@midwayjs/bootstrap 3.0.0-alpha.6 → 3.0.0-beta.11

package/CHANGELOG.md

@@ -3,6 +3,103 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21)
+
+**Note:** Version bump only for package @midwayjs/bootstrap
+
+
+
+
+
+# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20)
+
+**Note:** Version bump only for package @midwayjs/bootstrap
+
+
+
+
+
+# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09)
+
+**Note:** Version bump only for package @midwayjs/bootstrap
+
+
+
+
+
+# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
+
+
+### Bug Fixes
+
+* express routing middleware takes effect at the controller level ([#1364](https://github.com/midwayjs/midway/issues/1364)) ([b9272e0](https://github.com/midwayjs/midway/commit/b9272e0971003443304b0c53815be31a0061b4bd))
+
+
+
+
+
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+**Note:** Version bump only for package @midwayjs/bootstrap
+
+
+
+
+
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+**Note:** Version bump only for package @midwayjs/bootstrap
+
+
+
+
+
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+**Note:** Version bump only for package @midwayjs/bootstrap
+
+
+
+
+
+# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
+
+
+### Bug Fixes
+
+* logger close before bootstrap close ([#1370](https://github.com/midwayjs/midway/issues/1370)) ([6cc2720](https://github.com/midwayjs/midway/commit/6cc2720ed3445e8ffccc96d124b80ed7e2517f08))
+
+
+
+
+
+# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
+
+**Note:** Version bump only for package @midwayjs/bootstrap
+
+
+
+
+
+# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16)
+
+**Note:** Version bump only for package @midwayjs/bootstrap
+
+
+
+
+
+# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14)
+
+
+### Bug Fixes
+
+* serverless app support applicationContext ([#1281](https://github.com/midwayjs/midway/issues/1281)) ([b692001](https://github.com/midwayjs/midway/commit/b692001c451b17a10d26cb6778a8566d5fa569c5))
+
+
+
+
+
 ## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09)
 
 **Note:** Version bump only for package @midwayjs/bootstrap

package/README.md

@@ -5,7 +5,7 @@
 
 this is a sub package for midway.
 
-Document: [https://midwayjs.org/midway](https://midwayjs.org/midway)
+Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 

package/dist/bootstrap.d.ts

@@ -1,46 +1,29 @@
-import { IMidwayFramework, IMidwayBootstrapOptions, MidwayFrameworkType, IMidwayContainer } from '@midwayjs/core';
-import { ILogger } from '@midwayjs/logger';
+import { IMidwayBootstrapOptions, IMidwayContainer } from '@midwayjs/core';
+import { IMidwayLogger } from '@midwayjs/logger';
 export declare function isTypeScriptEnvironment(): boolean;
 export declare class BootstrapStarter {
     protected appDir: string;
     protected baseDir: string;
-    protected bootstrapItems: IMidwayFramework<any, any>[];
     protected globalOptions: Partial<IMidwayBootstrapOptions>;
-    protected globalAppMap: Map<MidwayFrameworkType, import("@midwayjs/core").IMidwayBaseApplication<any>>;
     protected globalConfig: any;
     private applicationContext;
     configure(options: IMidwayBootstrapOptions): this;
-    load(unit: (globalConfig: unknown) => IMidwayFramework<any, any>): any;
-    load(unit: IMidwayFramework<any, any>): any;
-    init(): Promise<void>;
+    init(): Promise<IMidwayContainer>;
     run(): Promise<void>;
     stop(): Promise<void>;
-    getActions(action: string, args?: any): any[];
-    getFirstActions(action: string, args?: any): Promise<any>;
-    getTailActions(action: string, args?: any): any[];
-    protected getMainFramework(): IMidwayFramework<any, any>;
-    protected refreshBootstrapItems(): void;
     protected getBaseDir(): string;
-    getBootstrapAppMap(): Map<MidwayFrameworkType, import("@midwayjs/core").IMidwayBaseApplication<any>>;
 }
 export declare class Bootstrap {
     static starter: BootstrapStarter;
-    static logger: ILogger;
+    static logger: IMidwayLogger;
     static configured: boolean;
-    static beforeHandler: any;
+    static applicationContext: IMidwayContainer;
     /**
      * set global configuration for midway
      * @param configuration
      */
     static configure(configuration?: IMidwayBootstrapOptions): typeof Bootstrap;
-    /**
-     * load midway framework unit
-     * @param unit
-     */
-    static load(unit: (globalConfig: unknown) => IMidwayFramework<any, any>): any;
-    static load(unit: IMidwayFramework<any, any>): any;
     private static getStarter;
-    static before(beforeHandler: (container: IMidwayContainer) => void): typeof Bootstrap;
     static run(): Promise<void>;
     static stop(): Promise<void>;
     static reset(): void;
@@ -56,5 +39,6 @@ export declare class Bootstrap {
     static onExit(code: any): void;
     static uncaughtExceptionHandler(err: any): void;
     static unhandledRejectionHandler(err: any): void;
+    static getApplicationContext(): IMidwayContainer;
 }
 //# sourceMappingURL=bootstrap.d.ts.map

package/dist/bootstrap.js

@@ -15,136 +15,37 @@ function isTypeScriptEnvironment() {
 exports.isTypeScriptEnvironment = isTypeScriptEnvironment;
 class BootstrapStarter {
     constructor() {
-        this.bootstrapItems = [];
         this.globalOptions = {};
-        this.globalAppMap = new Map();
     }
     configure(options) {
         this.globalOptions = options;
         return this;
     }
-    load(unit) {
-        this.bootstrapItems.push(unit);
-        return this;
-    }
     async init() {
         this.appDir = this.globalOptions.appDir || process.cwd();
         this.baseDir = this.getBaseDir();
-        let mainApp; // eslint-disable-line prefer-const
-        if (this.globalOptions.applicationContext) {
-            this.applicationContext = this.globalOptions.applicationContext;
-        }
-        else {
-            this.applicationContext = new core_1.MidwayContainer();
-            this.applicationContext.setFileDetector(new core_1.DirectoryFileDetector({
-                baseDir: this.baseDir,
-            }));
-            this.applicationContext.load(require(path_1.join(this.baseDir, 'configuration')));
-            await this.applicationContext.ready();
-        }
-        // 调用 bootstrap 的 before 逻辑
-        if (this.globalOptions['beforeHandler']) {
-            await this.globalOptions['beforeHandler'](this.applicationContext);
-        }
-        // 获取全局配置
-        this.globalConfig =
-            this.applicationContext.getConfigService().getConfiguration() || {};
-        this.refreshBootstrapItems();
-        // 初始化主框架
-        await this.getFirstActions('initialize', {
+        this.applicationContext = await (0, core_1.initializeGlobalApplicationContext)({
             ...this.globalOptions,
-            baseDir: this.baseDir,
             appDir: this.appDir,
-            isMainFramework: true,
-            applicationContext: this.applicationContext,
-            globalApplicationHandler: (type) => {
-                if (type) {
-                    return this.globalAppMap.get(type);
-                }
-                else {
-                    return mainApp;
-                }
-            },
-        });
-        global['MIDWAY_MAIN_FRAMEWORK'] = this.getMainFramework();
-        mainApp = await this.getFirstActions('getApplication');
-        // 初始化其余的副框架
-        await Promise.all(this.getTailActions('initialize', {
-            ...this.globalOptions,
             baseDir: this.baseDir,
-            appDir: this.appDir,
-            applicationContext: this.applicationContext,
-            isMainFramework: false,
-        }));
-        this.bootstrapItems.forEach(item => {
-            this.globalAppMap.set(item.getFrameworkType(), item.getApplication());
-            if (global['MIDWAY_BOOTSTRAP_APP_SET']) {
-                // for test/dev
-                global['MIDWAY_BOOTSTRAP_APP_SET'].add({
-                    framework: item,
-                    starter: this,
-                });
-            }
         });
-        // 等所有框架初始化完之后，开始执行生命周期
-        await this.getFirstActions('loadExtension');
-        await this.getActions('afterContainerReady');
-    }
-    async run() {
-        await Promise.all(this.getActions('run', {}));
-        global['MIDWAY_BOOTSTRAP_APP_READY'] = true;
+        return this.applicationContext;
     }
+    async run() { }
     async stop() {
-        await Promise.all(this.getActions('stop', {}));
-        global['MIDWAY_BOOTSTRAP_APP_READY'] = false;
-    }
-    getActions(action, args) {
-        return this.bootstrapItems.map(item => {
-            if (item[action]) {
-                return item[action](args);
-            }
-        });
-    }
-    async getFirstActions(action, args) {
-        if (this.bootstrapItems.length && this.bootstrapItems[0][action]) {
-            return this.bootstrapItems[0][action](args);
-        }
-    }
-    getTailActions(action, args) {
-        if (this.bootstrapItems.length > 1) {
-            return this.bootstrapItems.slice(1).map(item => {
-                if (item[action]) {
-                    return item[action](args);
-                }
-            });
-        }
-        return [];
-    }
-    getMainFramework() {
-        return this.bootstrapItems[0];
-    }
-    refreshBootstrapItems() {
-        this.bootstrapItems = this.bootstrapItems.map(bootstrapItem => {
-            if (typeof bootstrapItem === 'function') {
-                return bootstrapItem(this.globalConfig);
-            }
-            return bootstrapItem;
-        });
+        await (0, core_1.destroyGlobalApplicationContext)(this.applicationContext);
     }
     getBaseDir() {
         if (this.globalOptions.baseDir) {
             return this.globalOptions.baseDir;
         }
         if (isTypeScriptEnvironment()) {
-            return path_1.join(this.appDir, 'src');
+            return (0, path_1.join)(this.appDir, 'src');
         }
         else {
-            return path_1.join(this.appDir, 'dist');
+            return (0, path_1.join)(this.appDir, 'dist');
         }
     }
-    getBootstrapAppMap() {
-        return this.globalAppMap;
-    }
 }
 exports.BootstrapStarter = BootstrapStarter;
 class Bootstrap {
@@ -156,7 +57,10 @@ class Bootstrap {
         var _a;
         this.configured = true;
         if (!this.logger && !configuration.logger) {
-            this.logger = logger_1.createConsoleLogger('bootstrapConsole');
+            this.logger = new logger_1.MidwayBaseLogger({
+                disableError: true,
+                disableFile: true,
+            });
             if (configuration.logger === false) {
                 (_a = this.logger) === null || _a === void 0 ? void 0 : _a['disableConsole']();
             }
@@ -169,24 +73,15 @@ class Bootstrap {
         if (configuration.appDir && configuration.appDir !== process.cwd()) {
             process.chdir(configuration.appDir);
         }
-        configuration['beforeHandler'] = this.beforeHandler;
         this.getStarter().configure(configuration);
         return this;
     }
-    static load(unit) {
-        this.getStarter().load(unit);
-        return this;
-    }
     static getStarter() {
         if (!this.starter) {
             this.starter = new BootstrapStarter();
         }
         return this.starter;
     }
-    static before(beforeHandler) {
-        this.beforeHandler = beforeHandler;
-        return this;
-    }
     static async run() {
         if (!this.configured) {
             this.configure();
@@ -204,7 +99,7 @@ class Bootstrap {
         process.on('uncaughtException', this.uncaughtExceptionHandler);
         this.unhandledRejectionHandler = this.unhandledRejectionHandler.bind(this);
         process.on('unhandledRejection', this.unhandledRejectionHandler);
-        await this.getStarter().init();
+        this.applicationContext = await this.getStarter().init();
         return this.getStarter()
             .run()
             .then(() => {
@@ -224,6 +119,7 @@ class Bootstrap {
     static reset() {
         this.configured = false;
         this.starter = null;
+        this.logger.close();
     }
     /**
      * on bootstrap receive a exit signal
@@ -276,6 +172,9 @@ class Bootstrap {
         }
         this.logger.error(err);
     }
+    static getApplicationContext() {
+        return this.applicationContext;
+    }
 }
 exports.Bootstrap = Bootstrap;
 Bootstrap.configured = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bootstrap",
-  "version": "3.0.0-alpha.6+6c8b724b",
+  "version": "3.0.0-beta.11",
   "description": "midwayjs bootstrap",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,9 +21,11 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-alpha.6+6c8b724b",
-    "@midwayjs/decorator": "^3.0.0-alpha.6+6c8b724b",
-    "@midwayjs/logger": "^3.0.0-alpha.6+6c8b724b",
+    "@midwayjs/core": "^3.0.0-beta.11",
+    "@midwayjs/decorator": "^3.0.0-beta.11",
+    "@midwayjs/logger": "^3.0.0-beta.11",
+    "@midwayjs/socketio": "^3.0.0-beta.11",
+    "@midwayjs/web": "^3.0.0-beta.11",
     "@types/socket.io-client": "^1.4.36",
     "request": "^2.88.2",
     "socket.io-client": "^4.0.0"
@@ -33,5 +35,8 @@
     "type": "git",
     "url": "http://github.com/midwayjs/midway.git"
   },
-  "gitHead": "6c8b724b08cf395287636b80387653f9540768e5"
+  "engines": {
+    "node": ">=12"
+  },
+  "gitHead": "a2b066fd500e815e799e7f421cd216f12e0e9f8e"
 }