ee-core 2.8.0-beta.1 → 2.8.0-beta.3

package/cross/index.js

@@ -1,16 +1,12 @@
 const fs = require('fs');
 const EventEmitter = require('events');
-const path = require('path');
-const is = require('is-type-of');
 const Conf = require('../config/cache');
-const UtilsHelper = require('../utils/helper');
-const UtilsIs = require('../utils/is');
-const UtilsPargv = require('../utils/pargv');
+const Helper = require('../utils/helper');
 const Ps = require('../ps');
-const Log = require('../log');
-const GetPort = require('../utils/get-port');
 const SpawnProcess = require('./spawnProcess');
 const Channel = require('../const/channel');
+const extend = require('../utils/extend');
+const GetPort = require('../utils/get-port');
 
 /**
  * Cross-language service
@@ -39,7 +35,7 @@ const CrossLanguageService = {
 
     // boot services
     const servicesCfg = Conf.getValue('cross');
-    //await UtilsHelper.sleep(5 * 1000);
+    //await Helper.sleep(5 * 1000);
 
     for (let key of Object.keys(servicesCfg)) {
       let cfg = servicesCfg[key];
@@ -52,19 +48,17 @@ const CrossLanguageService = {
   /**
    * _initEventEmitter
    */
-  async _initEventEmitter() {
+  _initEventEmitter() {
     if (this.emitter) {
       return
     }
     this.emitter = new EventEmitter();  
     this.emitter.on(Channel.events.childProcessExit, (data) => {
-      console.log("------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) => {
-      console.log("------childProcessError:", data)
       const child = this.children[data.pid];
       delete this.childrenMap[child.name];
       delete this.children[data.pid];
@@ -74,39 +68,37 @@ const CrossLanguageService = {
   /**
    * run
    */
-  async run(service) {
+  async run(service, opt = {}) {
     // init dir
     this._initPath();
 
     const allConfig = Conf.all();
-    if (!allConfig.cross.hasOwnProperty(service)) {
+    const defaultOpt = allConfig.cross[service] || {};
+    console.log("defaultOpt:", defaultOpt);
+    //const targetConf = Object.assign({}, defaultOpt, opt);
+    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`);
     }
-
-    const targetConf = Object.assign({}, allConfig.cross[service]);
+    console.log("targetConf:", targetConf);
 
     // eventEmitter
     this._initEventEmitter();
     
-    let cmdPath = this._getCmdPath(targetConf.name);
-    let cmdArgs = is.string(targetConf.args) ? [targetConf.args] : targetConf.args;
-    if (targetConf.hasOwnProperty('cmd')) {
-      cmdPath = targetConf.cmd;
-    }
-
-    let confPort = this._getValueFromArgs(cmdArgs, 'port');
-    if (UtilsHelper.validValue(confPort)) {
-      // 动态生成port
+    // format params
+    let tmpArgs = targetConf.args;
+    let confPort = parseInt(Helper.getValueFromArgv(tmpArgs, 'port'));
+    console.log("confPort1:", confPort);
+    if (confPort > 0) {
+      // 动态生成port，传入的端口必须为int
       confPort = await GetPort({ port: confPort });
+      console.log("confPort2:", confPort);
       // 替换port
-      cmdArgs = this._replaceValue(cmdArgs, "--port=", confPort)
-      targetConf.args = cmdArgs;
+      targetConf.args = Helper.replaceArgsValue(tmpArgs, "port", String(confPort));
     }
 
-    Log.coreLogger.info(`[ee-core] [cross/run] cmd: ${cmdPath}, args: ${cmdArgs}`);
-
     // 创建进程
-    const subProcess = new SpawnProcess(this, { cmdPath, cmdArgs, targetConf });
+    const subProcess = new SpawnProcess(this, { targetConf, port: confPort });
     let uniqueName = targetConf.name;
     if (this.childrenMap.hasOwnProperty(uniqueName)) {
       uniqueName = uniqueName + "-" + String(subProcess.pid);
@@ -123,7 +115,6 @@ const CrossLanguageService = {
 
   killAll() {
     Object.keys(this.children).forEach(pid => {
-      console.log("-----killAll: ", pid);
       this.kill(pid)
     });
   },
@@ -142,35 +133,9 @@ const CrossLanguageService = {
     }
   },
 
-  _getValueFromArgs(argv, key) {
-    // parse args
-    const argsObj = UtilsPargv(argv);
-    const value = argsObj[key];
-
-    return value;
-  },
-
-  _replaceValue(arr, key, value) {
-    arr = arr.map(item => {
-      if (item.startsWith(key)) {
-          let newItem = key + value;
-          return newItem;
-      } else {
-          return item;
-      }
-    });
-    return arr;
-  },
-
   getUrl(name) {
     const entity = this.getProcByName(name);
-    const args = entity.getArgsObj();
-    let protocol = 'http://';
-    if (args.hasOwnProperty('ssl') && (args.ssl == 'true' || args.ssl == '1')) {
-      protocol = 'https://';
-    }
-    const hostname = args.hostname ? args.hostname : '127.0.0.1';
-    const url = protocol + hostname + ":" + args.port;
+    const url = entity.getUrl();
 
     return url;
   },
@@ -204,21 +169,16 @@ const CrossLanguageService = {
     return pids;
   },  
 
-  _getCmdPath(name) {
-    const coreName =  UtilsIs.windows() ? name + ".exe" : name;
-    const p = path.join(Ps.getExtraResourcesDir(), coreName);
-    return p;
-  },
-
   /**
    * init path
    */  
   _initPath() {
     const pathname = Ps.getUserHomeConfigDir();
     if (!fs.existsSync(pathname)) {
-      UtilsHelper.mkdir(pathname, {mode: 0o755});
+      Helper.mkdir(pathname, {mode: 0o755});
     }
-  }    
+  },
+
 }
 
 module.exports = CrossLanguageService;

package/cross/spawnProcess.js

@@ -1,12 +1,12 @@
 const EventEmitter = require('events');
 const path = require('path');
 const crossSpawn = require('cross-spawn');
-const serialize = require('serialize-javascript');
-const { app: electronApp } = require('electron');
 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');
 
 class SpawnProcess {
@@ -15,30 +15,73 @@ class SpawnProcess {
     this.host = host;
     this.child = undefined;
     this.pid = 0;
+    this.port = 0;
     this.name = "";
     this.config = {};
     this._init(opt);
   }
 
-
   /**
    * 初始化子进程
    */
   _init(options = {}) {
-    const { cmdPath, cmdArgs, targetConf } = options;
+    const { targetConf, port } = options;
     this.config = targetConf;
-    this.name = this.config.name;
+    this.port = port;
+    // 该名称如果在childrenMap重复，会被重写
+    this.name = targetConf.name;
 
     // Launch executable program
-    let standardOutput = ['ignore', 'ignore', 'ignore', 'ipc'];
-    if (!Ps.isPackaged()) {
-      standardOutput = ['inherit', 'inherit', 'inherit', 'ipc'];
-    }
+    let cmdPath = '';
+    let cmdArgs = targetConf.args;
+    console.log("targetConf.args:", targetConf.args);
     let execDir = Ps.getExtraResourcesDir();
-    if (this.config.hasOwnProperty('directory')) {
-      execDir = path.join(process.cwd(), this.config.directory);
+    let standardOutput = ['inherit', 'inherit', 'inherit', 'ipc'];
+    if (Ps.isPackaged()) {
+      standardOutput = ['ignore', 'ignore', 'ignore', 'ipc'];
+    }
+    
+    const { cmd, directory } = targetConf;
+    // use cmd first
+    if (cmd) {
+      console.log("cmd:", cmd)
+      console.log("cmd isAbsolute :", path.isAbsolute(cmd))
+      if (!directory) {
+        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);
+      }
+    } else {
+      cmdPath = path.join(Ps.getExtraResourcesDir(), targetConf.name);
+    }
+
+    // windonw
+    if (UtilsIs.windows() && path.extname(cmdPath) != '.exe') {
+      cmdPath += ".exe";
+    }
+
+    console.log("cmdPath:", cmdPath)
+
+    // executable program directory
+    console.log("directory:", directory)
+    if (directory && path.isAbsolute(directory)) {
+      console.log("directory isAbsolute :", path.isAbsolute(directory))
+      execDir = directory;
+    } else if (directory && !path.isAbsolute(directory)) {
+      console.log("directory isAbsolute :", path.isAbsolute(directory))
+      if (Ps.isDev()) {
+        execDir = path.join(Ps.getHomeDir(), directory);
+      } else {
+        execDir = path.join(Ps.getExtraResourcesDir(), directory);
+      }
+    } else {
+      execDir = Ps.getExtraResourcesDir();
     }
+    console.log("execDir:", execDir)
 
+    Log.coreLogger.info(`[ee-core] [cross/run] cmd: ${cmdPath}, args: ${cmdArgs}`);
     const coreProcess = crossSpawn(cmdPath, cmdArgs, { 
       stdio: standardOutput, 
       detached: false,
@@ -47,28 +90,6 @@ class SpawnProcess {
     });
     this.child = coreProcess;
     this.pid = coreProcess.pid;
-    coreProcess.on('close', (code, signal) => {
-      Log.coreLogger.info(`[ee-core] [cross/process] received a close from child-process, code:${code}, signal:${signal}, pid:${this.pid}`);
-
-      // electron quit
-      if (this.config.appExit) {
-        setTimeout(() => {
-          // 进程退出前的一些清理工作
-          electronApp.quit();
-        }, 1000)
-      }
-    });
-
-    coreProcess.on('message', (m) => {
-      Log.coreLogger.info(`[ee-core] [corss/process] received a message from child-process, message: ${serialize(m)}`);
-      
-      if (!m || !m.id) {
-        return;
-      }
-
-      // 收到子进程消息，转发到 event 
-      //this.emitter.emit(m.event, m.data);
-    });
 
     coreProcess.on('exit', (code, signal) => {
       let data = {
@@ -76,6 +97,7 @@ class SpawnProcess {
       }
       this.host.emitter.emit(Channel.events.childProcessExit, data);
       Log.coreLogger.info(`[ee-core] [corss/process] received a exit from child-process, code:${code}, signal:${signal}, pid:${this.pid}`);
+      this._exitElectron();
     });
 
     coreProcess.on('error', (err) => {
@@ -84,6 +106,7 @@ class SpawnProcess {
       }
       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._exitElectron();
     });
   }
 
@@ -91,7 +114,6 @@ class SpawnProcess {
    * kill
    */
   kill(timeout = 1000) {
-    console.log("----- spawnProcess kill ----  ");
     this.child.kill('SIGINT');
     setTimeout(() => {
       if (this.child.killed) return;
@@ -107,11 +129,6 @@ class SpawnProcess {
     return this.sendByType('close', 'close');
   }
 
-  _generateId() {
-    const rid = Helper.getRandomString();
-    return `node:${this.pid}:${rid}`;
-  }
-
   async sendByType(message, type) {
     const msg = typeof message === 'string' ? message : JSON.stringify(message);
     const id = this._generateId();
@@ -124,10 +141,41 @@ class SpawnProcess {
     return;
   }
 
+  getUrl() {
+    const ssl = Helper.getValueFromArgv(this.config.args, 'ssl');
+    let hostname = Helper.getValueFromArgv(this.config.args, 'hostname')
+    let protocol = 'http://';
+    if (ssl && (ssl == 'true' || ssl == '1')) {
+      protocol = 'https://';
+    }
+    hostname = hostname ? hostname : '127.0.0.1';
+    const url = protocol + hostname + ":" + this.port;
+
+    return url;
+  }
+
   getArgsObj() {
     const obj = UtilsPargv(this.config.args);
     return obj;
   }
+
+  _generateId() {
+    const rid = Helper.getRandomString();
+    return `node:${this.pid}:${rid}`;
+  }
+
+  /**
+   * exit electron
+   */
+  _exitElectron(timeout = 1000) {
+    const { CoreApp } = EE;
+    if (this.config.appExit) {
+      setTimeout(() => {
+        // 进程退出前的一些清理工作
+        CoreApp.appQuit();
+      }, timeout)
+    }
+  }
 }
 
 module.exports = SpawnProcess;

package/ee/eeApp.js

@@ -32,19 +32,19 @@ class EeApp extends BaseApp {
    */
   async createPorts() {
     if (Ps.isFrameworkMode() && Conf.isWebProtocol(this.config.mainServer)) {
-      const mainPort = await GetPort({port: this.config.mainServer.port});
+      const mainPort = await GetPort({port: parseInt(this.config.mainServer.port)});
       process.env.EE_MAIN_PORT = mainPort;
       this.config.mainServer.port = mainPort;
     }
 
     if (this.config.socketServer.enable) {
-      const socketPort = await GetPort({port: this.config.socketServer.port});
+      const socketPort = await GetPort({port: parseInt(this.config.socketServer.port)});
       process.env.EE_SOCKET_PORT = socketPort;
       this.config.socketServer.port = socketPort;
     }
     
     if (this.config.httpServer.enable) {
-      const httpPort = await GetPort({port: this.config.httpServer.port});
+      const httpPort = await GetPort({port: parseInt(this.config.httpServer.port)});
       process.env.EE_HTTP_PORT = httpPort;
       this.config.httpServer.port = httpPort;
     }

package/main/index.js

@@ -30,8 +30,6 @@ class ElectronEgg {
     if ( argsObj['env'] == 'development' || argsObj['env'] === 'dev' || argsObj['env'] === 'local' ) {
       isDev = true;
     }
-    console.log("argsObj env:", argsObj)
-    console.log("isDev:", isDev)
 
     // module mode
     if (Ps.isModuleMode()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.8.0-beta.1",
+  "version": "2.8.0-beta.3",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/utils/helper.js

@@ -5,6 +5,7 @@ const is = require('is-type-of');
 const co = require('./co');
 const path = require('path');
 const chalk = require('chalk');
+const Pargv = require('./pargv');
 
 const _basePath = process.cwd();
 
@@ -172,4 +173,58 @@ exports.loadConfig = function(prop) {
 
 exports.sleep = function(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
+};
+
+exports.replaceArgsValue = function(argv, key, value) {
+  key = key + "=";
+  for (let i = 0; i < argv.length; i++) {
+    let item = argv[i];
+    let pos = item.indexOf(key);
+    if (pos !== -1) {
+      pos = pos + key.length;
+      console.log("pos2:", pos)
+      let tmpStr = item.substring(0, pos);
+      console.log("tmpStr:", tmpStr)
+      argv[i] = tmpStr + value;
+      break;
+    }
+  }
+
+  return argv;
+};
+
+// exports.replaceValue = function(arr, key, value) {
+//   arr = arr.map(item => {
+//     if (item.startsWith(key)) {
+//         let newItem = key + value;
+//         return newItem;
+//     } else {
+//         return item;
+//     }
+//   });
+//   return arr;
+// };
+
+exports.getValueFromArgv = function(argv, key) {
+  const argvObj = Pargv(argv);
+  if (argvObj.hasOwnProperty(key)) {
+    return argvObj[key];
+  }
+
+  // match search
+  key = key + "=";
+  let value;
+  for (let i = 0; i < argv.length; i++) {
+    let item = argv[i];
+    let pos = item.indexOf(key);
+    if (pos !== -1) {
+      pos = pos + key.length;
+      console.log("pos2:", pos)
+      value = item.substring(pos);
+      console.log("value:", value)
+      break;
+    }
+  }
+
+  return value;
 };