@astrosheep/keiyaku 4.1.3 → 4.1.4

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

@@ -128,16 +128,23 @@ async function retainDetachedExitEvidence(log, path, from, code, signal) {
 export async function spawnDetachedProcess(input) {
     const log = await open(input.log, "a");
     let launched = false;
+    let logClosed = false;
+    const closeLog = async () => {
+        if (logClosed)
+            return;
+        logClosed = true;
+        await log.close();
+    };
     try {
         const from = (await log.stat()).size;
         const child = spawn(input.argv[0], input.argv.slice(1), spawnOptionsFor("retained", input, ["ignore", log.fd, log.fd]));
-        await new Promise((resolve, reject) => {
-            child.once("spawn", resolve);
-            child.once("error", reject);
-        });
-        if (child.pid === undefined)
-            throw new Error("detached process spawned without a pid");
-        const pid = child.pid;
+        let state = "active";
+        let termination;
+        const invalidate = () => {
+            state = "inert";
+        };
+        child.once("exit", invalidate);
+        child.once("close", invalidate);
         const exited = new Promise((resolve, reject) => {
             child.once("close", (code, signal) => {
                 void (async () => {
@@ -151,7 +158,7 @@ export async function spawnDetachedProcess(input) {
                         failure = error;
                     }
                     try {
-                        await log.close();
+                        await closeLog();
                     }
                     catch (error) {
                         failure ??= error;
@@ -164,13 +171,13 @@ export async function spawnDetachedProcess(input) {
             });
         });
         void exited.catch(() => undefined);
-        let state = "active";
-        let termination;
-        const invalidate = () => {
-            state = "inert";
-        };
-        child.once("exit", invalidate);
-        child.once("close", invalidate);
+        await new Promise((resolve, reject) => {
+            child.once("spawn", resolve);
+            child.once("error", reject);
+        });
+        if (child.pid === undefined)
+            throw new Error("detached process spawned without a pid");
+        const pid = child.pid;
         launched = true;
         return {
             pid,
@@ -194,7 +201,7 @@ export async function spawnDetachedProcess(input) {
     }
     finally {
         if (!launched)
-            await log.close();
+            await closeLog();
     }
 }
 function terminalOutcome(code, stdout, stderr, consuming) {

package/package.json

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