ee-core 2.11.1 → 4.0.0-beta.1

package/log/logger.js

@@ -1,10 +1,13 @@
+'use strict';
+
+const debug = require('debug')('ee-core:log:logger');
 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');
+const { extend } = require('../utils/extend');
+const { getConfig } = require('../config');
+const { getLogDir, env, isDev } = require('../ps');
+
 let LogDate = 0;
 const TmpFileName = {
   appLogName: '',
@@ -12,92 +15,81 @@ const TmpFileName = {
   errorLogName: '',
 }
 
-module.exports = {
+// 创建
+function create(config = {}) {
+  let opt = {};
+  
+  if (Object.keys(config).length == 0) {
+    const defaultConfig = {
+      logger: {
+        type: 'application',
+        dir: getLogDir(),
+        env: env(),
+        consoleLevel: 'INFO',
+        disableConsoleAfterReady: !isDev(),
+        coreLogger: {},
+        allowDebugAtProd: false,
+        agentLogName: 'ee-agent.log',
+        rotator: 'day',
+      },
+      customLogger: {}
+    };
+    const sysConfig = getConfig();
+    opt = extend(true, defaultConfig, {
+      logger: sysConfig.logger,
+      customLogger: sysConfig.customLogger || {}
+    });
+  } else {
+    opt.logger = config.logger;
+    opt.customLogger = config.customLogger;
+  }
 
-  /**
-   * 创建
-   */
-  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: {}
-      }
+  if (Object.keys(opt).length == 0) {
+    throw new Error("logger config is null");
+  }
 
-      // 先从 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);
+  let rotateType = opt.logger.rotator;
+  if (rotateType == 'day') {
+    opt = _rotateByDay(opt);
+  }
 
-    assert(Object.keys(opt).length != 0, `logger config is null`);
+  debug('[create] opt:%j', opt);
+  const loggers = new Loggers(opt);
 
-    let rotateType = opt.logger.rotator;
-    if (rotateType == 'day') {
-      this._rotateByDay(opt);
-    }
+  return loggers;
+}
 
-    const loggers = new Loggers(opt);
+/**
+ * 按天分割
+ */
+function _rotateByDay(logOpt) {
+  const now = parseInt(dayjs().format('YYYYMMDD'));
+  if (LogDate != now) {
+    LogDate = now;
 
-    return loggers;
-  },
+    // 保存一个临时文件名，防止文件名按日期累加
+    if (TmpFileName.appLogName.length == 0) {
+      TmpFileName.appLogName = logOpt.logger.appLogName;
+    }
+    if (TmpFileName.coreLogName.length == 0) {
+      TmpFileName.coreLogName = logOpt.logger.coreLogName;
+    }
+    if (TmpFileName.errorLogName.length == 0) {
+      TmpFileName.errorLogName = logOpt.logger.errorLogName;
+    }
 
-  /**
-   * 按天分割
-   */
-  _rotateByDay(logOpt) {
-    let now = parseInt(dayjs().format('YYYYMMDD'));
-    if (LogDate != now) {
-      LogDate = now;
+    const {appLogName, coreLogName, errorLogName} = TmpFileName;
+    const appLogExtname = path.extname(appLogName);
+    const coreLogExtname = path.extname(coreLogName);
+    const 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;
+  }
 
-      // 保存一个临时文件名，防止文件名按日期累加
-      if (TmpFileName.appLogName.length == 0) {
-        TmpFileName.appLogName = logOpt.logger.appLogName;
-      }
-      if (TmpFileName.coreLogName.length == 0) {
-        TmpFileName.coreLogName = logOpt.logger.coreLogName;
-      }
-      if (TmpFileName.errorLogName.length == 0) {
-        TmpFileName.errorLogName = logOpt.logger.errorLogName;
-      }
-      let appLogName = TmpFileName.appLogName;
-      let coreLogName = TmpFileName.coreLogName;
-      let errorLogName = TmpFileName.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;
-    }
-  },  
+  return logOpt;
+}
+
+module.exports = {
+  create
 };

package/message/childMessage.js

@@ -1,15 +1,14 @@
-const Channel = require('../const/channel');
+'use strict';
+
+const { Receiver, Processes } = require('../const/channel');
 
 class ChildMessage {
-  constructor() {
-    // ...
-  }
 
   /**
    * 向主进程发消息 for ChildJob 实例
    */
   sendToMain(eventName, params = {}) {
-    let receiver = Channel.receiver.childJob;
+    const receiver = Receiver.childJob;
     return this.send(eventName, params, receiver);
   }
 
@@ -17,9 +16,9 @@ class ChildMessage {
    * 向主进程发消息 for task 实例
    */
   send(eventName, params = {}, receiver) {
-    let eventReceiver = receiver || Channel.receiver.forkProcess;
-    let message = {
-      channel: Channel.process.sendToMain,
+    const eventReceiver = receiver || Receiver.forkProcess;
+    const message = {
+      channel: Processes.sendToMain,
       eventReceiver,
       event: eventName,
       data: params,
@@ -41,14 +40,14 @@ class ChildMessage {
   sendErrorToTerminal(err) {
     let errTips = (err && typeof err == 'object') ? err.toString() : '';
     errTips += ' Error !!! Please See file ee-core.log or ee-error-xxx.log for details !'
-    let message = {
-      channel: Channel.process.showException,
+    const message = {
+      channel: Processes.showException,
       data: errTips
     }
     process.send(message);
   }
 }
 
-
-
-module.exports = ChildMessage;
+module.exports = { 
+  ChildMessage
+};

package/message/index.js

@@ -1,19 +1,10 @@
-const ChildMessage = require('./childMessage');
-const EEChildMessage = Symbol('EeCore#Module#ChildMessage');
+'use strict';
 
-const message = {
+const { ChildMessage } = require('./childMessage');
 
-  /**
-   * childMessage
-   */
-  get childMessage() {
-    if (!this[EEChildMessage]) {
-      this[EEChildMessage] = new ChildMessage();
-    }
+const childMessage = new ChildMessage();
 
-    return this[EEChildMessage] || null;
-  },
-
-};
-
-module.exports = message;
+module.exports = {
+  ChildMessage,
+  childMessage
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.11.1",
+  "version": "4.0.0-beta.1",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -13,12 +13,12 @@
   },
   "dependencies": {
     "agentkeepalive": "^4.2.0",
+    "axios": "^1.7.9",
     "bytenode": "^1.3.6",
     "chalk": "^4.1.2",
     "cross-spawn": "^7.0.3",
     "dayjs": "^1.11.7",
     "debug": "^4.3.3",
-    "egg-errors": "^2.3.0",
     "egg-logger": "^2.7.1",
     "globby": "^10.0.0",
     "is-type-of": "^1.2.1",