koatty 3.6.0 → 3.6.4

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.6.4](https://github.com/thinkkoa/koatty/compare/v3.6.3...v3.6.4) (2022-02-25)
+
+### [3.6.3](https://github.com/thinkkoa/koatty/compare/v3.6.2...v3.6.3) (2022-02-25)
+
+### [3.6.2](https://github.com/thinkkoa/koatty/compare/v3.6.0...v3.6.2) (2022-02-23)
+
 ## [3.6.0](https://github.com/thinkkoa/koatty/compare/v3.6.0-1...v3.6.0) (2022-02-22)
 
 ## [3.6.0-1](https://github.com/thinkkoa/koatty/compare/v3.6.0-0...v3.6.0-1) (2022-02-21)

package/README.md

@@ -51,33 +51,18 @@ koatty service test
 
 ```
 
-### 3.Create a Middleware （Optional）
-
-```shell
-koatty middleware test
-
-```
-### 4.Create a Model（Optional）
-
-Supports [typeorm](https://github.com/typeorm/typeorm). Please expand other ORM by yourself.
-
-```shell
-//typeorm
-koatty middleware test
-
-```
-
-### 5.Create a DTOClass （Optional）
+### 4.Create a DTOClass （Optional）
 
 ```shell
 koatty dto test
 
 ```
 
-### 6.Define TestController
+### 5.Define TestController
 
 ```javascript
-import { Controller, BaseController, Autowired, GetMapping, RequestBody, PathVariable, PostMapping, RequestMapping, RequestMethod, Valid } from "koatty";
+import { Controller, BaseController, Autowired, GetMapping, RequestBody, PathVariable,
+ PostMapping, RequestMapping, RequestMethod, Valid } from "koatty";
 import { TestDTO } from "../model/dto/TestDTO";
 import { TestService } from "../service/TestService";
 import { App } from "../App";
@@ -111,6 +96,33 @@ export class IndexController extends BaseController {
 }
 ```
 
+## How to do Unit Testing
+
+>now only support `jest` UT framework
+
+```javascript
+import request from 'supertest';
+import { ExecBootStrap } from 'koatty';
+
+import { App } from '../src/App';
+
+describe('UT example', () => {
+
+  let server;
+  beforeAll(async () => {
+    const appInstance = await ExecBootStrap()(App);
+    server = appInstance.callback();
+  });
+
+  it('request', async (done) => {
+    const rsp = await request(server).get('/path/to/server');
+    expect(rsp.status).toBe(200);
+    done();
+  });
+});
+
+```
+
 ## How to debug
 
 if you use vscode , edit the `.vscode/launch.json` , like this: 

package/dist/README.md

@@ -51,33 +51,18 @@ koatty service test
 
 ```
 
-### 3.Create a Middleware （Optional）
-
-```shell
-koatty middleware test
-
-```
-### 4.Create a Model（Optional）
-
-Supports [typeorm](https://github.com/typeorm/typeorm). Please expand other ORM by yourself.
-
-```shell
-//typeorm
-koatty middleware test
-
-```
-
-### 5.Create a DTOClass （Optional）
+### 4.Create a DTOClass （Optional）
 
 ```shell
 koatty dto test
 
 ```
 
-### 6.Define TestController
+### 5.Define TestController
 
 ```javascript
-import { Controller, BaseController, Autowired, GetMapping, RequestBody, PathVariable, PostMapping, RequestMapping, RequestMethod, Valid } from "koatty";
+import { Controller, BaseController, Autowired, GetMapping, RequestBody, PathVariable,
+ PostMapping, RequestMapping, RequestMethod, Valid } from "koatty";
 import { TestDTO } from "../model/dto/TestDTO";
 import { TestService } from "../service/TestService";
 import { App } from "../App";
@@ -111,6 +96,33 @@ export class IndexController extends BaseController {
 }
 ```
 
+## How to do Unit Testing
+
+>now only support `jest` UT framework
+
+```javascript
+import request from 'supertest';
+import { ExecBootStrap } from 'koatty';
+
+import { App } from '../src/App';
+
+describe('UT example', () => {
+
+  let server;
+  beforeAll(async () => {
+    const appInstance = await ExecBootStrap()(App);
+    server = appInstance.callback();
+  });
+
+  it('request', async (done) => {
+    const rsp = await request(server).get('/path/to/server');
+    expect(rsp.status).toBe(200);
+    done();
+  });
+});
+
+```
+
 ## How to debug
 
 if you use vscode , edit the `.vscode/launch.json` , like this: 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-02-22 11:12:20
+* @Date: 2022-02-25 16:53:03
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -164,6 +164,15 @@ export declare function ConfigurationScan(scanPath?: string | string[]): ClassDe
  */
 export declare function Controller(path?: string): ClassDecorator;
 
+/**
+ * Actively perform dependency injection
+ * Parse the decorator, return the instantiated app.
+ * @export  ExecBootStrap
+ * @param {Function} [bootFunc] callback function
+ * @returns
+ */
+export declare function ExecBootStrap(bootFunc?: Function): (target: any) => Promise<void>;
+
 export { Helper }
 
 /**

package/dist/index.js

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-02-22 11:12:04
+* @Date: 2022-02-25 16:52:45
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -11,10 +11,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var koatty_lib = require('koatty_lib');
 require('reflect-metadata');
-var koatty_router = require('koatty_router');
+var fs = require('fs');
 var koatty_core = require('koatty_core');
-var koatty_serve = require('koatty_serve');
+var koatty_router = require('koatty_router');
 var koatty_container = require('koatty_container');
+var koatty_serve = require('koatty_serve');
 var path = require('path');
 var koatty_loader = require('koatty_loader');
 var koatty_config = require('koatty_config');
@@ -23,6 +24,8 @@ var koatty_exception = require('koatty_exception');
 var koatty_trace = require('koatty_trace');
 var koatty_payload = require('koatty_payload');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
 function _interopNamespace(e) {
     if (e && e.__esModule) return e;
     var n = Object.create(null);
@@ -41,6 +44,7 @@ function _interopNamespace(e) {
     return Object.freeze(n);
 }
 
+var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
 
 /**
@@ -446,14 +450,14 @@ const Logger = koatty_logger.DefaultLogger;
  *     logFilePath?: string;
  * }} config
  */
-function SetLogger(config) {
+function SetLogger(app, config) {
     if (config.logLevel !== undefined) {
         koatty_logger.DefaultLogger.setLevel(config.logLevel);
     }
-    if (config.logConsole !== undefined) {
+    if (config.logConsole !== undefined && !app.silent) {
         koatty_logger.DefaultLogger.setLogConsole(config.logConsole);
     }
-    if (config.logFile !== undefined) {
+    if (config.logFile !== undefined && !app.silent) {
         koatty_logger.DefaultLogger.setLogFile(config.logFile);
         koatty_logger.DefaultLogger.setLogFilePath(config.logFilePath);
     }
@@ -650,7 +654,7 @@ class Loader {
             if (opt.logs_path) {
                 logFilePath = opt.logs_path;
             }
-            SetLogger({ logLevel, logConsole, logFile, logFileLevel, logFilePath });
+            SetLogger(app, { logLevel, logConsole, logFile, logFileLevel, logFilePath });
         }
     }
     /**
@@ -721,13 +725,13 @@ class Loader {
         });
         const middlewareConfList = middlewareConf.list;
         const defaultList = ["TraceMiddleware", "PayloadMiddleware"];
+        //de-duplication
+        const appMList = new Set(defaultList);
         middlewareConfList.forEach((item) => {
             if (!defaultList.includes(item)) {
-                defaultList.push(item);
+                appMList.add(item);
             }
         });
-        //de-duplication
-        const appMList = [...new Set(defaultList)];
         //Automatically call middleware
         for (const key of appMList) {
             const handle = koatty_container.IOCContainer.get(key, "MIDDLEWARE");
@@ -868,7 +872,7 @@ class Loader {
     }
 }
 
-var version = "3.6.0";
+var version = "3.6.4";
 var engines = {
 	node: ">12.0.0"
 };
@@ -878,7 +882,7 @@ var engines = {
 * @Usage:
 * @Author: richen
 * @Date: 2021-12-17 11:54:06
- * @LastEditTime: 2021-12-17 13:13:00
+ * @LastEditTime: 2022-02-23 16:12:34
 */
 const KOATTY_VERSION = version;
 const ENGINES_VERSION = engines.node.slice(1) || '12.0.0';
@@ -898,7 +902,21 @@ function checkRuntime() {
         Logger.Error(`Koatty need node version > ${nodeEngines}, current version is ${nodeVersion}, please upgrade it.`);
         process.exit(-1);
     }
-}
+}
+/**
+ * unittest running environment detection
+ * only support jest
+ * @returns {boolean}
+ */
+const checkUTRuntime = () => {
+    let isUTRuntime = false;
+    // UT运行环境判断，暂时先只判断jest
+    const argv = JSON.stringify(process.argv[1]);
+    if (argv.indexOf('jest') > -1) {
+        isUTRuntime = true;
+    }
+    return isUTRuntime;
+};
 
 /**
  * @ author: richen
@@ -911,14 +929,27 @@ function checkRuntime() {
  *
  * @param {*} target
  * @param {Function} bootFunc
+ * @param {boolean} [isInitiative=false] Whether to actively execute app instantiation,
+ * mainly for unittest scenarios, you need to actively obtain app instances
  * @returns {Promise<void>}
  */
-const ExecBootstrap = async function (target, bootFunc) {
+const executeBootstrap = async function (target, bootFunc, isInitiative = false) {
     // checked runtime
     checkRuntime();
+    // unittest running environment
+    const isUTRuntime = checkUTRuntime();
+    if (!isInitiative && isUTRuntime) {
+        return;
+    }
     const app = Reflect.construct(target, []);
+    // unittest does not print startup logs
+    if (isUTRuntime) {
+        app.silent = true;
+        Logger.setLogConsole(false);
+        Logger.setLogFile(false);
+    }
     try {
-        console.log(LOGO);
+        !app.silent && console.log(LOGO);
         if (!(app instanceof koatty_core.Koatty)) {
             throw new Error(`class ${target.name} does not inherit from Koatty`);
         }
@@ -971,14 +1002,14 @@ const ExecBootstrap = async function (target, bootFunc) {
         // Load Routers
         Logger.Log('think', '', 'Load Routers ...');
         KoattyRouter.LoadRouter(app.getMetaData("_controllers"));
-        // Emit app started event
-        Logger.Log('think', '', 'Emit App Start ...');
-        // app.emit("appStart");
-        const server = newServe(app);
-        await asyncEvent(app, 'appStart');
         Logger.Log('think', '', '====================================');
         // Start server
-        app.listen(server);
+        const server = newServe(app);
+        app.listen(server, listenCallback(app, server.options));
+        // app.emit("appStart");
+        // Emit app started event
+        Logger.Log('think', '', 'Emit App Start ...');
+        asyncEvent(app, 'appStart');
         // binding event "appStop"
         koatty_serve.BindProcessEvent(app, 'appStop');
     }
@@ -1002,6 +1033,24 @@ const newRouter = function (app) {
     koatty_lib.Helper.define(app, "router", router);
     return router;
 };
+/**
+ * Listening callback function
+ *
+ * @param {Koatty} app
+ * @param {ListeningOptions} options
+ * @returns {*}
+ */
+const listenCallback = (app, options) => {
+    return function () {
+        Logger.Log("think", "", `Nodejs Version: ${process.version}`);
+        Logger.Log("think", "", `Koatty Version: v${app.version}`);
+        Logger.Log("think", "", `App Environment: ${app.env}`);
+        Logger.Log("think", "", `Server running at ${options.protocol === "http2" ? "https" : options.protocol}://${options.hostname || '127.0.0.1'}:${options.port}/`);
+        Logger.Log("think", "", "====================================");
+        // tslint:disable-next-line: no-unused-expression
+        app.appDebug && Logger.Warn(`Running in debug mode.`);
+    };
+};
 /**
  * create serve
  *
@@ -1009,8 +1058,37 @@ const newRouter = function (app) {
  * @returns {*}
  */
 const newServe = function (app) {
+    var _a, _b, _c;
     const protocol = app.config("protocol") || "http";
-    const server = koatty_serve.Serve(app, protocol);
+    const port = process.env.PORT || process.env.APP_PORT ||
+        app.config('app_port') || 3000;
+    const hostname = process.env.IP ||
+        ((_a = process.env.HOSTNAME) === null || _a === void 0 ? void 0 : _a.replace(/-/g, '.')) || app.config('app_host') || '127.0.0.1';
+    const options = {
+        hostname,
+        port,
+        protocol,
+        ext: {
+            key: "",
+            cert: "",
+            protoFile: "",
+        },
+    };
+    const pm = new Set(["https", "http2", "wss"]);
+    if (pm.has(options.protocol)) {
+        const keyFile = (_b = app.config("key_file")) !== null && _b !== void 0 ? _b : "";
+        const crtFile = (_c = app.config("crt_file")) !== null && _c !== void 0 ? _c : "";
+        options.ext.key = fs__default["default"].readFileSync(keyFile).toString();
+        options.ext.cert = fs__default["default"].readFileSync(crtFile).toString();
+    }
+    if (options.protocol === "https" || options.protocol === "http2") {
+        options.port = options.port == 80 ? 443 : options.port;
+    }
+    if (options.protocol === "grpc") {
+        const proto = app.config("protoFile", "router");
+        options.ext.protoFile = proto;
+    }
+    const server = koatty_serve.Serve(app, options);
     koatty_lib.Helper.define(app, "server", server);
     return server;
 };
@@ -1042,7 +1120,22 @@ function Bootstrap(bootFunc) {
         if (!(target.prototype instanceof koatty_core.Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
         }
-        ExecBootstrap(target, bootFunc);
+        executeBootstrap(target, bootFunc);
+    };
+}
+/**
+ * Actively perform dependency injection
+ * Parse the decorator, return the instantiated app.
+ * @export  ExecBootStrap
+ * @param {Function} [bootFunc] callback function
+ * @returns
+ */
+function ExecBootStrap(bootFunc) {
+    return async (target) => {
+        if (!(target.prototype instanceof koatty_core.Koatty)) {
+            throw new Error(`class ${target.name} does not inherit from TKoatty`);
+        }
+        return await executeBootstrap(target, bootFunc, true);
     };
 }
 /**
@@ -1220,27 +1313,22 @@ exports.Component = Component;
 exports.ComponentScan = ComponentScan;
 exports.ConfigurationScan = ConfigurationScan;
 exports.Controller = Controller;
+exports.ExecBootStrap = ExecBootStrap;
 exports.HttpController = HttpController;
 exports.Logger = Logger;
 exports.Middleware = Middleware;
 exports.Plugin = Plugin;
 exports.Service = Service;
-Object.keys(koatty_router).forEach(function (k) {
-    if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
-        enumerable: true,
-        get: function () { return koatty_router[k]; }
-    });
-});
 Object.keys(koatty_core).forEach(function (k) {
     if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
         enumerable: true,
         get: function () { return koatty_core[k]; }
     });
 });
-Object.keys(koatty_serve).forEach(function (k) {
+Object.keys(koatty_router).forEach(function (k) {
     if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
         enumerable: true,
-        get: function () { return koatty_serve[k]; }
+        get: function () { return koatty_router[k]; }
     });
 });
 Object.keys(koatty_container).forEach(function (k) {
@@ -1249,6 +1337,12 @@ Object.keys(koatty_container).forEach(function (k) {
         get: function () { return koatty_container[k]; }
     });
 });
+Object.keys(koatty_serve).forEach(function (k) {
+    if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+        enumerable: true,
+        get: function () { return koatty_serve[k]; }
+    });
+});
 Object.keys(koatty_exception).forEach(function (k) {
     if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
         enumerable: true,

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-02-22 11:12:04
+* @Date: 2022-02-25 16:52:45
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -8,14 +8,15 @@
 import { Helper } from 'koatty_lib';
 export { Helper } from 'koatty_lib';
 import 'reflect-metadata';
-import { NewRouter, CONTROLLER_ROUTER } from 'koatty_router';
-export * from 'koatty_router';
+import fs from 'fs';
 import { Koatty } from 'koatty_core';
 export * from 'koatty_core';
-import { BindProcessEvent, Serve } from 'koatty_serve';
-export * from 'koatty_serve';
+import { NewRouter, CONTROLLER_ROUTER } from 'koatty_router';
+export * from 'koatty_router';
 import { IOCContainer, TAGGED_CLS } from 'koatty_container';
 export * from 'koatty_container';
+import { BindProcessEvent, Serve } from 'koatty_serve';
+export * from 'koatty_serve';
 import * as path from 'path';
 import { Load } from 'koatty_loader';
 import { LoadConfigs } from 'koatty_config';
@@ -429,14 +430,14 @@ const Logger = DefaultLogger;
  *     logFilePath?: string;
  * }} config
  */
-function SetLogger(config) {
+function SetLogger(app, config) {
     if (config.logLevel !== undefined) {
         DefaultLogger.setLevel(config.logLevel);
     }
-    if (config.logConsole !== undefined) {
+    if (config.logConsole !== undefined && !app.silent) {
         DefaultLogger.setLogConsole(config.logConsole);
     }
-    if (config.logFile !== undefined) {
+    if (config.logFile !== undefined && !app.silent) {
         DefaultLogger.setLogFile(config.logFile);
         DefaultLogger.setLogFilePath(config.logFilePath);
     }
@@ -633,7 +634,7 @@ class Loader {
             if (opt.logs_path) {
                 logFilePath = opt.logs_path;
             }
-            SetLogger({ logLevel, logConsole, logFile, logFileLevel, logFilePath });
+            SetLogger(app, { logLevel, logConsole, logFile, logFileLevel, logFilePath });
         }
     }
     /**
@@ -704,13 +705,13 @@ class Loader {
         });
         const middlewareConfList = middlewareConf.list;
         const defaultList = ["TraceMiddleware", "PayloadMiddleware"];
+        //de-duplication
+        const appMList = new Set(defaultList);
         middlewareConfList.forEach((item) => {
             if (!defaultList.includes(item)) {
-                defaultList.push(item);
+                appMList.add(item);
             }
         });
-        //de-duplication
-        const appMList = [...new Set(defaultList)];
         //Automatically call middleware
         for (const key of appMList) {
             const handle = IOCContainer.get(key, "MIDDLEWARE");
@@ -851,7 +852,7 @@ class Loader {
     }
 }
 
-var version = "3.6.0";
+var version = "3.6.4";
 var engines = {
 	node: ">12.0.0"
 };
@@ -861,7 +862,7 @@ var engines = {
 * @Usage:
 * @Author: richen
 * @Date: 2021-12-17 11:54:06
- * @LastEditTime: 2021-12-17 13:13:00
+ * @LastEditTime: 2022-02-23 16:12:34
 */
 const KOATTY_VERSION = version;
 const ENGINES_VERSION = engines.node.slice(1) || '12.0.0';
@@ -881,7 +882,21 @@ function checkRuntime() {
         Logger.Error(`Koatty need node version > ${nodeEngines}, current version is ${nodeVersion}, please upgrade it.`);
         process.exit(-1);
     }
-}
+}
+/**
+ * unittest running environment detection
+ * only support jest
+ * @returns {boolean}
+ */
+const checkUTRuntime = () => {
+    let isUTRuntime = false;
+    // UT运行环境判断，暂时先只判断jest
+    const argv = JSON.stringify(process.argv[1]);
+    if (argv.indexOf('jest') > -1) {
+        isUTRuntime = true;
+    }
+    return isUTRuntime;
+};
 
 /**
  * @ author: richen
@@ -894,14 +909,27 @@ function checkRuntime() {
  *
  * @param {*} target
  * @param {Function} bootFunc
+ * @param {boolean} [isInitiative=false] Whether to actively execute app instantiation,
+ * mainly for unittest scenarios, you need to actively obtain app instances
  * @returns {Promise<void>}
  */
-const ExecBootstrap = async function (target, bootFunc) {
+const executeBootstrap = async function (target, bootFunc, isInitiative = false) {
     // checked runtime
     checkRuntime();
+    // unittest running environment
+    const isUTRuntime = checkUTRuntime();
+    if (!isInitiative && isUTRuntime) {
+        return;
+    }
     const app = Reflect.construct(target, []);
+    // unittest does not print startup logs
+    if (isUTRuntime) {
+        app.silent = true;
+        Logger.setLogConsole(false);
+        Logger.setLogFile(false);
+    }
     try {
-        console.log(LOGO);
+        !app.silent && console.log(LOGO);
         if (!(app instanceof Koatty)) {
             throw new Error(`class ${target.name} does not inherit from Koatty`);
         }
@@ -954,14 +982,14 @@ const ExecBootstrap = async function (target, bootFunc) {
         // Load Routers
         Logger.Log('think', '', 'Load Routers ...');
         KoattyRouter.LoadRouter(app.getMetaData("_controllers"));
-        // Emit app started event
-        Logger.Log('think', '', 'Emit App Start ...');
-        // app.emit("appStart");
-        const server = newServe(app);
-        await asyncEvent(app, 'appStart');
         Logger.Log('think', '', '====================================');
         // Start server
-        app.listen(server);
+        const server = newServe(app);
+        app.listen(server, listenCallback(app, server.options));
+        // app.emit("appStart");
+        // Emit app started event
+        Logger.Log('think', '', 'Emit App Start ...');
+        asyncEvent(app, 'appStart');
         // binding event "appStop"
         BindProcessEvent(app, 'appStop');
     }
@@ -985,6 +1013,24 @@ const newRouter = function (app) {
     Helper.define(app, "router", router);
     return router;
 };
+/**
+ * Listening callback function
+ *
+ * @param {Koatty} app
+ * @param {ListeningOptions} options
+ * @returns {*}
+ */
+const listenCallback = (app, options) => {
+    return function () {
+        Logger.Log("think", "", `Nodejs Version: ${process.version}`);
+        Logger.Log("think", "", `Koatty Version: v${app.version}`);
+        Logger.Log("think", "", `App Environment: ${app.env}`);
+        Logger.Log("think", "", `Server running at ${options.protocol === "http2" ? "https" : options.protocol}://${options.hostname || '127.0.0.1'}:${options.port}/`);
+        Logger.Log("think", "", "====================================");
+        // tslint:disable-next-line: no-unused-expression
+        app.appDebug && Logger.Warn(`Running in debug mode.`);
+    };
+};
 /**
  * create serve
  *
@@ -992,8 +1038,37 @@ const newRouter = function (app) {
  * @returns {*}
  */
 const newServe = function (app) {
+    var _a, _b, _c;
     const protocol = app.config("protocol") || "http";
-    const server = Serve(app, protocol);
+    const port = process.env.PORT || process.env.APP_PORT ||
+        app.config('app_port') || 3000;
+    const hostname = process.env.IP ||
+        ((_a = process.env.HOSTNAME) === null || _a === void 0 ? void 0 : _a.replace(/-/g, '.')) || app.config('app_host') || '127.0.0.1';
+    const options = {
+        hostname,
+        port,
+        protocol,
+        ext: {
+            key: "",
+            cert: "",
+            protoFile: "",
+        },
+    };
+    const pm = new Set(["https", "http2", "wss"]);
+    if (pm.has(options.protocol)) {
+        const keyFile = (_b = app.config("key_file")) !== null && _b !== void 0 ? _b : "";
+        const crtFile = (_c = app.config("crt_file")) !== null && _c !== void 0 ? _c : "";
+        options.ext.key = fs.readFileSync(keyFile).toString();
+        options.ext.cert = fs.readFileSync(crtFile).toString();
+    }
+    if (options.protocol === "https" || options.protocol === "http2") {
+        options.port = options.port == 80 ? 443 : options.port;
+    }
+    if (options.protocol === "grpc") {
+        const proto = app.config("protoFile", "router");
+        options.ext.protoFile = proto;
+    }
+    const server = Serve(app, options);
     Helper.define(app, "server", server);
     return server;
 };
@@ -1025,7 +1100,22 @@ function Bootstrap(bootFunc) {
         if (!(target.prototype instanceof Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
         }
-        ExecBootstrap(target, bootFunc);
+        executeBootstrap(target, bootFunc);
+    };
+}
+/**
+ * Actively perform dependency injection
+ * Parse the decorator, return the instantiated app.
+ * @export  ExecBootStrap
+ * @param {Function} [bootFunc] callback function
+ * @returns
+ */
+function ExecBootStrap(bootFunc) {
+    return async (target) => {
+        if (!(target.prototype instanceof Koatty)) {
+            throw new Error(`class ${target.name} does not inherit from TKoatty`);
+        }
+        return await executeBootstrap(target, bootFunc, true);
     };
 }
 /**
@@ -1183,4 +1273,4 @@ class BaseService {
     }
 }
 
-export { BaseController, BaseService, BindAppReadyHook, Bootstrap, Component, ComponentScan, ConfigurationScan, Controller, HttpController, Logger, Middleware, Plugin, Service };
+export { BaseController, BaseService, BindAppReadyHook, Bootstrap, Component, ComponentScan, ConfigurationScan, Controller, ExecBootStrap, HttpController, Logger, Middleware, Plugin, Service };

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koatty",
-    "version": "3.6.0",
+    "version": "3.6.4",
     "description": "Koa2 + Typescript = koatty. Use Typescript's decorator implement auto injection.",
     "scripts": {
         "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",
@@ -15,7 +15,6 @@
         "release:pre": "npm run release -- --prerelease",
         "release:major": "npm run release -- --release-as major",
         "release:minor": "npm run release -- --release-as minor",
-        "pub": "git push --follow-tags origin && npm publish",
         "test": "npm run eslint && jest --passWithNoTests",
         "test:cov": "jest --collectCoverage --detectOpenHandles",
         "version": "conventional-changelog -p angular -i CHANGELOG.md -s"
@@ -81,18 +80,18 @@
     "dependencies": {
         "koa": "2.13.4",
         "koatty_config": "1.1.2",
-        "koatty_container": "1.7.4",
-        "koatty_core": "1.6.0",
+        "koatty_container": "1.7.6",
+        "koatty_core": "1.6.1",
         "koatty_exception": "1.2.2",
         "koatty_lib": "1.2.10",
         "koatty_loader": "1.0.2",
         "koatty_logger": "1.3.12",
         "koatty_payload": "1.3.14",
         "koatty_proto": "1.1.6",
-        "koatty_router": "1.7.0",
-        "koatty_serve": "1.4.6",
+        "koatty_router": "1.7.2",
+        "koatty_serve": "1.4.8",
         "koatty_trace": "1.6.1",
-        "koatty_validation": "1.1.0",
+        "koatty_validation": "1.2.2",
         "reflect-metadata": "0.1.13",
         "tslib": "2.3.1"
     }

package/jest-html-reporters-attach/result.js

@@ -1 +1 @@
-window.jest_html_reporters_callback__({"numFailedTestSuites":0,"numFailedTests":0,"numPassedTestSuites":0,"numPassedTests":0,"numPendingTestSuites":0,"numPendingTests":0,"numRuntimeErrorTestSuites":0,"numTodoTests":0,"numTotalTestSuites":0,"numTotalTests":0,"startTime":1645499522937,"success":false,"testResults":[],"wasInterrupted":false,"config":{"bail":0,"changedFilesWithAncestor":false,"collectCoverage":true,"collectCoverageFrom":[],"coverageDirectory":"coverage","coverageProvider":"babel","coverageReporters":["html","lcov","json","text","clover","text-summary"],"detectLeaks":false,"detectOpenHandles":false,"errorOnDeprecated":false,"expand":false,"findRelatedTests":false,"forceExit":false,"json":false,"lastCommit":false,"listTests":false,"logHeapUsage":false,"maxConcurrency":5,"maxWorkers":7,"noStackTrace":false,"nonFlagArgs":[],"notify":false,"notifyMode":"failure-change","onlyChanged":false,"onlyFailures":false,"passWithNoTests":true,"projects":[],"reporters":[["default",{}],["/Users/richen/Workspace/nodejs/koatty/node_modules/jest-html-reporters/index.js",{}]],"rootDir":"/Users/richen/Workspace/nodejs/koatty","runTestsByPath":false,"skipFilter":false,"testFailureExitCode":1,"testPathPattern":"","testSequencer":"/Users/richen/Workspace/nodejs/koatty/node_modules/@jest/test-sequencer/build/index.js","updateSnapshot":"new","useStderr":false,"watch":false,"watchAll":false,"watchman":true},"endTime":1645499522975,"_reporterOptions":{"publicPath":"/Users/richen/Workspace/nodejs/koatty","filename":"jest_html_reporters.html","expand":false,"pageTitle":"","hideIcon":false,"testCommand":"npx jest","openReport":false,"failureMessageOnly":false,"enableMergeData":false,"dataMergeLevel":1},"attachInfos":{}})
+window.jest_html_reporters_callback__({"numFailedTestSuites":0,"numFailedTests":0,"numPassedTestSuites":0,"numPassedTests":0,"numPendingTestSuites":0,"numPendingTests":0,"numRuntimeErrorTestSuites":0,"numTodoTests":0,"numTotalTestSuites":0,"numTotalTests":0,"startTime":1645779159740,"success":false,"testResults":[],"wasInterrupted":false,"config":{"bail":0,"changedFilesWithAncestor":false,"collectCoverage":true,"collectCoverageFrom":[],"coverageDirectory":"coverage","coverageProvider":"babel","coverageReporters":["html","lcov","json","text","clover","text-summary"],"detectLeaks":false,"detectOpenHandles":false,"errorOnDeprecated":false,"expand":false,"findRelatedTests":false,"forceExit":false,"json":false,"lastCommit":false,"listTests":false,"logHeapUsage":false,"maxConcurrency":5,"maxWorkers":7,"noStackTrace":false,"nonFlagArgs":[],"notify":false,"notifyMode":"failure-change","onlyChanged":false,"onlyFailures":false,"passWithNoTests":true,"projects":[],"reporters":[["default",{}],["/Users/richen/Workspace/nodejs/koatty/node_modules/jest-html-reporters/index.js",{}]],"rootDir":"/Users/richen/Workspace/nodejs/koatty","runTestsByPath":false,"skipFilter":false,"testFailureExitCode":1,"testPathPattern":"","testSequencer":"/Users/richen/Workspace/nodejs/koatty/node_modules/@jest/test-sequencer/build/index.js","updateSnapshot":"new","useStderr":false,"watch":false,"watchAll":false,"watchman":true},"endTime":1645779159899,"_reporterOptions":{"publicPath":"/Users/richen/Workspace/nodejs/koatty","filename":"jest_html_reporters.html","expand":false,"pageTitle":"","hideIcon":false,"testCommand":"npx jest","openReport":false,"failureMessageOnly":false,"enableMergeData":false,"dataMergeLevel":1},"attachInfos":{}})

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koatty",
-    "version": "3.6.0",
+    "version": "3.6.4",
     "description": "Koa2 + Typescript = koatty. Use Typescript's decorator implement auto injection.",
     "scripts": {
         "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",
@@ -15,7 +15,6 @@
         "release:pre": "npm run release -- --prerelease",
         "release:major": "npm run release -- --release-as major",
         "release:minor": "npm run release -- --release-as minor",
-        "pub": "git push --follow-tags origin && npm publish",
         "test": "npm run eslint && jest --passWithNoTests",
         "test:cov": "jest --collectCoverage --detectOpenHandles",
         "version": "conventional-changelog -p angular -i CHANGELOG.md -s"
@@ -81,18 +80,18 @@
     "dependencies": {
         "koa": "2.13.4",
         "koatty_config": "1.1.2",
-        "koatty_container": "1.7.4",
-        "koatty_core": "1.6.0",
+        "koatty_container": "1.7.6",
+        "koatty_core": "1.6.1",
         "koatty_exception": "1.2.2",
         "koatty_lib": "1.2.10",
         "koatty_loader": "1.0.2",
         "koatty_logger": "1.3.12",
         "koatty_payload": "1.3.14",
         "koatty_proto": "1.1.6",
-        "koatty_router": "1.7.0",
-        "koatty_serve": "1.4.6",
+        "koatty_router": "1.7.2",
+        "koatty_serve": "1.4.8",
         "koatty_trace": "1.6.1",
-        "koatty_validation": "1.1.0",
+        "koatty_validation": "1.2.2",
         "reflect-metadata": "0.1.13",
         "tslib": "2.3.1"
     }