@astrosheep/keiyaku 4.5.8 → 4.5.9

package/build/src/runtime/proc/run.js

@@ -7,12 +7,27 @@ import { createProcessLifecycle } from "./lifecycle.js";
 import { terminateOwnedProcess } from "./termination.js";
 import { spawnWindowsRetainedProcess } from "./windows-run.js";
 const STREAM_TAIL_BYTES = 16 * 1024;
+function waitForProcessEnd(child, terminationFailure) {
+    const childEnd = new Promise((resolve) => {
+        child.once("close", (code) => resolve({ kind: "closed", code }));
+        child.once("error", (error) => resolve({ kind: "spawn-error", error }));
+    });
+    return Promise.race([childEnd, terminationFailure]);
+}
 export function spawnCancellableProcess(input) {
     const child = spawn(input.argv[0], input.argv.slice(1), spawnOptionsFor(input, ["pipe", "pipe", "pipe"]));
     let cancelled = false;
     let termination;
+    let reportTerminationFailure;
+    const terminationFailure = new Promise((_resolve, reject) => {
+        reportTerminationFailure = reject;
+    });
+    void terminationFailure.catch(() => undefined);
     const terminate = (force = false) => {
-        termination ??= terminateOwnedProcess(child, force);
+        if (termination === undefined) {
+            termination = terminateOwnedProcess(child, force);
+            void termination.catch(reportTerminationFailure);
+        }
         return termination;
     };
     const cancel = () => {
@@ -27,6 +42,7 @@ export function spawnCancellableProcess(input) {
     return {
         child,
         cancelled: () => cancelled,
+        terminationFailure,
         terminate,
         async waitTermination() {
             input.signal?.removeEventListener("abort", cancel);
@@ -143,11 +159,16 @@ async function executeProcess(input, timeoutMs, consumeStdout, spawnProcess = sp
     let stop;
     let streamError;
     let termination;
+    let reportTerminationFailure;
+    const terminationFailure = new Promise((resolve) => {
+        reportTerminationFailure = (error) => resolve({ kind: "termination-error", error });
+    });
     const requestStop = (reason) => {
         if (stop !== undefined)
             return;
         stop = reason;
         termination = terminateOwnedProcess(child);
+        void termination.catch(reportTerminationFailure);
     };
     const failStream = (error) => {
         if (streamError !== undefined)
@@ -175,13 +196,12 @@ async function executeProcess(input, timeoutMs, consumeStdout, spawnProcess = sp
     const cancel = () => requestStop("cancelled");
     input.signal?.addEventListener("abort", cancel, { once: true });
     const timeout = timeoutMs === undefined ? undefined : setTimeout(() => requestStop("timeout"), timeoutMs);
-    const terminal = await new Promise((resolve) => {
-        child.once("close", (code) => resolve({ kind: "closed", code }));
-        child.once("error", (error) => resolve({ kind: "spawn-error", error }));
-    });
+    const terminal = await waitForProcessEnd(child, terminationFailure);
     if (timeout !== undefined)
         clearTimeout(timeout);
     input.signal?.removeEventListener("abort", cancel);
+    if (terminal.kind === "termination-error")
+        throw terminal.error;
     await termination;
     const pid = child.pid ?? null;
     if (terminal.kind === "spawn-error") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "4.5.8",
+  "version": "4.5.9",
   "files": [
     "build"
   ],