@adonisjs/http-server 6.4.0-0 → 6.4.1-0

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

@@ -6,7 +6,7 @@ import type { MakeUrlOptions, RouteFn, RouteMatchers } from '../types/route.js';
 export declare class BriskRoute extends Macroable {
     #private;
     route: null | Route;
-    constructor(app: Application<any, any>, routerMiddleware: ParsedGlobalMiddleware[], options: {
+    constructor(app: Application<any>, routerMiddleware: ParsedGlobalMiddleware[], options: {
         pattern: string;
         globalMatchers: RouteMatchers;
     });

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

@@ -15,7 +15,7 @@ export declare class Router extends LookupStore {
     routes: (Route | RouteResource | RouteGroup | BriskRoute)[];
     usingDomains: boolean;
     matchers: Matchers;
-    constructor(app: Application<any, any>, encryption: Encryption, qsParser: Qs);
+    constructor(app: Application<any>, encryption: Encryption, qsParser: Qs);
     use(middleware: LazyImport<MiddlewareAsClass>[]): this;
     named<NamedMiddleware extends Record<string, LazyImport<MiddlewareAsClass>>>(collection: NamedMiddleware): { [K in keyof NamedMiddleware]: <Args extends import("../types/middleware.js").GetMiddlewareArgs<import("../types/base.js").UnWrapLazyImport<NamedMiddleware[K]>>>(...args: Args) => {
         name: K;

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

@@ -6,7 +6,7 @@ import type { ResourceActionNames, RouteMatcher, RouteMatchers } from '../types/
 export declare class RouteResource extends Macroable {
     #private;
     routes: Route[];
-    constructor(app: Application<any, any>, routerMiddleware: ParsedGlobalMiddleware[], options: {
+    constructor(app: Application<any>, routerMiddleware: ParsedGlobalMiddleware[], options: {
         resource: string;
         controller: string;
         globalMatchers: RouteMatchers;

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

@@ -5,7 +5,7 @@ import type { MiddlewareFn, ParsedNamedMiddleware, ParsedGlobalMiddleware } from
 import type { GetControllerHandlers, RouteFn, RouteJSON, RouteMatcher, RouteMatchers, StoreRouteMiddleware } from '../types/route.js';
 export declare class Route<Controller extends Constructor<any> = any> extends Macroable {
     #private;
-    constructor(app: Application<any, any>, routerMiddleware: ParsedGlobalMiddleware[], options: {
+    constructor(app: Application<any>, routerMiddleware: ParsedGlobalMiddleware[], options: {
         pattern: string;
         methods: string[];
         handler: RouteFn | string | [LazyImport<Controller> | Controller, GetControllerHandlers<Controller>?];

package/build/src/router/route.js

@@ -37,12 +37,12 @@ export class Route extends Macroable {
         if (Array.isArray(handler)) {
             if (is.class_(handler[0])) {
                 return {
-                    reference: handler[0].name,
+                    reference: handler,
                     ...moduleCaller(handler[0], (handler[1] || 'handle')).toHandleMethod(),
                 };
             }
             return {
-                reference: handler[0].name,
+                reference: handler,
                 ...moduleImporter(handler[0], (handler[1] || 'handle')).toHandleMethod(),
             };
         }

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

@@ -1,6 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 import { Emitter } from '@adonisjs/events';
+import type { Logger } from '@adonisjs/logger';
 import type { Encryption } from '@adonisjs/encryption';
 import type { Server as HttpsServer } from 'node:https';
 import type { Application } from '@adonisjs/application';
@@ -12,7 +13,7 @@ import { Router } from '../router/main.js';
 export declare class Server {
     #private;
     get usingAsyncLocalStorage(): boolean;
-    constructor(app: Application<any, any>, encryption: Encryption, emitter: Emitter<any>, config: ServerConfig);
+    constructor(app: Application<any>, encryption: Encryption, emitter: Emitter<any>, logger: Logger, config: ServerConfig);
     use(middleware: LazyImport<MiddlewareAsClass>[]): this;
     errorHandler(handler: LazyImport<ErrorHandlerAsAClass>): this;
     boot(): Promise<void>;

package/build/src/server/main.js

@@ -17,6 +17,7 @@ export class Server {
             ctx.response.status(error.status || 500).send(error.message || 'Internal server error');
         },
     };
+    #logger;
     #errorHandler;
     #resolvedErrorHandler = this.#defaultErrorHandler;
     #emitter;
@@ -31,10 +32,11 @@ export class Server {
     get usingAsyncLocalStorage() {
         return asyncLocalStorage.isEnabled;
     }
-    constructor(app, encryption, emitter, config) {
+    constructor(app, encryption, emitter, logger, config) {
         this.#app = app;
         this.#emitter = emitter;
         this.#config = config;
+        this.#logger = logger;
         this.#encryption = encryption;
         this.#qsParser = new Qs(this.#config.qs);
         this.#router = new Router(this.#app, this.#encryption, this.#qsParser);
@@ -102,7 +104,7 @@ export class Server {
         const resolver = this.#app.container.createResolver();
         const request = new Request(req, res, this.#encryption, this.#config, this.#qsParser);
         const response = new Response(req, res, this.#encryption, this.#config, this.#router, this.#qsParser);
-        const ctx = new HttpContext(request, response, this.#app.logger.child({ request_id: request.id() }), resolver);
+        const ctx = new HttpContext(request, response, this.#logger.child({ request_id: request.id() }), resolver);
         if (startTime) {
             onFinished(res, () => {
                 this.#emitter.emit('http:request_finished', {

package/build/test_factories/router.d.ts

@@ -2,7 +2,7 @@ import type { Encryption } from '@adonisjs/encryption';
 import type { Application } from '@adonisjs/application';
 import { Router } from '../src/router/main.js';
 type FactoryParameters = {
-    app: Application<any, any>;
+    app: Application<any>;
     encryption: Encryption;
 };
 export declare class RouterFactory {

package/build/test_factories/server_factory.d.ts

@@ -1,10 +1,12 @@
+import { Logger } from '@adonisjs/logger';
 import { Emitter } from '@adonisjs/events';
 import type { Encryption } from '@adonisjs/encryption';
 import type { Application } from '@adonisjs/application';
 import { Server } from '../src/server/main.js';
 import type { ServerConfig } from '../src/types/server.js';
 type FactoryParameters = {
-    app: Application<any, any>;
+    app: Application<any>;
+    logger: Logger;
     encryption: Encryption;
     emitter: Emitter<any>;
     config: Partial<ServerConfig>;

package/build/test_factories/server_factory.js

@@ -1,3 +1,4 @@
+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';
@@ -8,6 +9,9 @@ export class ServerFactory {
     #getEmitter() {
         return this.#parameters.emitter || new Emitter(this.#getApp());
     }
+    #getLogger() {
+        return this.#parameters.logger || new Logger({ enabled: false });
+    }
     #getConfig() {
         return defineConfig(this.#parameters.config || {});
     }
@@ -22,6 +26,6 @@ export class ServerFactory {
         return this;
     }
     create() {
-        return new Server(this.#getApp(), this.#createEncryption(), this.#getEmitter(), this.#getConfig());
+        return new Server(this.#getApp(), this.#createEncryption(), this.#getEmitter(), this.#getLogger(), this.#getConfig());
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/http-server",
-  "version": "6.4.0-0",
+  "version": "6.4.1-0",
   "description": "AdonisJS HTTP server with support packed with Routing and Cookies",
   "main": "build/index.js",
   "type": "module",
@@ -39,14 +39,14 @@
   "author": "virk,adonisjs",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/application": "^6.6.0-0",
+    "@adonisjs/application": "^6.7.0-0",
     "@adonisjs/config": "^4.1.3-0",
     "@adonisjs/encryption": "^5.1.0-0",
-    "@adonisjs/events": "^8.4.0-0",
+    "@adonisjs/events": "^8.4.1-0",
     "@adonisjs/fold": "^9.9.0-0",
     "@adonisjs/logger": "^5.2.0-0",
-    "@commitlint/cli": "^17.4.1",
-    "@commitlint/config-conventional": "^17.4.0",
+    "@commitlint/cli": "^17.4.2",
+    "@commitlint/config-conventional": "^17.4.2",
     "@fastify/middie": "^8.1.0",
     "@japa/api-client": "^1.4.2",
     "@japa/assert": "^1.3.6",
@@ -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.26",
+    "@swc/core": "^1.3.27",
     "@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.31.0",
+    "eslint": "^8.32.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-adonis": "^3.0.3",
     "eslint-plugin-prettier": "^4.2.1",
@@ -87,7 +87,7 @@
     "husky": "^8.0.3",
     "np": "^7.6.3",
     "pem": "^1.14.6",
-    "prettier": "^2.8.1",
+    "prettier": "^2.8.3",
     "reflect-metadata": "^0.1.13",
     "supertest": "^6.3.3",
     "ts-node": "^10.9.1",
@@ -116,9 +116,9 @@
     "vary": "^1.1.2"
   },
   "peerDependencies": {
-    "@adonisjs/application": "^6.6.0-0",
+    "@adonisjs/application": "^6.7.0-0",
     "@adonisjs/encryption": "^5.1.0-0",
-    "@adonisjs/events": "^8.4.0-0",
+    "@adonisjs/events": "^8.4.1-0",
     "@adonisjs/fold": "^9.9.0-0"
   },
   "repository": {