@adonisjs/http-server 7.7.0 → 8.0.0-next.1

package/build/factories/http_context.d.ts

@@ -1,7 +1,7 @@
 import type { Logger } from '@adonisjs/logger';
-import type { Request } from '../src/request.js';
-import type { Response } from '../src/response.js';
-import { HttpContext } from '../src/http_context/main.js';
+import type { Request } from '../src/request.ts';
+import type { Response } from '../src/response.ts';
+import { HttpContext } from '../src/http_context/main.ts';
 type FactoryParameters = {
     request: Request;
     response: Response;

package/build/factories/http_server.d.ts

@@ -1,4 +1,4 @@
-import { IncomingMessage, Server, ServerResponse } from 'node:http';
+import { type IncomingMessage, type Server, type ServerResponse } from 'node:http';
 export declare const httpServer: {
     create(handler: (req: IncomingMessage, res: ServerResponse) => any | Promise<any>): Promise<{
         server: Server;

package/build/factories/main.d.ts

@@ -1,6 +1,6 @@
-export { HttpContextFactory } from './http_context.js';
-export { QsParserFactory } from './qs_parser_factory.js';
-export { RequestFactory } from './request.js';
-export { ResponseFactory } from './response.js';
-export { RouterFactory } from './router.js';
-export { ServerFactory } from './server_factory.js';
+export { RouterFactory } from './router.ts';
+export { RequestFactory } from './request.ts';
+export { ResponseFactory } from './response.ts';
+export { ServerFactory } from './server_factory.ts';
+export { HttpContextFactory } from './http_context.ts';
+export { QsParserFactory } from './qs_parser_factory.ts';

package/build/factories/main.js

@@ -6,16 +6,11 @@ import {
   Router,
   Server,
   defineConfig
-} from "../chunk-6FSCILWX.js";
+} from "../chunk-HMYAZG76.js";
+import "../chunk-ASX56VAK.js";
 
-// factories/http_context.ts
-import { Container } from "@adonisjs/fold";
-import { LoggerFactory } from "@adonisjs/logger/factories";
-
-// factories/request.ts
-import { Socket } from "net";
-import proxyAddr from "proxy-addr";
-import { IncomingMessage, ServerResponse } from "http";
+// factories/router.ts
+import { AppFactory } from "@adonisjs/application/factories";
 import { EncryptionFactory } from "@adonisjs/encryption/factories";
 
 // factories/qs_parser_factory.ts
@@ -51,7 +46,43 @@ var QsParserFactory = class {
   }
 };
 
+// factories/router.ts
+var RouterFactory = class {
+  #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());
+  }
+};
+
 // factories/request.ts
+import { Socket } from "net";
+import proxyAddr from "proxy-addr";
+import { randomUUID } from "crypto";
+import { IncomingMessage, ServerResponse } from "http";
+import { EncryptionFactory as EncryptionFactory2 } from "@adonisjs/encryption/factories";
 var RequestFactory = class {
   #parameters = {};
   /**
@@ -63,6 +94,9 @@ var RequestFactory = class {
       trustProxy: proxyAddr.compile("loopback"),
       subdomainOffset: 2,
       generateRequestId: false,
+      createRequestId() {
+        return randomUUID();
+      },
       ...this.#parameters.config
     };
   }
@@ -90,7 +124,7 @@ var RequestFactory = class {
    * signed URLs
    */
   #createEncryption() {
-    return this.#parameters.encryption || new EncryptionFactory().create();
+    return this.#parameters.encryption || new EncryptionFactory2().create();
   }
   /**
    * Merge factory params
@@ -118,41 +152,6 @@ var RequestFactory = class {
 import { Socket as Socket2 } from "net";
 import { IncomingMessage as IncomingMessage2, ServerResponse as ServerResponse2 } from "http";
 import { EncryptionFactory as EncryptionFactory3 } from "@adonisjs/encryption/factories";
-
-// factories/router.ts
-import { AppFactory } from "@adonisjs/application/factories";
-import { EncryptionFactory as EncryptionFactory2 } from "@adonisjs/encryption/factories";
-var RouterFactory = class {
-  #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 EncryptionFactory2().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());
-  }
-};
-
-// factories/response.ts
 var ResponseFactory = class {
   #parameters = {};
   /**
@@ -220,47 +219,6 @@ var ResponseFactory = class {
   }
 };
 
-// factories/http_context.ts
-var HttpContextFactory = class {
-  #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()
-    );
-  }
-};
-
 // factories/server_factory.ts
 import { Logger } from "@adonisjs/logger";
 import { Emitter } from "@adonisjs/events";
@@ -319,6 +277,49 @@ var ServerFactory = class {
     );
   }
 };
+
+// factories/http_context.ts
+import { Container } from "@adonisjs/fold";
+import { LoggerFactory } from "@adonisjs/logger/factories";
+var HttpContextFactory = class {
+  #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()
+    );
+  }
+};
 export {
   HttpContextFactory,
   QsParserFactory,
@@ -327,4 +328,3 @@ export {
   RouterFactory,
   ServerFactory
 };
-//# sourceMappingURL=main.js.map

package/build/factories/qs_parser_factory.d.ts

@@ -1,5 +1,5 @@
-import { Qs } from '../src/qs.js';
-import type { QSParserConfig } from '../src/types/qs.js';
+import { Qs } from '../src/qs.ts';
+import type { QSParserConfig } from '../src/types/qs.ts';
 /**
  * QS Parser factory is used to generate the query string
  * parser for testing

package/build/factories/request.d.ts

@@ -1,7 +1,7 @@
 import type { Encryption } from '@adonisjs/encryption';
 import { IncomingMessage, ServerResponse } from 'node:http';
-import { Request } from '../src/request.js';
-import { RequestConfig } from '../src/types/request.js';
+import { Request } from '../src/request.ts';
+import { type RequestConfig } from '../src/types/request.ts';
 type FactoryParameters = {
     url: string;
     method: string;

package/build/factories/response.d.ts

@@ -1,8 +1,8 @@
 import type { Encryption } from '@adonisjs/encryption';
 import { IncomingMessage, ServerResponse } from 'node:http';
-import { Response } from '../src/response.js';
-import { Router } from '../src/router/main.js';
-import { ResponseConfig } from '../src/types/response.js';
+import { Response } from '../src/response.ts';
+import { type Router } from '../src/router/main.ts';
+import { type ResponseConfig } from '../src/types/response.ts';
 type FactoryParameters = {
     req: IncomingMessage;
     res: ServerResponse;

package/build/factories/router.d.ts

@@ -1,6 +1,6 @@
 import type { Encryption } from '@adonisjs/encryption';
 import type { Application } from '@adonisjs/application';
-import { Router } from '../src/router/main.js';
+import { Router } from '../src/router/main.ts';
 type FactoryParameters = {
     app: Application<any>;
     encryption: Encryption;

package/build/factories/server_factory.d.ts

@@ -2,8 +2,8 @@ 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';
+import { Server } from '../src/server/main.ts';
+import type { ServerConfig } from '../src/types/server.ts';
 type FactoryParameters = {
     app: Application<any>;
     logger: Logger;

package/build/factories/url_builder_factory.d.ts

@@ -0,0 +1,25 @@
+import type { Encryption } from '@adonisjs/encryption';
+import type { Router } from '../src/router/main.ts';
+import { type LookupList } from '../src/types/url_builder.ts';
+type FactoryParameters = {
+    router: Router;
+    encryption: Encryption;
+};
+/**
+ * URLBuilderFactory is used to create route and signed route helpers
+ */
+export declare class URLBuilderFactory<Routes extends LookupList> {
+    #private;
+    /**
+     * Merge factory params
+     */
+    merge(params: Partial<FactoryParameters>): this;
+    /**
+     * Create URL builder helpers
+     */
+    create(): {
+        urlFor: import("../src/types/url_builder.ts").UrlFor<Routes>;
+        signedUrlFor: import("../src/types/url_builder.ts").UrlFor<Routes, import("../src/types/url_builder.ts").SignedURLOptions>;
+    };
+}
+export {};

package/build/index.d.ts

@@ -1,15 +1,16 @@
-export { Request } from './src/request.js';
-export { Response } from './src/response.js';
-export { ResponseStatus } from './src/response_status.js';
-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 { CookieClient } from './src/cookies/client.js';
-export { HttpContext } from './src/http_context/main.js';
-export { RouteResource } from './src/router/resource.js';
-export { ExceptionHandler } from './src/exception_handler.js';
+export * as errors from './src/errors.ts';
+export { Request } from './src/request.ts';
+export { Response } from './src/response.ts';
+export { Redirect } from './src/redirect.ts';
+export { Server } from './src/server/main.ts';
+export { Router } from './src/router/main.ts';
+export { Route } from './src/router/route.ts';
+export { BriskRoute } from './src/router/brisk.ts';
+export { RouteGroup } from './src/router/group.ts';
+export { defineConfig } from './src/define_config.ts';
+export { CookieClient } from './src/cookies/client.ts';
+export { HttpContext } from './src/http_context/main.ts';
+export { RouteResource } from './src/router/resource.ts';
+export { ResponseStatus } from './src/response_status.ts';
+export { ExceptionHandler } from './src/exception_handler.ts';
+export * as tracingChannels from './src/tracing_channels.ts';

package/build/index.js

@@ -15,10 +15,13 @@ import {
   RouteResource,
   Router,
   Server,
+  canWriteResponseBody,
   defineConfig,
-  exceptions_exports,
-  parseRange
-} from "./chunk-6FSCILWX.js";
+  errors_exports,
+  parseRange,
+  tracing_channels_exports
+} from "./chunk-HMYAZG76.js";
+import "./chunk-ASX56VAK.js";
 
 // src/exception_handler.ts
 import is from "@sindresorhus/is";
@@ -149,9 +152,9 @@ var ExceptionHandler = class extends Macroable {
    */
   async renderErrorAsJSON(error, ctx) {
     if (this.isDebuggingEnabled(ctx)) {
-      const { default: Youch } = await import("youch");
-      const json = await new Youch(error, ctx.request.request).toJSON();
-      ctx.response.status(error.status).send(json.error);
+      const { Youch } = await import("youch");
+      const json = await new Youch().toJSON(error);
+      ctx.response.status(error.status).send(json);
       return;
     }
     ctx.response.status(error.status).send({ message: error.message });
@@ -161,9 +164,9 @@ var ExceptionHandler = class extends Macroable {
    */
   async renderErrorAsJSONAPI(error, ctx) {
     if (this.isDebuggingEnabled(ctx)) {
-      const { default: Youch } = await import("youch");
-      const json = await new Youch(error, ctx.request.request).toJSON();
-      ctx.response.status(error.status).send(json.error);
+      const { Youch } = await import("youch");
+      const json = await new Youch().toJSON(error);
+      ctx.response.status(error.status).send(json);
       return;
     }
     ctx.response.status(error.status).send({
@@ -180,9 +183,18 @@ var ExceptionHandler = class extends Macroable {
    * Renders an error to HTML response
    */
   async renderErrorAsHTML(error, ctx) {
+    const statusPages = this.#expandStatusPages();
+    if (this.renderStatusPages && statusPages[error.status]) {
+      const statusPageResponse = await statusPages[error.status](error, ctx);
+      if (canWriteResponseBody(statusPageResponse, ctx)) {
+        return ctx.response.safeStatus(error.status).send(statusPageResponse);
+      }
+      return statusPageResponse;
+    }
     if (this.isDebuggingEnabled(ctx)) {
-      const { default: Youch } = await import("youch");
-      const html = await new Youch(error, ctx.request.request).toHTML({
+      const { Youch } = await import("youch");
+      const html = await new Youch().toHTML(error, {
+        request: ctx.request.request,
         cspNonce: "nonce" in ctx.response ? ctx.response.nonce : void 0
       });
       ctx.response.status(error.status).send(html);
@@ -288,16 +300,6 @@ var ExceptionHandler = class extends Macroable {
     if (httpError.code === "E_VALIDATION_ERROR" && "messages" in httpError) {
       return this.renderValidationError(httpError, ctx);
     }
-    const statusPages = this.#expandStatusPages();
-    if (this.renderStatusPages && statusPages[httpError.status]) {
-      const statusPageResponse = await statusPages[httpError.status](httpError, ctx);
-      if (statusPageResponse !== void 0 && // Return value is explicitly defined
-      !ctx.response.hasLazyBody && // Lazy body is not set
-      statusPageResponse !== ctx.response) {
-        return ctx.response.safeStatus(httpError.status).send(statusPageResponse);
-      }
-      return statusPageResponse;
-    }
     return this.renderError(httpError, ctx);
   }
 };
@@ -316,6 +318,6 @@ export {
   Router,
   Server,
   defineConfig,
-  exceptions_exports as errors
+  errors_exports as errors,
+  tracing_channels_exports as tracingChannels
 };
-//# sourceMappingURL=index.js.map

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

@@ -17,7 +17,7 @@ export declare class CookieClient {
     /**
      * Encode a key value pair to be sent in the cookie header
      */
-    encode(_: string, value: any): string | null;
+    encode(_: string, value: any, stringify?: boolean): string | null;
     /**
      * Unsign a signed cookie value
      */
@@ -29,7 +29,7 @@ export declare class CookieClient {
     /**
      * Decode an encoded cookie value
      */
-    decode(_: string, value: string): any;
+    decode(_: string, value: string, stringified?: boolean): any;
     /**
      * Parse response cookie
      */

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

@@ -14,10 +14,10 @@ export declare class CookieParser {
     constructor(cookieHeader: string, encryption: Encryption);
     /**
      * Attempts to decode a cookie by the name. When calling this method,
-     * you are assuming that the cookie was just encoded in the first
+     * you are assuming that the cookie was just stringified in the first
      * place and not signed or encrypted.
      */
-    decode(key: string, encoded?: boolean): any | null;
+    decode(key: string, stringified?: boolean): any | null;
     /**
      * Attempts to unsign a cookie by the name. When calling this method,
      * you are assuming that the cookie was signed in the first place.

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

@@ -1,5 +1,5 @@
 import type { Encryption } from '@adonisjs/encryption';
-import type { CookieOptions } from '../types/response.js';
+import type { CookieOptions } from '../types/response.ts';
 /**
  * Cookies serializer is used to serialize a value to be set on the `Set-Cookie`
  * header. You can `encode`, `sign` on `encrypt` cookies using the serializer
@@ -12,14 +12,20 @@ export declare class CookieSerializer {
      * Encodes value as a plain cookie. By default, the plain value will be converted
      * to a string using "JSON.stringify" method and then encoded as a base64 string.
      *
-     * You can disable encoding of the cookie by setting `options.encoded = false`.
+     * You can disable cookie stringifaction by setting `options.stringify = false`.
      *
      * ```ts
      *  serializer.encode('name', 'virk')
+     *  serializer.encode('name', 'virk', { stringify: false })
      * ```
      */
     encode(key: string, value: any, options?: Partial<CookieOptions & {
+        /**
+         * @depreacted
+         * Instead use stringify option
+         */
         encode: boolean;
+        stringify: boolean;
     }>): string | null;
     /**
      * Sign a key-value pair to a signed cookie. The signed value has a

package/build/src/define_config.d.ts

@@ -1,4 +1,4 @@
-import type { ServerConfig } from './types/server.js';
+import type { ServerConfig } from './types/server.ts';
 type DeepPartial<T> = {
     [P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : T[P];
 };

package/build/src/define_middleware.d.ts

@@ -1,12 +1,13 @@
-import type { LazyImport, UnWrapLazyImport } from './types/base.js';
-import type { GetMiddlewareArgs, MiddlewareAsClass, ParsedGlobalMiddleware } from './types/middleware.js';
+import type { LazyImport, UnWrapLazyImport } from '@poppinss/utils/types';
+import type { GetMiddlewareArgs, MiddlewareAsClass, ParsedGlobalMiddleware } from './types/middleware.ts';
 /**
  * Define an collection of named middleware. The collection gets converted
  * into a collection of factory functions. Calling the function returns
  * a reference to the executable middleware.
  */
-export declare function defineNamedMiddleware<NamedMiddleware extends Record<string | number | symbol, LazyImport<MiddlewareAsClass>>>(collection: NamedMiddleware): { [K in keyof NamedMiddleware]: <Args extends GetMiddlewareArgs<UnWrapLazyImport<NamedMiddleware[K]>>>(...args: Args) => {
+export declare function defineNamedMiddleware<NamedMiddleware extends Record<string, LazyImport<MiddlewareAsClass>>>(collection: NamedMiddleware): { [K in keyof NamedMiddleware]: <Args extends GetMiddlewareArgs<UnWrapLazyImport<NamedMiddleware[K]>>>(...args: Args) => {
     name: K;
+    reference: LazyImport<MiddlewareAsClass> | MiddlewareAsClass;
     args: Args[0];
     handle: ParsedGlobalMiddleware["handle"];
 }; };

package/build/src/{exceptions.d.ts → errors.d.ts}

@@ -1,7 +1,16 @@
-import { Exception } from '@poppinss/utils';
-import type { HttpContext } from './http_context/main.js';
+import { Exception } from '@poppinss/utils/exception';
+import type { HttpContext } from './http_context/main.ts';
+/**
+ * Thrown when unable to find a matching route for the given request
+ */
 export declare const E_ROUTE_NOT_FOUND: new (args: [method: string, url: string], options?: ErrorOptions) => Exception;
+/**
+ * Thrown when unable to lookup a route by its identifier.
+ */
 export declare const E_CANNOT_LOOKUP_ROUTE: new (args: [routeIdentifier: string], options?: ErrorOptions) => Exception;
+/**
+ * A generic HTTP exception to convert errors to HTTP response
+ */
 export declare const E_HTTP_EXCEPTION: {
     new (message?: string, options?: ErrorOptions & {
         code?: string;
@@ -13,7 +22,7 @@ export declare const E_HTTP_EXCEPTION: {
         code?: string;
         status: number;
         toString(): string;
-        readonly [Symbol.toStringTag]: string;
+        get [Symbol.toStringTag](): string;
         message: string;
         stack?: string;
         cause?: unknown;
@@ -29,7 +38,7 @@ export declare const E_HTTP_EXCEPTION: {
         code?: string;
         status: number;
         toString(): string;
-        readonly [Symbol.toStringTag]: string;
+        get [Symbol.toStringTag](): string;
         message: string;
         stack?: string;
         cause?: unknown;
@@ -37,10 +46,14 @@ export declare const E_HTTP_EXCEPTION: {
     help?: string;
     status?: number;
     message?: string;
+    isError(error: unknown): error is Error;
     captureStackTrace(targetObject: object, constructorOpt?: Function): void;
     prepareStackTrace(err: Error, stackTraces: NodeJS.CallSite[]): any;
     stackTraceLimit: number;
 };
+/**
+ * Thrown when the "response.abort" method is called
+ */
 export declare const E_HTTP_REQUEST_ABORTED: {
     new (message?: string, options?: ErrorOptions & {
         code?: string;
@@ -53,7 +66,7 @@ export declare const E_HTTP_REQUEST_ABORTED: {
         code?: string;
         status: number;
         toString(): string;
-        readonly [Symbol.toStringTag]: string;
+        get [Symbol.toStringTag](): string;
         message: string;
         stack?: string;
         cause?: unknown;
@@ -69,7 +82,7 @@ export declare const E_HTTP_REQUEST_ABORTED: {
         code?: string;
         status: number;
         toString(): string;
-        readonly [Symbol.toStringTag]: string;
+        get [Symbol.toStringTag](): string;
         message: string;
         stack?: string;
         cause?: unknown;
@@ -77,6 +90,7 @@ export declare const E_HTTP_REQUEST_ABORTED: {
     help?: string;
     status?: number;
     message?: string;
+    isError(error: unknown): error is Error;
     captureStackTrace(targetObject: object, constructorOpt?: Function): void;
     prepareStackTrace(err: Error, stackTraces: NodeJS.CallSite[]): any;
     stackTraceLimit: number;

package/build/src/exception_handler.d.ts

@@ -1,7 +1,7 @@
 import Macroable from '@poppinss/macroable';
 import type { Level } from '@adonisjs/logger/types';
-import type { HttpContext } from './http_context/main.js';
-import type { HttpError, StatusPageRange, StatusPageRenderer } from './types/server.js';
+import type { HttpContext } from './http_context/main.ts';
+import type { HttpError, StatusPageRange, StatusPageRenderer } from './types/server.ts';
 /**
  * The base HTTP exception handler one can inherit from to handle
  * HTTP exceptions.
@@ -79,7 +79,7 @@ export declare class ExceptionHandler extends Macroable {
     /**
      * Renders an error to HTML response
      */
-    renderErrorAsHTML(error: HttpError, ctx: HttpContext): Promise<void>;
+    renderErrorAsHTML(error: HttpError, ctx: HttpContext): Promise<any>;
     /**
      * Renders the validation error message to a JSON
      * response
@@ -97,7 +97,7 @@ export declare class ExceptionHandler extends Macroable {
     /**
      * Renders the error to response
      */
-    renderError(error: HttpError, ctx: HttpContext): Promise<void>;
+    renderError(error: HttpError, ctx: HttpContext): Promise<any>;
     /**
      * Renders the validation error to response
      */