ee-core 2.0.2 → 2.1.0-beta.2

package/jobs/childPool/app.js

@@ -1,62 +0,0 @@
-
-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('../../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();
-
-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/jobs/childPool/forkProcess.js

@@ -1,81 +0,0 @@
-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/jobs/childPool/index.js

@@ -1,71 +0,0 @@
-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/jobs/childPool/pool.js

@@ -1,67 +0,0 @@
-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;