@swmansion/argent 0.25.1-next.33 → 0.25.1-next.34

package/dist/cli-cmds.mjs

@@ -21857,7 +21857,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.25.1-next.33";
+    return "0.25.1-next.34";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -16710,7 +16710,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.25.1-next.33";
+    return "0.25.1-next.34";
   }
   return "0.0.0";
 }

package/dist/tool-server.cjs

@@ -94704,7 +94704,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.25.1-next.33";
+    return "0.25.1-next.34";
   }
   return "0.0.0";
 }
@@ -107264,6 +107264,7 @@ async function openMoqClient(udid) {
 async function openMoqClientFromInfo(info) {
   await installNodeWebTransport();
   const session = new MoqDeviceSession(await connectMoq(info), { publishPath: PUBLISH_PATH });
+  disposeWhenTransportDies(session);
   return {
     sendControl: (payload) => session.sendControl(payload),
     async screenshot(opts) {
@@ -107274,6 +107275,15 @@ async function openMoqClientFromInfo(info) {
     }
   };
 }
+function disposeWhenTransportDies(session) {
+  const dispose = () => {
+    try {
+      session.close();
+    } catch {
+    }
+  };
+  void session.closed.then(dispose, dispose);
+}
 
 // ../tool-server/src/utils/simulator-client.ts
 init_wrapper();
@@ -107342,17 +107352,26 @@ function failAllPending(conn, makeError) {
   conn.pending.clear();
   for (const entry of entries) entry.settle(makeError(entry.cmd));
 }
+var COMMAND_TRANSPORT_FAILURE = {
+  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 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"
-    }
+    COMMAND_TRANSPORT_FAILURE
+  );
+}
+function remoteTransportError(cmd, cause) {
+  const detail = cause instanceof Error ? cause.message : String(cause);
+  return wrapFailure(
+    cause,
+    COMMAND_TRANSPORT_FAILURE,
+    `The remote simulator did not accept the '${cmd}' command: ${detail}. The command was NOT delivered to the device. Call stop-simulator-server for this device and retry - the next call opens a new cloud session. If the machine itself was released, acquire one again before retrying.`
   );
 }
 function getOrCreateConnection(api) {
@@ -107408,13 +107427,10 @@ function getOrCreateConnection(api) {
   return conn;
 }
 function sendCommand(api, cmd) {
-  if (api.transport) {
-    routeViaTransport(api.transport, cmd);
-    return Promise.resolve();
-  }
+  const cmdName = typeof cmd.cmd === "string" ? cmd.cmd : "unknown";
+  if (api.transport) return sendViaTransport(api.transport, cmd, cmdName);
   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((resolve14, reject) => {
     let done = false;
@@ -107616,32 +107632,36 @@ async function httpScreenshot(api, rotation, signal, scale) {
     );
   }
 }
+async function sendViaTransport(transport, cmd, cmdName) {
+  const sent = routeViaTransport(transport, cmd);
+  try {
+    await sent;
+  } catch (cause) {
+    throw remoteTransportError(cmdName, cause);
+  }
+}
 function routeViaTransport(transport, cmd) {
   switch (cmd.cmd) {
     case "touch": {
       const sx = cmd.second_x ?? cmd.secondX;
       const sy = cmd.second_y ?? cmd.secondY;
-      transport.touch({
+      return transport.touch({
         type: cmd.type,
         x: cmd.x,
         y: cmd.y,
         secondX: sx == null ? void 0 : sx,
         secondY: sy == null ? void 0 : sy
       });
-      return;
     }
     case "button":
-      transport.button({
+      return transport.button({
         direction: cmd.direction,
         button: cmd.button
       });
-      return;
     case "rotate":
-      transport.rotate(cmd.direction);
-      return;
+      return transport.rotate(cmd.direction);
     case "key":
-      transport.pressKey(cmd.direction, cmd.code);
-      return;
+      return transport.pressKey(cmd.direction, cmd.code);
     default:
       throw new Error(`MoQ transport does not implement sendCommand cmd '${String(cmd.cmd)}'`);
   }
@@ -107655,8 +107675,8 @@ function createMoqTransport(moq, options) {
     return { url: (0, import_node_url.pathToFileURL)(file2).toString(), path: file2 };
   };
   return {
-    touch(opts) {
-      void moq.sendControl(
+    async touch(opts) {
+      await moq.sendControl(
         encodeTouch({
           action: opts.type,
           x: opts.x,
@@ -107666,17 +107686,17 @@ function createMoqTransport(moq, options) {
         })
       );
     },
-    button(opts) {
-      void moq.sendControl(encodeButton({ action: opts.direction, button: opts.button }));
+    async button(opts) {
+      await moq.sendControl(encodeButton({ action: opts.direction, button: opts.button }));
     },
-    rotate(direction) {
-      void moq.sendControl(encodeRotate(direction));
+    async rotate(direction) {
+      await moq.sendControl(encodeRotate(direction));
     },
     async paste(text) {
       await options.pasteText(text);
     },
-    pressKey(direction, keyCode) {
-      void moq.sendControl(encodeKey({ action: direction, code: keyCode }));
+    async pressKey(direction, keyCode) {
+      await moq.sendControl(encodeKey({ action: direction, code: keyCode }));
     },
     async screenshot(opts) {
       const scale = opts?.scale ?? getScreenshotScale();
@@ -107709,17 +107729,20 @@ async function buildRemoteInstance(device) {
       await simctlPbcopy(device.id, text);
       const CMD = 227;
       const V = 25;
-      await moq.sendControl(encodeKey({ action: "Down", code: CMD }));
-      await moq.sendControl(encodeKey({ action: "Down", code: V }));
-      await moq.sendControl(encodeKey({ action: "Up", code: V }));
-      await moq.sendControl(encodeKey({ action: "Up", code: CMD }));
+      await api.pressKey("Down", CMD);
+      await api.pressKey("Down", V);
+      await api.pressKey("Up", V);
+      await api.pressKey("Up", CMD);
     }
   });
   const stubUrl = `moq+remote://${device.id}`;
   const api = {
     apiUrl: stubUrl,
     streamUrl: stubUrl,
-    pressKey: (direction, keyCode) => moq.sendControl(encodeKey({ action: direction, code: keyCode })),
+    // Through `sendCommand`, as the attached instance below does, so a key the
+    // session refuses reports the same failure as a refused touch instead of a
+    // bare SDK error the caller cannot classify.
+    pressKey: (direction, keyCode) => sendCommand(api, { cmd: "key", code: keyCode, direction }),
     transport
   };
   return {

package/package.json

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