@midwayjs/web 3.1.1 → 3.1.4

package/app.js

@@ -67,6 +67,9 @@ class AppBootHook {
     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();

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');
     }

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/utils.js

@@ -67,26 +67,38 @@ const getCurrentDateString = (timestamp = Date.now()) => {
 };
 exports.getCurrentDateString = getCurrentDateString;
 async function initializeAgentApplicationContext(agent) {
+    const applicationContext = (0, core_1.getCurrentApplicationContext)();
+    const agentFramework = new web_1.MidwayWebFramework(applicationContext);
+    agentFramework['logger'] = agent.logger;
+    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');
     if (process.env['EGG_CLUSTER_MODE'] === 'true') {
         // init aop support
         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 +109,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();
@@ -106,13 +118,6 @@ async function initializeAgentApplicationContext(agent) {
     else {
         debug('[egg]: "initializeAgentApplicationContext" ignore re-init in single process');
     }
-    const applicationContext = (0, core_1.getCurrentApplicationContext)();
-    const agentFramework = new web_1.MidwayWebFramework(applicationContext);
-    agentFramework['logger'] = agent.logger;
-    agentFramework['appLogger'] = agent.coreLogger;
-    agentFramework.app = agent;
-    agentFramework.configService = applicationContext.get(core_1.MidwayConfigService);
-    agentFramework.overwriteApplication('agent');
     return applicationContext;
 }
 exports.initializeAgentApplicationContext = initializeAgentApplicationContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.1.1",
+  "version": "3.1.4",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -29,8 +29,8 @@
   "devDependencies": {
     "@midwayjs/decorator": "^3.0.10",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.1.1",
-    "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",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.1.1",
+    "@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": "b7a5c817d2316b93967367c34cff20a98b1ce4b7"
+  "gitHead": "ca98130962ab629a65912870f82f64bd0e44566d"
 }