ee-core 2.12.0 → 4.0.0-beta.1

package/cross/index.js

@@ -1,183 +1,8 @@
-const fs = require('fs');
-const EventEmitter = require('events');
-const Conf = require('../config/cache');
-const Helper = require('../utils/helper');
-const Ps = require('../ps');
-const SpawnProcess = require('./spawnProcess');
-const Channel = require('../const/channel');
-const extend = require('../utils/extend');
-const GetPort = require('../utils/get-port');
+'use strict';
 
-/**
- * Cross-language service
- * 跨语言服务
- */
-const CrossLanguageService = {
+const { CrossProcess, cross} = require('./cross');
 
-  emitter: undefined,
-
-  /**
-   * pid唯一
-   * {pid:{name,entity}, pid:{name,entity}, ...}
-   */
-  children: {},
-
-  /**
-   * name唯一
-   * {name:pid, name:pid, ...}
-   */
-  childrenMap: {},
-
-  /**
-   * create
-   */
-  async create() {
-
-    // boot services
-    const servicesCfg = Conf.getValue('cross');
-    //await Helper.sleep(5 * 1000);
-
-    for (let key of Object.keys(servicesCfg)) {
-      let cfg = servicesCfg[key];
-      if (cfg.enable == true) {
-        this.run(key)
-      }
-    }
-  },
-
-  /**
-   * _initEventEmitter
-   */
-  _initEventEmitter() {
-    if (this.emitter) {
-      return
-    }
-    this.emitter = new EventEmitter();  
-    this.emitter.on(Channel.events.childProcessExit, (data) => {
-      const child = this.children[data.pid];
-      delete this.childrenMap[child.name];
-      delete this.children[data.pid];
-    });
-    this.emitter.on(Channel.events.childProcessError, (data) => {
-      const child = this.children[data.pid];
-      delete this.childrenMap[child.name];
-      delete this.children[data.pid];
-    });
-  },
-
-  /**
-   * run
-   */
-  async run(service, opt = {}) {
-    // init dir
-    this._initPath();
-
-    const allConfig = Conf.all();
-    const defaultOpt = allConfig.cross[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`);
-    }
-
-    // eventEmitter
-    this._initEventEmitter();
-    
-    // format params
-    let tmpArgs = targetConf.args;
-    let confPort = parseInt(Helper.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 = Helper.replaceArgsValue(tmpArgs, "port", String(confPort));
-    }
-
-    // 创建进程
-    const subProcess = new SpawnProcess(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;
-  },  
-
-  /**
-   * init path
-   */  
-  _initPath() {
-    const pathname = Ps.getUserHomeConfigDir();
-    if (!fs.existsSync(pathname)) {
-      Helper.mkdir(pathname, {mode: 0o755});
-    }
-  },
-
-}
-
-module.exports = CrossLanguageService;
+module.exports = {
+  CrossProcess,
+  cross
+};

package/cross/spawnProcess.js

@@ -1,13 +1,15 @@
+'use strict';
+
 const EventEmitter = require('events');
 const path = require('path');
 const crossSpawn = require('cross-spawn');
-const Log = require('../log');
-const Ps = require('../ps');
-const Channel = require('../const/channel');
-const EE = require('../ee');
-const Helper = require('../utils/helper');
-const UtilsIs = require('../utils/is');
-const UtilsPargv = require('../utils/pargv');
+const { coreLogger } = require('../log');
+const { getExtraResourcesDir, isPackaged, isDev, getBaseDir } = require('../ps');
+const { Events } = require('../const/channel');
+const { getRandomString, getValueFromArgv } = require('../utils/helper');
+const { is } = require('../utils');
+const { parseArgv } = require('../utils/pargv');
+const { app: electronApp } = require('electron');
 
 class SpawnProcess {
   constructor(host, opt = {}) {
@@ -35,9 +37,9 @@ class SpawnProcess {
     // Launch executable program
     let cmdPath = '';
     let cmdArgs = targetConf.args;
-    let execDir = Ps.getExtraResourcesDir();
+    let execDir = getExtraResourcesDir();
     let standardOutput = ['inherit', 'inherit', 'inherit', 'ipc'];
-    if (Ps.isPackaged()) {
+    if (isPackaged()) {
       standardOutput = ['ignore', 'ignore', 'ignore', 'ipc'];
     }
     if (targetConf.stdio) {
@@ -51,18 +53,18 @@ class SpawnProcess {
         throw new Error(`[ee-core] [cross] The config [directory] attribute does not exist`);
       }
       cmdPath = cmd;
-      if (!path.isAbsolute(cmd) && !Ps.isDev()) {
-        cmdPath = path.join(Ps.getExtraResourcesDir(), cmd);
+      if (!path.isAbsolute(cmd) && !isDev()) {
+        cmdPath = path.join(getExtraResourcesDir(), cmd);
       }
     } else {
-      cmdPath = path.join(Ps.getExtraResourcesDir(), targetConf.name);
+      cmdPath = path.join(getExtraResourcesDir(), targetConf.name);
     }
 
     // windows
-    if (UtilsIs.windows() && path.extname(cmdPath) != '.exe') {
+    if (is.windows() && path.extname(cmdPath) != '.exe') {
       // Complete the executable program extension
       // notice: python.exe may bring up the App Store
-      if (targetConf.windowsExtname === true || !Ps.isDev()) {
+      if (targetConf.windowsExtname === true || !isDev()) {
         cmdPath += ".exe";
       }
     }
@@ -71,16 +73,16 @@ class SpawnProcess {
     if (directory && path.isAbsolute(directory)) {
       execDir = directory;
     } else if (directory && !path.isAbsolute(directory)) {
-      if (Ps.isDev()) {
-        execDir = path.join(Ps.getHomeDir(), directory);
+      if (isDev()) {
+        execDir = path.join(getBaseDir(), directory);
       } else {
-        execDir = path.join(Ps.getExtraResourcesDir(), directory);
+        execDir = path.join(getExtraResourcesDir(), directory);
       }
     } else {
-      execDir = Ps.getExtraResourcesDir();
+      execDir = getExtraResourcesDir();
     }
 
-    Log.coreLogger.info(`[ee-core] [cross/run] cmd: ${cmdPath}, args: ${cmdArgs}`);
+    coreLogger.info(`[ee-core] [cross/run] cmd: ${cmdPath}, args: ${cmdArgs}`);
     const coreProcess = crossSpawn(cmdPath, cmdArgs, { 
       stdio: standardOutput, 
       detached: false,
@@ -94,9 +96,9 @@ class SpawnProcess {
       let data = {
         pid: this.pid
       }
-      this.host.emitter.emit(Channel.events.childProcessExit, data);
+      this.host.emitter.emit(Events.childProcessExit, data);
       // Child process closed: The child process was killed externally or an internal error caused the application to stop, resulting in the application exiting
-      Log.coreLogger.info(`[ee-core] [corss/process] received a exit from child-process, code:${code}, signal:${signal}, pid:${this.pid}, cmd:${cmdPath}, args: ${cmdArgs}`);
+      coreLogger.info(`[ee-core] [corss/process] received a exit from child-process, code:${code}, signal:${signal}, pid:${this.pid}, cmd:${cmdPath}, args: ${cmdArgs}`);
       this._exitElectron();
     });
 
@@ -104,8 +106,8 @@ class SpawnProcess {
       let data = {
         pid: this.pid
       }
-      this.host.emitter.emit(Channel.events.childProcessError, data);
-      Log.coreLogger.error(`[ee-core] [corss/process] received a error from child-process, error: ${err}, pid:${this.pid}`);
+      this.host.emitter.emit(Events.childProcessError, data);
+      coreLogger.error(`[ee-core] [corss/process] received a error from child-process, error: ${err}, pid:${this.pid}`);
       this._exitElectron();
     });
   }
@@ -121,29 +123,9 @@ class SpawnProcess {
     }, timeout)
   }
 
-  // send(message) {
-  //   return this.sendByType(message, 'message');
-  // }
-
-  // close() {
-  //   return this.sendByType('close', 'close');
-  // }
-
-  // async sendByType(message, type) {
-  //   const msg = typeof message === 'string' ? message : JSON.stringify(message);
-  //   const id = this._generateId();
-
-  //   this.child.send({
-  //       id,
-  //       type,
-  //       data: msg,
-  //   });
-  //   return;
-  // }
-
   getUrl() {
-    const ssl = Helper.getValueFromArgv(this.config.args, 'ssl');
-    let hostname = Helper.getValueFromArgv(this.config.args, 'hostname')
+    const ssl = getValueFromArgv(this.config.args, 'ssl');
+    let hostname = getValueFromArgv(this.config.args, 'hostname')
     let protocol = 'http://';
     if (ssl && (ssl == 'true' || ssl == '1')) {
       protocol = 'https://';
@@ -155,7 +137,7 @@ class SpawnProcess {
   }
 
   getArgsObj() {
-    const obj = UtilsPargv(this.config.args);
+    const obj = parseArgv(this.config.args);
     return obj;
   }
 
@@ -164,7 +146,7 @@ class SpawnProcess {
   }
 
   _generateId() {
-    const rid = Helper.getRandomString();
+    const rid = getRandomString();
     return `node:${this.pid}:${rid}`;
   }
 
@@ -172,14 +154,15 @@ class SpawnProcess {
    * exit electron
    */
   _exitElectron(timeout = 1000) {
-    const { CoreApp } = EE;
     if (this.config.appExit) {
       setTimeout(() => {
-        // 进程退出前的一些清理工作
-        CoreApp.appQuit();
+        // 主进程退出
+        electronApp.quit();
       }, timeout)
     }
   }
 }
 
-module.exports = SpawnProcess;
+module.exports = {
+  SpawnProcess
+};

package/electron/app/index.js

@@ -1,64 +1,48 @@
-const { app } = require('electron');
-const EE = require('../../ee');
-const Log = require('../../log');
-const Electron = require('../index');
-const UtilsIs = require('../../utils/is');
-const Cross = require('../../cross');
-const Window = require('../window');
+'use strict';
+
+const debug = require('debug')('ee-core:electron:app');
+const { app: electronApp } = require('electron');
+const { coreLogger } = require('../../log');
+const { is } = require('../../utils');
+const { cross } = require('../../cross');
+const { createMainWindow, setCloseAndQuit, loadServer } = require('../window');
+const { eventBus, ElectronAppReady, BeforeClose, Preload } = require('../../app/events');
+const { getConfig } = require('../../config');
 
 /**
- * CoreElectronApp (框架封装的electron app对象)
+ * 创建electron应用
  */
-const CoreElectronApp = {
-
-  /**
-   * 创建electron应用
-   */
-  async create() {
-    const { CoreApp } = EE;
-
-    const gotTheLock = app.requestSingleInstanceLock();
-    if (!gotTheLock) {
-      app.quit();
-    }
-
-    app.whenReady().then(() => {
-      CoreApp.createWindow();
-    })
-
-    // 显示首次打开的窗口
-    app.on('second-instance', () => {
-      Log.coreLogger.info('[ee-core] [lib/eeApp] second-instance');
-      Window.restoreMainWindow();
-    });
-
-    app.on('window-all-closed', () => {
-      if (!UtilsIs.macOS()) {
-        Log.coreLogger.info('[ee-core] [lib/eeApp] window-all-closed quit');
-        CoreApp.appQuit();
-      }
-    })
-
-    app.on('before-quit', () => {
-      Electron.extra.closeWindow = true;
+function createElectron() {
+  const { singleLock } = getConfig();
+  // 允许多个实例 
+  const gotTheLock = electronApp.requestSingleInstanceLock();
+  if (singleLock && !gotTheLock) {
+    electronApp.quit();
+  }
 
-      // kill cross services
-      Cross.killAll();
-    })
+  electronApp.whenReady().then(() => {
+    createMainWindow();
+    eventBus.emitLifecycle(Preload);
+    loadServer();
+  })
 
-    if (CoreApp.config.hardGpu.enable == false) {
-      app.disableHardwareAcceleration();
+  electronApp.on('window-all-closed', () => {
+    if (!is.macOS()) {
+      coreLogger.info('[ee-core] [lib/eeApp] window-all-closed quit');
+      electronApp.quit(); 
     }
+  })
 
-    return app;
-  },
+  electronApp.on('before-quit', () => {
+    setCloseAndQuit(true);
+    eventBus.emitLifecycle(BeforeClose);
+    cross.killAll();
+  })
 
-  /**
-   * 退出app
-   */
-  quit() {
-    app.quit();
-  }
+  eventBus.emitLifecycle(ElectronAppReady);
 }
 
-module.exports = CoreElectronApp;
+module.exports = {
+  electronApp,
+  createElectron,
+};

package/electron/index.js

@@ -1,20 +1,16 @@
-const Window = require('./window');
+'use strict';
 
-const Electron = {
+const { createElectron } = require("./app");
+const { getMainWindow, setCloseAndQuit, getCloseAndQuit } = require("./window");
 
-  /**
-   * 兼容1.x版本api
-   */
-  get mainWindow() {
-    return Window.getMainWindow();
-  },
+// load socket server
+function loadElectron() {
+  createElectron();
+}
 
-  /**
-   * extra
-   */
-  extra: {
-    closeWindow: false,
-  }, 
-};
-
-module.exports = Electron;
+module.exports = {
+  loadElectron,
+  getMainWindow,
+  setCloseAndQuit,
+  getCloseAndQuit
+};