koatty 3.10.4-3 → 3.10.4-5

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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-5](https://github.com/thinkkoa/koatty/compare/v3.10.4-4...v3.10.4-5) (2023-12-23)
+
+
+### Bug Fixes
+
+* KoattyMiddleware ([50dd7f5](https://github.com/thinkkoa/koatty/commit/50dd7f57fc6824127443ddfc614d5f61e83530ed))
+
+### [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)
 
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2023-12-16 14:47:58
+* @Date: 2023-12-23 11:42:32
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -11,8 +11,8 @@ import { EventHookFunc } from 'koatty_core';
 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 { Middleware as Middleware_2 } from 'koa';
 import { Value } from 'koatty_config';
 
 /**
@@ -212,7 +212,8 @@ export declare interface IService {
 /**
  * Interface for Middleware
  */
-export declare type KoattyMiddleware = (ctx: KoattyContext, next: KoattyNext) => Promise<any>;
+export declare interface KoattyMiddleware extends Middleware_2 {
+}
 
 export declare const Logger: Logger_2;
 
@@ -250,6 +251,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-16 14:47:37
+* @Date: 2023-12-23 11:42:17
 * @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 {
 //     }
 // });
 
-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));
+/*
+ * @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-16 14:46:25
+ * @LastEditTime: 2023-12-22 07:31:21
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -508,7 +508,7 @@ class Loader {
      * @memberof Loader
      */
     static async LoadMiddlewares(app, loadPath) {
-        // Error tracing middleware
+        // Error handling middleware
         await TraceHandler(app);
         let middlewareConf = app.config(undefined, "middleware");
         if (koatty_lib.Helper.isEmpty(middlewareConf)) {
@@ -662,7 +662,7 @@ class Loader {
     }
 }
 
-var version = "3.10.4-3";
+var version = "3.10.4-5";
 var engines = {
 	node: ">12.0.0"
 };
@@ -715,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>
  */
@@ -929,7 +929,7 @@ function BindEventHook(eventName, eventFunc, target) {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2023-12-09 23:03:33
+ * @LastEditTime: 2023-12-23 11:40:44
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -1065,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) {
@@ -1095,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-16 14:47:37
+* @Date: 2023-12-23 11:42:17
 * @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 {
 //     }
 // });
 
-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));
+/*
+ * @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-16 14:46:25
+ * @LastEditTime: 2023-12-22 07:31:21
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */
@@ -494,7 +493,7 @@ class Loader {
      * @memberof Loader
      */
     static async LoadMiddlewares(app, loadPath) {
-        // Error tracing middleware
+        // Error handling middleware
         await TraceHandler(app);
         let middlewareConf = app.config(undefined, "middleware");
         if (Helper.isEmpty(middlewareConf)) {
@@ -648,7 +647,7 @@ class Loader {
     }
 }
 
-var version = "3.10.4-3";
+var version = "3.10.4-5";
 var engines = {
 	node: ">12.0.0"
 };
@@ -701,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>
  */
@@ -915,7 +914,7 @@ function BindEventHook(eventName, eventFunc, target) {
  * @Usage:
  * @Author: richen
  * @Date: 2023-12-09 21:56:32
- * @LastEditTime: 2023-12-09 23:03:33
+ * @LastEditTime: 2023-12-23 11:40:44
  * @License: BSD (3-Clause)
  * @Copyright (c): <richenlin(at)gmail.com>
  */

package/dist/package.json

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

package/package.json

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