ee-core 2.7.0 → 2.8.0-beta.1

package/config/config.default.js

@@ -262,7 +262,7 @@ module.exports = appInfo => {
 
   /* 主进程加载的地址 */
   config.mainServer = {
-    protocol: 'http://', // http:// | https:// | file://
+    protocol: 'file://', // http:// | https:// | file://
     indexPath: '/public/dist/index.html',
     host: 'localhost',
     port: 7072, // 默认端口（如果端口被使用，则随机获取一个）

package/cross/index.js

@@ -1,5 +1,5 @@
 const fs = require('fs');
-const crossSpawn = require('cross-spawn');
+const EventEmitter = require('events');
 const path = require('path');
 const is = require('is-type-of');
 const Conf = require('../config/cache');
@@ -9,7 +9,8 @@ const UtilsPargv = require('../utils/pargv');
 const Ps = require('../ps');
 const Log = require('../log');
 const GetPort = require('../utils/get-port');
-const { app: electronApp } = require('electron');
+const SpawnProcess = require('./spawnProcess');
+const Channel = require('../const/channel');
 
 /**
  * Cross-language service
@@ -17,18 +18,24 @@ const { app: electronApp } = require('electron');
  */
 const CrossLanguageService = {
 
+  emitter: undefined,
+
+  /**
+   * pid唯一
+   * {pid:{name,entity}, pid:{name,entity}, ...}
+   */
   children: {},
 
+  /**
+   * name唯一
+   * {name:pid, name:pid, ...}
+   */
+  childrenMap: {},
+
   /**
    * create
    */
   async create() {
-    if (!Ps.isProd()) {
-      return
-    }
-
-    // init dir
-    this._initPath();
 
     // boot services
     const servicesCfg = Conf.getValue('cross');
@@ -37,79 +44,113 @@ const CrossLanguageService = {
     for (let key of Object.keys(servicesCfg)) {
       let cfg = servicesCfg[key];
       if (cfg.enable == true) {
-        this.run(cfg)
+        this.run(key)
       }
     }
   },
 
+  /**
+   * _initEventEmitter
+   */
+  async _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];
+    });
+  },
+
   /**
    * run
    */
-  async run(conf = {}) {
-    const cmdName = conf.name;
-    const cmdPath = this._getCmdPath(cmdName);
-    let cmdArgs = is.string(conf.args) ? [conf.args] : conf.args;
-
-    // 动态生成port
-    // if (Ps.isProd() || this.workspaces.length > 0) {
-    let confPort = this.getArgs(cmdArgs, 'port');
-    if (!confPort) {
-      throw new Error(`[ee-core] [cross/run]  --port parameter does not exist!`);
+  async run(service) {
+    // init dir
+    this._initPath();
+
+    const allConfig = Conf.all();
+    if (!allConfig.cross.hasOwnProperty(service)) {
+      throw new Error(`[ee-core] [cross] The service [${service}] config does not exit`);
+    }
+
+    const targetConf = Object.assign({}, allConfig.cross[service]);
+
+    // 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
+      confPort = await GetPort({ port: confPort });
+      // 替换port
+      cmdArgs = this._replaceValue(cmdArgs, "--port=", confPort)
+      targetConf.args = cmdArgs;
     }
-    confPort = await GetPort({ port: confPort });
-    // 替换port
-    cmdArgs = this.replaceValue(cmdArgs, "--port=", confPort)
 
     Log.coreLogger.info(`[ee-core] [cross/run] cmd: ${cmdPath}, args: ${cmdArgs}`);
 
-    // Launch executable program
-    let standardOutput = 'ignore';
-    if (!Ps.isPackaged()) {
-      standardOutput = 'inherit'
+    // 创建进程
+    const subProcess = new SpawnProcess(this, { cmdPath, cmdArgs, targetConf });
+    let uniqueName = targetConf.name;
+    if (this.childrenMap.hasOwnProperty(uniqueName)) {
+      uniqueName = uniqueName + "-" + String(subProcess.pid);
     }
-    const coreProcess = crossSpawn(cmdPath, cmdArgs, { stdio: standardOutput, detached: false });
-    coreProcess.on('close', (code, signal) => {
-      Log.coreLogger.info(`[ee-core] [cross/run] [pid=${coreProcess.pid}, port=${confPort}] exited with code: ${code}, signal: ${signal}`);
-      if (0 !== code) {
-        // 弹错误窗口
-        Log.coreLogger.error(`[ee-core] [cross/run] Please check [${cmdName}] service log !!!`);
-      }
+    this.childrenMap[uniqueName] = subProcess.pid;
+    subProcess.name = uniqueName;
+    this.children[subProcess.pid] = {
+      name: uniqueName,
+      entity: subProcess
+    };
+
+    return subProcess;
+  },
 
-      // electron quit
-      if (conf.appExit) {
-        setTimeout(() => {
-          // 进程退出前的一些清理工作
-          electronApp.quit();
-        }, 1000)
-      }
+  killAll() {
+    Object.keys(this.children).forEach(pid => {
+      console.log("-----killAll: ", pid);
+      this.kill(pid)
     });
-    this.children[cmdName] = coreProcess;
   },
 
-  kill() {
-    Object.keys(this.children).forEach(key => {
-      let proc = this.children[key];
-      if (proc) {
-        proc.kill('SIGINT');
-        setTimeout(() => {
-          if (proc.killed) return;
-          proc.kill('SIGKILL');
-        }, 500)
-      }
-    });
+  kill(pid) {
+    const entity = this.getProc(pid);
+    if (entity) {
+      entity.kill();
+    }
   },
 
-  getArgs(argv, key) {
-    // parse args
-    let value = UtilsPargv(argv);
-    if (key) {
-      value = value[key];
+  killByName(name) {
+    const entity = this.getProcByName(name);
+    if (entity) {
+      entity.kill();
     }
+  },
+
+  _getValueFromArgs(argv, key) {
+    // parse args
+    const argsObj = UtilsPargv(argv);
+    const value = argsObj[key];
 
     return value;
   },
 
-  replaceValue(arr, key, value) {
+  _replaceValue(arr, key, value) {
     arr = arr.map(item => {
       if (item.startsWith(key)) {
           let newItem = key + value;
@@ -121,11 +162,9 @@ const CrossLanguageService = {
     return arr;
   },
 
-  getUrl(service) {
-    const cfg = Conf.getValue('cross');
-    const servicesCfg = cfg[service];
-
-    const args = this.getArgs(servicesCfg.args);
+  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://';
@@ -136,6 +175,35 @@ const CrossLanguageService = {
     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;
+  },  
+
   _getCmdPath(name) {
     const coreName =  UtilsIs.windows() ? name + ".exe" : name;
     const p = path.join(Ps.getExtraResourcesDir(), coreName);
@@ -146,14 +214,9 @@ const CrossLanguageService = {
    * init path
    */  
   _initPath() {
-    try {
-      const pathname = Ps.getUserHomeConfigDir();
-      if (!fs.existsSync(pathname)) {
-        UtilsHelper.mkdir(pathname, {mode: 0o755});
-      }
-    } catch (e) {
-      Log.coreLogger.error(e);
-      throw new Error(`[ee-core] [cross] mkdir ${pathname} failed !`);
+    const pathname = Ps.getUserHomeConfigDir();
+    if (!fs.existsSync(pathname)) {
+      UtilsHelper.mkdir(pathname, {mode: 0o755});
     }
   }    
 }

package/cross/spawnProcess.js

@@ -0,0 +1,133 @@
+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 Helper = require('../utils/helper');
+const UtilsPargv = require('../utils/pargv');
+
+class SpawnProcess {
+  constructor(host, opt = {}) {
+    this.emitter = new EventEmitter();
+    this.host = host;
+    this.child = undefined;
+    this.pid = 0;
+    this.name = "";
+    this.config = {};
+    this._init(opt);
+  }
+
+
+  /**
+   * 初始化子进程
+   */
+  _init(options = {}) {
+    const { cmdPath, cmdArgs, targetConf } = options;
+    this.config = targetConf;
+    this.name = this.config.name;
+
+    // Launch executable program
+    let standardOutput = ['ignore', 'ignore', 'ignore', 'ipc'];
+    if (!Ps.isPackaged()) {
+      standardOutput = ['inherit', 'inherit', 'inherit', 'ipc'];
+    }
+    let execDir = Ps.getExtraResourcesDir();
+    if (this.config.hasOwnProperty('directory')) {
+      execDir = path.join(process.cwd(), this.config.directory);
+    }
+
+    const coreProcess = crossSpawn(cmdPath, cmdArgs, { 
+      stdio: standardOutput, 
+      detached: false,
+      cwd: execDir, 
+      maxBuffer: 1024 * 1024 * 1024
+    });
+    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 = {
+        pid: this.pid
+      }
+      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}`);
+    });
+
+    coreProcess.on('error', (err) => {
+      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}`);
+    });
+  }
+
+  /**
+   * kill
+   */
+  kill(timeout = 1000) {
+    console.log("----- spawnProcess kill ----  ");
+    this.child.kill('SIGINT');
+    setTimeout(() => {
+      if (this.child.killed) return;
+      this.child.kill('SIGKILL');
+    }, timeout)
+  }
+
+  send(message) {
+    return this.sendByType(message, 'message');
+  }
+
+  close() {
+    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();
+
+    this.child.send({
+        id,
+        type,
+        data: msg,
+    });
+    return;
+  }
+
+  getArgsObj() {
+    const obj = UtilsPargv(this.config.args);
+    return obj;
+  }
+}
+
+module.exports = SpawnProcess;

package/electron/app/index.js

@@ -37,7 +37,7 @@ const CoreElectronApp = {
       Electron.extra.closeWindow = true;
 
       // kill cross services
-      Cross.kill();
+      Cross.killAll();
     })
 
     if (CoreApp.config.hardGpu.enable == false) {

package/jobs/child/forkProcess.js

@@ -23,7 +23,7 @@ class ForkProcess {
       processOptions: { 
         cwd: cwd,
         env: Ps.allEnv(), 
-        stdio: 'pipe' 
+        stdio: 'ignore' // pipe
       }
     }, opt);
 

package/main/index.js

@@ -6,6 +6,7 @@ const Ps = require('../ps');
 const EE = require('../ee');
 const UtilsCore = require('../core/lib/utils');
 const Loader = require('../loader');
+const UtilsPargv = require('../utils/pargv');
 
 class ElectronEgg {
 
@@ -23,6 +24,15 @@ class ElectronEgg {
     }
     Ps.initMode(this.mode);
 
+    // env 可能为空
+    const argsObj = UtilsPargv(process.argv);
+    let isDev = false;
+    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()) {
       const { Application } = EE;
@@ -31,7 +41,7 @@ class ElectronEgg {
     }
 
     let baseDir = path.join(app.getAppPath(), 'electron');
-    if (Utils.isEncrypt(app.getAppPath())) {
+    if (!isDev && Utils.isEncrypt(app.getAppPath())) {
       baseDir = Ps.getEncryptDir(app.getAppPath());
     }
 
@@ -42,7 +52,7 @@ class ElectronEgg {
     }
 
     const EEApp = UtilsCore.loadFile(indexFile);
-    EE.app = new EEApp(this.env);
+    EE.app = new EEApp();
   }
 }
 

package/package.json

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

package/ps/index.js

@@ -5,7 +5,7 @@ const eis = require('../utils/is');
  * 初始化模式
  */
 exports.initMode = function(mode) {
-  // process.env.EE_MODE === undefined
+  if(process.env.EE_MODE !== undefined)return
   return process.env.EE_MODE = mode ? mode : 'framework';
 }
 
@@ -242,7 +242,7 @@ exports.getUserHomeDir = function() {
 }
 
 /**
- * 获取用户目录配置数据目录
+ * 获取用户配置数据目录
  */
 exports.getUserHomeConfigDir = function() {
   // const filePath = path.join(this.getHomeDir(), 'package.json');

package/socket/httpServer.js

@@ -29,13 +29,13 @@ class HttpServer {
       throw new Error('[ee-core] [socket/HttpServer] http port required, and must be a number !');
     }
 
-    this.create();
+    this._create();
   }
 
   /**
    * 创建服务
    */
-  create () {
+  _create () {
     const app = this.app;
     const httpServer = this.options;
     const isHttps = httpServer?.https?.enable ?? false;
@@ -62,7 +62,7 @@ class HttpServer {
         ctx.eeApp = app;
         await next();
       })
-      .use(this.dispatch);
+      .use(this._dispatch);
 
     let msg = '[ee-core] [socket/http] server is: ' + url;
 
@@ -86,13 +86,14 @@ class HttpServer {
   /**
    * 路由分发
    */
-  async dispatch (ctx, next) {
+  async _dispatch (ctx, next) {
     const config = ctx.eeApp.config.httpServer;
     let uriPath = ctx.request.path;
     const method = ctx.request.method;
     let params = ctx.request.query;
     params = is.object(params) ? JSON.parse(JSON.stringify(params)) : {};
     const body = ctx.request.body;
+    const files = ctx.request.files;
 
     // 默认
     ctx.response.status = 200;
@@ -117,7 +118,10 @@ class HttpServer {
         uriPath = 'controller/' + uriPath;
       }
       const cmd = uriPath.split('/').join('.');
-      const args = (method == 'POST') ? body : params;
+      const args = (method == 'POST') ? (ctx.request.header['content-type'] && ctx.request.header['content-type'].startsWith('multipart/form-data;') ? files : body) : params;
+      args.files = ctx.request.files;
+      args.body = ctx.request.body;
+      args.query = ctx.request.query;
       let fn = null;
       if (is.string(cmd)) {
         const actions = cmd.split('.');
@@ -140,4 +144,4 @@ class HttpServer {
   }
 }
 
-module.exports = HttpServer;
+module.exports = HttpServer;