@adonisjs/http-server 7.6.1 → 8.0.0-next.0

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

@@ -1,12 +1,12 @@
 import type { Logger } from '@adonisjs/logger';
+import type { LazyImport } from '@poppinss/utils/types';
 import type { Encryption } from '@adonisjs/encryption';
 import type { Server as HttpsServer } from 'node:https';
 import type { Application } from '@adonisjs/application';
 import type { EmitterLike } from '@adonisjs/events/types';
-import { ContainerResolver } from '@adonisjs/fold';
+import { type ContainerResolver } from '@adonisjs/fold';
 import type { ServerResponse, IncomingMessage, Server as HttpServer } from 'node:http';
-import type { LazyImport } from '../types/base.js';
-import type { MiddlewareAsClass } from '../types/middleware.js';
+import type { MiddlewareAsClass, ParsedGlobalMiddleware } from '../types/middleware.js';
 import type { ServerConfig, HttpServerEvents, ErrorHandlerAsAClass, TestingMiddlewarePipeline } from '../types/server.js';
 import { Request } from '../request.js';
 import { Response } from '../response.js';
@@ -75,6 +75,10 @@ export declare class Server {
      * Creates an instance of the [[HttpContext]] class
      */
     createHttpContext(request: Request, response: Response, resolver: ContainerResolver<any>): HttpContext;
+    /**
+     * Returns a list of server middleware stack
+     */
+    getMiddlewareList(): ParsedGlobalMiddleware[];
     /**
      * Handle request
      */

package/build/src/tracing_channels.d.ts

@@ -0,0 +1,23 @@
+import diagnostics_channel from 'node:diagnostics_channel';
+import type { MiddlewareTracingData } from './types/tracing_channels.js';
+/**
+ * Traces every HTTP request handled by the {@link Server} class.
+ */
+export declare const httpRequest: diagnostics_channel.TracingChannel<"adonisjs:http.request", import("./http_context/main.ts").HttpContext>;
+/**
+ * Traces middleware executed during the HTTP request
+ */
+export declare const httpMiddleware: diagnostics_channel.TracingChannel<"adonisjs:http.middleware", MiddlewareTracingData>;
+/**
+ * Traces the exception handler that converts errors into HTTP responses
+ */
+export declare const httpExceptionHandler: diagnostics_channel.TracingChannel<"adonisjs:http.exception.handler", object>;
+/**
+ * Traces route handler executed during the HTTP request
+ */
+export declare const httpRouteHandler: diagnostics_channel.TracingChannel<"adonisjs:http.route.handler", import("./types/route.ts").RouteJSON>;
+/**
+ * Traces non-stream and non-file download responses written by the AdonisJS
+ * response class
+ */
+export declare const httpResponseSerializer: diagnostics_channel.TracingChannel<"adonisjs:http.response.serializer", object>;

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

@@ -1,7 +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';
+export * from './qs.ts';
+export * from './route.ts';
+export * from './server.ts';
+export * from './request.ts';
+export * from './response.ts';
+export * from '../client/types.ts';
+export * from './middleware.ts';

package/build/src/types/main.js

@@ -1 +0,0 @@
-//# sourceMappingURL=main.js.map

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

@@ -1,5 +1,6 @@
 import type { ContainerResolver } from '@adonisjs/fold';
-import type { Constructor, NextFn } from './base.js';
+import type { NextFn } from '@poppinss/middleware/types';
+import type { Constructor, LazyImport } from '@poppinss/utils/types';
 import type { HttpContext } from '../http_context/main.js';
 /**
  * Middleware represented as a class
@@ -24,6 +25,7 @@ export type MiddlewareFn = (ctx: HttpContext, next: NextFn) => any;
  */
 export type ParsedGlobalMiddleware = {
     name?: string;
+    reference: LazyImport<MiddlewareAsClass> | MiddlewareAsClass;
     handle: (resolver: ContainerResolver<any>, ...args: [ctx: HttpContext, next: NextFn, params?: any]) => any;
 };
 /**
@@ -31,7 +33,38 @@ export type ParsedGlobalMiddleware = {
  */
 export type ParsedNamedMiddleware = {
     name: string;
+    reference: LazyImport<MiddlewareAsClass> | MiddlewareAsClass;
     handle: ParsedGlobalMiddleware['handle'];
     args: any;
 };
+/**
+ * Info node representing a middleware handler
+ */
+export type MiddlewareHandlerInfo = {
+    type: 'closure';
+    name: string;
+} | {
+    type: 'named';
+    name: string;
+    args: any | undefined;
+    method: string;
+    moduleNameOrPath: string;
+} | {
+    type: 'global';
+    name?: string | undefined;
+    method: string;
+    moduleNameOrPath: string;
+};
+/**
+ * Info node representing route handler
+ */
+export type RouteHandlerInfo = {
+    type: 'closure';
+    name: string;
+    args?: string;
+} | {
+    type: 'controller';
+    method: string;
+    moduleNameOrPath: string;
+};
 export {};

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

@@ -17,6 +17,10 @@ export type RequestConfig = {
      * Defaults to false
      */
     generateRequestId: boolean;
+    /**
+     * A custom method to generate a unique request id. Defaults to uuid v4.
+     */
+    createRequestId(): string;
     /**
      * Method spoofing allows changing the request method using the query string.
      * For example: Making a POST request on URL /users/1?_method=PATCH will

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

@@ -1,4 +1,4 @@
-import { Readable } from 'node:stream';
+import { type Readable } from 'node:stream';
 /**
  * Cookie options can that can be set on the response
  */

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

@@ -1,9 +1,10 @@
 import type Middleware from '@poppinss/middleware';
 import type { ContainerResolver } from '@adonisjs/fold';
-import type { Constructor, LazyImport } from './base.js';
+import type { Constructor, LazyImport } from '@poppinss/utils/types';
+import type { ServerErrorHandler } from './server.js';
 import type { HttpContext } from '../http_context/main.js';
+import { type RouteMatcher, type MatchItRouteToken } from '../client/types.ts';
 import type { MiddlewareFn, ParsedGlobalMiddleware } from './middleware.js';
-import { ServerErrorHandler } from './server.js';
 /**
  * Returns a union of methods from a controller that accepts
  * the context as the first argument.
@@ -11,15 +12,6 @@ import { ServerErrorHandler } from './server.js';
 export type GetControllerHandlers<Controller extends Constructor<any>> = {
     [K in keyof InstanceType<Controller>]: InstanceType<Controller>[K] extends (ctx: HttpContext, ...args: any[]) => any ? K : never;
 }[keyof InstanceType<Controller>];
-/**
- * Route token stored by matchit library
- */
-export type MatchItRouteToken = RouteMatcher & {
-    old: string;
-    type: 0 | 1 | 2 | 3;
-    val: string;
-    end: string;
-};
 /**
  * Route handler defined as a function
  */
@@ -38,36 +30,6 @@ export type StoreRouteMiddleware = MiddlewareFn | ({
     name?: string;
     args?: any[];
 } & ParsedGlobalMiddleware);
-/**
- * Route node persisted within the routes store
- */
-export type StoreRouteNode = {
-    /**
-     * The execute function to execute the route middleware
-     * and the handler
-     */
-    execute: (route: StoreRouteNode, resolver: ContainerResolver<any>, ctx: HttpContext, errorResponder: ServerErrorHandler['handle']) => any;
-    /**
-     * A unique name for the route
-     */
-    name?: string;
-    /**
-     * Route URI pattern
-     */
-    pattern: string;
-    /**
-     * Route handler
-     */
-    handler: StoreRouteHandler;
-    /**
-     * Route middleware
-     */
-    middleware: Middleware<StoreRouteMiddleware>;
-    /**
-     * Additional metadata associated with the route
-     */
-    meta: Record<string, any>;
-};
 /**
  * An object of routes for a given HTTP method
  */
@@ -77,7 +39,7 @@ export type StoreMethodNode = {
         [pattern: string]: string;
     };
     routes: {
-        [pattern: string]: StoreRouteNode;
+        [pattern: string]: RouteJSON;
     };
 };
 /**
@@ -100,7 +62,7 @@ export type StoreRoutesTree = {
  * Shape of the matched route for a pattern, method and domain.
  */
 export type MatchedRoute = {
-    route: StoreRouteNode;
+    route: RouteJSON;
     /**
      * A unique key for the looked up route
      */
@@ -114,13 +76,6 @@ export type MatchedRoute = {
      */
     subdomains: Record<string, any>;
 };
-/**
- * Shape of a route param matcher
- */
-export type RouteMatcher = {
-    match?: RegExp;
-    cast?: (value: string) => any;
-};
 /**
  * A collection of route matchers
  */
@@ -130,7 +85,36 @@ export type RouteMatchers = {
 /**
  * Representation of a route as JSON
  */
-export type RouteJSON = StoreRouteNode & {
+export type RouteJSON = {
+    /**
+     * The execute function to execute the route middleware
+     * and the handler
+     */
+    execute: (route: RouteJSON, resolver: ContainerResolver<any>, ctx: HttpContext, errorResponder: ServerErrorHandler['handle']) => any;
+    /**
+     * A unique name for the route
+     */
+    name?: string;
+    /**
+     * Route URI pattern
+     */
+    pattern: string;
+    /**
+     * Route handler
+     */
+    handler: StoreRouteHandler;
+    /**
+     * Route middleware
+     */
+    middleware: Middleware<StoreRouteMiddleware>;
+    /**
+     * Additional metadata associated with the route
+     */
+    meta: Record<string, any>;
+    /**
+     * Tokens to be used to construct the route URL
+     */
+    tokens: MatchItRouteToken[];
     /**
      * HTTP methods, the route responds to.
      */
@@ -150,6 +134,7 @@ export type RouteJSON = StoreRouteNode & {
 export type ResourceActionNames = 'create' | 'index' | 'store' | 'show' | 'edit' | 'update' | 'destroy';
 /**
  * Options accepted by makeUrl method
+ * @deprecated
  */
 export type MakeUrlOptions = {
     qs?: Record<string, any>;
@@ -159,8 +144,22 @@ export type MakeUrlOptions = {
 };
 /**
  * Options accepted by makeSignedUrl method
+ * @deprecated
  */
 export type MakeSignedUrlOptions = MakeUrlOptions & {
     expiresIn?: string | number;
     purpose?: string;
 };
+/**
+ * To be generated by the router and used by the URL builder
+ * and the LookupStore
+ */
+export interface RoutesList {
+}
+/**
+ * Helper to get routes for a given method from the RoutesList. The
+ * RoutesList is extended in the userland code.
+ */
+export type GetRoutesForMethod<Method> = {
+    [K in keyof RoutesList]: Method extends K ? RoutesList[Method] : never;
+};

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

@@ -1,5 +1,5 @@
+import type { Constructor } from '@poppinss/utils/types';
 import type { ErrorHandler, FinalHandler } from '@poppinss/middleware/types';
-import type { Constructor } from './base.js';
 import type { QSParserConfig } from './qs.js';
 import type { RequestConfig } from './request.js';
 import type { ResponseConfig } from './response.js';

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

@@ -0,0 +1,6 @@
+import type { RouteJSON } from './route.js';
+import type { HttpContext } from '../http_context/main.js';
+import type { MiddlewareFn, ParsedGlobalMiddleware, ParsedNamedMiddleware } from './middleware.js';
+export type HTTPRequestTracingData = HttpContext;
+export type MiddlewareTracingData = ParsedGlobalMiddleware | ParsedNamedMiddleware | MiddlewareFn;
+export type RouteHandlerTracingData = RouteJSON;

package/build/src/utils.d.ts

@@ -0,0 +1,28 @@
+import { type Route } from './router/route.js';
+import { RouteGroup } from './router/group.js';
+import { BriskRoute } from './router/brisk.js';
+import type { RouteJSON } from './types/route.js';
+import { RouteResource } from './router/resource.js';
+/**
+ * Makes input string consistent by having only the starting
+ * slash
+ */
+export declare function dropSlash(input: string): string;
+/**
+ * Returns a flat list of routes from the route groups and resources
+ */
+export declare function toRoutesJSON(routes: (RouteGroup | Route | RouteResource | BriskRoute)[]): RouteJSON[];
+/**
+ * Helper to know if the remote address should
+ * be trusted.
+ */
+export declare function trustProxy(remoteAddress: string, proxyFn: (addr: string, distance: number) => boolean): boolean;
+/**
+ * Parses a range expression to an object filled with the range
+ */
+export declare function parseRange<T>(range: string, value: T): Record<number, T>;
+export declare function safeDecodeURI(path: string, useSemicolonDelimiter: boolean): {
+    pathname: string;
+    query: string;
+    shouldDecodeParam: boolean;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/http-server",
-  "version": "7.6.1",
+  "version": "8.0.0-next.0",
   "description": "AdonisJS HTTP server with support packed with Routing and Cookies",
   "main": "build/index.js",
   "type": "module",
@@ -11,11 +11,16 @@
   ],
   "exports": {
     ".": "./build/index.js",
+    "./helpers": "./build/src/helpers.js",
     "./types": "./build/src/types/main.js",
+    "./client": {
+      "import": "./build/client.js",
+      "require": "./build/client.cjs"
+    },
     "./factories": "./build/factories/main.js"
   },
   "engines": {
-    "node": ">=18.16.0"
+    "node": ">=24.0.0"
   },
   "scripts": {
     "pretest": "npm run lint",
@@ -23,7 +28,8 @@
     "typecheck": "tsc --noEmit",
     "precompile": "npm run lint",
     "compile": "tsup-node && tsc --emitDeclarationOnly --declaration",
-    "build": "npm run compile",
+    "compile:client": "tsup-node --config=bin/build_client.ts",
+    "build": "npm run compile && npm run compile:client",
     "prebenchmark": "npm run build",
     "benchmark": "node benchmarks/index.js",
     "release": "release-it",
@@ -31,8 +37,7 @@
     "format": "prettier --write .",
     "prepublishOnly": "npm run build",
     "lint": "eslint",
-    "quick:test": "node --import=ts-node-maintained/register/esm --enable-source-maps bin/test.ts",
-    "citgm": "cross-env FORCE_COLOR=0 node --loader=ts-node/esm bin/test.ts"
+    "quick:test": "node --import=@poppinss/ts-exec --enable-source-maps bin/test.ts"
   },
   "keywords": [
     "http",
@@ -41,62 +46,62 @@
   "author": "virk,adonisjs",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/application": "^8.4.1",
-    "@adonisjs/assembler": "^7.8.2",
-    "@adonisjs/encryption": "^6.0.2",
-    "@adonisjs/eslint-config": "^2.0.0",
-    "@adonisjs/events": "^9.0.2",
-    "@adonisjs/fold": "^10.1.3",
-    "@adonisjs/logger": "^6.0.6",
-    "@adonisjs/prettier-config": "^1.4.4",
-    "@adonisjs/tsconfig": "^1.4.0",
+    "@adonisjs/application": "^9.0.0-next.2",
+    "@adonisjs/encryption": "^7.0.0-next.0",
+    "@adonisjs/eslint-config": "^3.0.0-next.0",
+    "@adonisjs/events": "^10.1.0-next.1",
+    "@adonisjs/fold": "^11.0.0-next.0",
+    "@adonisjs/logger": "^7.0.0-next.1",
+    "@adonisjs/prettier-config": "^1.4.5",
+    "@adonisjs/tsconfig": "^2.0.0-next.0",
     "@fastify/middie": "^9.0.3",
-    "@japa/assert": "^4.0.1",
+    "@japa/assert": "^4.1.1",
     "@japa/expect-type": "^2.0.3",
-    "@japa/runner": "^4.2.0",
+    "@japa/file-system": "^2.3.2",
+    "@japa/runner": "^4.3.0",
+    "@japa/snapshot": "^2.0.9",
+    "@poppinss/ts-exec": "^1.4.0",
     "@release-it/conventional-changelog": "^10.0.1",
-    "@swc/core": "1.10.7",
     "@types/accepts": "^1.3.7",
-    "@types/content-disposition": "^0.5.8",
+    "@types/content-disposition": "^0.5.9",
     "@types/destroy": "^1.0.3",
-    "@types/encodeurl": "^1.0.2",
-    "@types/etag": "^1.8.3",
-    "@types/fresh": "^0.5.2",
+    "@types/encodeurl": "^1.0.3",
+    "@types/etag": "^1.8.4",
+    "@types/fresh": "^0.5.3",
     "@types/fs-extra": "^11.0.4",
-    "@types/mime-types": "^2.1.4",
-    "@types/node": "^22.15.18",
-    "@types/on-finished": "^2.3.4",
+    "@types/mime-types": "^3.0.1",
+    "@types/node": "^24.1.0",
+    "@types/on-finished": "^2.3.5",
     "@types/pem": "^1.14.4",
     "@types/proxy-addr": "^2.0.3",
-    "@types/qs": "^6.9.18",
+    "@types/qs": "^6.14.0",
     "@types/supertest": "^6.0.3",
     "@types/type-is": "^1.6.7",
     "@types/vary": "^1.1.3",
     "@vinejs/vine": "^3.0.1",
     "autocannon": "^8.0.0",
     "c8": "^10.1.3",
-    "cross-env": "^7.0.3",
-    "eslint": "^9.26.0",
-    "fastify": "^5.3.3",
+    "cross-env": "^10.0.0",
+    "eslint": "^9.32.0",
+    "fastify": "^5.4.0",
     "fs-extra": "^11.3.0",
     "get-port": "^7.1.0",
     "http-status-codes": "^2.3.0",
     "pem": "^1.14.8",
-    "prettier": "^3.5.3",
+    "prettier": "^3.6.2",
     "reflect-metadata": "^0.2.2",
-    "release-it": "^19.0.2",
-    "supertest": "^7.1.1",
-    "ts-node-maintained": "^10.9.5",
-    "tsup": "^8.4.0",
-    "typescript": "^5.8.3"
+    "release-it": "^19.0.4",
+    "supertest": "^7.1.4",
+    "tsup": "^8.5.0",
+    "typescript": "^5.8.3",
+    "youch": "^4.1.0-beta.11"
   },
   "dependencies": {
-    "@paralleldrive/cuid2": "^2.2.2",
-    "@poppinss/macroable": "^1.0.4",
-    "@poppinss/matchit": "^3.1.2",
-    "@poppinss/middleware": "^3.2.5",
-    "@poppinss/utils": "^6.9.3",
-    "@sindresorhus/is": "^7.0.1",
+    "@poppinss/macroable": "^1.0.5",
+    "@poppinss/matchit": "^3.2.0",
+    "@poppinss/middleware": "^3.2.6",
+    "@poppinss/utils": "^7.0.0-next.3",
+    "@sindresorhus/is": "^7.0.2",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "cookie": "^1.0.2",
@@ -110,15 +115,20 @@
     "qs": "^6.14.0",
     "tmp-cache": "^1.1.0",
     "type-is": "^2.0.1",
-    "vary": "^1.1.2",
-    "youch": "^3.3.4"
+    "vary": "^1.1.2"
   },
   "peerDependencies": {
-    "@adonisjs/application": "^8.0.2",
-    "@adonisjs/encryption": "^6.0.0",
-    "@adonisjs/events": "^9.0.0",
-    "@adonisjs/fold": "^10.0.1",
-    "@adonisjs/logger": "^6.0.1"
+    "@adonisjs/application": "^9.0.0-next.2",
+    "@adonisjs/encryption": "^7.0.0-next.0",
+    "@adonisjs/events": "^10.1.0-next.1",
+    "@adonisjs/fold": "^11.0.0-next.0",
+    "@adonisjs/logger": "^7.0.0-next.1",
+    "youch": "^4.1.0-beta.11"
+  },
+  "peerDependenciesMeta": {
+    "youch": {
+      "optional": true
+    }
   },
   "repository": {
     "type": "git",
@@ -163,6 +173,7 @@
     ],
     "exclude": [
       "tests/**",
+      "bin/**",
       "factories/**",
       ".yalc/**"
     ]
@@ -171,6 +182,7 @@
   "tsup": {
     "entry": [
       "./index.ts",
+      "./src/helpers.ts",
       "./src/types/main.ts",
       "./factories/main.ts"
     ],
@@ -178,7 +190,7 @@
     "clean": true,
     "format": "esm",
     "dts": false,
-    "sourcemap": true,
+    "sourcemap": false,
     "target": "esnext"
   }
 }