ee-core 2.9.2 → 2.10.1

package/jobs/child/index.js

@@ -1,82 +1,82 @@
-const EventEmitter = require('events');
-const ForkProcess = require('./forkProcess');
-const Loader = require('../../loader');
-const Channel = require('../../const/channel');
-const Conf = require('../../config');
-
-class ChildJob extends EventEmitter {
-
-  constructor() {
-    super();
-    this.jobs = {};
-    this.config = {};
-
-    const cfg = Conf.getValue('jobs');
-    if (cfg) {
-      this.config = cfg;
-    }
-
-    this._initEvents();
-  }
-
-  /**
-   * 初始化监听
-   */  
-  _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 = Loader.getFullpath(filepath);
-    const proc = this.createProcess(opt);
-    const cmd = 'run';
-    proc.dispatch(cmd, jobPath, params);
-  
-    return proc;
-  }
-
-  /**
-   * 创建子进程
-   */  
-  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);
-    }
-    this.jobs[proc.pid] = proc;
-
-    return proc;
-  }
-
-  /**
-   * 获取当前pids
-   */  
-  getPids() {
-    let pids = Object.keys(this.jobs);
-    return pids;
-  }  
-
-  /**
-   * 异步执行一个job文件 todo this指向
-   */
-  async execPromise(filepath, params = {}, opt = {}) {
-    return this.exec(filepath, params, opt);
-  }
-
-}
-
-module.exports = ChildJob;
+const EventEmitter = require('events');
+const ForkProcess = require('./forkProcess');
+const Loader = require('../../loader');
+const Channel = require('../../const/channel');
+const Conf = require('../../config/cache');
+
+class ChildJob extends EventEmitter {
+
+  constructor() {
+    super();
+    this.jobs = {};
+    this.config = {};
+
+    const cfg = Conf.getValue('jobs');
+    if (cfg) {
+      this.config = cfg;
+    }
+
+    this._initEvents();
+  }
+
+  /**
+   * 初始化监听
+   */  
+  _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 = Loader.getFullpath(filepath);
+    const proc = this.createProcess(opt);
+    const cmd = 'run';
+    proc.dispatch(cmd, jobPath, params);
+  
+    return proc;
+  }
+
+  /**
+   * 创建子进程
+   */  
+  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);
+    }
+    this.jobs[proc.pid] = proc;
+
+    return proc;
+  }
+
+  /**
+   * 获取当前pids
+   */  
+  getPids() {
+    let pids = Object.keys(this.jobs);
+    return pids;
+  }  
+
+  /**
+   * 异步执行一个job文件 todo this指向
+   */
+  async execPromise(filepath, params = {}, opt = {}) {
+    return this.exec(filepath, params, opt);
+  }
+
+}
+
+module.exports = ChildJob;

package/jobs/child-pool/index.js

@@ -1,213 +1,213 @@
-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');
-
-class ChildPoolJob extends EventEmitter {
-
-  constructor(opt = {}) {
-    super();
-    let options = Object.assign({
-      weights: [],
-    }, opt);
-
-    this.config = {};
-    this.boundMap = new Map();
-    this.children = {};
-    this.min = 3;
-    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
-      return w;
-    });
-
-    let lbOpt = {
-      algorithm: LoadBalancer.Algorithm.polling,
-      targets: [],
-    }
-    this.LB = new LoadBalancer(lbOpt);
-
-    const cfg = Conf.getValue('jobs');
-    if (cfg) {
-      this.config = cfg;
-    }
-
-    this._initEvents();
-  }
-
-  /**
-   * 初始化监听
-   */  
-  _initEvents() {
-    this.on(Channel.events.childProcessExit, (data) => {
-      this._removeChild(data.pid);
-    });
-    this.on(Channel.events.childProcessError, (data) => {
-      this._removeChild(data.pid);
-    });
-  }
-
-  /**
-   * 移除对象
-   */  
-  _removeChild(pid) {
-    const length = Object.keys(this.children).length;
-    const lbOpt = {
-      id: pid,
-      weight: this.weights[length - 1],
-    }
-    this.LB.del(lbOpt);
-    delete this.children[pid];
-  }
-
-  /**
-   * 创建一个池子
-   */  
-  async create(number = 3) {
-    if (number < 0 || number > this.max) {
-      throw new Error(`[ee-core] [jobs/child-pool] The number is invalid !`);
-    }
-    let currentNumber = this.children.length;
-    if (currentNumber > this.max) {
-      throw new Error(`[ee-core] [jobs/child-pool] The number of current processes number: ${currentNumber} is greater than the maximum: ${this.max} !`);
-    }
-
-    if (number + currentNumber > this.max) {
-      number = this.max - currentNumber;
-    }
-
-    // args
-    let options = Object.assign({
-      processArgs: {
-        type: 'childPoolJob'
-      }
-    }, {});
-    for (let i = 1; i <= number; i++) {
-      let task = new ForkProcess(this, options);
-      this._childCreated(task);
-    }
-  
-    let pids = Object.keys(this.children);
-
-    return pids;
-  }
-
-  /**
-   * 子进程创建后处理
-   */  
-  _childCreated(childProcess) {
-    let pid = childProcess.pid;
-    this.children[pid] = childProcess;
-
-    const length = Object.keys(this.children).length;
-    let lbTask = {
-      id: pid,
-      weight: this.weights[length - 1],
-    }
-    this.LB.add(lbTask);
-  }
-
-  /**
-   * 执行一个job文件
-   */  
-  run(filepath, params = {}) {
-    const jobPath = Loader.getFullpath(filepath);
-    const childProcess = this.getChild();
-    childProcess.dispatch('run', jobPath, params);
-
-    return childProcess;
-  }
-
-  /**
-   * 异步执行一个job文件
-   */
-  async runPromise(filepath, params = {}) {
-    return this.run(filepath, params);
-  }  
-
-  /**
-   * 获取绑定的进程对象
-   */  
-  getBoundChild(boundId) {
-    let proc;
-    const boundPid = this.boundMap.get(boundId);
-    if (boundPid) {
-      proc = this.children[boundPid];
-      return proc;
-    }
-
-    // 获取进程并绑定
-    proc = this.getChild();
-    this.boundMap.set(boundId, proc.pid);
-
-    return proc;
-  }
-
-  /**
-   * 通过pid获取一个子进程对象
-   */  
-  getChildByPid(pid) {
-    let proc = this.children[pid] || null;
-    return proc;
-  }
-
-  /**
-   * 获取一个子进程对象
-   */  
-  getChild() {
-    let proc;
-    const currentPids = Object.keys(this.children);
-
-    // 没有则创建
-    if (currentPids.length == 0) {
-      let subIds = this.create(1);
-      proc = this.children[subIds[0]];
-    } else {
-      // 从池子中获取一个
-      let onePid = this.LB.pickOne().id;
-      proc = this.children[onePid];
-    }
-    
-    if (!proc) {
-      let errorMessage = `[ee-core] [jobs/child-pool] Failed to obtain the child process !`
-      throw new Error(errorMessage);
-    }
-
-    return proc;
-  }
-
-  /**
-   * 获取当前pids
-   */  
-  getPids() {
-    let pids = Object.keys(this.children);
-    return pids;
-  }   
-
-  /**
-   * kill all 
-   * @param type {String} - 'sequence' | 'parallel'
-   */
-  killAll(type = 'parallel') {
-    let i = 1;
-    Object.keys(this.children).forEach(key => {
-      let proc = this.children[key];
-      if (proc) {
-        if (type == 'sequence') {
-          setTimeout(()=>{
-            proc.kill();
-          }, i * 1000)
-          i++;
-        } else {
-          proc.kill();
-        }
-      }
-    });
-  }
-}
-
-module.exports = ChildPoolJob;
+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');
+
+class ChildPoolJob extends EventEmitter {
+
+  constructor(opt = {}) {
+    super();
+    let options = Object.assign({
+      weights: [],
+    }, opt);
+
+    this.config = {};
+    this.boundMap = new Map();
+    this.children = {};
+    this.min = 3;
+    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
+      return w;
+    });
+
+    let lbOpt = {
+      algorithm: LoadBalancer.Algorithm.polling,
+      targets: [],
+    }
+    this.LB = new LoadBalancer(lbOpt);
+
+    const cfg = Conf.getValue('jobs');
+    if (cfg) {
+      this.config = cfg;
+    }
+
+    this._initEvents();
+  }
+
+  /**
+   * 初始化监听
+   */  
+  _initEvents() {
+    this.on(Channel.events.childProcessExit, (data) => {
+      this._removeChild(data.pid);
+    });
+    this.on(Channel.events.childProcessError, (data) => {
+      this._removeChild(data.pid);
+    });
+  }
+
+  /**
+   * 移除对象
+   */  
+  _removeChild(pid) {
+    const length = Object.keys(this.children).length;
+    const lbOpt = {
+      id: pid,
+      weight: this.weights[length - 1],
+    }
+    this.LB.del(lbOpt);
+    delete this.children[pid];
+  }
+
+  /**
+   * 创建一个池子
+   */  
+  async create(number = 3) {
+    if (number < 0 || number > this.max) {
+      throw new Error(`[ee-core] [jobs/child-pool] The number is invalid !`);
+    }
+    let currentNumber = this.children.length;
+    if (currentNumber > this.max) {
+      throw new Error(`[ee-core] [jobs/child-pool] The number of current processes number: ${currentNumber} is greater than the maximum: ${this.max} !`);
+    }
+
+    if (number + currentNumber > this.max) {
+      number = this.max - currentNumber;
+    }
+
+    // args
+    let options = Object.assign({
+      processArgs: {
+        type: 'childPoolJob'
+      }
+    }, {});
+    for (let i = 1; i <= number; i++) {
+      let task = new ForkProcess(this, options);
+      this._childCreated(task);
+    }
+  
+    let pids = Object.keys(this.children);
+
+    return pids;
+  }
+
+  /**
+   * 子进程创建后处理
+   */  
+  _childCreated(childProcess) {
+    let pid = childProcess.pid;
+    this.children[pid] = childProcess;
+
+    const length = Object.keys(this.children).length;
+    let lbTask = {
+      id: pid,
+      weight: this.weights[length - 1],
+    }
+    this.LB.add(lbTask);
+  }
+
+  /**
+   * 执行一个job文件
+   */  
+  run(filepath, params = {}) {
+    const jobPath = Loader.getFullpath(filepath);
+    const childProcess = this.getChild();
+    childProcess.dispatch('run', jobPath, params);
+
+    return childProcess;
+  }
+
+  /**
+   * 异步执行一个job文件
+   */
+  async runPromise(filepath, params = {}) {
+    return this.run(filepath, params);
+  }  
+
+  /**
+   * 获取绑定的进程对象
+   */  
+  getBoundChild(boundId) {
+    let proc;
+    const boundPid = this.boundMap.get(boundId);
+    if (boundPid) {
+      proc = this.children[boundPid];
+      return proc;
+    }
+
+    // 获取进程并绑定
+    proc = this.getChild();
+    this.boundMap.set(boundId, proc.pid);
+
+    return proc;
+  }
+
+  /**
+   * 通过pid获取一个子进程对象
+   */  
+  getChildByPid(pid) {
+    let proc = this.children[pid] || null;
+    return proc;
+  }
+
+  /**
+   * 获取一个子进程对象
+   */  
+  getChild() {
+    let proc;
+    const currentPids = Object.keys(this.children);
+
+    // 没有则创建
+    if (currentPids.length == 0) {
+      let subIds = this.create(1);
+      proc = this.children[subIds[0]];
+    } else {
+      // 从池子中获取一个
+      let onePid = this.LB.pickOne().id;
+      proc = this.children[onePid];
+    }
+    
+    if (!proc) {
+      let errorMessage = `[ee-core] [jobs/child-pool] Failed to obtain the child process !`
+      throw new Error(errorMessage);
+    }
+
+    return proc;
+  }
+
+  /**
+   * 获取当前pids
+   */  
+  getPids() {
+    let pids = Object.keys(this.children);
+    return pids;
+  }   
+
+  /**
+   * kill all 
+   * @param type {String} - 'sequence' | 'parallel'
+   */
+  killAll(type = 'parallel') {
+    let i = 1;
+    Object.keys(this.children).forEach(key => {
+      let proc = this.children[key];
+      if (proc) {
+        if (type == 'sequence') {
+          setTimeout(()=>{
+            proc.kill();
+          }, i * 1000)
+          i++;
+        } else {
+          proc.kill();
+        }
+      }
+    });
+  }
+}
+
+module.exports = ChildPoolJob;

package/jobs/index.js

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

package/jobs/load-balancer/algorithm/index.js

@@ -1,12 +1,12 @@
-const Consts = require("../consts");
-
-module.exports = {
-  [Consts.polling]: require('./polling'),
-  [Consts.weights]: require('./weights'),
-  [Consts.random]: require('./random'),
-  [Consts.specify]: require('./specify'),
-  [Consts.minimumConnection]: require('./minimumConnection'),
-  [Consts.weightsPolling]: require('./weightsPolling'),
-  [Consts.weightsRandom]: require('./weightsRandom'),
-  [Consts.weightsMinimumConnection]: require('./weightsMinimumConnection'),
+const Consts = require("../consts");
+
+module.exports = {
+  [Consts.polling]: require('./polling'),
+  [Consts.weights]: require('./weights'),
+  [Consts.random]: require('./random'),
+  [Consts.specify]: require('./specify'),
+  [Consts.minimumConnection]: require('./minimumConnection'),
+  [Consts.weightsPolling]: require('./weightsPolling'),
+  [Consts.weightsRandom]: require('./weightsRandom'),
+  [Consts.weightsMinimumConnection]: require('./weightsMinimumConnection'),
 };

package/jobs/load-balancer/algorithm/minimumConnection.js

@@ -1,19 +1,19 @@
-/**
- * 最小连接数
- */
-module.exports = function (tasks, conMap={}) {
-  if (tasks.length < 2) return tasks[0] || null;
-
-  let min = conMap[tasks[0].id];
-  let minIndex = 0;
-
-  for (let i = 1; i < tasks.length; i++) {
-    const con = conMap[tasks[i].id] || 0;
-    if (con <= min) {
-      min = con;
-      minIndex = i;
-    }
-  }
-
-  return tasks[minIndex] || null;
+/**
+ * 最小连接数
+ */
+module.exports = function (tasks, conMap={}) {
+  if (tasks.length < 2) return tasks[0] || null;
+
+  let min = conMap[tasks[0].id];
+  let minIndex = 0;
+
+  for (let i = 1; i < tasks.length; i++) {
+    const con = conMap[tasks[i].id] || 0;
+    if (con <= min) {
+      min = con;
+      minIndex = i;
+    }
+  }
+
+  return tasks[minIndex] || null;
 };