refactor(encryption): replace adonisjs module with boringnode

benchmarks/adonisjs.js

@@ -10,7 +10,7 @@
 import { createServer } from 'node:http'
 import { Logger } from '@adonisjs/logger'
 import { Emitter } from '@adonisjs/events'
-import { Encryption } from '@adonisjs/encryption'
+import { Encryption } from '@boringnode/encryption'
 import { Application } from '@adonisjs/application'
 
 import { defineConfig, Server } from '../build/index.js'

factories/request.ts

@@ -10,9 +10,9 @@
 import { Socket } from 'node:net'
 import proxyAddr from 'proxy-addr'
 import { randomUUID } from 'node:crypto'
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 import { IncomingMessage, ServerResponse } from 'node:http'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { HttpRequest } from '../src/request.ts'
 import { QsParserFactory } from './qs_parser_factory.ts'

factories/response.ts

@@ -8,9 +8,9 @@
  */
 
 import { Socket } from 'node:net'
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 import { IncomingMessage, ServerResponse } from 'node:http'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { RouterFactory } from './router.ts'
 import { HttpResponse } from '../src/response.ts'

factories/router.ts

@@ -7,10 +7,10 @@
  * file that was distributed with this source code.
  */
 
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 import type { Application } from '@adonisjs/application'
 import { AppFactory } from '@adonisjs/application/factories'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { Router } from '../src/router/main.ts'
 import { QsParserFactory } from './qs_parser_factory.ts'

factories/server_factory.ts

@@ -9,10 +9,10 @@
 
 import { Logger } from '@adonisjs/logger'
 import { Emitter } from '@adonisjs/events'
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 import type { Application } from '@adonisjs/application'
 import { AppFactory } from '@adonisjs/application/factories'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { Server } from '../src/server/main.ts'
 import { defineConfig } from '../src/define_config.ts'

factories/url_builder_factory.ts

@@ -7,8 +7,8 @@
  * file that was distributed with this source code.
  */
 
-import type { Encryption } from '@adonisjs/encryption'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import type { Encryption } from '@boringnode/encryption'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { RouterFactory } from './router.ts'
 import type { Router } from '../src/router/main.ts'

package.json

@@ -44,13 +44,13 @@
   "license": "MIT",
   "devDependencies": {
     "@adonisjs/application": "^9.0.0-next.4",
-    "@adonisjs/encryption": "^7.0.0-next.1",
     "@adonisjs/eslint-config": "^3.0.0-next.1",
     "@adonisjs/events": "^10.1.0-next.2",
     "@adonisjs/fold": "^11.0.0-next.2",
     "@adonisjs/logger": "^7.1.0-next.0",
     "@adonisjs/prettier-config": "^1.4.5",
     "@adonisjs/tsconfig": "^2.0.0-next.0",
+    "@boringnode/encryption": "^0.2.2",
     "@fastify/middie": "^9.0.3",
     "@japa/assert": "^4.1.1",
     "@japa/expect-type": "^2.0.3",
@@ -117,7 +117,6 @@
   },
   "peerDependencies": {
     "@adonisjs/application": "^9.0.0-next.4",
-    "@adonisjs/encryption": "^7.0.0-next.1",
     "@adonisjs/events": "^10.1.0-next.2",
     "@adonisjs/fold": "^11.0.0-next.2",
     "@adonisjs/logger": "^7.1.0-next.0",

src/cookies/client.ts

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 
 import * as plainCookiesDriver from './drivers/plain.ts'
 import * as signedCookiesDriver from './drivers/signed.ts'

src/cookies/drivers/encrypted.ts

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 
 /**
  * Encrypt a value to be set as cookie

src/cookies/drivers/signed.ts

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 
 /**
  * Signs a value to be shared as a cookie. The signed output has a
@@ -22,7 +22,7 @@ export function pack(key: string, value: any, encryption: Encryption): null | st
   if (value === undefined || value === null) {
     return null
   }
-  return `s:${encryption.verifier.sign(value, undefined, key)}`
+  return `s:${encryption.getMessageVerifier().sign(value, undefined, key)}`
 }
 
 /**
@@ -51,5 +51,5 @@ export function unpack(key: string, signedValue: string, encryption: Encryption)
     return null
   }
 
-  return encryption.verifier.unsign(value, key)
+  return encryption.getMessageVerifier().unsign(value, key)
 }

src/cookies/parser.ts

@@ -8,7 +8,7 @@
  */
 
 import { parse } from 'cookie-es'
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 
 import { CookieClient } from './client.ts'
 

src/cookies/serializer.ts

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 
 import { CookieClient } from './client.ts'
 import { serializeCookie } from '../helpers.ts'

src/helpers.ts

@@ -11,7 +11,7 @@ import { serialize } from 'cookie-es'
 // @ts-expect-error
 import matchit from '@poppinss/matchit'
 import string from '@poppinss/utils/string'
-import { type Encryption } from '@adonisjs/encryption'
+import { type Encryption } from '@boringnode/encryption'
 import { parseBindingReference } from '@adonisjs/fold'
 
 import { type Qs } from './qs.ts'
@@ -103,7 +103,7 @@ export function createSignedURL(
    * on their 2 different domains, but we ignore that case for now and can consider
    * it later (when someone asks for it)
    */
-  const signature = encryption.verifier.sign(
+  const signature = encryption.getMessageVerifier().sign(
     createURL(identifier, tokens, searchParamsStringifier, params, {
       ...options,
       prefixUrl: undefined,

src/request.ts

@@ -16,7 +16,7 @@ import proxyaddr from 'proxy-addr'
 import { safeEqual } from '@poppinss/utils'
 import Macroable from '@poppinss/macroable'
 import lodash from '@poppinss/utils/lodash'
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 import { type ServerResponse, type IncomingMessage, type IncomingHttpHeaders } from 'node:http'
 
 import type { Qs } from './qs.ts'
@@ -1043,7 +1043,7 @@ export class HttpRequest extends Macroable {
     /*
      * Return false when signature fails
      */
-    const signedUrl = this.#encryption.verifier.unsign(signature, purpose)
+    const signedUrl = this.#encryption.getMessageVerifier().unsign(signature, purpose)
     if (!signedUrl) {
       return false
     }

src/response.ts

@@ -18,7 +18,7 @@ import { stat } from 'node:fs/promises'
 import Macroable from '@poppinss/macroable'
 import { createReadStream } from 'node:fs'
 import contentDisposition from 'content-disposition'
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 import { RuntimeException } from '@poppinss/utils/exception'
 import { type ServerResponse, type IncomingMessage, type OutgoingHttpHeaders } from 'node:http'
 

src/router/main.ts

@@ -9,7 +9,7 @@
 
 import is from '@sindresorhus/is'
 import { moduleImporter } from '@adonisjs/fold'
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 import type { Application } from '@adonisjs/application'
 import { RuntimeException } from '@poppinss/utils/exception'
 import type { Constructor, LazyImport } from '@poppinss/utils/types'

src/router/signed_url_builder.ts

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 
 import { type Router } from './main.ts'
 import { createSignedURL } from '../helpers.ts'

src/server/main.ts

@@ -11,7 +11,7 @@ import onFinished from 'on-finished'
 import Middleware from '@poppinss/middleware'
 import type { Logger } from '@adonisjs/logger'
 import type { LazyImport } from '@poppinss/utils/types'
-import type { Encryption } from '@adonisjs/encryption'
+import type { Encryption } from '@boringnode/encryption'
 import type { Server as HttpsServer } from 'node:https'
 import type { Application } from '@adonisjs/application'
 import type { EmitterLike } from '@adonisjs/events/types'

tests/cookies/client.spec.ts

@@ -8,7 +8,7 @@
  */
 
 import { test } from '@japa/runner'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { CookieClient } from '../../src/cookies/client.ts'
 

tests/cookies/drivers/encrypted.spec.ts

@@ -17,7 +17,7 @@
  */
 
 import { test } from '@japa/runner'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 import { pack, unpack, canUnpack } from '../../../src/cookies/drivers/encrypted.ts'
 
 const encryption = new EncryptionFactory().create()

tests/cookies/drivers/signed.spec.ts

@@ -17,7 +17,7 @@
  */
 
 import { test } from '@japa/runner'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 import { pack, unpack, canUnpack } from '../../../src/cookies/drivers/signed.ts'
 
 const encryption = new EncryptionFactory().create()

tests/cookies/parser.spec.ts

@@ -8,7 +8,7 @@
  */
 
 import { test } from '@japa/runner'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { CookieParser } from '../../src/cookies/parser.ts'
 import { CookieSerializer } from '../../src/cookies/serializer.ts'

tests/cookies/serializer.spec.ts

@@ -10,7 +10,7 @@
 import { test } from '@japa/runner'
 import { setTimeout } from 'node:timers/promises'
 import { MessageBuilder } from '@poppinss/utils'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { CookieSerializer } from '../../src/cookies/serializer.ts'
 import base64 from '@poppinss/utils/base64'

tests/redirect.spec.ts

@@ -10,7 +10,7 @@
 import supertest from 'supertest'
 import { test } from '@japa/runner'
 import { AppFactory } from '@adonisjs/application/factories'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { RouterFactory } from '../factories/router.ts'
 import { httpServer } from '../factories/http_server.ts'

tests/request.spec.ts

@@ -13,7 +13,7 @@ import proxyAddr from 'proxy-addr'
 import { test } from '@japa/runner'
 import Middleware from '@poppinss/middleware'
 import { createServer as httpsServer } from 'node:https'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { RouterFactory } from '../factories/router.ts'
 import { HttpRequestFactory } from '../factories/request.ts'

tests/response.spec.ts

@@ -18,7 +18,7 @@ import { Readable } from 'node:stream'
 import { fileURLToPath } from 'node:url'
 import { AppFactory } from '@adonisjs/application/factories'
 import { createWriteStream, createReadStream } from 'node:fs'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { RouterFactory } from '../factories/router.ts'
 import { CookieParser } from '../src/cookies/parser.ts'

tests/router/legacy_url_builder.spec.ts

@@ -9,7 +9,7 @@
 
 import { test } from '@japa/runner'
 import { AppFactory } from '@adonisjs/application/factories'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { Router } from '../../src/router/main.ts'
 import { HttpRequestFactory } from '../../factories/request.ts'

tests/router/router.spec.ts

@@ -9,7 +9,7 @@
 
 import { parse } from 'qs'
 import { test } from '@japa/runner'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { RouterFactory } from '../../factories/router.ts'
 
@@ -885,7 +885,7 @@ test.group('Make signed url', () => {
 
     const url = router.makeSignedUrl('/posts/:id', { id: 1 })!
     const qs = parse(url.split('?')[1])
-    assert.equal(encryption.verifier.unsign(qs.signature as string), '/posts/1')
+    assert.equal(encryption.getMessageVerifier().unsign(qs.signature as string), '/posts/1')
   })
 
   test("make signed url to a given route by it's name", ({ assert }) => {
@@ -897,7 +897,7 @@ test.group('Make signed url', () => {
 
     const url = router.makeSignedUrl('showPost', { id: 1 })!
     const qs = parse(url.split('?')[1])
-    assert.equal(encryption.verifier.unsign(qs.signature as string), '/posts/1')
+    assert.equal(encryption.getMessageVerifier().unsign(qs.signature as string), '/posts/1')
   })
 
   test("make signed url to a given route by it's controller method", ({ assert }) => {
@@ -909,7 +909,7 @@ test.group('Make signed url', () => {
 
     const url = router.makeSignedUrl('#controllers/posts.index', { id: 1 })!
     const qs = parse(url.split('?')[1])
-    assert.equal(encryption.verifier.unsign(qs.signature as string), '/posts/1')
+    assert.equal(encryption.getMessageVerifier().unsign(qs.signature as string), '/posts/1')
   })
 
   test('make url for a specific domain', ({ assert }) => {
@@ -932,7 +932,7 @@ test.group('Make signed url', () => {
       }
     )!
     const qs = parse(url.split('?')[1])
-    assert.equal(encryption.verifier.unsign(qs.signature as string), '/articles/1')
+    assert.equal(encryption.getMessageVerifier().unsign(qs.signature as string), '/articles/1')
   })
 
   test('make signed url with expiry', ({ assert }) => {
@@ -945,7 +945,7 @@ test.group('Make signed url', () => {
     const url = router.makeSignedUrl('PostsController.index', { id: 1, expiresIn: '1m' })!
     const qs = parse(url.split('?')[1])
 
-    assert.equal(encryption.verifier.unsign(qs.signature as string), '/posts/1')
+    assert.equal(encryption.getMessageVerifier().unsign(qs.signature as string), '/posts/1')
   })
 
   test('make signed url with custom query string', ({ assert }) => {
@@ -960,7 +960,7 @@ test.group('Make signed url', () => {
     })!
     const qs = parse(url.split('?')[1])
 
-    assert.equal(encryption.verifier.unsign(qs.signature as string), '/posts/1?page=1')
+    assert.equal(encryption.getMessageVerifier().unsign(qs.signature as string), '/posts/1?page=1')
     assert.equal(Number(qs.page), 1)
   })
 

tests/router/url_builder.spec.ts

@@ -8,7 +8,7 @@
  */
 
 import { test } from '@japa/runner'
-import { EncryptionFactory } from '@adonisjs/encryption/factories'
+import { EncryptionFactory } from '@boringnode/encryption/factories'
 
 import { RouterFactory } from '../../factories/router.ts'
 import { HttpRequestFactory } from '../../factories/request.ts'