koatty 3.10.4-2 → 3.10.4-4

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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-4](https://github.com/thinkkoa/koatty/compare/v3.10.4-3...v3.10.4-4) (2023-12-23)
+
+
+### Bug Fixes
+
+* remove export ([b2eed18](https://github.com/thinkkoa/koatty/commit/b2eed18017838e9e91394f91cd60ea9790c59920))
+
+### [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-23 11:03:07
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -250,6 +250,5 @@ export * from "koatty_container";
 export * from "koatty_core";
 export * from "koatty_exception";
 export * from "koatty_serve";
-export * from "koatty_trace";
 
 export { }

package/dist/index.js

@@ -1,22 +1,22 @@
 /*!
 * @Author: richen
-* @Date: 2023-12-15 00:18:46
+* @Date: 2023-12-23 11:02:53
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
 */
 'use strict';
 
+var koatty_container = require('koatty_container');
 var koatty_core = require('koatty_core');
+var koatty_serve = require('koatty_serve');
 var path = require('path');
 var koatty_loader = require('koatty_loader');
+var koatty_exception = require('koatty_exception');
 var koatty_config = require('koatty_config');
+var koatty_trace = require('koatty_trace');
 var koatty_lib = require('koatty_lib');
 var koatty_logger = require('koatty_logger');
-var koatty_exception = require('koatty_exception');
-var koatty_container = require('koatty_container');
-var koatty_trace = require('koatty_trace');
-var koatty_serve = require('koatty_serve');
 require('reflect-metadata');
 
 function _interopNamespaceDefault(e) {
@@ -38,39 +38,21 @@ function _interopNamespaceDefault(e) {
 
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 
-/*
- * @Description: framework logger
- * @Usage:
- * @Author: richen
- * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2023-12-09 23:02:27
- * @License: BSD (3-Clause)
- * @Copyright (c): <richenlin(at)gmail.com>
- */
-// Logger
-const Logger = koatty_logger.DefaultLogger;
-/**
- * SetLogger
- *
- * @export
- * @param {{
- *     logLevel?: LogLevelType;
- *     logFilePath?: string;
- *     sensFields?: string[];
- * }} config
- */
-function SetLogger(app, config) {
-    if (config.logLevel) {
-        koatty_logger.DefaultLogger.setLevel(config.logLevel);
-    }
-    if (config.logFilePath && !app.silent) {
-        koatty_lib.Helper.define(app, "logsPath", config.logFilePath);
-        process.env.LOGS_PATH = config.logFilePath;
-        koatty_logger.DefaultLogger.setLogFilePath(config.logFilePath);
-    }
-    if (config.sensFields) {
-        koatty_logger.DefaultLogger.setSensFields(config.sensFields);
-    }
+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;
+    const asyncHooks = app.config("async_hooks") || false;
+    const options = {
+        RequestIdHeaderName: app.config('trace_header') || 'X-Request-Id',
+        RequestIdName: app.config('trace_id') || "requestId",
+        IdFactory: undefined,
+        Timeout: timeout,
+        Encoding: encoding,
+        OpenTrace: openTrace,
+        AsyncHooks: asyncHooks,
+    };
+    app.use(await koatty_trace.Trace(options, app));
 }
 
 /*
@@ -149,27 +131,6 @@ function formatApiData(msg, data, defaultCode) {
     return obj;
 }
 
-/*
- * @Description: framework constants
- * @Usage:
- * @Author: richen
- * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2023-12-09 23:00:13
- * @License: BSD (3-Clause)
- * @Copyright (c): <richenlin(at)gmail.com>
- */
-const COMPONENT_SCAN = 'COMPONENT_SCAN';
-const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
-// tslint:disable: no-irregular-whitespace
-const LOGO = `
-
-┬┌─┌─┐┌─┐┌┬┐┌┬┐┬ ┬
-├┴┐│ │├─┤ │  │ └┬┘
-┴ ┴└─┘┴ ┴ ┴  ┴  ┴ 
--------------------------------------------
-https://github.com/koatty
-`;
-
 /*
  * @Description: base controller
  * @Usage:
@@ -256,29 +217,68 @@ class BaseController {
 //     }
 // });
 
-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;
-    const asyncHooks = app.config("async_hooks") || false;
-    const options = {
-        RequestIdHeaderName: app.config('trace_header') || 'X-Request-Id',
-        RequestIdName: app.config('trace_id') || "requestId",
-        IdFactory: undefined,
-        Timeout: timeout,
-        Encoding: encoding,
-        OpenTrace: openTrace,
-        AsyncHooks: asyncHooks,
-    };
-    app.use(koatty_trace.Trace(options, app));
+/*
+ * @Description: framework logger
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:02:27
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
+ */
+// Logger
+const Logger = koatty_logger.DefaultLogger;
+/**
+ * SetLogger
+ *
+ * @export
+ * @param {{
+ *     logLevel?: LogLevelType;
+ *     logFilePath?: string;
+ *     sensFields?: string[];
+ * }} config
+ */
+function SetLogger(app, config) {
+    if (config.logLevel) {
+        koatty_logger.DefaultLogger.setLevel(config.logLevel);
+    }
+    if (config.logFilePath && !app.silent) {
+        koatty_lib.Helper.define(app, "logsPath", config.logFilePath);
+        process.env.LOGS_PATH = config.logFilePath;
+        koatty_logger.DefaultLogger.setLogFilePath(config.logFilePath);
+    }
+    if (config.sensFields) {
+        koatty_logger.DefaultLogger.setSensFields(config.sensFields);
+    }
 }
 
+/*
+ * @Description: framework constants
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:00:13
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
+ */
+const COMPONENT_SCAN = 'COMPONENT_SCAN';
+const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
+// tslint:disable: no-irregular-whitespace
+const LOGO = `
+
+┬┌─┌─┐┌─┐┌┬┐┌┬┐┬ ┬
+├┴┐│ │├─┤ │  │ └┬┘
+┴ ┴└─┘┴ ┴ ┴  ┴  ┴ 
+-------------------------------------------
+https://github.com/koatty
+`;
+
 /*
  * @Description: framework loader
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 22:55:49
- * @LastEditTime: 2023-12-14 23:10:33
+ * @LastEditTime: 2023-12-22 07:31:21
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -509,7 +509,7 @@ class Loader {
      */
     static async LoadMiddlewares(app, loadPath) {
         // Error handling middleware
-        TraceHandler(app);
+        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-4";
 var engines = {
 	node: ">12.0.0"
 };
@@ -719,7 +715,7 @@ const checkUTRuntime = () => {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2023-12-14 23:06:45
+ * @LastEditTime: 2023-12-22 07:31:53
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -1069,28 +1065,16 @@ exports.Logger = Logger;
 exports.Middleware = Middleware;
 exports.Plugin = Plugin;
 exports.Service = Service;
-Object.keys(koatty_core).forEach(function (k) {
-  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
-    enumerable: true,
-    get: function () { return koatty_core[k]; }
-  });
-});
-Object.keys(koatty_exception).forEach(function (k) {
-  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
-    enumerable: true,
-    get: function () { return koatty_exception[k]; }
-  });
-});
 Object.keys(koatty_container).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
     get: function () { return koatty_container[k]; }
   });
 });
-Object.keys(koatty_trace).forEach(function (k) {
+Object.keys(koatty_core).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,
-    get: function () { return koatty_trace[k]; }
+    get: function () { return koatty_core[k]; }
   });
 });
 Object.keys(koatty_serve).forEach(function (k) {
@@ -1099,3 +1083,9 @@ Object.keys(koatty_serve).forEach(function (k) {
     get: function () { return koatty_serve[k]; }
   });
 });
+Object.keys(koatty_exception).forEach(function (k) {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return koatty_exception[k]; }
+  });
+});

package/dist/index.mjs

@@ -1,62 +1,43 @@
 /*!
 * @Author: richen
-* @Date: 2023-12-15 00:18:46
+* @Date: 2023-12-23 11:02:53
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
 */
+import { IOCContainer, TAGGED_CLS } from 'koatty_container';
+export * from 'koatty_container';
 import { AppEventArr, Koatty } from 'koatty_core';
 export * from 'koatty_core';
+import { NewServe, NewRouter, BindProcessEvent, CONTROLLER_ROUTER } from 'koatty_serve';
+export * from 'koatty_serve';
 import * as path from 'path';
 import { Load } from 'koatty_loader';
+import { prevent } from 'koatty_exception';
+export * from 'koatty_exception';
 import { LoadConfigs } from 'koatty_config';
 export { Config, Value } from 'koatty_config';
+import { Trace } from 'koatty_trace';
 import { Helper } from 'koatty_lib';
 export { Helper } from 'koatty_lib';
 import { DefaultLogger } from 'koatty_logger';
-import { prevent } from 'koatty_exception';
-export * from 'koatty_exception';
-import { IOCContainer, TAGGED_CLS } from 'koatty_container';
-export * from 'koatty_container';
-import { Trace } from 'koatty_trace';
-export * from 'koatty_trace';
-import { NewServe, NewRouter, BindProcessEvent, CONTROLLER_ROUTER } from 'koatty_serve';
-export * from 'koatty_serve';
 import 'reflect-metadata';
 
-/*
- * @Description: framework logger
- * @Usage:
- * @Author: richen
- * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2023-12-09 23:02:27
- * @License: BSD (3-Clause)
- * @Copyright (c): <richenlin(at)gmail.com>
- */
-// Logger
-const Logger = DefaultLogger;
-/**
- * SetLogger
- *
- * @export
- * @param {{
- *     logLevel?: LogLevelType;
- *     logFilePath?: string;
- *     sensFields?: string[];
- * }} config
- */
-function SetLogger(app, config) {
-    if (config.logLevel) {
-        DefaultLogger.setLevel(config.logLevel);
-    }
-    if (config.logFilePath && !app.silent) {
-        Helper.define(app, "logsPath", config.logFilePath);
-        process.env.LOGS_PATH = config.logFilePath;
-        DefaultLogger.setLogFilePath(config.logFilePath);
-    }
-    if (config.sensFields) {
-        DefaultLogger.setSensFields(config.sensFields);
-    }
+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;
+    const asyncHooks = app.config("async_hooks") || false;
+    const options = {
+        RequestIdHeaderName: app.config('trace_header') || 'X-Request-Id',
+        RequestIdName: app.config('trace_id') || "requestId",
+        IdFactory: undefined,
+        Timeout: timeout,
+        Encoding: encoding,
+        OpenTrace: openTrace,
+        AsyncHooks: asyncHooks,
+    };
+    app.use(await Trace(options, app));
 }
 
 /*
@@ -135,27 +116,6 @@ function formatApiData(msg, data, defaultCode) {
     return obj;
 }
 
-/*
- * @Description: framework constants
- * @Usage:
- * @Author: richen
- * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2023-12-09 23:00:13
- * @License: BSD (3-Clause)
- * @Copyright (c): <richenlin(at)gmail.com>
- */
-const COMPONENT_SCAN = 'COMPONENT_SCAN';
-const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
-// tslint:disable: no-irregular-whitespace
-const LOGO = `
-
-┬┌─┌─┐┌─┐┌┬┐┌┬┐┬ ┬
-├┴┐│ │├─┤ │  │ └┬┘
-┴ ┴└─┘┴ ┴ ┴  ┴  ┴ 
--------------------------------------------
-https://github.com/koatty
-`;
-
 /*
  * @Description: base controller
  * @Usage:
@@ -242,29 +202,68 @@ class BaseController {
 //     }
 // });
 
-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;
-    const asyncHooks = app.config("async_hooks") || false;
-    const options = {
-        RequestIdHeaderName: app.config('trace_header') || 'X-Request-Id',
-        RequestIdName: app.config('trace_id') || "requestId",
-        IdFactory: undefined,
-        Timeout: timeout,
-        Encoding: encoding,
-        OpenTrace: openTrace,
-        AsyncHooks: asyncHooks,
-    };
-    app.use(Trace(options, app));
+/*
+ * @Description: framework logger
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:02:27
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
+ */
+// Logger
+const Logger = DefaultLogger;
+/**
+ * SetLogger
+ *
+ * @export
+ * @param {{
+ *     logLevel?: LogLevelType;
+ *     logFilePath?: string;
+ *     sensFields?: string[];
+ * }} config
+ */
+function SetLogger(app, config) {
+    if (config.logLevel) {
+        DefaultLogger.setLevel(config.logLevel);
+    }
+    if (config.logFilePath && !app.silent) {
+        Helper.define(app, "logsPath", config.logFilePath);
+        process.env.LOGS_PATH = config.logFilePath;
+        DefaultLogger.setLogFilePath(config.logFilePath);
+    }
+    if (config.sensFields) {
+        DefaultLogger.setSensFields(config.sensFields);
+    }
 }
 
+/*
+ * @Description: framework constants
+ * @Usage:
+ * @Author: richen
+ * @Date: 2023-12-09 21:56:32
+ * @LastEditTime: 2023-12-09 23:00:13
+ * @License: BSD (3-Clause)
+ * @Copyright (c): <richenlin(at)gmail.com>
+ */
+const COMPONENT_SCAN = 'COMPONENT_SCAN';
+const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
+// tslint:disable: no-irregular-whitespace
+const LOGO = `
+
+┬┌─┌─┐┌─┐┌┬┐┌┬┐┬ ┬
+├┴┐│ │├─┤ │  │ └┬┘
+┴ ┴└─┘┴ ┴ ┴  ┴  ┴ 
+-------------------------------------------
+https://github.com/koatty
+`;
+
 /*
  * @Description: framework loader
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 22:55:49
- * @LastEditTime: 2023-12-14 23:10:33
+ * @LastEditTime: 2023-12-22 07:31:21
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -495,7 +494,7 @@ class Loader {
      */
     static async LoadMiddlewares(app, loadPath) {
         // Error handling middleware
-        TraceHandler(app);
+        await TraceHandler(app);
         let middlewareConf = app.config(undefined, "middleware");
         if (Helper.isEmpty(middlewareConf)) {
             middlewareConf = { config: {}, list: [] };
@@ -521,12 +520,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 +559,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 +632,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 +647,7 @@ class Loader {
     }
 }
 
-var version = "3.10.4-2";
+var version = "3.10.4-4";
 var engines = {
 	node: ">12.0.0"
 };
@@ -705,7 +700,7 @@ const checkUTRuntime = () => {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2023-12-14 23:06:45
+ * @LastEditTime: 2023-12-22 07:31:53
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.10.4-2",
+  "version": "3.10.4-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",
@@ -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-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",
@@ -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"
   }
 }