@adonisjs/http-server 6.6.0-0 → 6.6.2-0

package/build/factories/http_context.js

@@ -1,5 +1,5 @@
 import { Container } from '@adonisjs/fold';
-import { LoggerFactory } from '@adonisjs/logger/test_factories/logger';
+import { LoggerFactory } from '@adonisjs/logger/factories';
 import { RequestFactory } from './request.js';
 import { ResponseFactory } from './response.js';
 import { HttpContext } from '../src/http_context/main.js';

package/build/factories/request.js

@@ -1,7 +1,7 @@
 import { Socket } from 'node:net';
 import proxyAddr from 'proxy-addr';
 import { IncomingMessage, ServerResponse } from 'node:http';
-import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption';
+import { EncryptionFactory } from '@adonisjs/encryption/factories';
 import { Request } from '../src/request.js';
 import { QsParserFactory } from './qs_parser_factory.js';
 export class RequestFactory {

package/build/factories/response.js

@@ -1,6 +1,6 @@
 import { Socket } from 'node:net';
 import { IncomingMessage, ServerResponse } from 'node:http';
-import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption';
+import { EncryptionFactory } from '@adonisjs/encryption/factories';
 import { RouterFactory } from './router.js';
 import { Response } from '../src/response.js';
 import { QsParserFactory } from './qs_parser_factory.js';

package/build/factories/router.js

@@ -1,11 +1,11 @@
-import { AppFactory } from '@adonisjs/application/test_factories/app';
-import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption';
+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';
 export class RouterFactory {
     #parameters = {};
     #getApp() {
-        return this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url));
+        return (this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url), () => { }));
     }
     #createEncryption() {
         return this.#parameters.encryption || new EncryptionFactory().create();

package/build/factories/server_factory.js

@@ -1,7 +1,7 @@
 import { Logger } from '@adonisjs/logger';
 import { Emitter } from '@adonisjs/events';
-import { AppFactory } from '@adonisjs/application/test_factories/app';
-import { EncryptionFactory } from '@adonisjs/encryption/test_factories/encryption';
+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';
 export class ServerFactory {
@@ -16,7 +16,7 @@ export class ServerFactory {
         return defineConfig(this.#parameters.config || {});
     }
     #getApp() {
-        return this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url));
+        return (this.#parameters.app || new AppFactory().create(new URL('./app/', import.meta.url), () => { }));
     }
     #createEncryption() {
         return this.#parameters.encryption || new EncryptionFactory().create();

package/build/index.d.ts

@@ -4,10 +4,11 @@ export { Redirect } from './src/redirect.js';
 export { Server } from './src/server/main.js';
 export { Router } from './src/router/main.js';
 export { Route } from './src/router/route.js';
+export * as errors from './src/exceptions.js';
+export { BriskRoute } from './src/router/brisk.js';
 export { RouteGroup } from './src/router/group.js';
 export { defineConfig } from './src/define_config.js';
-export { RouteResource } from './src/router/resource.js';
-export { BriskRoute } from './src/router/brisk.js';
+export { CookieClient } from './src/cookies/client.js';
 export { HttpContext } from './src/http_context/main.js';
-export * as errors from './src/exceptions.js';
+export { RouteResource } from './src/router/resource.js';
 export { HttpExceptionHandler } from './src/exception_handler.js';

package/build/index.js

@@ -4,10 +4,11 @@ export { Redirect } from './src/redirect.js';
 export { Server } from './src/server/main.js';
 export { Router } from './src/router/main.js';
 export { Route } from './src/router/route.js';
+export * as errors from './src/exceptions.js';
+export { BriskRoute } from './src/router/brisk.js';
 export { RouteGroup } from './src/router/group.js';
 export { defineConfig } from './src/define_config.js';
-export { RouteResource } from './src/router/resource.js';
-export { BriskRoute } from './src/router/brisk.js';
+export { CookieClient } from './src/cookies/client.js';
 export { HttpContext } from './src/http_context/main.js';
-export * as errors from './src/exceptions.js';
+export { RouteResource } from './src/router/resource.js';
 export { HttpExceptionHandler } from './src/exception_handler.js';

package/build/src/http_context/main.d.ts

@@ -1,5 +1,5 @@
+import Macroable from '@poppinss/macroable';
 import type { Logger } from '@adonisjs/logger';
-import { Macroable } from '@poppinss/macroable';
 import { ContainerResolver } from '@adonisjs/fold';
 import type { Request } from '../request.js';
 import type { Response } from '../response.js';

package/build/src/http_context/main.js

@@ -1,5 +1,5 @@
 import { inspect } from 'node:util';
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 import { RuntimeException } from '@poppinss/utils';
 import { asyncLocalStorage } from './local_storage.js';
 export class HttpContext extends Macroable {

package/build/src/request.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 import { UrlWithStringQuery } from 'node:url';
 import type { Encryption } from '@adonisjs/encryption';
 import { ServerResponse, IncomingMessage, IncomingHttpHeaders } from 'node:http';
@@ -68,6 +68,20 @@ export declare class Request extends Macroable {
     }): any;
     plainCookie(key: string, defaultValue?: string, encoded?: boolean): any;
     hasValidSignature(purpose?: string): boolean;
+    serialize(): {
+        id: string | undefined;
+        url: string;
+        query: string | null;
+        body: Record<string, any>;
+        params: Record<string, any>;
+        headers: IncomingHttpHeaders;
+        method: string;
+        protocol: string;
+        cookies: Record<string, any>;
+        hostname: string | null;
+        ip: string;
+        subdomains: Record<string, any>;
+    };
     toJSON(): {
         id: string | undefined;
         url: string;

package/build/src/request.js

@@ -5,9 +5,9 @@ import accepts from 'accepts';
 import { isIP } from 'node:net';
 import is from '@sindresorhus/is';
 import proxyaddr from 'proxy-addr';
-import lodash from '@poppinss/utils/lodash';
 import { safeEqual } from '@poppinss/utils';
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
+import lodash from '@poppinss/utils/lodash';
 import { parse } from 'node:url';
 import { trustProxy } from './helpers.js';
 import { CookieParser } from './cookies/parser.js';
@@ -301,7 +301,7 @@ export class Request extends Macroable {
             ? safeEqual(signedUrl, `${this.url()}?${queryString}`)
             : safeEqual(signedUrl, this.url());
     }
-    toJSON() {
+    serialize() {
         return {
             id: this.id(),
             url: this.url(),
@@ -317,4 +317,7 @@ export class Request extends Macroable {
             subdomains: this.ctx?.subdomains || {},
         };
     }
+    toJSON() {
+        return this.serialize();
+    }
 }

package/build/src/response.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 import type { Encryption } from '@adonisjs/encryption';
 import { ServerResponse, IncomingMessage } from 'node:http';
 import type { Qs } from './qs.js';

package/build/src/response.js

@@ -7,7 +7,7 @@ import { extname } from 'node:path';
 import onFinished from 'on-finished';
 import { promisify } from 'node:util';
 import json from '@poppinss/utils/json';
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 import { createReadStream, stat } from 'node:fs';
 import { RuntimeException } from '@poppinss/utils';
 import contentDisposition from 'content-disposition';

package/build/src/router/brisk.d.ts

@@ -1,4 +1,4 @@
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 import type { Application } from '@adonisjs/application';
 import { Route } from './route.js';
 import type { ParsedGlobalMiddleware } from '../types/middleware.js';

package/build/src/router/brisk.js

@@ -1,4 +1,4 @@
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 import { Route } from './route.js';
 export class BriskRoute extends Macroable {
     #pattern;

package/build/src/router/group.d.ts

@@ -1,4 +1,4 @@
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 import type { RouteMatcher } from '../types/route.js';
 import type { MiddlewareFn, ParsedNamedMiddleware } from '../types/middleware.js';
 import { Route } from './route.js';

package/build/src/router/group.js

@@ -1,4 +1,4 @@
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 import { BriskRoute } from './brisk.js';
 import { RouteResource } from './resource.js';
 export class RouteGroup extends Macroable {

package/build/src/router/matchers.d.ts

@@ -1,4 +1,4 @@
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 export declare class RouteMatchers extends Macroable {
     number(): {
         match: RegExp;

package/build/src/router/matchers.js

@@ -1,4 +1,4 @@
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 export class RouteMatchers extends Macroable {
     number() {
         return { match: /^[0-9]+$/, cast: (value) => Number(value) };

package/build/src/router/resource.d.ts

@@ -1,4 +1,4 @@
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 import type { Application } from '@adonisjs/application';
 import { Route } from './route.js';
 import type { ParsedGlobalMiddleware } from '../types/middleware.js';

package/build/src/router/resource.js

@@ -1,5 +1,5 @@
 import string from '@poppinss/utils/string';
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 import { RuntimeException } from '@poppinss/utils';
 import { Route } from './route.js';
 export class RouteResource extends Macroable {

package/build/src/router/route.d.ts

@@ -1,4 +1,4 @@
-import { Macroable } from '@poppinss/macroable';
+import Macroable from '@poppinss/macroable';
 import type { Application } from '@adonisjs/application';
 import type { Constructor, LazyImport, OneOrMore } from '../types/base.js';
 import type { MiddlewareFn, ParsedNamedMiddleware, ParsedGlobalMiddleware } from '../types/middleware.js';

package/build/src/router/route.js

@@ -1,6 +1,6 @@
 import is from '@sindresorhus/is';
+import Macroable from '@poppinss/macroable';
 import Middleware from '@poppinss/middleware';
-import { Macroable } from '@poppinss/macroable';
 import { RuntimeException } from '@poppinss/utils';
 import { moduleCaller, moduleExpression, moduleImporter } from '@adonisjs/fold';
 import { execute } from './executor.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/http-server",
-  "version": "6.6.0-0",
+  "version": "6.6.2-0",
   "description": "AdonisJS HTTP server with support packed with Routing and Cookies",
   "main": "build/index.js",
   "type": "module",
@@ -39,12 +39,12 @@
   "author": "virk,adonisjs",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/application": "^6.8.1-0",
-    "@adonisjs/config": "^4.1.4-0",
-    "@adonisjs/encryption": "^5.1.1-0",
-    "@adonisjs/events": "^8.4.4-0",
-    "@adonisjs/fold": "^9.9.1-0",
-    "@adonisjs/logger": "^5.4.0-0",
+    "@adonisjs/application": "^7.0.0-0",
+    "@adonisjs/config": "^4.2.0-0",
+    "@adonisjs/encryption": "^5.1.2-0",
+    "@adonisjs/events": "^8.4.5-0",
+    "@adonisjs/fold": "^9.9.2-0",
+    "@adonisjs/logger": "^5.4.1-0",
     "@commitlint/cli": "^17.4.2",
     "@commitlint/config-conventional": "^17.4.2",
     "@fastify/middie": "^8.1.0",
@@ -54,7 +54,7 @@
     "@japa/run-failed-tests": "^1.1.0",
     "@japa/runner": "^2.2.2",
     "@japa/spec-reporter": "^1.3.2",
-    "@swc/core": "^1.3.27",
+    "@swc/core": "^1.3.30",
     "@types/accepts": "^1.3.5",
     "@types/content-disposition": "^0.5.5",
     "@types/cookie": "^0.5.1",
@@ -76,7 +76,7 @@
     "c8": "^7.12.0",
     "cross-env": "^7.0.3",
     "del-cli": "^5.0.0",
-    "eslint": "^8.32.0",
+    "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-adonis": "^3.0.3",
     "eslint-plugin-prettier": "^4.2.1",
@@ -94,15 +94,15 @@
     "typescript": "^4.9.4"
   },
   "dependencies": {
-    "@poppinss/macroable": "^1.0.0-0",
+    "@poppinss/macroable": "^1.0.0-2",
     "@poppinss/matchit": "^3.1.2",
     "@poppinss/middleware": "^3.1.0",
-    "@poppinss/utils": "^6.4.0-0",
+    "@poppinss/utils": "^6.5.0-0",
     "@sindresorhus/is": "^5.3.0",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "cookie": "^0.5.0",
-    "cuid": "^2.1.8",
+    "cuid": "^3.0.0",
     "destroy": "^1.2.0",
     "encodeurl": "^1.0.2",
     "etag": "^1.8.1",
@@ -117,11 +117,11 @@
     "youch": "^3.2.2"
   },
   "peerDependencies": {
-    "@adonisjs/application": "^6.8.1-0",
-    "@adonisjs/encryption": "^5.1.1-0",
-    "@adonisjs/events": "^8.4.4-0",
-    "@adonisjs/fold": "^9.9.1-0",
-    "@adonisjs/logger": "^5.4.0-0"
+    "@adonisjs/application": "^7.0.0-0",
+    "@adonisjs/encryption": "^5.1.2-0",
+    "@adonisjs/events": "^8.4.5-0",
+    "@adonisjs/fold": "^9.9.2-0",
+    "@adonisjs/logger": "^5.4.1-0"
   },
   "repository": {
     "type": "git",