@deepkit/http 1.0.1-alpha.98 → 1.0.2

package/dist/cjs/src/kernel.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpKernel = void 0;
 /*@ts-ignore*/
 const { __ΩLoggerInterface } = require('@deepkit/logger');
+function __assignType(fn, args) {
+    fn.__type = args;
+    return fn;
+}
 const injector_1 = require("@deepkit/injector");
 const router_js_1 = require("./router.js");
 const event_1 = require("@deepkit/event");
@@ -11,6 +15,8 @@ const http_js_1 = require("./http.js");
 const stopwatch_1 = require("@deepkit/stopwatch");
 const fs_1 = require("fs");
 const type_1 = require("@deepkit/type");
+const __ΩHttpKernelHandleOptions = ['throwOnNotFound', 'HttpKernelHandleOptions', 'P)4!8Mw"y'];
+const __ΩHttpKernelMiddlewareOptions = [() => __ΩHttpKernelHandleOptions, 'fallThroughOnNotFound', 'HttpKernelMiddlewareOptions', 'Pn!)4"8Mw#y'];
 class HttpKernel {
     constructor(router, eventDispatcher, injectorContext, logger, stopwatch) {
         this.router = router;
@@ -19,24 +25,65 @@ class HttpKernel {
         this.logger = logger;
         this.stopwatch = stopwatch;
     }
-    async request(requestBuilder) {
+    /**
+     * Creates a request handler function that can be used with http.createServer
+     * or any other http server library based on the node.js http module.
+     *
+     * When `fallThroughOnNotFound` is set to true, the handler will call `next()`
+     * when the route is not found, allowing the request to fall through to the next
+     * middleware in the chain.
+     *
+     * @example
+     * ```typescript
+     * import { createServer } from 'http';
+     *
+     * const app = new App({
+     *   imports: [new HttpModule({})],
+     * });
+     *
+     * const handler = app.get(HttpKernel).createMiddleware({ fallThroughOnNotFound: true });
+     * const server = createServer(handler);
+     *
+     * server.listen(3000);
+     * ```
+     */
+    createMiddleware(options = {}) {
+        if (options.fallThroughOnNotFound && 'undefined' === typeof options.throwOnNotFound) {
+            options.throwOnNotFound = true;
+        }
+        return __assignType((req, res, next) => {
+            return this.handleRequest(req, res, options).then(() => {
+                next();
+            }).catch(__assignType((error) => {
+                if (options.fallThroughOnNotFound && error instanceof http_js_1.HttpError && error.httpCode === 404) {
+                    next();
+                    return;
+                }
+                next(error);
+            }, ['error', '', 'P"2!"/"']));
+        }, ['req', 'res', 'error', '', 'next', 'P!2!!2"P"2#8$/$2%"/$']);
+    }
+    async request(requestBuilder, options = {}) {
         const request = requestBuilder.build();
         const response = new model_js_1.MemoryHttpResponse(request);
         response.assignSocket(request.socket);
-        await this.handleRequest(request, response);
+        await this.handleRequest(request, response, options);
         return response;
     }
-    async handleRequest(req, res) {
+    async handleRequest(_req, _res, options = {}) {
         const httpInjectorContext = this.injectorContext.createChildScope('http');
+        const req = (0, model_js_1.incomingMessageToHttpRequest)(_req);
+        const res = (0, model_js_1.serverResponseToHttpResponse)(_res);
         httpInjectorContext.set(model_js_1.HttpRequest, req);
         httpInjectorContext.set(model_js_1.HttpResponse, res);
         httpInjectorContext.set(injector_1.InjectorContext, httpInjectorContext);
+        req.throwErrorOnNotFound = options.throwOnNotFound || false;
         const frame = this.stopwatch ? this.stopwatch.start(req.method + ' ' + req.getUrl(), stopwatch_1.FrameCategory.http, true) : undefined;
         const workflow = http_js_1.httpWorkflow.create('start', this.eventDispatcher, httpInjectorContext, this.stopwatch);
         try {
             if (frame) {
                 frame.data({ url: req.getUrl(), method: req.getMethod(), clientIp: req.getRemoteAddress() });
-                await frame.run({}, () => workflow.apply('request', new http_js_1.HttpRequestEvent(httpInjectorContext, req, res)));
+                await frame.run(() => workflow.apply('request', new http_js_1.HttpRequestEvent(httpInjectorContext, req, res)));
             }
             else {
                 await workflow.apply('request', new http_js_1.HttpRequestEvent(httpInjectorContext, req, res));
@@ -48,13 +95,16 @@ class HttpKernel {
                 if (error instanceof type_1.ValidationError) {
                     resultFormatter.handle(new http_js_1.JSONResponse({
                         message: error.message,
-                        errors: error.errors
+                        errors: error.errors,
                     }, 400).disableAutoSerializing(), { request: req, response: res });
                     return;
                 }
                 else if (error instanceof http_js_1.HttpError) {
+                    if (req.throwErrorOnNotFound && error.httpCode === 404) {
+                        throw error;
+                    }
                     resultFormatter.handle(new http_js_1.JSONResponse({
-                        message: error.message
+                        message: error.message,
                     }, error.httpCode).disableAutoSerializing(), { request: req, response: res });
                     return;
                 }
@@ -63,7 +113,7 @@ class HttpKernel {
             this.logger.error('HTTP kernel request failed', error);
         }
         finally {
-            for (const file of Object.values(req.uploadedFiles)) {
+            for (const file of Object.values(req.uploadedFiles || [])) {
                 (0, fs_1.unlink)(file.path, () => {
                 });
             }
@@ -75,5 +125,5 @@ class HttpKernel {
     }
 }
 exports.HttpKernel = HttpKernel;
-HttpKernel.__type = [() => router_js_1.HttpRouter, 'router', () => event_1.EventDispatcher, 'eventDispatcher', () => injector_1.InjectorContext, 'injectorContext', () => __ΩLoggerInterface, 'logger', () => stopwatch_1.Stopwatch, 'stopwatch', 'constructor', () => model_js_1.RequestBuilder, 'requestBuilder', () => model_js_1.MemoryHttpResponse, 'request', () => model_js_1.HttpRequest, 'req', () => model_js_1.HttpResponse, 'res', 'handleRequest', 'PP7!2"<P7#2$<P7%2&<n\'2(<P7)2*8<"0+PP7,2-P7.`0/PP7021P7223"045'];
+HttpKernel.__type = [() => router_js_1.HttpRouter, 'router', () => event_1.EventDispatcher, 'eventDispatcher', () => injector_1.InjectorContext, 'injectorContext', () => __ΩLoggerInterface, 'logger', () => stopwatch_1.Stopwatch, 'stopwatch', 'constructor', () => __ΩHttpKernelMiddlewareOptions, 'options', () => ({}), 'createMiddleware', () => model_js_1.RequestBuilder, 'requestBuilder', () => __ΩHttpKernelHandleOptions, () => ({}), () => model_js_1.MemoryHttpResponse, 'request', '_req', '_res', () => __ΩHttpKernelHandleOptions, () => ({}), 'handleRequest', 'HttpKernel', 'PP7!2"<P7#2$<P7%2&<n\'2(<P7)2*8<"0+Pn,2->."0/PP7021n22->3P74`05P!26!27n82->9$`0:5w;'];
 //# sourceMappingURL=kernel.js.map

package/dist/cjs/src/kernel.js.map

@@ -1 +1 @@
-{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../../src/kernel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../../src/kernel.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/logger.js

@@ -22,7 +22,8 @@ class HttpLogger {
         this.logger.log(event.request.connection.remoteAddress || '0.0.0.0', '-', event.request.method, `"${event.request.url}"`, event.response.statusCode, `"${event.request.headers.referer || ''}"`);
     }
 }
-HttpLogger.__type = [() => __ΩLoggerInterface, 'logger', 'constructor', () => http_js_1.httpWorkflow.onResponse.event, 'event', 'onHttpRequest', 'Pn!2";"0#Pi$2%"0&5'];
+exports.HttpLogger = HttpLogger;
+HttpLogger.__type = [() => __ΩLoggerInterface, 'logger', 'constructor', () => http_js_1.httpWorkflow.onResponse.event, 'event', 'onHttpRequest', 'HttpLogger', 'Pn!2";"0#Pi$2%"0&5w\''];
 __decorate([
     event_1.eventDispatcher.listen(http_js_1.httpWorkflow.onResponse, 101) //101 is right after 100 default listener
     ,
@@ -30,5 +31,4 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], HttpLogger.prototype, "onHttpRequest", null);
-exports.HttpLogger = HttpLogger;
 //# sourceMappingURL=logger.js.map

package/dist/cjs/src/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;uCAAgC,iBAAiB;AACjD,0CAAiD;AACjD,uCAAyC;AAEzC,MAAa,UAAU;IACnB,YAAoB,MAAuB;QAAvB,WAAM,GAAN,MAAM,CAAiB;IAC3C,CAAC;IAGD,aAAa,CAAC,KAA2C;QACrD,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,IAAI,SAAS,EAAE,GAAG,EACxD,KAAK,CAAC,OAAO,CAAC,MAAM,EACpB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,GAAG,EACxB,KAAK,CAAC,QAAQ,CAAC,UAAU,EACzB,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,GAAG,CAE7C,CAAC;IACN,CAAC;;qGATwC,UAAU,CAAC,KAAK;AADzD;IAAC,uBAAe,CAAC,MAAM,CAAC,sBAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,yCAAyC;;;;;+CAU9F;AAdL,gCAeC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;uCAAgC,iBAAiB;AACjD,0CAAiD;AACjD,uCAAyC;AAEzC,MAAa,UAAU;IACnB,YAAoB,MAAuB;QAAvB,WAAM,GAAN,MAAM,CAAiB;IAC3C,CAAC;IAGD,aAAa,CAAC,KAA2C;QACrD,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,IAAI,SAAS,EAAE,GAAG,EACxD,KAAK,CAAC,OAAO,CAAC,MAAM,EACpB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,GAAG,EACxB,KAAK,CAAC,QAAQ,CAAC,UAAU,EACzB,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,GAAG,CAE7C,CAAC;IACN,CAAC;;AAdL,gCAeC;qGAV4C,UAAU,CAAC,KAAK;AAAzD;IADC,uBAAe,CAAC,MAAM,CAAC,sBAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,yCAAyC;;;;;+CAU9F"}

package/dist/cjs/src/middleware.d.ts

@@ -2,7 +2,7 @@ import { ClassType } from '@deepkit/core';
 import { AppModule } from '@deepkit/app';
 import { HttpRequest, HttpResponse } from './model.js';
 import { InjectorModule } from '@deepkit/injector';
-export declare type HttpMiddlewareFn = (req: HttpRequest, res: HttpResponse, next: (err?: any) => void) => void | Promise<void>;
+export type HttpMiddlewareFn = (req: HttpRequest, res: HttpResponse, next: (err?: any) => void) => void | Promise<void>;
 export interface HttpMiddleware {
     execute: HttpMiddlewareFn;
 }
@@ -25,7 +25,7 @@ export declare class HttpMiddlewareConfig {
     excludeControllers: ClassType[];
     routeNames: string[];
     excludeRouteNames: string[];
-    timeout: number;
+    timeout?: number;
     modules: InjectorModule<any>[];
     selfModule: boolean;
     getClassTypes(): ClassType[];

package/dist/cjs/src/middleware.js

@@ -8,11 +8,11 @@ const app_1 = require("@deepkit/app");
 const type_1 = require("@deepkit/type");
 const model_js_1 = require("./model.js");
 const injector_1 = require("@deepkit/injector");
-const __ΩHttpMiddlewareFn = [() => model_js_1.HttpRequest, 'req', () => model_js_1.HttpResponse, 'res', 'err', '', 'next', 'PP7!2"P7#2$P"2%8$/&2\'P$$`J/&'];
+const __ΩHttpMiddlewareFn = [() => model_js_1.HttpRequest, 'req', () => model_js_1.HttpResponse, 'res', 'err', '', 'next', 'HttpMiddlewareFn', 'PP7!2"P7#2$P"2%8$/&2\'P$$`J/&w(y'];
 exports.__ΩHttpMiddlewareFn = __ΩHttpMiddlewareFn;
-const __ΩHttpMiddleware = [() => __ΩHttpMiddlewareFn, 'execute', 'Pn!4"M'];
+const __ΩHttpMiddleware = [() => __ΩHttpMiddlewareFn, 'execute', 'HttpMiddleware', 'Pn!4"Mw#y'];
 exports.__ΩHttpMiddleware = __ΩHttpMiddleware;
-const __ΩHttpMiddlewareRoute = ['path', 'pathRegExp', "GET", "HEAD", "POST", "PATCH", "PUT", "DELETE", "OPTIONS", "TRACE", 'httpMethod', 'category', 'excludeCategory', 'group', 'excludeGroup', 'P&4!8A4"8P.#.$.%.&.\'.(.).*J4+8&4,8&4-8&4.8&4/8M'];
+const __ΩHttpMiddlewareRoute = ['path', 'pathRegExp', "GET", "HEAD", "POST", "PATCH", "PUT", "DELETE", "OPTIONS", "TRACE", 'httpMethod', 'category', 'excludeCategory', 'group', 'excludeGroup', 'HttpMiddlewareRoute', 'P&4!8A4"8P.#.$.%.&.\'.(.).*J4+8&4,8&4-8&4.8&4/8Mw0y'];
 exports.__ΩHttpMiddlewareRoute = __ΩHttpMiddlewareRoute;
 class HttpMiddlewareConfig {
     constructor() {
@@ -24,7 +24,6 @@ class HttpMiddlewareConfig {
         this.excludeControllers = [];
         this.routeNames = [];
         this.excludeRouteNames = [];
-        this.timeout = 4000;
         this.modules = [];
         this.selfModule = false;
     }
@@ -38,7 +37,7 @@ class HttpMiddlewareConfig {
     }
 }
 exports.HttpMiddlewareConfig = HttpMiddlewareConfig;
-HttpMiddlewareConfig.__type = ['name', () => __ΩHttpMiddlewareFn, () => __ΩClassType, () => __ΩHttpMiddleware, 'middlewares', function () { return []; }, () => __ΩHttpMiddlewareRoute, 'routes', function () { return []; }, () => __ΩHttpMiddlewareRoute, 'excludeRoutes', function () { return []; }, 'order', function () { return 0; }, () => __ΩClassType, 'controllers', function () { return []; }, () => __ΩClassType, 'excludeControllers', function () { return []; }, 'routeNames', function () { return []; }, 'excludeRouteNames', function () { return []; }, 'timeout', function () { return 4000; }, () => injector_1.InjectorModule, 'modules', function () { return []; }, 'selfModule', function () { return false; }, () => __ΩClassType, 'getClassTypes', '&3!8Pn"n$o#"JF3%>&n\'F3(>)n*F3+>,\'3->.n/F30>1n2F33>4&F35>6&F37>8\'39>:P"7;F3<>=)3>>?Pn@F0A5'];
+HttpMiddlewareConfig.__type = ['name', () => __ΩHttpMiddlewareFn, () => __ΩClassType, () => __ΩHttpMiddleware, 'middlewares', function () { return []; }, () => __ΩHttpMiddlewareRoute, 'routes', function () { return []; }, () => __ΩHttpMiddlewareRoute, 'excludeRoutes', function () { return []; }, 'order', function () { return 0; }, () => __ΩClassType, 'controllers', function () { return []; }, () => __ΩClassType, 'excludeControllers', function () { return []; }, 'routeNames', function () { return []; }, 'excludeRouteNames', function () { return []; }, 'timeout', () => injector_1.InjectorModule, 'modules', function () { return []; }, 'selfModule', function () { return false; }, () => __ΩClassType, 'getClassTypes', 'HttpMiddlewareConfig', '&3!8Pn"n$o#"JF3%>&n\'F3(>)n*F3+>,\'3->.n/F30>1n2F33>4&F35>6&F37>8\'398P"7:F3;><)3=>>Pn?F0@5wA'];
 class HttpMiddlewareApi {
     constructor() {
         this.t = new HttpMiddlewareConfig;
@@ -91,6 +90,6 @@ class HttpMiddlewareApi {
     }
 }
 exports.HttpMiddlewareApi = HttpMiddlewareApi;
-HttpMiddlewareApi.__type = ['name', () => __ΩHttpMiddlewareFn, () => __ΩClassType, () => __ΩHttpMiddleware, 'middlewares', 'for', () => __ΩHttpMiddlewareRoute, 'routes', 'forRoutes', () => __ΩHttpMiddlewareRoute, 'excludeRoutes', 'names', 'forRouteNames', 'excludeRouteNames', 'timeout', () => __ΩClassType, 'controllers', 'forControllers', () => __ΩClassType, 'excludeControllers', 'order', () => app_1.AppModule, 'modules', 'forModules', 'forSelfModules', 'P&2!"0!PPn"n$o#"J@2%"0&Pn\'@2("0)Pn*@2("0+P&@2,"0-P&@2,"0.P\'2/"0/Pn0@21"02Pn3@21"04P\'25"05PP"76@27"08P"095'];
+HttpMiddlewareApi.__type = ['t', function () { return new HttpMiddlewareConfig; }, 'name', () => __ΩHttpMiddlewareFn, () => __ΩClassType, () => __ΩHttpMiddleware, 'middlewares', 'for', () => __ΩHttpMiddlewareRoute, 'routes', 'forRoutes', () => __ΩHttpMiddlewareRoute, 'excludeRoutes', 'names', 'forRouteNames', 'excludeRouteNames', 'timeout', () => __ΩClassType, 'controllers', 'forControllers', () => __ΩClassType, 'excludeControllers', 'order', () => app_1.AppModule, 'modules', 'forModules', 'forSelfModules', 'HttpMiddlewareApi', '!3!>"P&2#"0#PPn$n&o%"J@2\'"0(Pn)@2*"0+Pn,@2*"0-P&@2."0/P&@2."00P\'21"01Pn2@23"04Pn5@23"06P\'27"07PP"78@29"0:P"0;5w<'];
 exports.httpMiddleware = (0, type_1.createFreeDecoratorContext)(HttpMiddlewareApi);
 //# sourceMappingURL=middleware.js.map

package/dist/cjs/src/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/middleware.ts"],"names":[],"mappings":";;;;iCAAmC,eAAe;AAAlD,wCAAmD;AACnD,sCAAyC;AACzC,wCAA2D;AAC3D,yCAAuD;AACvD,gDAAmD;;;;;;;AAkBnD,MAAa,oBAAoB;IAAjC;QAEI,gBAAW,GAAqD,EAAE,CAAC;QAEnE,WAAM,GAA0B,EAAE,CAAC;QACnC,kBAAa,GAA0B,EAAE,CAAC;QAE1C,UAAK,GAAW,CAAC,CAAC;QAElB,gBAAW,GAAgB,EAAE,CAAC;QAC9B,uBAAkB,GAAgB,EAAE,CAAC;QAErC,eAAU,GAAa,EAAE,CAAC;QAC1B,sBAAiB,GAAa,EAAE,CAAC;QAEjC,YAAO,GAAW,IAAK,CAAC;QAExB,YAAO,GAA0B,EAAE,CAAC;QAEpC,eAAU,GAAY,KAAK,CAAC;KAU/B;IARG,aAAa;QACT,MAAM,UAAU,GAAgB,EAAE,CAAC;QACnC,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE;YACvC,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC;gBAAE,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACxD;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;;AA5BL,oDA6BC;mJA3BmE,EAAE,kEAElC,EAAE,yEACK,EAAE,mCAEzB,CAAC,6DAEU,EAAE,oEACK,EAAE,wCAEb,EAAE,+CACK,EAAE,qCAEd,IAAK,sEAEU,EAAE,wCAEb,KAAK;AAY/B,MAAa,iBAAiB;IAA9B;QACI,MAAC,GAAG,IAAI,oBAAoB,CAAC;KA2DhC;IAzDG,IAAI,CAAC,IAAY;QACb,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,GAAG,WAA6D;QAChE,IAAI,CAAC,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,GAAG,MAA6B;QACtC,IAAI,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC;IAC3B,CAAC;IAED,aAAa,CAAC,GAAG,MAA6B;QAC1C,IAAI,CAAC,CAAC,CAAC,aAAa,GAAG,MAAM,CAAC;IAClC,CAAC;IAED,aAAa,CAAC,GAAG,KAAe;QAC5B,IAAI,CAAC,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,iBAAiB,CAAC,GAAG,KAAe;QAChC,IAAI,CAAC,CAAC,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,OAAe;QACnB,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;IAC7B,CAAC;IAED,cAAc,CAAC,GAAG,WAAwB;QACtC,IAAI,CAAC,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC;IACrC,CAAC;IAED,kBAAkB,CAAC,GAAG,WAAwB;QAC1C,IAAI,CAAC,CAAC,CAAC,kBAAkB,GAAG,WAAW,CAAC;IAC5C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAa;QACf,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,UAAU,CAAC,GAAG,OAAyB;QACnC,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,cAAc;QACV,IAAI,CAAC,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC;IAC7B,CAAC;;AA3DL,8CA4DC;;AAEY,QAAA,cAAc,GAAG,IAAA,iCAA0B,EAAC,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/middleware.ts"],"names":[],"mappings":";;;;iCAAmC,eAAe;AAAlD,wCAAmD;AACnD,sCAAyC;AACzC,wCAA2D;AAC3D,yCAAuD;AACvD,gDAAmD;;;;;;;AAkBnD,MAAa,oBAAoB;IAAjC;QAEI,gBAAW,GAAqD,EAAE,CAAC;QAEnE,WAAM,GAA0B,EAAE,CAAC;QACnC,kBAAa,GAA0B,EAAE,CAAC;QAE1C,UAAK,GAAW,CAAC,CAAC;QAElB,gBAAW,GAAgB,EAAE,CAAC;QAC9B,uBAAkB,GAAgB,EAAE,CAAC;QAErC,eAAU,GAAa,EAAE,CAAC;QAC1B,sBAAiB,GAAa,EAAE,CAAC;QAIjC,YAAO,GAA0B,EAAE,CAAC;QAEpC,eAAU,GAAY,KAAK,CAAC;KAU/B;IARG,aAAa;QACT,MAAM,UAAU,GAAgB,EAAE,CAAC;QACnC,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACxC,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC;gBAAE,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;;AA5BL,oDA6BC;mJA3BmE,EAAE,kEAElC,EAAE,yEACK,EAAE,mCAEzB,CAAC,6DAEU,EAAE,oEACK,EAAE,wCAEb,EAAE,+CACK,EAAE,iFAIC,EAAE,wCAEb,KAAK;AAY/B,MAAa,iBAAiB;IAA9B;QACI,MAAC,GAAG,IAAI,oBAAoB,CAAC;KA2DhC;IAzDG,IAAI,CAAC,IAAY;QACb,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,GAAG,WAA6D;QAChE,IAAI,CAAC,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,GAAG,MAA6B;QACtC,IAAI,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC;IAC3B,CAAC;IAED,aAAa,CAAC,GAAG,MAA6B;QAC1C,IAAI,CAAC,CAAC,CAAC,aAAa,GAAG,MAAM,CAAC;IAClC,CAAC;IAED,aAAa,CAAC,GAAG,KAAe;QAC5B,IAAI,CAAC,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,iBAAiB,CAAC,GAAG,KAAe;QAChC,IAAI,CAAC,CAAC,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,OAAe;QACnB,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;IAC7B,CAAC;IAED,cAAc,CAAC,GAAG,WAAwB;QACtC,IAAI,CAAC,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC;IACrC,CAAC;IAED,kBAAkB,CAAC,GAAG,WAAwB;QAC1C,IAAI,CAAC,CAAC,CAAC,kBAAkB,GAAG,WAAW,CAAC;IAC5C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAa;QACf,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,UAAU,CAAC,GAAG,OAAyB;QACnC,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,cAAc;QACV,IAAI,CAAC,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC;IAC7B,CAAC;;AA3DL,8CA4DC;sDA3DO,IAAI,oBAAoB;AA6DnB,QAAA,cAAc,GAAG,IAAA,iCAA0B,EAAC,iBAAiB,CAAC,CAAC"}

package/dist/cjs/src/model.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { IncomingMessage, OutgoingHttpHeader, OutgoingHttpHeaders, ServerResponse } from 'http';
 import { UploadedFile } from './router.js';
 import { Type, ValidationErrorItem } from '@deepkit/type';
+import { TypeAnnotation } from '@deepkit/core';
 export declare class HttpResponse extends ServerResponse {
     status(code: number): void;
 }
@@ -14,13 +13,13 @@ export declare class HttpResponse extends ServerResponse {
  */
 export declare function readBody(request: IncomingMessage): Promise<Buffer>;
 export declare function createRequestWithCachedBody(request: Partial<IncomingMessage>, body: Buffer): HttpRequest;
-export declare type HttpRequestQuery = {
+export type HttpRequestQuery = {
     [name: string]: string;
 };
-export declare type HttpRequestResolvedParameters = {
+export type HttpRequestResolvedParameters = {
     [name: string]: any;
 };
-export declare type HttpRequestPositionedParameters = {
+export type HttpRequestPositionedParameters = {
     arguments: any[];
     parameters: HttpRequestResolvedParameters;
 };
@@ -40,32 +39,153 @@ export declare class ValidatedBody<T> {
         value: T;
     };
 }
-export declare type HttpBody<T> = T & {
-    __meta?: ['httpBody'];
-};
-export declare type HttpBodyValidation<T> = ValidatedBody<T> & {
-    __meta?: ['httpBodyValidation'];
-};
-export declare type HttpPath<T, Options extends {
+/**
+ * Marks a parameter as HTTP body and reads the value from the request body.
+ *
+ * @example
+ * ```typescript
+ * class Controller {
+ *   @http.GET('/api')
+ *   route(body: HttpBody<{username: string}>) {
+ *     //body is {username: string} and required
+ *     //could also reference an interface or type alias via `HttpBody<MyInterface>`
+ *   }
+ * }
+ *
+ * // curl /api -d '{"username":"Peter"}'
+ */
+export type HttpBody<T> = T & TypeAnnotation<'httpBody'>;
+export type HttpBodyValidation<T> = ValidatedBody<T> & TypeAnnotation<'httpBodyValidation'>;
+export interface HttpRequestParserOptions {
+    withPath?: boolean;
+    withBody?: boolean;
+    withQuery?: boolean;
+    withHeader?: boolean;
+}
+/**
+ * Delays the parsing of the path/body/query/header to the very last moment, when the parameter is actually used.
+ *
+ * If no options are provided, the parser will receive data from path, header, body, and query, in this order.
+ * This basically allows to fetch data from all possible HTTP sources in one go.
+ *
+ * You can disable various sources by providing the options, e.g. `{withBody: false}` to disable body parsing.
+ * Or `{withQuery: false}` to disable query parsing. Or `{withHeader: false}` to disable header parsing.
+ * To only parse the body, use `{withQuery: false, withHeader: false}`.
+ *
+ * @example
+ * ```typescript
+ * async route(parser: HttpRequestParser<{authorization: string}>) {
+ *    const data = await parser();
+ *    console.log(data.authorization);
+ * }
+ * ```
+ *
+ * Note that the parsers is based on all defined parameters (e.g. `userId: HttpQuery<string>` => {userId: string}),
+ * and then starts from there applying header, body, and then query values.
+ * This means you also get access to defined path parameters, like:
+ *
+ * ```typescript
+ * @http.GET('teams/:teamId')
+ * async route(teamId: string) {
+ *    //teamId is string
+ * }
+ *
+ * httpWorkflow.onController.listen((event, parser: HttpRequestParser<{teamId: string}>) => {
+ *  const data = await parser();
+ *  console.log(data.teamId);
+ * });
+ * ```
+ *
+ * HttpRequestParser is necessary in event listeners, since they are instantiated synchronously,
+ * but body is parsed asynchronously. So use in event listeners HttpRequestParser instead of HttpBody.
+ */
+export type HttpRequestParser<T> = ((options?: HttpRequestParserOptions) => Promise<T>) & TypeAnnotation<'httpRequestParser', T>;
+/**
+ * Marks a parameter as HTTP path and reads the value from the request path.
+ * This is normally not requires since the parameter name automatically maps to the path parameter,
+ * but in case of requesting the path parameter in for example listeners, this is required.
+ * The name option can be used to change the parameter name.
+ *
+ * @example
+ * ```typescript
+ * app.listen(httpWorkflow.onController, (event, request: HttpRequest, groupId: HttpPath<number>) => {
+ *   console.log(groupId); //123
+ * });
+ *
+ * class Controller {
+ *   @http.GET('/api/:groupId')
+ *   route(groupId: number) {
+ *     //groupId is number and required
+ *     //same as `groupId: HttpPath<number>`
+ *   }
+ * }
+ * ```
+ */
+export type HttpPath<T, Options extends {
     name?: string;
-} = {}> = T & {
-    __meta?: ['httpPath', Options];
-};
-export declare type HttpHeader<T, Options extends {
+} = {}> = T & TypeAnnotation<'httpPath', Options>;
+/**
+ * Marks a parameter as HTTP header and reads the value from the request header.
+ *
+ * @example
+ * ```typescript
+ * class Controller {
+ *    @http.GET('/api')
+ *    route(authorization: HttpHeader<string>) {
+ *         //authorization is string and required
+ *         //use `authorization?: HttpHeader<string>` to make it optional
+ *    }
+ * }
+ *
+ * // curl /api -H 'Authorization: 123'
+ * ```
+ *
+ * To change the header name, use `param: HttpHeader<string, {name: 'X-My-Header'}>`.
+ */
+export type HttpHeader<T, Options extends {
     name?: string;
-} = {}> = T & {
-    __meta?: ['httpHeader', Options];
-};
-export declare type HttpQuery<T, Options extends {
+} = {}> = T & TypeAnnotation<'httpHeader', Options>;
+/**
+ * Marks a parameter as HTTP query and reads the value from the request query string.
+ *
+ * @example
+ * ```typescript
+ * class Controller {
+ *   @http.GET('/api')
+ *   route(limit: HttpQuery<number>) {
+ *      //limit is number and required
+ *      //use `limit?: HttpQuery<number>` to make it optional
+ *   }
+ * }
+ *
+ * // curl /api?limit=10
+ * ```
+ */
+export type HttpQuery<T, Options extends {
     name?: string;
-} = {}> = T & {
-    __meta?: ['httpQuery', Options];
-};
-export declare type HttpQueries<T, Options extends {
+} = {}> = T & TypeAnnotation<'httpQuery', Options>;
+/**
+ * Marks a parameter as HTTP query objects and reads multiple values from the request query string into an object.
+ *
+ * @example
+ * ```typescript
+ * interface Query {
+ *    limit?: number;
+ *    offset?: number;
+ *    sort?: 'asc' | 'desc';
+ * }
+ *
+ * class Controller {
+ *  @http.GET('/api')
+ *  route(query: HttpQueries<Query>) {
+ *    //query is an object containing limit, offset, and sort
+ * }
+ *
+ * // curl /api?limit=10&offset=20&sort=asc
+ */
+export type HttpQueries<T, Options extends {
     name?: string;
-} = {}> = T & {
-    __meta?: ['httpQueries', Options];
-};
+} = {}> = T & TypeAnnotation<'httpQueries', Options>;
 /**
  * For all parameters used in the URL path, a regular expression of /[^/]+/ is used. To change that, use getRegExp.
  *
@@ -80,9 +200,7 @@ export declare type HttpQueries<T, Options extends {
  * }
  * ```
  */
-export declare type HttpRegExp<T, Pattern extends string | RegExp> = T & {
-    __meta?: ['httpRegExp', Pattern];
-};
+export type HttpRegExp<T, Pattern extends string | RegExp> = T & TypeAnnotation<'httpRegExp', Pattern>;
 export declare function getRegExp(type: Type): string | RegExp | undefined;
 export declare class RequestBuilder {
     protected path: string;
@@ -107,7 +225,7 @@ export declare class RequestBuilder {
         json?: any;
     }[]): this;
     body(body: string | Buffer): this;
-    query(query: any): this;
+    query(query: any | string): this;
 }
 export declare class HttpRequest extends IncomingMessage {
     /**
@@ -119,6 +237,7 @@ export declare class HttpRequest extends IncomingMessage {
     uploadedFiles: {
         [name: string]: UploadedFile;
     };
+    throwErrorOnNotFound: boolean;
     /**
      * The router sets the body when it was read.
      */
@@ -137,6 +256,8 @@ export declare class HttpRequest extends IncomingMessage {
     getMethod(): string;
     getRemoteAddress(): string;
 }
+export declare function incomingMessageToHttpRequest(request: IncomingMessage): HttpRequest;
+export declare function serverResponseToHttpResponse(response: ServerResponse): HttpResponse;
 export declare class MemoryHttpResponse extends HttpResponse {
     body: Buffer;
     headers: {
@@ -158,6 +279,8 @@ export declare type __ΩHttpRequestResolvedParameters = any[];
 export declare type __ΩHttpRequestPositionedParameters = any[];
 export declare type __ΩHttpBody = any[];
 export declare type __ΩHttpBodyValidation = any[];
+export declare type __ΩHttpRequestParserOptions = any[];
+export declare type __ΩHttpRequestParser = any[];
 export declare type __ΩHttpPath = any[];
 export declare type __ΩHttpHeader = any[];
 export declare type __ΩHttpQuery = any[];