Allow explicitely kill process

Author: taras

process/src/exec/api.ts

@@ -24,6 +24,11 @@ export interface Process extends StdIO {
    * not complete successfully, it will raise an ExecError.
    */
   expect(): Operation<ExitStatus>;
+
+  /**
+   * Kill the child process
+   */
+  kill(): Operation<void>;
 }
 
 export interface ExecOptions {
@@ -77,6 +82,7 @@ export interface ProcessResult extends ExitStatus {
   stdout: string;
   stderr: string;
 }
+
 export interface CreateOSProcess {
   (command: string, options: ExecOptions): Operation<Process>;
 }

process/src/exec/posix.ts

@@ -90,18 +90,21 @@ export const createPosixProcess: CreateOSProcess = function* createPosixProcess(
       processResult.resolve(Ok(value));
     } finally {
       try {
-        if (typeof childProcess.pid === "undefined") {
-          // deno-lint-ignore no-unsafe-finally
-          throw new Error("no pid for childProcess");
-        }
-        process.kill(-childProcess.pid, "SIGTERM");
-        yield* all([io.stdoutDone.operation, io.stderrDone.operation]);
+        yield* kill();
       } catch (_e) {
         // do nothing, process is probably already dead
       }
     }
   });
 
+  function* kill() {
+    if (typeof childProcess.pid === "undefined") {
+      throw new Error("no pid for childProcess");
+    }
+    process.kill(-childProcess.pid, "SIGTERM");
+    yield* all([io.stdoutDone.operation, io.stderrDone.operation]);
+  }
+
   function* join() {
     let result = yield* processResult.operation;
     if (result.ok) {
@@ -129,5 +132,6 @@ export const createPosixProcess: CreateOSProcess = function* createPosixProcess(
     stderr,
     join,
     expect,
+    kill,
   };
 };

process/src/exec/win32.ts

@@ -110,74 +110,74 @@ export const createWin32Process: CreateOSProcess = function* createWin32Process(
       processResult.resolve(Ok(value));
     } finally {
       try {
-        // Only try to kill the process if it hasn't exited yet
-        if (
-          childProcess.exitCode === null &&
-          childProcess.signalCode === null
-        ) {
-          if (typeof childProcess.pid === "undefined") {
-            // deno-lint-ignore no-unsafe-finally
-            throw new Error("no pid for childProcess");
-          }
+        yield* kill();
+      } catch (_e) {
+        // do nothing, process is probably already dead
+      }
+    }
+  });
 
-          let stdinStream = childProcess.stdin;
+  function* kill() {
+    // Only try to kill the process if it hasn't exited yet
+    if (
+      childProcess.exitCode === null &&
+      childProcess.signalCode === null
+    ) {
+      if (typeof childProcess.pid === "undefined") {
+        throw new Error("no pid for childProcess");
+      }
 
-          // Try graceful shutdown with ctrlc
-          try {
-            ctrlc(childProcess.pid);
-            if (stdinStream.writable) {
-              try {
-                // Terminate batch process (Y/N)
-                stdinStream.write("Y\n");
-              } catch (_err) {
-                // not much we can do here
-              }
-            }
-          } catch (_err) {
-            // ctrlc might fail
-          }
+      let stdinStream = childProcess.stdin;
 
-          // Close stdin to allow process to exit cleanly
+      // Try graceful shutdown with ctrlc
+      try {
+        ctrlc(childProcess.pid);
+        if (stdinStream.writable) {
           try {
-            stdinStream.end();
+            // Terminate batch process (Y/N)
+            stdinStream.write("Y\n");
           } catch (_err) {
-            // stdin might already be closed
+            // not much we can do here
           }
+        }
+      } catch (_err) {
+        // ctrlc might fail
+      }
 
-          // Wait for graceful exit with a timeout
-          yield* race([processResult.operation, sleep(300)]);
-
-          // If process still hasn't exited, escalate
-          if (
-            childProcess.exitCode === null &&
-            childProcess.signalCode === null
-          ) {
-            // Try regular kill first
-            try {
-              childProcess.kill();
-            } catch (_err) {
-              // process might already be dead
-            }
-
-            // If still alive after kill, force-kill entire process tree
-            // This is necessary for bash on Windows where ctrlc doesn't work
-            // and child.kill() only kills the shell, leaving grandchildren alive
-            if (
-              childProcess.exitCode === null &&
-              childProcess.signalCode === null
-            ) {
-              yield* killTree(childProcess.pid);
-            }
-          }
+      // Close stdin to allow process to exit cleanly
+      try {
+        stdinStream.end();
+      } catch (_err) {
+        // stdin might already be closed
+      }
 
-          // Wait for streams to finish
-          yield* all([io.stdoutDone.operation, io.stderrDone.operation]);
+      // If process still hasn't exited, escalate
+      if (
+        childProcess.exitCode === null &&
+        childProcess.signalCode === null
+      ) {
+        // Try regular kill first
+        try {
+          childProcess.kill();
+        } catch (_err) {
+          // process might already be dead
+        }
+
+        // If still alive after kill, force-kill entire process tree
+        // This is necessary for bash on Windows where ctrlc doesn't work
+        // and child.kill() only kills the shell, leaving grandchildren alive
+        if (
+          childProcess.exitCode === null &&
+          childProcess.signalCode === null
+        ) {
+          yield* killTree(childProcess.pid);
         }
-      } catch (_e) {
-        // do nothing, process is probably already dead
       }
+
+      // Wait for streams to finish
+      yield* all([io.stdoutDone.operation, io.stderrDone.operation]);
     }
-  });
+  }
 
   function* join() {
     let result = yield* processResult.operation;
@@ -206,6 +206,7 @@ export const createWin32Process: CreateOSProcess = function* createWin32Process(
     stderr,
     join,
     expect,
+    kill,
   };
 };