koatty 3.8.0-5 → 3.8.0-6

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.8.0-6](https://github.com/thinkkoa/koatty/compare/v3.8.0-5...v3.8.0-6) (2023-03-04)
+
+
+### Bug Fixes
+
+* change event ([7d651a7](https://github.com/thinkkoa/koatty/commit/7d651a7b3453c0878dd37d0890509b2908e4afdf))
+* 修改listen callback函数类型 ([9a3b29f](https://github.com/thinkkoa/koatty/commit/9a3b29f8d16a06b3627e5ccf88c08460e2cc3ae2))
+
 ## [3.8.0-5](https://github.com/thinkkoa/koatty/compare/v3.8.0-4...v3.8.0-5) (2023-02-26)
 
 ## [3.8.0-4](https://github.com/thinkkoa/koatty/compare/v3.8.0-3...v3.8.0-4) (2023-02-26)

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2023-02-27 00:10:15
+* @Date: 2023-03-05 01:16:27
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -31,7 +31,7 @@ export declare interface ApiOutput {
     data: any;
 }
 
-export declare type AppReadyHookFunc = (app: Koatty) => Promise<any>;
+export declare type AppBootHookFunc = (app: Koatty) => Promise<any>;
 
 /**
  * Base controller
@@ -104,7 +104,7 @@ export declare class BaseService implements IService {
  * example:
  * export function TestDecorator(): ClassDecorator {
  *  return (target: any) => {
- *   BindAppReadyHook((app: Koatty) => {
+ *   BindAppBootHook((app: Koatty) => {
  *      // todo
  *      return Promise.resolve();
  *   }, target)
@@ -112,10 +112,10 @@ export declare class BaseService implements IService {
  * }
  *
  * @export
- * @param {AppReadyHookFunc} func
+ * @param {AppBootHookFunc} func
  * @param {*} target
  */
-export declare function BindAppReadyHook(func: AppReadyHookFunc, target: any): void;
+export declare function BindAppBootHook(func: AppBootHookFunc, target: any): void;
 
 /**
  * Bootstrap application

package/dist/index.js

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2023-02-27 00:09:59
+* @Date: 2023-03-05 01:16:11
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -152,7 +152,7 @@ function formatApiData(msg, data, defaultCode) {
  */
 const COMPONENT_SCAN = 'COMPONENT_SCAN';
 const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
-const APP_READY_HOOK = "APP_READY_HOOK";
+const APP_BOOT_HOOK = "APP_BOOT_HOOK";
 // tslint:disable: no-irregular-whitespace
 const LOGO = `
 
@@ -418,11 +418,11 @@ class Loader {
      * @param {*} target
      * @memberof Loader
      */
-    static LoadAppReadyHooks(app, target) {
-        const funcs = koatty_container.IOCContainer.getClassMetadata(koatty_container.TAGGED_CLS, APP_READY_HOOK, target);
+    static LoadAppBootHooks(app, target) {
+        const funcs = koatty_container.IOCContainer.getClassMetadata(koatty_container.TAGGED_CLS, APP_BOOT_HOOK, target);
         if (koatty_lib.Helper.isArray(funcs)) {
             funcs.forEach((element) => {
-                app.once('appReady', () => element(app));
+                app.once('appBoot', () => element(app));
                 return null;
             });
         }
@@ -616,7 +616,7 @@ class Loader {
     }
 }
 
-var version = "3.8.0-5";
+var version = "3.8.0-6";
 var engines = {
 	node: ">12.0.0"
 };
@@ -713,13 +713,13 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         // configuration metadata
         const configurationMetas = Loader.GetConfigurationMetas(app, target);
         Loader.LoadConfigs(app, configurationMetas);
+        // Load App ready hooks
+        Loader.LoadAppBootHooks(app, target);
+        // app.emit("appBoot");
+        await asyncEvent(app, 'appBoot');
         // Load Plugin
         Logger.Log('Koatty', '', 'Load Plugins ...');
         await Loader.LoadPlugins(app);
-        // app.emit("appBoot");
-        await asyncEvent(app, 'appBoot');
-        // Load App ready hooks
-        Loader.LoadAppReadyHooks(app, target);
         // Load Middleware
         Logger.Log('Koatty', '', 'Load Middlewares ...');
         await Loader.LoadMiddlewares(app);
@@ -733,17 +733,20 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         Logger.Log('Koatty', '', 'Load Controllers ...');
         const controllers = Loader.LoadControllers(app);
         // Create Server
-        app.server = newServe(app);
+        // app.server = newServe(app);
+        koatty_lib.Helper.define(app, "server", newServe(app));
         // Create router
-        app.router = newRouter(app);
-        // Load Routers
-        Logger.Log('Koatty', '', 'Load Routers ...');
-        app.router.LoadRouter(controllers);
+        // app.router = newRouter(app);
+        koatty_lib.Helper.define(app, "router", newRouter(app));
         // Emit app ready event
         Logger.Log('Koatty', '', 'Emit App Ready ...');
         await asyncEvent(app, 'appReady');
+        // Load Routers
+        Logger.Log('Koatty', '', 'Load Routers ...');
+        app.router.LoadRouter(controllers);
         if (!isUTRuntime) {
-            app.listen(app.server, listenCallback(app));
+            // Start Server
+            app.listen(listenCallback);
         }
         return app;
     }
@@ -772,26 +775,21 @@ const newRouter = function (app) {
  * @returns {*}
  */
 const listenCallback = (app) => {
-    return function () {
-        const options = app.server.options;
-        // Emit app started event
-        Logger.Log('Koatty', '', 'Emit App Start ...');
-        asyncEvent(app, 'appStart');
-        Logger.Log('Koatty', '', '====================================');
-        Logger.Log("Koatty", "", `Nodejs Version: ${process.version}`);
-        Logger.Log("Koatty", "", `Koatty Version: v${KOATTY_VERSION}`);
-        Logger.Log("Koatty", "", `App Environment: ${app.env}`);
-        Logger.Log('Koatty', '', `Server Protocol: ${(options.protocol).toUpperCase()}`);
-        Logger.Log("Koatty", "", `Server running at ${options.protocol === "http2" ? "https" : options.protocol}://${options.hostname || '127.0.0.1'}:${options.port}/`);
-        Logger.Log("Koatty", "", "====================================");
-        // binding event "appStop"
-        Logger.Log('Koatty', '', 'Bind App Stop event ...');
-        koatty_serve.BindProcessEvent(app, 'appStop');
-        // tslint:disable-next-line: no-unused-expression
-        app.appDebug && Logger.Warn(`Running in debug mode.`);
-        // Set Logger
-        Loader.SetLogger(app);
-    };
+    const options = app.server.options;
+    Logger.Log('Koatty', '', '====================================');
+    Logger.Log("Koatty", "", `Nodejs Version: ${process.version}`);
+    Logger.Log("Koatty", "", `Koatty Version: v${KOATTY_VERSION}`);
+    Logger.Log("Koatty", "", `App Environment: ${app.env}`);
+    Logger.Log('Koatty', '', `Server Protocol: ${(options.protocol).toUpperCase()}`);
+    Logger.Log("Koatty", "", `Server running at ${options.protocol === "http2" ? "https" : options.protocol}://${options.hostname || '127.0.0.1'}:${options.port}/`);
+    Logger.Log("Koatty", "", "====================================");
+    // binding event "appStop"
+    Logger.Log('Koatty', '', 'Bind App Stop event ...');
+    koatty_serve.BindProcessEvent(app, 'appStop');
+    // tslint:disable-next-line: no-unused-expression
+    app.appDebug && Logger.Warn(`Running in debug mode.`);
+    // Set Logger
+    Loader.SetLogger(app);
 };
 /**
  * create serve
@@ -913,7 +911,7 @@ function ConfigurationScan(scanPath) {
  * example:
  * export function TestDecorator(): ClassDecorator {
  *  return (target: any) => {
- *   BindAppReadyHook((app: Koatty) => {
+ *   BindAppBootHook((app: Koatty) => {
  *      // todo
  *      return Promise.resolve();
  *   }, target)
@@ -921,11 +919,11 @@ function ConfigurationScan(scanPath) {
  * }
  *
  * @export
- * @param {AppReadyHookFunc} func
+ * @param {AppBootHookFunc} func
  * @param {*} target
  */
-function BindAppReadyHook(func, target) {
-    koatty_container.IOCContainer.attachClassMetadata(koatty_container.TAGGED_CLS, APP_READY_HOOK, func, target);
+function BindAppBootHook(func, target) {
+    koatty_container.IOCContainer.attachClassMetadata(koatty_container.TAGGED_CLS, APP_BOOT_HOOK, func, target);
 }
 
 /**
@@ -1045,7 +1043,7 @@ Object.defineProperty(exports, 'Helper', {
 });
 exports.BaseController = BaseController;
 exports.BaseService = BaseService;
-exports.BindAppReadyHook = BindAppReadyHook;
+exports.BindAppBootHook = BindAppBootHook;
 exports.Bootstrap = Bootstrap;
 exports.Component = Component;
 exports.ComponentScan = ComponentScan;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2023-02-27 00:09:59
+* @Date: 2023-03-05 01:16:11
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -138,7 +138,7 @@ function formatApiData(msg, data, defaultCode) {
  */
 const COMPONENT_SCAN = 'COMPONENT_SCAN';
 const CONFIGURATION_SCAN = 'CONFIGURATION_SCAN';
-const APP_READY_HOOK = "APP_READY_HOOK";
+const APP_BOOT_HOOK = "APP_BOOT_HOOK";
 // tslint:disable: no-irregular-whitespace
 const LOGO = `
 
@@ -404,11 +404,11 @@ class Loader {
      * @param {*} target
      * @memberof Loader
      */
-    static LoadAppReadyHooks(app, target) {
-        const funcs = IOCContainer.getClassMetadata(TAGGED_CLS, APP_READY_HOOK, target);
+    static LoadAppBootHooks(app, target) {
+        const funcs = IOCContainer.getClassMetadata(TAGGED_CLS, APP_BOOT_HOOK, target);
         if (Helper.isArray(funcs)) {
             funcs.forEach((element) => {
-                app.once('appReady', () => element(app));
+                app.once('appBoot', () => element(app));
                 return null;
             });
         }
@@ -602,7 +602,7 @@ class Loader {
     }
 }
 
-var version = "3.8.0-5";
+var version = "3.8.0-6";
 var engines = {
 	node: ">12.0.0"
 };
@@ -699,13 +699,13 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         // configuration metadata
         const configurationMetas = Loader.GetConfigurationMetas(app, target);
         Loader.LoadConfigs(app, configurationMetas);
+        // Load App ready hooks
+        Loader.LoadAppBootHooks(app, target);
+        // app.emit("appBoot");
+        await asyncEvent(app, 'appBoot');
         // Load Plugin
         Logger.Log('Koatty', '', 'Load Plugins ...');
         await Loader.LoadPlugins(app);
-        // app.emit("appBoot");
-        await asyncEvent(app, 'appBoot');
-        // Load App ready hooks
-        Loader.LoadAppReadyHooks(app, target);
         // Load Middleware
         Logger.Log('Koatty', '', 'Load Middlewares ...');
         await Loader.LoadMiddlewares(app);
@@ -719,17 +719,20 @@ const executeBootstrap = async function (target, bootFunc, isInitiative = false)
         Logger.Log('Koatty', '', 'Load Controllers ...');
         const controllers = Loader.LoadControllers(app);
         // Create Server
-        app.server = newServe(app);
+        // app.server = newServe(app);
+        Helper.define(app, "server", newServe(app));
         // Create router
-        app.router = newRouter(app);
-        // Load Routers
-        Logger.Log('Koatty', '', 'Load Routers ...');
-        app.router.LoadRouter(controllers);
+        // app.router = newRouter(app);
+        Helper.define(app, "router", newRouter(app));
         // Emit app ready event
         Logger.Log('Koatty', '', 'Emit App Ready ...');
         await asyncEvent(app, 'appReady');
+        // Load Routers
+        Logger.Log('Koatty', '', 'Load Routers ...');
+        app.router.LoadRouter(controllers);
         if (!isUTRuntime) {
-            app.listen(app.server, listenCallback(app));
+            // Start Server
+            app.listen(listenCallback);
         }
         return app;
     }
@@ -758,26 +761,21 @@ const newRouter = function (app) {
  * @returns {*}
  */
 const listenCallback = (app) => {
-    return function () {
-        const options = app.server.options;
-        // Emit app started event
-        Logger.Log('Koatty', '', 'Emit App Start ...');
-        asyncEvent(app, 'appStart');
-        Logger.Log('Koatty', '', '====================================');
-        Logger.Log("Koatty", "", `Nodejs Version: ${process.version}`);
-        Logger.Log("Koatty", "", `Koatty Version: v${KOATTY_VERSION}`);
-        Logger.Log("Koatty", "", `App Environment: ${app.env}`);
-        Logger.Log('Koatty', '', `Server Protocol: ${(options.protocol).toUpperCase()}`);
-        Logger.Log("Koatty", "", `Server running at ${options.protocol === "http2" ? "https" : options.protocol}://${options.hostname || '127.0.0.1'}:${options.port}/`);
-        Logger.Log("Koatty", "", "====================================");
-        // binding event "appStop"
-        Logger.Log('Koatty', '', 'Bind App Stop event ...');
-        BindProcessEvent(app, 'appStop');
-        // tslint:disable-next-line: no-unused-expression
-        app.appDebug && Logger.Warn(`Running in debug mode.`);
-        // Set Logger
-        Loader.SetLogger(app);
-    };
+    const options = app.server.options;
+    Logger.Log('Koatty', '', '====================================');
+    Logger.Log("Koatty", "", `Nodejs Version: ${process.version}`);
+    Logger.Log("Koatty", "", `Koatty Version: v${KOATTY_VERSION}`);
+    Logger.Log("Koatty", "", `App Environment: ${app.env}`);
+    Logger.Log('Koatty', '', `Server Protocol: ${(options.protocol).toUpperCase()}`);
+    Logger.Log("Koatty", "", `Server running at ${options.protocol === "http2" ? "https" : options.protocol}://${options.hostname || '127.0.0.1'}:${options.port}/`);
+    Logger.Log("Koatty", "", "====================================");
+    // binding event "appStop"
+    Logger.Log('Koatty', '', 'Bind App Stop event ...');
+    BindProcessEvent(app, 'appStop');
+    // tslint:disable-next-line: no-unused-expression
+    app.appDebug && Logger.Warn(`Running in debug mode.`);
+    // Set Logger
+    Loader.SetLogger(app);
 };
 /**
  * create serve
@@ -899,7 +897,7 @@ function ConfigurationScan(scanPath) {
  * example:
  * export function TestDecorator(): ClassDecorator {
  *  return (target: any) => {
- *   BindAppReadyHook((app: Koatty) => {
+ *   BindAppBootHook((app: Koatty) => {
  *      // todo
  *      return Promise.resolve();
  *   }, target)
@@ -907,11 +905,11 @@ function ConfigurationScan(scanPath) {
  * }
  *
  * @export
- * @param {AppReadyHookFunc} func
+ * @param {AppBootHookFunc} func
  * @param {*} target
  */
-function BindAppReadyHook(func, target) {
-    IOCContainer.attachClassMetadata(TAGGED_CLS, APP_READY_HOOK, func, target);
+function BindAppBootHook(func, target) {
+    IOCContainer.attachClassMetadata(TAGGED_CLS, APP_BOOT_HOOK, func, target);
 }
 
 /**
@@ -1017,4 +1015,4 @@ class BaseService {
     }
 }
 
-export { BaseController, BaseService, BindAppReadyHook, Bootstrap, Component, ComponentScan, ConfigurationScan, Controller, ExecBootStrap, Logger, Middleware, Plugin, Service };
+export { BaseController, BaseService, BindAppBootHook, Bootstrap, Component, ComponentScan, ConfigurationScan, Controller, ExecBootStrap, Logger, Middleware, Plugin, Service };

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.8.0-5",
+  "version": "3.8.0-6",
   "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",
@@ -82,7 +82,7 @@
     "koa": "^2.14.1",
     "koatty_config": "^1.1.6",
     "koatty_container": "^1.8.0",
-    "koatty_core": "^1.7.6",
+    "koatty_core": "^1.7.8",
     "koatty_exception": "^1.2.8",
     "koatty_lib": "^1.3.2",
     "koatty_loader": "^1.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koatty",
-  "version": "3.8.0-5",
+  "version": "3.8.0-6",
   "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",
@@ -82,7 +82,7 @@
     "koa": "^2.14.1",
     "koatty_config": "^1.1.6",
     "koatty_container": "^1.8.0",
-    "koatty_core": "^1.7.6",
+    "koatty_core": "^1.7.8",
     "koatty_exception": "^1.2.8",
     "koatty_lib": "^1.3.2",
     "koatty_loader": "^1.1.0",