@midwayjs/web 3.0.13 → 3.0.14-beta.1

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, 'logger');
   },
 
   set logger(customLogger) {

package/dist/base.js

@@ -38,9 +38,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 +101,30 @@ 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)();
+                    /**
+                     * 这里 logger service 已经被 get loggers() 初始化过了，就不需要在这里初始化了
+                     */
+                    // framework/config/plugin/logger/app decorator support
+                    await applicationContext.getAsync(core_1.MidwayFrameworkService, [
+                        applicationContext,
+                        {
+                            application: this.app,
+                        },
+                    ]);
+                    // lifecycle support
+                    await applicationContext.getAsync(core_1.MidwayLifeCycleService, [
+                        applicationContext,
+                    ]);
                 });
             }
         }
@@ -126,15 +134,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 +161,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 +225,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.d.ts

@@ -1,13 +1,15 @@
 import { IMidwayWebApplication } from './interface';
 import { MidwayDecoratorService } from '@midwayjs/core';
+import { MidwayWebFramework } from './framework/web';
 export declare class EggConfiguration {
     baseDir: any;
     appDir: any;
     app: IMidwayWebApplication;
     decoratorService: MidwayDecoratorService;
+    framework: MidwayWebFramework;
     init(): void;
     onReady(): Promise<void>;
-    onServerReady(): Promise<void>;
+    onServerReady(container: any): Promise<void>;
     onStop(): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -12,6 +12,8 @@ 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");
+const web_1 = require("./framework/web");
 let EggConfiguration = class EggConfiguration {
     init() {
         this.decoratorService.registerParameterHandler(decorator_1.WEB_ROUTER_PARAM_KEY, options => {
@@ -26,9 +28,16 @@ let EggConfiguration = class EggConfiguration {
                 ? this.app.middleware.slice()
                 : [];
     }
-    async onServerReady() {
+    async onServerReady(container) {
         // trigger server didReady
         this.app.messenger.emit('egg-ready');
+        if (process.env['EGG_CLUSTER_MODE'] === 'true') {
+            this.app.once('server', server => {
+                this.framework.setServer(server);
+                // register httpServer to applicationContext
+                container.registerObject(core_1.HTTP_SERVER_KEY, server);
+            });
+        }
     }
     async onStop() {
         // TODO flush egg logger and close it
@@ -50,6 +59,10 @@ __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
 ], EggConfiguration.prototype, "decoratorService", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", web_1.MidwayWebFramework)
+], EggConfiguration.prototype, "framework", void 0);
 __decorate([
     (0, decorator_1.Init)(),
     __metadata("design:type", Function),
@@ -59,65 +72,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/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,6 +138,9 @@ 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}"`);
@@ -238,6 +243,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/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 {};