@midwayjs/web 3.0.13 → 3.1.0

package/app/extend/context.js

@@ -19,7 +19,7 @@ module.exports = {
     if (this[ctxLogger]) {
       return this[ctxLogger];
     }
-    return this.getLogger('logger');
+    return this.app.createContextLogger(this);
   },
 
   set logger(customLogger) {

package/dist/base.js

@@ -8,6 +8,8 @@ const fs_1 = require("fs");
 const logger_1 = require("./logger");
 const router_1 = require("@eggjs/router");
 const util_1 = require("util");
+const lifecycle_1 = require("./framework/lifecycle");
+const web_1 = require("./framework/web");
 const ROUTER = Symbol('EggCore#router');
 const EGG_LOADER = Symbol.for('egg#loader');
 const EGG_PATH = Symbol.for('egg#eggPath');
@@ -38,9 +40,6 @@ const createAppWorkerLoader = () => {
             this.useEggSocketIO = false;
         }
         getEggPaths() {
-            if ((0, core_1.getCurrentApplicationContext)()) {
-                this.singleProcessMode = true;
-            }
             if (!this.appDir) {
                 // 这里的逻辑是为了兼容老 cluster 模式
                 if (this.app.options.typescript || this.app.options.isTsMode) {
@@ -104,19 +103,38 @@ const createAppWorkerLoader = () => {
             return serverEnv;
         }
         load() {
-            if (!this.singleProcessMode) {
-                // 多进程模式，从 egg-scripts 启动的
-                process.env['EGG_CLUSTER_MODE'] = 'true';
-                debug('[egg]: run with egg-scripts in cluster mode');
-                // 如果不走 bootstrap，就得在这里初始化 applicationContext
-                (0, core_1.initializeGlobalApplicationContext)({
-                    ...this.globalOptions,
-                    appDir: this.appDir,
-                    baseDir: this.baseDir,
-                    ignore: ['**/app/extend/**'],
-                    application: this.app,
-                }).then(_ => {
-                    debug('[egg]: global context: init complete');
+            /**
+             * 由于使用了新的 hook 方式，这个时候 midway 已经初始化了一部分
+             * 但是我们把初始化分为了两个部分，framework 相关的留到这里初始化
+             * 避免 app 不存在，也能尽可能和单进程模式执行一样的逻辑
+             */
+            // lazy initialize framework
+            if (process.env['EGG_CLUSTER_MODE'] === 'true') {
+                this.app.beforeStart(async () => {
+                    debug('[egg]: start "initialize framework service with lazy in app.load"');
+                    const applicationContext = (0, core_1.getCurrentApplicationContext)();
+                    applicationContext.bind(lifecycle_1.MidwayWebLifeCycleService);
+                    /**
+                     * 这里 logger service 已经被 get loggers() 初始化过了，就不需要在这里初始化了
+                     */
+                    // framework/config/plugin/logger/app decorator support
+                    await applicationContext.getAsync(core_1.MidwayFrameworkService, [
+                        applicationContext,
+                        {
+                            application: this.app,
+                        },
+                    ]);
+                    this.app.once('server', async (server) => {
+                        this.framework.setServer(server);
+                        // register httpServer to applicationContext
+                        applicationContext.registerObject(core_1.HTTP_SERVER_KEY, server);
+                        await this.lifecycleService.afterInit();
+                    });
+                    // 这里生命周期走到 onReady
+                    this.lifecycleService = await applicationContext.getAsync(lifecycle_1.MidwayWebLifeCycleService, [applicationContext]);
+                    // 执行加载路由
+                    this.framework = await applicationContext.getAsync(web_1.MidwayWebFramework);
+                    await this.framework.loadMidwayController();
                 });
             }
         }
@@ -126,15 +144,13 @@ const createAppWorkerLoader = () => {
         }
         loadConfig() {
             super.loadConfig();
-            if (this.singleProcessMode) {
-                const configService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayConfigService);
-                configService.addObject(this.config);
-                Object.defineProperty(this, 'config', {
-                    get() {
-                        return configService.getConfiguration();
-                    },
-                });
-            }
+            const configService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayConfigService);
+            configService.addObject(this.config, true);
+            Object.defineProperty(this, 'config', {
+                get() {
+                    return configService.getConfiguration();
+                },
+            });
         }
         loadMiddleware() {
             super.loadMiddleware();
@@ -155,9 +171,6 @@ const createAgentWorkerLoader = () => {
         require('egg').AgentWorkerLoader;
     class EggAgentWorkerLoader extends AppWorkerLoader {
         getEggPaths() {
-            if ((0, core_1.getCurrentApplicationContext)()) {
-                this.singleProcessMode = true;
-            }
             if (!this.appDir) {
                 if (this.app.options.typescript || this.app.options.isTsMode) {
                     process.env.EGG_TYPESCRIPT = 'true';
@@ -222,21 +235,16 @@ const createAgentWorkerLoader = () => {
         load() {
             this.app.beforeStart(async () => {
                 debug('[egg]: start "initializeAgentApplicationContext"');
-                await (0, utils_1.initializeAgentApplicationContext)(this.app, {
-                    ...this.globalOptions,
-                    appDir: this.appDir,
-                    baseDir: this.baseDir,
-                    ignore: ['**/app/extend/**'],
-                });
+                await (0, utils_1.initializeAgentApplicationContext)(this.app);
                 super.load();
                 debug('[egg]: agent load run complete');
             });
         }
         loadConfig() {
             super.loadConfig();
-            if (this.singleProcessMode) {
+            if ((0, core_1.getCurrentApplicationContext)()) {
                 const configService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayConfigService);
-                configService.addObject(this.config);
+                configService.addObject(this.config, true);
                 Object.defineProperty(this, 'config', {
                     get() {
                         return configService.getConfiguration();

package/dist/cluster.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=cluster.d.ts.map

package/dist/cluster.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@midwayjs/core");
+const path_1 = require("path");
+const utils_1 = require("./utils");
+const util_1 = require("util");
+const debug = (0, util_1.debuglog)('midway:debug');
+function runInAgent() {
+    return (process.title.indexOf('agent') !== -1 ||
+        (process.argv[1] && process.argv[1].indexOf('agent_worker') !== -1));
+}
+// 多进程模式，从 egg-scripts 启动的
+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();
+let baseDir;
+if ((0, utils_1.isTypeScriptEnvironment)()) {
+    baseDir = (0, path_1.join)(appDir, 'src');
+}
+else {
+    baseDir = (0, path_1.join)(appDir, 'dist');
+}
+(0, core_1.initializeGlobalApplicationContext)({
+    appDir,
+    baseDir,
+    ignore: ['**/app/extend/**'],
+    lazyInitializeFramework: true,
+});
+if (!isAgent) {
+    debug('[egg]: run with egg-scripts in worker and init midway container complete');
+}
+else {
+    debug('[egg]: run with egg-scripts in agent and init midway container complete');
+}
+//# sourceMappingURL=cluster.js.map

package/dist/config/config.default.d.ts

@@ -0,0 +1,3 @@
+declare const _default: (appInfo: any) => any;
+export default _default;
+//# sourceMappingURL=config.default.d.ts.map

package/dist/config/config.default.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const mkdirp = require("mkdirp");
+const os = require("os");
+const fs = require("fs");
+exports.default = appInfo => {
+    const exports = {};
+    exports.rundir = path.join(appInfo.appDir, 'run');
+    // 修改默认的日志名
+    exports.midwayLogger = {
+        clients: {
+            appLogger: {
+                fileLogName: 'midway-web.log',
+                aliasName: 'logger',
+            },
+            agentLogger: {
+                fileLogName: 'midway-agent.log',
+            },
+        },
+    };
+    exports.egg = {
+        dumpConfig: true,
+        contextLoggerFormat: info => {
+            const ctx = info.ctx;
+            // format: '[$userId/$ip/$traceId/$use_ms $method $url]'
+            const userId = ctx.userId || '-';
+            const traceId = (ctx.tracer && ctx.tracer.traceId) || '-';
+            const use = Date.now() - ctx.startTime;
+            const label = userId +
+                '/' +
+                ctx.ip +
+                '/' +
+                traceId +
+                '/' +
+                use +
+                'ms ' +
+                ctx.method +
+                ' ' +
+                ctx.url;
+            return `${info.timestamp} ${info.LEVEL} ${info.pid} [${label}] ${info.message}`;
+        },
+    };
+    exports.pluginOverwrite = false;
+    exports.security = {
+        csrf: {
+            ignoreJSON: false,
+        },
+    };
+    // alinode runtime 写入的日志策略是: 如果 NODE_LOG_DIR 有设置，写入 NODE_LOG_DIR 设置的目录；否则为 /tmp
+    let alinodeLogdir = fs.existsSync('/tmp') ? '/tmp' : os.tmpdir();
+    // try to use NODE_LOG_DIR first
+    if (process.env.NODE_LOG_DIR) {
+        alinodeLogdir = process.env.NODE_LOG_DIR;
+    }
+    mkdirp.sync(alinodeLogdir);
+    exports.alinode = {
+        logdir: alinodeLogdir,
+        error_log: [
+            path.join(appInfo.root, `logs/${appInfo.pkg.name}/common-error.log`),
+            path.join(appInfo.root, 'logs/stderr.log'),
+        ],
+        packages: [path.join(appInfo.appDir, 'package.json')],
+    };
+    return exports;
+};
+//# sourceMappingURL=config.default.js.map

package/dist/config/config.local.d.ts

@@ -0,0 +1,9 @@
+export declare const egg: {
+    plugins: {
+        'egg-mock': {
+            enable: boolean;
+            package: string;
+        };
+    };
+};
+//# sourceMappingURL=config.local.d.ts.map

package/dist/config/config.local.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.egg = void 0;
+exports.egg = {
+    plugins: {
+        'egg-mock': {
+            enable: true,
+            package: 'egg-mock',
+        },
+    },
+};
+//# sourceMappingURL=config.local.js.map

package/dist/config/config.unittest.d.ts

@@ -0,0 +1,9 @@
+export declare const egg: {
+    plugins: {
+        'egg-mock': {
+            enable: boolean;
+            package: string;
+        };
+    };
+};
+//# sourceMappingURL=config.unittest.d.ts.map

package/dist/config/config.unittest.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.egg = void 0;
+exports.egg = {
+    plugins: {
+        'egg-mock': {
+            enable: true,
+            package: 'egg-mock',
+        },
+    },
+};
+//# sourceMappingURL=config.unittest.js.map

package/dist/configuration.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EggConfiguration = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
+const path_1 = require("path");
 let EggConfiguration = class EggConfiguration {
     init() {
         this.decoratorService.registerParameterHandler(decorator_1.WEB_ROUTER_PARAM_KEY, options => {
@@ -59,65 +60,7 @@ __decorate([
 EggConfiguration = __decorate([
     (0, decorator_1.Configuration)({
         namespace: 'egg',
-        importConfigs: [
-            {
-                default: {
-                    midwayLogger: {
-                        clients: {
-                            appLogger: {
-                                fileLogName: 'midway-web.log',
-                                aliasName: 'logger',
-                            },
-                            agentLogger: {
-                                fileLogName: 'midway-agent.log',
-                            },
-                        },
-                    },
-                    egg: {
-                        dumpConfig: true,
-                        contextLoggerFormat: info => {
-                            const ctx = info.ctx;
-                            // format: '[$userId/$ip/$traceId/$use_ms $method $url]'
-                            const userId = ctx.userId || '-';
-                            const traceId = (ctx.tracer && ctx.tracer.traceId) || '-';
-                            const use = Date.now() - ctx.startTime;
-                            const label = userId +
-                                '/' +
-                                ctx.ip +
-                                '/' +
-                                traceId +
-                                '/' +
-                                use +
-                                'ms ' +
-                                ctx.method +
-                                ' ' +
-                                ctx.url;
-                            return `${info.timestamp} ${info.LEVEL} ${info.pid} [${label}] ${info.message}`;
-                        },
-                    },
-                },
-                test: {
-                    egg: {
-                        plugins: {
-                            'egg-mock': {
-                                enable: true,
-                                package: 'egg-mock',
-                            },
-                        },
-                    },
-                },
-                unittest: {
-                    egg: {
-                        plugins: {
-                            'egg-mock': {
-                                enable: true,
-                                package: 'egg-mock',
-                            },
-                        },
-                    },
-                },
-            },
-        ],
+        importConfigs: [(0, path_1.join)(__dirname, 'config')],
     })
 ], EggConfiguration);
 exports.EggConfiguration = EggConfiguration;

package/dist/framework/lifecycle.d.ts

@@ -0,0 +1,14 @@
+import { IMidwayContainer, MidwayConfigService, MidwayFrameworkService } from '@midwayjs/core';
+export declare class MidwayWebLifeCycleService {
+    readonly applicationContext: IMidwayContainer;
+    protected frameworkService: MidwayFrameworkService;
+    protected configService: MidwayConfigService;
+    private lifecycleInstanceList;
+    constructor(applicationContext: IMidwayContainer);
+    protected init(): Promise<void>;
+    afterInit(): Promise<void>;
+    stop(): Promise<void>;
+    private runContainerLifeCycle;
+    private runObjectLifeCycle;
+}
+//# sourceMappingURL=lifecycle.d.ts.map

package/dist/framework/lifecycle.js

@@ -0,0 +1,137 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MidwayWebLifeCycleService = void 0;
+const core_1 = require("@midwayjs/core");
+const decorator_1 = require("@midwayjs/decorator");
+const configuration_1 = require("@midwayjs/core/dist/functional/configuration");
+const util_1 = require("util");
+const debug = (0, util_1.debuglog)('midway:debug');
+let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
+    constructor(applicationContext) {
+        this.applicationContext = applicationContext;
+        this.lifecycleInstanceList = [];
+    }
+    async init() {
+        // run lifecycle
+        const cycles = (0, decorator_1.listModule)(decorator_1.CONFIGURATION_KEY);
+        debug(`[core]: Found Configuration length = ${cycles.length}`);
+        for (const cycle of cycles) {
+            if (cycle.target instanceof configuration_1.FunctionalConfiguration) {
+                // 函数式写法
+                cycle.instance = cycle.target;
+            }
+            else {
+                // 普通类写法
+                debug(`[core]: Lifecycle run ${cycle.target.name} init`);
+                cycle.instance = await this.applicationContext.getAsync(cycle.target);
+            }
+            if (cycle.instance) {
+                this.lifecycleInstanceList.push(cycle);
+            }
+        }
+        // bind object lifecycle
+        await Promise.all([
+            this.runObjectLifeCycle(this.lifecycleInstanceList, 'onBeforeObjectCreated'),
+            this.runObjectLifeCycle(this.lifecycleInstanceList, 'onObjectCreated'),
+            this.runObjectLifeCycle(this.lifecycleInstanceList, 'onObjectInit'),
+            this.runObjectLifeCycle(this.lifecycleInstanceList, 'onBeforeObjectDestroy'),
+        ]);
+        // bind framework lifecycle
+        // onAppError
+        // exec onConfigLoad()
+        await this.runContainerLifeCycle(this.lifecycleInstanceList, 'onConfigLoad', configData => {
+            if (configData) {
+                this.configService.addObject(configData);
+            }
+        });
+        // exec onReady()
+        await this.runContainerLifeCycle(this.lifecycleInstanceList, 'onReady');
+    }
+    async afterInit() {
+        // exec framework.run()
+        await this.frameworkService.runFramework();
+        // exec onServerReady()
+        await this.runContainerLifeCycle(this.lifecycleInstanceList, 'onServerReady');
+        // clear config merge cache
+        if (!this.configService.getConfiguration('debug.recordConfigMergeOrder')) {
+            this.configService.clearConfigMergeOrder();
+        }
+    }
+    async stop() {
+        // stop lifecycle
+        const cycles = (0, decorator_1.listModule)(decorator_1.CONFIGURATION_KEY);
+        for (const cycle of cycles) {
+            let inst;
+            if (cycle.target instanceof configuration_1.FunctionalConfiguration) {
+                // 函数式写法
+                inst = cycle.target;
+            }
+            else {
+                inst = await this.applicationContext.getAsync(cycle.target);
+            }
+            await this.runContainerLifeCycle(inst, 'onStop');
+        }
+        // stop framework
+        await this.frameworkService.stopFramework();
+    }
+    async runContainerLifeCycle(lifecycleInstanceOrList, lifecycle, resultHandler) {
+        if (Array.isArray(lifecycleInstanceOrList)) {
+            for (const cycle of lifecycleInstanceOrList) {
+                if (typeof cycle.instance[lifecycle] === 'function') {
+                    debug(`[core]: Lifecycle run ${cycle.instance.constructor.name} ${lifecycle}`);
+                    const result = await cycle.instance[lifecycle](this.applicationContext, this.frameworkService.getMainApp());
+                    if (resultHandler) {
+                        resultHandler(result);
+                    }
+                }
+            }
+        }
+        else {
+            if (typeof lifecycleInstanceOrList[lifecycle] === 'function') {
+                debug(`[core]: Lifecycle run ${lifecycleInstanceOrList.constructor.name} ${lifecycle}`);
+                const result = await lifecycleInstanceOrList[lifecycle](this.applicationContext, this.frameworkService.getMainApp());
+                if (resultHandler) {
+                    resultHandler(result);
+                }
+            }
+        }
+    }
+    async runObjectLifeCycle(lifecycleInstanceList, lifecycle) {
+        for (const cycle of lifecycleInstanceList) {
+            if (typeof cycle.instance[lifecycle] === 'function') {
+                debug(`[core]: Lifecycle run ${cycle.instance.constructor.name} ${lifecycle}`);
+                return this.applicationContext[lifecycle](cycle.instance[lifecycle].bind(cycle.instance));
+            }
+        }
+    }
+};
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", core_1.MidwayFrameworkService)
+], MidwayWebLifeCycleService.prototype, "frameworkService", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", core_1.MidwayConfigService)
+], MidwayWebLifeCycleService.prototype, "configService", void 0);
+__decorate([
+    (0, decorator_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], MidwayWebLifeCycleService.prototype, "init", null);
+MidwayWebLifeCycleService = __decorate([
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),
+    __metadata("design:paramtypes", [Object])
+], MidwayWebLifeCycleService);
+exports.MidwayWebLifeCycleService = MidwayWebLifeCycleService;
+//# sourceMappingURL=lifecycle.js.map

package/dist/framework/web.d.ts

@@ -29,6 +29,7 @@ export declare class MidwayWebFramework extends BaseFramework<Application, Conte
     setContextLoggerClass(): void;
     generateMiddleware(middlewareId: any): Promise<any>;
     beforeStop(): Promise<void>;
+    setServer(server: any): void;
 }
 export {};
 //# sourceMappingURL=web.d.ts.map

package/dist/framework/web.js

@@ -87,17 +87,19 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         this.app.use(midwayRootMiddleware);
         this.generator = new EggControllerGenerator(this.app);
         this.overwriteApplication('app');
-        await new Promise(resolve => {
-            this.app.once('application-ready', () => {
-                debug('[egg]: web framework: init egg end');
-                resolve();
+        this.app.loader.loadOrigin();
+        // 这里拦截 app.use 方法，让他可以加到 midway 的 middlewareManager 中
+        this.app.originUse = this.app.use;
+        this.app.use = this.app.useMiddleware;
+        if (!this.isClusterMode) {
+            await new Promise(resolve => {
+                this.app.once('application-ready', () => {
+                    debug('[egg]: web framework: init egg end');
+                    resolve();
+                });
+                this.app.ready();
             });
-            this.app.loader.loadOrigin();
-            // 这里拦截 app.use 方法，让他可以加到 midway 的 middlewareManager 中
-            this.app.originUse = this.app.use;
-            this.app.use = this.app.useMiddleware;
-            this.app.ready();
-        });
+        }
     }
     overwriteApplication(processType) {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
@@ -136,32 +138,36 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
                     return core_1.MidwayProcessTypeEnum.AGENT;
                 }
             },
+            createContextLogger: (ctx, name) => {
+                return this.createContextLogger(ctx, name);
+            },
         }, ['createAnonymousContext']);
         // if use midway logger will be use midway custom context logger
         debug(`[egg]: overwrite BaseContextLoggerClass to "${processType}"`);
         this.setContextLoggerClass();
     }
     async loadMidwayController() {
+        // move egg router to last
+        this.app.getMiddleware().findAndInsertLast('eggRouterMiddleware');
         await this.generator.loadMidwayController(this.configurationOptions.globalPrefix, newRouter => {
             var _a;
             const dispatchFn = newRouter.middleware();
             dispatchFn._name = `midwayController(${((_a = newRouter === null || newRouter === void 0 ? void 0 : newRouter.opts) === null || _a === void 0 ? void 0 : _a.prefix) || '/'})`;
             this.app.useMiddleware(dispatchFn);
         });
+        // restore use method
+        this.app.use = this.app.originUse;
+        debug(`[egg]: current middleware = ${this.middlewareManager.getNames()}`);
     }
     getFrameworkType() {
         return decorator_1.MidwayFrameworkType.WEB;
     }
     async run() {
         var _a;
-        // move egg router to last
-        this.app.getMiddleware().findAndInsertLast('eggRouterMiddleware');
-        // load controller
-        await this.loadMidwayController();
-        // restore use method
-        this.app.use = this.app.originUse;
-        debug(`[egg]: current middleware = ${this.middlewareManager.getNames()}`);
+        // cluster 模式加载路由需在 run 之前，因为 run 需要在拿到 server 之后执行
         if (!this.isClusterMode) {
+            // load controller
+            await this.loadMidwayController();
             // https config
             if (this.configurationOptions.key && this.configurationOptions.cert) {
                 this.configurationOptions.key = core_1.PathFileUtil.getFileContentSync(this.configurationOptions.key);
@@ -238,6 +244,9 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
             await this.agent.close();
         }
     }
+    setServer(server) {
+        this.server = server;
+    }
 };
 __decorate([
     (0, decorator_1.Inject)(),

package/dist/index.d.ts

@@ -2,6 +2,6 @@ export * from './interface';
 export { MidwayWebFramework as Framework } from './framework/web';
 export { createEggApplication, createEggAgent, createAppWorkerLoader, createAgentWorkerLoader, } from './base';
 export { Application, Agent } from './application';
-export { startCluster } from 'egg';
 export { EggConfiguration as Configuration } from './configuration';
+export declare function startCluster(serverConfig: any, callback?: any): any;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -10,7 +10,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Configuration = exports.startCluster = exports.Agent = exports.Application = exports.createAgentWorkerLoader = exports.createAppWorkerLoader = exports.createEggAgent = exports.createEggApplication = exports.Framework = void 0;
+exports.startCluster = exports.Configuration = exports.Agent = exports.Application = exports.createAgentWorkerLoader = exports.createAppWorkerLoader = exports.createEggAgent = exports.createEggApplication = exports.Framework = void 0;
+const egg_cluster_1 = require("egg-cluster");
+const path_1 = require("path");
 __exportStar(require("./interface"), exports);
 var web_1 = require("./framework/web");
 Object.defineProperty(exports, "Framework", { enumerable: true, get: function () { return web_1.MidwayWebFramework; } });
@@ -22,8 +24,17 @@ Object.defineProperty(exports, "createAgentWorkerLoader", { enumerable: true, ge
 var application_1 = require("./application");
 Object.defineProperty(exports, "Application", { enumerable: true, get: function () { return application_1.Application; } });
 Object.defineProperty(exports, "Agent", { enumerable: true, get: function () { return application_1.Agent; } });
-var egg_1 = require("egg");
-Object.defineProperty(exports, "startCluster", { enumerable: true, get: function () { return egg_1.startCluster; } });
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.EggConfiguration; } });
+function startCluster(serverConfig, callback) {
+    if (!serverConfig['require']) {
+        serverConfig['require'] = [];
+    }
+    if (!Array.isArray(serverConfig['require'])) {
+        serverConfig['require'] = [serverConfig['require']];
+    }
+    serverConfig['require'].push((0, path_1.join)(__dirname, 'cluster'));
+    return (0, egg_cluster_1.startCluster)(serverConfig, callback);
+}
+exports.startCluster = startCluster;
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

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

package/dist/logger.d.ts

@@ -1,7 +1,9 @@
 import { ILogger } from '@midwayjs/logger';
 import { Application } from 'egg';
+import { MidwayLoggerService } from '@midwayjs/core';
 declare class MidwayLoggers extends Map<string, ILogger> {
-    app: Application;
+    protected app: Application;
+    protected loggerService: MidwayLoggerService;
     /**
      * @constructor
      * - logger
@@ -20,13 +22,17 @@ declare class MidwayLoggers extends Map<string, ILogger> {
      *   - {String} eol - end of line char
      *   - {String} [concentrateError = duplicate] - whether write error logger to common-error.log, `duplicate` / `redirect` / `ignore`
      * - customLogger
-     * @param options
      * @param app
      */
-    constructor(options: any, app: Application, processType: 'agent' | 'app');
+    constructor(app: Application);
     createLogger(options: any, loggerKey: string): ILogger;
     disableConsole(): void;
     reload(): void;
+    transformEggLogger(eggCustomLogger: any): {
+        midwayLogger: {
+            clients: {};
+        };
+    };
 }
 export declare const createLoggers: (app: Application, processType: 'agent' | 'app') => MidwayLoggers;
 export {};

package/dist/logger.js

@@ -16,6 +16,34 @@ function isEmptyFile(p) {
     });
     return content === null || content === undefined || content === '';
 }
+const levelTransform = level => {
+    if (!level) {
+        return undefined;
+    }
+    switch (level) {
+        case 'NONE':
+        case Infinity: // egg logger 的 none 是这个等级
+            return 'none';
+        case 0:
+        case 'DEBUG':
+        case 'debug':
+            return 'debug';
+        case 1:
+        case 'INFO':
+        case 'info':
+            return 'info';
+        case 2:
+        case 'WARN':
+        case 'warn':
+            return 'warn';
+        case 3:
+        case 'ERROR':
+        case 'error':
+            return 'error';
+        default:
+            return 'silly';
+    }
+};
 function checkEggLoggerExistsAndBackup(dir, fileName) {
     const file = (0, path_1.isAbsolute)(fileName) ? fileName : (0, path_1.join)(dir, fileName);
     if ((0, fs_1.existsSync)(file) && !(0, fs_1.lstatSync)(file).isSymbolicLink()) {
@@ -32,6 +60,13 @@ function checkEggLoggerExistsAndBackup(dir, fileName) {
         }
     }
 }
+function cleanUndefinedProperty(obj) {
+    Object.keys(obj).forEach(key => {
+        if (obj[key] === undefined) {
+            delete obj[key];
+        }
+    });
+}
 class MidwayLoggers extends Map {
     /**
      * @constructor
@@ -51,59 +86,30 @@ class MidwayLoggers extends Map {
      *   - {String} eol - end of line char
      *   - {String} [concentrateError = duplicate] - whether write error logger to common-error.log, `duplicate` / `redirect` / `ignore`
      * - customLogger
-     * @param options
      * @param app
      */
-    constructor(options, app, processType) {
-        var _a, _b;
+    constructor(app) {
         super();
         /**
-         * 日志创建的几种场景，主要考虑 2，4
-         * 1、单进程，使用 egg logger
-         * 2、单进程，使用 midway logger
-         * 3、egg-scripts 多进程，使用 egg-logger
-         * 4、egg-scripts 多进程，使用 midway logger
+         * 在 egg 这里创建 loggers，并初始化 loggerService
          */
         // 这么改是为了防止 egg 日志切割时遍历属性，导致报错
         Object.defineProperty(this, 'app', {
             value: app,
             enumerable: false,
         });
-        /**
-         * 提前备份 egg 日志
-         */
-        for (const name of [
-            options.logger.appLogName,
-            options.logger.coreLogName,
-            options.logger.agentLogName,
-            options.logger.errorLogName,
-        ]) {
-            checkEggLoggerExistsAndBackup(options.logger.dir, name);
-        }
-        /**
-         * 走到这里，有几种情况
-         * 1、egg-scripts 启动，并使用了 midway logger，egg 先启动了
-         * 2、单进程启动，但是没有 configuration，midway 没读到配置，日志服务没初始化
-         * 3、再走一遍日志创建，把 egg 插件配置的日志再初始化一遍
-         */
-        const loggerService = new core_1.MidwayLoggerService(null);
-        loggerService.configService = {
-            getConfiguration(configKey) {
-                if (configKey) {
-                    return (0, core_1.safelyGet)(configKey, options);
-                }
-                return this.configuration;
-            },
-        };
-        const midwayLoggerConfig = loggerService.transformEggLogger(options);
-        (0, core_1.extend)(true, options, midwayLoggerConfig);
-        if ((_a = options === null || options === void 0 ? void 0 : options.midwayLogger) === null || _a === void 0 ? void 0 : _a.clients) {
-            // 从 egg 过来，这里有可能没有 dir
-            if (!((_b = options.midwayLogger['default']) === null || _b === void 0 ? void 0 : _b.dir)) {
-                options.midwayLogger.default['dir'] = options.logger.dir;
+        const configService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayConfigService);
+        // 先把 egg 的日志配置转为 midway logger 配置
+        if (configService.getConfiguration('customLogger')) {
+            const eggLoggerConfig = this.transformEggLogger(configService.getConfiguration('customLogger'));
+            if (eggLoggerConfig) {
+                configService.addObject(eggLoggerConfig);
             }
-            for (const id of Object.keys(options.midwayLogger.clients)) {
-                const config = Object.assign({}, options.midwayLogger['default'], options.midwayLogger.clients[id]);
+        }
+        const loggerConfig = configService.getConfiguration('midwayLogger');
+        if (loggerConfig) {
+            for (const id of Object.keys(loggerConfig.clients)) {
+                const config = Object.assign({}, loggerConfig['default'], loggerConfig.clients[id]);
                 this.createLogger(config, id);
             }
         }
@@ -111,16 +117,18 @@ class MidwayLoggers extends Map {
             this['logger'] = logger_1.loggers.getLogger('appLogger');
             this.set('logger', logger_1.loggers.getLogger('appLogger'));
         }
-        if (logger_1.loggers.has('coreLogger')) {
-            this.createLogger({}, 'coreLogger');
-            this.createLogger({}, 'appLogger');
-            this.createLogger({}, 'agentLogger');
-        }
-        else {
-            console.log('-----请在 logger 里配置 clients');
-        }
+        // 初始化日志服务
+        this.loggerService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayLoggerService, [(0, core_1.getCurrentApplicationContext)()]);
+        // 防止循环枚举报错
+        Object.defineProperty(this, 'loggerService', {
+            enumerable: false,
+        });
     }
     createLogger(options, loggerKey) {
+        /**
+         * 提前备份 egg 日志
+         */
+        checkEggLoggerExistsAndBackup(options.dir, options.fileLogName);
         const logger = logger_1.loggers.createLogger(loggerKey, options);
         // overwrite values for pandora collect
         logger.values = () => {
@@ -149,25 +157,36 @@ class MidwayLoggers extends Map {
             }
         }
     }
+    transformEggLogger(eggCustomLogger) {
+        var _a, _b, _c;
+        const transformLoggerConfig = {
+            midwayLogger: {
+                clients: {},
+            },
+        };
+        for (const name in eggCustomLogger) {
+            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),
+            };
+            cleanUndefinedProperty(transformLoggerConfig.midwayLogger.clients[name]);
+        }
+        return transformLoggerConfig;
+    }
 }
 const createLoggers = (app, processType) => {
-    const loggerConfig = app.config.logger;
-    loggerConfig.type = app.type;
-    if (app.config.env === 'prod' &&
-        loggerConfig.level === 'DEBUG' &&
-        !loggerConfig.allowDebugAtProd) {
-        loggerConfig.level = 'INFO';
-    }
     // 现在只走 midway logger
-    const loggers = new MidwayLoggers(app.config, app, processType);
+    const loggers = new MidwayLoggers(app);
     // won't print to console after started, except for local and unittest
     app.ready(() => {
-        if (loggerConfig.disableConsoleAfterReady) {
+        var _a;
+        if ((_a = app.config.logger) === null || _a === void 0 ? void 0 : _a.disableConsoleAfterReady) {
             loggers.disableConsole();
         }
     });
     debug(`[egg]: create loggers in ${processType}`);
-    loggers['coreLogger'].info('[egg:logger] init all loggers with options: %j', loggerConfig);
+    loggers['coreLogger'].info('[egg:logger] init all loggers with options: %j', app.config.midwayLogger);
     return loggers;
 };
 exports.createLoggers = createLoggers;

package/dist/utils.d.ts

@@ -1,4 +1,3 @@
-import { IMidwayBootstrapOptions } from '@midwayjs/core';
 export declare function isTypeScriptEnvironment(): boolean;
 export declare const parseNormalDir: (baseDir: string, isTypescript?: boolean) => {
     baseDir: string;
@@ -6,5 +5,5 @@ export declare const parseNormalDir: (baseDir: string, isTypescript?: boolean) =
 };
 export declare const findLernaRoot: (findRoot?: string) => string;
 export declare const getCurrentDateString: (timestamp?: number) => string;
-export declare function initializeAgentApplicationContext(agent: any, globalOptions: Omit<IMidwayBootstrapOptions, 'applicationContext'>): Promise<import("@midwayjs/core").IMidwayContainer>;
+export declare function initializeAgentApplicationContext(agent: any): Promise<import("@midwayjs/core").IMidwayContainer>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -66,75 +66,12 @@ const getCurrentDateString = (timestamp = Date.now()) => {
         .padStart(2, '0')}-${d.getDate().toString().padStart(2, '0')}`;
 };
 exports.getCurrentDateString = getCurrentDateString;
-async function initializeAgentApplicationContext(agent, globalOptions) {
-    var _a, _b, _c;
-    if (!(0, core_1.getCurrentApplicationContext)()) {
-        debug('[egg]: start "initializeGlobalApplicationContext"');
-        const appDir = (_a = globalOptions.appDir) !== null && _a !== void 0 ? _a : '';
-        const baseDir = (_b = globalOptions.baseDir) !== null && _b !== void 0 ? _b : '';
-        // new container
-        const applicationContext = new core_1.MidwayContainer();
-        debug('[egg]: delegate module map from decoratorManager');
-        (0, decorator_1.bindContainer)(applicationContext);
-        global['MIDWAY_APPLICATION_CONTEXT'] = applicationContext;
-        // register baseDir and appDir
-        applicationContext.registerObject('baseDir', baseDir);
-        applicationContext.registerObject('appDir', appDir);
-        if (globalOptions.moduleDirector !== false) {
-            if (globalOptions.moduleDetector === undefined ||
-                globalOptions.moduleDetector === 'file') {
-                applicationContext.setFileDetector(new core_1.DirectoryFileDetector({
-                    loadDir: baseDir,
-                    ignore: (_c = globalOptions.ignore) !== null && _c !== void 0 ? _c : [],
-                }));
-            }
-            else if (globalOptions.moduleDetector) {
-                applicationContext.setFileDetector(globalOptions.moduleDetector);
-            }
-        }
-        // bind inner service
-        applicationContext.bindClass(core_1.MidwayEnvironmentService);
-        applicationContext.bindClass(core_1.MidwayInformationService);
-        applicationContext.bindClass(core_1.MidwayDecoratorService);
-        applicationContext.bindClass(core_1.MidwayConfigService);
-        applicationContext.bindClass(core_1.MidwayAspectService);
-        applicationContext.bindClass(core_1.MidwayLoggerService);
-        // bind preload module
-        if (globalOptions.preloadModules && globalOptions.preloadModules.length) {
-            for (const preloadModule of globalOptions.preloadModules) {
-                applicationContext.bindClass(preloadModule);
-            }
-        }
-        // init default config
-        const configService = await applicationContext.getAsync(core_1.MidwayConfigService);
-        // add egg config here, it will be ignore midway and component config
-        configService.add([
-            {
-                default: agent.config,
-            },
-        ]);
+async function initializeAgentApplicationContext(agent) {
+    if (process.env['EGG_CLUSTER_MODE'] === 'true') {
         // init aop support
-        const aspectService = await applicationContext.getAsync(core_1.MidwayAspectService, [applicationContext]);
+        const aspectService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayAspectService);
         // init decorator service
-        const decoratorService = await applicationContext.getAsync(core_1.MidwayDecoratorService, [applicationContext]);
-        if (!globalOptions.imports) {
-            globalOptions.imports = [
-                (0, core_1.safeRequire)((0, path_1.join)(globalOptions.baseDir, 'configuration')),
-            ];
-        }
-        for (const configurationModule of [].concat(globalOptions.imports)) {
-            // load configuration and component
-            applicationContext.load(configurationModule);
-        }
-        // bind user code module
-        await applicationContext.ready();
-        // merge config
-        await configService.load();
-        debug('[core]: Current config = %j', configService.getConfiguration());
-        // init logger
-        await applicationContext.getAsync(core_1.MidwayLoggerService, [
-            applicationContext,
-        ]);
+        const decoratorService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayDecoratorService);
         // framework/config/plugin/logger/app decorator support
         // register base config hook
         decoratorService.registerPropertyHandler(decorator_1.CONFIG_KEY, (propertyName, meta) => {
@@ -164,12 +101,15 @@ async function initializeAgentApplicationContext(agent, globalOptions) {
         });
         // init aspect module
         await aspectService.loadAspect();
+        debug('[egg]: added extra for "initializeAgentApplicationContext" in cluster mode');
     }
     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');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.0.13",
+  "version": "3.1.0",
   "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.0.13",
+    "@midwayjs/mock": "^3.1.0",
     "axios": "0.26.0",
     "dayjs": "1.10.8",
     "egg-logger": "2.7.1",
@@ -46,8 +46,9 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.0.13",
+    "@midwayjs/core": "^3.1.0",
     "egg": "^2.28.0",
+    "egg-cluster": "^1.27.1",
     "find-up": "5.0.0",
     "mkdirp": "^1.0.4"
   },
@@ -59,5 +60,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "8c8338f4488ec65765c342dd5238ed3e61872b37"
+  "gitHead": "2074c838e454a9673a044dbe065631dd9f944005"
 }

package/config/config.default.js

@@ -1,54 +0,0 @@
-'use strict';
-
-const path = require('path');
-const mkdirp = require('mkdirp');
-const os = require('os');
-const fs = require('fs');
-
-module.exports = appInfo => {
-  const exports = {};
-
-  exports.rundir = path.join(appInfo.appDir, 'run');
-  // 修改默认的日志名
-  exports.midwayLogger = {
-    clients: {
-      coreLogger: {
-        fileLogName: 'midway-core.log',
-      },
-      appLogger: {
-        fileLogName: 'midway-web.log',
-        aliasName: 'logger',
-      },
-      agentLogger: {
-        fileLogName: 'midway-agent.log',
-      },
-    },
-  };
-
-  exports.pluginOverwrite = false;
-
-  exports.security = {
-    csrf: {
-      ignoreJSON: false,
-    },
-  };
-
-  // alinode runtime 写入的日志策略是: 如果 NODE_LOG_DIR 有设置，写入 NODE_LOG_DIR 设置的目录；否则为 /tmp
-  let alinodeLogdir = fs.existsSync('/tmp') ? '/tmp' : os.tmpdir();
-  // try to use NODE_LOG_DIR first
-  if (process.env.NODE_LOG_DIR) {
-    alinodeLogdir = process.env.NODE_LOG_DIR;
-  }
-  mkdirp.sync(alinodeLogdir);
-
-  exports.alinode = {
-    logdir: alinodeLogdir,
-    error_log: [
-      path.join(appInfo.root, `logs/${appInfo.pkg.name}/common-error.log`),
-      path.join(appInfo.root, 'logs/stderr.log'),
-    ],
-    packages: [path.join(appInfo.appDir, 'package.json')],
-  };
-
-  return exports;
-};