@tsed/common 6.90.0 → 6.93.0

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

@@ -82,7 +82,7 @@ export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Route
     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>;
@@ -98,6 +98,7 @@ export declare class PlatformBuilder<App = TsED.Application, Router = TsED.Route
      * @protected
      */
     protected loadMiddlewaresFor(hook: string): void;
+    protected createHttpServers(): void;
     protected listenServers(): Promise<void>;
     protected logRoutes(): 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/domain/EndpointMetadata.d.ts

@@ -1,11 +1,6 @@
 import { Type } from "@tsed/core";
 import { ParamMetadata } from "@tsed/platform-params";
-import { JsonEntityStoreOptions, JsonMethodStore, JsonOperation } from "@tsed/schema";
-export interface EndpointConstructorOptions extends JsonEntityStoreOptions {
-    beforeMiddlewares?: Function[];
-    middlewares?: Function[];
-    afterMiddlewares?: Function[];
-}
+import { JsonMethodStore } from "@tsed/schema";
 export interface EndpointViewOptions {
     path: string;
     options: any;
@@ -30,11 +25,7 @@ export interface EndpointRedirectOptions {
  *    }
  *
  */
-export declare class EndpointMetadata extends JsonMethodStore implements EndpointConstructorOptions {
-    beforeMiddlewares: any[];
-    middlewares: any[];
-    afterMiddlewares: any[];
-    constructor(options: EndpointConstructorOptions);
+export declare class EndpointMetadata extends JsonMethodStore {
     get targetName(): string;
     get params(): ParamMetadata[];
     get view(): EndpointViewOptions;
@@ -48,7 +39,7 @@ export declare class EndpointMetadata extends JsonMethodStore implements Endpoin
      * @param descriptor
      */
     static get(target: Type<any>, propertyKey: string | symbol, descriptor?: PropertyDescriptor): EndpointMetadata;
-    addOperationPath(method: string, path: string | RegExp, options?: any): JsonOperation;
+    addOperationPath(method: string, path: string | RegExp, options?: any): import("@tsed/schema").JsonOperation;
     /**
      * Find the a value at the controller level. Let this value be extended or overridden by the endpoint itself.
      *
@@ -56,21 +47,4 @@ export declare class EndpointMetadata extends JsonMethodStore implements Endpoin
      * @returns {any}
      */
     get<T = any>(key: any): T;
-    /**
-     * Append middlewares to the beforeMiddlewares list.
-     * @param args
-     * @returns {EndpointMetadata}
-     */
-    before(args: Function[]): this;
-    /**
-     * Append middlewares to the afterMiddlewares list.
-     * @param args
-     * @returns {EndpointMetadata}
-     */
-    after(args: Function[]): this;
-    /**
-     * Store all arguments collected via Annotation.
-     * @param args
-     */
-    use(args: Function[]): this;
 }

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.90.0",
+  "version": "6.93.0",
   "description": "A TypeScript Framework on top of Express",
   "private": false,
   "source": "./src/index.ts",
@@ -59,22 +59,22 @@
     }
   ],
   "dependencies": {
-    "@tsed/components-scan": "6.90.0",
-    "@tsed/core": "6.90.0",
-    "@tsed/di": "6.90.0",
-    "@tsed/exceptions": "6.90.0",
-    "@tsed/json-mapper": "6.90.0",
+    "@tsed/components-scan": "6.93.0",
+    "@tsed/core": "6.93.0",
+    "@tsed/di": "6.93.0",
+    "@tsed/exceptions": "6.93.0",
+    "@tsed/json-mapper": "6.93.0",
     "@tsed/logger": "^6.0.0",
     "@tsed/logger-file": "^6.0.0",
-    "@tsed/perf": "6.90.0",
-    "@tsed/platform-cache": "6.90.0",
-    "@tsed/platform-exceptions": "6.90.0",
-    "@tsed/platform-log-middleware": "6.90.0",
-    "@tsed/platform-middlewares": "6.90.0",
-    "@tsed/platform-params": "6.90.0",
-    "@tsed/platform-response-filter": "6.90.0",
-    "@tsed/platform-views": "6.90.0",
-    "@tsed/schema": "6.90.0",
+    "@tsed/perf": "6.93.0",
+    "@tsed/platform-cache": "6.93.0",
+    "@tsed/platform-exceptions": "6.93.0",
+    "@tsed/platform-log-middleware": "6.93.0",
+    "@tsed/platform-middlewares": "6.93.0",
+    "@tsed/platform-params": "6.93.0",
+    "@tsed/platform-response-filter": "6.93.0",
+    "@tsed/platform-views": "6.93.0",
+    "@tsed/schema": "6.93.0",
     "@types/json-schema": "7.0.7",
     "on-finished": "2.3.0",
     "tslib": "2.2.0",