ee-bin 4.0.0 → 4.0.1

package/config/bin_default.js

@@ -26,6 +26,7 @@ module.exports = {
       loadingPage: '/public/html/loading.html',
       watch: false,
       sync: false,
+      delay: 1000,
     },
   },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-bin",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "ee bin",
   "main": "index.js",
   "scripts": {
@@ -26,6 +26,7 @@
     "is-type-of": "^1.2.1",
     "javascript-obfuscator": "^4.0.2",
     "json5": "^2.2.3",
-    "mkdirp": "^2.1.3"
+    "mkdirp": "^2.1.3",
+    "tree-kill": "^1.2.2"
   }
 }

package/tools/serve.js

@@ -9,6 +9,7 @@ const chalk = require('chalk');
 const crossSpawn = require('cross-spawn');
 const { buildSync } = require('esbuild');
 const chokidar = require('chokidar');
+const kill = require('tree-kill');
 
 class ServeProcess {
 
@@ -57,16 +58,23 @@ class ServeProcess {
           // rebuild code
           this.bundle(binCfg.build.electron);
           let subPorcess = this.execProcess[cmd];
-          subPorcess.kill();
+          kill(subPorcess.pid, 'SIGKILL', (err) => {
+            if (err) {
+              console.log(chalk.red('[ee-bin] [dev] ') + `Restart failed, error: ${err}`);
+              process.exit(-1);
+            }
+          })
           delete this.execProcess[cmd];
   
           // restart electron command
-          let onlyElectronOpt = {
-            binCmd,
-            binCmdConfig,
-            command: cmd,
-          }
-          this.multiExec(onlyElectronOpt);
+          setTimeout(() => {
+            let onlyElectronOpt = {
+              binCmd,
+              binCmdConfig,
+              command: cmd,
+            }
+            this.multiExec(onlyElectronOpt);
+          }, electronConfig.delay);
         });
       }