@swmansion/argent 0.29.1-next.22 → 0.29.1-next.24

package/dist/cli-cmds.mjs

@@ -35549,7 +35549,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.29.1-next.22";
+    return "0.29.1-next.24";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -16875,7 +16875,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.29.1-next.22";
+    return "0.29.1-next.24";
   }
   return "0.0.0";
 }

package/dist/tool-server.cjs

@@ -100766,7 +100766,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.29.1-next.22";
+    return "0.29.1-next.24";
   }
   return "0.0.0";
 }
@@ -128117,6 +128117,7 @@ function androidDevtoolsRef(device) {
 }
 var READY_TIMEOUT_MS2 = 3e4;
 var EXIT_GRACE_MS = 200;
+var HELPER_EXIT_TIMEOUT_MS = 3e3;
 var HELPER_PORT_MARKER = /^INSTRUMENTATION_STATUS:\s*port=(\d+)/;
 var ADB_FORWARD_PORT_MARKER = /^(\d+)\s*$/;
 var HELPER_STATUS_MARKER = /^INSTRUMENTATION_STATUS:\s*Error=/;
@@ -128358,13 +128359,38 @@ var androidDevtoolsBlueprint = {
     const spawned = await spawnHelperWithRepair(serial);
     let ready2 = false;
     let disposed = false;
+    let procExited = false;
+    spawned.proc.once("exit", () => {
+      procExited = true;
+    });
+    let generation = 0;
+    let activeGeneration = 0;
+    let socketLost = false;
+    let clientClosed = false;
+    let reconnecting = null;
+    const onClientClosed = (gen, err) => {
+      if (gen !== activeGeneration) return;
+      clientClosed = true;
+      if (disposed) return;
+      if (!procExited && getFailureSignal(err)?.error_code === FAILURE_CODES.ANDROID_DEVTOOLS_SOCKET_CLOSED) {
+        socketLost = true;
+        return;
+      }
+      events.emit("terminated", err);
+    };
+    const openClient = async () => {
+      const gen = ++generation;
+      const opened = await connectAndroidDevtoolsClient(
+        spawned.localPort,
+        (err) => onClientClosed(gen, err)
+      );
+      return { client: opened, gen };
+    };
     let client2;
     try {
-      client2 = await connectAndroidDevtoolsClient(spawned.localPort, (err) => {
-        if (!disposed) {
-          events.emit("terminated", err);
-        }
-      });
+      const opened = await openClient();
+      client2 = opened.client;
+      activeGeneration = opened.gen;
     } catch (err) {
       try {
         spawned.proc.kill();
@@ -128404,10 +128430,60 @@ var androidDevtoolsBlueprint = {
     spawned.proc.on("error", (err) => {
       if (!disposed) events.emit("terminated", err);
     });
+    const reconnect = async () => {
+      let opened;
+      try {
+        opened = await openClient();
+        await opened.client.request("ping");
+      } catch (err) {
+        opened?.client.close();
+        if (!disposed) events.emit("terminated", err instanceof Error ? err : void 0);
+        throw err;
+      }
+      if (disposed) {
+        opened.client.close();
+        throw new FailureError("AndroidDevtools client closed", {
+          error_code: FAILURE_CODES.ANDROID_DEVTOOLS_RPC_CLIENT_CLOSED,
+          failure_stage: "android_devtools_rpc_reconnect",
+          failure_area: "tool_server",
+          error_kind: "subprocess"
+        });
+      }
+      client2 = opened.client;
+      activeGeneration = opened.gen;
+      socketLost = false;
+      clientClosed = false;
+      return client2;
+    };
+    const waitForHelperExit = (timeoutMs) => new Promise((resolve16) => {
+      if (procExited) return resolve16();
+      const timer = setTimeout(resolve16, timeoutMs);
+      spawned.proc.once("exit", () => {
+        clearTimeout(timer);
+        resolve16();
+      });
+    });
+    const request3 = async (method, params) => {
+      let current = client2;
+      if (socketLost && !disposed && !procExited) {
+        reconnecting ??= reconnect().finally(() => {
+          reconnecting = null;
+        });
+        current = await reconnecting;
+      }
+      try {
+        return await current.request(method, params);
+      } catch (err) {
+        if (!disposed && getFailureSignal(err)?.error_code === FAILURE_CODES.ANDROID_DEVTOOLS_RPC_ERROR && err instanceof Error && err.message.includes("UiAutomation not connected")) {
+          events.emit("terminated", err);
+        }
+        throw err;
+      }
+    };
     const api = {
       isReady: () => ready2 && !disposed,
       getHierarchy(getOpts = {}) {
-        return client2.request("getHierarchy", {
+        return request3("getHierarchy", {
           waitForIdleMs: getOpts.waitForIdleMs ?? 500,
           maxDepth: getOpts.maxDepth ?? 128,
           maxNodes: getOpts.maxNodes ?? 5e3,
@@ -128415,15 +128491,15 @@ var androidDevtoolsBlueprint = {
         });
       },
       getScreenSize() {
-        return client2.request("getScreenSize");
+        return request3("getScreenSize");
       },
       ping() {
-        return client2.request("ping");
+        return request3("ping");
       },
       async setText(text, setOpts = {}) {
         let result;
         try {
-          result = await client2.request("setText", {
+          result = await request3("setText", {
             text,
             ...setOpts.check ? { check: true } : {}
           });
@@ -128455,19 +128531,41 @@ var androidDevtoolsBlueprint = {
       dispose: async () => {
         disposed = true;
         ready2 = false;
-        try {
-          await Promise.race([
-            client2.request("shutdown"),
-            new Promise(
-              (_, reject) => setTimeout(() => reject(new Error("shutdown timeout")), 1e3)
-            )
-          ]);
-        } catch {
+        let opening;
+        let acknowledged = false;
+        if (!procExited) {
+          let timer;
+          try {
+            await Promise.race([
+              (async () => {
+                let target = client2;
+                if (clientClosed) {
+                  opening = openClient();
+                  target = (await opening).client;
+                }
+                await target.request("shutdown");
+              })(),
+              new Promise((_, reject) => {
+                timer = setTimeout(() => reject(new Error("shutdown timeout")), 1e3);
+              })
+            ]);
+            acknowledged = true;
+          } catch {
+          } finally {
+            clearTimeout(timer);
+          }
         }
+        if (acknowledged) await waitForHelperExit(HELPER_EXIT_TIMEOUT_MS);
+        void opening?.then(
+          (opened) => opened.client.close(),
+          () => void 0
+        );
         client2.close();
-        try {
-          spawned.proc.kill();
-        } catch {
+        if (!procExited) {
+          try {
+            spawned.proc.kill();
+          } catch {
+          }
         }
         await removeAdbForward(serial, spawned.localPort);
       },
@@ -134819,7 +134917,7 @@ var NETWORK_INTERCEPTOR_SCRIPT = `(function() {
         if (outcome === 'error') {
           var text = '';
           try { if (xhr.responseType === '' || xhr.responseType === 'text') text = xhr.responseText; } catch (e) {}
-          return fail(rec, text ? String(text) : 'Network error');
+          return fail(rec, text ? String(text) : 'Network request failed');
         }
         // RN sets responseURL only after it announces HEADERS_RECEIVED: this is the final URL.
         if (rec.entry.response && xhr.responseURL) rec.entry.response.url = xhr.responseURL;
@@ -142414,18 +142512,19 @@ function parseDeviceStates(stdout) {
 function parseSnapshot(stdout) {
   const screenOn = !/mScreenOnFully=false/.test(stdout);
   const wakefulness = /mWakefulness=([A-Za-z]+)/.exec(stdout)?.[1];
+  const keyguard = /isKeyguardShowing=([a-z]+)/.exec(stdout)?.[1];
   return {
     state: /^\s*(\d+)\s*$/m.exec(stdout)?.[1],
     screenOn,
     awake: wakefulness ? !/^(Asleep|Dozing)$/.test(wakefulness) : screenOn,
-    keyguard: /isKeyguardShowing=true/.test(stdout)
+    keyguard: keyguard === void 0 ? void 0 : keyguard === "true"
   };
 }
 async function readSnapshot(serial) {
   return parseSnapshot(
     await shell(
       serial,
-      "cmd device_state print-state; dumpsys window displays | grep -o 'mScreenOnFully=[a-z]*'; dumpsys power | grep -o 'mWakefulness=[A-Za-z]*'; dumpsys window | grep -o 'isKeyguardShowing=[a-z]*'"
+      "cmd device_state print-state; dumpsys window displays | grep -o 'mScreenOnFully=[a-z]*'; dumpsys power | grep -o 'mWakefulness=[A-Za-z]*'; dumpsys window | grep -o 'isKeyguardShowing=[a-z]*'; true"
     )
   );
 }
@@ -142461,12 +142560,16 @@ async function dismissFoldLockScreen(serial, signal) {
   let lastAttempt = -Infinity;
   const deadline = Date.now() + DISMISS_TIMEOUT_MS;
   for (; ; ) {
-    if (!(await readSnapshot(serial)).keyguard) {
+    const { keyguard } = await readSnapshot(serial);
+    if (keyguard === false) {
       if (++clear >= STABLE_READS) return void 0;
     } else {
       clear = 0;
-      if (Date.now() >= deadline) break;
-      if (attempts < MAX_DISMISS_ATTEMPTS && Date.now() - lastAttempt >= DISMISS_SPACING_MS) {
+      if (Date.now() >= deadline) {
+        if (keyguard) break;
+        return void 0;
+      }
+      if (keyguard && attempts < MAX_DISMISS_ATTEMPTS && Date.now() - lastAttempt >= DISMISS_SPACING_MS) {
         attempts++;
         lastAttempt = Date.now();
         await shell(serial, "wm dismiss-keyguard");
@@ -142542,9 +142645,15 @@ async function fold(serial, params, device, signal) {
   const stateName = last?.state !== void 0 ? byId.get(last.state) ?? last.state : "unknown";
   const darkAwake = last?.state !== void 0 && last.awake && !last.screenOn;
   const budget = `${SETTLE_TIMEOUT_MS2 / 1e3} s`;
+  let lockScreen = last?.keyguard ?? false;
+  let lockScreenWarning;
+  if (stateName === "CLOSED" && !before.keyguard && last?.awake) {
+    lockScreen = false;
+    lockScreenWarning = await dismissFoldLockScreen(serial, signal);
+  }
   if (!settled && expected !== void 0) {
     throw failed(
-      last?.state === expected ? `${serial} reached device state ${stateName} for the ${params.posture} posture, but the device is awake and the screen did not stay on within ${budget}. Take a screenshot before the next action.` : `${serial} did not reach the ${params.posture} posture: the guest still reports device state ${stateName}. Fold again; a screenshot shows what the device renders.`,
+      last?.state === expected ? `${serial} reached device state ${stateName} for the ${params.posture} posture, but the device is awake and the screen did not stay on within ${budget}. Take a screenshot before the next action.` + (lockScreenWarning ? ` ${lockScreenWarning}` : "") : `${serial} did not reach the ${params.posture} posture: the guest still reports device state ${stateName}. Fold again; a screenshot shows what the device renders.`,
       "android_fold_unverified"
     );
   }
@@ -142558,12 +142667,7 @@ async function fold(serial, params, device, signal) {
       `The screen did not hold steady within ${budget}. Take a screenshot before the next action.`
     );
   }
-  let lockScreen = last?.keyguard ?? false;
-  if (stateName === "CLOSED" && !before.keyguard && last?.awake) {
-    lockScreen = false;
-    const warning = await dismissFoldLockScreen(serial, signal);
-    if (warning) warnings.push(warning);
-  }
+  if (lockScreenWarning) warnings.push(lockScreenWarning);
   const screenOff = settled && last !== void 0 && !last.screenOn;
   if (screenOff && lockScreen) {
     warnings.push(

package/package.json

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