@tsed/common 6.89.0 → 6.92.1

package/lib/esm/utils/createHttpServer.js

@@ -1,29 +1,29 @@
-import { ProviderScope, registerProvider } from "@tsed/di";
+import { ProviderScope } from "@tsed/di";
+import { getHostInfoFromPort } from "@tsed/core";
 import Http from "http";
-import { PlatformApplication } from "../services/PlatformApplication";
 import { HttpServer } from "../decorators/httpServer";
 import { listenServer } from "./listenServer";
-export function createHttpServer(injector) {
-    injector.invoke(HttpServer);
-}
-registerProvider({
-    provide: HttpServer,
-    deps: [PlatformApplication],
-    scope: ProviderScope.SINGLETON,
-    global: true,
-    useFactory(platformApplication) {
-        return Http.createServer(platformApplication.callback());
-    }
-});
-export async function listenHttpServer(injector) {
+export function createHttpServer(injector, requestListener) {
     const { settings } = injector;
-    const server = injector.get(HttpServer);
-    if (settings.httpPort !== false && server) {
-        const { address, port } = settings.getHttpPort();
-        injector.logger.debug(`Start server on http://${address}:${port}`);
-        const options = await listenServer(server, { address, port });
-        settings.setHttpPort(options);
-        injector.logger.info(`Listen server on http://${options.address}:${options.port}`);
+    const httpPort = settings.getRaw("httpPort");
+    const httpOptions = settings.getRaw("httpOptions");
+    const server = httpPort !== false ? Http.createServer(httpOptions, requestListener) : null;
+    injector.addProvider(HttpServer, {
+        scope: ProviderScope.SINGLETON,
+        useValue: server
+    });
+    injector.addProvider(Http.Server, {
+        scope: ProviderScope.SINGLETON,
+        useValue: server
+    });
+    injector.invoke(HttpServer);
+    injector.invoke(Http.Server);
+    if (httpPort !== false) {
+        const hostInfo = getHostInfoFromPort("http", httpPort);
+        return async () => {
+            const resolvedHostInfo = await listenServer(injector, server, hostInfo);
+            settings.setRaw("httpPort", `${resolvedHostInfo.address}:${resolvedHostInfo.port}`);
+        };
     }
 }
 //# sourceMappingURL=createHttpServer.js.map

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,EAAE,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1E,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,mBAAmB,EAAC,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,MAAM,UAAU,gBAAgB,CAAC,QAAyB;IACxD,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AAC9B,CAAC;AAED,gBAAgB,CAAC;IACf,OAAO,EAAE,UAAU;IACnB,IAAI,EAAE,CAAC,mBAAmB,CAAC;IAC3B,KAAK,EAAE,aAAa,CAAC,SAAS;IAC9B,MAAM,EAAE,IAAI;IACZ,UAAU,CAAC,mBAAwC;QACjD,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3D,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAyB;IAC9D,MAAM,EAAC,QAAQ,EAAC,GAAG,QAAQ,CAAC;IAC5B,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAa,UAAU,CAAC,CAAC;IAEpD,IAAI,QAAQ,CAAC,QAAQ,KAAK,KAAK,IAAI,MAAM,EAAE;QACzC,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC/C,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,OAAO,IAAI,IAAI,EAAE,CAAC,CAAC;QAEnE,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;QAC5D,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE9B,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;KACpF;AACH,CAAC","sourcesContent":["import {InjectorService, ProviderScope, registerProvider} from \"@tsed/di\";\nimport Http from \"http\";\nimport {PlatformApplication} from \"../services/PlatformApplication\";\nimport {HttpServer} from \"../decorators/httpServer\";\nimport {listenServer} from \"./listenServer\";\n\nexport function createHttpServer(injector: InjectorService): void {\n  injector.invoke(HttpServer);\n}\n\nregisterProvider({\n  provide: HttpServer,\n  deps: [PlatformApplication],\n  scope: ProviderScope.SINGLETON,\n  global: true,\n  useFactory(platformApplication: PlatformApplication) {\n    return Http.createServer(platformApplication.callback());\n  }\n});\n\nexport async function listenHttpServer(injector: InjectorService) {\n  const {settings} = injector;\n  const server = injector.get<HttpServer>(HttpServer);\n\n  if (settings.httpPort !== false && server) {\n    const {address, port} = settings.getHttpPort();\n    injector.logger.debug(`Start server on http://${address}:${port}`);\n\n    const options = await listenServer(server, {address, port});\n    settings.setHttpPort(options);\n\n    injector.logger.info(`Listen server on http://${options.address}:${options.port}`);\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,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACpD,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,UAAU,EAAE;QAC/B,KAAK,EAAE,aAAa,CAAC,SAAS;QAC9B,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAC;IAEH,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,UAAU,CAAC,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE7B,IAAI,QAAQ,KAAK,KAAK,EAAE;QACtB,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;QACtF,CAAC,CAAC;KACH;AACH,CAAC","sourcesContent":["import {InjectorService, ProviderScope} from \"@tsed/di\";\nimport {getHostInfoFromPort} from \"@tsed/core\";\nimport Http from \"http\";\nimport {HttpServer} from \"../decorators/httpServer\";\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(HttpServer, {\n    scope: ProviderScope.SINGLETON,\n    useValue: server\n  });\n\n  injector.addProvider(Http.Server, {\n    scope: ProviderScope.SINGLETON,\n    useValue: server\n  });\n\n  injector.invoke(HttpServer);\n  injector.invoke(Http.Server);\n\n  if (httpPort !== false) {\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    };\n  }\n}\n"]}

package/lib/esm/utils/createHttpsServer.js

@@ -1,30 +1,29 @@
-import { Configuration, ProviderScope, registerProvider } from "@tsed/di";
+import { ProviderScope } from "@tsed/di";
+import { getHostInfoFromPort } from "@tsed/core";
 import Https from "https";
-import { PlatformApplication } from "../services/PlatformApplication";
 import { HttpsServer } from "../decorators/httpsServer";
 import { listenServer } from "./listenServer";
-export function createHttpsServer(injector) {
-    injector.invoke(HttpsServer);
-}
-registerProvider({
-    provide: HttpsServer,
-    deps: [PlatformApplication, Configuration],
-    scope: ProviderScope.SINGLETON,
-    global: true,
-    useFactory(platformApplication, settings) {
-        const options = settings.httpsOptions;
-        return Https.createServer(options, platformApplication.callback());
-    }
-});
-export async function listenHttpsServer(injector) {
+export function createHttpsServer(injector, requestListener) {
     const { settings } = injector;
-    const server = injector.get(HttpsServer);
-    if (settings.httpsPort !== false && server) {
-        const { address, port } = settings.getHttpsPort();
-        injector.logger.debug(`Start server on https://${address}:${port}`);
-        const options = await listenServer(server, { address, port });
-        settings.setHttpsPort(options);
-        injector.logger.info(`Listen server on https://${options.address}:${options.port}`);
+    const httpsPort = settings.getRaw("httpsPort");
+    const httpsOptions = settings.getRaw("httpsOptions");
+    const server = httpsPort !== false ? Https.createServer(httpsOptions, requestListener) : null;
+    injector.addProvider(HttpsServer, {
+        scope: ProviderScope.SINGLETON,
+        useValue: server
+    });
+    injector.addProvider(Https.Server, {
+        scope: ProviderScope.SINGLETON,
+        useValue: server
+    });
+    injector.invoke(HttpsServer);
+    injector.invoke(Https.Server);
+    if (httpsPort !== false) {
+        const hostInfo = getHostInfoFromPort("https", httpsPort);
+        return async () => {
+            const resolvedHostInfo = await listenServer(injector, server, hostInfo);
+            settings.setRaw("httpsPort", `${resolvedHostInfo.address}:${resolvedHostInfo.port}`);
+        };
     }
 }
 //# sourceMappingURL=createHttpsServer.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"createHttpsServer.js","sourceRoot":"","sources":["../../../src/utils/createHttpsServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAmB,aAAa,EAAE,gBAAgB,EAAC,MAAM,UAAU,CAAC;AACzF,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,mBAAmB,EAAC,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,MAAM,UAAU,iBAAiB,CAAC,QAAyB;IACzD,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAC/B,CAAC;AAED,gBAAgB,CAAC;IACf,OAAO,EAAE,WAAW;IACpB,IAAI,EAAE,CAAC,mBAAmB,EAAE,aAAa,CAAC;IAC1C,KAAK,EAAE,aAAa,CAAC,SAAS;IAC9B,MAAM,EAAE,IAAI;IACZ,UAAU,CAAC,mBAAwC,EAAE,QAAuB;QAC1E,MAAM,OAAO,GAAG,QAAQ,CAAC,YAAa,CAAC;QAEvC,OAAO,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,mBAAmB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrE,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,QAAyB;IAC/D,MAAM,EAAC,QAAQ,EAAC,GAAG,QAAQ,CAAC;IAC5B,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAc,WAAW,CAAC,CAAC;IAEtD,IAAI,QAAQ,CAAC,SAAS,KAAK,KAAK,IAAI,MAAM,EAAE;QAC1C,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;QAChD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,OAAO,IAAI,IAAI,EAAE,CAAC,CAAC;QAEpE,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;QAC5D,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAE/B,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;KACrF;AACH,CAAC","sourcesContent":["import {Configuration, InjectorService, ProviderScope, registerProvider} from \"@tsed/di\";\nimport Https from \"https\";\nimport {PlatformApplication} from \"../services/PlatformApplication\";\nimport {HttpsServer} from \"../decorators/httpsServer\";\nimport {listenServer} from \"./listenServer\";\n\nexport function createHttpsServer(injector: InjectorService): void {\n  injector.invoke(HttpsServer);\n}\n\nregisterProvider({\n  provide: HttpsServer,\n  deps: [PlatformApplication, Configuration],\n  scope: ProviderScope.SINGLETON,\n  global: true,\n  useFactory(platformApplication: PlatformApplication, settings: Configuration) {\n    const options = settings.httpsOptions!;\n\n    return Https.createServer(options, platformApplication.callback());\n  }\n});\n\nexport async function listenHttpsServer(injector: InjectorService) {\n  const {settings} = injector;\n  const server = injector.get<HttpsServer>(HttpsServer);\n\n  if (settings.httpsPort !== false && server) {\n    const {address, port} = settings.getHttpsPort();\n    injector.logger.debug(`Start server on https://${address}:${port}`);\n\n    const options = await listenServer(server, {address, port});\n    settings.setHttpsPort(options);\n\n    injector.logger.info(`Listen server on https://${options.address}:${options.port}`);\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,WAAW,EAAC,MAAM,2BAA2B,CAAC;AACtD,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,WAAW,EAAE;QAChC,KAAK,EAAE,aAAa,CAAC,SAAS;QAC9B,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAC;IAEH,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,WAAW,CAAC,CAAC;IAC7B,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,SAAS,KAAK,KAAK,EAAE;QACvB,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;QACvF,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 {HttpsServer} from \"../decorators/httpsServer\";\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(HttpsServer, {\n    scope: ProviderScope.SINGLETON,\n    useValue: server\n  });\n\n  injector.addProvider(Https.Server, {\n    scope: ProviderScope.SINGLETON,\n    useValue: server\n  });\n\n  injector.invoke(HttpsServer);\n  injector.invoke(Https.Server);\n\n  if (httpsPort !== false) {\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    };\n  }\n}\n"]}

package/lib/esm/utils/createInjector.js

@@ -8,8 +8,6 @@ import { PlatformRouter } from "../services/PlatformRouter";
 import { PlatformApplication } from "../services/PlatformApplication";
 import { Platform } from "../services/Platform";
 import { PlatformRequest } from "../services/PlatformRequest";
-import { createHttpsServer } from "./createHttpsServer";
-import { createHttpServer } from "./createHttpServer";
 $log.name = "TSED";
 const DEFAULT_PROVIDERS = [
     { provide: PlatformHandler },
@@ -31,8 +29,6 @@ export function createInjector({ providers = [], settings = {} }) {
         injector.addProvider(token, provider);
     });
     injector.invoke(PlatformApplication);
-    createHttpsServer(injector);
-    createHttpServer(injector);
     return injector;
 }
 //# sourceMappingURL=createInjector.js.map

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,EAAa,cAAc,EAAC,MAAM,UAAU,CAAC;AACpE,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,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAEpD,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,SAAS,GAAG,EAAE,EAAE,QAAQ,GAAG,EAAE,EAAwB;IACnF,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,cAAc,CAAC,QAAQ,CAAC,CAAC;IAEzB,SAAS,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,SAAS,CAAC,CAAC;IAEjD,KAAK,CAAiB,SAAS,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QACtE,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACrC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC5B,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAE3B,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import {InjectorService, IProvider, 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 {createHttpsServer} from \"./createHttpsServer\";\nimport {createHttpServer} from \"./createHttpServer\";\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  providers?: IProvider[];\n  settings?: Partial<TsED.Configuration>;\n}\n\nexport function createInjector({providers = [], 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  setLoggerLevel(injector);\n\n  providers = [...DEFAULT_PROVIDERS, ...providers];\n\n  toMap<any, IProvider>(providers, \"provide\").forEach((provider, token) => {\n    injector.addProvider(token, provider);\n  });\n\n  injector.invoke(PlatformApplication);\n  createHttpsServer(injector);\n  createHttpServer(injector);\n\n  return injector;\n}\n"]}
+{"version":3,"file":"createInjector.js","sourceRoot":"","sources":["../../../src/utils/createInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAa,cAAc,EAAC,MAAM,UAAU,CAAC;AACpE,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAClC,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AACjC,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;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,SAAS,GAAG,EAAE,EAAE,QAAQ,GAAG,EAAE,EAAwB;IACnF,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,cAAc,CAAC,QAAQ,CAAC,CAAC;IAEzB,SAAS,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,SAAS,CAAC,CAAC;IAEjD,KAAK,CAAiB,SAAS,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QACtE,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, IProvider, setLoggerLevel} from \"@tsed/di\";\nimport {$log} from \"@tsed/logger\";\nimport {toMap} 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\";\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  providers?: IProvider[];\n  settings?: Partial<TsED.Configuration>;\n}\n\nexport function createInjector({providers = [], 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  setLoggerLevel(injector);\n\n  providers = [...DEFAULT_PROVIDERS, ...providers];\n\n  toMap<any, IProvider>(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/listenServer.js

@@ -1,13 +1,17 @@
-export function listenServer(http, settings) {
-    const { address, port } = settings;
+export function listenServer(injector, server, hostInfo) {
+    const { protocol, address, port } = hostInfo;
+    const url = `${protocol}://${address}:${port}`;
+    injector.logger.debug(`Start server on ${url}`);
     const promise = new Promise((resolve, reject) => {
-        http.on("listening", resolve);
-        http.on("error", reject);
+        server.on("listening", resolve);
+        server.on("error", reject);
     }).then(() => {
-        const port = http.address().port;
-        return { address: settings.address, port };
+        const port = server.address().port;
+        const info = { ...hostInfo, port };
+        injector.logger.info(`Listen server on ${info.toString()}`);
+        return info;
     });
-    http.listen(port, address);
+    server.listen(port, address);
     return promise;
 }
 //# sourceMappingURL=listenServer.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"listenServer.js","sourceRoot":"","sources":["../../../src/utils/listenServer.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,YAAY,CAC1B,IAAgC,EAChC,QAAkD;IAElD,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,QAAQ,CAAC;IAEjC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9C,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9B,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACX,MAAM,IAAI,GAAI,IAAI,CAAC,OAAO,EAAU,CAAC,IAAI,CAAC;QAE1C,OAAO,EAAC,OAAO,EAAE,QAAQ,CAAC,OAAiB,EAAE,IAAI,EAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,OAAc,CAAC,CAAC;IAElC,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import Http from \"http\";\nimport Https from \"https\";\n\nexport function listenServer(\n  http: Http.Server | Https.Server,\n  settings: {address: string | number; port: number}\n): Promise<{address: string; port: number}> {\n  const {address, port} = settings;\n\n  const promise = new Promise((resolve, reject) => {\n    http.on(\"listening\", resolve);\n    http.on(\"error\", reject);\n  }).then(() => {\n    const port = (http.address() as any).port;\n\n    return {address: settings.address as string, port};\n  });\n\n  http.listen(port, address as any);\n\n  return promise;\n}\n"]}
+{"version":3,"file":"listenServer.js","sourceRoot":"","sources":["../../../src/utils/listenServer.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,YAAY,CAC1B,QAAyB,EACzB,MAAsD,EACtD,QAAgD;IAEhD,MAAM,EAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAC,GAAG,QAAQ,CAAC;IAC3C,MAAM,GAAG,GAAG,GAAG,QAAQ,MAAM,OAAO,IAAI,IAAI,EAAE,CAAC;IAC/C,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAC;IAEhD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9C,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAChC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACX,MAAM,IAAI,GAAI,MAAM,CAAC,OAAO,EAAU,CAAC,IAAI,CAAC;QAC5C,MAAM,IAAI,GAAG,EAAC,GAAG,QAAQ,EAAE,IAAI,EAAC,CAAC;QAEjC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAE5D,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAc,CAAC,CAAC;IAEpC,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import type Http from \"http\";\nimport type Https from \"https\";\nimport type Http2 from \"http2\";\nimport {InjectorService} from \"@tsed/di\";\nimport {getHostInfoFromPort} from \"@tsed/core\";\n\nexport function listenServer(\n  injector: InjectorService,\n  server: Http.Server | Https.Server | Http2.Http2Server,\n  hostInfo: ReturnType<typeof getHostInfoFromPort>\n): Promise<ReturnType<typeof getHostInfoFromPort>> {\n  const {protocol, address, port} = hostInfo;\n  const url = `${protocol}://${address}:${port}`;\n  injector.logger.debug(`Start server on ${url}`);\n\n  const promise = new Promise((resolve, reject) => {\n    server.on(\"listening\", resolve);\n    server.on(\"error\", reject);\n  }).then(() => {\n    const port = (server.address() as any).port;\n    const info = {...hostInfo, port};\n\n    injector.logger.info(`Listen server on ${info.toString()}`);\n\n    return info;\n  });\n\n  server.listen(port, address as any);\n\n  return promise;\n}\n"]}

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

@@ -4,35 +4,17 @@ import { InjectorService, IProvider } from "@tsed/di";
 import { Platform } from "../services/Platform";
 import { PlatformApplication } from "../services/PlatformApplication";
 import { IncomingMessage, ServerResponse } from "http";
-/**
- * @ignore
- */
-export interface PlatformType<T = any> extends Type<T> {
-    providers: IProvider[];
-}
-/**
- * @ignore
- */
-export interface PlatformBootstrap {
-    create(module: Type<any>, settings?: Partial<TsED.Configuration>): PlatformBuilder;
-    bootstrap(module: Type<any>, settings?: Partial<TsED.Configuration>): Promise<PlatformBuilder>;
-}
-export interface PlatformBuilderOptions {
-    name: string;
-    providers: IProvider[];
-    settings: any;
-    module: Type<any>;
-}
+import { PlatformAdapter, PlatformBuilderSettings } from "../interfaces/PlatformAdapter";
 /**
  * @platform
  */
-export declare abstract class PlatformBuilder<App = TsED.Application, Router = TsED.Router> {
+export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Router> {
     #private;
-    static currentPlatform: Type<PlatformBuilder<any, any>> & PlatformBootstrap;
+    static adapter: Type<PlatformAdapter>;
     readonly name: string;
     protected startedAt: Date;
     protected current: Date;
-    constructor({ name, providers, settings, module }: PlatformBuilderOptions);
+    protected constructor(adapter: Type<PlatformAdapter<App, Router>> | undefined, module: Type, settings: Partial<TsED.Configuration>);
     get injector(): InjectorService;
     get rootModule(): any;
     get app(): PlatformApplication<App, Router>;
@@ -61,7 +43,14 @@ export declare abstract class PlatformBuilder<App = TsED.Application, Router = T
     get settings(): TsED.Configuration & import("@tsed/di").DIConfiguration;
     get logger(): import("@tsed/di").DILogger;
     get disableBootstrapLog(): boolean | undefined;
-    static build<T extends PlatformBuilder<any, any>>(platformBuildClass: PlatformType<T>, module: Type<any>, settings?: Partial<TsED.Configuration>): T;
+    static create<App = TsED.Application, Router = TsED.Router>(module: Type<any>, settings: PlatformBuilderSettings<App, Router>): PlatformBuilder<App, Router>;
+    static build<App = TsED.Application, Router = TsED.Router>(module: Type<any>, { adapter, ...settings }: PlatformBuilderSettings<App, Router>): PlatformBuilder<App, Router>;
+    /**
+     * Bootstrap a server application
+     * @param module
+     * @param settings
+     */
+    static bootstrap<App = TsED.Application, Router = TsED.Router>(module: Type<any>, settings: PlatformBuilderSettings<App, Router>): Promise<PlatformBuilder<App, Router>>;
     callback(): (req: IncomingMessage, res: ServerResponse) => void;
     callback(req: IncomingMessage, res: ServerResponse): void;
     log(...data: any[]): any;
@@ -93,13 +82,14 @@ export declare abstract class PlatformBuilder<App = TsED.Application, Router = T
     addControllers(endpoint: string, controllers: any | string | (any | string)[]): void;
     runLifecycle(): Promise<this>;
     loadInjector(): Promise<void>;
-    listen(): Promise<void>;
+    listen(network?: boolean): Promise<void>;
     stop(): Promise<void>;
     ready(): Promise<void>;
     callHook(hook: string, ...args: any[]): Promise<void>;
     loadStatics(hook: string): Promise<void>;
     useProvider(token: Type<any>, settings?: Partial<IProvider>): this;
     bootstrap(): Promise<this>;
+    protected loadRoutes(): Promise<void>;
     protected diff(): string;
     protected importProviders(): Promise<void>;
     /**
@@ -108,9 +98,7 @@ export declare abstract class PlatformBuilder<App = TsED.Application, Router = T
      * @protected
      */
     protected loadMiddlewaresFor(hook: string): void;
-    protected useRouter(): this;
-    protected useContext(): this;
+    protected createHttpServers(): void;
     protected listenServers(): Promise<void>;
     protected logRoutes(): Promise<void>;
-    protected loadRoutes(): Promise<void>;
 }

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

@@ -1,11 +1,12 @@
 /// <reference types="node" />
 import { Env } from "@tsed/core";
-import Https from "https";
 import { ConverterSettings } from "./ConverterSettings";
 import { EndpointDirectoriesSettings } from "./EndpointDirectoriesSettings";
 import { PlatformLoggerSettings } from "./PlatformLoggerSettings";
 import { PlatformMulterSettings } from "./PlatformMulterSettings";
 import { PlatformStaticsSettings } from "./PlatformStaticsSettings";
+import type Http from "http";
+import type Https from "https";
 declare global {
     namespace TsED {
         interface LoggerConfiguration extends Partial<PlatformLoggerSettings> {
@@ -27,6 +28,14 @@ declare global {
              * Port number for the [HTTP.Server](https://nodejs.org/api/http.html#http_class_http_server).
              */
             httpPort: string | number | boolean;
+            /**
+             * [Https.ServerOptions](https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener)):
+             * - `key` &lt;string&gt; | &lt;string[]&gt; | [&lt;Buffer&gt;](https://nodejs.org/api/buffer.html#buffer_class_buffer) | &lt;Object[]&gt;: The private key of the server in PEM format. To support multiple keys using different algorithms an array can be provided either as a plain array of key strings or an array of objects in the format `{pem: key, passphrase: passphrase}`. This option is required for ciphers that make use of private keys.
+             * - `passphrase` &lt;string&gt; A string containing the passphrase for the private key or pfx.
+             * - `cert` &lt;string&gt; | &lt;string[]&gt; | [&lt;Buffer&gt;](https://nodejs.org/api/buffer.html#buffer_class_buffer) | [&lt;Buffer[]&gt;](https://nodejs.org/api/buffer.html#buffer_class_buffer): A string, Buffer, array of strings, or array of Buffers containing the certificate key of the server in PEM format. (Required)
+             * - `ca` &lt;string&gt; | &lt;string[]&gt; | [&lt;Buffer&gt;](https://nodejs.org/api/buffer.html#buffer_class_buffer) | [&lt;Buffer[]&gt;](https://nodejs.org/api/buffer.html#buffer_class_buffer): A string, Buffer, array of strings, or array of Buffers of trusted certificates in PEM format. If this is omitted several well known "root" CAs (like VeriSign) will be used. These are used to authorize connections.
+             */
+            httpOptions: Http.ServerOptions;
             /**
              * Port number for the [HTTPs.Server](https://nodejs.org/api/https.html#https_class_https_server).
              */

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Env } from "@tsed/core";
+import { Env, getHostInfoFromPort } from "@tsed/core";
 import { DIConfiguration } from "@tsed/di";
 import Https from "https";
 import { EndpointDirectoriesSettings, PlatformLoggerSettings } from "../interfaces";
@@ -39,20 +39,11 @@ export declare class PlatformConfiguration extends DIConfiguration {
     set logger(value: Partial<PlatformLoggerSettings>);
     get exclude(): string[];
     set exclude(exclude: string[]);
-    /**
-     *
-     * @param addressPort
-     * @returns {{address: string, port: number}}
-     */
-    private static buildAddressAndPort;
     /**
      *
      * @returns {string|number}
      */
-    getHttpPort(): {
-        address: string;
-        port: number;
-    };
+    getHttpPort(): ReturnType<typeof getHostInfoFromPort>;
     /**
      *
      * @param settings
@@ -66,8 +57,10 @@ export declare class PlatformConfiguration extends DIConfiguration {
      * @returns {string|number}
      */
     getHttpsPort(): {
+        protocol: string;
         address: string;
         port: number;
+        toString(): string;
     };
     /**
      *
@@ -78,8 +71,11 @@ export declare class PlatformConfiguration extends DIConfiguration {
         port: number;
     }): void;
     getBestHost(): {
+        protocol: string;
         address: string;
         port: number;
-        protocol: string;
-    } | undefined;
+        toString(): string;
+    } | {
+        toString(): string;
+    };
 }

package/lib/types/decorators/httpServer.d.ts

@@ -22,6 +22,7 @@ import Http from "http";
  * @param {TypedPropertyDescriptor<Function> | number} descriptor
  * @returns {any}
  * @decorator
+ * @deprecated Use Https.Server from "http"
  */
 export declare function HttpServer(target: Type<any>, targetKey: string, descriptor: TypedPropertyDescriptor<Function> | number): any;
 export declare type HttpServer = Http.Server;

package/lib/types/decorators/httpsServer.d.ts

@@ -22,6 +22,7 @@ import Https from "https";
  * @param {TypedPropertyDescriptor<Function> | number} descriptor
  * @returns {any}
  * @decorator
+ * @deprecated Use Https.Server from "https"
  */
 export declare function HttpsServer(target: Type<any>, targetKey: string, descriptor: TypedPropertyDescriptor<Function> | number): any;
 export declare type HttpsServer = Https.Server;

package/lib/types/interfaces/PlatformAdapter.d.ts

@@ -0,0 +1,19 @@
+import { Type } from "@tsed/core";
+import { IProvider } from "@tsed/di";
+export interface PlatformAdapter<App = TsED.Application, Router = TsED.Router> {
+    /**
+     * Load providers in top priority
+     */
+    readonly providers: IProvider[];
+    /**
+     * Called after the injector instantiation
+     */
+    onInit?: () => any;
+    beforeLoadRoutes?: () => Promise<any>;
+    afterLoadRoutes?: () => Promise<any>;
+    useRouter?: () => any;
+    useContext?: () => any;
+}
+export interface PlatformBuilderSettings<App = TsED.Application, Router = TsED.Router> extends Partial<TsED.Configuration> {
+    adapter?: Type<PlatformAdapter<App, Router>>;
+}

package/lib/types/interfaces/index.d.ts

@@ -14,3 +14,4 @@ export * from "./OnRequest";
 export * from "./OnResponse";
 export * from "./Route";
 export * from "./IncomingEvent";
+export * from "./PlatformAdapter";

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

@@ -1,12 +1,12 @@
-import { Type } from "@tsed/core";
 import { DITest, InjectorService } from "@tsed/di";
-import { PlatformBuilder } from "../builder/PlatformBuilder";
 import { PlatformContext, PlatformContextOptions } from "../domain/PlatformContext";
+import { PlatformAdapter, PlatformBuilderSettings } from "../interfaces/PlatformAdapter";
+import { Type } from "@tsed/core";
 /**
  * @platform
  */
 export declare class PlatformTest extends DITest {
-    static platformBuilder: Type<PlatformBuilder<any, any>>;
+    static adapter: Type<PlatformAdapter>;
     static create(settings?: Partial<TsED.Configuration>): Promise<void>;
     /**
      * Create a new injector with the right default services
@@ -16,10 +16,11 @@ export declare class PlatformTest extends DITest {
      * Load the server silently without listening port and configure it on test profile.
      * @decorator
      * @param mod
+     * @param listen
      * @param settings
      * @returns {Promise<void>}
      */
-    static bootstrap(mod: any, settings?: Partial<TsED.Configuration & {
+    static bootstrap(mod: any, { listen, ...settings }?: Partial<PlatformBuilderSettings & {
         listen: boolean;
     }>): () => Promise<void>;
     /**

package/lib/types/utils/createHttpServer.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { InjectorService } from "@tsed/di";
-export declare function createHttpServer(injector: InjectorService): void;
-export declare function listenHttpServer(injector: InjectorService): Promise<void>;
+import Http from "http";
+export declare function createHttpServer(injector: InjectorService, requestListener: Http.RequestListener): (() => Promise<void>) | undefined;

package/lib/types/utils/createHttpsServer.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { InjectorService } from "@tsed/di";
-export declare function createHttpsServer(injector: InjectorService): void;
-export declare function listenHttpsServer(injector: InjectorService): Promise<void>;
+import Http from "http";
+export declare function createHttpsServer(injector: InjectorService, requestListener?: Http.RequestListener): (() => Promise<void>) | undefined;

package/lib/types/utils/listenServer.d.ts

@@ -1,10 +1,7 @@
 /// <reference types="node" />
-import Http from "http";
-import Https from "https";
-export declare function listenServer(http: Http.Server | Https.Server, settings: {
-    address: string | number;
-    port: number;
-}): Promise<{
-    address: string;
-    port: number;
-}>;
+import type Http from "http";
+import type Https from "https";
+import type Http2 from "http2";
+import { InjectorService } from "@tsed/di";
+import { getHostInfoFromPort } from "@tsed/core";
+export declare function listenServer(injector: InjectorService, server: Http.Server | Https.Server | Http2.Http2Server, hostInfo: ReturnType<typeof getHostInfoFromPort>): Promise<ReturnType<typeof getHostInfoFromPort>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/common",
-  "version": "6.89.0",
+  "version": "6.92.1",
   "description": "A TypeScript Framework on top of Express",
   "private": false,
   "source": "./src/index.ts",
@@ -59,24 +59,23 @@
     }
   ],
   "dependencies": {
-    "@tsed/components-scan": "6.89.0",
-    "@tsed/core": "6.89.0",
-    "@tsed/di": "6.89.0",
-    "@tsed/exceptions": "6.89.0",
-    "@tsed/json-mapper": "6.89.0",
+    "@tsed/components-scan": "6.92.1",
+    "@tsed/core": "6.92.1",
+    "@tsed/di": "6.92.1",
+    "@tsed/exceptions": "6.92.1",
+    "@tsed/json-mapper": "6.92.1",
     "@tsed/logger": "^6.0.0",
     "@tsed/logger-file": "^6.0.0",
-    "@tsed/perf": "6.89.0",
-    "@tsed/platform-cache": "6.89.0",
-    "@tsed/platform-exceptions": "6.89.0",
-    "@tsed/platform-log-middleware": "6.89.0",
-    "@tsed/platform-middlewares": "6.89.0",
-    "@tsed/platform-params": "6.89.0",
-    "@tsed/platform-response-filter": "6.89.0",
-    "@tsed/platform-views": "6.89.0",
-    "@tsed/schema": "6.89.0",
+    "@tsed/perf": "6.92.1",
+    "@tsed/platform-cache": "6.92.1",
+    "@tsed/platform-exceptions": "6.92.1",
+    "@tsed/platform-log-middleware": "6.92.1",
+    "@tsed/platform-middlewares": "6.92.1",
+    "@tsed/platform-params": "6.92.1",
+    "@tsed/platform-response-filter": "6.92.1",
+    "@tsed/platform-views": "6.92.1",
+    "@tsed/schema": "6.92.1",
     "@types/json-schema": "7.0.7",
-    "json-schema": "^0.2.3",
     "on-finished": "2.3.0",
     "tslib": "2.2.0",
     "uuid": "8.3.2"