@midwayjs/web 3.1.2 → 3.1.5

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

@@ -1,4 +1,5 @@
 "use strict";
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
@@ -13,7 +14,7 @@ function runInAgent() {
 process.env['EGG_CLUSTER_MODE'] = 'true';
 const isAgent = runInAgent();
 debug('[egg]: run with egg-scripts in worker and init midway container in cluster mode');
-const appDir = process.cwd();
+const appDir = (_b = (_a = JSON.parse(process.argv[2])) === null || _a === void 0 ? void 0 : _a.baseDir) !== null && _b !== void 0 ? _b : process.cwd();
 let baseDir;
 if ((0, utils_1.isTypeScriptEnvironment)()) {
     baseDir = (0, path_1.join)(appDir, 'src');

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,6 +67,16 @@ 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);
@@ -108,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.2",
+  "version": "3.1.5",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@midwayjs/decorator": "^3.0.10",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.1.2",
+    "@midwayjs/mock": "^3.1.5",
     "axios": "0.26.1",
     "dayjs": "1.10.8",
     "egg-logger": "2.7.1",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.1.2",
+    "@midwayjs/core": "^3.1.5",
     "egg": "^2.28.0",
     "egg-cluster": "^1.27.1",
     "find-up": "5.0.0",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "4ff3aa892b76d016f0ea123c7f9520d054d5c96b"
+  "gitHead": "46a7851ad3ce6fc675bd7e1b7c9dff2c70009104"
 }