ee-core 2.0.0-beta.2 → 2.0.0-beta.4

package/module/jobs/child/forkProcess.js

@@ -1,104 +1,61 @@
 const path = require('path');
 const { fork } = require('child_process');
+const serialize = require('serialize-javascript');
+const Log = require('../../log');
+const Ps = require('../../ps');
+const Channel = require('../../const/channel');
 
 class ForkProcess {
-  constructor(host, modulePath, processArgs = [], processOptions = {}) {
+  constructor(host, opt = {}) {
+    
+    let options = Object.assign({
+      processOptions: { 
+        cwd: Ps.getHomeDir(),
+        env: Ps.allEnv(), 
+        stdio: 'pipe' 
+      }
+    }, opt);
+
     this.host = host;
-    this.modulePath = modulePath;
-    this.args;
-    this.options = processOptions;
+    this.args = [];
     this.sleeping = false;
-    this.activitiesCount = 0;
-    this.activitiesMap = new Map();
 
     // 传递给子进程的参数
-    let scriptArgs = {
-      jobPath: modulePath
-    }
-    processArgs.push(JSON.stringify(scriptArgs));
-    this.args = processArgs;
-    
+    //this.args.push(JSON.stringify(options.params));
+
     const appPath = path.join(__dirname, 'app.js');
-    this.child = fork(appPath, this.args, this.options);
+    this.child = fork(appPath, this.args, options.processOptions);
 
     this.pid = this.child.pid;
     this._init();
   }
 
-  /**
-   * 进程挂起
-   */
-  sleep() {
-    if (this.activitiesCount) {
-      if (this.sleeping) return;
-      process.kill(this.pid, 'SIGSTOP');
-      this.sleeping = true;
-    }
-  }
-
-  /**
-   * 进程唤醒
-   */
-  wakeup() {
-    if (!this.sleeping) return;
-    process.kill(this.pid, 'SIGCONT');
-    this.sleeping = false;
-  }
-
   /**
    * 进程初始化
    */
   _init() {
-    this.child.on('message', (data) => {
-      const id = data.id;
-      this.connectionsCountMinus(id);
-      delete data.id;
-      delete data.action;
-      //this.host.emit('forked_message', {data, id});
+    this.child.on('message', (m) => {
+      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.host.emit(m.event, m.data);
+      }
+
     });
+
     this.child.on('exit', (code, signal) => {
-      // if (code !== 0 && code !== null) {
-      //   this.host.emit('forked_error', code, this.pid);
-      // } else {
-      //   this.host.emit('forked_exit', this.pid);
-      // }
+      Log.coreLogger.info(`[ee-core] [jobs/child] received a exit from child-process, code:${code}, signal:${signal}`);
     });
+
     this.child.on('error', (err) => {
-      console.log('forked error: ', err);
-      // this.host.emit('forked_error', err, this.pid);
+      Log.coreLogger.error(`[ee-core] [jobs/child] received a error from child-process, error: ${err} !`);
     });
   }
 
-  /**
-   * 向进程发消息
-   */
-  send(params) {
-    if (this.sleeping) {
-      this.wakeup();
-    }
-    this.connectionsCountPlus(params.id);
-    this.child.send(params);
-  }
-
-  /**
-   * 连接数+
-   */
-  _connectionsCountPlus(id) {
-    this.activitiesMap.set(id, 1);
-    this.activitiesCount += 1;
-    this.host.connectionsMap[this.pid] = this.activitiesCount;
-  }
-
-  /**
-   * 连接数-
-   */
-  _connectionsCountMinus(id) {
-    if (this.activitiesMap.has(id)) {
-      this.activitiesCount = (this.activitiesCount > 0) ? (this.activitiesCount - 1) : 0;
-      this.activitiesMap.delete(id);
-    }
-    this.host.connectionsMap[this.pid] = this.activitiesCount;
-  }
 }
 
 module.exports = ForkProcess;

package/module/jobs/child/index.js

@@ -1,35 +1,78 @@
-//require('bytenode');
+const EventEmitter = require('events');
 const path = require('path');
+const fs = require('fs');
 const ForkProcess = require('./forkProcess');
-const Ps = require('../../utils/ps');
-const Constants = require('../../const');
+const Ps = require('../../ps');
+const Loader = require('../../loader');
+const Helper = require('../../utils/helper');
 
-class ChildJob {
+class ChildJob extends EventEmitter {
+
+  constructor() {
+    super();
+    this.initEvents();
+  }
+
+  /**
+   * 初始化监听
+   */  
+  initEvents = () => {
+
+    // this.on('forked_message', ({data, id}) => {
+    //   this.onMessage({data, id});
+    // });
+  }
+
+  /**
+   * 执行一个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);
+  
+    return subProcess;
+  }
 
   /**
-    * constructor
-    * @param  {String} name - job name
-    * @param  {String} filepath - filepath
-    * @param  {Object} opt - child process options 
-    */
-  constructor(name, filepath, opt = {}) {
-    // todo
-    //processArgs: Ps.isDev() ?  [`--inspect=${Constants.jobs.inspectStartIndex}`] : [],
-    let options = Object.assign({
-      processArgs: Ps.isDev() ?  [] : [],
-      processOptions: { 
-        //cwd: path.dirname(filepath),
-        env: Ps.allEnv(), 
-        stdio: 'pipe' 
-      }
-    }, opt);
-
-    this.childProcess = new ForkProcess(this, filepath, options.processArgs, options.processOptions);
-
-    this.jobReady = false;
-    this.exec = filepath;
-    this.name = name;
+   * todo 运行job
+   */  
+  run(name, filepath, opt = {}) {
+    let times = opt.times || 1;
+
+    for (let i = 1; i <= times; i++) {
+      this.exec(filepath, opt);
+    }
+  
+    return;
   }
+
+  _getFullpath(filepath) {
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), filepath);
+    }
+
+    const fullpath = Loader.resolveModule(filepath);
+    if (!fs.existsSync(fullpath)) {
+      throw new Error(`[ee-core] [jobs/child] file ${fullpath} not exists`);
+    }
+
+    return fullpath;
+  }
+
 }
 
 module.exports = ChildJob;

package/module/jobs/childPool/app.js

@@ -0,0 +1,68 @@
+
+const is = require('is-type-of');
+let Exception;
+let Loader;
+let Log;
+let UtilsCore;
+
+// 开发环境下，ee-core是soft link
+if (__dirname.indexOf("node_modules") == -1) {
+  Exception = require('../../exception');
+  Loader = require('../../loader');
+  Log = require('../../log');
+  UtilsCore = require('../../core/lib/utils');
+} else {
+  Exception = require('ee-core/module/exception');
+  Loader = require('ee-core/module/loader');
+  Log = require('ee-core/module/log');
+  UtilsCore = require('../../core/lib/utils');
+}
+
+Exception.start();
+
+class ChildApp {
+  constructor() {
+    this._initEvents();
+  }
+
+  /**
+   * 初始化事件监听
+   */
+  _initEvents() {
+    process.on('message', this._handleMessage.bind(this));
+    process.on('disconnect', () => {
+      Log.coreLogger.info(`[ee-core] [jobs/child] child process disconnected, pid:${process.pid}`);
+    });
+    process.on('exit', (code) => {
+      Log.coreLogger.info(`[ee-core] [jobs/child] child process exit code:${code}, pid:${process.pid}`);
+    });
+  }
+
+  /**
+   * 监听消息
+   */
+  _handleMessage(m) {
+    this.run(m);
+    Log.coreLogger.info(`[ee-core] [jobs/child] Received a message ${JSON.stringify(m)} from the mainProcess`);
+  }
+
+  /**
+   * 运行脚本
+   */  
+  run(msg = {}) {
+    let filepath = msg.jobPath;
+    let params = msg.params;
+
+    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);
+    }
+
+    Log.coreLogger.info('[ee-core] [child-process] job run');
+  }
+}
+
+new ChildApp();

package/module/jobs/childPool/forkProcess.js

@@ -0,0 +1,81 @@
+const path = require('path');
+const { fork } = require('child_process');
+const serialize = require('serialize-javascript');
+const Log = require('../../log');
+const Ps = require('../../ps');
+const Channel = require('../../const/channel');
+
+class ForkProcess {
+  constructor(host, opt = {}) {
+    
+    let options = Object.assign({
+      processOptions: { 
+        cwd: Ps.getHomeDir(),
+        env: Ps.allEnv(), 
+        stdio: 'pipe' 
+      }
+    }, opt);
+
+    this.host = host;
+    this.args = [];
+    this.sleeping = false;
+
+    // 传递给子进程的参数
+    //this.args.push(JSON.stringify(options.params));
+
+    const appPath = path.join(__dirname, 'app.js');
+    this.child = fork(appPath, this.args, options.processOptions);
+
+    this.pid = this.child.pid;
+    this._init();
+  }
+
+  /**
+   * 进程初始化
+   */
+  _init() {
+    this.child.on('message', (m) => {
+      Log.coreLogger.info(`[ee-core] [jobs/child/forkProcess] from childProcess event-message: ${serialize(m)}`);
+      if (m.channel == Channel.process.showException) {
+        Log.coreLogger.error(`${m.data}`);
+      }
+    });
+
+    this.child.on('disconnect', () => {
+      Log.coreLogger.info(`[ee-core] [jobs/child/forkProcess] from childProcess event-disconnect !`);
+    });
+
+    this.child.on('close', (code, signal) => {
+      Log.coreLogger.info(`[ee-core] [jobs/child/forkProcess] from childProcess event-close code:${code}, signal:${signal}`);
+    });
+
+    this.child.on('exit', (code, signal) => {
+      Log.coreLogger.info(`[ee-core] [jobs/child/forkProcess] from childProcess event-exit code:${code}, signal:${signal}`);
+    });
+
+    this.child.on('error', (err) => {
+      Log.coreLogger.error(`[ee-core] [jobs/child/forkProcess] from childProcess event-error: ${err} !`);
+    });
+  }
+
+  /**
+   * 进程挂起
+   */
+  sleep() {
+    if (this.sleeping) return;
+    process.kill(this.pid, 'SIGSTOP');
+    this.sleeping = true;
+  }
+
+  /**
+   * 进程唤醒
+   */
+  wakeup() {
+    if (!this.sleeping) return;
+    process.kill(this.pid, 'SIGCONT');
+    this.sleeping = false;
+  }
+
+}
+
+module.exports = ForkProcess;

package/module/jobs/childPool/index.js

@@ -0,0 +1,71 @@
+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');
+
+class ChildJob extends EventEmitter {
+
+  constructor() {
+    super();
+    this.jobList = new Map();
+  }
+
+  /**
+   * 执行一个job文件
+   */  
+  exec(filepath, opt = {}) {
+    const jobPath = this._getFullpath(filepath);
+    let options = Object.assign({
+      params: {},
+    }, opt);
+
+    // 消息对象
+    const mid = Helper.getRandomString();
+    let msg = {
+      mid,
+      jobPath,
+      params: options.params
+    }
+
+    let subProcess = new ForkProcess(this, options);
+
+    // todo 是否会发生监听未完成时，接收不到消息？
+    // 发消息到子进程，
+    subProcess.child.send(msg);
+  
+    return subProcess;
+  }
+
+  /**
+   * todo 运行job
+   */  
+  run(name, filepath, opt = {}) {
+    let times = opt.times || 1;
+
+    for (let i = 1; i <= times; i++) {
+      this.exec(filepath, opt);
+    }
+  
+    return;
+  }
+
+  _getFullpath(filepath) {
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), filepath);
+    }
+
+    const fullpath = Loader.resolveModule(filepath);
+    if (!fs.existsSync(fullpath)) {
+      throw new Error(`[ee-core] [jobs/child] file ${fullpath} not exists`);
+    }
+
+    return fullpath;
+  }
+
+}
+
+module.exports = ChildJob;

package/module/jobs/childPool/pool.js

@@ -0,0 +1,67 @@
+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 Log = require('../../log');
+
+class ChildJob {
+
+  /**
+    * constructor
+    */
+  constructor(name, filepath, opt) {
+    this.pools = new Map();
+    this.create(name, filepath, opt);
+  }
+
+  _initEvents() {
+    // ddd
+
+  }
+
+  create(name, filepath, opt = {}) {
+
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), filepath);
+    }
+
+    const fullpath = Loader.resolveModule(filepath);
+    if (!fs.existsSync(fullpath)) {
+      throw new Error(`[ee-core] [jobs/child] file ${fullpath} not exists`);
+    }
+
+    let options = Object.assign({
+      scriptArgs: {
+        name: name,
+        jobPath: fullpath
+      },
+      processArgs: [],
+      processOptions: { 
+        //cwd: path.dirname(filepath),
+        env: Ps.allEnv(), 
+        stdio: 'pipe' 
+      }
+    }, opt);
+
+    const subProcess = new ForkProcess(this, options);
+    this.pools.set(subProcess.pid, subProcess);
+
+    return subProcess;
+  }
+
+  sendToChild(pid, message, ...other) {
+    if (!this.pools.has(pid)) {
+      Log.coreLogger.warn(`[ee-core] [jobs/child] process dose not exist  ${pid}`);
+      return;
+    }
+    const subProcess = this.pools.get(pid);
+    subProcess.child.send(message, ...other);
+    return
+  }
+
+}
+
+module.exports = ChildJob;

package/module/jobs/index.js

@@ -1,56 +1,7 @@
-const path = require('path');
-const fs = require('fs');
-const RendererJob = require('./renderer');
 const ChildJob = require('./child');
-const Utils = require('../utils');
-const Loader = require('../loader');
-
-class Jobs  {
-  constructor() {
-    this.type = undefined;
-    this.instance = undefined;
-  }
-
-  /**
-   * 创建 job
-   */
-  create (name, opt = {}) {
-    this.type = opt.type || 'child';
-    this.dev = opt.dev || false;
-    this.winOptions = opt.winOptions || {};
-    this.childOptions = opt.childOptions || {};
-    this.path = opt.path || null;
-
-
-    const isAbsolute = path.isAbsolute(this.path);
-    if (!isAbsolute) {
-      this.path = path.join(Utils.getBaseDir(), this.path);
-    }
-    const filepath = Loader.resolveModule(this.path);
-
-    if (!fs.existsSync(filepath)) {
-      throw new Error(`[ee-core] [jobs-create] file ${this.path} not exists`);
-    }
-    
-    this.path = filepath;
-    if (this.type == 'child') {
-      this.instance = new ChildJob(name, filepath, this.childOptions);
-    } else if (this.type == 'renderer') {
-      this.instance = new RendererJob(name, filepath, this.winOptions);
-      if (this.dev) {
-        this.openDevTools();
-      }
-    }
-    
-    return;
-  }
-
-  /**
-   * 显示开发者工具栏（仅支持 RendererJob)
-   */
-  openDevTools () {
-    this.instance.openDevTools();
-  }
-}
+const RendererJob = require('./renderer');
 
-module.exports = Jobs;
+module.exports = {
+  ChildJob,
+  RendererJob
+};

package/module/jobs/renderer/loadView.js

@@ -1,4 +1,4 @@
-const Ps = require('../../utils/ps');
+const Ps = require('../../ps');
 
 /**
   * loadView 生成BrowserWindow的html content

package/module/jobs/unification.js

@@ -0,0 +1,64 @@
+const path = require('path');
+const fs = require('fs');
+const RendererJob = require('./renderer');
+const ChildJob = require('./child/pool');
+const Ps = require('../ps');
+const Loader = require('../loader');
+
+class Jobs  {
+  constructor() {
+    this.type;
+    this.dev;
+    this.path;
+    this.instance;
+    this.child;
+    this.childOptions;
+    this.renderer;
+    this.winOptions;
+  }
+
+  /**
+   * 创建 job
+   */
+  create (name, opt = {}) {
+    this.type = opt.type || 'child';
+    this.dev = opt.dev || false;
+    this.winOptions = opt.winOptions || {};
+    this.childOptions = opt.childOptions || {};
+    this.path = opt.path || null;
+
+    const isAbsolute = path.isAbsolute(this.path);
+    if (!isAbsolute) {
+      this.path = path.join(Ps.getBaseDir(), this.path);
+    }
+    const filepath = Loader.resolveModule(this.path);
+
+    if (!fs.existsSync(filepath)) {
+      throw new Error(`[ee-core] [jobs-create] file ${this.path} not exists`);
+    }
+    
+    this.path = filepath;
+    if (this.type == 'child') {
+      this.instance = new ChildJob(name, filepath, this.childOptions);
+      this.child = this.instance;
+    } else if (this.type == 'renderer') {
+      this.instance = new RendererJob(name, filepath, this.winOptions);
+      this.renderer = this.instance;
+
+      if (this.dev) {
+        this.openDevTools();
+      }
+    }
+    
+    return;
+  }
+
+  /**
+   * 显示开发者工具栏（仅支持 RendererJob)
+   */
+  openDevTools () {
+    this.instance.openDevTools();
+  }
+}
+
+module.exports = Jobs;