@touchtechclub/simbox 0.4.9 → 0.4.10

package/dist/cli.js

@@ -623,6 +623,22 @@ function remoteArgs(args, info, stateDir) {
   result.push("--state-dir", stateDir, "--daemon-base-url", daemonBaseUrl(info.tunnelUrl), "--daemon-transport", "http");
   return [...result, ...tail];
 }
+var REPLAY_SAFE = new Set([
+  "devices",
+  "snapshot",
+  "screenshot",
+  "fold",
+  "session",
+  "appstate",
+  "apps",
+  "get",
+  "is"
+]);
+var TRANSPORT_ERROR = /Remote daemon is unavailable|Daemon request timed out|Failed to read daemon response|fetch failed|ECONNRESET|socket hang up/;
+function shouldReplay(args, code, output) {
+  return code !== 0 && REPLAY_SAFE.has(args[0] ?? "") && TRANSPORT_ERROR.test(output);
+}
+var REPLAY_ATTEMPTS = 3;
 function hasFlag(args, flag) {
   const end = args.indexOf("--");
   return (end < 0 ? args : args.slice(0, end)).some((arg) => arg === flag || arg.startsWith(`${flag}=`));
@@ -661,26 +677,56 @@ async function cmdExec(args) {
     info = await waitForRemote(initial);
   }
   writeCachedRun(info);
+  const replaySafe = REPLAY_SAFE.has(args[0]);
+  let connected = info;
+  let result = await runRemote(bin, args, connected, replaySafe);
+  for (let attempt = 1;attempt < REPLAY_ATTEMPTS; attempt++) {
+    if (!shouldReplay(args, result.code, result.output))
+      break;
+    process.stderr.write(`Tunnel dropped during \`${args[0]}\`; retrying (${attempt}/${REPLAY_ATTEMPTS - 1}).
+`);
+    await sleep(attempt * 5000);
+    if (!await probeRemote(connected)) {
+      const refreshed = await refreshRemote();
+      if (!refreshed)
+        break;
+      connected = await waitForRemote(refreshed);
+      writeCachedRun(connected);
+    }
+    result = await runRemote(bin, args, connected, replaySafe);
+  }
+  if (replaySafe) {
+    process.stdout.write(result.stdout);
+    process.stderr.write(result.stderr);
+  }
+  const code = result.code;
+  if (code === 0 && !args.some((arg) => ["help", "--help", "-h", "--version", "version"].includes(arg)))
+    registerDevice(connected, { args });
+  if (code !== 0 && !replaySafe) {
+    process.stderr.write("Simbox did not retry the device command (it may already have executed). Use `simbox exec session list` to inspect it; the next command refreshes the tunnel automatically.\n");
+  }
+  process.exitCode = code;
+}
+async function runRemote(bin, args, info, capture) {
   const env = {
     ...process.env,
     AGENT_DEVICE_DAEMON_AUTH_TOKEN: info.daemonToken
   };
   delete env.AGENT_DEVICE_REMOTE_CONFIG;
   delete env.AGENT_DEVICE_DAEMON_BASE_URL;
+  let stdout = "";
+  let stderr = "";
   const code = await new Promise((resolve, reject) => {
     const child = spawn(bin, remoteArgs(args, info, join4(configDir(), "agent-device")), {
-      stdio: "inherit",
+      stdio: capture ? ["inherit", "pipe", "pipe"] : "inherit",
       env
     });
+    child.stdout?.on("data", (chunk) => stdout += chunk.toString());
+    child.stderr?.on("data", (chunk) => stderr += chunk.toString());
     child.on("error", reject);
-    child.on("exit", (status) => resolve(status ?? 1));
+    child.on("close", (status) => resolve(status ?? 1));
   });
-  if (code === 0 && !args.some((arg) => ["help", "--help", "-h", "--version", "version"].includes(arg)))
-    registerDevice(info, { args });
-  if (code !== 0) {
-    process.stderr.write("Simbox did not retry the device command (it may already have executed). Use `simbox exec session list` to inspect it; the next command refreshes the tunnel automatically.\n");
-  }
-  process.exitCode = code;
+  return { code, output: stdout + stderr, stdout, stderr };
 }
 
 // src/commands.ts
@@ -765,7 +811,7 @@ function printRepoConnected(repo) {
   }
   console.log(`Run ${pc3.cyan("simbox sim")} to boot a simulator.`);
 }
-var SIM_TIMEOUT_MS = 12 * 60 * 1000;
+var SIM_TIMEOUT_MS = 25 * 60 * 1000;
 var SIM_POLL_MS = 3000;
 async function cmdSim(opts) {
   const json = opts.json === true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@touchtechclub/simbox",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "On-demand iOS simulators & Android emulators on your own GitHub Actions minutes.",
   "repository": {
     "type": "git",