@adonisjs/http-server 6.0.0-0 → 6.0.2-0

package/build/src/cookies/client.d.ts

@@ -1,4 +1,4 @@
-import type Encryption from '@adonisjs/encryption';
+import type { Encryption } from '@adonisjs/encryption';
 export declare class CookieClient {
     #private;
     constructor(encryption: Encryption);

package/build/src/cookies/drivers/encrypted.d.ts

@@ -1,4 +1,4 @@
-import type Encryption from '@adonisjs/encryption';
+import type { Encryption } from '@adonisjs/encryption';
 export declare function pack(key: string, value: any, encryption: Encryption): null | string;
 export declare function canUnpack(encryptedValue: string): boolean;
 export declare function unpack(key: string, encryptedValue: string, encryption: Encryption): null | any;

package/build/src/cookies/drivers/signed.d.ts

@@ -1,4 +1,4 @@
-import type Encryption from '@adonisjs/encryption';
+import type { Encryption } from '@adonisjs/encryption';
 export declare function pack(key: string, value: any, encryption: Encryption): null | string;
 export declare function canUnpack(signedValue: string): boolean;
 export declare function unpack(key: string, signedValue: string, encryption: Encryption): null | any;

package/build/src/cookies/parser.d.ts

@@ -1,4 +1,4 @@
-import type Encryption from '@adonisjs/encryption';
+import type { Encryption } from '@adonisjs/encryption';
 export declare class CookieParser {
     #private;
     constructor(cookieHeader: string, encryption: Encryption);

package/build/src/cookies/serializer.d.ts

@@ -1,4 +1,4 @@
-import type Encryption from '@adonisjs/encryption';
+import type { Encryption } from '@adonisjs/encryption';
 import type { CookieOptions } from '../types/response.js';
 export declare class CookieSerializer {
     #private;

package/build/src/request.d.ts

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

package/build/src/response.d.ts

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

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

@@ -8,7 +8,7 @@ import type { MakeUrlOptions, RouteFn, RouteMatchers } from '../types/route.js';
 export declare class BriskRoute<NamedMiddleware extends Record<string, LazyImport<MiddlewareAsClass>> = any> extends Macroable {
     #private;
     route: null | Route<NamedMiddleware>;
-    constructor(app: Application, middlewareStore: MiddlewareStore<NamedMiddleware>, options: {
+    constructor(app: Application<any, any, any>, middlewareStore: MiddlewareStore<NamedMiddleware>, options: {
         pattern: string;
         globalMatchers: RouteMatchers;
     });

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

@@ -1,4 +1,4 @@
 import type { ContainerResolver } from '@adonisjs/fold';
 import type { StoreRouteNode } from '../types/route.js';
 import type { HttpContext } from '../http_context/main.js';
-export declare function execute(route: StoreRouteNode, resolver: ContainerResolver, ctx: HttpContext): Promise<void>;
+export declare function execute(route: StoreRouteNode, resolver: ContainerResolver<any>, ctx: HttpContext): Promise<void>;

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

@@ -1,4 +1,4 @@
-import type Encryption from '@adonisjs/encryption';
+import type { Encryption } from '@adonisjs/encryption';
 import type { Qs } from '../../qs.js';
 import { UrlBuilder } from './url_builder.js';
 import type { RouteJSON } from '../../types/route.js';

package/build/src/router/lookup_store/url_builder.d.ts

@@ -1,4 +1,4 @@
-import type Encryption from '@adonisjs/encryption';
+import type { Encryption } from '@adonisjs/encryption';
 import type { Qs } from '../../qs.js';
 import type { RouteFinder } from './route_finder.js';
 export declare class UrlBuilder {

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

@@ -1,4 +1,4 @@
-import type Encryption from '@adonisjs/encryption';
+import type { Encryption } from '@adonisjs/encryption';
 import type { Application } from '@adonisjs/application';
 import type { Qs } from '../qs.js';
 import { Route } from './route.js';
@@ -16,7 +16,7 @@ export declare class Router<NamedMiddleware extends Record<string, LazyImport<Mi
     routes: (Route<NamedMiddleware> | RouteResource<NamedMiddleware> | RouteGroup<NamedMiddleware> | BriskRoute<NamedMiddleware>)[];
     usingDomains: boolean;
     matchers: Matchers;
-    constructor(app: Application, encryption: Encryption, middlewareStore: MiddlewareStore<NamedMiddleware>, qsParser: Qs);
+    constructor(app: Application<any, any, any>, encryption: Encryption, middlewareStore: MiddlewareStore<NamedMiddleware>, qsParser: Qs);
     route(pattern: string, methods: string[], handler: string | RouteFn): Route<NamedMiddleware>;
     any(pattern: string, handler: string | RouteFn): Route<NamedMiddleware>;
     get(pattern: string, handler: string | RouteFn): Route<NamedMiddleware>;

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

@@ -8,7 +8,7 @@ import type { ResourceActionNames, RouteMatcher, RouteMatchers } from '../types/
 export declare class RouteResource<NamedMiddleware extends Record<string, LazyImport<MiddlewareAsClass>> = any> extends Macroable {
     #private;
     routes: Route[];
-    constructor(app: Application, middlewareStore: MiddlewareStore<NamedMiddleware>, options: {
+    constructor(app: Application<any, any, any>, middlewareStore: MiddlewareStore<NamedMiddleware>, options: {
         resource: string;
         controller: string;
         globalMatchers: RouteMatchers;

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

@@ -6,7 +6,7 @@ import type { GetMiddlewareArgs, MiddlewareAsClass, MiddlewareFn } from '../type
 import type { RouteFn, RouteJSON, RouteMatcher, RouteMatchers, StoreRouteMiddleware } from '../types/route.js';
 export declare class Route<NamedMiddleware extends Record<string, LazyImport<MiddlewareAsClass>> = any> extends Macroable {
     #private;
-    constructor(app: Application, middlewareStore: MiddlewareStore<NamedMiddleware>, options: {
+    constructor(app: Application<any, any, any>, middlewareStore: MiddlewareStore<NamedMiddleware>, options: {
         pattern: string;
         methods: string[];
         handler: RouteFn | string;

package/build/src/server/factories/final_handler.d.ts

@@ -1,4 +1,4 @@
 import type { ContainerResolver } from '@adonisjs/fold';
 import type { Router } from '../../router/main.js';
 import type { HttpContext } from '../../http_context/main.js';
-export declare function finalHandler(router: Router, resolver: ContainerResolver, ctx: HttpContext): () => any;
+export declare function finalHandler(router: Router, resolver: ContainerResolver<any>, ctx: HttpContext): () => any;

package/build/src/server/factories/middleware_handler.d.ts

@@ -2,4 +2,4 @@ import type { NextFn } from '@poppinss/middleware/types';
 import type { ContainerResolver } from '@adonisjs/fold';
 import type { HttpContext } from '../../http_context/main.js';
 import { ParsedGlobalMiddleware } from '../../types/middleware.js';
-export declare function middlewareHandler(resolver: ContainerResolver, ctx: HttpContext): (fn: ParsedGlobalMiddleware, next: NextFn) => any;
+export declare function middlewareHandler(resolver: ContainerResolver<any>, ctx: HttpContext): (fn: ParsedGlobalMiddleware, next: NextFn) => any;

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

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import type Encryption from '@adonisjs/encryption';
+import type { Encryption } from '@adonisjs/encryption';
 import type { Application } from '@adonisjs/application';
 import type { Server as HttpsServer } from 'node:https';
 import type { ServerResponse, IncomingMessage, Server as HttpServer } from 'node:http';
@@ -11,13 +11,12 @@ import { Router } from '../router/main.js';
 export declare class Server<NamedMiddleware extends Record<string, LazyImport<MiddlewareAsClass>> = any> {
     #private;
     get usingAsyncLocalStorage(): boolean;
-    constructor(app: Application, encryption: Encryption, config: ServerConfig);
+    constructor(app: Application<any, any, any>, encryption: Encryption, config: ServerConfig);
     use(serverMiddleware: LazyImport<MiddlewareAsClass>[], routerMiddleware: LazyImport<MiddlewareAsClass>[], namedMiddleware: NamedMiddleware): this;
     errorHandler(handler: LazyImport<ErrorHandlerAsAClass>): this;
     boot(): Promise<void>;
     setNodeServer(server: HttpServer | HttpsServer): void;
-    close(): Promise<void>;
     getNodeServer(): HttpServer<typeof IncomingMessage, typeof ServerResponse> | HttpsServer<typeof IncomingMessage, typeof ServerResponse> | undefined;
-    getRouter(): Router<any> | undefined;
+    getRouter(): Router<NamedMiddleware> | undefined;
     handle(req: IncomingMessage, res: ServerResponse): Promise<any>;
 }

package/build/src/server/main.js

@@ -93,20 +93,6 @@ export class Server {
     setNodeServer(server) {
         this.#underlyingHttpServer = server;
     }
-    close() {
-        return new Promise((resolve, reject) => {
-            if (!this.#underlyingHttpServer || !this.#underlyingHttpServer.listening) {
-                resolve();
-                return;
-            }
-            this.#underlyingHttpServer.close((error) => {
-                if (error) {
-                    return reject(error);
-                }
-                resolve();
-            });
-        });
-    }
     getNodeServer() {
         return this.#underlyingHttpServer;
     }

package/build/src/types/base.d.ts

@@ -1,3 +1,4 @@
+export type { NextFn } from '@poppinss/middleware/types';
 export type Constructor<T> = new (...args: any[]) => T;
 export type LazyImport<DefaultExport> = () => Promise<{
     default: DefaultExport;

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

@@ -0,0 +1,7 @@
+export * from './base.js';
+export * from './middleware.js';
+export * from './qs.js';
+export * from './request.js';
+export * from './response.js';
+export * from './route.js';
+export * from './server.js';

package/build/src/types/main.js

@@ -0,0 +1,7 @@
+export * from './base.js';
+export * from './middleware.js';
+export * from './qs.js';
+export * from './request.js';
+export * from './response.js';
+export * from './route.js';
+export * from './server.js';

package/build/src/types/middleware.d.ts

@@ -1,6 +1,5 @@
 import type { ContainerResolver } from '@adonisjs/fold';
-import type { NextFn } from '@poppinss/middleware/types';
-import type { Constructor } from './base.js';
+import type { Constructor, NextFn } from './base.js';
 import type { HttpContext } from '../http_context/main.js';
 export type MiddlewareAsClass = Constructor<{
     handle: (ctx: HttpContext, next: NextFn, args?: any) => any;
@@ -9,6 +8,6 @@ type HasUndefined<T> = T extends NonNullable<T> ? true : false;
 export type GetMiddlewareArgs<Middleware extends MiddlewareAsClass> = HasUndefined<Parameters<InstanceType<Middleware>['handle']>[2]> extends true ? [Parameters<InstanceType<Middleware>['handle']>[2]] : [Parameters<InstanceType<Middleware>['handle']>[2]?];
 export type MiddlewareFn = (ctx: HttpContext, next: NextFn) => any;
 export type ParsedGlobalMiddleware = {
-    handle: (resolver: ContainerResolver, ...args: [ctx: HttpContext, next: NextFn, params?: any]) => any;
+    handle: (resolver: ContainerResolver<any>, ...args: [ctx: HttpContext, next: NextFn, params?: any]) => any;
 };
 export {};

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

@@ -11,14 +11,14 @@ export type MatchItRouteToken = RouteMatcher & {
 export type RouteFn = (ctx: HttpContext) => any;
 export type StoreRouteHandler = RouteFn | {
     name: string;
-    handle: (resolver: ContainerResolver, ...args: [ctx: HttpContext, ...injections: any[]]) => any;
+    handle: (resolver: ContainerResolver<any>, ...args: [ctx: HttpContext, ...injections: any[]]) => any;
 };
 export type StoreRouteMiddleware = MiddlewareFn | ({
     name?: string;
     args?: any[];
 } & ParsedGlobalMiddleware);
 export type StoreRouteNode = {
-    execute: (route: StoreRouteNode, resolver: ContainerResolver, ctx: HttpContext) => any;
+    execute: (route: StoreRouteNode, resolver: ContainerResolver<any>, ctx: HttpContext) => any;
     name?: string;
     pattern: string;
     handler: StoreRouteHandler;

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

@@ -1,8 +1,8 @@
+import type { QSParserConfig } from './qs.js';
 import type { Constructor } from './base.js';
 import type { RequestConfig } from './request.js';
 import type { ResponseConfig } from './response.js';
 import type { HttpContext } from '../http_context/main.js';
-import { QSParserConfig } from './qs.js';
 export type ServerErrorHandler = {
     handle: (error: any, ctx: HttpContext) => any;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/http-server",
-  "version": "6.0.0-0",
+  "version": "6.0.2-0",
   "description": "AdonisJS HTTP server with support packed with Routing and Cookies",
   "main": "build/index.js",
   "type": "module",
@@ -11,7 +11,7 @@
   ],
   "exports": {
     ".": "./build/index.js",
-    "./types": "./build/src/types.js"
+    "./types": "./build/src/types/main.js"
   },
   "scripts": {
     "pretest": "npm run lint",
@@ -37,22 +37,22 @@
   "author": "virk,adonisjs",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/application": "^6.1.2-0",
+    "@adonisjs/application": "^6.2.0-0",
     "@adonisjs/config": "^4.1.1-0",
-    "@adonisjs/encryption": "^5.0.1-0",
+    "@adonisjs/encryption": "^5.0.2-0",
     "@adonisjs/env": "^4.0.3-0",
-    "@adonisjs/fold": "^9.4.1-0",
-    "@adonisjs/logger": "^5.0.2-0",
+    "@adonisjs/fold": "^9.5.0-0",
+    "@adonisjs/logger": "^5.1.0-0",
     "@commitlint/cli": "^17.3.0",
     "@commitlint/config-conventional": "^17.3.0",
-    "@fastify/middie": "^8.0.0",
+    "@fastify/middie": "^8.1.0",
     "@japa/api-client": "^1.4.2",
     "@japa/assert": "^1.3.6",
     "@japa/expect-type": "^1.0.2",
     "@japa/run-failed-tests": "^1.1.0",
     "@japa/runner": "^2.2.2",
     "@japa/spec-reporter": "^1.3.2",
-    "@swc/core": "^1.3.21",
+    "@swc/core": "^1.3.22",
     "@types/accepts": "^1.3.5",
     "@types/content-disposition": "^0.5.5",
     "@types/cookie": "^0.5.1",
@@ -85,11 +85,11 @@
     "husky": "^8.0.2",
     "np": "^7.6.2",
     "pem": "^1.14.6",
-    "prettier": "^2.8.0",
+    "prettier": "^2.8.1",
     "reflect-metadata": "^0.1.13",
-    "supertest": "^6.3.1",
+    "supertest": "^6.3.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.4"
   },
   "dependencies": {
     "@poppinss/macroable": "^1.0.0-0",
@@ -114,9 +114,9 @@
     "vary": "^1.1.2"
   },
   "peerDependencies": {
-    "@adonisjs/application": "^6.1.2-0",
-    "@adonisjs/encryption": "^5.0.1-0",
-    "@adonisjs/fold": "^9.4.1-0"
+    "@adonisjs/application": "^6.2.0-0",
+    "@adonisjs/encryption": "^5.0.2-0",
+    "@adonisjs/fold": "^9.5.0-0"
   },
   "repository": {
     "type": "git",