@adonisjs/http-server 7.0.0-1 → 7.0.0-3

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@adonisjs/http-server",
-  "version": "7.0.0-1",
+  "version": "7.0.0-3",
   "description": "AdonisJS HTTP server with support packed with Routing and Cookies",
   "main": "build/index.js",
   "type": "module",
   "files": [
-    "build/factories",
-    "build/src",
-    "build/index.d.ts",
-    "build/index.js"
+    "build",
+    "!build/bin",
+    "!build/tests"
   ],
   "exports": {
     ".": "./build/index.js",
@@ -23,7 +22,8 @@
     "test": "cross-env NODE_DEBUG=adonisjs:http c8 npm run quick:test",
     "clean": "del-cli build",
     "typecheck": "tsc --noEmit",
-    "compile": "npm run lint && npm run clean && tsc",
+    "precompile": "npm run lint && npm run clean",
+    "compile": "tsup-node && tsc --emitDeclarationOnly --declaration",
     "build": "npm run compile",
     "prebenchmark": "npm run build",
     "benchmark": "node benchmarks/index.js",
@@ -43,70 +43,70 @@
   "author": "virk,adonisjs",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/application": "^8.0.0-0",
-    "@adonisjs/encryption": "^5.1.2-3",
-    "@adonisjs/eslint-config": "^1.1.8",
-    "@adonisjs/events": "^9.0.0-0",
-    "@adonisjs/fold": "^9.9.3-10",
-    "@adonisjs/logger": "^5.4.2-6",
-    "@adonisjs/prettier-config": "^1.1.8",
-    "@adonisjs/tsconfig": "^1.1.8",
-    "@commitlint/cli": "^17.8.0",
-    "@commitlint/config-conventional": "^17.8.0",
+    "@adonisjs/application": "^8.0.0-3",
+    "@adonisjs/encryption": "^5.1.2-5",
+    "@adonisjs/eslint-config": "^1.2.0",
+    "@adonisjs/events": "^9.0.0-2",
+    "@adonisjs/fold": "^9.9.3-12",
+    "@adonisjs/logger": "^5.4.2-8",
+    "@adonisjs/prettier-config": "^1.2.0",
+    "@adonisjs/tsconfig": "^1.2.0",
+    "@commitlint/cli": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.3",
     "@fastify/middie": "^8.3.0",
-    "@japa/assert": "^2.0.0",
-    "@japa/expect-type": "^2.0.0",
-    "@japa/runner": "^3.0.2",
-    "@swc/core": "1.3.82",
-    "@types/accepts": "^1.3.5",
-    "@types/content-disposition": "^0.5.6",
-    "@types/cookie": "^0.5.2",
-    "@types/destroy": "^1.0.1",
-    "@types/encodeurl": "^1.0.0",
-    "@types/etag": "^1.8.1",
-    "@types/fresh": "^0.5.0",
-    "@types/fs-extra": "^11.0.2",
+    "@japa/assert": "^2.1.0",
+    "@japa/expect-type": "^2.0.1",
+    "@japa/runner": "^3.1.1",
+    "@swc/core": "^1.3.101",
+    "@types/accepts": "^1.3.7",
+    "@types/content-disposition": "^0.5.8",
+    "@types/cookie": "^0.6.0",
+    "@types/destroy": "^1.0.3",
+    "@types/encodeurl": "^1.0.2",
+    "@types/etag": "^1.8.3",
+    "@types/fresh": "^0.5.2",
+    "@types/fs-extra": "^11.0.4",
     "@types/http-status-codes": "^1.2.0",
-    "@types/mime-types": "^2.1.2",
-    "@types/node": "^20.8.6",
-    "@types/on-finished": "^2.3.2",
-    "@types/pem": "^1.14.2",
-    "@types/proxy-addr": "^2.0.1",
-    "@types/qs": "^6.9.8",
-    "@types/supertest": "^2.0.14",
-    "@types/type-is": "^1.6.4",
-    "@types/vary": "^1.1.1",
+    "@types/mime-types": "^2.1.4",
+    "@types/node": "^20.10.5",
+    "@types/on-finished": "^2.3.4",
+    "@types/pem": "^1.14.4",
+    "@types/proxy-addr": "^2.0.3",
+    "@types/qs": "^6.9.10",
+    "@types/supertest": "^2.0.16",
+    "@types/type-is": "^1.6.6",
+    "@types/vary": "^1.1.3",
     "@vinejs/vine": "^1.6.0",
-    "autocannon": "^7.12.0",
+    "autocannon": "^7.14.0",
     "c8": "^8.0.1",
     "cross-env": "^7.0.3",
     "del-cli": "^5.1.0",
-    "eslint": "^8.51.0",
-    "fastify": "^4.24.2",
-    "fs-extra": "^11.1.1",
+    "eslint": "^8.56.0",
+    "fastify": "^4.25.1",
+    "fs-extra": "^11.2.0",
     "get-port": "^7.0.0",
     "github-label-sync": "^2.3.1",
     "http-status-codes": "^2.3.0",
     "husky": "^8.0.3",
-    "np": "^8.0.4",
+    "np": "^9.2.0",
     "pem": "^1.14.8",
-    "prettier": "^3.0.3",
-    "reflect-metadata": "^0.1.13",
+    "prettier": "^3.1.1",
+    "reflect-metadata": "^0.2.1",
     "supertest": "^6.3.3",
-    "ts-node": "^10.9.1",
-    "tsup": "^7.2.0",
-    "typescript": "^5.2.2"
+    "ts-node": "^10.9.2",
+    "tsup": "^8.0.1",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "@paralleldrive/cuid2": "^2.2.2",
-    "@poppinss/macroable": "^1.0.0",
+    "@poppinss/macroable": "^1.0.1",
     "@poppinss/matchit": "^3.1.2",
-    "@poppinss/middleware": "^3.2.0",
-    "@poppinss/utils": "^6.5.0",
-    "@sindresorhus/is": "^6.0.1",
+    "@poppinss/middleware": "^3.2.2",
+    "@poppinss/utils": "^6.7.0",
+    "@sindresorhus/is": "^6.1.0",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
-    "cookie": "^0.5.0",
+    "cookie": "^0.6.0",
     "destroy": "^1.2.0",
     "encodeurl": "^1.0.2",
     "etag": "^1.8.1",
@@ -118,14 +118,14 @@
     "tmp-cache": "^1.1.0",
     "type-is": "^1.6.18",
     "vary": "^1.1.2",
-    "youch": "^3.3.2"
+    "youch": "^3.3.3"
   },
   "peerDependencies": {
-    "@adonisjs/application": "^8.0.0-0",
-    "@adonisjs/encryption": "^5.1.2-3",
-    "@adonisjs/events": "^9.0.0-0",
-    "@adonisjs/fold": "^9.9.3-10",
-    "@adonisjs/logger": "^5.4.2-6"
+    "@adonisjs/application": "^8.0.0-3",
+    "@adonisjs/encryption": "^5.1.2-5",
+    "@adonisjs/events": "^9.0.0-2",
+    "@adonisjs/fold": "^9.9.3-12",
+    "@adonisjs/logger": "^5.4.2-8"
   },
   "repository": {
     "type": "git",
@@ -174,7 +174,8 @@
     "outDir": "./build",
     "clean": true,
     "format": "esm",
-    "dts": true,
+    "dts": false,
+    "sourcemap": true,
     "target": "esnext"
   }
 }

package/build/factories/http_context.js

@@ -1,51 +0,0 @@
-/*
- * @adonisjs/http-server
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { Container } from '@adonisjs/fold';
-import { LoggerFactory } from '@adonisjs/logger/factories';
-import { RequestFactory } from './request.js';
-import { ResponseFactory } from './response.js';
-import { HttpContext } from '../src/http_context/main.js';
-/**
- * HttpContext factory is used to generate Http context class instances for
- * testing
- */
-export class HttpContextFactory {
-    #parameters = {};
-    /**
-     * Returns the request class instance
-     */
-    #createRequest() {
-        return this.#parameters.request || new RequestFactory().create();
-    }
-    /**
-     * Returns the response class instance
-     */
-    #createResponse() {
-        return this.#parameters.response || new ResponseFactory().create();
-    }
-    /**
-     * Returns an instance of the logger class
-     */
-    #createLogger() {
-        return this.#parameters.logger || new LoggerFactory().create();
-    }
-    /**
-     * Merge factory params
-     */
-    merge(params) {
-        Object.assign(this.#parameters, params);
-        return this;
-    }
-    /**
-     * Create request
-     */
-    create() {
-        return new HttpContext(this.#createRequest(), this.#createResponse(), this.#createLogger(), new Container().createResolver());
-    }
-}

package/build/factories/http_server.js

@@ -1,26 +0,0 @@
-/*
- * @adonisjs/http-server
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import getPort from 'get-port';
-import { getActiveTest } from '@japa/runner';
-import { createServer } from 'node:http';
-export const httpServer = {
-    async create(handler) {
-        const server = createServer(handler);
-        const test = getActiveTest();
-        test?.cleanup(() => {
-            server.close();
-        });
-        const port = await getPort({ port: 3000 });
-        return new Promise((resolve) => {
-            server.listen(port, 'localhost', () => {
-                return resolve({ server, port, url: `http://localhost:${port}` });
-            });
-        });
-    },
-};

package/build/factories/qs_parser_factory.js

@@ -1,44 +0,0 @@
-/*
- * @adonisjs/http-server
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { Qs } from '../src/qs.js';
-/**
- * QS Parser factory is used to generate the query string
- * parser for testing
- */
-export class QsParserFactory {
-    #options = {
-        parse: {
-            depth: 5,
-            parameterLimit: 1000,
-            allowSparse: false,
-            arrayLimit: 20,
-            comma: true,
-        },
-        stringify: {
-            encode: true,
-            encodeValuesOnly: false,
-            arrayFormat: 'indices',
-            skipNulls: false,
-        },
-    };
-    /**
-     * Merge encryption factory options
-     */
-    merge(options) {
-        Object.assign(this.#options.parse, options.parse);
-        Object.assign(this.#options.stringify, options.stringify);
-        return this;
-    }
-    /**
-     * Create instance of the logger class
-     */
-    create() {
-        return new Qs(this.#options);
-    }
-}

package/build/factories/request.js

@@ -1,73 +0,0 @@
-/*
- * @adonisjs/http-server
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { Socket } from 'node:net';
-import proxyAddr from 'proxy-addr';
-import { IncomingMessage, ServerResponse } from 'node:http';
-import { EncryptionFactory } from '@adonisjs/encryption/factories';
-import { Request } from '../src/request.js';
-import { QsParserFactory } from './qs_parser_factory.js';
-/**
- * Request factory is used to generate request class instances for
- * testing
- */
-export class RequestFactory {
-    #parameters = {};
-    /**
-     * Returns the config for the request class
-     */
-    #getConfig() {
-        return {
-            allowMethodSpoofing: false,
-            trustProxy: proxyAddr.compile('loopback'),
-            subdomainOffset: 2,
-            generateRequestId: false,
-            ...this.#parameters.config,
-        };
-    }
-    /**
-     * Returns the HTTP req object
-     */
-    #createRequest() {
-        const req = this.#parameters.req || new IncomingMessage(new Socket());
-        if (this.#parameters.url) {
-            req.url = this.#parameters.url;
-        }
-        if (this.#parameters.method) {
-            req.method = this.#parameters.method;
-        }
-        return req;
-    }
-    /**
-     * Returns the HTTP res object
-     */
-    #createResponse(req) {
-        return this.#parameters.res || new ServerResponse(req);
-    }
-    /**
-     * Returns an instance of the encryptor to encrypt
-     * signed URLs
-     */
-    #createEncryption() {
-        return this.#parameters.encryption || new EncryptionFactory().create();
-    }
-    /**
-     * Merge factory params
-     */
-    merge(params) {
-        Object.assign(this.#parameters, params);
-        return this;
-    }
-    /**
-     * Create request
-     */
-    create() {
-        const req = this.#createRequest();
-        return new Request(req, this.#createResponse(req), this.#createEncryption(), this.#getConfig(), new QsParserFactory().create());
-    }
-}

package/build/factories/response.js

@@ -1,77 +0,0 @@
-/*
- * @adonisjs/http-server
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { Socket } from 'node:net';
-import { IncomingMessage, ServerResponse } from 'node:http';
-import { EncryptionFactory } from '@adonisjs/encryption/factories';
-import { RouterFactory } from './router.js';
-import { Response } from '../src/response.js';
-import { QsParserFactory } from './qs_parser_factory.js';
-/**
- * Response factory is used to generate response class instances for
- * testing
- */
-export class ResponseFactory {
-    #parameters = {};
-    /**
-     * Returns the config for the request class
-     */
-    #getConfig() {
-        return {
-            etag: false,
-            jsonpCallbackName: 'callback',
-            cookie: {
-                maxAge: 90,
-                path: '/',
-                httpOnly: true,
-                sameSite: false,
-                secure: false,
-            },
-            ...this.#parameters.config,
-        };
-    }
-    /**
-     * Returns the HTTP req object
-     */
-    #createRequest() {
-        return this.#parameters.req || new IncomingMessage(new Socket());
-    }
-    /**
-     * Returns an instance of the router
-     */
-    #createRouter() {
-        return this.#parameters.router || new RouterFactory().create();
-    }
-    /**
-     * Returns the HTTP res object
-     */
-    #createResponse(req) {
-        return this.#parameters.res || new ServerResponse(req);
-    }
-    /**
-     * Returns an instance of the encryptor to encrypt
-     * signed URLs
-     */
-    #createEncryption() {
-        return this.#parameters.encryption || new EncryptionFactory().create();
-    }
-    /**
-     * Merge factory params
-     */
-    merge(params) {
-        Object.assign(this.#parameters, params);
-        return this;
-    }
-    /**
-     * Create response class instance
-     */
-    create() {
-        const req = this.#createRequest();
-        return new Response(req, this.#createResponse(req), this.#createEncryption(), this.#getConfig(), this.#createRouter(), new QsParserFactory().create());
-    }
-}

package/build/factories/router.js

@@ -1,45 +0,0 @@
-/*
- * @adonisjs/http-server
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { AppFactory } from '@adonisjs/application/factories';
-import { EncryptionFactory } from '@adonisjs/encryption/factories';
-import { Router } from '../src/router/main.js';
-import { QsParserFactory } from './qs_parser_factory.js';
-/**
- * Router factory is used to generate router class instances for
- * testing
- */
-export class RouterFactory {
-    #parameters = {};
-    /**
-     * Returns an instance of the application class
-     */
-    #getApp() {
-        return (this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url), () => { }));
-    }
-    /**
-     * Returns an instance of the encryptor to encrypt
-     * signed URLs
-     */
-    #createEncryption() {
-        return this.#parameters.encryption || new EncryptionFactory().create();
-    }
-    /**
-     * Merge factory params
-     */
-    merge(params) {
-        Object.assign(this.#parameters, params);
-        return this;
-    }
-    /**
-     * Create router instance
-     */
-    create() {
-        return new Router(this.#getApp(), this.#createEncryption(), new QsParserFactory().create());
-    }
-}

package/build/factories/server_factory.js

@@ -1,65 +0,0 @@
-/*
- * @adonisjs/http-server
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { Logger } from '@adonisjs/logger';
-import { Emitter } from '@adonisjs/events';
-import { AppFactory } from '@adonisjs/application/factories';
-import { EncryptionFactory } from '@adonisjs/encryption/factories';
-import { Server } from '../src/server/main.js';
-import { defineConfig } from '../src/define_config.js';
-/**
- * Server factory is used to generate server class instances for
- * testing
- */
-export class ServerFactory {
-    #parameters = {};
-    /**
-     * Returns the emitter instance
-     */
-    #getEmitter() {
-        return this.#parameters.emitter || new Emitter(this.#getApp());
-    }
-    /**
-     * Returns the logger instance
-     */
-    #getLogger() {
-        return this.#parameters.logger || new Logger({ enabled: false });
-    }
-    /**
-     * Returns the config for the server class
-     */
-    #getConfig() {
-        return defineConfig(this.#parameters.config || {});
-    }
-    /**
-     * Returns an instance of the application class
-     */
-    #getApp() {
-        return (this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url), () => { }));
-    }
-    /**
-     * Returns an instance of the encryptor to encrypt
-     * signed URLs
-     */
-    #createEncryption() {
-        return this.#parameters.encryption || new EncryptionFactory().create();
-    }
-    /**
-     * Merge factory params
-     */
-    merge(params) {
-        Object.assign(this.#parameters, params);
-        return this;
-    }
-    /**
-     * Create server instance
-     */
-    create() {
-        return new Server(this.#getApp(), this.#createEncryption(), this.#getEmitter(), this.#getLogger(), this.#getConfig());
-    }
-}

package/build/src/cookies/client.js

@@ -1,84 +0,0 @@
-/*
- * @adonisjs/http-server
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import * as plainCookiesDriver from './drivers/plain.js';
-import * as signedCookiesDriver from './drivers/signed.js';
-import * as encryptedCookiesDriver from './drivers/encrypted.js';
-/**
- * Cookie client exposes the API to parse/set AdonisJS cookies
- * as a client.
- */
-export class CookieClient {
-    #encryption;
-    constructor(encryption) {
-        this.#encryption = encryption;
-    }
-    /**
-     * Encrypt a key value pair to be sent in the cookie header
-     */
-    encrypt(key, value) {
-        return encryptedCookiesDriver.pack(key, value, this.#encryption);
-    }
-    /**
-     * Sign a key value pair to be sent in the cookie header
-     */
-    sign(key, value) {
-        return signedCookiesDriver.pack(key, value, this.#encryption);
-    }
-    /**
-     * Encode a key value pair to be sent in the cookie header
-     */
-    encode(_, value) {
-        return plainCookiesDriver.pack(value);
-    }
-    /**
-     * Unsign a signed cookie value
-     */
-    unsign(key, value) {
-        return signedCookiesDriver.canUnpack(value)
-            ? signedCookiesDriver.unpack(key, value, this.#encryption)
-            : null;
-    }
-    /**
-     * Decrypt an encrypted cookie value
-     */
-    decrypt(key, value) {
-        return encryptedCookiesDriver.canUnpack(value)
-            ? encryptedCookiesDriver.unpack(key, value, this.#encryption)
-            : null;
-    }
-    /**
-     * Decode an encoded cookie value
-     */
-    decode(_, value) {
-        return plainCookiesDriver.canUnpack(value) ? plainCookiesDriver.unpack(value) : null;
-    }
-    /**
-     * Parse response cookie
-     */
-    parse(key, value) {
-        /**
-         * Unsign signed cookie
-         */
-        if (signedCookiesDriver.canUnpack(value)) {
-            return signedCookiesDriver.unpack(key, value, this.#encryption);
-        }
-        /**
-         * Decrypted encrypted cookie
-         */
-        if (encryptedCookiesDriver.canUnpack(value)) {
-            return encryptedCookiesDriver.unpack(key, value, this.#encryption);
-        }
-        /**
-         * Decode encoded cookie
-         */
-        if (plainCookiesDriver.canUnpack(value)) {
-            return plainCookiesDriver.unpack(value);
-        }
-    }
-}

package/build/src/cookies/drivers/encrypted.js

@@ -1,36 +0,0 @@
-/*
- * @adonisjs/http-server
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-/**
- * Encrypt a value to be set as cookie
- */
-export function pack(key, value, encryption) {
-    if (value === undefined || value === null) {
-        return null;
-    }
-    return `e:${encryption.encrypt(value, undefined, key)}`;
-}
-/**
- * Returns a boolean, if the unpack method from this module can attempt
- * to unpack encrypted value.
- */
-export function canUnpack(encryptedValue) {
-    return typeof encryptedValue === 'string' && encryptedValue.substring(0, 2) === 'e:';
-}
-/**
- * Attempts to unpack the encrypted cookie value. Returns null, when fails to do so.
- * Only call this method, when `canUnpack` returns true, otherwise runtime
- * exceptions can be raised.
- */
-export function unpack(key, encryptedValue, encryption) {
-    const value = encryptedValue.slice(2);
-    if (!value) {
-        return null;
-    }
-    return encryption.decrypt(value, key);
-}