fix: windows exit immediate (#4)

midwayjs · Jan 9, 2024 · 7bf4fa7 · 7bf4fa7
1 parent 3467122
commit 7bf4fa7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -56,11 +56,13 @@ function run() {
     },
   });
 
-  function onSignal() {
+  async function onSignal() {
     try {
       restart.clear();
       child.kill();
-      runChild && runChild.kill();
+      if (runChild) {
+        await runChild.kill();
+      }
       process.exit(0);
     } catch (err) {
       console.error(err);

diff --git a/lib/process.js b/lib/process.js
@@ -79,23 +79,28 @@ const forkRun = (runCmdPath, runArgs = [], options = {}) => {
 
   innerFork(true);
 
-  const killRunningChild = signal => {
+  const killRunningChild = async signal => {
     if (isWin) {
-      runChild.send({
-        title: 'server-kill',
+      await new Promise(resolve => {
+        runChild.once('exit', (code, signal) => {
+          resolve();
+        });
+        runChild.send({
+          title: 'server-kill',
+        });
       });
     } else {
       runChild.kill(signal);
     }
   };
 
   return {
-    kill(signal) {
-      killRunningChild(signal);
+    async kill(signal) {
+      await killRunningChild(signal);
     },
-    restart() {
+    async restart() {
       // 杀进程
-      killRunningChild();
+      await killRunningChild();
       // 重新拉起来
       innerFork();
     },