ee-core 2.7.0-beta.6 → 2.7.0-beta.8

package/cross/index.js

@@ -9,7 +9,7 @@ const UtilsPargv = require('../utils/pargv');
 const Ps = require('../ps');
 const Log = require('../log');
 const GetPort = require('../utils/get-port');
-const CoreElectronApp = require('../electron/app');
+const { app: electronApp } = require('electron');
 
 /**
  * Cross-language service
@@ -17,7 +17,7 @@ const CoreElectronApp = require('../electron/app');
  */
 const CrossLanguageService = {
 
-  execProcess: {},
+  children: {},
 
   /**
    * create
@@ -63,19 +63,37 @@ const CrossLanguageService = {
     Log.coreLogger.info(`[ee-core] [cross/run] cmd: ${cmdPath}, args: ${cmdArgs}`);
 
     // Launch executable program
-    const coreProcess = crossSpawn(cmdPath, cmdArgs, { stdio: 'ignore', detached: false });
+    //ignore inherit
+    const coreProcess = crossSpawn(cmdPath, cmdArgs, { stdio: 'inherit', 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 !!!`);
       }
 
-      setTimeout(() => {
-        // 延迟退出，进程退出前的一些处理
-        CoreElectronApp.quit();
-      }, 1000)
+      // electron quit
+      if (conf.appExit) {
+        setTimeout(() => {
+          // 进程退出前的一些清理工作
+          electronApp.quit();
+        }, 1000)
+      }
+    });
+    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)
+      }
     });
-    // this.execProcess[cmdName] = coreProcess;
   },
 
   getArgs(argv, key) {

package/ee/application.js

@@ -88,8 +88,6 @@ class Appliaction extends EeApp {
     await this.createPorts();
 
     await this.startSocket();
-
-    await this.crossService();
     
     await this.ready();
 

package/ee/eeApp.js

@@ -77,6 +77,8 @@ class EeApp extends BaseApp {
       return
     }
 
+    await this.crossService();
+    
     await this.electronAppReady();
   }
     

package/electron/app/index.js

@@ -3,6 +3,7 @@ const EE = require('../../ee');
 const Log = require('../../log');
 const Electron = require('../index');
 const UtilsIs = require('../../utils/is');
+const Cross = require('../../cross');
 
 /**
  * CoreElectronApp (框架封装的electron app对象)
@@ -34,6 +35,9 @@ const CoreElectronApp = {
 
     app.on('before-quit', () => {
       Electron.extra.closeWindow = true;
+
+      // kill cross services
+      Cross.kill();
     })
 
     if (CoreApp.config.hardGpu.enable == false) {

package/package.json

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