ee-core 2.9.2-beta.1 → 2.10.0

package/index.js

@@ -1,55 +1,55 @@
-/**
- * @namespace EeCore
- */
-
-/**
- * @member {ElectronEgg} EeCore#Index
- * @since 1.0.0
- */
-const ElectronEgg = require('./main');
-
-/**
- * @member {app} EeCore#app
- * @since 1.0.0
- */
-const EE = require('./ee');
-
-/**
- * @member {Controller} EeCore#Controller
- * @since 1.0.0
- */
-const Controller = require('./controller/baseContextClass');
-
-/**
- * @member {Service} EeCore#Service
- * @since 1.0.0
- */
-const Service = require('./services/baseContextClass');
-
-/**
- * @member {Storage}
- * @since 1.0.0
- */
-const Storage = require('./storage');
-
-/**
- * @member {Utils}
- * @since 1.0.0
- */
-const Utils = require('./old-utils');
-
-/**
- * @member {Socket}
- * @since 1.0.0
- */
-const Socket = require('./socket');
-
-module.exports = {
-  ElectronEgg,
-  Application: EE.Application,
-  Controller,
-  Service,
-  Storage,
-  Socket,
-  Utils
+/**
+ * @namespace EeCore
+ */
+
+/**
+ * @member {ElectronEgg} EeCore#Index
+ * @since 1.0.0
+ */
+const ElectronEgg = require('./main');
+
+/**
+ * @member {app} EeCore#app
+ * @since 1.0.0
+ */
+const EE = require('./ee');
+
+/**
+ * @member {Controller} EeCore#Controller
+ * @since 1.0.0
+ */
+const Controller = require('./controller/baseContextClass');
+
+/**
+ * @member {Service} EeCore#Service
+ * @since 1.0.0
+ */
+const Service = require('./services/baseContextClass');
+
+/**
+ * @member {Storage}
+ * @since 1.0.0
+ */
+const Storage = require('./storage');
+
+/**
+ * @member {Utils}
+ * @since 1.0.0
+ */
+const Utils = require('./old-utils');
+
+/**
+ * @member {Socket}
+ * @since 1.0.0
+ */
+const Socket = require('./socket');
+
+module.exports = {
+  ElectronEgg,
+  Application: EE.Application,
+  Controller,
+  Service,
+  Storage,
+  Socket,
+  Utils
 };

package/jobs/baseJobClass.js

@@ -1,16 +1,16 @@
-/**
- * BaseJobClass
- */
-class BaseJobClass {
-
-  /**
-   * @class
-   * @param {Object} params - job基础类
-   * @since 1.0.0
-   */
-  constructor(params = {}) {
-    // todo
-  }
-}
-
-module.exports = BaseJobClass;
+/**
+ * BaseJobClass
+ */
+class BaseJobClass {
+
+  /**
+   * @class
+   * @param {Object} params - job基础类
+   * @since 1.0.0
+   */
+  constructor(params = {}) {
+    // todo
+  }
+}
+
+module.exports = BaseJobClass;

package/jobs/child/app.js

@@ -1,66 +1,66 @@
-
-const is = require('is-type-of');
-const Exception = require('ee-core/exception');
-const Loader = require('ee-core/loader');
-const Log = require('ee-core/log');
-const UtilsCore = require('ee-core/core/lib/utils');
-
-// 开发环境下，ee-core是soft link
-// /node_modules[\\/]electron[\\/]/.test(process.execPath)
-// const Exception = require('../../exception');
-// const Loader = require('../../loader');
-// const Log = require('../../log');
-// const UtilsCore = require('../../core/lib/utils');
-
-Exception.start();
-const commands = ['run'];
-
-class ChildApp {
-  constructor() {
-    this._initEvents();
-  }
-
-  /**
-   * 初始化事件监听
-   */
-  _initEvents() {
-    process.on('message', this._handleMessage.bind(this));
-    process.once('exit', (code) => {
-      Log.coreLogger.info(`[ee-core] [jobs/child] received a exit from main-process, code:${code}, pid:${process.pid}`);
-    });
-  }
-
-  /**
-   * 监听消息
-   */
-  _handleMessage(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)}`);
-  }
-
-  /**
-   * 运行脚本
-   */  
-  run(msg = {}) {
-    let filepath = msg.jobPath;
-    let params = msg.jobParams;
-
-    let mod = Loader.loadJsFile(filepath);
-    if (is.class(mod) || UtilsCore.isBytecodeClass(mod)) {
-      let jobClass = new mod(params);
-      jobClass.handle();
-    } else if (is.function(mod)) {
-      mod(params);
-    }
-  }
-}
-
+
+const is = require('is-type-of');
+const Exception = require('ee-core/exception');
+const Loader = require('ee-core/loader');
+const Log = require('ee-core/log');
+const UtilsCore = require('ee-core/core/lib/utils');
+
+// 开发环境下，ee-core是soft link
+// /node_modules[\\/]electron[\\/]/.test(process.execPath)
+// const Exception = require('../../exception');
+// const Loader = require('../../loader');
+// const Log = require('../../log');
+// const UtilsCore = require('../../core/lib/utils');
+
+Exception.start();
+const commands = ['run'];
+
+class ChildApp {
+  constructor() {
+    this._initEvents();
+  }
+
+  /**
+   * 初始化事件监听
+   */
+  _initEvents() {
+    process.on('message', this._handleMessage.bind(this));
+    process.once('exit', (code) => {
+      Log.coreLogger.info(`[ee-core] [jobs/child] received a exit from main-process, code:${code}, pid:${process.pid}`);
+    });
+  }
+
+  /**
+   * 监听消息
+   */
+  _handleMessage(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)}`);
+  }
+
+  /**
+   * 运行脚本
+   */  
+  run(msg = {}) {
+    let filepath = msg.jobPath;
+    let params = msg.jobParams;
+
+    let mod = Loader.loadJsFile(filepath);
+    if (is.class(mod) || UtilsCore.isBytecodeClass(mod)) {
+      let jobClass = new mod(params);
+      jobClass.handle();
+    } else if (is.function(mod)) {
+      mod(params);
+    }
+  }
+}
+
 new ChildApp();

package/jobs/child/forkProcess.js

@@ -1,146 +1,146 @@
-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 = {}) {
-    
-    let cwd = Ps.getHomeDir();
-    let appPath = path.join(__dirname, 'app.js');
-    if (Ps.isPackaged()) {
-      // todo fork的cwd目录为什么要在app.asar外 ？
-      cwd = path.join(Ps.getHomeDir(), '..');
-    }
-
-    // TODO Object.assign 只能单层对象结构，多层的对象会直接覆盖
-    let options = Object.assign({
-      processArgs: {},
-      processOptions: { 
-        cwd: cwd,
-        env: Ps.allEnv(), 
-        stdio: 'ignore' // pipe
-      }
-    }, opt);
-
-    this.emitter = new EventEmitter();
-    this.host = host;
-    this.args = [];
-    this.sleeping = false;
-
-    // 传递给子进程的参数
-    this.args.push(JSON.stringify(options.processArgs));
-
-    this.child = fork(appPath, this.args, options.processOptions);
-    this.pid = this.child.pid;
-    this._init();
-  }
-
-  /**
-   * 初始化事件监听
-   */
-  _init() {
-    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)}`);
-      }
-      
-      if (m.channel == Channel.process.showException) {
-        Log.coreLogger.error(`${m.data}`);
-      }
-
-      // 收到子进程消息，转发到 event 
-      if (m.channel == Channel.process.sendToMain) {
-        this._eventEmit(m);
-      }
-    });
-
-    this.child.on('exit', (code, 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) => {
-      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;
-  }
-}
-
+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 = {}) {
+    
+    let cwd = Ps.getHomeDir();
+    let appPath = path.join(__dirname, 'app.js');
+    if (Ps.isPackaged()) {
+      // todo fork的cwd目录为什么要在app.asar外 ？
+      cwd = path.join(Ps.getHomeDir(), '..');
+    }
+
+    // TODO Object.assign 只能单层对象结构，多层的对象会直接覆盖
+    let options = Object.assign({
+      processArgs: {},
+      processOptions: { 
+        cwd: cwd,
+        env: Ps.allEnv(), 
+        stdio: 'ignore' // pipe
+      }
+    }, opt);
+
+    this.emitter = new EventEmitter();
+    this.host = host;
+    this.args = [];
+    this.sleeping = false;
+
+    // 传递给子进程的参数
+    this.args.push(JSON.stringify(options.processArgs));
+
+    this.child = fork(appPath, this.args, options.processOptions);
+    this.pid = this.child.pid;
+    this._init();
+  }
+
+  /**
+   * 初始化事件监听
+   */
+  _init() {
+    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)}`);
+      }
+      
+      if (m.channel == Channel.process.showException) {
+        Log.coreLogger.error(`${m.data}`);
+      }
+
+      // 收到子进程消息，转发到 event 
+      if (m.channel == Channel.process.sendToMain) {
+        this._eventEmit(m);
+      }
+    });
+
+    this.child.on('exit', (code, 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) => {
+      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;