ee-core 2.11.1 → 4.0.0-beta.1

package/jobs/child/forkProcess.js

@@ -1,29 +1,29 @@
 const path = require('path');
 const EventEmitter = require('events');
-const { fork } = require('child_process');
 const serialize = require('serialize-javascript');
-const Log = require('../../log');
-const Ps = require('../../ps');
-const Channel = require('../../const/channel');
-const Helper = require('../../utils/helper');
-const Loader = require('../../loader');
+const { fork } = require('child_process');
+const { coreLogger } = require('../../log');
+const { getBaseDir, isPackaged, allEnv } = require('../../ps');
+const { Processes, Events, Receiver } = require('../../const/channel');
+const { getRandomString } = require('../../utils/helper');
+const { getFullpath } = require('../../loader');
+const { extend } = require('../../utils/extend');
 
 class ForkProcess {
   constructor(host, opt = {}) {
     
-    let cwd = Ps.getHomeDir();
-    let appPath = path.join(__dirname, 'app.js');
-    if (Ps.isPackaged()) {
+    const cwd = getBaseDir();
+    const appPath = path.join(__dirname, 'app.js');
+    if (isPackaged()) {
       // todo fork的cwd目录为什么要在app.asar外 ？
-      cwd = path.join(Ps.getHomeDir(), '..');
+      cwd = path.join(getBaseDir(), '..');
     }
 
-    // TODO Object.assign 只能单层对象结构，多层的对象会直接覆盖
-    let options = Object.assign({
+    const options = extend(true, {
       processArgs: {},
       processOptions: { 
         cwd: cwd,
-        env: Ps.allEnv(), 
+        env: allEnv(), 
         stdio: 'ignore' // pipe
       }
     }, opt);
@@ -48,15 +48,15 @@ class ForkProcess {
     const { messageLog } = this.host.config;
     this.child.on('message', (m) => {
       if (messageLog == true) {
-        Log.coreLogger.info(`[ee-core] [jobs/child] received a message from child-process, message: ${serialize(m)}`);
+        coreLogger.info(`[ee-core] [jobs/child] received a message from child-process, message: ${serialize(m)}`);
       }
       
-      if (m.channel == Channel.process.showException) {
-        Log.coreLogger.error(`${m.data}`);
+      if (m.channel == Processes.showException) {
+        coreLogger.error(`${m.data}`);
       }
 
       // 收到子进程消息，转发到 event 
-      if (m.channel == Channel.process.sendToMain) {
+      if (m.channel == Processes.sendToMain) {
         this._eventEmit(m);
       }
     });
@@ -65,16 +65,16 @@ class ForkProcess {
       let data = {
         pid: this.pid
       }
-      this.host.emit(Channel.events.childProcessExit, data);
-      Log.coreLogger.info(`[ee-core] [jobs/child] received a exit from child-process, code:${code}, signal:${signal}, pid:${this.pid}`);
+      this.host.emit(Events.childProcessExit, data);
+      coreLogger.info(`[ee-core] [jobs/child] received a exit from child-process, code:${code}, signal:${signal}, pid:${this.pid}`);
     });
 
     this.child.on('error', (err) => {
       let data = {
         pid: this.pid
       }
-      this.host.emit(Channel.events.childProcessError, data);
-      Log.coreLogger.error(`[ee-core] [jobs/child] received a error from child-process, error: ${err}, pid:${this.pid}`);
+      this.host.emit(Events.childProcessError, data);
+      coreLogger.error(`[ee-core] [jobs/child] received a error from child-process, error: ${err}, pid:${this.pid}`);
     });
   }
 
@@ -83,10 +83,10 @@ class ForkProcess {
    */
   _eventEmit(m) {
     switch (m.eventReceiver) {
-      case Channel.receiver.forkProcess:
+      case Receiver.forkProcess:
         this.emitter.emit(m.event, m.data);
         break;
-      case Channel.receiver.childJob:
+      case Receiver.childJob:
         this.host.emit(m.event, m.data);
         break;    
       default:
@@ -101,7 +101,7 @@ class ForkProcess {
    */
   dispatch(cmd, jobPath = '', ...params) {
     // 消息对象
-    const mid = Helper.getRandomString();
+    const mid = getRandomString();
     let msg = {
       mid,
       cmd,
@@ -118,10 +118,10 @@ class ForkProcess {
    * 调用job的方法
    */
   callFunc(jobPath = '', funcName = '', ...params) {
-    jobPath = Loader.getFullpath(jobPath);
+    jobPath = getFullpath(jobPath);
 
     // 消息对象
-    const mid = Helper.getRandomString();
+    const mid = getRandomString();
     let msg = {
       mid,
       cmd:'run',
@@ -142,24 +142,8 @@ class ForkProcess {
       this.child.kill('SIGKILL');
     }, timeout)
   }
-
-  /**
-   * sleep (仅Unix平台)
-   */
-  sleep() {
-    if (this.sleeping) return;
-    process.kill(this.pid, 'SIGSTOP');
-    this.sleeping = true;
-  }
-  
-  /**
-   * wakeup (仅Unix平台)
-   */
-  wakeup() {
-    if (!this.sleeping) return;
-    process.kill(this.pid, 'SIGCONT');
-    this.sleeping = false;
-  }
 }
 
-module.exports = ForkProcess;
+module.exports = {
+  ForkProcess
+};

package/jobs/child/index.js

@@ -1,8 +1,9 @@
 const EventEmitter = require('events');
-const ForkProcess = require('./forkProcess');
-const Loader = require('../../loader');
-const Channel = require('../../const/channel');
-const Conf = require('../../config/cache');
+const { ForkProcess } = require('./forkProcess');
+const { getFullpath } = require('../../loader');
+const { Events } = require('../../const/channel');
+const { getConfig } = require('../../config');
+const { extend } = require('../../utils/extend');
 
 class ChildJob extends EventEmitter {
 
@@ -11,7 +12,7 @@ class ChildJob extends EventEmitter {
     this.jobs = {};
     this.config = {};
 
-    const cfg = Conf.getValue('jobs');
+    const cfg = getConfig().jobs;
     if (cfg) {
       this.config = cfg;
     }
@@ -23,10 +24,10 @@ class ChildJob extends EventEmitter {
    * 初始化监听
    */  
   _initEvents() {
-    this.on(Channel.events.childProcessExit, (data) => {
+    this.on(Events.childProcessExit, (data) => {
       delete this.jobs[data.pid];
     });
-    this.on(Channel.events.childProcessError, (data) => {
+    this.on(Events.childProcessError, (data) => {
       delete this.jobs[data.pid];
     });
   }
@@ -35,7 +36,7 @@ class ChildJob extends EventEmitter {
    * 执行一个job文件
    */  
   exec(filepath, params = {}, opt = {}) {
-    const jobPath = Loader.getFullpath(filepath);
+    const jobPath = getFullpath(filepath);
     const proc = this.createProcess(opt);
     const cmd = 'run';
     proc.dispatch(cmd, jobPath, params);
@@ -47,7 +48,7 @@ class ChildJob extends EventEmitter {
    * 创建子进程
    */  
   createProcess(opt = {}) {
-    let options = Object.assign({
+    const options = extend(true, {
       processArgs: {
         type: 'childJob'
       }
@@ -79,4 +80,6 @@ class ChildJob extends EventEmitter {
 
 }
 
-module.exports = ChildJob;
+module.exports = {
+  ChildJob
+};

package/jobs/child-pool/index.js

@@ -1,10 +1,10 @@
 const EventEmitter = require('events');
 const LoadBalancer = require('../load-balancer');
-const Loader = require('../../loader');
-const ForkProcess = require('../child/forkProcess');
-const Channel = require('../../const/channel');
-const Helper = require('../../utils/helper');
-const Conf = require('../../config/cache');
+const { getFullpath } = require('../../loader');
+const { ForkProcess } = require('../child/forkProcess');
+const { Events } = require('../../const/channel');
+const { validValue } = require('../../utils/helper');
+const { getConfig } = require('../../config');
 
 class ChildPoolJob extends EventEmitter {
 
@@ -21,7 +21,7 @@ class ChildPoolJob extends EventEmitter {
     this.max = 6;
     this.strategy = 'polling';
     this.weights = new Array(this.max).fill().map((v, i) => {
-      let w = Helper.validValue(options.weights[i]) ? options.weights[i] : 1
+      let w = validValue(options.weights[i]) ? options.weights[i] : 1
       return w;
     });
 
@@ -31,7 +31,7 @@ class ChildPoolJob extends EventEmitter {
     }
     this.LB = new LoadBalancer(lbOpt);
 
-    const cfg = Conf.getValue('jobs');
+    const cfg = getConfig().jobs;
     if (cfg) {
       this.config = cfg;
     }
@@ -43,10 +43,10 @@ class ChildPoolJob extends EventEmitter {
    * 初始化监听
    */  
   _initEvents() {
-    this.on(Channel.events.childProcessExit, (data) => {
+    this.on(Events.childProcessExit, (data) => {
       this._removeChild(data.pid);
     });
-    this.on(Channel.events.childProcessError, (data) => {
+    this.on(Events.childProcessError, (data) => {
       this._removeChild(data.pid);
     });
   }
@@ -115,7 +115,7 @@ class ChildPoolJob extends EventEmitter {
    * 执行一个job文件
    */  
   run(filepath, params = {}) {
-    const jobPath = Loader.getFullpath(filepath);
+    const jobPath = getFullpath(filepath);
     const childProcess = this.getChild();
     childProcess.dispatch('run', jobPath, params);
 
@@ -210,4 +210,6 @@ class ChildPoolJob extends EventEmitter {
   }
 }
 
-module.exports = ChildPoolJob;
+module.exports = {
+  ChildPoolJob
+};

package/jobs/index.js

@@ -1,9 +1,7 @@
-const ChildJob = require('./child');
-const RendererJob = require('./renderer');
-const ChildPoolJob = require('./child-pool');
+const { ChildJob } = require('./child');
+const { ChildPoolJob } = require('./child-pool');
 
 module.exports = {
   ChildJob,
-  RendererJob,
   ChildPoolJob
 };

package/loader/index.js

@@ -1,163 +1,110 @@
 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 = {
+const CoreUtils = require('../core/utils');
+const { getElectronDir } = require('../ps');
+
+/**
+ * 加载单个文件(如果是函数，将被执行)
+ *
+ * @param {String} filepath - fullpath
+ * @param {Array} inject - pass rest arguments into the function when invoke
+ * @return {Object} exports
+ */
+function loadFile(filepath, ...inject) {
+  const isAbsolute = path.isAbsolute(filepath);
+  if (!isAbsolute) {
+    filepath = path.join(getElectronDir(), filepath);
+  }
 
-  /**
-   * 加载单个文件(如果是函数，将被执行)
-   *
-   * @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 && resolveModule(filepath);
+  if (!fs.existsSync(filepath)) {
+    let errorMsg = `[ee-core] [loader/index] loadFile ${filepath} does not exist`;
+    throw new Error(errorMsg);
+  }
 
-    filepath = filepath && this.resolveModule(filepath);
-    if (!fs.existsSync(filepath)) {
-      let errorMsg = `[ee-core] [loader/index] loadOneFile ${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;
+}
 
-    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`;
-      throw new Error(errMsg);
-    }
+// requireFile
+function requireFile(filepath) {
+  return CoreUtils.loadFile(filepath);
+}
 
-    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`;
-      throw new Error(errMsg);
-    }
+/**
+ * 加载并运行文件
+ *
+ * @param {String} filepath - fullpath
+ * @param {Array} inject - pass rest arguments into the function when invoke
+ * @return {Any}
+ */
+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);
+  }
 
-    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;
+}
 
-    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 }
-        console.warn(`[ee-core] [loader] resolveModule unknow filepath: ${files}`)
-        return undefined;
-      }
+/**
+ * 模块的绝对路径
+ * @param {String} filepath - fullpath
+ */
+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';
     }
 
-    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);
+    if (!fs.existsSync(filepath) && !fs.existsSync(fullpath)) {
+      let files = { filepath, fullpath }
+      console.warn(`[ee-core] [loader] resolveModule unknow filepath: ${files}`)
+      return undefined;
     }
+  }
 
-    fullpath = this.resolveModule(filepath);
-    if (!fs.existsSync(fullpath)) {
-      let errorMsg = `[ee-core] [loader] requireModule filepath: ${filepath} does not exist`;
-      throw new 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);
-    }
+  return fullpath;
+}
 
-    fullpath = this.resolveModule(filepath);
-    if (!fs.existsSync(fullpath)) {
-      throw new Error(`[ee-core] [loader] getFullpath filepath ${fullpath} not exists`);
-    }
+/**
+ * 获取electron目录下文件的绝对路径
+ * @param {String} filepath - fullpath
+ */
+function getFullpath(filepath) {
+  let fullpath;
+  const isAbsolute = path.isAbsolute(filepath);
+  if (!isAbsolute) {
+    filepath = path.join(getElectronDir(), filepath);
+  }
 
-    return fullpath;
+  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.js

@@ -1,69 +1,86 @@
-const dayjs = require('dayjs');
-const Logger = require('./logger');
-const EELoggers = Symbol('EeApplication#EELoggers');
-let LogDate = 0;
+'use strict';
 
-const Log = {
-  /**
-   * 创建日志实例
-   */
-  create(config) {
-    this._delCache();
-    const eeLog = Logger.create(config);
+const dayjs = require('dayjs');
+const { create } = require('./logger');
 
-    return eeLog;
-  },
+const Instance = {
+  eelog: null,
+  logger: {},
+  coreLogger: {},
+};
+let logDate = 0;
+const logProperties = ['error', 'warn', 'info', 'debug'];
 
-  /**
-   * delete cache
-   */
-  _delCache() {
-    let now = parseInt(dayjs().format('YYYYMMDD'));
-    if (LogDate != now) {
-      LogDate = now;
-      this[EELoggers] = null;
-    }
-  },
+// define logger/coreLogger properties
+defineLoggerProperty();
+defineCoreLoggerProperty();
 
-  /**
-   * logger
-   */
-  get logger() {
-    this._delCache();
-    if (!this[EELoggers]) {
-      this[EELoggers] = Logger.create();
-    }
+// Create a log instance
+function createLog(config) {
+  _delCache();
+  const eeLog = create(config);
 
-    return this[EELoggers]['logger'] || null;
-  },
+  return eeLog;
+}
 
-  /**
-   * coreLogger
-   */
-  get coreLogger () {
-    this._delCache();
-    if (!this[EELoggers]) {
-      this[EELoggers] = Logger.create();
-    }
+function loadLog() {
+  Instance.eelog = createLog();
+  return Instance.eelog;
+}
 
-    return this[EELoggers]['coreLogger'] || null;
-  },
+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;
+      },
+    });
+  }
+}
 
-  get error() {
-    return this.logger.error.bind(this.logger);
-  },
+function defineCoreLoggerProperty() {
+  for (const property of logProperties) {
+    Object.defineProperty(Instance.coreLogger, property, {
+      get() {
+        let log = getCoreLogger();
+        let val = log[property].bind(log);
+        return val;
+      },
+    });
+  }
+}
 
-  get warn() {
-    return this.logger.warn.bind(this.logger);
-  },
+function _delCache() {
+  const now = parseInt(dayjs().format('YYYYMMDD'));
+  if (logDate != now) {
+    logDate = now;
+    Instance.eelog = null;
+  }
+}
 
-  get info() {
-    return this.logger.info.bind(this.logger);
-  },
+function getLogger() {
+  _delCache();
+  if (!Instance.eelog) {
+    loadLog();
+  }
+  
+  return Instance.eelog["logger"];
+}
 
-  get debug() {
-    return this.logger.debug.bind(this.logger);
-  },
-};
+function getCoreLogger() {
+  _delCache();
+  if (!Instance.eelog) {
+    loadLog();
+  }
+  return Instance.eelog["coreLogger"];
+}
 
-module.exports = Log;
+module.exports = {
+  createLog,
+  loadLog,
+  logger: Instance.logger,
+  coreLogger: Instance.coreLogger
+};