@swmansion/argent 0.22.2-next.8 → 0.22.2-next.9

package/dist/cli-cmds.mjs

@@ -2287,6 +2287,9 @@ var FAILURE_CODES = {
   SIMULATOR_SERVER_READY_TIMEOUT: "SIMULATOR_SERVER_READY_TIMEOUT",
   SIMULATOR_SERVER_PROCESS_ERROR: "SIMULATOR_SERVER_PROCESS_ERROR",
   SIMULATOR_SERVER_TERMINATED: "SIMULATOR_SERVER_TERMINATED",
+  SIMULATOR_COMMAND_REJECTED: "SIMULATOR_COMMAND_REJECTED",
+  SIMULATOR_COMMAND_ACK_TIMEOUT: "SIMULATOR_COMMAND_ACK_TIMEOUT",
+  SIMULATOR_COMMAND_TRANSPORT_FAILED: "SIMULATOR_COMMAND_TRANSPORT_FAILED",
   AX_QUERY_TIMEOUT: "AX_QUERY_TIMEOUT",
   AX_DAEMON_READY_TIMEOUT: "AX_DAEMON_READY_TIMEOUT",
   AX_DAEMON_EXITED_BEFORE_READY: "AX_DAEMON_EXITED_BEFORE_READY",
@@ -7214,7 +7217,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.22.2-next.8";
+    return "0.22.2-next.9";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -15443,6 +15443,9 @@ var FAILURE_CODES = {
   SIMULATOR_SERVER_READY_TIMEOUT: "SIMULATOR_SERVER_READY_TIMEOUT",
   SIMULATOR_SERVER_PROCESS_ERROR: "SIMULATOR_SERVER_PROCESS_ERROR",
   SIMULATOR_SERVER_TERMINATED: "SIMULATOR_SERVER_TERMINATED",
+  SIMULATOR_COMMAND_REJECTED: "SIMULATOR_COMMAND_REJECTED",
+  SIMULATOR_COMMAND_ACK_TIMEOUT: "SIMULATOR_COMMAND_ACK_TIMEOUT",
+  SIMULATOR_COMMAND_TRANSPORT_FAILED: "SIMULATOR_COMMAND_TRANSPORT_FAILED",
   AX_QUERY_TIMEOUT: "AX_QUERY_TIMEOUT",
   AX_DAEMON_READY_TIMEOUT: "AX_DAEMON_READY_TIMEOUT",
   AX_DAEMON_EXITED_BEFORE_READY: "AX_DAEMON_EXITED_BEFORE_READY",
@@ -16428,7 +16431,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.22.2-next.8";
+    return "0.22.2-next.9";
   }
   return "0.0.0";
 }

package/dist/mcp-server.mjs

@@ -16471,6 +16471,9 @@ var FAILURE_CODES = {
   SIMULATOR_SERVER_READY_TIMEOUT: "SIMULATOR_SERVER_READY_TIMEOUT",
   SIMULATOR_SERVER_PROCESS_ERROR: "SIMULATOR_SERVER_PROCESS_ERROR",
   SIMULATOR_SERVER_TERMINATED: "SIMULATOR_SERVER_TERMINATED",
+  SIMULATOR_COMMAND_REJECTED: "SIMULATOR_COMMAND_REJECTED",
+  SIMULATOR_COMMAND_ACK_TIMEOUT: "SIMULATOR_COMMAND_ACK_TIMEOUT",
+  SIMULATOR_COMMAND_TRANSPORT_FAILED: "SIMULATOR_COMMAND_TRANSPORT_FAILED",
   AX_QUERY_TIMEOUT: "AX_QUERY_TIMEOUT",
   AX_DAEMON_READY_TIMEOUT: "AX_DAEMON_READY_TIMEOUT",
   AX_DAEMON_EXITED_BEFORE_READY: "AX_DAEMON_EXITED_BEFORE_READY",

package/dist/tool-server.cjs

@@ -628,6 +628,9 @@ var init_failure_codes = __esm({
       SIMULATOR_SERVER_READY_TIMEOUT: "SIMULATOR_SERVER_READY_TIMEOUT",
       SIMULATOR_SERVER_PROCESS_ERROR: "SIMULATOR_SERVER_PROCESS_ERROR",
       SIMULATOR_SERVER_TERMINATED: "SIMULATOR_SERVER_TERMINATED",
+      SIMULATOR_COMMAND_REJECTED: "SIMULATOR_COMMAND_REJECTED",
+      SIMULATOR_COMMAND_ACK_TIMEOUT: "SIMULATOR_COMMAND_ACK_TIMEOUT",
+      SIMULATOR_COMMAND_TRANSPORT_FAILED: "SIMULATOR_COMMAND_TRANSPORT_FAILED",
       AX_QUERY_TIMEOUT: "AX_QUERY_TIMEOUT",
       AX_DAEMON_READY_TIMEOUT: "AX_DAEMON_READY_TIMEOUT",
       AX_DAEMON_EXITED_BEFORE_READY: "AX_DAEMON_EXITED_BEFORE_READY",
@@ -93890,7 +93893,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.22.2-next.8";
+    return "0.22.2-next.9";
   }
   return "0.0.0";
 }
@@ -106325,33 +106328,127 @@ var DEFAULT_SCREENSHOT_SCALE = 0.25;
 var NO_IMAGE_ERROR = /no image to export/i;
 var FIRST_FRAME_WAIT_MS = 6e3;
 var FIRST_FRAME_POLL_MS = 250;
+var COMMAND_ACK_TIMEOUT_MS = 5e3;
 var connections = /* @__PURE__ */ new Map();
 var cmdId = 0;
-function getOrCreateWs(api) {
+function failAllPending(conn, makeError) {
+  const entries = [...conn.pending.values()];
+  conn.pending.clear();
+  for (const entry of entries) entry.settle(makeError(entry.cmd));
+}
+function transportError(cmd, apiUrl, detail) {
+  return new FailureError(
+    `simulator-server did not accept the '${cmd}' command: ${detail}. The command was NOT delivered to the device. Check that the simulator is still booted and the simulator-server for ${apiUrl} is running.`,
+    {
+      error_code: FAILURE_CODES.SIMULATOR_COMMAND_TRANSPORT_FAILED,
+      failure_stage: "simulator_command_transport",
+      failure_area: "tool_server",
+      error_kind: "network",
+      network_failure: "connection_reset",
+      failure_command: "simulator_server"
+    }
+  );
+}
+function getOrCreateConnection(api) {
   const key2 = api.apiUrl;
   const existing = connections.get(key2);
-  if (existing && (existing.readyState === wrapper_default.OPEN || existing.readyState === wrapper_default.CONNECTING)) {
+  if (existing && (existing.ws.readyState === wrapper_default.OPEN || existing.ws.readyState === wrapper_default.CONNECTING)) {
     return existing;
   }
   const { host } = new URL(api.apiUrl);
   const ws = new wrapper_default(`ws://${host}/ws`);
-  ws.on("error", () => connections.delete(key2));
-  ws.on("close", () => connections.delete(key2));
-  connections.set(key2, ws);
-  return ws;
+  const conn = { ws, pending: /* @__PURE__ */ new Map() };
+  ws.on("message", (data) => {
+    const text = Buffer.isBuffer(data) ? data.toString() : Array.isArray(data) ? Buffer.concat(data).toString() : Buffer.from(data).toString();
+    let ack;
+    try {
+      ack = JSON.parse(text);
+    } catch {
+      return;
+    }
+    if (ack.status !== "ok" && ack.status !== "error") return;
+    if (ack.id != null && !conn.pending.has(ack.id)) return;
+    const id = ack.id ?? conn.pending.keys().next().value;
+    if (id == null) return;
+    const entry = conn.pending.get(id);
+    if (entry == null) return;
+    conn.pending.delete(id);
+    if (ack.status === "ok") {
+      entry.settle();
+      return;
+    }
+    entry.settle(
+      new FailureError(
+        `simulator-server rejected the '${entry.cmd}' command: ${ack.message ?? "unknown error"}. The command was NOT delivered to the device.`,
+        {
+          error_code: FAILURE_CODES.SIMULATOR_COMMAND_REJECTED,
+          failure_stage: "simulator_command_rejected",
+          failure_area: "tool_server",
+          error_kind: "unknown",
+          failure_command: "simulator_server"
+        }
+      )
+    );
+  });
+  ws.on("error", (err) => {
+    connections.delete(key2);
+    failAllPending(conn, (cmd) => transportError(cmd, key2, err.message));
+  });
+  ws.on("close", () => {
+    connections.delete(key2);
+    failAllPending(conn, (cmd) => transportError(cmd, key2, "the connection closed"));
+  });
+  connections.set(key2, conn);
+  return conn;
 }
 function sendCommand(api, cmd) {
   if (api.transport) {
     routeViaTransport(api.transport, cmd);
-    return;
-  }
-  const ws = getOrCreateWs(api);
-  const payload = JSON.stringify({ id: String(++cmdId), ...cmd });
-  if (ws.readyState === wrapper_default.OPEN) {
-    ws.send(payload);
-  } else {
-    ws.once("open", () => ws.send(payload));
+    return Promise.resolve();
   }
+  const conn = getOrCreateConnection(api);
+  const id = String(++cmdId);
+  const cmdName = typeof cmd.cmd === "string" ? cmd.cmd : "unknown";
+  const payload = JSON.stringify({ id, ...cmd });
+  return new Promise((resolve12, reject) => {
+    let done = false;
+    const settle = (err) => {
+      if (done) return;
+      done = true;
+      clearTimeout(timer);
+      conn.pending.delete(id);
+      if (err) reject(err);
+      else resolve12();
+    };
+    const timer = setTimeout(
+      () => settleAndDropConnection(
+        new FailureError(
+          `simulator-server did not acknowledge the '${cmdName}' command within ${COMMAND_ACK_TIMEOUT_MS}ms. The command may not have reached the device \u2014 the simulator may be wedged or the simulator-server unresponsive.`,
+          {
+            error_code: FAILURE_CODES.SIMULATOR_COMMAND_ACK_TIMEOUT,
+            failure_stage: "simulator_command_ack",
+            failure_area: "tool_server",
+            error_kind: "timeout",
+            network_failure: "timeout",
+            failure_command: "simulator_server"
+          }
+        )
+      ),
+      COMMAND_ACK_TIMEOUT_MS
+    );
+    timer.unref?.();
+    const settleAndDropConnection = (err) => {
+      settle(err);
+      connections.delete(api.apiUrl);
+      conn.ws.close();
+    };
+    conn.pending.set(id, { settle, cmd: cmdName });
+    const write = () => conn.ws.send(payload, (err) => {
+      if (err) settle(transportError(cmdName, api.apiUrl, err.message));
+    });
+    if (conn.ws.readyState === wrapper_default.OPEN) write();
+    else conn.ws.once("open", write);
+  });
 }
 function setPointerVisible(api, show, signal) {
   return pointerPost(api, { show }, signal);
@@ -119444,7 +119541,7 @@ Before tapping, determine the correct coordinates by using discovery tools \u201
     const api = services.simulatorServer;
     for (let i = 1; i <= clickCount; i++) {
       if (i > 1) await sleep2(MULTI_TAP_GAP_MS);
-      sendCommand(api, {
+      await sendCommand(api, {
         cmd: "touch",
         type: "Down",
         x: params.x,
@@ -119453,7 +119550,7 @@ Before tapping, determine the correct coordinates by using discovery tools \u201
         second_y: null
       });
       await sleep2(TAP_HOLD_MS);
-      sendCommand(api, {
+      await sendCommand(api, {
         cmd: "touch",
         type: "Up",
         x: params.x,
@@ -119538,20 +119635,24 @@ Pass momentum:false for a momentum-free swipe that lands where the finger lifts
     let lastY = 0;
     for (let i = 0; i <= steps; i++) {
       if (ctx?.signal?.aborted) {
-        if (i > 0) {
-          sendCommand(api, {
-            cmd: "touch",
-            type: "Up",
-            x: lastX,
-            y: lastY,
-            second_x: null,
-            second_y: null
-          });
-        }
         const err = new Error(
           `gesture-swipe aborted - cancelled mid-gesture after ${i} of ${steps + 1} frames`
         );
         err.name = "AbortError";
+        if (i > 0) {
+          try {
+            await sendCommand(api, {
+              cmd: "touch",
+              type: "Up",
+              x: lastX,
+              y: lastY,
+              second_x: null,
+              second_y: null
+            });
+          } catch (liftErr) {
+            err.cause = liftErr;
+          }
+        }
         throw err;
       }
       const t = i / steps;
@@ -119560,7 +119661,7 @@ Pass momentum:false for a momentum-free swipe that lands where the finger lifts
       const y = params.fromY + (params.toY - params.fromY) * progress;
       const type = i === 0 ? "Down" : i === steps ? "Up" : "Move";
       if (type === "Up") {
-        sendCommand(api, {
+        await sendCommand(api, {
           cmd: "touch",
           type: "Move",
           x,
@@ -119569,7 +119670,7 @@ Pass momentum:false for a momentum-free swipe that lands where the finger lifts
           second_y: null
         });
       }
-      sendCommand(api, {
+      await sendCommand(api, {
         cmd: "touch",
         type,
         x,
@@ -119812,7 +119913,7 @@ function interpolateEvents(events, steps) {
   return result;
 }
 function sendTouchEvent(api, type, x, y, x2, y2) {
-  sendCommand(api, {
+  return sendCommand(api, {
     cmd: "touch",
     type,
     x,
@@ -119883,7 +119984,7 @@ Example pinch-to-zoom (with interpolate:10 for smoothness):
     const events = params.interpolate && params.interpolate > 0 ? interpolateEvents(params.events, params.interpolate) : params.events;
     for (const event2 of events) {
       await sleep6(event2.delayMs ?? 16);
-      sendCommand(api, {
+      await sendCommand(api, {
         cmd: "touch",
         type: event2.type,
         x: event2.x,
@@ -119966,7 +120067,7 @@ Use when you need to zoom in or out on a map, image, or zoomable view. Returns {
       const y2 = cy + halfDist * sinA;
       const type = i === 0 ? "Down" : i === steps ? "Up" : "Move";
       if (i === 0) timestampMs = Date.now();
-      sendTouchEvent(api, type, x1, y1, x2, y2);
+      await sendTouchEvent(api, type, x1, y1, x2, y2);
       if (i < steps) await sleep(16);
     }
     return { pinched: true, timestampMs };
@@ -120044,11 +120145,17 @@ Size the orbit with radius, or with radiusX and radiusY together (the pair overr
     let lastY2 = 0;
     for (let i = 0; i <= steps; i++) {
       if (ctx?.signal?.aborted) {
-        if (i > 0) sendTouchEvent(api, "Up", lastX1, lastY1, lastX2, lastY2);
         const err = new Error(
           `gesture-rotate aborted \u2014 cancelled mid-gesture after ${i} of ${steps + 1} frames`
         );
         err.name = "AbortError";
+        if (i > 0) {
+          try {
+            await sendTouchEvent(api, "Up", lastX1, lastY1, lastX2, lastY2);
+          } catch (liftErr) {
+            err.cause = liftErr;
+          }
+        }
         throw err;
       }
       const t = i / steps;
@@ -120060,7 +120167,7 @@ Size the orbit with radius, or with radiusX and radiusY together (the pair overr
       const y2 = params.centerY - radiusY * Math.sin(angleRad);
       const type = i === 0 ? "Down" : i === steps ? "Up" : "Move";
       if (i === 0) timestampMs = Date.now();
-      sendTouchEvent(api, type, x1, y1, x2, y2);
+      await sendTouchEvent(api, type, x1, y1, x2, y2);
       lastX1 = x1;
       lastY1 = y1;
       lastX2 = x2;
@@ -120129,13 +120236,13 @@ Fails if the device backend is not reachable \u2014 the simulator-server for iOS
       return { pressed: params.button };
     }
     const api = services.simulatorServer;
-    sendCommand(api, {
+    await sendCommand(api, {
       cmd: "button",
       direction: "Down",
       button: params.button
     });
     await sleep7(50);
-    sendCommand(api, { cmd: "button", direction: "Up", button: params.button });
+    await sendCommand(api, { cmd: "button", direction: "Up", button: params.button });
     return { pressed: params.button };
   }
 };
@@ -120946,7 +121053,7 @@ Returns { orientation }. Fails if the target device is not booted.`,
   }),
   async execute(services, params) {
     const api = services.simulatorServer;
-    sendCommand(api, { cmd: "rotate", direction: params.orientation });
+    await sendCommand(api, { cmd: "rotate", direction: params.orientation });
     return { orientation: params.orientation };
   }
 };

package/package.json

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