koatty 3.6.10 → 3.7.0

package/.vscode/launch.json

@@ -4,7 +4,7 @@
         {
             "type": "node",
             "request": "launch",
-            "name": "TS Program",
+            "name": "Koatty Test Program",
             "args": [
                 "${workspaceRoot}/demo/src/App.ts"
             ],

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.7.0](https://github.com/thinkkoa/koatty/compare/v3.6.10...v3.7.0) (2022-11-01)
+
+
+### Bug Fixes
+
+* ctx.body未赋值导致的404 ([ea0a248](https://github.com/thinkkoa/koatty/commit/ea0a248a71031b2d8a26b0b4280410dcdeb841af))
+
 ### [3.6.10](https://github.com/thinkkoa/koatty/compare/v3.6.10-1...v3.6.10) (2022-09-05)
 
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-09-05 18:42:36
+* @Date: 2022-11-01 17:00:46
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -175,113 +175,6 @@ export declare function ExecBootStrap(bootFunc?: Function): (target: any) => Pro
 
 export { Helper }
 
-/**
- * HTTP controller
- *
- * @export
- * @class HttpController
- * @implements {IController}
- */
-export declare class HttpController extends BaseController {
-    /**
-     * Whether it is a GET request
-     *
-     * @public
-     * @returns {boolean}
-     * @memberof HttpController
-     */
-    isGet(): boolean;
-    /**
-     * Whether it is a POST request
-     *
-     * @public
-     * @returns {boolean}
-     * @memberof HttpController
-     */
-    isPost(): boolean;
-    /**
-     * Determines whether the METHOD request is specified
-     *
-     * @public
-     * @param {string} method
-     * @returns {boolean}
-     * @memberof HttpController
-     */
-    isMethod(method: string): boolean;
-    /**
-     * Get/Set headers.
-     *
-     * @public
-     * @param {string} [name]
-     * @param {*} [value]
-     * @returns {*}
-     * @memberof HttpController
-     */
-    header(name?: string, value?: any): any;
-    /**
-     * Get POST/GET parameters, the POST value is priority.
-     *
-     * @param {string} [name]
-     * @returns
-     * @memberof HttpController
-     */
-    param(name?: string): Promise<any>;
-    /**
-     * Set response content-type
-     *
-     * @public
-     * @param {string} contentType
-     * @param {(string | boolean)} [encoding]
-     * @returns {string}
-     * @memberof HttpController
-     */
-    type(contentType: string, encoding?: string | boolean): string;
-    /**
-     * set cache-control and expires header
-     *
-     * @public
-     * @param {number} [timeout=30]
-     * @returns {void}
-     * @memberof HttpController
-     */
-    expires(timeout?: number): void;
-    /**
-     * Url redirect
-     *
-     * @param {string} urls
-     * @param {string} [alt]
-     * @returns {void}
-     * @memberof HttpController
-     */
-    redirect(urls: string, alt?: string): void;
-    /**
-     * Block access
-     *
-     * @param {number} [code=403]
-     * @returns {Promise<any>}
-     * @memberof HttpController
-     */
-    deny(code?: number): Promise<any>;
-    /**
-     * Set response Body content
-     *
-     * @param {*} data
-     * @param {string} [contentType]
-     * @param {string} [encoding]
-     * @returns void
-     * @memberof HttpController
-     */
-    body(data: any, contentType?: string, encoding?: string): void;
-    /**
-     * Respond to json formatted content
-     *
-     * @param {*} data
-     * @returns {Promise<any>}
-     * @memberof HttpController
-     */
-    json(data: any): void;
-}
-
 /**
  * Interface for Controller
  */
@@ -290,8 +183,6 @@ export declare interface IController {
     readonly ctx: KoattyContext;
     __befor?: () => Promise<any>;
     __after?: () => Promise<any>;
-    readonly ok: (msg?: string | ApiInput, data?: any, ret?: number) => Promise<any>;
-    readonly fail: (msg?: Error | string | ApiInput, data?: any, ret?: number) => void;
 }
 
 /**

package/dist/index.js

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-09-05 18:42:21
+* @Date: 2022-11-01 17:00:27
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -9,7 +9,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var koatty_lib = require('koatty_lib');
 require('reflect-metadata');
 var fs = require('fs');
 var koatty_core = require('koatty_core');
@@ -21,6 +20,7 @@ var koatty_loader = require('koatty_loader');
 var koatty_config = require('koatty_config');
 var koatty_logger = require('koatty_logger');
 var koatty_exception = require('koatty_exception');
+var koatty_lib = require('koatty_lib');
 var koatty_trace = require('koatty_trace');
 var koatty_payload = require('koatty_payload');
 
@@ -47,6 +47,42 @@ function _interopNamespace(e) {
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
 
+/**
+ * @ author: richen
+ * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
+ * @ license: BSD (3-Clause)
+ * @ version: 2020-05-10 11:49:15
+ */
+// Logger
+const Logger = koatty_logger.DefaultLogger;
+/**
+ * SetLogger
+ *
+ * @export
+ * @param {{
+ *     logLevel?: LogLevelType;
+ *     logConsole?: boolean;
+ *     logFile?: boolean;
+ *     logFileLevel?: LogLevelType;
+ *     logFilePath?: string;
+ * }} config
+ */
+function SetLogger(app, config) {
+    if (config.logLevel !== undefined) {
+        koatty_logger.DefaultLogger.setLevel(config.logLevel);
+    }
+    if (config.logConsole !== undefined && !app.silent) {
+        koatty_logger.DefaultLogger.setLogConsole(config.logConsole);
+    }
+    if (config.logFile !== undefined && !app.silent) {
+        koatty_logger.DefaultLogger.setLogFile(config.logFile);
+        koatty_logger.DefaultLogger.setLogFilePath(config.logFilePath);
+    }
+    if (config.logFileLevel !== undefined) {
+        koatty_logger.DefaultLogger.setLogFileLevel(config.logFileLevel);
+    }
+}
+
 /**
  * @ author: richen
  * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
@@ -124,8 +160,22 @@ function formatApiData(msg, data, defaultCode) {
  * @ author: richen
  * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
  * @ license: BSD (3-Clause)
- * @ version: 2020-05-20 15:45:24
+ * @ version: 2020-05-10 11:49:15
  */
+const COMPONENT_SCAN = 'COMPONENT_SCAN';
+const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
+const APP_READY_HOOK = "APP_READY_HOOK";
+// tslint:disable: no-irregular-whitespace
+const LOGO = `
+
+██   ██  ██████   █████  ████████ ████████ ██    ██ 
+██  ██  ██    ██ ██   ██    ██       ██     ██  ██  
+█████   ██    ██ ███████    ██       ██      ████   
+██  ██  ██    ██ ██   ██    ██       ██       ██    
+██   ██  ██████  ██   ██    ██       ██       ██    
+                         https://github.com/koatty
+`;
+
 /**
  * Base controller
  *
@@ -152,25 +202,6 @@ class BaseController {
      */
     init(...arg) {
     }
-    // /**
-    //  * Class pre-execution method (except constructor, init, __after).
-    //  *
-    //  * @returns {Promise<any>}
-    //  * @memberof BaseController
-    //  */
-    // public __before(): Promise<any> {
-    //     return Promise.resolve();
-    // }
-    // /**
-    //  * Class after-execution method (except constructor, init, __before).
-    //  *
-    //  * @public
-    //  * @returns {*}
-    //  * @memberof BaseController
-    //  */
-    // public __after(): Promise<any> {
-    //     return Promise.resolve();
-    // }
     /**
      * Response to normalize json format content for success
      *
@@ -223,244 +254,6 @@ class BaseController {
 //     }
 // });
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-20 15:45:24
- */
-/**
- * HTTP controller
- *
- * @export
- * @class HttpController
- * @implements {IController}
- */
-class HttpController extends BaseController {
-    /**
-     * Whether it is a GET request
-     *
-     * @public
-     * @returns {boolean}
-     * @memberof HttpController
-     */
-    isGet() {
-        return this.ctx.method === "GET";
-    }
-    /**
-     * Whether it is a POST request
-     *
-     * @public
-     * @returns {boolean}
-     * @memberof HttpController
-     */
-    isPost() {
-        return this.ctx.method === "POST";
-    }
-    /**
-     * Determines whether the METHOD request is specified
-     *
-     * @public
-     * @param {string} method
-     * @returns {boolean}
-     * @memberof HttpController
-     */
-    isMethod(method) {
-        return this.ctx.method === method.toUpperCase();
-    }
-    /**
-     * Get/Set headers.
-     *
-     * @public
-     * @param {string} [name]
-     * @param {*} [value]
-     * @returns {*}
-     * @memberof HttpController
-     */
-    header(name, value) {
-        if (name === undefined) {
-            return this.ctx.headers;
-        }
-        if (value === undefined) {
-            return this.ctx.get(name);
-        }
-        return this.ctx.set(name, value);
-    }
-    /**
-     * Get POST/GET parameters, the POST value is priority.
-     *
-     * @param {string} [name]
-     * @returns
-     * @memberof HttpController
-     */
-    param(name) {
-        return this.ctx.bodyParser().then((body) => {
-            const getParams = this.ctx.queryParser() || {};
-            const postParams = (body.post ? body.post : body) || {};
-            if (name !== undefined) {
-                return postParams[name] === undefined ? getParams[name] : postParams[name];
-            }
-            return { ...getParams, ...postParams };
-        });
-    }
-    /**
-     * Set response content-type
-     *
-     * @public
-     * @param {string} contentType
-     * @param {(string | boolean)} [encoding]
-     * @returns {string}
-     * @memberof HttpController
-     */
-    type(contentType, encoding) {
-        if (encoding !== false && !contentType.includes("charset")) {
-            contentType = `${contentType}; charset=${encoding || this.app.config("encoding")}`;
-        }
-        this.ctx.type = contentType;
-        return contentType;
-    }
-    /**
-     * set cache-control and expires header
-     *
-     * @public
-     * @param {number} [timeout=30]
-     * @returns {void}
-     * @memberof HttpController
-     */
-    expires(timeout = 30) {
-        timeout = koatty_lib.Helper.toNumber(timeout) * 1000;
-        const date = new Date(Date.now() + timeout);
-        this.ctx.set("Cache-Control", `max-age=${timeout}`);
-        return this.ctx.set("Expires", date.toUTCString());
-    }
-    /**
-     * Url redirect
-     *
-     * @param {string} urls
-     * @param {string} [alt]
-     * @returns {void}
-     * @memberof HttpController
-     */
-    redirect(urls, alt) {
-        return this.ctx.redirect(urls, alt);
-    }
-    /**
-     * Block access
-     *
-     * @param {number} [code=403]
-     * @returns {Promise<any>}
-     * @memberof HttpController
-     */
-    deny(code = 403) {
-        return this.ctx.throw(code);
-    }
-    /**
-     * Set response Body content
-     *
-     * @param {*} data
-     * @param {string} [contentType]
-     * @param {string} [encoding]
-     * @returns void
-     * @memberof HttpController
-     */
-    body(data, contentType, encoding) {
-        contentType = contentType || "text/plain";
-        encoding = encoding || this.app.config("encoding") || "utf-8";
-        this.type(contentType, encoding);
-        this.ctx.body = data;
-        return null;
-    }
-    /**
-     * Respond to json formatted content
-     *
-     * @param {*} data
-     * @returns {Promise<any>}
-     * @memberof HttpController
-     */
-    json(data) {
-        return this.body(data, "application/json");
-    }
-}
-// const properties = ["constructor", "init"];
-// export const HttpController = new Proxy(Base, {
-//     set(target, key, value, receiver) {
-//         if (Reflect.get(target, key, receiver) === undefined) {
-//             return Reflect.set(target, key, value, receiver);
-//         } else if (key === "init") {
-//             return Reflect.set(target, key, value, receiver);
-//         } else {
-//             throw Error("Cannot redefine getter-only property");
-//         }
-//     },
-//     deleteProperty(target, key) {
-//         throw Error("Cannot delete getter-only property");
-//     },
-//     construct(target, args, newTarget) {
-//         Reflect.ownKeys(target.prototype).map((n) => {
-//             if (newTarget.prototype.hasOwnProperty(n) && !properties.includes(Helper.toString(n))) {
-//                 throw Error(`Cannot override the final method "${Helper.toString(n)}"`);
-//             }
-//         });
-//         return Reflect.construct(target, args, newTarget);
-//     }
-// });
-
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
- */
-// Logger
-const Logger = koatty_logger.DefaultLogger;
-/**
- * SetLogger
- *
- * @export
- * @param {{
- *     logLevel?: LogLevelType;
- *     logConsole?: boolean;
- *     logFile?: boolean;
- *     logFileLevel?: LogLevelType;
- *     logFilePath?: string;
- * }} config
- */
-function SetLogger(app, config) {
-    if (config.logLevel !== undefined) {
-        koatty_logger.DefaultLogger.setLevel(config.logLevel);
-    }
-    if (config.logConsole !== undefined && !app.silent) {
-        koatty_logger.DefaultLogger.setLogConsole(config.logConsole);
-    }
-    if (config.logFile !== undefined && !app.silent) {
-        koatty_logger.DefaultLogger.setLogFile(config.logFile);
-        koatty_logger.DefaultLogger.setLogFilePath(config.logFilePath);
-    }
-    if (config.logFileLevel !== undefined) {
-        koatty_logger.DefaultLogger.setLogFileLevel(config.logFileLevel);
-    }
-}
-
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
- */
-const COMPONENT_SCAN = 'COMPONENT_SCAN';
-const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
-const APP_READY_HOOK = "APP_READY_HOOK";
-// tslint:disable: no-irregular-whitespace
-const LOGO = `
-
-██   ██  ██████   █████  ████████ ████████ ██    ██ 
-██  ██  ██    ██ ██   ██    ██       ██     ██  ██  
-█████   ██    ██ ███████    ██       ██      ████   
-██  ██  ██    ██ ██   ██    ██       ██       ██    
-██   ██  ██████  ██   ██    ██       ██       ██    
-                         https://github.com/koatty
-`;
-
 class TraceMiddleware {
     run(options, app) {
         return koatty_trace.Trace(options, app);
@@ -838,7 +631,7 @@ class Loader {
     }
 }
 
-var version = "3.6.10";
+var version = "3.7.0";
 var engines = {
 	node: ">12.0.0"
 };
@@ -947,12 +740,6 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         await asyncEvent(app, 'appBoot');
         // Load App ready hooks
         Loader.LoadAppReadyHooks(app, target);
-        // New router
-        const KoattyRouter = newRouter(app);
-        koatty_lib.Helper.define(app, "router", KoattyRouter);
-        // Create Server
-        app.server = newServe(app);
-        koatty_lib.Helper.define(app, "listenCallback", listenCallback(app));
         // Load Middleware
         Logger.Log('think', '', 'Load Middlewares ...');
         await Loader.LoadMiddlewares(app);
@@ -965,14 +752,18 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         // Load Controllers
         Logger.Log('think', '', 'Load Controllers ...');
         const controllers = Loader.LoadControllers(app);
+        // Create Server
+        app.server = newServe(app);
+        // Create router
+        app.router = newRouter(app);
         // Load Routers
         Logger.Log('think', '', 'Load Routers ...');
-        KoattyRouter.LoadRouter(controllers);
+        app.router.LoadRouter(controllers);
         // Emit app ready event
         Logger.Log('think', '', 'Emit App Ready ...');
         await asyncEvent(app, 'appReady');
         if (!isUTRuntime) {
-            app.listen();
+            app.listen(app.server, listenCallback(app));
         }
         return app;
     }
@@ -1001,8 +792,8 @@ const newRouter = function (app) {
  * @returns {*}
  */
 const listenCallback = (app) => {
-    const options = app.server.options;
     return function () {
+        const options = app.server.options;
         // Emit app started event
         Logger.Log('think', '', 'Emit App Start ...');
         asyncEvent(app, 'appStart');
@@ -1033,9 +824,7 @@ const newServe = function (app) {
     const hostname = process.env.IP ||
         process.env.HOSTNAME?.replace(/-/g, '.') || app.config('app_host') || '127.0.0.1';
     const options = {
-        hostname,
-        port,
-        protocol,
+        hostname, port, protocol,
         ext: {
             key: "",
             cert: "",
@@ -1056,7 +845,11 @@ const newServe = function (app) {
         const proto = app.config("protoFile", "router");
         options.ext.protoFile = proto;
     }
-    return koatty_serve.Serve(app, options);
+    const server = koatty_serve.Serve(app, options);
+    process.on('SIGINT', () => {
+        server.Stop();
+    });
+    return server;
 };
 /**
  * Execute event as async
@@ -1259,10 +1052,6 @@ class BaseService {
     }
 }
 
-Object.defineProperty(exports, 'Helper', {
-  enumerable: true,
-  get: function () { return koatty_lib.Helper; }
-});
 Object.defineProperty(exports, 'Config', {
   enumerable: true,
   get: function () { return koatty_config.Config; }
@@ -1271,6 +1060,10 @@ Object.defineProperty(exports, 'Value', {
   enumerable: true,
   get: function () { return koatty_config.Value; }
 });
+Object.defineProperty(exports, 'Helper', {
+  enumerable: true,
+  get: function () { return koatty_lib.Helper; }
+});
 exports.BaseController = BaseController;
 exports.BaseService = BaseService;
 exports.BindAppReadyHook = BindAppReadyHook;
@@ -1280,7 +1073,6 @@ exports.ComponentScan = ComponentScan;
 exports.ConfigurationScan = ConfigurationScan;
 exports.Controller = Controller;
 exports.ExecBootStrap = ExecBootStrap;
-exports.HttpController = HttpController;
 exports.Logger = Logger;
 exports.Middleware = Middleware;
 exports.Plugin = Plugin;

package/dist/index.mjs

@@ -1,12 +1,10 @@
 /*!
 * @Author: richen
-* @Date: 2022-09-05 18:42:21
+* @Date: 2022-11-01 17:00:27
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
 */
-import { Helper } from 'koatty_lib';
-export { Helper } from 'koatty_lib';
 import 'reflect-metadata';
 import fs from 'fs';
 import { Koatty } from 'koatty_core';
@@ -15,7 +13,7 @@ import { NewRouter, CONTROLLER_ROUTER } from 'koatty_router';
 export * from 'koatty_router';
 import { IOCContainer, TAGGED_CLS } from 'koatty_container';
 export * from 'koatty_container';
-import { Serve, BindProcessEvent } from 'koatty_serve';
+import { BindProcessEvent, Serve } from 'koatty_serve';
 export * from 'koatty_serve';
 import * as path from 'path';
 import { Load } from 'koatty_loader';
@@ -24,9 +22,47 @@ export { Config, Value } from 'koatty_config';
 import { DefaultLogger } from 'koatty_logger';
 import { prevent } from 'koatty_exception';
 export * from 'koatty_exception';
+import { Helper } from 'koatty_lib';
+export { Helper } from 'koatty_lib';
 import { Trace } from 'koatty_trace';
 import { Payload } from 'koatty_payload';
 
+/**
+ * @ author: richen
+ * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
+ * @ license: BSD (3-Clause)
+ * @ version: 2020-05-10 11:49:15
+ */
+// Logger
+const Logger = DefaultLogger;
+/**
+ * SetLogger
+ *
+ * @export
+ * @param {{
+ *     logLevel?: LogLevelType;
+ *     logConsole?: boolean;
+ *     logFile?: boolean;
+ *     logFileLevel?: LogLevelType;
+ *     logFilePath?: string;
+ * }} config
+ */
+function SetLogger(app, config) {
+    if (config.logLevel !== undefined) {
+        DefaultLogger.setLevel(config.logLevel);
+    }
+    if (config.logConsole !== undefined && !app.silent) {
+        DefaultLogger.setLogConsole(config.logConsole);
+    }
+    if (config.logFile !== undefined && !app.silent) {
+        DefaultLogger.setLogFile(config.logFile);
+        DefaultLogger.setLogFilePath(config.logFilePath);
+    }
+    if (config.logFileLevel !== undefined) {
+        DefaultLogger.setLogFileLevel(config.logFileLevel);
+    }
+}
+
 /**
  * @ author: richen
  * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
@@ -104,8 +140,22 @@ function formatApiData(msg, data, defaultCode) {
  * @ author: richen
  * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
  * @ license: BSD (3-Clause)
- * @ version: 2020-05-20 15:45:24
+ * @ version: 2020-05-10 11:49:15
  */
+const COMPONENT_SCAN = 'COMPONENT_SCAN';
+const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
+const APP_READY_HOOK = "APP_READY_HOOK";
+// tslint:disable: no-irregular-whitespace
+const LOGO = `
+
+██   ██  ██████   █████  ████████ ████████ ██    ██ 
+██  ██  ██    ██ ██   ██    ██       ██     ██  ██  
+█████   ██    ██ ███████    ██       ██      ████   
+██  ██  ██    ██ ██   ██    ██       ██       ██    
+██   ██  ██████  ██   ██    ██       ██       ██    
+                         https://github.com/koatty
+`;
+
 /**
  * Base controller
  *
@@ -132,25 +182,6 @@ class BaseController {
      */
     init(...arg) {
     }
-    // /**
-    //  * Class pre-execution method (except constructor, init, __after).
-    //  *
-    //  * @returns {Promise<any>}
-    //  * @memberof BaseController
-    //  */
-    // public __before(): Promise<any> {
-    //     return Promise.resolve();
-    // }
-    // /**
-    //  * Class after-execution method (except constructor, init, __before).
-    //  *
-    //  * @public
-    //  * @returns {*}
-    //  * @memberof BaseController
-    //  */
-    // public __after(): Promise<any> {
-    //     return Promise.resolve();
-    // }
     /**
      * Response to normalize json format content for success
      *
@@ -203,244 +234,6 @@ class BaseController {
 //     }
 // });
 
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-20 15:45:24
- */
-/**
- * HTTP controller
- *
- * @export
- * @class HttpController
- * @implements {IController}
- */
-class HttpController extends BaseController {
-    /**
-     * Whether it is a GET request
-     *
-     * @public
-     * @returns {boolean}
-     * @memberof HttpController
-     */
-    isGet() {
-        return this.ctx.method === "GET";
-    }
-    /**
-     * Whether it is a POST request
-     *
-     * @public
-     * @returns {boolean}
-     * @memberof HttpController
-     */
-    isPost() {
-        return this.ctx.method === "POST";
-    }
-    /**
-     * Determines whether the METHOD request is specified
-     *
-     * @public
-     * @param {string} method
-     * @returns {boolean}
-     * @memberof HttpController
-     */
-    isMethod(method) {
-        return this.ctx.method === method.toUpperCase();
-    }
-    /**
-     * Get/Set headers.
-     *
-     * @public
-     * @param {string} [name]
-     * @param {*} [value]
-     * @returns {*}
-     * @memberof HttpController
-     */
-    header(name, value) {
-        if (name === undefined) {
-            return this.ctx.headers;
-        }
-        if (value === undefined) {
-            return this.ctx.get(name);
-        }
-        return this.ctx.set(name, value);
-    }
-    /**
-     * Get POST/GET parameters, the POST value is priority.
-     *
-     * @param {string} [name]
-     * @returns
-     * @memberof HttpController
-     */
-    param(name) {
-        return this.ctx.bodyParser().then((body) => {
-            const getParams = this.ctx.queryParser() || {};
-            const postParams = (body.post ? body.post : body) || {};
-            if (name !== undefined) {
-                return postParams[name] === undefined ? getParams[name] : postParams[name];
-            }
-            return { ...getParams, ...postParams };
-        });
-    }
-    /**
-     * Set response content-type
-     *
-     * @public
-     * @param {string} contentType
-     * @param {(string | boolean)} [encoding]
-     * @returns {string}
-     * @memberof HttpController
-     */
-    type(contentType, encoding) {
-        if (encoding !== false && !contentType.includes("charset")) {
-            contentType = `${contentType}; charset=${encoding || this.app.config("encoding")}`;
-        }
-        this.ctx.type = contentType;
-        return contentType;
-    }
-    /**
-     * set cache-control and expires header
-     *
-     * @public
-     * @param {number} [timeout=30]
-     * @returns {void}
-     * @memberof HttpController
-     */
-    expires(timeout = 30) {
-        timeout = Helper.toNumber(timeout) * 1000;
-        const date = new Date(Date.now() + timeout);
-        this.ctx.set("Cache-Control", `max-age=${timeout}`);
-        return this.ctx.set("Expires", date.toUTCString());
-    }
-    /**
-     * Url redirect
-     *
-     * @param {string} urls
-     * @param {string} [alt]
-     * @returns {void}
-     * @memberof HttpController
-     */
-    redirect(urls, alt) {
-        return this.ctx.redirect(urls, alt);
-    }
-    /**
-     * Block access
-     *
-     * @param {number} [code=403]
-     * @returns {Promise<any>}
-     * @memberof HttpController
-     */
-    deny(code = 403) {
-        return this.ctx.throw(code);
-    }
-    /**
-     * Set response Body content
-     *
-     * @param {*} data
-     * @param {string} [contentType]
-     * @param {string} [encoding]
-     * @returns void
-     * @memberof HttpController
-     */
-    body(data, contentType, encoding) {
-        contentType = contentType || "text/plain";
-        encoding = encoding || this.app.config("encoding") || "utf-8";
-        this.type(contentType, encoding);
-        this.ctx.body = data;
-        return null;
-    }
-    /**
-     * Respond to json formatted content
-     *
-     * @param {*} data
-     * @returns {Promise<any>}
-     * @memberof HttpController
-     */
-    json(data) {
-        return this.body(data, "application/json");
-    }
-}
-// const properties = ["constructor", "init"];
-// export const HttpController = new Proxy(Base, {
-//     set(target, key, value, receiver) {
-//         if (Reflect.get(target, key, receiver) === undefined) {
-//             return Reflect.set(target, key, value, receiver);
-//         } else if (key === "init") {
-//             return Reflect.set(target, key, value, receiver);
-//         } else {
-//             throw Error("Cannot redefine getter-only property");
-//         }
-//     },
-//     deleteProperty(target, key) {
-//         throw Error("Cannot delete getter-only property");
-//     },
-//     construct(target, args, newTarget) {
-//         Reflect.ownKeys(target.prototype).map((n) => {
-//             if (newTarget.prototype.hasOwnProperty(n) && !properties.includes(Helper.toString(n))) {
-//                 throw Error(`Cannot override the final method "${Helper.toString(n)}"`);
-//             }
-//         });
-//         return Reflect.construct(target, args, newTarget);
-//     }
-// });
-
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
- */
-// Logger
-const Logger = DefaultLogger;
-/**
- * SetLogger
- *
- * @export
- * @param {{
- *     logLevel?: LogLevelType;
- *     logConsole?: boolean;
- *     logFile?: boolean;
- *     logFileLevel?: LogLevelType;
- *     logFilePath?: string;
- * }} config
- */
-function SetLogger(app, config) {
-    if (config.logLevel !== undefined) {
-        DefaultLogger.setLevel(config.logLevel);
-    }
-    if (config.logConsole !== undefined && !app.silent) {
-        DefaultLogger.setLogConsole(config.logConsole);
-    }
-    if (config.logFile !== undefined && !app.silent) {
-        DefaultLogger.setLogFile(config.logFile);
-        DefaultLogger.setLogFilePath(config.logFilePath);
-    }
-    if (config.logFileLevel !== undefined) {
-        DefaultLogger.setLogFileLevel(config.logFileLevel);
-    }
-}
-
-/**
- * @ author: richen
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
- * @ license: BSD (3-Clause)
- * @ version: 2020-05-10 11:49:15
- */
-const COMPONENT_SCAN = 'COMPONENT_SCAN';
-const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
-const APP_READY_HOOK = "APP_READY_HOOK";
-// tslint:disable: no-irregular-whitespace
-const LOGO = `
-
-██   ██  ██████   █████  ████████ ████████ ██    ██ 
-██  ██  ██    ██ ██   ██    ██       ██     ██  ██  
-█████   ██    ██ ███████    ██       ██      ████   
-██  ██  ██    ██ ██   ██    ██       ██       ██    
-██   ██  ██████  ██   ██    ██       ██       ██    
-                         https://github.com/koatty
-`;
-
 class TraceMiddleware {
     run(options, app) {
         return Trace(options, app);
@@ -818,7 +611,7 @@ class Loader {
     }
 }
 
-var version = "3.6.10";
+var version = "3.7.0";
 var engines = {
 	node: ">12.0.0"
 };
@@ -927,12 +720,6 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         await asyncEvent(app, 'appBoot');
         // Load App ready hooks
         Loader.LoadAppReadyHooks(app, target);
-        // New router
-        const KoattyRouter = newRouter(app);
-        Helper.define(app, "router", KoattyRouter);
-        // Create Server
-        app.server = newServe(app);
-        Helper.define(app, "listenCallback", listenCallback(app));
         // Load Middleware
         Logger.Log('think', '', 'Load Middlewares ...');
         await Loader.LoadMiddlewares(app);
@@ -945,14 +732,18 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         // Load Controllers
         Logger.Log('think', '', 'Load Controllers ...');
         const controllers = Loader.LoadControllers(app);
+        // Create Server
+        app.server = newServe(app);
+        // Create router
+        app.router = newRouter(app);
         // Load Routers
         Logger.Log('think', '', 'Load Routers ...');
-        KoattyRouter.LoadRouter(controllers);
+        app.router.LoadRouter(controllers);
         // Emit app ready event
         Logger.Log('think', '', 'Emit App Ready ...');
         await asyncEvent(app, 'appReady');
         if (!isUTRuntime) {
-            app.listen();
+            app.listen(app.server, listenCallback(app));
         }
         return app;
     }
@@ -981,8 +772,8 @@ const newRouter = function (app) {
  * @returns {*}
  */
 const listenCallback = (app) => {
-    const options = app.server.options;
     return function () {
+        const options = app.server.options;
         // Emit app started event
         Logger.Log('think', '', 'Emit App Start ...');
         asyncEvent(app, 'appStart');
@@ -1013,9 +804,7 @@ const newServe = function (app) {
     const hostname = process.env.IP ||
         process.env.HOSTNAME?.replace(/-/g, '.') || app.config('app_host') || '127.0.0.1';
     const options = {
-        hostname,
-        port,
-        protocol,
+        hostname, port, protocol,
         ext: {
             key: "",
             cert: "",
@@ -1036,7 +825,11 @@ const newServe = function (app) {
         const proto = app.config("protoFile", "router");
         options.ext.protoFile = proto;
     }
-    return Serve(app, options);
+    const server = Serve(app, options);
+    process.on('SIGINT', () => {
+        server.Stop();
+    });
+    return server;
 };
 /**
  * Execute event as async
@@ -1239,4 +1032,4 @@ class BaseService {
     }
 }
 
-export { BaseController, BaseService, BindAppReadyHook, Bootstrap, Component, ComponentScan, ConfigurationScan, Controller, ExecBootStrap, HttpController, Logger, Middleware, Plugin, Service };
+export { BaseController, BaseService, BindAppReadyHook, Bootstrap, Component, ComponentScan, ConfigurationScan, Controller, ExecBootStrap, Logger, Middleware, Plugin, Service };

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.6.10",
+  "version": "3.7.0",
   "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",
@@ -58,9 +58,9 @@
     "@rollup/plugin-json": "^4.x.x",
     "@types/jest": "^27.x.x",
     "@types/koa": "^2.x.x",
-    "@types/koa__router": "^8.0.11",
+    "@types/koa__router": "^8.x.x",
     "@types/node": "^16.x.x",
-    "@types/ws": "^8.5.3",
+    "@types/ws": "^8.x.x",
     "@typescript-eslint/eslint-plugin": "^5.x.x",
     "@typescript-eslint/parser": "^5.x.x",
     "conventional-changelog-cli": "^2.x.x",
@@ -71,6 +71,7 @@
     "husky": "^4.x.x",
     "jest": "^28.x.x",
     "jest-html-reporters": "^3.x.x",
+    "koa-session": "^6.2.0",
     "rollup": "^2.x.x",
     "rollup-plugin-typescript2": "^0.x.x",
     "standard-version": "^9.x.x",
@@ -82,16 +83,16 @@
     "koa": "2.13.4",
     "koatty_config": "1.1.5",
     "koatty_container": "1.7.10",
-    "koatty_core": "1.6.8",
+    "koatty_core": "1.6.9",
     "koatty_exception": "1.2.7",
     "koatty_lib": "1.2.12",
     "koatty_loader": "1.0.3",
     "koatty_logger": "1.3.14",
     "koatty_payload": "1.3.18",
-    "koatty_proto": "1.1.8",
-    "koatty_router": "1.7.9",
-    "koatty_serve": "1.4.11",
-    "koatty_trace": "1.6.9",
+    "koatty_proto": "^1.1.9",
+    "koatty_router": "1.7.12",
+    "koatty_serve": "1.4.12",
+    "koatty_trace": "1.6.10",
     "koatty_validation": "1.2.5",
     "reflect-metadata": "0.1.13",
     "tslib": "2.4.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.6.10",
+  "version": "3.7.0",
   "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",
@@ -58,9 +58,9 @@
     "@rollup/plugin-json": "^4.x.x",
     "@types/jest": "^27.x.x",
     "@types/koa": "^2.x.x",
-    "@types/koa__router": "^8.0.11",
+    "@types/koa__router": "^8.x.x",
     "@types/node": "^16.x.x",
-    "@types/ws": "^8.5.3",
+    "@types/ws": "^8.x.x",
     "@typescript-eslint/eslint-plugin": "^5.x.x",
     "@typescript-eslint/parser": "^5.x.x",
     "conventional-changelog-cli": "^2.x.x",
@@ -71,6 +71,7 @@
     "husky": "^4.x.x",
     "jest": "^28.x.x",
     "jest-html-reporters": "^3.x.x",
+    "koa-session": "^6.2.0",
     "rollup": "^2.x.x",
     "rollup-plugin-typescript2": "^0.x.x",
     "standard-version": "^9.x.x",
@@ -82,16 +83,16 @@
     "koa": "2.13.4",
     "koatty_config": "1.1.5",
     "koatty_container": "1.7.10",
-    "koatty_core": "1.6.8",
+    "koatty_core": "1.6.9",
     "koatty_exception": "1.2.7",
     "koatty_lib": "1.2.12",
     "koatty_loader": "1.0.3",
     "koatty_logger": "1.3.14",
     "koatty_payload": "1.3.18",
-    "koatty_proto": "1.1.8",
-    "koatty_router": "1.7.9",
-    "koatty_serve": "1.4.11",
-    "koatty_trace": "1.6.9",
+    "koatty_proto": "^1.1.9",
+    "koatty_router": "1.7.12",
+    "koatty_serve": "1.4.12",
+    "koatty_trace": "1.6.10",
     "koatty_validation": "1.2.5",
     "reflect-metadata": "0.1.13",
     "tslib": "2.4.0"