@swmansion/argent 0.31.2-next.4 → 0.31.2-next.6

package/dist/cli-cmds.mjs

@@ -35797,7 +35797,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.31.2-next.3";
+    return "0.31.2-next.6";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -16922,7 +16922,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.31.2-next.3";
+    return "0.31.2-next.6";
   }
   return "0.0.0";
 }

package/dist/tool-server.cjs

@@ -101080,7 +101080,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.31.2-next.3";
+    return "0.31.2-next.6";
   }
   return "0.0.0";
 }
@@ -158868,8 +158868,8 @@ var import_util14 = require("util");
 var DEFAULT_EXEC_TIMEOUT_MS = 6e4;
 var DEFAULT_EXEC_MAX_BUFFER = 256 * 1024 * 1024;
 async function execFileAsyncWithTimeout(file2, args, options = {}) {
-  const execFileAsync37 = (0, import_util14.promisify)(import_child_process2.execFile);
-  const { stdout, stderr } = await execFileAsync37(file2, args, {
+  const execFileAsync36 = (0, import_util14.promisify)(import_child_process2.execFile);
+  const { stdout, stderr } = await execFileAsync36(file2, args, {
     encoding: "utf-8",
     ...options,
     // Applied after ...options so a caller cannot weaken the guards; maxBuffer
@@ -179026,18 +179026,68 @@ function probeArgentToolServer(host, port, timeoutMs = 500) {
 
 // ../tool-server/src/utils/simulator-watcher.ts
 var fs69 = __toESM(require("node:fs"));
-var import_node_child_process45 = require("node:child_process");
-var import_node_util33 = require("node:util");
 init_external_devices();
-var execFileAsync36 = (0, import_node_util33.promisify)(import_node_child_process45.execFile);
+
+// ../tool-server/src/utils/simctl-exec.ts
+var import_node_child_process45 = require("node:child_process");
+var SimctlTimeoutError = class extends Error {
+  constructor(args, timeoutMs) {
+    super(`xcrun ${args.join(" ")} did not answer within ${timeoutMs} ms`);
+    this.name = "SimctlTimeoutError";
+  }
+};
+function execSimctl(args, options = {}) {
+  const timeoutMs = options.timeoutMs ?? SIMCTL_SPAWN_TIMEOUT_MS;
+  return new Promise((resolve16, reject) => {
+    if (options.signal?.aborted) {
+      reject(new Error(`xcrun ${args.join(" ")} aborted`));
+      return;
+    }
+    const child = (0, import_node_child_process45.spawn)("xcrun", args, { detached: true, stdio: ["ignore", "pipe", "pipe"] });
+    let stdout = "";
+    let stderr = "";
+    let settled = false;
+    child.stdout.setEncoding("utf8").on("data", (chunk) => stdout += chunk);
+    child.stderr.setEncoding("utf8").on("data", (chunk) => stderr += chunk);
+    const settle3 = (err) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      options.signal?.removeEventListener("abort", onAbort);
+      if (err) reject(err);
+      else resolve16(stdout);
+    };
+    const killGroup2 = () => {
+      if (child.pid) signalGroup(child.pid, "SIGKILL");
+    };
+    const onAbort = () => {
+      killGroup2();
+      settle3(new Error(`xcrun ${args.join(" ")} aborted`));
+    };
+    const timer = setTimeout(() => {
+      killGroup2();
+      settle3(new SimctlTimeoutError(args, timeoutMs));
+    }, timeoutMs);
+    options.signal?.addEventListener("abort", onAbort, { once: true });
+    child.on("error", (err) => settle3(err));
+    child.on("close", (code, sig) => {
+      if (code === 0) return settle3(null);
+      settle3(
+        new Error(
+          `xcrun ${args.join(" ")} exited with ${sig ?? `code ${code}`}` + (stderr.trim() ? `: ${stderr.trim()}` : "")
+        )
+      );
+    });
+  });
+}
+
+// ../tool-server/src/utils/simulator-watcher.ts
 var POLL_INTERVAL_MS2 = 1e4;
-async function getBootedUdidsInSet(deviceSet) {
-  const { stdout } = await execFileAsync36("xcrun", [
-    ...simctlPrefix(deviceSet),
-    "list",
-    "devices",
-    "--json"
-  ]);
+var MAX_BACKOFF_TICKS = 29;
+async function getBootedUdidsInSet(deviceSet, signal) {
+  const stdout = await execSimctl([...simctlPrefix(deviceSet), "list", "devices", "--json"], {
+    signal
+  });
   const data = JSON.parse(stdout);
   const udids = /* @__PURE__ */ new Set();
   for (const devices of Object.values(data.devices)) {
@@ -179050,13 +179100,17 @@ async function getBootedUdidsInSet(deviceSet) {
   }
   return udids;
 }
-async function getBootedUdids() {
+async function getBootedUdids(signal) {
   const sets = [
     null,
     ...configuredAdditionalDeviceSets().filter((p) => fs69.existsSync(p))
   ];
-  const perSet = await Promise.all(sets.map(getBootedUdidsInSet));
-  return new Set(perSet.flatMap((s) => [...s]));
+  const perSet = await Promise.allSettled(sets.map((set2) => getBootedUdidsInSet(set2, signal)));
+  const failures = perSet.flatMap((r) => r.status === "rejected" ? [r.reason] : []);
+  if (failures.length) {
+    throw failures.find((err) => err instanceof SimctlTimeoutError) ?? failures[0];
+  }
+  return new Set(perSet.flatMap((r) => r.status === "fulfilled" ? [...r.value] : []));
 }
 async function initUdid(registry2, udid, trackedServices) {
   const ndRef = nativeDevtoolsRef({ id: udid, platform: "ios", kind: "simulator" });
@@ -179069,6 +179123,9 @@ async function initUdid(registry2, udid, trackedServices) {
 function startSimulatorWatcher(registry2) {
   const trackedServices = /* @__PURE__ */ new Map();
   const reportedSkips = /* @__PURE__ */ new Set();
+  const stopController = new AbortController();
+  let consecutiveTimeouts = 0;
+  let ticksToSkip = 0;
   function withoutForeignSimulators(booted) {
     const ours = /* @__PURE__ */ new Set();
     const claimed = /* @__PURE__ */ new Set();
@@ -179117,10 +179174,23 @@ function startSimulatorWatcher(registry2) {
     let booted;
     let claimed;
     try {
-      ({ ours: booted, claimed } = withoutForeignSimulators(await getBootedUdids()));
-    } catch {
+      ({ ours: booted, claimed } = withoutForeignSimulators(
+        await getBootedUdids(stopController.signal)
+      ));
+    } catch (err) {
+      if (err instanceof SimctlTimeoutError) {
+        consecutiveTimeouts += 1;
+        ticksToSkip = Math.min(2 ** consecutiveTimeouts - 1, MAX_BACKOFF_TICKS);
+        if (consecutiveTimeouts === 1) {
+          process.stderr.write(
+            `[simulator-watcher] ${err.message}; retrying with backoff until it does. If Xcode was just updated, open Xcode once or run \`sudo xcodebuild -runFirstLaunch\`.
+`
+          );
+        }
+      }
       return;
     }
+    consecutiveTimeouts = 0;
     await handBackClaimed(claimed);
     const newUdids = [...booted].filter((udid) => !trackedServices.has(udid));
     const pendingAttempts = newUdids.map(
@@ -179145,9 +179215,24 @@ function startSimulatorWatcher(registry2) {
     }
   }
   const ready2 = poll(true);
-  const interval2 = setInterval(() => poll(false).catch(() => {
-  }), POLL_INTERVAL_MS2);
-  return { stop: () => clearInterval(interval2), ready: ready2 };
+  let inFlight2 = ready2.catch(() => {
+  }).finally(() => inFlight2 = null);
+  const interval2 = setInterval(() => {
+    if (inFlight2) return;
+    if (ticksToSkip > 0) {
+      ticksToSkip -= 1;
+      return;
+    }
+    inFlight2 = poll(false).catch(() => {
+    }).finally(() => inFlight2 = null);
+  }, POLL_INTERVAL_MS2);
+  return {
+    stop: () => {
+      clearInterval(interval2);
+      stopController.abort();
+    },
+    ready: ready2
+  };
 }
 
 // ../tool-server/src/utils/preview-window.ts
@@ -179470,6 +179555,7 @@ function start() {
     if (exitCode > finalExitCode) finalExitCode = exitCode;
     if (shuttingDown) return;
     shuttingDown = true;
+    stopWatcher();
     eventLog?.info({
       type: "tool_server.stopping",
       msg: "Tool server is stopping.",
@@ -179484,7 +179570,6 @@ function start() {
     }
     previewWindow.dispose();
     updateChecker.dispose();
-    stopWatcher();
     httpHandle.dispose();
     try {
       await registry2.dispose();
@@ -179547,6 +179632,7 @@ function start() {
     }
   });
   Promise.all([watcherReady, identityWarm]).then(() => {
+    if (shuttingDown) return;
     server = httpHandle.app.listen(PORT, HOST, () => {
       listening = true;
       const addr = server.address();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.31.2-next.4",
+  "version": "0.31.2-next.6",
   "mcpName": "io.github.software-mansion/argent",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",