@midwayjs/web 3.1.0 → 3.1.3

package/app.js

@@ -65,6 +65,16 @@ class AppBootHook {
     const eggRouterMiddleware = this.app.router.middleware();
     eggRouterMiddleware._name = 'eggRouterMiddleware';
     this.app.useMiddleware(eggRouterMiddleware);
+
+    if (process.env['EGG_CLUSTER_MODE'] === 'true') {
+      const lifeCycleService = this.app.applicationContext.get('midwayWebLifeCycleService');
+      // exec onReady()
+      await lifeCycleService.runReady();
+      // 多进程时的路由加载必须放在这里，中间件加载之后
+      const framework = this.app.applicationContext.get('midwayWebFramework');
+      await framework.loadMidwayController();
+    }
+
     this.app.emit('application-ready');
   }
 

package/dist/base.js

@@ -132,9 +132,8 @@ const createAppWorkerLoader = () => {
                     });
                     // 这里生命周期走到 onReady
                     this.lifecycleService = await applicationContext.getAsync(lifecycle_1.MidwayWebLifeCycleService, [applicationContext]);
-                    // 执行加载路由
+                    // 执行加载框架初始化
                     this.framework = await applicationContext.getAsync(web_1.MidwayWebFramework);
-                    await this.framework.loadMidwayController();
                 });
             }
         }

package/dist/configuration.js

@@ -29,7 +29,9 @@ let EggConfiguration = class EggConfiguration {
     }
     async onServerReady() {
         // trigger server didReady
-        this.app.messenger.emit('egg-ready');
+        if (this.app.messenger) {
+            this.app.messenger.emit('egg-ready');
+        }
     }
     async onStop() {
         // TODO flush egg logger and close it

package/dist/framework/lifecycle.d.ts

@@ -6,6 +6,7 @@ export declare class MidwayWebLifeCycleService {
     private lifecycleInstanceList;
     constructor(applicationContext: IMidwayContainer);
     protected init(): Promise<void>;
+    runReady(): Promise<void>;
     afterInit(): Promise<void>;
     stop(): Promise<void>;
     private runContainerLifeCycle;

package/dist/framework/lifecycle.js

@@ -53,6 +53,9 @@ let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
                 this.configService.addObject(configData);
             }
         });
+        // cluster 下，onReady 放到 egg willReady 中执行
+    }
+    async runReady() {
         // exec onReady()
         await this.runContainerLifeCycle(this.lifecycleInstanceList, 'onReady');
     }
@@ -65,6 +68,12 @@ let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
         if (!this.configService.getConfiguration('debug.recordConfigMergeOrder')) {
             this.configService.clearConfigMergeOrder();
         }
+        // some preload module init
+        const modules = (0, decorator_1.listPreloadModule)();
+        for (const module of modules) {
+            // preload init context
+            await this.applicationContext.getAsync(module);
+        }
     }
     async stop() {
         // stop lifecycle

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/interface.d.ts

@@ -86,7 +86,7 @@ export interface IWebMiddleware {
     resolve(): MidwayWebMiddleware;
 }
 declare module '@midwayjs/core/dist/interface' {
-    interface MidwayConfig extends Partial<EggAppConfig> {
+    interface MidwayConfig extends PowerPartial<EggAppConfig> {
         egg?: IMidwayWebConfigurationOptions;
     }
 }

package/dist/logger.d.ts

@@ -1,4 +1,4 @@
-import { ILogger } from '@midwayjs/logger';
+import { ILogger, LoggerOptions } from '@midwayjs/logger';
 import { Application } from 'egg';
 import { MidwayLoggerService } from '@midwayjs/core';
 declare class MidwayLoggers extends Map<string, ILogger> {
@@ -28,7 +28,7 @@ declare class MidwayLoggers extends Map<string, ILogger> {
     createLogger(options: any, loggerKey: string): ILogger;
     disableConsole(): void;
     reload(): void;
-    transformEggLogger(eggCustomLogger: any): {
+    transformEggLogger(eggCustomLogger: any, midwayLoggerConfig: LoggerOptions): {
         midwayLogger: {
             clients: {};
         };

package/dist/logger.js

@@ -101,7 +101,7 @@ class MidwayLoggers extends Map {
         const configService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayConfigService);
         // 先把 egg 的日志配置转为 midway logger 配置
         if (configService.getConfiguration('customLogger')) {
-            const eggLoggerConfig = this.transformEggLogger(configService.getConfiguration('customLogger'));
+            const eggLoggerConfig = this.transformEggLogger(configService.getConfiguration('customLogger'), configService.getConfiguration('midwayLogger.default'));
             if (eggLoggerConfig) {
                 configService.addObject(eggLoggerConfig);
             }
@@ -139,10 +139,9 @@ class MidwayLoggers extends Map {
         return logger;
     }
     disableConsole() {
-        var _a, _b;
         for (const value of this.values()) {
-            if ((_a = value) === null || _a === void 0 ? void 0 : _a.disableConsole) {
-                (_b = value) === null || _b === void 0 ? void 0 : _b.disableConsole();
+            if (value === null || value === void 0 ? void 0 : value.disableConsole) {
+                value === null || value === void 0 ? void 0 : value.disableConsole();
             }
             else if (value.disable) {
                 value.disable('console');
@@ -157,18 +156,38 @@ class MidwayLoggers extends Map {
             }
         }
     }
-    transformEggLogger(eggCustomLogger) {
-        var _a, _b, _c;
+    transformEggLogger(eggCustomLogger, midwayLoggerConfig) {
+        var _a, _b, _c, _d;
         const transformLoggerConfig = {
             midwayLogger: {
                 clients: {},
             },
         };
         for (const name in eggCustomLogger) {
+            const file = (_a = eggCustomLogger[name]) === null || _a === void 0 ? void 0 : _a.file;
+            if (!file) {
+                continue;
+            }
+            const options = {};
+            if ((0, path_1.isAbsolute)(file)) {
+                // 绝对路径，单独处理
+                options.dir = (0, path_1.dirname)(file);
+                options.fileLogName = (0, path_1.basename)(file);
+                options.auditFileDir =
+                    midwayLoggerConfig.auditFileDir === '.audit'
+                        ? (0, path_1.join)(midwayLoggerConfig.dir, '.audit')
+                        : midwayLoggerConfig.auditFileDir;
+                options.errorDir =
+                    (_b = midwayLoggerConfig.errorDir) !== null && _b !== void 0 ? _b : midwayLoggerConfig.dir;
+            }
+            else {
+                // 相对路径，使用默认的 dir 即可
+                options.fileLogName = file;
+            }
             transformLoggerConfig.midwayLogger.clients[name] = {
-                fileLogName: (_a = eggCustomLogger[name]) === null || _a === void 0 ? void 0 : _a.file,
-                level: levelTransform((_b = eggCustomLogger[name]) === null || _b === void 0 ? void 0 : _b.level),
-                consoleLevel: levelTransform((_c = eggCustomLogger[name]) === null || _c === void 0 ? void 0 : _c.consoleLevel),
+                level: levelTransform((_c = eggCustomLogger[name]) === null || _c === void 0 ? void 0 : _c.level),
+                consoleLevel: levelTransform((_d = eggCustomLogger[name]) === null || _d === void 0 ? void 0 : _d.consoleLevel),
+                ...options,
             };
             cleanUndefinedProperty(transformLoggerConfig.midwayLogger.clients[name]);
         }

package/dist/utils.js

@@ -72,21 +72,23 @@ async function initializeAgentApplicationContext(agent) {
         const aspectService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayAspectService);
         // init decorator service
         const decoratorService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayDecoratorService);
+        const configService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayConfigService);
+        const loggerService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayLoggerService);
         // framework/config/plugin/logger/app decorator support
         // register base config hook
         decoratorService.registerPropertyHandler(decorator_1.CONFIG_KEY, (propertyName, meta) => {
             var _a;
             if (meta.identifier === decorator_1.ALL) {
-                return this.configService.getConfiguration();
+                return configService.getConfiguration();
             }
             else {
-                return this.configService.getConfiguration((_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName);
+                return configService.getConfiguration((_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName);
             }
         });
         // register @Logger decorator handler
         decoratorService.registerPropertyHandler(decorator_1.LOGGER_KEY, (propertyName, meta) => {
             var _a;
-            return this.loggerService.getLogger((_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName);
+            return loggerService.getLogger((_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName);
         });
         decoratorService.registerPropertyHandler(decorator_1.PIPELINE_IDENTIFIER, (key, meta, instance) => {
             var _a, _b;
@@ -97,7 +99,7 @@ async function initializeAgentApplicationContext(agent) {
             return agent;
         });
         decoratorService.registerPropertyHandler(decorator_1.PLUGIN_KEY, (key, target) => {
-            return this.agent[key];
+            return agent[key];
         });
         // init aspect module
         await aspectService.loadAspect();
@@ -112,6 +114,9 @@ async function initializeAgentApplicationContext(agent) {
     agentFramework['appLogger'] = agent.coreLogger;
     agentFramework.app = agent;
     agentFramework.configService = applicationContext.get(core_1.MidwayConfigService);
+    agentFramework.environmentService = applicationContext.get(core_1.MidwayEnvironmentService);
+    agentFramework.loggerService = applicationContext.get(core_1.MidwayLoggerService);
+    agentFramework.informationService = applicationContext.get(core_1.MidwayInformationService);
     agentFramework.overwriteApplication('agent');
     return applicationContext;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.1.0",
+  "version": "3.1.3",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -29,12 +29,12 @@
   "devDependencies": {
     "@midwayjs/decorator": "^3.0.10",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.1.0",
-    "axios": "0.26.0",
+    "@midwayjs/mock": "^3.1.2",
+    "axios": "0.26.1",
     "dayjs": "1.10.8",
     "egg-logger": "2.7.1",
     "egg-mock": "4.2.0",
-    "egg-scripts": "2.15.2",
+    "egg-scripts": "2.15.3",
     "egg-socket.io": "4.1.6",
     "egg-view-nunjucks": "2.3.0",
     "fake-egg": "1.0.0",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.1.0",
+    "@midwayjs/core": "^3.1.2",
     "egg": "^2.28.0",
     "egg-cluster": "^1.27.1",
     "find-up": "5.0.0",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "2074c838e454a9673a044dbe065631dd9f944005"
+  "gitHead": "98d41a7a8b40d65f43df9655b1f5b4aebcdc091a"
 }