ee-core 2.9.2 → 2.10.1

package/loader/index.js

@@ -1,172 +1,172 @@
-const is = require('is-type-of');
-const fs = require('fs');
-const path = require('path');
-const UtilsCore = require('../core/lib/utils');
-const Ps = require('../ps');
-const Log = require('../log');
-
-module.exports = {
-
-  /**
-   * 加载单个文件(如果是函数，将被执行)
-   *
-   * @param {String} filepath - fullpath
-   * @param {Array} inject - pass rest arguments into the function when invoke
-   * @return {Object} exports
-   * @since 1.0.0
-   */
-  loadOneFile (filepath, ...inject) {
-    const isAbsolute = path.isAbsolute(filepath);
-    if (!isAbsolute) {
-      filepath = path.join(Ps.getBaseDir(), filepath);
-    }
-
-    filepath = filepath && this.resolveModule(filepath);
-    if (!fs.existsSync(filepath)) {
-      let errorMsg = `[ee-core] [loader/index] loadOneFile ${filepath} does not exist`;
-      Log.coreLogger.error(errorMsg);
-      throw new Error(errorMsg);
-    }
-
-    const ret = UtilsCore.loadFile(filepath);
-    if (is.function(ret) && !is.class(ret) && !UtilsCore.isBytecodeClass(ret)) {
-      ret = ret(...inject);
-    }
-    return ret;
-  },
-
-  /**
-   * 加载js文件
-   *
-   * @param {String} filepath - fullpath
-   * @return {Any} exports
-   * @since 1.0.0
-   */
-  loadJsFile (filepath) {
-    if (!fs.existsSync(filepath)) {
-      let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
-      Log.coreLogger.error(errMsg);
-      return;
-    }
-
-    const ret = UtilsCore.loadFile(filepath);
-    return ret;
-  },  
-
-  /**
-   * 加载并运行js文件
-   *
-   * @param {String} filepath - fullpath
-   * @param {Array} inject - pass rest arguments into the function when invoke
-   * @return {Any}
-   * @since 1.0.0
-   */
-  execJsFile (filepath, ...inject) {
-    if (!fs.existsSync(filepath)) {
-      let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
-      Log.coreLogger.error(errMsg);
-      return;
-    }
-
-    let ret = UtilsCore.loadFile(filepath);
-    if (is.class(ret) || UtilsCore.isBytecodeClass(ret)) {
-      ret = new ret(inject);
-    } else if (is.function(ret)) {
-      ret = ret(inject);
-    }
-
-    return ret;
-  }, 
-
-  /**
-   * 模块的绝对路径
-   * @param {String} filepath - fullpath
-   */
-  resolveModule(filepath) {
-    let fullpath;
-    try {
-      fullpath = require.resolve(filepath);
-    } catch (e) {
-
-      // 特殊后缀处理
-      if (filepath && (filepath.endsWith('.defalut') || filepath.endsWith('.prod'))) {
-        fullpath = filepath + '.jsc';
-      } else if (filepath && filepath.endsWith('.js')) {
-        fullpath = filepath + 'c';
-      }
-
-      if (!fs.existsSync(filepath) && !fs.existsSync(fullpath)) {
-        let files = { filepath, fullpath }
-        Log.coreLogger.warn(`[ee-core] [loader] resolveModule unknow filepath: ${files}`)
-        return undefined;
-      }
-    }
-
-    return fullpath;
-  },
-
-  /**
-   * 加载模块(子进程中使用)
-   *
-   * @param {String} filepath - fullpath
-   * @return {Object} exports
-   * @since 1.0.0
-   */
-  requireModule (filepath, type = '') {
-    let fullpath;
-    const isAbsolute = path.isAbsolute(filepath);
-    if (!isAbsolute) {
-      filepath = path.join(Ps.getBaseDir(), type, filepath);
-    }
-
-    fullpath = this.resolveModule(filepath);
-    if (!fs.existsSync(fullpath)) {
-      let errorMsg = `[ee-core] [loader] requireModule filepath: ${filepath} does not exist`;
-      Log.coreLogger.error(errorMsg);
-    }
-    const ret = UtilsCore.loadFile(fullpath);
-
-    return ret;
-  },   
-
-  /**
-   * 加载jobs模块(子进程中使用)
-   *
-   * @param {String} filepath - fullpath
-   * @return {Object} exports
-   * @since 1.0.0
-   */
-  requireJobsModule (filepath) {
-    const ret = this.requireModule(filepath, 'jobs');
-
-    return ret;
-  },
-  
-  /**
-   * 获取electron目录下文件的绝对路径
-   * @param {String} filepath - fullpath
-   */
-  getFullpath(filepath) {
-    let fullpath;
-    const isAbsolute = path.isAbsolute(filepath);
-    if (!isAbsolute) {
-      filepath = path.join(Ps.getBaseDir(), filepath);
-    }
-
-    fullpath = this.resolveModule(filepath);
-    if (!fs.existsSync(fullpath)) {
-      throw new Error(`[ee-core] [loader] getFullpath filepath ${fullpath} not exists`);
-    }
-
-    return fullpath;
-  }
-  
-}
-
-
-
-
-
-
-
-
+const is = require('is-type-of');
+const fs = require('fs');
+const path = require('path');
+const UtilsCore = require('../core/lib/utils');
+const Ps = require('../ps');
+const Log = require('../log');
+
+module.exports = {
+
+  /**
+   * 加载单个文件(如果是函数，将被执行)
+   *
+   * @param {String} filepath - fullpath
+   * @param {Array} inject - pass rest arguments into the function when invoke
+   * @return {Object} exports
+   * @since 1.0.0
+   */
+  loadOneFile (filepath, ...inject) {
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), filepath);
+    }
+
+    filepath = filepath && this.resolveModule(filepath);
+    if (!fs.existsSync(filepath)) {
+      let errorMsg = `[ee-core] [loader/index] loadOneFile ${filepath} does not exist`;
+      Log.coreLogger.error(errorMsg);
+      throw new Error(errorMsg);
+    }
+
+    const ret = UtilsCore.loadFile(filepath);
+    if (is.function(ret) && !is.class(ret) && !UtilsCore.isBytecodeClass(ret)) {
+      ret = ret(...inject);
+    }
+    return ret;
+  },
+
+  /**
+   * 加载js文件
+   *
+   * @param {String} filepath - fullpath
+   * @return {Any} exports
+   * @since 1.0.0
+   */
+  loadJsFile (filepath) {
+    if (!fs.existsSync(filepath)) {
+      let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
+      Log.coreLogger.error(errMsg);
+      return;
+    }
+
+    const ret = UtilsCore.loadFile(filepath);
+    return ret;
+  },  
+
+  /**
+   * 加载并运行js文件
+   *
+   * @param {String} filepath - fullpath
+   * @param {Array} inject - pass rest arguments into the function when invoke
+   * @return {Any}
+   * @since 1.0.0
+   */
+  execJsFile (filepath, ...inject) {
+    if (!fs.existsSync(filepath)) {
+      let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
+      Log.coreLogger.error(errMsg);
+      return;
+    }
+
+    let ret = UtilsCore.loadFile(filepath);
+    if (is.class(ret) || UtilsCore.isBytecodeClass(ret)) {
+      ret = new ret(inject);
+    } else if (is.function(ret)) {
+      ret = ret(inject);
+    }
+
+    return ret;
+  }, 
+
+  /**
+   * 模块的绝对路径
+   * @param {String} filepath - fullpath
+   */
+  resolveModule(filepath) {
+    let fullpath;
+    try {
+      fullpath = require.resolve(filepath);
+    } catch (e) {
+
+      // 特殊后缀处理
+      if (filepath && (filepath.endsWith('.defalut') || filepath.endsWith('.prod'))) {
+        fullpath = filepath + '.jsc';
+      } else if (filepath && filepath.endsWith('.js')) {
+        fullpath = filepath + 'c';
+      }
+
+      if (!fs.existsSync(filepath) && !fs.existsSync(fullpath)) {
+        let files = { filepath, fullpath }
+        Log.coreLogger.warn(`[ee-core] [loader] resolveModule unknow filepath: ${files}`)
+        return undefined;
+      }
+    }
+
+    return fullpath;
+  },
+
+  /**
+   * 加载模块(子进程中使用)
+   *
+   * @param {String} filepath - fullpath
+   * @return {Object} exports
+   * @since 1.0.0
+   */
+  requireModule (filepath, type = '') {
+    let fullpath;
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), type, filepath);
+    }
+
+    fullpath = this.resolveModule(filepath);
+    if (!fs.existsSync(fullpath)) {
+      let errorMsg = `[ee-core] [loader] requireModule filepath: ${filepath} does not exist`;
+      Log.coreLogger.error(errorMsg);
+    }
+    const ret = UtilsCore.loadFile(fullpath);
+
+    return ret;
+  },   
+
+  /**
+   * 加载jobs模块(子进程中使用)
+   *
+   * @param {String} filepath - fullpath
+   * @return {Object} exports
+   * @since 1.0.0
+   */
+  requireJobsModule (filepath) {
+    const ret = this.requireModule(filepath, 'jobs');
+
+    return ret;
+  },
+  
+  /**
+   * 获取electron目录下文件的绝对路径
+   * @param {String} filepath - fullpath
+   */
+  getFullpath(filepath) {
+    let fullpath;
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), filepath);
+    }
+
+    fullpath = this.resolveModule(filepath);
+    if (!fs.existsSync(fullpath)) {
+      throw new Error(`[ee-core] [loader] getFullpath filepath ${fullpath} not exists`);
+    }
+
+    return fullpath;
+  }
+  
+}
+
+
+
+
+
+
+
+

package/log/index.js

@@ -1,69 +1,69 @@
-const dayjs = require('dayjs');
-const Logger = require('./logger');
-const EELoggers = Symbol('EeApplication#EELoggers');
-let LogDate = 0;
-
-const Log = {
-  /**
-   * 创建日志实例
-   */
-  create(config) {
-    this._delCache();
-    const eeLog = Logger.create(config);
-
-    return eeLog;
-  },
-
-  /**
-   * delete cache
-   */
-  _delCache() {
-    let now = parseInt(dayjs().format('YYYYMMDD'));
-    if (LogDate != now) {
-      LogDate = now;
-      this[EELoggers] = null;
-    }
-  },
-
-  /**
-   * logger
-   */
-  get logger() {
-    this._delCache();
-    if (!this[EELoggers]) {
-      this[EELoggers] = Logger.create();
-    }
-
-    return this[EELoggers]['logger'] || null;
-  },
-
-  /**
-   * coreLogger
-   */
-  get coreLogger () {
-    this._delCache();
-    if (!this[EELoggers]) {
-      this[EELoggers] = Logger.create();
-    }
-
-    return this[EELoggers]['coreLogger'] || null;
-  },
-
-  get error() {
-    return this.logger.error.bind(this.logger);
-  },
-
-  get warn() {
-    return this.logger.warn.bind(this.logger);
-  },
-
-  get info() {
-    return this.logger.info.bind(this.logger);
-  },
-
-  get debug() {
-    return this.logger.debug.bind(this.logger);
-  },
-};
-
+const dayjs = require('dayjs');
+const Logger = require('./logger');
+const EELoggers = Symbol('EeApplication#EELoggers');
+let LogDate = 0;
+
+const Log = {
+  /**
+   * 创建日志实例
+   */
+  create(config) {
+    this._delCache();
+    const eeLog = Logger.create(config);
+
+    return eeLog;
+  },
+
+  /**
+   * delete cache
+   */
+  _delCache() {
+    let now = parseInt(dayjs().format('YYYYMMDD'));
+    if (LogDate != now) {
+      LogDate = now;
+      this[EELoggers] = null;
+    }
+  },
+
+  /**
+   * logger
+   */
+  get logger() {
+    this._delCache();
+    if (!this[EELoggers]) {
+      this[EELoggers] = Logger.create();
+    }
+
+    return this[EELoggers]['logger'] || null;
+  },
+
+  /**
+   * coreLogger
+   */
+  get coreLogger () {
+    this._delCache();
+    if (!this[EELoggers]) {
+      this[EELoggers] = Logger.create();
+    }
+
+    return this[EELoggers]['coreLogger'] || null;
+  },
+
+  get error() {
+    return this.logger.error.bind(this.logger);
+  },
+
+  get warn() {
+    return this.logger.warn.bind(this.logger);
+  },
+
+  get info() {
+    return this.logger.info.bind(this.logger);
+  },
+
+  get debug() {
+    return this.logger.debug.bind(this.logger);
+  },
+};
+
 module.exports = Log;

package/log/logger.js

@@ -1,81 +1,87 @@
-const Loggers = require('egg-logger').EggLoggers;
-const assert = require('assert');
-const dayjs = require('dayjs');
-const path = require('path');
-const Ps = require('../ps');
-const Conf = require('../config');
-let LogDate = 0;
-
-module.exports = {
-
-  /**
-   * 创建
-   */
-  create(config = {}) {
-    let opt = {};
-    
-    if (Object.keys(config).length == 0) {
-      const defaultConfig = {
-        logger: {
-          type: 'application',
-          dir: Ps.getLogDir(),
-          encoding: 'utf8',
-          env: Ps.env(),
-          level: 'INFO',
-          consoleLevel: 'INFO',
-          disableConsoleAfterReady: !Ps.isDev(),
-          outputJSON: false,
-          buffer: true,
-          appLogName: `ee.log`,
-          coreLogName: 'ee-core.log',
-          agentLogName: 'ee-agent.log',
-          errorLogName: `ee-error.log`,
-          coreLogger: {},
-          allowDebugAtProd: false,
-          enablePerformanceTimer: false,
-          rotator: 'none',
-        },
-        customLogger: {}
-      }
-      const sysConfig = Conf.all();
-      opt = Object.assign(defaultConfig, {
-        logger: sysConfig.logger,
-        customLogger: sysConfig.customLogger || {}
-      });
-    } else {
-      opt.logger = config.logger;
-      opt.customLogger = config.customLogger;
-    }
-    // console.log('log---------', opt);
-
-    assert(Object.keys(opt).length != 0, `logger config is null`);
-
-    let rotateType = opt.logger.rotator;
-    if (rotateType == 'day') {
-      this._rotateByDay(opt);
-    }
-
-    const loggers = new Loggers(opt);
-
-    return loggers;
-  },
-
-  /**
-   * 按天分割
-   */
-  _rotateByDay(logOpt) {
-    let now = parseInt(dayjs().format('YYYYMMDD'));
-    if (LogDate != now) {
-      LogDate = now;
-      let appLogName = logOpt.logger.appLogName;
-      let coreLogName = logOpt.logger.coreLogName;
-      let errorLogName = logOpt.logger.errorLogName;
-      let appLogExtname = path.extname(appLogName);
-      let coreLogExtname = path.extname(coreLogName);
-      let errorLogExtname = path.extname(errorLogName);
-      logOpt.logger.appLogName = path.basename(appLogName, appLogExtname) + '-' + now + appLogExtname;
-      logOpt.logger.coreLogName = path.basename(coreLogName, coreLogExtname) + '-' + now + coreLogExtname;
-      logOpt.logger.errorLogName = path.basename(errorLogName, errorLogExtname) + '-' + now + errorLogExtname;
-    }
-  },  
+const Loggers = require('egg-logger').EggLoggers;
+const assert = require('assert');
+const dayjs = require('dayjs');
+const path = require('path');
+const Ps = require('../ps');
+const Conf = require('../config');
+const ConfigCache = require('../config/cache');
+let LogDate = 0;
+
+module.exports = {
+
+  /**
+   * 创建
+   */
+  create(config = {}) {
+    let opt = {};
+    
+    if (Object.keys(config).length == 0) {
+      const defaultConfig = {
+        logger: {
+          type: 'application',
+          dir: Ps.getLogDir(),
+          encoding: 'utf8',
+          env: Ps.env(),
+          level: 'INFO',
+          consoleLevel: 'INFO',
+          disableConsoleAfterReady: !Ps.isDev(),
+          outputJSON: false,
+          buffer: true,
+          appLogName: `ee.log`,
+          coreLogName: 'ee-core.log',
+          agentLogName: 'ee-agent.log',
+          errorLogName: `ee-error.log`,
+          coreLogger: {},
+          allowDebugAtProd: false,
+          enablePerformanceTimer: false,
+          rotator: 'none',
+        },
+        customLogger: {}
+      }
+
+      // 先从 cache 中读配置且不能抛出错误，如果没有从文件中读（子进程无法获取 cache）
+      let sysConfig = ConfigCache.all(false);
+      if (!sysConfig) {
+        sysConfig = Conf.all(false);
+      }
+      opt = Object.assign(defaultConfig, {
+        logger: sysConfig.logger,
+        customLogger: sysConfig.customLogger || {}
+      });
+    } else {
+      opt.logger = config.logger;
+      opt.customLogger = config.customLogger;
+    }
+    // console.log('log---------', opt);
+
+    assert(Object.keys(opt).length != 0, `logger config is null`);
+
+    let rotateType = opt.logger.rotator;
+    if (rotateType == 'day') {
+      this._rotateByDay(opt);
+    }
+
+    const loggers = new Loggers(opt);
+
+    return loggers;
+  },
+
+  /**
+   * 按天分割
+   */
+  _rotateByDay(logOpt) {
+    let now = parseInt(dayjs().format('YYYYMMDD'));
+    if (LogDate != now) {
+      LogDate = now;
+      let appLogName = logOpt.logger.appLogName;
+      let coreLogName = logOpt.logger.coreLogName;
+      let errorLogName = logOpt.logger.errorLogName;
+      let appLogExtname = path.extname(appLogName);
+      let coreLogExtname = path.extname(coreLogName);
+      let errorLogExtname = path.extname(errorLogName);
+      logOpt.logger.appLogName = path.basename(appLogName, appLogExtname) + '-' + now + appLogExtname;
+      logOpt.logger.coreLogName = path.basename(coreLogName, coreLogExtname) + '-' + now + coreLogExtname;
+      logOpt.logger.errorLogName = path.basename(errorLogName, errorLogExtname) + '-' + now + errorLogExtname;
+    }
+  },  
 };