@tsed/common 7.0.0-beta.10 → 7.0.0-beta.13

package/lib/esm/utils/createContext.js

@@ -2,26 +2,40 @@ import { PlatformContext } from "../domain/PlatformContext.js";
 import { PlatformRequest } from "../services/PlatformRequest.js";
 import { PlatformResponse } from "../services/PlatformResponse.js";
 import { v4 } from "uuid";
-const defaultReqIdBuilder = (req) => req.get("x-request-id") || v4().replace(/-/gi, "");
+function defaultReqIdBuilder(req) {
+    return req.get("x-request-id") || v4().split("-").join("");
+}
+function mapIgnoreUrlPatterns(ignoreUrlPatterns) {
+    return ignoreUrlPatterns.map((pattern) => (typeof pattern === "string" ? new RegExp(pattern, "gi") : pattern));
+}
+export function ignoreLog(ignoreUrlPatterns) {
+    if (ignoreUrlPatterns) {
+        ignoreUrlPatterns = mapIgnoreUrlPatterns(ignoreUrlPatterns);
+        return (ignore, data, url) => ignoreUrlPatterns?.find((reg) => !!url.match(reg));
+    }
+}
 /**
  * Create the TsED context to wrap request, response, injector, etc...
  * @param injector
  * @ignore
  */
 export function createContext(injector) {
-    var _a, _b;
-    const ResponseKlass = (_a = injector.getProvider(PlatformResponse)) === null || _a === void 0 ? void 0 : _a.useClass;
-    const RequestKlass = (_b = injector.getProvider(PlatformRequest)) === null || _b === void 0 ? void 0 : _b.useClass;
-    const { reqIdBuilder = defaultReqIdBuilder, ...loggerOptions } = injector.settings.logger || {};
-    return async (event) => {
+    const ResponseKlass = injector.getProvider(PlatformResponse)?.useClass;
+    const RequestKlass = injector.getProvider(PlatformRequest)?.useClass;
+    const { reqIdBuilder = defaultReqIdBuilder, ...loggerOptions } = injector.settings.logger;
+    const opts = {
+        logger: injector.logger,
+        ...loggerOptions,
+        ignoreLog: ignoreLog(loggerOptions.ignoreUrlPatterns),
+        injector,
+        ResponseKlass,
+        RequestKlass
+    };
+    return async function invokeContext(event) {
         const ctx = new PlatformContext({
+            ...opts,
             event,
-            id: reqIdBuilder(event.request),
-            logger: injector.logger,
-            ...loggerOptions,
-            injector,
-            ResponseKlass,
-            RequestKlass
+            id: reqIdBuilder(event.request)
         });
         ctx.response.onEnd(async () => {
             await ctx.emit("$onResponse", ctx);

package/lib/esm/utils/createContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"createContext.js","sourceRoot":"","sources":["../../../src/utils/createContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAE9D,OAAO,EAAC,EAAE,EAAC,MAAM,MAAM,CAAC;AAExB,MAAM,mBAAmB,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAE7F;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,QAAyB;;IACrD,MAAM,aAAa,GAAG,MAAA,QAAQ,CAAC,WAAW,CAAC,gBAAgB,CAAC,0CAAE,QAAQ,CAAC;IACvE,MAAM,YAAY,GAAG,MAAA,QAAQ,CAAC,WAAW,CAAC,eAAe,CAAC,0CAAE,QAAQ,CAAC;IACrE,MAAM,EAAC,YAAY,GAAG,mBAAmB,EAAE,GAAG,aAAa,EAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;IAE9F,OAAO,KAAK,EAAE,KAAoB,EAA4B,EAAE;QAC9D,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC;YAC9B,KAAK;YACL,EAAE,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,GAAG,aAAa;YAChB,QAAQ;YACR,aAAa;YACb,YAAY;SACb,CAAC,CAAC;QAEH,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;YAC5B,MAAM,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;YACnC,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,MAAM,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QAElC,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import {InjectorService} from \"@tsed/di\";\nimport {PlatformContext} from \"../domain/PlatformContext\";\nimport {PlatformRequest} from \"../services/PlatformRequest\";\nimport {PlatformResponse} from \"../services/PlatformResponse\";\nimport {IncomingEvent} from \"../interfaces/IncomingEvent\";\nimport {v4} from \"uuid\";\n\nconst defaultReqIdBuilder = (req: any) => req.get(\"x-request-id\") || v4().replace(/-/gi, \"\");\n\n/**\n * Create the TsED context to wrap request, response, injector, etc...\n * @param injector\n * @ignore\n */\nexport function createContext(injector: InjectorService) {\n  const ResponseKlass = injector.getProvider(PlatformResponse)?.useClass;\n  const RequestKlass = injector.getProvider(PlatformRequest)?.useClass;\n  const {reqIdBuilder = defaultReqIdBuilder, ...loggerOptions} = injector.settings.logger || {};\n\n  return async (event: IncomingEvent): Promise<PlatformContext> => {\n    const ctx = new PlatformContext({\n      event,\n      id: reqIdBuilder(event.request),\n      logger: injector.logger,\n      ...loggerOptions,\n      injector,\n      ResponseKlass,\n      RequestKlass\n    });\n\n    ctx.response.onEnd(async () => {\n      await ctx.emit(\"$onResponse\", ctx);\n      await ctx.destroy();\n    });\n\n    await ctx.emit(\"$onRequest\", ctx);\n\n    return ctx;\n  };\n}\n"]}
+{"version":3,"file":"createContext.js","sourceRoot":"","sources":["../../../src/utils/createContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAE9D,OAAO,EAAC,EAAE,EAAC,MAAM,MAAM,CAAC;AAExB,SAAS,mBAAmB,CAAC,GAAQ;IACnC,OAAO,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,oBAAoB,CAAC,iBAAwB;IACpD,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,OAAwB,EAAE,EAAE,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;AAClI,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,iBAAoC;IAC5D,IAAI,iBAAiB,EAAE;QACrB,iBAAiB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;QAC5D,OAAO,CAAC,MAAe,EAAE,IAAS,EAAE,GAAW,EAAE,EAAE,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;KACxG;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,QAAyB;IACrD,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,QAAQ,CAAC;IACvE,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC;IACrE,MAAM,EAAC,YAAY,GAAG,mBAAmB,EAAE,GAAG,aAAa,EAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;IAExF,MAAM,IAAI,GAAG;QACX,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,GAAG,aAAa;QAChB,SAAS,EAAE,SAAS,CAAC,aAAa,CAAC,iBAAiB,CAAC;QACrD,QAAQ;QACR,aAAa;QACb,YAAY;KACb,CAAC;IAEF,OAAO,KAAK,UAAU,aAAa,CAAC,KAAoB;QACtD,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC;YAC9B,GAAG,IAAI;YACP,KAAK;YACL,EAAE,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC;SAChC,CAAC,CAAC;QAEH,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;YAC5B,MAAM,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;YACnC,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,MAAM,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QAElC,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import {InjectorService} from \"@tsed/di\";\nimport {PlatformContext} from \"../domain/PlatformContext\";\nimport {PlatformRequest} from \"../services/PlatformRequest\";\nimport {PlatformResponse} from \"../services/PlatformResponse\";\nimport {IncomingEvent} from \"../interfaces/IncomingEvent\";\nimport {v4} from \"uuid\";\n\nfunction defaultReqIdBuilder(req: any) {\n  return req.get(\"x-request-id\") || v4().split(\"-\").join(\"\");\n}\n\nfunction mapIgnoreUrlPatterns(ignoreUrlPatterns: any[]) {\n  return ignoreUrlPatterns.map((pattern: string | RegExp) => (typeof pattern === \"string\" ? new RegExp(pattern, \"gi\") : pattern));\n}\n\nexport function ignoreLog(ignoreUrlPatterns: any[] | undefined) {\n  if (ignoreUrlPatterns) {\n    ignoreUrlPatterns = mapIgnoreUrlPatterns(ignoreUrlPatterns);\n    return (ignore: boolean, data: any, url: string) => ignoreUrlPatterns?.find((reg) => !!url.match(reg));\n  }\n}\n\n/**\n * Create the TsED context to wrap request, response, injector, etc...\n * @param injector\n * @ignore\n */\nexport function createContext(injector: InjectorService) {\n  const ResponseKlass = injector.getProvider(PlatformResponse)?.useClass;\n  const RequestKlass = injector.getProvider(PlatformRequest)?.useClass;\n  const {reqIdBuilder = defaultReqIdBuilder, ...loggerOptions} = injector.settings.logger;\n\n  const opts = {\n    logger: injector.logger,\n    ...loggerOptions,\n    ignoreLog: ignoreLog(loggerOptions.ignoreUrlPatterns),\n    injector,\n    ResponseKlass,\n    RequestKlass\n  };\n\n  return async function invokeContext(event: IncomingEvent) {\n    const ctx = new PlatformContext({\n      ...opts,\n      event,\n      id: reqIdBuilder(event.request)\n    });\n\n    ctx.response.onEnd(async () => {\n      await ctx.emit(\"$onResponse\", ctx);\n      await ctx.destroy();\n    });\n\n    await ctx.emit(\"$onRequest\", ctx);\n\n    return ctx;\n  };\n}\n"]}

package/lib/esm/utils/createHttpServer.js

@@ -4,8 +4,8 @@ import Http from "http";
 import { listenServer } from "./listenServer.js";
 export function createHttpServer(injector, requestListener) {
     const { settings } = injector;
-    const httpPort = settings.getRaw("httpPort");
-    const httpOptions = settings.getRaw("httpOptions");
+    const httpPort = settings.get("httpPort");
+    const httpOptions = settings.get("httpOptions");
     const server = httpPort !== false ? Http.createServer(httpOptions, requestListener) : null;
     injector.addProvider(Http.Server, {
         scope: ProviderScope.SINGLETON,
@@ -16,7 +16,7 @@ export function createHttpServer(injector, requestListener) {
         const hostInfo = getHostInfoFromPort("http", httpPort);
         return async () => {
             const resolvedHostInfo = await listenServer(injector, server, hostInfo);
-            settings.setRaw("httpPort", `${resolvedHostInfo.address}:${resolvedHostInfo.port}`);
+            settings.set("httpPort", `${resolvedHostInfo.address}:${resolvedHostInfo.port}`);
             return server;
         };
     }

package/lib/esm/utils/createHttpServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"createHttpServer.js","sourceRoot":"","sources":["../../../src/utils/createHttpServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAC,MAAM,UAAU,CAAC;AACxD,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAC/C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,MAAM,UAAU,gBAAgB,CAAC,QAAyB,EAAE,eAAqC;IAC/F,MAAM,EAAC,QAAQ,EAAC,GAAG,QAAQ,CAAC;IAC5B,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAEnD,MAAM,MAAM,GAAG,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE3F,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE;QAChC,KAAK,EAAE,aAAa,CAAC,SAAS;QAC9B,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAC;IAEH,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE7B,IAAI,MAAM,EAAE;QACV,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAEvD,OAAO,KAAK,IAAI,EAAE;YAChB,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAqB,EAAE,QAAQ,CAAC,CAAC;YACvF,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,gBAAgB,CAAC,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;YACpF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;KACH;AACH,CAAC","sourcesContent":["import {InjectorService, ProviderScope} from \"@tsed/di\";\nimport {getHostInfoFromPort} from \"@tsed/core\";\nimport Http from \"http\";\nimport {listenServer} from \"./listenServer\";\n\nexport function createHttpServer(injector: InjectorService, requestListener: Http.RequestListener) {\n  const {settings} = injector;\n  const httpPort = settings.getRaw(\"httpPort\");\n  const httpOptions = settings.getRaw(\"httpOptions\");\n\n  const server = httpPort !== false ? Http.createServer(httpOptions, requestListener) : null;\n\n  injector.addProvider(Http.Server, {\n    scope: ProviderScope.SINGLETON,\n    useValue: server\n  });\n\n  injector.invoke(Http.Server);\n\n  if (server) {\n    const hostInfo = getHostInfoFromPort(\"http\", httpPort);\n\n    return async () => {\n      const resolvedHostInfo = await listenServer(injector, server as Http.Server, hostInfo);\n      settings.setRaw(\"httpPort\", `${resolvedHostInfo.address}:${resolvedHostInfo.port}`);\n      return server;\n    };\n  }\n}\n"]}
+{"version":3,"file":"createHttpServer.js","sourceRoot":"","sources":["../../../src/utils/createHttpServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAC,MAAM,UAAU,CAAC;AACxD,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAC/C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,MAAM,UAAU,gBAAgB,CAAC,QAAyB,EAAE,eAAqC;IAC/F,MAAM,EAAC,QAAQ,EAAC,GAAG,QAAQ,CAAC;IAC5B,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAEhD,MAAM,MAAM,GAAG,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE3F,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE;QAChC,KAAK,EAAE,aAAa,CAAC,SAAS;QAC9B,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAC;IAEH,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE7B,IAAI,MAAM,EAAE;QACV,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAEvD,OAAO,KAAK,IAAI,EAAE;YAChB,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAqB,EAAE,QAAQ,CAAC,CAAC;YACvF,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,gBAAgB,CAAC,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;YACjF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;KACH;AACH,CAAC","sourcesContent":["import {InjectorService, ProviderScope} from \"@tsed/di\";\nimport {getHostInfoFromPort} from \"@tsed/core\";\nimport Http from \"http\";\nimport {listenServer} from \"./listenServer\";\n\nexport function createHttpServer(injector: InjectorService, requestListener: Http.RequestListener) {\n  const {settings} = injector;\n  const httpPort = settings.get(\"httpPort\");\n  const httpOptions = settings.get(\"httpOptions\");\n\n  const server = httpPort !== false ? Http.createServer(httpOptions, requestListener) : null;\n\n  injector.addProvider(Http.Server, {\n    scope: ProviderScope.SINGLETON,\n    useValue: server\n  });\n\n  injector.invoke(Http.Server);\n\n  if (server) {\n    const hostInfo = getHostInfoFromPort(\"http\", httpPort);\n\n    return async () => {\n      const resolvedHostInfo = await listenServer(injector, server as Http.Server, hostInfo);\n      settings.set(\"httpPort\", `${resolvedHostInfo.address}:${resolvedHostInfo.port}`);\n      return server;\n    };\n  }\n}\n"]}

package/lib/esm/utils/createHttpsServer.js

@@ -4,8 +4,8 @@ import Https from "https";
 import { listenServer } from "./listenServer.js";
 export function createHttpsServer(injector, requestListener) {
     const { settings } = injector;
-    const httpsPort = settings.getRaw("httpsPort");
-    const httpsOptions = settings.getRaw("httpsOptions");
+    const httpsPort = settings.get("httpsPort");
+    const httpsOptions = settings.get("httpsOptions");
     const server = httpsPort !== false ? Https.createServer(httpsOptions, requestListener) : null;
     injector.addProvider(Https.Server, {
         scope: ProviderScope.SINGLETON,
@@ -16,7 +16,7 @@ export function createHttpsServer(injector, requestListener) {
         const hostInfo = getHostInfoFromPort("https", httpsPort);
         return async () => {
             const resolvedHostInfo = await listenServer(injector, server, hostInfo);
-            settings.setRaw("httpsPort", `${resolvedHostInfo.address}:${resolvedHostInfo.port}`);
+            settings.set("httpsPort", `${resolvedHostInfo.address}:${resolvedHostInfo.port}`);
             return server;
         };
     }

package/lib/esm/utils/createHttpsServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"createHttpsServer.js","sourceRoot":"","sources":["../../../src/utils/createHttpsServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAC,MAAM,UAAU,CAAC;AACxD,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,MAAM,UAAU,iBAAiB,CAAC,QAAyB,EAAE,eAAsC;IACjG,MAAM,EAAC,QAAQ,EAAC,GAAG,QAAQ,CAAC;IAC5B,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAErD,MAAM,MAAM,GAAG,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE9F,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE;QACjC,KAAK,EAAE,aAAa,CAAC,SAAS;QAC9B,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAC;IAEH,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,MAAM,EAAE;QACV,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAEzD,OAAO,KAAK,IAAI,EAAE;YAChB,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAsB,EAAE,QAAQ,CAAC,CAAC;YACxF,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,gBAAgB,CAAC,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;YACrF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;KACH;AACH,CAAC","sourcesContent":["import {InjectorService, ProviderScope} from \"@tsed/di\";\nimport {getHostInfoFromPort} from \"@tsed/core\";\nimport Https from \"https\";\nimport Http from \"http\";\nimport {listenServer} from \"./listenServer\";\n\nexport function createHttpsServer(injector: InjectorService, requestListener?: Http.RequestListener) {\n  const {settings} = injector;\n  const httpsPort = settings.getRaw(\"httpsPort\");\n  const httpsOptions = settings.getRaw(\"httpsOptions\");\n\n  const server = httpsPort !== false ? Https.createServer(httpsOptions, requestListener) : null;\n\n  injector.addProvider(Https.Server, {\n    scope: ProviderScope.SINGLETON,\n    useValue: server\n  });\n\n  injector.invoke(Https.Server);\n\n  if (server) {\n    const hostInfo = getHostInfoFromPort(\"https\", httpsPort);\n\n    return async () => {\n      const resolvedHostInfo = await listenServer(injector, server as Https.Server, hostInfo);\n      settings.setRaw(\"httpsPort\", `${resolvedHostInfo.address}:${resolvedHostInfo.port}`);\n      return server;\n    };\n  }\n}\n"]}
+{"version":3,"file":"createHttpsServer.js","sourceRoot":"","sources":["../../../src/utils/createHttpsServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAC,MAAM,UAAU,CAAC;AACxD,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,MAAM,UAAU,iBAAiB,CAAC,QAAyB,EAAE,eAAsC;IACjG,MAAM,EAAC,QAAQ,EAAC,GAAG,QAAQ,CAAC;IAC5B,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAElD,MAAM,MAAM,GAAG,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE9F,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE;QACjC,KAAK,EAAE,aAAa,CAAC,SAAS;QAC9B,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAC;IAEH,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,MAAM,EAAE;QACV,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAEzD,OAAO,KAAK,IAAI,EAAE;YAChB,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAsB,EAAE,QAAQ,CAAC,CAAC;YACxF,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,gBAAgB,CAAC,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;YAClF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;KACH;AACH,CAAC","sourcesContent":["import {InjectorService, ProviderScope} from \"@tsed/di\";\nimport {getHostInfoFromPort} from \"@tsed/core\";\nimport Https from \"https\";\nimport Http from \"http\";\nimport {listenServer} from \"./listenServer\";\n\nexport function createHttpsServer(injector: InjectorService, requestListener?: Http.RequestListener) {\n  const {settings} = injector;\n  const httpsPort = settings.get(\"httpsPort\");\n  const httpsOptions = settings.get(\"httpsOptions\");\n\n  const server = httpsPort !== false ? Https.createServer(httpsOptions, requestListener) : null;\n\n  injector.addProvider(Https.Server, {\n    scope: ProviderScope.SINGLETON,\n    useValue: server\n  });\n\n  injector.invoke(Https.Server);\n\n  if (server) {\n    const hostInfo = getHostInfoFromPort(\"https\", httpsPort);\n\n    return async () => {\n      const resolvedHostInfo = await listenServer(injector, server as Https.Server, hostInfo);\n      settings.set(\"httpsPort\", `${resolvedHostInfo.address}:${resolvedHostInfo.port}`);\n      return server;\n    };\n  }\n}\n"]}

package/lib/esm/utils/createInjector.js

@@ -1,14 +1,14 @@
-import { InjectorService, setLoggerLevel } from "@tsed/di";
-import { $log } from "@tsed/logger";
 import { toMap } from "@tsed/core";
+import { InjectorService, setLoggerConfiguration } from "@tsed/di";
+import { $log } from "@tsed/logger";
 import { PlatformConfiguration } from "../config/services/PlatformConfiguration.js";
+import { Platform } from "../services/Platform.js";
+import { PlatformAdapter } from "../services/PlatformAdapter.js";
+import { PlatformApplication } from "../services/PlatformApplication.js";
 import { PlatformHandler } from "../services/PlatformHandler.js";
+import { PlatformRequest } from "../services/PlatformRequest.js";
 import { PlatformResponse } from "../services/PlatformResponse.js";
 import { PlatformRouter } from "../services/PlatformRouter.js";
-import { PlatformApplication } from "../services/PlatformApplication.js";
-import { Platform } from "../services/Platform.js";
-import { PlatformRequest } from "../services/PlatformRequest.js";
-import { PlatformAdapter } from "../services/PlatformAdapter.js";
 $log.name = "TSED";
 const DEFAULT_PROVIDERS = [
     { provide: PlatformHandler },
@@ -30,7 +30,7 @@ export function createInjector({ adapter, settings = {} }) {
         });
     }
     injector.invoke(PlatformAdapter);
-    setLoggerLevel(injector);
+    setLoggerConfiguration(injector);
     const instance = injector.get(PlatformAdapter);
     instance.providers = [...DEFAULT_PROVIDERS, ...instance.providers];
     toMap(instance.providers, "provide").forEach((provider, token) => {

package/lib/esm/utils/createInjector.js.map

@@ -1 +1 @@
-{"version":3,"file":"createInjector.js","sourceRoot":"","sources":["../../../src/utils/createInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAgB,cAAc,EAAC,MAAM,UAAU,CAAC;AACvE,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAClC,OAAO,EAAC,KAAK,EAAO,MAAM,YAAY,CAAC;AACvC,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAC,mBAAmB,EAAC,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAE5D,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;AAEnB,MAAM,iBAAiB,GAAG;IACxB,EAAC,OAAO,EAAE,eAAe,EAAC;IAC1B,EAAC,OAAO,EAAE,gBAAgB,EAAC;IAC3B,EAAC,OAAO,EAAE,eAAe,EAAC;IAC1B,EAAC,OAAO,EAAE,cAAc,EAAC;IACzB,EAAC,OAAO,EAAE,mBAAmB,EAAC;IAC9B,EAAC,OAAO,EAAE,QAAQ,EAAC;CACpB,CAAC;AAOF,MAAM,UAAU,cAAc,CAAC,EAAC,OAAO,EAAE,QAAQ,GAAG,EAAE,EAAwB;IAC5E,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;IACvC,QAAQ,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAE5C,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAC3D,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAEhC,IAAI,OAAO,EAAE;QACX,QAAQ,CAAC,WAAW,CAAC,eAAe,EAAE;YACpC,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;KACJ;IAED,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAEjC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAEzB,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAkB,eAAe,CAAE,CAAC;IAEjE,QAAQ,CAAC,SAAS,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEnE,KAAK,CAAoB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QAClF,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAErC,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {InjectorService, ProviderOpts, setLoggerLevel} from \"@tsed/di\";\nimport {$log} from \"@tsed/logger\";\nimport {toMap, Type} from \"@tsed/core\";\nimport {PlatformConfiguration} from \"../config/services/PlatformConfiguration\";\nimport {PlatformHandler} from \"../services/PlatformHandler\";\nimport {PlatformResponse} from \"../services/PlatformResponse\";\nimport {PlatformRouter} from \"../services/PlatformRouter\";\nimport {PlatformApplication} from \"../services/PlatformApplication\";\nimport {Platform} from \"../services/Platform\";\nimport {PlatformRequest} from \"../services/PlatformRequest\";\nimport {PlatformAdapter} from \"../services/PlatformAdapter\";\n\n$log.name = \"TSED\";\n\nconst DEFAULT_PROVIDERS = [\n  {provide: PlatformHandler},\n  {provide: PlatformResponse},\n  {provide: PlatformRequest},\n  {provide: PlatformRouter},\n  {provide: PlatformApplication},\n  {provide: Platform}\n];\n\ninterface CreateInjectorOptions {\n  adapter?: Type<PlatformAdapter<any, any>>;\n  settings?: Partial<TsED.Configuration>;\n}\n\nexport function createInjector({adapter, settings = {}}: CreateInjectorOptions) {\n  const injector = new InjectorService();\n  injector.addProvider(PlatformConfiguration);\n\n  injector.settings = injector.invoke(PlatformConfiguration);\n  injector.logger = $log;\n  injector.settings.set(settings);\n\n  if (adapter) {\n    injector.addProvider(PlatformAdapter, {\n      useClass: adapter\n    });\n  }\n\n  injector.invoke(PlatformAdapter);\n\n  setLoggerLevel(injector);\n\n  const instance = injector.get<PlatformAdapter>(PlatformAdapter)!;\n\n  instance.providers = [...DEFAULT_PROVIDERS, ...instance.providers];\n\n  toMap<any, ProviderOpts>(instance.providers, \"provide\").forEach((provider, token) => {\n    injector.addProvider(token, provider);\n  });\n\n  injector.invoke(PlatformApplication);\n\n  return injector;\n}\n"]}
+{"version":3,"file":"createInjector.js","sourceRoot":"","sources":["../../../src/utils/createInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAO,MAAM,YAAY,CAAC;AACvC,OAAO,EAAC,eAAe,EAAgB,sBAAsB,EAAC,MAAM,UAAU,CAAC;AAC/E,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAClC,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAC,mBAAmB,EAAC,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAE1D,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;AAEnB,MAAM,iBAAiB,GAAG;IACxB,EAAC,OAAO,EAAE,eAAe,EAAC;IAC1B,EAAC,OAAO,EAAE,gBAAgB,EAAC;IAC3B,EAAC,OAAO,EAAE,eAAe,EAAC;IAC1B,EAAC,OAAO,EAAE,cAAc,EAAC;IACzB,EAAC,OAAO,EAAE,mBAAmB,EAAC;IAC9B,EAAC,OAAO,EAAE,QAAQ,EAAC;CACpB,CAAC;AAOF,MAAM,UAAU,cAAc,CAAC,EAAC,OAAO,EAAE,QAAQ,GAAG,EAAE,EAAwB;IAC5E,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;IACvC,QAAQ,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAE5C,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAC3D,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAEhC,IAAI,OAAO,EAAE;QACX,QAAQ,CAAC,WAAW,CAAC,eAAe,EAAE;YACpC,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;KACJ;IAED,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAEjC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IAEjC,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAkB,eAAe,CAAE,CAAC;IAEjE,QAAQ,CAAC,SAAS,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEnE,KAAK,CAAoB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QAClF,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAErC,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {toMap, Type} from \"@tsed/core\";\nimport {InjectorService, ProviderOpts, setLoggerConfiguration} from \"@tsed/di\";\nimport {$log} from \"@tsed/logger\";\nimport {PlatformConfiguration} from \"../config/services/PlatformConfiguration\";\nimport {Platform} from \"../services/Platform\";\nimport {PlatformAdapter} from \"../services/PlatformAdapter\";\nimport {PlatformApplication} from \"../services/PlatformApplication\";\nimport {PlatformHandler} from \"../services/PlatformHandler\";\nimport {PlatformRequest} from \"../services/PlatformRequest\";\nimport {PlatformResponse} from \"../services/PlatformResponse\";\nimport {PlatformRouter} from \"../services/PlatformRouter\";\n\n$log.name = \"TSED\";\n\nconst DEFAULT_PROVIDERS = [\n  {provide: PlatformHandler},\n  {provide: PlatformResponse},\n  {provide: PlatformRequest},\n  {provide: PlatformRouter},\n  {provide: PlatformApplication},\n  {provide: Platform}\n];\n\ninterface CreateInjectorOptions {\n  adapter?: Type<PlatformAdapter<any, any>>;\n  settings?: Partial<TsED.Configuration>;\n}\n\nexport function createInjector({adapter, settings = {}}: CreateInjectorOptions) {\n  const injector = new InjectorService();\n  injector.addProvider(PlatformConfiguration);\n\n  injector.settings = injector.invoke(PlatformConfiguration);\n  injector.logger = $log;\n  injector.settings.set(settings);\n\n  if (adapter) {\n    injector.addProvider(PlatformAdapter, {\n      useClass: adapter\n    });\n  }\n\n  injector.invoke(PlatformAdapter);\n\n  setLoggerConfiguration(injector);\n\n  const instance = injector.get<PlatformAdapter>(PlatformAdapter)!;\n\n  instance.providers = [...DEFAULT_PROVIDERS, ...instance.providers];\n\n  toMap<any, ProviderOpts>(instance.providers, \"provide\").forEach((provider, token) => {\n    injector.addProvider(token, provider);\n  });\n\n  injector.invoke(PlatformApplication);\n\n  return injector;\n}\n"]}

package/lib/esm/utils/getConfiguration.js

@@ -1,11 +1,13 @@
-import { deepMerge, Env, Store } from "@tsed/core";
-import { ProviderScope, ProviderType } from "@tsed/di";
+import { Env, Store } from "@tsed/core";
+import { mergeMount, ProviderScope, ProviderType } from "@tsed/di";
 export function getConfiguration(configuration = {}, module = null) {
+    if (configuration.$$resolved) {
+        return configuration;
+    }
     const store = module ? Store.from(module).get("configuration") || {} : {};
     const env = configuration.env || store.env || process.env.NODE_ENV || Env.DEV;
-    const config = {
-        exclude: ["**/*.spec.ts", "**/*.spec.js"],
-        componentsScan: ["${rootDir}/mvc/**/*.ts", "${rootDir}/services/**/*.ts", "${rootDir}/middlewares/**/*.ts"],
+    return {
+        $$resolved: true,
         env,
         httpPort: 8080,
         httpsPort: false,
@@ -16,11 +18,7 @@ export function getConfiguration(configuration = {}, module = null) {
             ...store.scopes,
             ...configuration.scopes
         },
-        mount: store.mount || configuration.mount
-            ? deepMerge(store.mount || {}, configuration.mount || {})
-            : {
-                "/rest": "${rootDir}/controllers/**/*.ts"
-            },
+        mount: mergeMount(store.mount, configuration.mount),
         logger: {
             debug: false,
             level: env === Env.TEST ? "off" : "info",
@@ -30,9 +28,5 @@ export function getConfiguration(configuration = {}, module = null) {
             jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2
         }
     };
-    if (!configuration.disableComponentsScan && store.componentsScan && configuration.componentsScan) {
-        config.componentsScan = [...store.componentsScan, ...configuration.componentsScan];
-    }
-    return config;
 }
 //# sourceMappingURL=getConfiguration.js.map

package/lib/esm/utils/getConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"file":"getConfiguration.js","sourceRoot":"","sources":["../../../src/utils/getConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,GAAG,EAAE,KAAK,EAAO,MAAM,YAAY,CAAC;AACvD,OAAO,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AAErD,MAAM,UAAU,gBAAgB,CAAC,gBAAqB,EAAE,EAAE,SAA2B,IAAI;IACvF,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1E,MAAM,GAAG,GAAG,aAAa,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,IAAK,OAAO,CAAC,GAAG,CAAC,QAAgB,IAAI,GAAG,CAAC,GAAG,CAAC;IAEvF,MAAM,MAAM,GAAG;QACb,OAAO,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC;QACzC,cAAc,EAAE,CAAC,wBAAwB,EAAE,6BAA6B,EAAE,gCAAgC,CAAC;QAC3G,GAAG;QACH,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,KAAK;QAChB,GAAG,KAAK;QACR,GAAG,aAAa;QAChB,MAAM,EAAE;YACN,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,SAAS;YAClD,GAAG,KAAK,CAAC,MAAM;YACf,GAAG,aAAa,CAAC,MAAM;SACxB;QACD,KAAK,EACH,KAAK,CAAC,KAAK,IAAI,aAAa,CAAC,KAAK;YAChC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,EAAE,aAAa,CAAC,KAAK,IAAI,EAAE,CAAC;YACzD,CAAC,CAAC;gBACE,OAAO,EAAE,gCAAgC;aAC1C;QACP,MAAM,EAAE;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;YACxC,UAAU,EAAE,IAAI;YAChB,GAAG,KAAK,CAAC,MAAM;YACf,GAAG,aAAa,CAAC,MAAM;YACvB,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3D;KACF,CAAC;IAEF,IAAI,CAAC,aAAa,CAAC,qBAAqB,IAAI,KAAK,CAAC,cAAc,IAAI,aAAa,CAAC,cAAc,EAAE;QAChG,MAAM,CAAC,cAAc,GAAG,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC;KACpF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import {deepMerge, Env, Store, Type} from \"@tsed/core\";\nimport {ProviderScope, ProviderType} from \"@tsed/di\";\n\nexport function getConfiguration(configuration: any = {}, module: Type<any> | null = null) {\n  const store = module ? Store.from(module).get(\"configuration\") || {} : {};\n  const env = configuration.env || store.env || (process.env.NODE_ENV as Env) || Env.DEV;\n\n  const config = {\n    exclude: [\"**/*.spec.ts\", \"**/*.spec.js\"],\n    componentsScan: [\"${rootDir}/mvc/**/*.ts\", \"${rootDir}/services/**/*.ts\", \"${rootDir}/middlewares/**/*.ts\"],\n    env,\n    httpPort: 8080,\n    httpsPort: false,\n    ...store,\n    ...configuration,\n    scopes: {\n      [ProviderType.CONTROLLER]: ProviderScope.SINGLETON,\n      ...store.scopes,\n      ...configuration.scopes\n    },\n    mount:\n      store.mount || configuration.mount\n        ? deepMerge(store.mount || {}, configuration.mount || {})\n        : {\n            \"/rest\": \"${rootDir}/controllers/**/*.ts\"\n          },\n    logger: {\n      debug: false,\n      level: env === Env.TEST ? \"off\" : \"info\",\n      logRequest: true,\n      ...store.logger,\n      ...configuration.logger,\n      jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2\n    }\n  };\n\n  if (!configuration.disableComponentsScan && store.componentsScan && configuration.componentsScan) {\n    config.componentsScan = [...store.componentsScan, ...configuration.componentsScan];\n  }\n\n  return config;\n}\n"]}
+{"version":3,"file":"getConfiguration.js","sourceRoot":"","sources":["../../../src/utils/getConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,KAAK,EAAO,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAE,aAAa,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AAEjE,MAAM,UAAU,gBAAgB,CAAC,gBAAqB,EAAE,EAAE,SAA2B,IAAI;IACvF,IAAI,aAAa,CAAC,UAAU,EAAE;QAC5B,OAAO,aAAa,CAAC;KACtB;IAED,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1E,MAAM,GAAG,GAAG,aAAa,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,IAAK,OAAO,CAAC,GAAG,CAAC,QAAgB,IAAI,GAAG,CAAC,GAAG,CAAC;IAEvF,OAAO;QACL,UAAU,EAAE,IAAI;QAChB,GAAG;QACH,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,KAAK;QAChB,GAAG,KAAK;QACR,GAAG,aAAa;QAChB,MAAM,EAAE;YACN,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,SAAS;YAClD,GAAG,KAAK,CAAC,MAAM;YACf,GAAG,aAAa,CAAC,MAAM;SACxB;QACD,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC;QACnD,MAAM,EAAE;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;YACxC,UAAU,EAAE,IAAI;YAChB,GAAG,KAAK,CAAC,MAAM;YACf,GAAG,aAAa,CAAC,MAAM;YACvB,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3D;KACF,CAAC;AACJ,CAAC","sourcesContent":["import {Env, Store, Type} from \"@tsed/core\";\nimport {mergeMount, ProviderScope, ProviderType} from \"@tsed/di\";\n\nexport function getConfiguration(configuration: any = {}, module: Type<any> | null = null) {\n  if (configuration.$$resolved) {\n    return configuration;\n  }\n\n  const store = module ? Store.from(module).get(\"configuration\") || {} : {};\n  const env = configuration.env || store.env || (process.env.NODE_ENV as Env) || Env.DEV;\n\n  return {\n    $$resolved: true,\n    env,\n    httpPort: 8080,\n    httpsPort: false,\n    ...store,\n    ...configuration,\n    scopes: {\n      [ProviderType.CONTROLLER]: ProviderScope.SINGLETON,\n      ...store.scopes,\n      ...configuration.scopes\n    },\n    mount: mergeMount(store.mount, configuration.mount),\n    logger: {\n      debug: false,\n      level: env === Env.TEST ? \"off\" : \"info\",\n      logRequest: true,\n      ...store.logger,\n      ...configuration.logger,\n      jsonIndentation: process.env.NODE_ENV === Env.PROD ? 0 : 2\n    }\n  };\n}\n"]}

package/lib/esm/utils/setResponseHeaders.js

@@ -1,12 +1,3 @@
-function mergeHeaders(specHeaders, headers) {
-    return Object.entries(specHeaders).reduce((headers, [key, item]) => {
-        key = key.toLowerCase();
-        return {
-            ...headers,
-            [key]: headers[key] === undefined ? String(item.example) : headers[key]
-        };
-    }, headers);
-}
 /**
  * @ignore
  */
@@ -21,11 +12,14 @@ export function setResponseHeaders(ctx) {
         response.status(operation.getStatus());
     }
     const statusCode = response.statusCode;
-    const headers = operation.getHeadersOf(response.statusCode);
-    const mergedHeaders = mergeHeaders(headers, response.getHeaders());
-    response.setHeaders(mergedHeaders);
+    const headers = operation.getHeadersOf(statusCode);
+    Object.entries(headers).forEach(([key, item]) => {
+        if (!response.get(key)) {
+            response.setHeader(key, String(item.example));
+        }
+    });
     if (operation.isRedirection(statusCode)) {
-        response.redirect(statusCode, String(mergedHeaders["location"]));
+        response.redirect(statusCode, response.get("location"));
     }
 }
 //# sourceMappingURL=setResponseHeaders.js.map

package/lib/esm/utils/setResponseHeaders.js.map

@@ -1 +1 @@
-{"version":3,"file":"setResponseHeaders.js","sourceRoot":"","sources":["../../../src/utils/setResponseHeaders.ts"],"names":[],"mappings":"AAIA,SAAS,YAAY,CAAC,WAA2D,EAAE,OAA4B;IAC7G,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;QACjE,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QACxB,OAAO;YACL,GAAG,OAAO;YACV,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;SACxE,CAAC;IACJ,CAAC,EAAE,OAAO,CAAC,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAoB;IACrD,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,GAAG,CAAC;IACjC,MAAM,EAAC,SAAS,EAAC,GAAG,QAAQ,CAAC;IAE7B,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;QACrB,OAAO;KACR;IAED,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;QACzB,kDAAkD;QAClD,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;KACxC;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;IAEnE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAEnC,IAAI,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;QACvC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;KAClE;AACH,CAAC","sourcesContent":["import {JsonHeader} from \"@tsed/schema\";\nimport {OutgoingHttpHeaders} from \"http\";\nimport {PlatformContext} from \"../domain/PlatformContext\";\n\nfunction mergeHeaders(specHeaders: Record<string, JsonHeader & {example: string}>, headers: OutgoingHttpHeaders) {\n  return Object.entries(specHeaders).reduce((headers, [key, item]) => {\n    key = key.toLowerCase();\n    return {\n      ...headers,\n      [key]: headers[key] === undefined ? String(item.example) : headers[key]\n    };\n  }, headers);\n}\n\n/**\n * @ignore\n */\nexport function setResponseHeaders(ctx: PlatformContext) {\n  const {response, endpoint} = ctx;\n  const {operation} = endpoint;\n\n  if (response.isDone()) {\n    return;\n  }\n\n  if (!response.hasStatus()) {\n    // apply status only if the isn't already modified\n    response.status(operation.getStatus());\n  }\n\n  const statusCode = response.statusCode;\n  const headers = operation.getHeadersOf(response.statusCode);\n  const mergedHeaders = mergeHeaders(headers, response.getHeaders());\n\n  response.setHeaders(mergedHeaders);\n\n  if (operation.isRedirection(statusCode)) {\n    response.redirect(statusCode, String(mergedHeaders[\"location\"]));\n  }\n}\n"]}
+{"version":3,"file":"setResponseHeaders.js","sourceRoot":"","sources":["../../../src/utils/setResponseHeaders.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAoB;IACrD,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,GAAG,CAAC;IACjC,MAAM,EAAC,SAAS,EAAC,GAAG,QAAQ,CAAC;IAE7B,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;QACrB,OAAO;KACR;IAED,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;QACzB,kDAAkD;QAClD,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;KACxC;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAEnD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;QAC9C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACtB,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;SAC/C;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;QACvC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;KACzD;AACH,CAAC","sourcesContent":["import {PlatformContext} from \"../domain/PlatformContext\";\n\n/**\n * @ignore\n */\nexport function setResponseHeaders(ctx: PlatformContext) {\n  const {response, endpoint} = ctx;\n  const {operation} = endpoint;\n\n  if (response.isDone()) {\n    return;\n  }\n\n  if (!response.hasStatus()) {\n    // apply status only if the isn't already modified\n    response.status(operation.getStatus());\n  }\n\n  const statusCode = response.statusCode;\n  const headers = operation.getHeadersOf(statusCode);\n\n  Object.entries(headers).forEach(([key, item]) => {\n    if (!response.get(key)) {\n      response.setHeader(key, String(item.example));\n    }\n  });\n\n  if (operation.isRedirection(statusCode)) {\n    response.redirect(statusCode, response.get(\"location\"));\n  }\n}\n"]}

package/lib/types/builder/PlatformBuilder.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import { Type } from "@tsed/core";
-import { InjectorService, ProviderOpts } from "@tsed/di";
-import { Platform } from "../services/Platform";
-import { PlatformApplication } from "../services/PlatformApplication";
+import { InjectorService, ProviderOpts, TokenProvider } from "@tsed/di";
 import type { IncomingMessage, ServerResponse } from "http";
+import { Platform } from "../services/Platform";
 import { PlatformAdapter, PlatformBuilderSettings } from "../services/PlatformAdapter";
+import { PlatformApplication } from "../services/PlatformApplication";
 /**
  * @platform
  */
@@ -41,7 +41,7 @@ export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Route
      *
      * @returns {PlatformConfiguration}
      */
-    get settings(): TsED.Configuration & import("@tsed/di").DIConfiguration;
+    get settings(): import("@tsed/di").DIConfiguration;
     get logger(): import("@tsed/di").DILogger;
     get disableBootstrapLog(): any;
     static create<App = TsED.Application, Router = TsED.Router>(module: Type<any>, settings: PlatformBuilderSettings<App, Router>): PlatformBuilder<App, Router>;
@@ -59,7 +59,7 @@ export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Route
      * Add classes to the components list
      * @param classes
      */
-    addComponents(classes: any | any[]): this;
+    addComponents(classes: Type | Type[]): this;
     /**
      * Add classes decorated by @@Controller@@ to components container.
      *
@@ -80,7 +80,7 @@ export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Route
      * @param {string} endpoint
      * @param {any[]} controllers
      */
-    addControllers(endpoint: string, controllers: any | string | (any | string)[]): void;
+    addControllers(endpoint: string, controllers: TokenProvider | TokenProvider[]): void;
     runLifecycle(): Promise<this>;
     loadInjector(): Promise<void>;
     listen(network?: boolean): Promise<void>;
@@ -92,7 +92,6 @@ export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Route
     bootstrap(): Promise<this>;
     protected loadRoutes(): Promise<void>;
     protected diff(): string;
-    protected importProviders(): Promise<void>;
     /**
      * Load middlewares from configuration for the given hook
      * @param hook

package/lib/types/config/interfaces/PlatformLoggerSettings.d.ts

@@ -1,44 +1,3 @@
-export interface PlatformLoggerSettings {
-    /**
-     * Enable debug mode. By default debug is false.
-     */
-    debug?: boolean;
-    /**
-     * Enable info mode. By default debug is false.
-     */
-    level?: "debug" | "info" | "warn" | "error" | "off";
-    /**
-     * Enable log performance tracker and disable log server.
-     */
-    perf?: boolean;
-    /**
-     * List of regexp to ignore log.
-     */
-    ignoreUrlPatterns?: string[];
-    /**
-     * The number of space characters to use as white space in JSON output. Default is 2 (0 in production).
-     */
-    jsonIndentation?: number;
-    /**
-     * A function called for each incoming request to create a request id.
-     * @returns {number}
-     */
-    reqIdBuilder?: (req: TsED.Request) => string;
-    /**
-     * Disable routes table displayed in the logger. By default debug is `false`.
-     */
-    disableRoutesSummary?: boolean;
-    /**
-     * Disable bootstrap log displayed in the logger. By default debug is `false`.
-     */
-    disableBootstrapLog?: boolean;
-    /**
-     * Specify log format. Example: `%[%d{[yyyy-MM-dd hh:mm:ss,SSS}] %p%] %m`. See [@tsed/logger configuration](https://tsedio.github.io/logger/).
-     */
-    format?: string;
-    /**
-     * Specify the log stack size for the context.logger. When the stack.length is reach, the logger is flushed during the request.
-     * Default size is set to 30.
-     */
-    maxStackSize?: number;
+import { DILoggerOptions } from "@tsed/di";
+export interface PlatformLoggerSettings extends DILoggerOptions {
 }

package/lib/types/config/services/PlatformConfiguration.d.ts

@@ -1,19 +1,13 @@
 /// <reference types="node" />
-import { Env, getHostInfoFromPort } from "@tsed/core";
-import { DIConfiguration } from "@tsed/di";
+import { getHostInfoFromPort } from "@tsed/core";
+import { DIConfiguration, TokenProvider } from "@tsed/di";
 import Https from "https";
 import { ConverterSettings } from "../interfaces/ConverterSettings";
-import { EndpointDirectoriesSettings } from "../interfaces/EndpointDirectoriesSettings";
-import { PlatformLoggerSettings } from "../interfaces/PlatformLoggerSettings";
 /**
  * `PlatformConfiguration` contains all information about your Server configuration.
  */
 export declare class PlatformConfiguration extends DIConfiguration {
     constructor();
-    get version(): string;
-    set version(v: string);
-    get rootDir(): string;
-    set rootDir(value: string);
     get port(): string | number | false;
     set port(value: string | number | false);
     get httpsOptions(): Https.ServerOptions;
@@ -22,24 +16,14 @@ export declare class PlatformConfiguration extends DIConfiguration {
     set httpPort(value: string | number | false);
     get httpsPort(): string | number | false;
     set httpsPort(value: string | number | false);
-    get env(): Env;
-    set env(value: Env);
-    get mount(): EndpointDirectoriesSettings;
-    set mount(value: EndpointDirectoriesSettings);
-    get componentsScan(): string[];
-    set componentsScan(value: string[]);
-    get statics(): EndpointDirectoriesSettings;
-    set statics(value: EndpointDirectoriesSettings);
+    get mount(): Record<string, TokenProvider[]>;
+    set mount(value: Record<string, TokenProvider[]>);
+    get statics(): Record<string, (any | string)[]>;
+    set statics(value: Record<string, (any | string)[]>);
     get acceptMimes(): string[];
     set acceptMimes(value: string[]);
-    get debug(): boolean;
-    set debug(debug: boolean);
     get converter(): Partial<ConverterSettings>;
     set converter(options: Partial<ConverterSettings>);
-    get logger(): Partial<PlatformLoggerSettings>;
-    set logger(value: Partial<PlatformLoggerSettings>);
-    get exclude(): string[];
-    set exclude(exclude: string[]);
     get additionalProperties(): boolean;
     /**
      *

package/lib/types/domain/PlatformContext.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
 import { ContextMethods, DIContext, DIContextOptions } from "@tsed/di";
-import { IncomingMessage, ServerResponse } from "http";
 import { EndpointMetadata } from "@tsed/schema";
+import { IncomingMessage, ServerResponse } from "http";
+import { IncomingEvent } from "../interfaces/IncomingEvent";
 import { PlatformApplication } from "../services/PlatformApplication";
 import { PlatformRequest } from "../services/PlatformRequest";
 import { PlatformResponse } from "../services/PlatformResponse";
@@ -12,36 +13,40 @@ declare global {
     }
 }
 export interface PlatformContextOptions extends DIContextOptions {
-    event: {
-        response?: ServerResponse;
-        request?: IncomingMessage;
-    };
+    event: IncomingEvent;
     ignoreUrlPatterns?: any[];
     endpoint?: EndpointMetadata;
 }
-export declare class PlatformContext extends DIContext implements ContextMethods {
-    /**
-     * The current @@EndpointMetadata@@ resolved by Ts.ED during the request.
-     */
-    endpoint: EndpointMetadata;
+export declare class PlatformContext<PReq extends PlatformRequest = PlatformRequest, PRes extends PlatformResponse = PlatformResponse> extends DIContext implements ContextMethods {
+    #private;
+    event: IncomingEvent;
     /**
      * The data return by the previous endpoint if you use multiple handler on the same route. By default data is empty.
      */
     data: any;
+    /**
+     * The error caught by the current handler
+     */
+    error?: unknown;
     /**
      * The current @@PlatformResponse@@.
      */
-    response: PlatformResponse;
+    readonly response: PRes;
     /**
      * The current @@PlatformRequest@@.
      */
-    request: PlatformRequest;
+    readonly request: PReq;
     private ignoreUrlPatterns;
-    constructor({ event, endpoint, ignoreUrlPatterns, ResponseKlass, RequestKlass, ...options }: PlatformContextOptions);
+    constructor(options: PlatformContextOptions);
+    /**
+     * The current @@EndpointMetadata@@ resolved by Ts.ED during the request.
+     */
+    get endpoint(): EndpointMetadata;
+    set endpoint(endpoint: EndpointMetadata);
     get url(): string;
     get app(): PlatformApplication<TsED.Application, TsED.Router>;
     destroy(): Promise<void>;
-    isDone(): boolean;
+    isDone(): any;
     /**
      * Return the framework request instance (Express, Koa, etc...)
      */
@@ -62,4 +67,5 @@ export declare class PlatformContext extends DIContext implements ContextMethods
      * Return the original application instance.
      */
     getApp<T = any>(): T;
+    upgrade(event: IncomingEvent): void;
 }

package/lib/types/domain/PlatformRouteDetails.d.ts

@@ -1,15 +1,9 @@
 import { EndpointMetadata, JsonOperationRoute } from "@tsed/schema";
 import { ControllerProvider } from "./ControllerProvider";
-export interface PlatformRouterDetailsOptions {
-    provider: ControllerProvider;
-    endpoint: EndpointMetadata;
-    method: string;
-    url: string;
-}
 export declare class PlatformRouteDetails extends JsonOperationRoute<EndpointMetadata> {
     readonly rawBody: boolean;
     readonly provider: ControllerProvider;
-    constructor(options?: Partial<PlatformRouteDetails>);
+    constructor(options: Partial<PlatformRouteDetails>);
     toJSON(): {
         method: string;
         name: string;

package/lib/types/index.d.ts

@@ -5,7 +5,6 @@ export * from "./exports";
 export * from "./builder/PlatformBuilder";
 export * from "./builder/PlatformControllerBuilder";
 export * from "./config/interfaces/ConverterSettings";
-export * from "./config/interfaces/EndpointDirectoriesSettings";
 export * from "./config/interfaces/PlatformLoggerSettings";
 export * from "./config/interfaces/PlatformMulterSettings";
 export * from "./config/interfaces/PlatformStaticsSettings";
@@ -58,7 +57,6 @@ export * from "./utils/createHttpServer";
 export * from "./utils/createHttpsServer";
 export * from "./utils/createInjector";
 export * from "./utils/getStaticsOptions";
-export * from "./utils/importProviders";
 export * from "./utils/listenServer";
 export * from "./utils/mapReturnedResponse";
 export * from "./utils/printRoutes";

package/lib/types/services/PlatformRequest.d.ts

@@ -1,12 +1,14 @@
 /// <reference types="node" />
 import { IncomingHttpHeaders, IncomingMessage } from "http";
 import type { PlatformContext } from "../domain/PlatformContext";
-import { IncomingEvent } from "../interfaces/IncomingEvent";
 import type { PlatformResponse } from "./PlatformResponse";
 declare global {
     namespace TsED {
         interface Request {
             id: string;
+            /**
+             * @deprecated
+             */
             $ctx: PlatformContext;
         }
     }
@@ -15,16 +17,16 @@ declare global {
  * Platform Request abstraction layer.
  * @platform
  */
-export declare class PlatformRequest<T extends {
+export declare class PlatformRequest<Req extends {
     [key: string]: any;
 } = any> {
-    protected $ctx: PlatformContext;
-    raw: T;
+    readonly $ctx: PlatformContext;
+    constructor($ctx: PlatformContext);
     /**
      * The current @@PlatformResponse@@.
      */
-    response: PlatformResponse;
-    constructor({ request }: IncomingEvent, $ctx: PlatformContext);
+    get response(): PlatformResponse;
+    get raw(): Req;
     get secure(): boolean;
     get host(): string;
     get protocol(): string;
@@ -72,10 +74,11 @@ export declare class PlatformRequest<T extends {
         [key: string]: any;
     };
     get files(): any;
+    get route(): any;
     /**
      * Return the original request framework instance
      */
-    get request(): T;
+    get request(): Req;
     /**
      * Return the original request node.js instance
      */
@@ -104,7 +107,7 @@ export declare class PlatformRequest<T extends {
     /**
      * Return the Framework response object (express, koa, etc...)
      */
-    getRequest<Req = T>(): Req;
+    getRequest<R = Req>(): R;
     /**
      * Return the Node.js response object
      */