ee-core 4.1.3 → 4.1.4

package/jobs/child/app.js

@@ -1,70 +1,70 @@
-
-const is = require('is-type-of');
-const { loadException } = require('ee-core/exception');
-const { requireFile } = require('ee-core/loader');
-const { coreLogger } = require('ee-core/log');
-const { isBytecodeClass } = require('ee-core/core/utils');
-
-loadException();
-const commands = ['run'];
-
-class ChildApp {
-  constructor() {
-    this._initEvents();
-    this.jobMap = new Map();
-  }
-
-  /**
-   * 初始化事件监听
-   */
-  _initEvents() {
-    process.on('message', this._handleMessage.bind(this));
-    process.once('exit', (code) => {
-      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:
-    }
-    coreLogger.info(`[ee-core] [jobs/child] received a message from main-process, message: ${JSON.stringify(m)}`);
-  }
-
-  /**
-   * 运行脚本
-   */  
-  run(msg = {}) {
-    const {jobPath, jobParams, jobFunc, jobFuncParams} = msg;
-    let mod = requireFile(jobPath);
-    if (is.class(mod) || isBytecodeClass(mod)) {
-      let instance;
-      if (!this.jobMap.has(jobPath)) {
-        instance = new mod(...jobParams);
-        this.jobMap.set(jobPath, instance);
-      } else {
-        instance = this.jobMap.get(jobPath);
-      }
-
-      // 如果指定了函数名，则调用指定的函数
-      if (jobFunc) {
-        instance[jobFunc](...jobFuncParams);
-      } else {
-        instance.handle(...jobParams);
-      }
-    } else if (is.function(mod)) {
-      mod(jobParams);
-    }
-  }
-}
-
+
+const is = require('is-type-of');
+const { loadException } = require('ee-core/exception');
+const { requireFile } = require('ee-core/loader');
+const { coreLogger } = require('ee-core/log');
+const { isBytecodeClass } = require('ee-core/core/utils');
+
+loadException();
+const commands = ['run'];
+
+class ChildApp {
+  constructor() {
+    this._initEvents();
+    this.jobMap = new Map();
+  }
+
+  /**
+   * 初始化事件监听
+   */
+  _initEvents() {
+    process.on('message', this._handleMessage.bind(this));
+    process.once('exit', (code) => {
+      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:
+    }
+    coreLogger.info(`[ee-core] [jobs/child] received a message from main-process, message: ${JSON.stringify(m)}`);
+  }
+
+  /**
+   * 运行脚本
+   */  
+  run(msg = {}) {
+    const {jobPath, jobParams, jobFunc, jobFuncParams} = msg;
+    let mod = requireFile(jobPath);
+    if (is.class(mod) || isBytecodeClass(mod)) {
+      let instance;
+      if (!this.jobMap.has(jobPath)) {
+        instance = new mod(...jobParams);
+        this.jobMap.set(jobPath, instance);
+      } else {
+        instance = this.jobMap.get(jobPath);
+      }
+
+      // 如果指定了函数名，则调用指定的函数
+      if (jobFunc) {
+        instance[jobFunc](...jobFuncParams);
+      } else {
+        instance.handle(...jobParams);
+      }
+    } else if (is.function(mod)) {
+      mod(jobParams);
+    }
+  }
+}
+
 new ChildApp();

package/jobs/child/index.d.ts

@@ -1,13 +1,13 @@
-import EventEmitter = require("events");
-import { JobProcess } from "./jobProcess";
-export declare class ChildJob extends EventEmitter<[never]> {
-    constructor();
-    jobs: {};
-    config: any;
-    _initEvents(): void;
-    exec(filepath: string, params?: {}, opt?: {}): JobProcess;
-    createProcess(opt?: {}): JobProcess;
-    getPids(): string[];
-    execPromise(filepath: string, params?: {}, opt?: {}): Promise<JobProcess>;
-}
-
+import EventEmitter = require("events");
+import { JobProcess } from "./jobProcess";
+export declare class ChildJob extends EventEmitter<[never]> {
+    constructor();
+    jobs: {};
+    config: any;
+    _initEvents(): void;
+    exec(filepath: string, params?: {}, opt?: {}): JobProcess;
+    createProcess(opt?: {}): JobProcess;
+    getPids(): string[];
+    execPromise(filepath: string, params?: {}, opt?: {}): Promise<JobProcess>;
+}
+

package/jobs/child/index.js

@@ -1,85 +1,85 @@
-const EventEmitter = require('events');
-const { JobProcess } = require('./jobProcess');
-const { getFullpath } = require('../../loader');
-const { Events } = require('../../const/channel');
-const { getConfig } = require('../../config');
-const { extend } = require('../../utils/extend');
-
-class ChildJob extends EventEmitter {
-
-  constructor() {
-    super();
-    this.jobs = {};
-    this.config = {};
-
-    const cfg = getConfig().jobs;
-    if (cfg) {
-      this.config = cfg;
-    }
-
-    this._initEvents();
-  }
-
-  /**
-   * 初始化监听
-   */  
-  _initEvents() {
-    this.on(Events.childProcessExit, (data) => {
-      delete this.jobs[data.pid];
-    });
-    this.on(Events.childProcessError, (data) => {
-      delete this.jobs[data.pid];
-    });
-  }
-
-  /**
-   * 执行一个job文件
-   */  
-  exec(filepath, params = {}, opt = {}) {
-    const jobPath = getFullpath(filepath);
-    const proc = this.createProcess(opt);
-    const cmd = 'run';
-    proc.dispatch(cmd, jobPath, params);
-  
-    return proc;
-  }
-
-  /**
-   * 创建子进程
-   */  
-  createProcess(opt = {}) {
-    const options = extend(true, {
-      processArgs: {
-        type: 'childJob'
-      }
-    }, opt);
-    const proc = new JobProcess(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 { JobProcess } = require('./jobProcess');
+const { getFullpath } = require('../../loader');
+const { Events } = require('../../const/channel');
+const { getConfig } = require('../../config');
+const { extend } = require('../../utils/extend');
+
+class ChildJob extends EventEmitter {
+
+  constructor() {
+    super();
+    this.jobs = {};
+    this.config = {};
+
+    const cfg = getConfig().jobs;
+    if (cfg) {
+      this.config = cfg;
+    }
+
+    this._initEvents();
+  }
+
+  /**
+   * 初始化监听
+   */  
+  _initEvents() {
+    this.on(Events.childProcessExit, (data) => {
+      delete this.jobs[data.pid];
+    });
+    this.on(Events.childProcessError, (data) => {
+      delete this.jobs[data.pid];
+    });
+  }
+
+  /**
+   * 执行一个job文件
+   */  
+  exec(filepath, params = {}, opt = {}) {
+    const jobPath = getFullpath(filepath);
+    const proc = this.createProcess(opt);
+    const cmd = 'run';
+    proc.dispatch(cmd, jobPath, params);
+  
+    return proc;
+  }
+
+  /**
+   * 创建子进程
+   */  
+  createProcess(opt = {}) {
+    const options = extend(true, {
+      processArgs: {
+        type: 'childJob'
+      }
+    }, opt);
+    const proc = new JobProcess(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/jobProcess.d.ts

@@ -1,16 +1,16 @@
-import { EventEmitter } from "events";
-import { ChildProcess } from "child_process";
-declare export class JobProcess {
-    constructor(host: any, opt?: {});
-    emitter: EventEmitter<[never]>;
-    host: any;
-    args: string[];
-    sleeping: boolean;
-    child: ChildProcess;
-    pid: number;
-    _init(): void;
-    _eventEmit(m: any): void;
-    dispatch(cmd: string, jobPath?: string, ...params: any[]): void;
-    callFunc(jobPath?: string, funcName?: string, ...params: any[]): void;
-    kill(timeout?: number): void;
-}
+import { EventEmitter } from "events";
+import { ChildProcess } from "child_process";
+declare export class JobProcess {
+    constructor(host: any, opt?: {});
+    emitter: EventEmitter<[never]>;
+    host: any;
+    args: string[];
+    sleeping: boolean;
+    child: ChildProcess;
+    pid: number;
+    _init(): void;
+    _eventEmit(m: any): void;
+    dispatch(cmd: string, jobPath?: string, ...params: any[]): void;
+    callFunc(jobPath?: string, funcName?: string, ...params: any[]): void;
+    kill(timeout?: number): void;
+}

package/jobs/child/jobProcess.js

@@ -1,134 +1,134 @@
-const path = require('path');
-const EventEmitter = require('events');
-const serialize = require('serialize-javascript');
-const { fork } = require('child_process');
-const { coreLogger } = require('../../log');
-const { getBaseDir, isPackaged, allEnv } = require('../../ps');
-const { Processes, Events, Receiver } = require('../../const/channel');
-const { getRandomString } = require('../../utils/helper');
-const { getFullpath } = require('../../loader');
-const { extend } = require('../../utils/extend');
-
-class JobProcess {
-  constructor(host, opt = {}) {
-    
-    let cwd = getBaseDir();
-    const appPath = path.join(__dirname, 'app.js');
-    if (isPackaged()) {
-      // todo fork的cwd目录为什么要在app.asar外 ？
-      cwd = path.join(getBaseDir(), '..');
-    }
-
-    const options = extend(true, {
-      processArgs: {},
-      processOptions: { 
-        cwd: cwd,
-        env: 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) {
-        coreLogger.info(`[ee-core] [jobs/child] received a message from child-process, message: ${serialize(m)}`);
-      }
-      
-      if (m.channel == Processes.showException) {
-        coreLogger.error(`${m.data}`);
-      }
-
-      // 收到子进程消息，转发到 event 
-      if (m.channel == Processes.sendToMain) {
-        this._eventEmit(m);
-      }
-    });
-
-    this.child.on('exit', (code, signal) => {
-      let data = {
-        pid: this.pid
-      }
-      this.host.emit(Events.childProcessExit, data);
-      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(Events.childProcessError, data);
-      coreLogger.error(`[ee-core] [jobs/child] received a error from child-process, error: ${err}, pid:${this.pid}`);
-    });
-  }
-
-  _eventEmit(m) {
-    switch (m.eventReceiver) {
-      case Receiver.forkProcess:
-        this.emitter.emit(m.event, m.data);
-        break;
-      case 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 = getRandomString();
-    let msg = {
-      mid,
-      cmd,
-      jobPath,
-      jobParams: params
-    }
-
-    // todo 是否会发生监听未完成时，接收不到消息？
-    // 发消息到子进程
-    this.child.send(msg);
-  }
-
-  callFunc(jobPath = '', funcName = '', ...params) {
-    jobPath = getFullpath(jobPath);
-
-    // 消息对象
-    const mid = getRandomString();
-    let msg = {
-      mid,
-      cmd:'run',
-      jobPath,
-      jobFunc: funcName,
-      jobFuncParams: params
-    }
-    this.child.send(msg);
-  }
-
-  kill(timeout = 1000) {
-    this.child.kill('SIGINT');
-    setTimeout(() => {
-      if (this.child.killed) return;
-      this.child.kill('SIGKILL');
-    }, timeout)
-  }
-}
-
-module.exports = {
-  JobProcess
+const path = require('path');
+const EventEmitter = require('events');
+const serialize = require('serialize-javascript');
+const { fork } = require('child_process');
+const { coreLogger } = require('../../log');
+const { getBaseDir, isPackaged, allEnv } = require('../../ps');
+const { Processes, Events, Receiver } = require('../../const/channel');
+const { getRandomString } = require('../../utils/helper');
+const { getFullpath } = require('../../loader');
+const { extend } = require('../../utils/extend');
+
+class JobProcess {
+  constructor(host, opt = {}) {
+    
+    let cwd = getBaseDir();
+    const appPath = path.join(__dirname, 'app.js');
+    if (isPackaged()) {
+      // todo fork的cwd目录为什么要在app.asar外 ？
+      cwd = path.join(getBaseDir(), '..');
+    }
+
+    const options = extend(true, {
+      processArgs: {},
+      processOptions: { 
+        cwd: cwd,
+        env: 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) {
+        coreLogger.info(`[ee-core] [jobs/child] received a message from child-process, message: ${serialize(m)}`);
+      }
+      
+      if (m.channel == Processes.showException) {
+        coreLogger.error(`${m.data}`);
+      }
+
+      // 收到子进程消息，转发到 event 
+      if (m.channel == Processes.sendToMain) {
+        this._eventEmit(m);
+      }
+    });
+
+    this.child.on('exit', (code, signal) => {
+      let data = {
+        pid: this.pid
+      }
+      this.host.emit(Events.childProcessExit, data);
+      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(Events.childProcessError, data);
+      coreLogger.error(`[ee-core] [jobs/child] received a error from child-process, error: ${err}, pid:${this.pid}`);
+    });
+  }
+
+  _eventEmit(m) {
+    switch (m.eventReceiver) {
+      case Receiver.forkProcess:
+        this.emitter.emit(m.event, m.data);
+        break;
+      case 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 = getRandomString();
+    let msg = {
+      mid,
+      cmd,
+      jobPath,
+      jobParams: params
+    }
+
+    // todo 是否会发生监听未完成时，接收不到消息？
+    // 发消息到子进程
+    this.child.send(msg);
+  }
+
+  callFunc(jobPath = '', funcName = '', ...params) {
+    jobPath = getFullpath(jobPath);
+
+    // 消息对象
+    const mid = getRandomString();
+    let msg = {
+      mid,
+      cmd:'run',
+      jobPath,
+      jobFunc: funcName,
+      jobFuncParams: params
+    }
+    this.child.send(msg);
+  }
+
+  kill(timeout = 1000) {
+    this.child.kill('SIGINT');
+    setTimeout(() => {
+      if (this.child.killed) return;
+      this.child.kill('SIGKILL');
+    }, timeout)
+  }
+}
+
+module.exports = {
+  JobProcess
 };