ee-core 2.0.3 → 2.1.0-beta.3

package/bin/tools.js

@@ -16,3 +16,7 @@ if (cmd == 'rd') {
 if (cmd == 'encrypt') {
   encrypt.run();
 }
+
+if (cmd == 'clean') {
+  encrypt.clean();
+}

package/config/config.default.js

@@ -282,5 +282,14 @@ module.exports = appInfo => {
     }
   }; 
 
+  /**
+   * 异常捕获
+   */
+  config.exception = {
+    mainExit: false,
+    childExit: true,
+    rendererExit: true,
+  };
+
   return config;
 };

package/const/channel.js

@@ -5,5 +5,14 @@ module.exports = {
   },
   socketIo: {
     partySoftware: 'c1',
-  },  
+  },
+  events: {
+    childProcessExit: 'ee#childProcess#exit',
+    childProcessError: 'ee#childProcess#error',
+  },
+  receiver: {
+    childJob: 'job',
+    forkProcess: 'task',
+    all: 'all'
+  }
 };

package/core/lib/ee.js

@@ -2,7 +2,7 @@ const assert = require('assert');
 const fs = require('fs');
 const KoaApplication = require('koa');
 const is = require('is-type-of');
-const co = require('co');
+const co = require('../../utils/co');
 const BaseContextClass = require('./utils/base_context_class');
 const utils = require('./utils');
 const Timing = require('./utils/timing');

package/core/lib/loader/file_loader.js

@@ -6,11 +6,11 @@ const debug = require('debug')('ee-core:fileLoader');
 const path = require('path');
 const globby = require('globby');
 const is = require('is-type-of');
-const deprecate = require('depd')('ee');
+const deprecate = require('../../../utils/depd')('ee');
 const Utils = require('../utils');
 const FULLPATH = Symbol('EE_LOADER_ITEM_FULLPATH');
 const EXPORTS = Symbol('EE_LOADER_ITEM_EXPORTS');
-const Addon = require('../../../addon');
+//const Addon = require('../../../addon');
 
 const defaults = {
   directory: null,

package/core/lib/loader/mixin/config.js

@@ -2,7 +2,7 @@
 
 const debug = require('debug')('ee-core:config');
 const path = require('path');
-const extend = require('extend2');
+const extend = require('../../../../utils/extend');
 const assert = require('assert');
 const { Console } = require('console');
 

package/core/lib/utils/index.js

@@ -5,7 +5,7 @@ const convert = require('koa-convert');
 const is = require('is-type-of');
 const path = require('path');
 const fs = require('fs');
-const co = require('co');
+const co = require('../../../utils/co');
 const BuiltinModule = require('module');
 
 // Guard against poorly mocked module constructors.

package/ee/eeApp.js

@@ -1,7 +1,6 @@
 const path = require('path');
 const fs = require('fs');
 const assert = require('assert');
-const getPort = require('get-port');
 const { app } = require('electron');
 const is = require('is-type-of');
 const Koa = require('koa');
@@ -12,7 +11,8 @@ const Log = require('../log');
 const Electron = require('../electron');
 const Conf = require('../config');
 const Ps = require('../ps');
-const Socket = require('../socket')
+const Socket = require('../socket');
+const GetPort = require('../utils/get-port');
 
 class EeApp extends BaseApp {
   constructor(options = {}) {
@@ -26,18 +26,18 @@ class EeApp extends BaseApp {
    * 生成端口
    */
   async createPorts () {
-    const mainPort = await getPort({port: this.config.mainServer.port});
+    const mainPort = await GetPort({port: this.config.mainServer.port});
     process.env.EE_MAIN_PORT = mainPort;
     this.config.mainServer.port = mainPort;
 
     if (this.config.socketServer.enable) {
-      const socketPort = await getPort({port: this.config.socketServer.port});
+      const socketPort = await GetPort({port: this.config.socketServer.port});
       process.env.EE_SOCKET_PORT = socketPort;
       this.config.socketServer.port = socketPort;
     }
     
     if (this.config.httpServer.enable) {
-      const httpPort = await getPort({port: this.config.httpServer.port});
+      const httpPort = await GetPort({port: this.config.httpServer.port});
       process.env.EE_HTTP_PORT = httpPort;
       this.config.httpServer.port = httpPort;
     }
@@ -119,7 +119,8 @@ class EeApp extends BaseApp {
       if (this.mainWindow.isMinimized()) {
         this.mainWindow.restore();
       }
-      this.mainWindow.show()
+      this.mainWindow.show();
+      this.mainWindow.focus();
     }
   }
 
@@ -267,7 +268,7 @@ class EeApp extends BaseApp {
   }
 
   /**
-   * 捕获异常
+   * 捕获异常（废弃）
    */
   async catchLog () {
     process.on('uncaughtException', function(err) {

package/exception/index.js

@@ -1,6 +1,7 @@
 const Log = require('../log');
 const Ps = require('../ps');
-const Channel = require('../const/channel');
+const Conf = require('../config');
+const Message = require('../message');
 
 /**
  * 捕获异常
@@ -25,7 +26,9 @@ exports.uncaughtExceptionHandler = function() {
 
     Log.coreLogger.error(err);
 
-    devError(err);
+    _devError(err);
+
+    _exit();
   });
 }
 
@@ -64,22 +67,47 @@ exports.unhandledRejectionHandler = function() {
 
     Log.coreLogger.error(err);
 
-    devError(err);
+    _devError(err);
+
+    _exit();
   });
 }
 
 /**
  * 如果是子进程，发送错误到主进程控制台
  */
-function devError (err) {
+function _devError (err) {
   if (Ps.isForkedChild() && Ps.isDev()) {
-    let msgChannel = Channel.process.showException;
-    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: msgChannel,
-      data: errTips
-    }
-    process.send(message);
+    Message.childMessage.sendErrorToTerminal(err);
+  }
+}
+
+/**
+ * 捕获异常后是否退出
+ */
+function _exit () {
+  let cfg = Conf.getValue('exception');
+  if (!cfg) {
+    return;
+  }
+
+  if (Ps.isMain() && cfg.mainExit == true) {
+    _delayExit();
+  } else if (Ps.isForkedChild() && cfg.childExit == true) {
+    _delayExit();
+  } else if (Ps.isRenderer() && cfg.rendererExit == true) {
+    _delayExit();
+  } else {
+    // other
   }
+}
+
+/**
+ * 捕获异常后是否退出
+ */
+function _delayExit() {
+  // 等待日志等异步写入完成
+  setTimeout(() => {
+    process.exit();
+  }, 1500)
 }

package/httpclient/index.js

@@ -1,10 +1,10 @@
 const Agent = require('agentkeepalive');
 const HttpsAgent = require('agentkeepalive').HttpsAgent;
 const urllib = require('urllib');
-const ms = require('humanize-ms');
 const { FrameworkBaseError } = require('egg-errors');
 const Conf = require('../config');
 const Log = require('../log');
+const Time = require('../utils/time');
 
 class HttpClientError extends FrameworkBaseError {
   get module() {
@@ -50,14 +50,6 @@ class HttpClient extends urllib.HttpClient2 {
     this.config = config;
   }
 
-  /**
-   * 获取 coredb
-   */
-  _getCoreDB() {
-    const coreDB = Storage.connection('system');
-    return coreDB;
-  }  
-
   request(url, args, callback) {
     if (typeof args === 'function') {
       callback = args;
@@ -116,7 +108,7 @@ function normalizeConfig(httpConfig) {
     config.httpsAgent.keepAlive = config.keepAlive;
   }
   if (config.timeout) {
-    config.timeout = ms(config.timeout);
+    config.timeout = Time.ms(config.timeout);
     config.httpAgent.timeout = config.timeout;
     config.httpsAgent.timeout = config.timeout;
   }
@@ -126,7 +118,7 @@ function normalizeConfig(httpConfig) {
     delete config.freeSocketKeepAliveTimeout;
   }
   if (config.freeSocketTimeout) {
-    config.freeSocketTimeout = ms(config.freeSocketTimeout);
+    config.freeSocketTimeout = Time.ms(config.freeSocketTimeout);
     config.httpAgent.freeSocketTimeout = config.freeSocketTimeout;
     config.httpsAgent.freeSocketTimeout = config.freeSocketTimeout;
   } else {
@@ -162,7 +154,7 @@ function normalizeConfig(httpConfig) {
   }
 
   if (typeof config.request.timeout === 'string') {
-    config.request.timeout = ms(config.request.timeout);
+    config.request.timeout = Time.ms(config.request.timeout);
   }
 }
 

package/index.js

@@ -30,7 +30,7 @@ const Storage = require('./storage');
  * @member {Utils}
  * @since 1.0.0
  */
-const Utils = require('./oldUtils');
+const Utils = require('./old-utils');
 
 /**
  * @member {Socket}

package/jobs/child/app.js

@@ -13,6 +13,7 @@ const UtilsCore = require('ee-core/core/lib/utils');
 // const UtilsCore = require('../../core/lib/utils');
 
 Exception.start();
+const commands = ['run'];
 
 class ChildApp {
   constructor() {
@@ -24,7 +25,7 @@ class ChildApp {
    */
   _initEvents() {
     process.on('message', this._handleMessage.bind(this));
-    process.on('exit', (code) => {
+    process.once('exit', (code) => {
       Log.coreLogger.info(`[ee-core] [jobs/child] received a exit from main-process, code:${code}, pid:${process.pid}`);
     });
   }
@@ -33,7 +34,15 @@ class ChildApp {
    * 监听消息
    */
   _handleMessage(m) {
-    this.run(m);
+    if (commands.indexOf(m.cmd) == -1) {
+      return
+    }
+    switch (m.cmd) {
+      case 'run':
+        this.run(m);
+        break;
+      default:
+    }
     Log.coreLogger.info(`[ee-core] [jobs/child] received a message from main-process, message: ${JSON.stringify(m)}`);
   }
 

package/jobs/child/forkProcess.js

@@ -1,9 +1,11 @@
 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');
 
 class ForkProcess {
   constructor(host, opt = {}) {
@@ -16,6 +18,7 @@ class ForkProcess {
     }
 
     let options = Object.assign({
+      processArgs: {},
       processOptions: { 
         cwd: cwd,
         env: Ps.allEnv(), 
@@ -23,12 +26,13 @@ class ForkProcess {
       }
     }, opt);
 
+    this.emitter = new EventEmitter();
     this.host = host;
     this.args = [];
     this.sleeping = false;
 
     // 传递给子进程的参数
-    //this.args.push(JSON.stringify(options.params));
+    this.args.push(JSON.stringify(options.processArgs));
 
     this.child = fork(appPath, this.args, options.processOptions);
     this.pid = this.child.pid;
@@ -36,7 +40,7 @@ class ForkProcess {
   }
 
   /**
-   * 进程初始化
+   * 初始化事件监听
    */
   _init() {
     this.child.on('message', (m) => {
@@ -47,20 +51,91 @@ class ForkProcess {
 
       // 收到子进程消息，转发到 event 
       if (m.channel == Channel.process.sendToMain) {
-        this.host.emit(m.event, m.data);
+        this._eventEmit(m);
       }
-
     });
 
     this.child.on('exit', (code, signal) => {
-      Log.coreLogger.info(`[ee-core] [jobs/child] received a exit from child-process, code:${code}, signal:${signal}`);
+      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.child.on('error', (err) => {
-      Log.coreLogger.error(`[ee-core] [jobs/child] received a error from child-process, 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}`);
     });
   }
 
+  /**
+   * event emit
+   */
+  _eventEmit(m) {
+    switch (m.eventReceiver) {
+      case Channel.receiver.forkProcess:
+        this.emitter.emit(m.event, m.data);
+        break;
+      case Channel.receiver.childJob:
+        this.host.emit(m.event, m.data);
+        break;    
+      default:
+        this.host.emit(m.event, m.data);
+        this.emitter.emit(m.event, m.data);
+        break;
+    }
+  }
+  
+  /**
+   * 分发任务
+   */
+  dispatch(cmd, jobPath = '', params = {}) {
+    // 消息对象
+    const mid = Helper.getRandomString();
+    let msg = {
+      mid,
+      cmd,
+      jobPath,
+      jobParams: params
+    }
+
+    // todo 是否会发生监听未完成时，接收不到消息？
+    // 发消息到子进程
+    this.child.send(msg);
+  }
+
+  /**
+   * kill
+   */
+  kill(timeout = 1000) {
+    this.child.kill('SIGINT');
+    setTimeout(() => {
+      if (this.child.killed) return;
+      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;

package/jobs/child/index.js

@@ -1,76 +1,72 @@
 const EventEmitter = require('events');
-const path = require('path');
-const fs = require('fs');
 const ForkProcess = require('./forkProcess');
-const Ps = require('../../ps');
 const Loader = require('../../loader');
-const Helper = require('../../utils/helper');
+const Channel = require('../../const/channel');
 
 class ChildJob extends EventEmitter {
 
   constructor() {
     super();
-    this.initEvents();
+    this.jobs = {};
+    this._initEvents();
   }
 
   /**
    * 初始化监听
    */  
-  initEvents = () => {
-
-    // this.on('forked_message', ({data, id}) => {
-    //   this.onMessage({data, id});
-    // });
+  _initEvents() {
+    this.on(Channel.events.childProcessExit, (data) => {
+      delete this.jobs[data.pid];
+    });
+    this.on(Channel.events.childProcessError, (data) => {
+      delete this.jobs[data.pid];
+    });
   }
 
   /**
    * 执行一个job文件
    */  
   exec(filepath, params = {}, opt = {}) {
-    const jobPath = this._getFullpath(filepath);
-
-    // 消息对象
-    const mid = Helper.getRandomString();
-    let msg = {
-      mid,
-      jobPath,
-      jobParams: params
-    }
-
-    let subProcess = new ForkProcess(this, opt);
-
-    // todo 是否会发生监听未完成时，接收不到消息？
-    // 发消息到子进程
-    subProcess.child.send(msg);
+    const jobPath = Loader.getFullpath(filepath);
+    const proc = this.createProcess(opt);
+    const cmd = 'run';
+    proc.dispatch(cmd, jobPath, params);
   
-    return subProcess;
+    return proc;
   }
 
   /**
-   * todo 运行job
+   * 创建子进程
    */  
-  run(name, filepath, opt = {}) {
-    let times = opt.times || 1;
-
-    for (let i = 1; i <= times; i++) {
-      this.exec(filepath, opt);
+  createProcess(opt = {}) {
+    let options = Object.assign({
+      processArgs: {
+        type: 'childJob'
+      }
+    }, opt);
+    const proc = new ForkProcess(this, options);
+    if (!proc) {
+      let errorMessage = `[ee-core] [jobs/child] Failed to obtain the child process !`
+      throw new Error(errorMessage);
     }
-  
-    return;
-  }
+    this.jobs[proc.pid] = proc;
 
-  _getFullpath(filepath) {
-    const isAbsolute = path.isAbsolute(filepath);
-    if (!isAbsolute) {
-      filepath = path.join(Ps.getBaseDir(), filepath);
-    }
+    return proc;
+  }
 
-    const fullpath = Loader.resolveModule(filepath);
-    if (!fs.existsSync(fullpath)) {
-      throw new Error(`[ee-core] [jobs/child] file ${fullpath} not exists`);
-    }
+  /**
+   * 获取当前pids
+   */  
+  getPids() {
+    let pids = Object.keys(this.jobs);
+    return pids;
+  }  
 
-    return fullpath;
+  /**
+   * 异步执行一个job文件 todo this指向
+   */
+  async execPromise(filepath, params = {}, opt = {}) {
+    return this.exec(filepath, params, opt);
   }
 
 }