koatty 3.10.4-2 → 3.10.4-3

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.10.4-3](https://github.com/thinkkoa/koatty/compare/v3.10.4-2...v3.10.4-3) (2023-12-16)
+
+
+### Bug Fixes
+
+* async tracer ([098bf04](https://github.com/thinkkoa/koatty/commit/098bf040dc44cb1294cf3726acab65a2856f0548))
+* 集成tracer ([7f1ed23](https://github.com/thinkkoa/koatty/commit/7f1ed232e4aa1224132ce74d6a6f4b92aa884973))
+
 ### [3.10.4-2](https://github.com/thinkkoa/koatty/compare/v3.10.4-1...v3.10.4-2) (2023-12-14)
 
 ### [3.10.4-1](https://github.com/thinkkoa/koatty/compare/v3.10.4-0...v3.10.4-1) (2023-12-10)

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2023-12-15 00:19:05
+* @Date: 2023-12-16 14:47:58
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/

package/dist/index.js

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2023-12-15 00:18:46
+* @Date: 2023-12-16 14:47:37
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -256,7 +256,7 @@ class BaseController {
 //     }
 // });
 
-function TraceHandler(app) {
+async function TraceHandler(app) {
     const timeout = (app.config('http_timeout') || 10) * 1000;
     const encoding = app.config('encoding') || 'utf-8';
     const openTrace = app.config("open_trace") || false;
@@ -264,13 +264,13 @@ function TraceHandler(app) {
     const options = {
         RequestIdHeaderName: app.config('trace_header') || 'X-Request-Id',
         RequestIdName: app.config('trace_id') || "requestId",
-        IdFactory: undefined,
+        // IdFactory: undefined,
         Timeout: timeout,
         Encoding: encoding,
         OpenTrace: openTrace,
         AsyncHooks: asyncHooks,
     };
-    app.use(koatty_trace.Trace(options, app));
+    app.use(await koatty_trace.Trace(options, app));
 }
 
 /*
@@ -278,7 +278,7 @@ function TraceHandler(app) {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 22:55:49
- * @LastEditTime: 2023-12-14 23:10:33
+ * @LastEditTime: 2023-12-16 14:46:25
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -508,8 +508,8 @@ class Loader {
      * @memberof Loader
      */
     static async LoadMiddlewares(app, loadPath) {
-        // Error handling middleware
-        TraceHandler(app);
+        // Error tracing middleware
+        await TraceHandler(app);
         let middlewareConf = app.config(undefined, "middleware");
         if (koatty_lib.Helper.isEmpty(middlewareConf)) {
             middlewareConf = { config: {}, list: [] };
@@ -535,12 +535,10 @@ class Loader {
         for (const key of appMList) {
             const handle = koatty_container.IOCContainer.get(key, "MIDDLEWARE");
             if (!handle) {
-                Logger.Error(`Middleware ${key} load error.`);
-                continue;
+                throw Error(`Middleware ${key} load error.`);
             }
             if (!koatty_lib.Helper.isFunction(handle.run)) {
-                Logger.Error(`The middleware ${key} must implements interface 'IMiddleware'.`);
-                continue;
+                throw Error(`The middleware ${key} must implements interface 'IMiddleware'.`);
             }
             if (middlewareConf.config[key] === false) {
                 Logger.Warn(`The middleware ${key} has been loaded but not executed.`);
@@ -576,7 +574,7 @@ class Loader {
                 koatty_container.IOCContainer.reg(item.id, item.target, { scope: "Prototype", type: "CONTROLLER", args: [] });
                 const ctl = koatty_container.IOCContainer.getInsByClass(item.target);
                 if (!(ctl instanceof BaseController)) {
-                    throw new Error(`class ${item.id} does not inherit from BaseController`);
+                    throw Error(`Controller class ${item.id} does not inherit from BaseController`);
                 }
                 controllers.push(item.id);
             }
@@ -649,12 +647,10 @@ class Loader {
         for (const key of pluginConfList) {
             const handle = koatty_container.IOCContainer.get(key, "COMPONENT");
             if (!handle) {
-                Logger.Error(`Plugin ${key} load error.`);
-                continue;
+                throw Error(`Plugin ${key} load error.`);
             }
             if (!koatty_lib.Helper.isFunction(handle.run)) {
-                Logger.Error(`Plugin ${key} must be implements method 'run'.`);
-                continue;
+                throw Error(`Plugin ${key} must implements interface 'IPlugin'.`);
             }
             if (pluginsConf.config[key] === false) {
                 Logger.Warn(`Plugin ${key} already loaded but not effective.`);
@@ -666,7 +662,7 @@ class Loader {
     }
 }
 
-var version = "3.10.4-2";
+var version = "3.10.4-3";
 var engines = {
 	node: ">12.0.0"
 };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2023-12-15 00:18:46
+* @Date: 2023-12-16 14:47:37
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -242,7 +242,7 @@ class BaseController {
 //     }
 // });
 
-function TraceHandler(app) {
+async function TraceHandler(app) {
     const timeout = (app.config('http_timeout') || 10) * 1000;
     const encoding = app.config('encoding') || 'utf-8';
     const openTrace = app.config("open_trace") || false;
@@ -250,13 +250,13 @@ function TraceHandler(app) {
     const options = {
         RequestIdHeaderName: app.config('trace_header') || 'X-Request-Id',
         RequestIdName: app.config('trace_id') || "requestId",
-        IdFactory: undefined,
+        // IdFactory: undefined,
         Timeout: timeout,
         Encoding: encoding,
         OpenTrace: openTrace,
         AsyncHooks: asyncHooks,
     };
-    app.use(Trace(options, app));
+    app.use(await Trace(options, app));
 }
 
 /*
@@ -264,7 +264,7 @@ function TraceHandler(app) {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 22:55:49
- * @LastEditTime: 2023-12-14 23:10:33
+ * @LastEditTime: 2023-12-16 14:46:25
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -494,8 +494,8 @@ class Loader {
      * @memberof Loader
      */
     static async LoadMiddlewares(app, loadPath) {
-        // Error handling middleware
-        TraceHandler(app);
+        // Error tracing middleware
+        await TraceHandler(app);
         let middlewareConf = app.config(undefined, "middleware");
         if (Helper.isEmpty(middlewareConf)) {
             middlewareConf = { config: {}, list: [] };
@@ -521,12 +521,10 @@ class Loader {
         for (const key of appMList) {
             const handle = IOCContainer.get(key, "MIDDLEWARE");
             if (!handle) {
-                Logger.Error(`Middleware ${key} load error.`);
-                continue;
+                throw Error(`Middleware ${key} load error.`);
             }
             if (!Helper.isFunction(handle.run)) {
-                Logger.Error(`The middleware ${key} must implements interface 'IMiddleware'.`);
-                continue;
+                throw Error(`The middleware ${key} must implements interface 'IMiddleware'.`);
             }
             if (middlewareConf.config[key] === false) {
                 Logger.Warn(`The middleware ${key} has been loaded but not executed.`);
@@ -562,7 +560,7 @@ class Loader {
                 IOCContainer.reg(item.id, item.target, { scope: "Prototype", type: "CONTROLLER", args: [] });
                 const ctl = IOCContainer.getInsByClass(item.target);
                 if (!(ctl instanceof BaseController)) {
-                    throw new Error(`class ${item.id} does not inherit from BaseController`);
+                    throw Error(`Controller class ${item.id} does not inherit from BaseController`);
                 }
                 controllers.push(item.id);
             }
@@ -635,12 +633,10 @@ class Loader {
         for (const key of pluginConfList) {
             const handle = IOCContainer.get(key, "COMPONENT");
             if (!handle) {
-                Logger.Error(`Plugin ${key} load error.`);
-                continue;
+                throw Error(`Plugin ${key} load error.`);
             }
             if (!Helper.isFunction(handle.run)) {
-                Logger.Error(`Plugin ${key} must be implements method 'run'.`);
-                continue;
+                throw Error(`Plugin ${key} must implements interface 'IPlugin'.`);
             }
             if (pluginsConf.config[key] === false) {
                 Logger.Warn(`Plugin ${key} already loaded but not effective.`);
@@ -652,7 +648,7 @@ class Loader {
     }
 }
 
-var version = "3.10.4-2";
+var version = "3.10.4-3";
 var engines = {
 	node: ">12.0.0"
 };

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.10.4-2",
+  "version": "3.10.4-3",
   "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",
@@ -93,6 +93,6 @@
     "koatty_proto": "^1.1.12",
     "koatty_serve": "2.1.0",
     "koatty_trace": "^1.10.4",
-    "koatty_validation": "^1.2.9"
+    "koatty_validation": "^1.2.10"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.10.4-2",
+  "version": "3.10.4-3",
   "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",
@@ -93,6 +93,6 @@
     "koatty_proto": "^1.1.12",
     "koatty_serve": "2.1.0",
     "koatty_trace": "^1.10.4",
-    "koatty_validation": "^1.2.9"
+    "koatty_validation": "^1.2.10"
   }
 }