Merge pull request #34 from ErKeLost/fix/child_killed

fix: child process kill not be resolved

Author: ErKeLost

.changeset/plenty-clocks-change.md

@@ -0,0 +1,5 @@
+---
+'farmup': minor
+---
+
+fix: child process kill not be resolved

.changeset/thirty-phones-juggle.md

@@ -0,0 +1,5 @@
+---
+'farmup': patch
+---
+
+Improve the child process exit logic

package.json

@@ -5,6 +5,7 @@
   "private": true,
   "type": "module",
   "scripts": {
+    "dev": "pnpm --filter './packages/core' run dev",
     "release": "pnpm --filter './packages/*' run build && changeset publish",
     "ready": "farmup ./scripts/ready.ts -o ./dist/ready --no-config"
   },
@@ -23,4 +24,4 @@
     "execa": "^8.0.1",
     "@changesets/cli": "^2.27.3"
   }
-}
+}

packages/core/package.json

@@ -56,6 +56,6 @@
     "email": "[email protected]"
   },
   "dependencies": {
-    "@farmfe/core": "^1.2.0"
+    "@farmfe/core": "^1.3.6"
   }
-}
+}

packages/core/src/core/executer.ts

@@ -31,15 +31,16 @@ export class Executer {
     }
 
     async _execute(command: string, name: string, args: string[], logger: Logger) {
+
         if (this.child) {
             await this.closeChild();
         }
-
         const child = execaCommand([command, ...args].join(' '), {
             cwd: process.cwd(),
             stdio: 'pipe',
         });
 
+
         child.stdout?.on('data', (data) => logger.debug(trimEndLF(data.toString())));
 
         child.stderr?.on('data', (err) => logger.error(err));
@@ -49,17 +50,37 @@ export class Executer {
         process.on('beforeExit', this.closeChild);
         process.on('exit', this.closeChild);
 
-        child.on('exit', (code) => {
+        child.once('exit', (code) => {
             this.logger.info(`"${name}" PID ${child.pid} ${!code ? 'done' : `exit ${code}`}`);
             this.child = undefined;
         });
     }
 
     async closeChild() {
-        while (this.child && !this.child.killed) {
-            this.child.kill();
-            await delay(50);
+        if (!this.child) {
+            return;
+        }
+
+        const child = this.child;
+
+        const exitPromise = new Promise<void>((resolve) => {
+            child.once('exit', () => {
+                resolve();
+            });
+        });
+
+        try {
+            await this.terminateChild(child);
+            await exitPromise;
+        } finally {
+            this.child = undefined;
+        }
+    }
+
+    private async terminateChild(child: ExecaChildProcess) {
+        while (child && !child.killed) {
+            child.kill();
+            await delay(30);
         }
-        this.child = undefined;
     }
 }

playground/farm.config.ts

@@ -5,8 +5,6 @@ export default defineConfig({
         input: {
             index: 'index.ts',
         },
-        output: {
-            
-        }
+        persistentCache: false,
     },
 });

playground/package.json

@@ -13,5 +13,8 @@
     "farmup": "workspace:*"
   },
   "author": "",
-  "license": "ISC"
+  "license": "ISC",
+  "dependencies": {
+    "@farmfe/core": "^1.3.6"
+  }
 }