@midwayjs/bootstrap 3.12.3 → 3.13.0

package/dist/bootstrap.d.ts

@@ -1,5 +1,5 @@
 import { IMidwayBootstrapOptions, IMidwayContainer } from '@midwayjs/core';
-import { IMidwayLogger } from '@midwayjs/logger';
+import { ILogger } from '@midwayjs/logger';
 export declare class BootstrapStarter {
     protected appDir: string;
     protected baseDir: string;
@@ -16,8 +16,9 @@ export declare class BootstrapStarter {
 }
 export declare class Bootstrap {
     protected static starter: BootstrapStarter;
-    protected static logger: IMidwayLogger;
+    protected static logger: ILogger;
     protected static configured: boolean;
+    protected static bootstrapLoggerFactory: import("@midwayjs/logger").LoggerFactory;
     /**
      * set global configuration for midway
      * @param configuration

package/dist/bootstrap.js

@@ -41,6 +41,7 @@ class BootstrapStarter {
         }
         this.applicationContext = await (0, core_1.initializeGlobalApplicationContext)({
             asyncContextManager: (0, async_hooks_context_manager_1.createContextManager)(),
+            loggerFactory: logger_1.loggers,
             ...this.globalOptions,
         });
         return this.applicationContext;
@@ -86,15 +87,22 @@ class Bootstrap {
      * @param configuration
      */
     static configure(configuration = {}) {
-        var _a;
         this.configured = true;
         if (!this.logger && !configuration.logger) {
-            this.logger = new logger_1.MidwayBaseLogger({
-                disableError: true,
-                disableFile: true,
+            this.logger = this.bootstrapLoggerFactory.createLogger('bootstrap', {
+                enableError: false,
+                enableFile: false,
+                enableConsole: true,
             });
             if (configuration.logger === false) {
-                (_a = this.logger) === null || _a === void 0 ? void 0 : _a['disableConsole']();
+                if (this.logger['disableConsole']) {
+                    // v2
+                    this.logger['disableConsole']();
+                }
+                else {
+                    // v3
+                    this.logger['level'] = 'none';
+                }
             }
             configuration.logger = this.logger;
         }
@@ -153,7 +161,7 @@ class Bootstrap {
     static reset() {
         this.configured = false;
         this.starter = null;
-        this.logger.close();
+        this.bootstrapLoggerFactory.close();
     }
     /**
      * on bootstrap receive a exit signal
@@ -212,4 +220,5 @@ class Bootstrap {
 }
 exports.Bootstrap = Bootstrap;
 Bootstrap.configured = false;
+Bootstrap.bootstrapLoggerFactory = new logger_1.MidwayLoggerContainer();
 //# sourceMappingURL=bootstrap.js.map

package/dist/manager/base.d.ts

@@ -1,19 +1,19 @@
 import { ForkOptions } from '../interface';
 import type { IEventBus, EventBusOptions } from '@midwayjs/event-bus';
-export declare abstract class AbstractForkManager<T, ClusterOptions extends ForkOptions> {
+export declare abstract class AbstractForkManager<Worker, ClusterOptions extends ForkOptions> {
     readonly options: ClusterOptions;
     private reforks;
     private disconnectCount;
     private unexpectedCount;
     private disconnects;
     private hub;
-    protected workers: Map<string, T>;
-    protected eventBus: IEventBus<T>;
+    protected workers: Map<string, Worker>;
+    protected eventBus: IEventBus<Worker>;
     private isClosing;
     private exitListener;
     protected constructor(options: ClusterOptions);
     start(): Promise<void>;
-    protected tryToRefork(oldWorker: T): void;
+    protected tryToRefork(oldWorker: Worker): void;
     /**
      * allow refork
      */
@@ -25,7 +25,7 @@ export declare abstract class AbstractForkManager<T, ClusterOptions extends Fork
     /**
      * unexpectedExit default handler
      */
-    protected onUnexpected(worker: T, code: any, signal: any): void;
+    protected onUnexpected(worker: Worker, code: any, signal: any): void;
     /**
      * reachReforkLimit default handler
      */
@@ -33,7 +33,7 @@ export declare abstract class AbstractForkManager<T, ClusterOptions extends Fork
     protected killWorker(worker: any, timeout: any): Promise<void>;
     stop(timeout?: number): Promise<void>;
     hasWorker(workerId: string): boolean;
-    getWorker(workerId: string): T;
+    getWorker(workerId: string): Worker;
     getWorkerIds(): string[];
     onStop(exitListener: any): void;
     protected bindClose(): void;
@@ -47,13 +47,13 @@ export declare abstract class AbstractForkManager<T, ClusterOptions extends Fork
      * @param code
      */
     private onMasterExit;
-    abstract createWorker(oldWorker?: T): T;
-    abstract bindWorkerDisconnect(listener: (worker: T) => void): void;
-    abstract bindWorkerExit(listener: (worker: T, code: any, signal: any) => void): void;
-    abstract getWorkerId(worker: T): string;
-    abstract isWorkerDead(worker: T): boolean;
-    abstract closeWorker(worker: T): any;
-    abstract createEventBus(eventBusOptions: EventBusOptions): IEventBus<T>;
+    abstract createWorker(oldWorker?: Worker): Worker;
+    abstract bindWorkerDisconnect(listener: (worker: Worker) => void): void;
+    abstract bindWorkerExit(listener: (worker: Worker, code: any, signal: any) => void): void;
+    abstract getWorkerId(worker: Worker): string;
+    abstract isWorkerDead(worker: Worker): boolean;
+    abstract closeWorker(worker: Worker): any;
+    abstract createEventBus(eventBusOptions: EventBusOptions<Worker>): IEventBus<Worker>;
     abstract isPrimary(): boolean;
 }
 //# sourceMappingURL=base.d.ts.map

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@midwayjs/bootstrap",
-  "version": "3.12.3",
+  "version": "3.13.0",
   "description": "midwayjs bootstrap",
-  "main": "dist/index",
+  "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
@@ -21,12 +21,12 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/async-hooks-context-manager": "^3.12.3",
-    "@midwayjs/event-bus": "1.7.0"
+    "@midwayjs/async-hooks-context-manager": "^3.13.0",
+    "@midwayjs/event-bus": "1.9.4"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.12.3",
-    "@midwayjs/logger": "^2.15.0",
+    "@midwayjs/core": "^3.13.0",
+    "@midwayjs/logger": "^3.0.0",
     "request": "2.88.2",
     "socket.io-client": "4.7.2"
   },
@@ -38,5 +38,5 @@
   "engines": {
     "node": ">=12.11.0"
   },
-  "gitHead": "0b6638726c4722d5a6ee8075fea0a0b68378452c"
+  "gitHead": "9f55734afa5b08dcf46bc89493ec8edaa8c6202b"
 }