ee-core 4.1.2 → 4.1.4

package/loader/index.js

@@ -1,98 +1,99 @@
-const is = require('is-type-of');
-const fs = require('fs');
-const path = require('path');
-const CoreUtils = require('../core/utils');
-const { getElectronDir } = require('../ps');
-
-// 加载单个文件(如果是函数，将被执行)
-function loadFile(filepath, ...inject) {
-  const isAbsolute = path.isAbsolute(filepath);
-  if (!isAbsolute) {
-    filepath = path.join(getElectronDir(), filepath);
-  }
-
-  filepath = filepath && resolveModule(filepath);
-  if (!fs.existsSync(filepath)) {
-    let errorMsg = `[ee-core] [loader/index] loadFile ${filepath} does not exist`;
-    throw new Error(errorMsg);
-  }
-
-  let ret = CoreUtils.loadFile(filepath);
-  if (is.function(ret) && !is.class(ret) && !CoreUtils.isBytecodeClass(ret)) {
-    ret = ret(...inject);
-  }
-  return ret;
-}
-
-// requireFile
-function requireFile(filepath) {
-  return CoreUtils.loadFile(filepath);
-}
-
-// 加载并运行文件
-function execFile(filepath, ...inject) {
-  let ret = CoreUtils.loadFile(filepath);
-  if (is.class(ret) || CoreUtils.isBytecodeClass(ret)) {
-    ret = new ret(inject);
-  } else if (is.function(ret)) {
-    ret = ret(inject);
-  }
-
-  return ret;
-}
-
-// 模块的绝对路径
-function 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 }
-      console.warn(`[ee-core] [loader] resolveModule unknow filepath: ${files}`)
-      return undefined;
-    }
-  }
-
-  return fullpath;
-}
-
-// 获取electron目录下文件的绝对路径
-function getFullpath(filepath) {
-  let fullpath;
-  const isAbsolute = path.isAbsolute(filepath);
-  if (!isAbsolute) {
-    filepath = path.join(getElectronDir(), filepath);
-  }
-
-  fullpath = resolveModule(filepath);
-  if (!fs.existsSync(fullpath)) {
-    throw new Error(`[ee-core] [loader] getFullpath filepath ${filepath} not exists`);
-  }
-
-  return fullpath;
-}
-
-module.exports = {
-  loadFile,
-  execFile,
-  requireFile,
-  resolveModule,
-  getFullpath,
-}
-
-
-
-
-
-
-
-
+const is = require('is-type-of');
+const fs = require('fs');
+const path = require('path');
+const CoreUtils = require('../core/utils');
+const { getElectronDir } = require('../ps');
+
+// 加载单个文件(如果是函数，将被执行)
+function loadFile(filepath, ...inject) {
+  let fullpath = filepath;
+  const isAbsolute = path.isAbsolute(fullpath);
+  if (!isAbsolute) {
+    fullpath = path.join(getElectronDir(), fullpath);
+  }
+
+  fullpath = fullpath && resolveModule(fullpath);
+  if (!fs.existsSync(fullpath)) {
+    let errorMsg = `[ee-core] [loader/index] loadFile ${filepath} does not exist`;
+    throw new Error(errorMsg);
+  }
+
+  let ret = CoreUtils.loadFile(fullpath);
+  if (is.function(ret) && !is.class(ret) && !CoreUtils.isBytecodeClass(ret)) {
+    ret = ret(...inject);
+  }
+  return ret;
+}
+
+// requireFile
+function requireFile(filepath) {
+  return CoreUtils.loadFile(filepath);
+}
+
+// 加载并运行文件
+function execFile(filepath, ...inject) {
+  let ret = CoreUtils.loadFile(filepath);
+  if (is.class(ret) || CoreUtils.isBytecodeClass(ret)) {
+    ret = new ret(inject);
+  } else if (is.function(ret)) {
+    ret = ret(inject);
+  }
+
+  return ret;
+}
+
+// 模块的绝对路径
+function 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 }
+      console.warn(`[ee-core] [loader] resolveModule unknow filepath: ${files}`)
+      return undefined;
+    }
+  }
+
+  return fullpath;
+}
+
+// 获取electron目录下文件的绝对路径
+function getFullpath(filepath) {
+  let fullpath;
+  const isAbsolute = path.isAbsolute(filepath);
+  if (!isAbsolute) {
+    filepath = path.join(getElectronDir(), filepath);
+  }
+
+  fullpath = resolveModule(filepath);
+  if (!fs.existsSync(fullpath)) {
+    throw new Error(`[ee-core] [loader] getFullpath filepath ${filepath} not exists`);
+  }
+
+  return fullpath;
+}
+
+module.exports = {
+  loadFile,
+  execFile,
+  requireFile,
+  resolveModule,
+  getFullpath,
+}
+
+
+
+
+
+
+
+

package/log/index.d.ts

@@ -1,5 +1,5 @@
-import { EggLoggers, Logger } from "egg-logger";
-export declare function createLog(config: any): EggLoggers;
-export declare function loadLog(): EggLoggers;
-export declare const logger: Logger;
-export declare const coreLogger: Logger;
+import { EggLoggers, Logger } from "egg-logger";
+export declare function createLog(config: any): EggLoggers;
+export declare function loadLog(): EggLoggers;
+export declare const logger: Logger;
+export declare const coreLogger: Logger;

package/log/index.js

@@ -1,86 +1,86 @@
-'use strict';
-
-const dayjs = require('dayjs');
-const { create } = require('./logger');
-
-const Instance = {
-  eelog: null,
-  logger: {},
-  coreLogger: {},
-};
-let logDate = 0;
-const logProperties = ['error', 'warn', 'info', 'debug'];
-
-// define logger/coreLogger properties
-defineLoggerProperty();
-defineCoreLoggerProperty();
-
-// Create a log instance
-function createLog(config) {
-  _delCache();
-  const eeLog = create(config);
-
-  return eeLog;
-}
-
-function loadLog() {
-  Instance.eelog = createLog();
-  return Instance.eelog;
-}
-
-function defineLoggerProperty() {
-  for (const property of logProperties) {
-    Object.defineProperty(Instance.logger, property, {
-      get() {
-        //console.log('emit logger property: ', property);
-        let log = getLogger();
-        let val = log[property].bind(log);
-        return val;
-      },
-    });
-  }
-}
-
-function defineCoreLoggerProperty() {
-  for (const property of logProperties) {
-    Object.defineProperty(Instance.coreLogger, property, {
-      get() {
-        let log = getCoreLogger();
-        let val = log[property].bind(log);
-        return val;
-      },
-    });
-  }
-}
-
-function _delCache() {
-  const now = parseInt(dayjs().format('YYYYMMDD'));
-  if (logDate != now) {
-    logDate = now;
-    Instance.eelog = null;
-  }
-}
-
-function getLogger() {
-  _delCache();
-  if (!Instance.eelog) {
-    loadLog();
-  }
-  
-  return Instance.eelog["logger"];
-}
-
-function getCoreLogger() {
-  _delCache();
-  if (!Instance.eelog) {
-    loadLog();
-  }
-  return Instance.eelog["coreLogger"];
-}
-
-module.exports = {
-  createLog,
-  loadLog,
-  logger: Instance.logger,
-  coreLogger: Instance.coreLogger
+'use strict';
+
+const dayjs = require('dayjs');
+const { create } = require('./logger');
+
+const Instance = {
+  eelog: null,
+  logger: {},
+  coreLogger: {},
+};
+let logDate = 0;
+const logProperties = ['error', 'warn', 'info', 'debug'];
+
+// define logger/coreLogger properties
+defineLoggerProperty();
+defineCoreLoggerProperty();
+
+// Create a log instance
+function createLog(config) {
+  _delCache();
+  const eeLog = create(config);
+
+  return eeLog;
+}
+
+function loadLog() {
+  Instance.eelog = createLog();
+  return Instance.eelog;
+}
+
+function defineLoggerProperty() {
+  for (const property of logProperties) {
+    Object.defineProperty(Instance.logger, property, {
+      get() {
+        //console.log('emit logger property: ', property);
+        let log = getLogger();
+        let val = log[property].bind(log);
+        return val;
+      },
+    });
+  }
+}
+
+function defineCoreLoggerProperty() {
+  for (const property of logProperties) {
+    Object.defineProperty(Instance.coreLogger, property, {
+      get() {
+        let log = getCoreLogger();
+        let val = log[property].bind(log);
+        return val;
+      },
+    });
+  }
+}
+
+function _delCache() {
+  const now = parseInt(dayjs().format('YYYYMMDD'));
+  if (logDate != now) {
+    logDate = now;
+    Instance.eelog = null;
+  }
+}
+
+function getLogger() {
+  _delCache();
+  if (!Instance.eelog) {
+    loadLog();
+  }
+  
+  return Instance.eelog["logger"];
+}
+
+function getCoreLogger() {
+  _delCache();
+  if (!Instance.eelog) {
+    loadLog();
+  }
+  return Instance.eelog["coreLogger"];
+}
+
+module.exports = {
+  createLog,
+  loadLog,
+  logger: Instance.logger,
+  coreLogger: Instance.coreLogger
 };

package/log/logger.d.ts

@@ -1,2 +1,2 @@
-import { EggLoggers } from "egg-logger";
+import { EggLoggers } from "egg-logger";
 export declare function create(config?: {}): EggLoggers;

package/log/logger.js

@@ -1,95 +1,95 @@
-'use strict';
-
-const debug = require('debug')('ee-core:log:logger');
-const Loggers = require('egg-logger').EggLoggers;
-const dayjs = require('dayjs');
-const path = require('path');
-const { extend } = require('../utils/extend');
-const { getConfig } = require('../config');
-const { getLogDir, env, isDev } = require('../ps');
-
-let LogDate = 0;
-const TmpFileName = {
-  appLogName: '',
-  coreLogName: '',
-  errorLogName: '',
-}
-
-// 创建
-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;
-  }
-
-  if (Object.keys(opt).length == 0) {
-    throw new Error("logger config is null");
-  }
-
-  let rotateType = opt.logger.rotator;
-  if (rotateType == 'day') {
-    opt = _rotateByDay(opt);
-  }
-
-  debug('[create] opt:%j', opt);
-  const loggers = new Loggers(opt);
-
-  return loggers;
-}
-
-/**
- * 按天分割
- */
-function _rotateByDay(logOpt) {
-  const now = parseInt(dayjs().format('YYYYMMDD'));
-  if (LogDate != now) {
-    LogDate = now;
-
-    // 保存一个临时文件名，防止文件名按日期累加
-    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;
-    }
-
-    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;
-  }
-
-  return logOpt;
-}
-
-module.exports = {
-  create
+'use strict';
+
+const debug = require('debug')('ee-core:log:logger');
+const Loggers = require('egg-logger').EggLoggers;
+const dayjs = require('dayjs');
+const path = require('path');
+const { extend } = require('../utils/extend');
+const { getConfig } = require('../config');
+const { getLogDir, env, isDev } = require('../ps');
+
+let LogDate = 0;
+const TmpFileName = {
+  appLogName: '',
+  coreLogName: '',
+  errorLogName: '',
+}
+
+// 创建
+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;
+  }
+
+  if (Object.keys(opt).length == 0) {
+    throw new Error("logger config is null");
+  }
+
+  let rotateType = opt.logger.rotator;
+  if (rotateType == 'day') {
+    opt = _rotateByDay(opt);
+  }
+
+  debug('[create] opt:%j', opt);
+  const loggers = new Loggers(opt);
+
+  return loggers;
+}
+
+/**
+ * 按天分割
+ */
+function _rotateByDay(logOpt) {
+  const now = parseInt(dayjs().format('YYYYMMDD'));
+  if (LogDate != now) {
+    LogDate = now;
+
+    // 保存一个临时文件名，防止文件名按日期累加
+    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;
+    }
+
+    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;
+  }
+
+  return logOpt;
+}
+
+module.exports = {
+  create
 };

package/message/childMessage.d.ts

@@ -1,10 +1,10 @@
-export declare class ChildMessage {
-    // 向主进程发消息 for ChildJob 实例
-    sendToMain(eventName: string, params?: {}): boolean;
-    // 向主进程发消息 for task 实例
-    send(eventName: string, params: {}, receiver?: string): boolean;
-    // 进程退出
-    exit(code?: number): never;
-    // 发送错误到控制台
-    sendErrorToTerminal(err: any): void;
-}
+export declare class ChildMessage {
+    // 向主进程发消息 for ChildJob 实例
+    sendToMain(eventName: string, params?: {}): boolean;
+    // 向主进程发消息 for task 实例
+    send(eventName: string, params: {}, receiver?: string): boolean;
+    // 进程退出
+    exit(code?: number): never;
+    // 发送错误到控制台
+    sendErrorToTerminal(err: any): void;
+}