lody 0.104.0 → 0.105.0-nightly.2

package/dist/baguette-worker.js

@@ -1,11 +1,18 @@
-import { spawn } from "node:child_process";
+import { s as startProcessLegacy, b as runPromise, c as raceAll, p as promise, d as sleep, t as terminateChildTreeLegacy, e as provide, f as runCommand, g as processLayer } from "./chunks/process-D1XNeXEb.js";
 import { createServer } from "node:net";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { mkdtemp, writeFile, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { l as IosSimulatorDeviceControlSchema } from "./chunks/ios-simulator-hTbW-tat.js";
-import { s as string, o as object, e as union, a as _enum, n as number, l as literal } from "./chunks/schemas-D_XLKCXC.js";
+import { I as IosSimulatorDeviceControlSchema } from "./chunks/ios-simulator-2zCUndUk.js";
+import { s as string, o as object, u as union, _ as _enum, n as number, l as literal } from "./chunks/schemas-CODbzktn.js";
+import "node:child_process";
+import "node:fs";
+import "node:url";
+import "child_process";
+import "path";
+import "fs";
+import "node:stream";
 const guestButtonsSource = String.raw`
 #import <Foundation/Foundation.h>
 #import <objc/message.h>
@@ -84,7 +91,7 @@ int main(void) {
 function createGuestButtons(signal, executable = "/usr/bin/xcrun") {
   let directory;
   let device;
-  let child2;
+  let child;
   let childClosed;
   let preparing;
   let pending;
@@ -100,43 +107,34 @@ function createGuestButtons(signal, executable = "/usr/bin/xcrun") {
   let terminating;
   function terminate() {
     if (terminating) return terminating;
-    const owned = child2;
-    if (!owned) return Promise.resolve();
+    const owned2 = child;
+    if (!owned2) return Promise.resolve();
     const closed = childClosed;
     terminating = (async () => {
-      owned.stdin.end();
-      const send = (terminationSignal) => {
-        if (owned.pid) {
-          try {
-            process.kill(-owned.pid, terminationSignal);
-            return true;
-          } catch (e) {
-            if (!(e instanceof Error && "code" in e && e.code === "ESRCH")) throw e;
-          }
-        }
-        return false;
-      };
-      const term = setTimeout(() => send("SIGTERM"), 1e3);
-      const kill = setTimeout(() => send("SIGKILL"), 2e3);
+      owned2.stdin.end();
+      if (closed)
+        await runPromise(raceAll([promise(() => closed), sleep(1e3)]));
+      await terminateChildTreeLegacy(owned2, {
+        processGroup: true,
+        graceMs: 1e3,
+        killWaitMs: 2e3
+      });
       await closed;
-      clearTimeout(term);
-      clearTimeout(kill);
-      if (send("SIGTERM")) {
-        const killAt = Date.now() + 1e3;
-        while (send(0)) {
-          if (Date.now() >= killAt) send("SIGKILL");
-          await setTimeout$1(25);
-        }
-      }
-      if (child2 === owned) child2 = void 0;
+      if (child === owned2) child = void 0;
     })();
     return terminating;
   }
   function launch(args, protocol) {
     signal.throwIfAborted();
     if (failed) throw error();
-    const process2 = spawn(executable, args, { detached: true, stdio: ["pipe", "pipe", "ignore"] });
-    child2 = process2;
+    const { child: started } = startProcessLegacy({
+      command: executable,
+      args,
+      processGroup: true,
+      options: { stdio: ["pipe", "pipe", "ignore"] }
+    });
+    const process2 = started;
+    child = process2;
     terminating = void 0;
     childClosed = new Promise((resolve) => process2.once("close", resolve));
     process2.stdin.on("error", fail);
@@ -247,12 +245,12 @@ function createGuestButtons(signal, executable = "/usr/bin/xcrun") {
       try {
         preparing ??= prepare(udid);
         await preparing;
-        if (failed || signal.aborted || !child2) throw error();
+        if (failed || signal.aborted || !child) throw error();
         if (!button) return;
         const id = ++sequence;
         await new Promise((resolve, reject) => {
           pending = { line: `${id} ok`, resolve, reject };
-          child2?.stdin.write(`${id} ${button}
+          child?.stdin.write(`${id} ${button}
 `, (err) => {
             if (err) fail();
           });
@@ -269,34 +267,25 @@ function createGuestButtons(signal, executable = "/usr/bin/xcrun") {
 async function runSimulatorHostControl(udid, control, signal, executable = "/usr/bin/xcrun") {
   async function run(args, input) {
     signal.throwIfAborted();
-    return new Promise((resolve, reject) => {
-      const child2 = spawn(executable, args, {
-        stdio: ["pipe", "ignore", "ignore"],
-        // The IPC worker has a filtered environment. simctl decodes stdin with
-        // the locale, so an unset locale rejects non-ASCII pasteboard contents.
-        env: { ...process.env, LANG: "en_US.UTF-8", LC_ALL: "en_US.UTF-8" }
-      });
-      let kill;
-      const cancel = () => {
-        child2.kill("SIGTERM");
-        kill ??= setTimeout(() => child2.kill("SIGKILL"), 1e3);
-      };
-      signal.addEventListener("abort", cancel, { once: true });
-      if (signal.aborted) cancel();
-      child2.stdin.on("error", () => {
-      });
-      child2.stdin.end(input);
-      let failed = false;
-      child2.once("error", () => {
-        failed = true;
-      });
-      child2.once("close", (code2) => {
-        clearTimeout(kill);
-        signal.removeEventListener("abort", cancel);
-        if (signal.aborted || failed) reject(new Error("Simulator control failed."));
-        else resolve(code2);
-      });
-    });
+    try {
+      const result = await runPromise(
+        provide(
+          runCommand({
+            command: executable,
+            args,
+            input: input ?? "",
+            // simctl decodes stdin with the locale; keep Unicode clipboard input.
+            env: { ...process.env, LANG: "en_US.UTF-8", LC_ALL: "en_US.UTF-8" },
+            abandonPolicy: { graceMs: 1e3, killWaitMs: 2e3 }
+          }),
+          processLayer({})
+        ),
+        { signal }
+      );
+      return result.code;
+    } catch {
+      throw new Error("Simulator control failed.");
+    }
   }
   let code;
   switch (control.kind) {
@@ -393,7 +382,7 @@ const onMessage = (raw) => {
 process.on("message", onMessage);
 process.once("SIGTERM", stop);
 process.once("SIGINT", stop);
-let child;
+let owned;
 let exited;
 try {
   if (!process.connected) throw new Error("Missing lifecycle owner");
@@ -410,12 +399,13 @@ try {
     (resolve, reject) => reservation.close((error) => error ? reject(error) : resolve())
   );
   abort.signal.throwIfAborted();
-  child = spawn(binary, ["serve", "--host", "127.0.0.1", "--port", String(port), "--no-plugins"], {
-    // Isolate the native server and its xcrun descendants in our own process group.
-    detached: true,
-    stdio: "ignore",
-    env: process.env
+  owned = startProcessLegacy({
+    command: binary,
+    args: ["serve", "--host", "127.0.0.1", "--port", String(port), "--no-plugins"],
+    processGroup: true,
+    options: { stdio: "ignore", env: process.env }
   });
+  const child = owned.child;
   exited = new Promise((resolve) => {
     child?.once("error", () => {
       stop();
@@ -453,24 +443,8 @@ try {
   await buttons.close().catch(() => {
     process.exitCode = 1;
   });
-  if (child?.pid !== void 0) {
-    const group = -child.pid;
-    const signalGroup = (signal) => {
-      try {
-        process.kill(group, signal);
-        return true;
-      } catch (error) {
-        if (error instanceof Error && "code" in error && error.code === "ESRCH") return false;
-        throw error;
-      }
-    };
-    if (signalGroup("SIGTERM")) {
-      const killAt = Date.now() + 3e3;
-      while (signalGroup(0)) {
-        if (Date.now() >= killAt) signalGroup("SIGKILL");
-        await setTimeout$1(25);
-      }
-    }
+  if (owned) {
+    await owned.terminate({ graceMs: 3e3, killWaitMs: 2e3 });
     await exited;
   }
   process.removeListener("disconnect", stop);