koatty 3.5.16 → 3.6.0-0

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.0-0](https://github.com/thinkkoa/koatty/compare/v3.5.16...v3.6.0-0) (2022-02-21)
+
 ### [3.5.16](https://github.com/thinkkoa/koatty/compare/v3.5.14...v3.5.16) (2022-02-14)
 
 ### [3.5.14](https://github.com/thinkkoa/koatty/compare/v3.5.12...v3.5.14) (2022-01-17)

package/README.md

@@ -8,10 +8,9 @@ Use Typescript's decorator implement IOC and AOP.
 
 ## New features 
 
-* HTTP、HTTPS、HTTP2 .
-* gRPC  server. 
-* WebSocket server. (unstable)
-* Support loading environment configuration, support parsing command line parameters (process. argv) and environment variables (process.env)
+* HTTP、HTTPS、HTTP2、gRPC、WebSocket server.
+* Support loading environment configuration, parsing command line parameters (process. argv) and environment variables (process.env)
+* `@ExceptionHandler()` Register global exception handling
 
 
 ## Documentation
@@ -96,8 +95,12 @@ export class IndexController extends BaseController {
 
     @RequestMapping("/:name", RequestMethod.ALL)
     async default(@PathVariable("name") @Valid("IsNotEmpty") name: string) {
-        const info = await this.testService.sayHello(name).catch((err: any) => this.fail(err.message));
-        return info;
+        try {
+            const info = await this.testService.sayHello(name);
+            return this.ok("success", info);
+        } catch (err: Error) {
+            return this.fail(err.message));
+        }
     }
 
     @PostMapping("/test")

package/dist/README.md

@@ -8,10 +8,9 @@ Use Typescript's decorator implement IOC and AOP.
 
 ## New features 
 
-* HTTP、HTTPS、HTTP2 .
-* gRPC  server. 
-* WebSocket server. (unstable)
-* Support loading environment configuration, support parsing command line parameters (process. argv) and environment variables (process.env)
+* HTTP、HTTPS、HTTP2、gRPC、WebSocket server.
+* Support loading environment configuration, parsing command line parameters (process. argv) and environment variables (process.env)
+* `@ExceptionHandler()` Register global exception handling
 
 
 ## Documentation
@@ -96,8 +95,12 @@ export class IndexController extends BaseController {
 
     @RequestMapping("/:name", RequestMethod.ALL)
     async default(@PathVariable("name") @Valid("IsNotEmpty") name: string) {
-        const info = await this.testService.sayHello(name).catch((err: any) => this.fail(err.message));
-        return info;
+        try {
+            const info = await this.testService.sayHello(name);
+            return this.ok("success", info);
+        } catch (err: Error) {
+            return this.fail(err.message));
+        }
     }
 
     @PostMapping("/test")

package/dist/index.d.ts

@@ -1,15 +1,17 @@
 /*!
 * @Author: richen
-* @Date: 2022-02-14 14:58:36
+* @Date: 2022-02-21 18:02:28
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
 */
+import { Config } from 'koatty_config';
 import { Helper } from 'koatty_lib';
 import { Koatty } from 'koatty_core';
 import { KoattyContext } from 'koatty_core';
 import { KoattyNext } from 'koatty_core';
 import { Logger as Logger_2 } from 'koatty_logger';
+import { Value } from 'koatty_config';
 
 /**
  * Interface for Api input
@@ -142,6 +144,8 @@ export declare function Component(identifier?: string): ClassDecorator;
  */
 export declare function ComponentScan(scanPath?: string | string[]): ClassDecorator;
 
+export { Config }
+
 /**
  * Define project configuration scan path
  *
@@ -356,12 +360,13 @@ export declare function Plugin(identifier?: string): ClassDecorator;
  */
 export declare function Service(identifier?: string): ClassDecorator;
 
+export { Value }
+
 
 export * from "koatty_container";
 export * from "koatty_core";
 export * from "koatty_exception";
 export * from "koatty_router";
 export * from "koatty_serve";
-export * from "koatty_trace";
 
 export { }

package/dist/index.js

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-02-14 14:58:23
+* @Date: 2022-02-21 18:02:12
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -700,7 +700,7 @@ class Loader {
      * @memberof Loader
      */
     static async LoadMiddlewares(app, loadPath) {
-        var _a, _b;
+        var _a;
         let middlewareConf = app.config(undefined, "middleware");
         if (koatty_lib.Helper.isEmpty(middlewareConf)) {
             middlewareConf = { config: {}, list: [] };
@@ -717,7 +717,6 @@ class Loader {
             item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("MIDDLEWARE:", "");
             if (item.id && koatty_lib.Helper.isClass(item.target)) {
                 koatty_container.IOCContainer.reg(item.id, item.target, { scope: "Prototype", type: "MIDDLEWARE", args: [] });
-                // middleware[item.id] = item.target;
             }
         });
         const middlewareConfList = middlewareConf.list;
@@ -727,9 +726,6 @@ class Loader {
                 defaultList.push(item);
             }
         });
-        // if (defaultList.length > middlewareConfList.length) {
-        //     Logger.Warn("Some middleware is loaded but not allowed to execute.");
-        // }
         //de-duplication
         const appMList = [...new Set(defaultList)];
         //Automatically call middleware
@@ -744,11 +740,17 @@ class Loader {
                 continue;
             }
             if (middlewareConf.config[key] === false) {
-                Logger.Warn(`Middleware ${key} is loaded but not allowed to execute.`);
-                continue;
+                // Default middleware cannot be disabled
+                if (defaultList.includes(key)) {
+                    Logger.Warn(`Middleware ${key} cannot be disabled.`);
+                }
+                else {
+                    Logger.Warn(`Middleware ${key} is loaded but not allowed to execute.`);
+                    continue;
+                }
             }
             Logger.Debug(`Load middleware: ${key}`);
-            const result = await handle.run((_b = middlewareConf.config[key]) !== null && _b !== void 0 ? _b : {}, app);
+            const result = await handle.run(middlewareConf.config[key] || {}, app);
             if (koatty_lib.Helper.isFunction(result)) {
                 if (result.length < 3) {
                     app.use(result);
@@ -758,7 +760,6 @@ class Loader {
                 }
             }
         }
-        // app.setMetaData("_middlewares", middleware);
     }
     /**
      * Load controllers
@@ -867,7 +868,7 @@ class Loader {
     }
 }
 
-var version = "3.5.16";
+var version = "3.6.0-0";
 var engines = {
 	node: ">12.0.0"
 };
@@ -1052,7 +1053,6 @@ function Bootstrap(bootFunc) {
  * @returns {ClassDecorator}
  */
 function ComponentScan(scanPath) {
-    Logger.Log('think', '', 'ComponentScan');
     return (target) => {
         if (!(target.prototype instanceof koatty_core.Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
@@ -1069,7 +1069,6 @@ function ComponentScan(scanPath) {
  * @returns {ClassDecorator}
  */
 function ConfigurationScan(scanPath) {
-    Logger.Log('think', '', 'ConfigurationScan');
     return (target) => {
         if (!(target.prototype instanceof koatty_core.Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
@@ -1205,6 +1204,14 @@ Object.defineProperty(exports, 'Helper', {
     enumerable: true,
     get: function () { return koatty_lib.Helper; }
 });
+Object.defineProperty(exports, 'Config', {
+    enumerable: true,
+    get: function () { return koatty_config.Config; }
+});
+Object.defineProperty(exports, 'Value', {
+    enumerable: true,
+    get: function () { return koatty_config.Value; }
+});
 exports.BaseController = BaseController;
 exports.BaseService = BaseService;
 exports.BindAppReadyHook = BindAppReadyHook;
@@ -1248,9 +1255,3 @@ Object.keys(koatty_exception).forEach(function (k) {
         get: function () { return koatty_exception[k]; }
     });
 });
-Object.keys(koatty_trace).forEach(function (k) {
-    if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
-        enumerable: true,
-        get: function () { return koatty_trace[k]; }
-    });
-});

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-02-14 14:58:23
+* @Date: 2022-02-21 18:02:12
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -19,11 +19,11 @@ export * from 'koatty_container';
 import * as path from 'path';
 import { Load } from 'koatty_loader';
 import { LoadConfigs } from 'koatty_config';
+export { Config, Value } from 'koatty_config';
 import { DefaultLogger } from 'koatty_logger';
 import { prevent } from 'koatty_exception';
 export * from 'koatty_exception';
 import { Trace } from 'koatty_trace';
-export * from 'koatty_trace';
 import { Payload } from 'koatty_payload';
 
 /**
@@ -683,7 +683,7 @@ class Loader {
      * @memberof Loader
      */
     static async LoadMiddlewares(app, loadPath) {
-        var _a, _b;
+        var _a;
         let middlewareConf = app.config(undefined, "middleware");
         if (Helper.isEmpty(middlewareConf)) {
             middlewareConf = { config: {}, list: [] };
@@ -700,7 +700,6 @@ class Loader {
             item.id = ((_a = item.id) !== null && _a !== void 0 ? _a : "").replace("MIDDLEWARE:", "");
             if (item.id && Helper.isClass(item.target)) {
                 IOCContainer.reg(item.id, item.target, { scope: "Prototype", type: "MIDDLEWARE", args: [] });
-                // middleware[item.id] = item.target;
             }
         });
         const middlewareConfList = middlewareConf.list;
@@ -710,9 +709,6 @@ class Loader {
                 defaultList.push(item);
             }
         });
-        // if (defaultList.length > middlewareConfList.length) {
-        //     Logger.Warn("Some middleware is loaded but not allowed to execute.");
-        // }
         //de-duplication
         const appMList = [...new Set(defaultList)];
         //Automatically call middleware
@@ -727,11 +723,17 @@ class Loader {
                 continue;
             }
             if (middlewareConf.config[key] === false) {
-                Logger.Warn(`Middleware ${key} is loaded but not allowed to execute.`);
-                continue;
+                // Default middleware cannot be disabled
+                if (defaultList.includes(key)) {
+                    Logger.Warn(`Middleware ${key} cannot be disabled.`);
+                }
+                else {
+                    Logger.Warn(`Middleware ${key} is loaded but not allowed to execute.`);
+                    continue;
+                }
             }
             Logger.Debug(`Load middleware: ${key}`);
-            const result = await handle.run((_b = middlewareConf.config[key]) !== null && _b !== void 0 ? _b : {}, app);
+            const result = await handle.run(middlewareConf.config[key] || {}, app);
             if (Helper.isFunction(result)) {
                 if (result.length < 3) {
                     app.use(result);
@@ -741,7 +743,6 @@ class Loader {
                 }
             }
         }
-        // app.setMetaData("_middlewares", middleware);
     }
     /**
      * Load controllers
@@ -850,7 +851,7 @@ class Loader {
     }
 }
 
-var version = "3.5.16";
+var version = "3.6.0-0";
 var engines = {
 	node: ">12.0.0"
 };
@@ -1035,7 +1036,6 @@ function Bootstrap(bootFunc) {
  * @returns {ClassDecorator}
  */
 function ComponentScan(scanPath) {
-    Logger.Log('think', '', 'ComponentScan');
     return (target) => {
         if (!(target.prototype instanceof Koatty)) {
             throw new Error(`class does not inherit from Koatty`);
@@ -1052,7 +1052,6 @@ function ComponentScan(scanPath) {
  * @returns {ClassDecorator}
  */
 function ConfigurationScan(scanPath) {
-    Logger.Log('think', '', 'ConfigurationScan');
     return (target) => {
         if (!(target.prototype instanceof Koatty)) {
             throw new Error(`class does not inherit from Koatty`);

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koatty",
-    "version": "3.5.16",
+    "version": "3.6.0-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,18 +58,17 @@
         "@types/koa": "^2.x.x",
         "@types/koa__router": "^8.x.x",
         "@types/node": "^16.x.x",
-        "@types/uuid": "^8.x.x",
         "@types/ws": "^8.x.x",
         "@typescript-eslint/eslint-plugin": "^5.x.x",
         "@typescript-eslint/parser": "^5.x.x",
-        "commitlint": "^15.x.x",
+        "commitlint": "^11.x.x",
         "commitlint-config-gitmoji": "^2.x.x",
         "conventional-changelog-cli": "^2.x.x",
         "copyfiles": "^2.x.x",
         "del-cli": "^4.x.x",
         "eslint": "^8.x.x",
         "eslint-plugin-jest": "^25.x.x",
-        "husky": "^7.x.x",
+        "husky": "^4.x.x",
         "jest": "^27.x.x",
         "jest-html-reporters": "^2.x.x",
         "rollup": "^2.x.x",
@@ -80,19 +79,21 @@
         "typescript": "^4.x.x"
     },
     "dependencies": {
-        "koa": "^2.13.4",
-        "koatty_config": "^1.0.6",
-        "koatty_container": "^1.6.16",
-        "koatty_core": "^1.5.2",
-        "koatty_exception": "^1.1.2",
-        "koatty_lib": "^1.2.8",
-        "koatty_loader": "^1.0.2",
-        "koatty_logger": "^1.3.12",
-        "koatty_payload": "^1.3.11",
-        "koatty_router": "^1.6.4",
-        "koatty_serve": "^1.4.4",
-        "koatty_trace": "^1.5.4",
-        "reflect-metadata": "^0.1.13",
-        "tslib": "^2.3.1"
+        "koa": "2.13.4",
+        "koatty_config": "1.1.2",
+        "koatty_container": "1.7.4",
+        "koatty_core": "1.6.0",
+        "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_trace": "1.6.0",
+        "koatty_validation": "1.1.0",
+        "reflect-metadata": "0.1.13",
+        "tslib": "2.3.1"
     }
 }