@tsed/common 6.87.1 → 6.87.2

package/lib/builder/PlatformBuilder.d.ts

@@ -113,5 +113,4 @@ export declare abstract class PlatformBuilder<App = TsED.Application, Router = T
     protected listenServers(): Promise<void>;
     protected logRoutes(): Promise<void>;
     protected loadRoutes(): Promise<void>;
-    protected createInjector(module: Type<any>, providers: IProvider[], settings: any): void;
 }

package/lib/index.js

@@ -14,8 +14,8 @@ var core = require('@tsed/core');
 var exceptions = require('@tsed/exceptions');
 var schema = require('@tsed/schema');
 var util = require('util');
-var Http = require('http');
 var Https = require('https');
+var Http = require('http');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -39,8 +39,8 @@ function _interopNamespace(e) {
   return n;
 }
 
-var Http__default = /*#__PURE__*/_interopDefaultLegacy(Http);
 var Https__default = /*#__PURE__*/_interopDefaultLegacy(Https);
+var Http__default = /*#__PURE__*/_interopDefaultLegacy(Http);
 
 function _extends() {
   _extends = Object.assign || function (target) {
@@ -2215,36 +2215,21 @@ exports.Platform = tslib.__decorate([di.Injectable({
   imports: [exports.PlatformMiddlewaresChain]
 }), tslib.__metadata("design:paramtypes", [di.InjectorService, exports.PlatformApplication])], exports.Platform);
 
-logger.$log.name = "TSED";
-function createInjector(settings = {}) {
-  const injector = new di.InjectorService();
-  injector.addProvider(exports.PlatformConfiguration);
-  injector.settings = injector.invoke(exports.PlatformConfiguration);
-  injector.logger = logger.$log;
-  injector.settings.set(settings);
-  di.setLoggerLevel(injector);
-  return injector;
-}
-
-function createPlatformApplication(injector) {
-  injector.forkProvider(exports.PlatformApplication);
-}
-
 /**
- * Inject the Http.Server instance.
+ * Inject the Https.Server instance.
  *
  * ### Example
  *
  * ```typescript
- * import {HttpServer, Service} from "@tsed/common";
+ * import {HttpsServer, Service} from "@tsed/common";
  *
  * @Service()
  * export default class OtherService {
- *    constructor(@HttpServer httpServer: HttpServer) {}
+ *    constructor(@HttpsServer httpServer: HttpServer) {}
  * }
  * ```
  *
- * > Note: TypeScript transform and store `HttpServer` as `Function` type in the metadata. So to inject a factory, you must use the `@Inject(type)` decorator.
+ * > Note: TypeScript transform and store `HttpsServer` as `Function` type in the metadata. So to inject a factory, you must use the `@Inject(type)` decorator.
  *
  * @param {Type<any>} target
  * @param {string} targetKey
@@ -2253,8 +2238,8 @@ function createPlatformApplication(injector) {
  * @decorator
  */
 
-function HttpServer(target, targetKey, descriptor) {
-  return di.Inject(HttpServer)(target, targetKey, descriptor);
+function HttpsServer(target, targetKey, descriptor) {
+  return di.Inject(HttpsServer)(target, targetKey, descriptor);
 }
 
 function listenServer(http, settings) {
@@ -2276,56 +2261,57 @@ function listenServer(http, settings) {
   return promise;
 }
 
-function createHttpServer(injector) {
-  injector.forkProvider(HttpServer);
+function createHttpsServer(injector) {
+  injector.invoke(HttpsServer);
 }
 di.registerProvider({
-  provide: HttpServer,
-  deps: [exports.PlatformApplication],
+  provide: HttpsServer,
+  deps: [exports.PlatformApplication, di.Configuration],
   scope: di.ProviderScope.SINGLETON,
   global: true,
 
-  useFactory(platformApplication) {
-    return Http__default['default'].createServer(platformApplication.callback());
+  useFactory(platformApplication, settings) {
+    const options = settings.httpsOptions;
+    return Https__default['default'].createServer(options, platformApplication.callback());
   }
 
 });
-async function listenHttpServer(injector) {
+async function listenHttpsServer(injector) {
   const {
     settings
   } = injector;
-  const server = injector.get(HttpServer);
+  const server = injector.get(HttpsServer);
 
-  if (settings.httpPort !== false && server) {
+  if (settings.httpsPort !== false && server) {
     const {
       address,
       port
-    } = settings.getHttpPort();
-    injector.logger.debug(`Start server on http://${address}:${port}`);
+    } = settings.getHttpsPort();
+    injector.logger.debug(`Start server on https://${address}:${port}`);
     const options = await listenServer(server, {
       address,
       port
     });
-    settings.setHttpPort(options);
-    injector.logger.info(`Listen server on http://${options.address}:${options.port}`);
+    settings.setHttpsPort(options);
+    injector.logger.info(`Listen server on https://${options.address}:${options.port}`);
   }
 }
 
 /**
- * Inject the Https.Server instance.
+ * Inject the Http.Server instance.
  *
  * ### Example
  *
  * ```typescript
- * import {HttpsServer, Service} from "@tsed/common";
+ * import {HttpServer, Service} from "@tsed/common";
  *
  * @Service()
  * export default class OtherService {
- *    constructor(@HttpsServer httpServer: HttpServer) {}
+ *    constructor(@HttpServer httpServer: HttpServer) {}
  * }
  * ```
  *
- * > Note: TypeScript transform and store `HttpsServer` as `Function` type in the metadata. So to inject a factory, you must use the `@Inject(type)` decorator.
+ * > Note: TypeScript transform and store `HttpServer` as `Function` type in the metadata. So to inject a factory, you must use the `@Inject(type)` decorator.
  *
  * @param {Type<any>} target
  * @param {string} targetKey
@@ -2334,46 +2320,79 @@ async function listenHttpServer(injector) {
  * @decorator
  */
 
-function HttpsServer(target, targetKey, descriptor) {
-  return di.Inject(HttpsServer)(target, targetKey, descriptor);
+function HttpServer(target, targetKey, descriptor) {
+  return di.Inject(HttpServer)(target, targetKey, descriptor);
 }
 
-function createHttpsServer(injector) {
-  injector.forkProvider(HttpsServer);
+function createHttpServer(injector) {
+  injector.invoke(HttpServer);
 }
 di.registerProvider({
-  provide: HttpsServer,
-  deps: [exports.PlatformApplication, di.Configuration],
+  provide: HttpServer,
+  deps: [exports.PlatformApplication],
   scope: di.ProviderScope.SINGLETON,
   global: true,
 
-  useFactory(platformApplication, settings) {
-    const options = settings.httpsOptions;
-    return Https__default['default'].createServer(options, platformApplication.callback());
+  useFactory(platformApplication) {
+    return Http__default['default'].createServer(platformApplication.callback());
   }
 
 });
-async function listenHttpsServer(injector) {
+async function listenHttpServer(injector) {
   const {
     settings
   } = injector;
-  const server = injector.get(HttpsServer);
+  const server = injector.get(HttpServer);
 
-  if (settings.httpsPort !== false && server) {
+  if (settings.httpPort !== false && server) {
     const {
       address,
       port
-    } = settings.getHttpsPort();
-    injector.logger.debug(`Start server on https://${address}:${port}`);
+    } = settings.getHttpPort();
+    injector.logger.debug(`Start server on http://${address}:${port}`);
     const options = await listenServer(server, {
       address,
       port
     });
-    settings.setHttpsPort(options);
-    injector.logger.info(`Listen server on https://${options.address}:${options.port}`);
+    settings.setHttpPort(options);
+    injector.logger.info(`Listen server on http://${options.address}:${options.port}`);
   }
 }
 
+logger.$log.name = "TSED";
+const DEFAULT_PROVIDERS = [{
+  provide: exports.PlatformHandler
+}, {
+  provide: exports.PlatformResponse
+}, {
+  provide: exports.PlatformRequest
+}, {
+  provide: exports.PlatformRouter
+}, {
+  provide: exports.PlatformApplication
+}, {
+  provide: exports.Platform
+}];
+function createInjector({
+  providers = [],
+  settings = {}
+}) {
+  const injector = new di.InjectorService();
+  injector.addProvider(exports.PlatformConfiguration);
+  injector.settings = injector.invoke(exports.PlatformConfiguration);
+  injector.logger = logger.$log;
+  injector.settings.set(settings);
+  di.setLoggerLevel(injector);
+  providers = [...DEFAULT_PROVIDERS, ...providers];
+  core.toMap(providers, "provide").forEach((provider, token) => {
+    injector.addProvider(token, provider);
+  });
+  injector.invoke(exports.PlatformApplication);
+  createHttpsServer(injector);
+  createHttpServer(injector);
+  return injector;
+}
+
 /**
  * @ignore
  * @deprecated User injector.load(container, module) instead
@@ -2514,19 +2533,6 @@ function getConfiguration(configuration = {}, module = null) {
   return config;
 }
 
-const DEFAULT_PROVIDERS = [{
-  provide: exports.PlatformHandler
-}, {
-  provide: exports.PlatformResponse
-}, {
-  provide: exports.PlatformRequest
-}, {
-  provide: exports.PlatformRouter
-}, {
-  provide: exports.PlatformApplication
-}, {
-  provide: exports.Platform
-}];
 /**
  * @platform
  */
@@ -2555,7 +2561,13 @@ class PlatformBuilder {
     this.current = new Date();
     this.name = name;
     _classPrivateFieldLooseBase(this, _rootModule)[_rootModule] = module;
-    this.createInjector(module, providers, settings);
+    const configuration = getConfiguration(settings, module);
+    configuration.PLATFORM_NAME = name;
+    _classPrivateFieldLooseBase(this, _injector)[_injector] = createInjector({
+      settings: configuration,
+      providers
+    });
+    this.log("Injector created...");
   }
 
   get injector() {
@@ -2834,20 +2846,6 @@ class PlatformBuilder {
     await this.callHook("$afterRoutesInit");
   }
 
-  createInjector(module, providers, settings) {
-    const configuration = getConfiguration(settings, module);
-    configuration.PLATFORM_NAME = this.name;
-    _classPrivateFieldLooseBase(this, _injector)[_injector] = createInjector(configuration);
-    providers = [...DEFAULT_PROVIDERS, ...providers];
-    core.toMap(providers, "provide").forEach((provider, token) => {
-      this.injector.addProvider(token, provider);
-    });
-    createPlatformApplication(this.injector);
-    createHttpsServer(this.injector);
-    createHttpServer(this.injector);
-    this.log("Injector created...");
-  }
-
 }
 
 /**
@@ -3220,8 +3218,8 @@ function mapReturnedResponse(_ref) {
  */
 
 class PlatformTest extends di.DITest {
-  static async create(options = {}) {
-    di.DITest.injector = PlatformTest.createInjector(getConfiguration(options, null));
+  static async create(settings = {}) {
+    di.DITest.injector = PlatformTest.createInjector(getConfiguration(settings));
     const container = di.createContainer();
     await di.DITest.injector.load(container);
   }
@@ -3231,7 +3229,10 @@ class PlatformTest extends di.DITest {
 
 
   static createInjector(settings = {}) {
-    return createInjector(di.DITest.configure(settings));
+    return createInjector({
+      providers: [],
+      settings: di.DITest.configure(settings)
+    });
   }
   /**
    * Load the server silently without listening port and configure it on test profile.
@@ -3518,7 +3519,6 @@ exports.createContext = createContext;
 exports.createHttpServer = createHttpServer;
 exports.createHttpsServer = createHttpsServer;
 exports.createInjector = createInjector;
-exports.createPlatformApplication = createPlatformApplication;
 exports.createRouter = createRouter;
 exports.getRouter = getRouter;
 exports.listenHttpServer = listenHttpServer;