ee-core 4.1.2 → 4.1.4

package/core/utils/timing.js

@@ -1,78 +1,78 @@
-'use strict';
-
-const assert = require('assert');
-const MAP = Symbol('Timing#map');
-const LIST = Symbol('Timing#list');
-
-class Timing {
-
-  constructor() {
-    this._enable = true;
-    this[MAP] = new Map();
-    this[LIST] = [];
-
-    this.init();
-  }
-
-  init() {
-    // process start time
-    this.start('Process Start', Date.now() - Math.floor((process.uptime() * 1000)));
-    this.end('Process Start');
-
-    if (typeof process.scriptStartTime === 'number') {
-      // js script start execute time
-      this.start('Script Start', process.scriptStartTime);
-      this.end('Script Start');
-    }
-  }
-
-  start(name, start) {
-    if (!name || !this._enable) return;
-
-    if (this[MAP].has(name)) this.end(name);
-
-    start = start || Date.now();
-    const item = {
-      name,
-      start,
-      end: undefined,
-      duration: undefined,
-      pid: process.pid,
-      index: this[LIST].length,
-    };
-    this[MAP].set(name, item);
-    this[LIST].push(item);
-    return item;
-  }
-
-  end(name) {
-    if (!name || !this._enable) return;
-    assert(this[MAP].has(name), `should run timing.start('${name}') first`);
-
-    const item = this[MAP].get(name);
-    item.end = Date.now();
-    item.duration = item.end - item.start;
-    return item;
-  }
-
-  enable() {
-    this._enable = true;
-  }
-
-  disable() {
-    this._enable = false;
-  }
-
-  clear() {
-    this[MAP].clear();
-    this[LIST] = [];
-  }
-
-  toJSON() {
-    return this[LIST];
-  }
-}
-
-module.exports = {
-  Timing
-};
+'use strict';
+
+const assert = require('assert');
+const MAP = Symbol('Timing#map');
+const LIST = Symbol('Timing#list');
+
+class Timing {
+
+  constructor() {
+    this._enable = true;
+    this[MAP] = new Map();
+    this[LIST] = [];
+
+    this.init();
+  }
+
+  init() {
+    // process start time
+    this.start('Process Start', Date.now() - Math.floor((process.uptime() * 1000)));
+    this.end('Process Start');
+
+    if (typeof process.scriptStartTime === 'number') {
+      // js script start execute time
+      this.start('Script Start', process.scriptStartTime);
+      this.end('Script Start');
+    }
+  }
+
+  start(name, start) {
+    if (!name || !this._enable) return;
+
+    if (this[MAP].has(name)) this.end(name);
+
+    start = start || Date.now();
+    const item = {
+      name,
+      start,
+      end: undefined,
+      duration: undefined,
+      pid: process.pid,
+      index: this[LIST].length,
+    };
+    this[MAP].set(name, item);
+    this[LIST].push(item);
+    return item;
+  }
+
+  end(name) {
+    if (!name || !this._enable) return;
+    assert(this[MAP].has(name), `should run timing.start('${name}') first`);
+
+    const item = this[MAP].get(name);
+    item.end = Date.now();
+    item.duration = item.end - item.start;
+    return item;
+  }
+
+  enable() {
+    this._enable = true;
+  }
+
+  disable() {
+    this._enable = false;
+  }
+
+  clear() {
+    this[MAP].clear();
+    this[LIST] = [];
+  }
+
+  toJSON() {
+    return this[LIST];
+  }
+}
+
+module.exports = {
+  Timing
+};

package/cross/cross.d.ts

@@ -1,19 +1,19 @@
-import { EventEmitter } from 'node:events';
-import { CrossProcess } from "./crossProcess";
-import internal = require("stream");
-export declare class Cross {
-    emitter: EventEmitter<[never]>;
-    children: {};
-    childrenMap: {};
-    create(): Promise<void>;
-    run(service: string, opt?: {}): Promise<CrossProcess>;
-    killAll(): void;
-    kill(pid: string|number): void;
-    killByName(name: string): void;
-    getUrl(name: string): string;
-    getProcByName(name: string): CrossProcess;
-    getProc(pid: string|number): CrossProcess;
-    getPids(): string[];
-    _initEventEmitter(): void;
-}
-export declare let cross: Cross;
+import { EventEmitter } from 'node:events';
+import { CrossProcess } from "./crossProcess";
+import internal = require("stream");
+export declare class Cross {
+    emitter: EventEmitter<[never]>;
+    children: {};
+    childrenMap: {};
+    create(): Promise<void>;
+    run(service: string, opt?: {}): Promise<CrossProcess>;
+    killAll(): void;
+    kill(pid: string|number): void;
+    killByName(name: string): void;
+    getUrl(name: string): string;
+    getProcByName(name: string): CrossProcess;
+    getProc(pid: string|number): CrossProcess;
+    getPids(): string[];
+    _initEventEmitter(): void;
+}
+export declare let cross: Cross;

package/cross/cross.js

@@ -1,152 +1,152 @@
-'use strict';
-
-const EventEmitter = require('events');
-const { getConfig } = require('../config');
-const { sleep, getValueFromArgv, replaceArgsValue } = require('../utils/helper');
-const { CrossProcess } = require('./crossProcess');
-const { Events } = require('../const/channel');
-const { extend } = require('../utils/extend');
-const { getPort } = require('../utils/port');
-
-class Cross {
-  constructor() {
-    this.emitter = undefined;
-
-    // pid唯一
-    // {pid:{name,entity}, pid:{name,entity}, ...}
-    this.children = {};
-  
-    // name唯一
-    // {name:pid, name:pid, ...}
-    this.childrenMap = {};
-
-    // eventEmitter
-    this._initEventEmitter();
-  }
-
-  async create() {
-
-    // boot services
-    const crossCfg = getConfig().cross;
-    //await sleep(5 * 1000);
-
-    for (let key of Object.keys(crossCfg)) {
-      let val = crossCfg[key];
-      if (val.enable == true) {
-        this.run(key)
-      }
-    }
-  }
-
-  // run
-  async run(service, opt = {}) {
-    const crossConf = getConfig().cross;
-    const defaultOpt = crossConf[service] || {};
-    const targetConf = extend(true, {}, defaultOpt, opt);
-    if (Object.keys(targetConf).length == 0) {
-      throw new Error(`[ee-core] [cross] The service [${service}] config does not exit`);
-    }
-    
-    // format params
-    let tmpArgs = targetConf.args;
-    let confPort = parseInt(getValueFromArgv(tmpArgs, 'port'));
-    // 某些程序给它传入不存在的参数时会报错
-    if (isNaN(confPort) && targetConf.port > 0) {
-      confPort = targetConf.port;
-    }
-    if (confPort > 0) {
-      // 动态生成port，传入的端口必须为int
-      confPort = await getPort({ port: confPort });
-      // 替换port
-      targetConf.args = replaceArgsValue(tmpArgs, "port", String(confPort));
-    }
-
-    // 创建进程
-    const subProcess = new CrossProcess(this, { targetConf, port: confPort });
-    let uniqueName = targetConf.name;
-    if (this.childrenMap.hasOwnProperty(uniqueName)) {
-      uniqueName = uniqueName + "-" + String(subProcess.pid);
-    }
-    this.childrenMap[uniqueName] = subProcess.pid;
-    subProcess.name = uniqueName;
-    this.children[subProcess.pid] = {
-      name: uniqueName,
-      entity: subProcess
-    };
-
-    return subProcess;
-  }
-
-  killAll() {
-    Object.keys(this.children).forEach(pid => {
-      this.kill(pid)
-    });
-  }
-
-  kill(pid) {
-    const entity = this.getProc(pid);
-    if (entity) {
-      entity.kill();
-    }
-  }
-
-  killByName(name) {
-    const entity = this.getProcByName(name);
-    if (entity) {
-      entity.kill();
-    }
-  }
-
-  getUrl(name) {
-    const entity = this.getProcByName(name);
-    const url = entity.getUrl();
-
-    return url;
-  }
-
-  // 获取 proc
-  getProcByName(name) {
-    const pid = this.childrenMap[name];
-    if (!pid) {
-      throw new Error(`[ee-core] [cross] The process named [${name}] does not exit`);
-    }
-    const entity = this.getProc(pid);
-
-    return entity;
-  }
-
-  // 获取 proc
-  getProc(pid) {
-    const child = this.children[pid];
-    if (!pid) {
-      throw new Error(`[ee-core] [cross] The process pid [${pid}] does not exit`);
-    }
-
-    return child.entity;
-  } 
-
-  // 获取pids  
-  getPids() {
-    let pids = Object.keys(this.children);
-    return pids;
-  }
-
-  _initEventEmitter() {
-    this.emitter = new EventEmitter();  
-    this.emitter.on(Events.childProcessExit, (data) => {
-      const child = this.children[data.pid];
-      delete this.childrenMap[child.name];
-      delete this.children[data.pid];
-    });
-    this.emitter.on(Events.childProcessError, (data) => {
-      const child = this.children[data.pid];
-      delete this.childrenMap[child.name];
-      delete this.children[data.pid];
-    });
-  }
-}  
-
-module.exports = {
-  Cross,
-  cross: new Cross()
+'use strict';
+
+const EventEmitter = require('events');
+const { getConfig } = require('../config');
+const { sleep, getValueFromArgv, replaceArgsValue } = require('../utils/helper');
+const { CrossProcess } = require('./crossProcess');
+const { Events } = require('../const/channel');
+const { extend } = require('../utils/extend');
+const { getPort } = require('../utils/port');
+
+class Cross {
+  constructor() {
+    this.emitter = undefined;
+
+    // pid唯一
+    // {pid:{name,entity}, pid:{name,entity}, ...}
+    this.children = {};
+  
+    // name唯一
+    // {name:pid, name:pid, ...}
+    this.childrenMap = {};
+
+    // eventEmitter
+    this._initEventEmitter();
+  }
+
+  async create() {
+
+    // boot services
+    const crossCfg = getConfig().cross;
+    //await sleep(5 * 1000);
+
+    for (let key of Object.keys(crossCfg)) {
+      let val = crossCfg[key];
+      if (val.enable == true) {
+        this.run(key)
+      }
+    }
+  }
+
+  // run
+  async run(service, opt = {}) {
+    const crossConf = getConfig().cross;
+    const defaultOpt = crossConf[service] || {};
+    const targetConf = extend(true, {}, defaultOpt, opt);
+    if (Object.keys(targetConf).length == 0) {
+      throw new Error(`[ee-core] [cross] The service [${service}] config does not exit`);
+    }
+    
+    // format params
+    let tmpArgs = targetConf.args;
+    let confPort = parseInt(getValueFromArgv(tmpArgs, 'port'));
+    // 某些程序给它传入不存在的参数时会报错
+    if (isNaN(confPort) && targetConf.port > 0) {
+      confPort = targetConf.port;
+    }
+    if (confPort > 0) {
+      // 动态生成port，传入的端口必须为int
+      confPort = await getPort({ port: confPort });
+      // 替换port
+      targetConf.args = replaceArgsValue(tmpArgs, "port", String(confPort));
+    }
+
+    // 创建进程
+    const subProcess = new CrossProcess(this, { targetConf, port: confPort });
+    let uniqueName = targetConf.name;
+    if (this.childrenMap.hasOwnProperty(uniqueName)) {
+      uniqueName = uniqueName + "-" + String(subProcess.pid);
+    }
+    this.childrenMap[uniqueName] = subProcess.pid;
+    subProcess.name = uniqueName;
+    this.children[subProcess.pid] = {
+      name: uniqueName,
+      entity: subProcess
+    };
+
+    return subProcess;
+  }
+
+  killAll() {
+    Object.keys(this.children).forEach(pid => {
+      this.kill(pid)
+    });
+  }
+
+  kill(pid) {
+    const entity = this.getProc(pid);
+    if (entity) {
+      entity.kill();
+    }
+  }
+
+  killByName(name) {
+    const entity = this.getProcByName(name);
+    if (entity) {
+      entity.kill();
+    }
+  }
+
+  getUrl(name) {
+    const entity = this.getProcByName(name);
+    const url = entity.getUrl();
+
+    return url;
+  }
+
+  // 获取 proc
+  getProcByName(name) {
+    const pid = this.childrenMap[name];
+    if (!pid) {
+      throw new Error(`[ee-core] [cross] The process named [${name}] does not exit`);
+    }
+    const entity = this.getProc(pid);
+
+    return entity;
+  }
+
+  // 获取 proc
+  getProc(pid) {
+    const child = this.children[pid];
+    if (!pid) {
+      throw new Error(`[ee-core] [cross] The process pid [${pid}] does not exit`);
+    }
+
+    return child.entity;
+  } 
+
+  // 获取pids  
+  getPids() {
+    let pids = Object.keys(this.children);
+    return pids;
+  }
+
+  _initEventEmitter() {
+    this.emitter = new EventEmitter();  
+    this.emitter.on(Events.childProcessExit, (data) => {
+      const child = this.children[data.pid];
+      delete this.childrenMap[child.name];
+      delete this.children[data.pid];
+    });
+    this.emitter.on(Events.childProcessError, (data) => {
+      const child = this.children[data.pid];
+      delete this.childrenMap[child.name];
+      delete this.children[data.pid];
+    });
+  }
+}  
+
+module.exports = {
+  Cross,
+  cross: new Cross()
 };

package/cross/crossProcess.d.ts

@@ -1,29 +1,29 @@
-import EventEmitter = require("events");
-export declare class CrossProcess {
-    constructor(host: any, opt?: {});
-    emitter: EventEmitter<[never]>;
-    host: any;
-    child: any;
-    pid: number;
-    port: number;
-    name: string;
-    config: {};
-    /**
-     * 初始化子进程
-     */
-    _init(options?: {}): void;
-    /**
-     * kill
-     */
-    kill(timeout?: number): void;
-    getUrl(): string;
-    getArgsObj(): {
-        _: any[];
-    };
-    setPort(port: string|number): void;
-    _generateId(): string;
-    /**
-     * exit electron
-     */
-    _exitElectron(timeout?: number): void;
-}
+import EventEmitter = require("events");
+export declare class CrossProcess {
+    constructor(host: any, opt?: {});
+    emitter: EventEmitter<[never]>;
+    host: any;
+    child: any;
+    pid: number;
+    port: number;
+    name: string;
+    config: {};
+    /**
+     * 初始化子进程
+     */
+    _init(options?: {}): void;
+    /**
+     * kill
+     */
+    kill(timeout?: number): void;
+    getUrl(): string;
+    getArgsObj(): {
+        _: any[];
+    };
+    setPort(port: string|number): void;
+    _generateId(): string;
+    /**
+     * exit electron
+     */
+    _exitElectron(timeout?: number): void;
+}