ee-core 4.1.3 → 4.1.4

package/jobs/child-pool/index.d.ts

@@ -1,26 +1,26 @@
-import EventEmitter = require("events");
-import LoadBalancer = require("../load-balancer");
-export declare class ChildPoolJob extends EventEmitter<[never]> {
-    constructor(opt?: {});
-    config: any;
-    boundMap: Map<any, any>;
-    children: {};
-    min: number;
-    max: number;
-    strategy: string;
-    weights: any[];
-    LB: LoadBalancer;
-    _initEvents(): void;
-    _removeChild(pid: any): void;
-    create(number?: number): Promise<string[]>;
-    _childCreated(childProcess: any): void;
-    run(filepath: any, params?: {}): any;
-    runPromise(filepath: any, params?: {}): Promise<any>;
-    getBoundChild(boundId: any): any;
-    getChildByPid(pid: any): any;
-    getChild(): any;
-    getPids(): string[];
-    // kill all
-    // type: sequence | parallel
-    killAll(type?: string): void;
-}
+import EventEmitter = require("events");
+import LoadBalancer = require("../load-balancer");
+export declare class ChildPoolJob extends EventEmitter<[never]> {
+    constructor(opt?: {});
+    config: any;
+    boundMap: Map<any, any>;
+    children: {};
+    min: number;
+    max: number;
+    strategy: string;
+    weights: any[];
+    LB: LoadBalancer;
+    _initEvents(): void;
+    _removeChild(pid: any): void;
+    create(number?: number): Promise<string[]>;
+    _childCreated(childProcess: any): void;
+    run(filepath: any, params?: {}): any;
+    runPromise(filepath: any, params?: {}): Promise<any>;
+    getBoundChild(boundId: any): any;
+    getChildByPid(pid: any): any;
+    getChild(): any;
+    getPids(): string[];
+    // kill all
+    // type: sequence | parallel
+    killAll(type?: string): void;
+}

package/jobs/child-pool/index.js

@@ -1,190 +1,190 @@
-const EventEmitter = require('events');
-const LoadBalancer = require('../load-balancer');
-const { getFullpath } = require('../../loader');
-const { JobProcess } = require('../child/jobProcess');
-const { Events } = require('../../const/channel');
-const { validValue } = require('../../utils/helper');
-const { getConfig } = 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 = validValue(options.weights[i]) ? options.weights[i] : 1
-      return w;
-    });
-
-    let lbOpt = {
-      algorithm: LoadBalancer.Algorithm.polling,
-      targets: [],
-    }
-    this.LB = new LoadBalancer(lbOpt);
-
-    const cfg = getConfig().jobs;
-    if (cfg) {
-      this.config = cfg;
-    }
-
-    this._initEvents();
-  }
-
-  _initEvents() {
-    this.on(Events.childProcessExit, (data) => {
-      this._removeChild(data.pid);
-    });
-    this.on(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 JobProcess(this, options);
-      this._childCreated(task);
-    }
-  
-    let pids = Object.keys(this.children);
-
-    return pids;
-  }
-
-  //  Post creation processing of child processes
-  _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);
-  }
-
-  // Execute a job file 
-  run(filepath, params = {}) {
-    const jobPath = getFullpath(filepath);
-    const childProcess = this.getChild();
-    childProcess.dispatch('run', jobPath, params);
-
-    return childProcess;
-  }
-
-  // Asynchronous execution of a job file
-  async runPromise(filepath, params = {}) {
-    return this.run(filepath, params);
-  }  
-
-  // Get the bound process object 
-  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;
-  }
-
-  // Retrieve a sub process object through PID 
-  getChildByPid(pid) {
-    let proc = this.children[pid] || null;
-    return proc;
-  }
-
-  // Get a sub process object 
-  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;
-  }
-
-  // Get current pigs 
-  getPids() {
-    let pids = Object.keys(this.children);
-    return pids;
-  }   
-
-  // kill all
-  // type: 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 { getFullpath } = require('../../loader');
+const { JobProcess } = require('../child/jobProcess');
+const { Events } = require('../../const/channel');
+const { validValue } = require('../../utils/helper');
+const { getConfig } = 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 = validValue(options.weights[i]) ? options.weights[i] : 1
+      return w;
+    });
+
+    let lbOpt = {
+      algorithm: LoadBalancer.Algorithm.polling,
+      targets: [],
+    }
+    this.LB = new LoadBalancer(lbOpt);
+
+    const cfg = getConfig().jobs;
+    if (cfg) {
+      this.config = cfg;
+    }
+
+    this._initEvents();
+  }
+
+  _initEvents() {
+    this.on(Events.childProcessExit, (data) => {
+      this._removeChild(data.pid);
+    });
+    this.on(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 JobProcess(this, options);
+      this._childCreated(task);
+    }
+  
+    let pids = Object.keys(this.children);
+
+    return pids;
+  }
+
+  //  Post creation processing of child processes
+  _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);
+  }
+
+  // Execute a job file 
+  run(filepath, params = {}) {
+    const jobPath = getFullpath(filepath);
+    const childProcess = this.getChild();
+    childProcess.dispatch('run', jobPath, params);
+
+    return childProcess;
+  }
+
+  // Asynchronous execution of a job file
+  async runPromise(filepath, params = {}) {
+    return this.run(filepath, params);
+  }  
+
+  // Get the bound process object 
+  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;
+  }
+
+  // Retrieve a sub process object through PID 
+  getChildByPid(pid) {
+    let proc = this.children[pid] || null;
+    return proc;
+  }
+
+  // Get a sub process object 
+  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;
+  }
+
+  // Get current pigs 
+  getPids() {
+    let pids = Object.keys(this.children);
+    return pids;
+  }   
+
+  // kill all
+  // type: 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.d.ts

@@ -1,3 +1,3 @@
-import { ChildJob } from "./child";
-import { ChildPoolJob } from "./child-pool";
-export { ChildJob, ChildPoolJob };
+import { ChildJob } from "./child";
+import { ChildPoolJob } from "./child-pool";
+export { ChildJob, ChildPoolJob };

package/jobs/index.js

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

package/jobs/load-balancer/algorithm/index.d.ts

@@ -1,4 +1,4 @@
-declare const _exports: {
-    [x: string]: (tasks: any, weightIndex: any, weightTotal: any, context: any) => any;
-};
-export = _exports;
+declare const _exports: {
+    [x: string]: (tasks: any, weightIndex: any, weightTotal: any, context: any) => any;
+};
+export = _exports;

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.d.ts

@@ -1,2 +1,2 @@
-declare function _exports(tasks: any, conMap?: {}): any;
-export = _exports;
+declare function _exports(tasks: any, conMap?: {}): any;
+export = _exports;

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;
 };

package/jobs/load-balancer/algorithm/polling.d.ts

@@ -1,2 +1,2 @@
-declare function _exports(tasks: any, currentIndex: any, context: any): any;
-export = _exports;
+declare function _exports(tasks: any, currentIndex: any, context: any): any;
+export = _exports;

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

@@ -1,12 +1,12 @@
-/**
- * 轮询
- */
-module.exports = function (tasks, currentIndex, context) {
-  if (!tasks.length) return null;
-
-  const task = tasks[currentIndex];
-  context.currentIndex ++;
-  context.currentIndex %= tasks.length;
-
-  return task || null;
+/**
+ * 轮询
+ */
+module.exports = function (tasks, currentIndex, context) {
+  if (!tasks.length) return null;
+
+  const task = tasks[currentIndex];
+  context.currentIndex ++;
+  context.currentIndex %= tasks.length;
+
+  return task || null;
 };

package/jobs/load-balancer/algorithm/random.d.ts

@@ -1,2 +1,2 @@
-declare function _exports(tasks: any): any;
-export = _exports;
+declare function _exports(tasks: any): any;
+export = _exports;

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

@@ -1,10 +1,10 @@
-/**
- * 随机
- */
-module.exports = function (tasks) {
-
-  const length = tasks.length;
-  const target = tasks[Math.floor(Math.random() * length)];
-
-  return target || null;
+/**
+ * 随机
+ */
+module.exports = function (tasks) {
+
+  const length = tasks.length;
+  const target = tasks[Math.floor(Math.random() * length)];
+
+  return target || null;
 };

package/jobs/load-balancer/algorithm/specify.d.ts

@@ -1,2 +1,2 @@
-declare function _exports(tasks: any, id: any): any;
-export = _exports;
+declare function _exports(tasks: any, id: any): any;
+export = _exports;

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

@@ -1,15 +1,15 @@
-/**
- * 声明绑定
- */
-module.exports = function (tasks, id) {
-  let task;
-
-  for (let i = 0; i < tasks.length; i++) {
-    if (tasks[i].id === id) {
-      task = tasks[i];
-      break;
-    }
-  }
-
-  return task || null;
+/**
+ * 声明绑定
+ */
+module.exports = function (tasks, id) {
+  let task;
+
+  for (let i = 0; i < tasks.length; i++) {
+    if (tasks[i].id === id) {
+      task = tasks[i];
+      break;
+    }
+  }
+
+  return task || null;
 };

package/jobs/load-balancer/algorithm/weights.d.ts

@@ -1,2 +1,2 @@
-declare function _exports(tasks: any, weightTotal: any, context: any): any;
-export = _exports;
+declare function _exports(tasks: any, weightTotal: any, context: any): any;
+export = _exports;