@midwayjs/web 3.0.13 → 3.0.14-beta.1

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,6 +101,7 @@ 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');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.0.13",
+  "version": "3.0.14-beta.1",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -48,6 +48,7 @@
     "@eggjs/router": "^2.0.0",
     "@midwayjs/core": "^3.0.13",
     "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": "a603d2348d6141f8f723901498f03a162a037708"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

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