@touchtechclub/simbox 0.4.8 → 0.4.10

package/dist/cli.js

@@ -81,6 +81,35 @@ function parseRunnerInput(input, platform) {
 function formatRunner(runner) {
   return runner ? runner.labels.join(" + ") : "unknown (legacy workflow)";
 }
+// ../../packages/shared/src/device-profile.ts
+var XCODE_VERSION = /^\d{1,3}(\.\d{1,3}){0,2}$/;
+function validateDeviceProfile(value, platform) {
+  if (value === undefined || value === null)
+    return null;
+  if (typeof value !== "object" || Array.isArray(value))
+    throw new Error("Device must be {foldable?: boolean, xcode?: string}.");
+  const keys = Object.keys(value);
+  if (keys.some((key) => key !== "foldable" && key !== "xcode"))
+    throw new Error("Device only accepts foldable and xcode.");
+  const { foldable, xcode } = value;
+  if (foldable !== undefined && typeof foldable !== "boolean")
+    throw new Error("foldable must be true or false.");
+  if (xcode !== undefined) {
+    if (typeof xcode !== "string" || !XCODE_VERSION.test(xcode))
+      throw new Error('Xcode must be a version such as "27.1".');
+    if (platform !== "ios")
+      throw new Error("Xcode selection only applies to iOS runs.");
+  }
+  const profile = {
+    ...foldable === true ? { foldable: true } : {},
+    ...xcode !== undefined ? { xcode } : {}
+  };
+  return Object.keys(profile).length > 0 ? profile : null;
+}
+function formatDeviceProfile(profile, platform) {
+  const device = profile?.foldable ? platform === "ios" ? "iPhone Duo" : "Android foldable" : "default";
+  return profile?.xcode ? `${device}, Xcode ${profile.xcode}` : device;
+}
 // ../../packages/shared/src/preview.ts
 var PREVIEW_SESSION_MS = 5 * 60000;
 // src/config.ts
@@ -234,9 +263,9 @@ var repoStatus = () => api("/v1/repo/status");
 var repairRepo = () => api("/v1/repo/repair", {
   method: "POST"
 });
-var ensureRun = (fresh, platform2, runner) => api("/v1/runs/ensure", {
+var ensureRun = (fresh, platform2, runner, device) => api("/v1/runs/ensure", {
   method: "POST",
-  body: { new: fresh, platform: platform2, runner }
+  body: { new: fresh, platform: platform2, runner, device }
 });
 var runnerSettings = () => api("/v1/runners");
 var runnerDiagnostics = () => api("/v1/runners/doctor");
@@ -594,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}=`));
@@ -616,7 +661,7 @@ async function cmdExec(args) {
   }
   const bin = findAgentDevice();
   if (!bin)
-    throw new CliError("Install agent-device first: npm i -g agent-device@0.21.20");
+    throw new CliError("Install agent-device first: npm i -g agent-device@0.21.28");
   const android = args.some((arg, i) => arg === "--platform=android" || arg === "--platform" && args[i + 1] === "android");
   let info = android ? null : readCachedRun();
   if (info && !await probeRemote(info))
@@ -632,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
@@ -736,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;
@@ -744,7 +819,16 @@ async function cmdSim(opts) {
   if (opts.runner !== undefined && !opts.platform)
     throw new CliError("Use --platform ios or android with --runner.");
   const runner = opts.runner === undefined ? undefined : parseRunnerInput(opts.runner, opts.platform);
-  const first = await ensureRun(opts.new === true, opts.platform, runner);
+  const wantsDevice = opts.foldable === true || opts.xcode !== undefined;
+  if (wantsDevice && !opts.platform)
+    throw new CliError("Use --platform ios or android with --foldable or --xcode.");
+  let device;
+  try {
+    device = wantsDevice ? validateDeviceProfile({ foldable: opts.foldable, xcode: opts.xcode }, opts.platform) ?? undefined : undefined;
+  } catch (err) {
+    throw new CliError(err.message);
+  }
+  const first = await ensureRun(opts.new === true, opts.platform, runner, device);
   let info;
   if (first.state === "live") {
     info = {
@@ -823,6 +907,7 @@ async function cmdPs() {
   console.log(`  state:          ${stateColor(run.state)}`);
   console.log(`  platform:       ${run.platform}`);
   console.log(`  runner:         ${formatRunner(run.runner)}`);
+  console.log(`  device:         ${formatDeviceProfile(run.device ?? null, run.platform)}`);
   console.log(`  gh_run_id:      ${run.ghRunId ?? pc3.dim("pending")}`);
   console.log(`  active_devices: ${run.activeDevices}`);
   console.log(`  android_ready:  ${run.androidReady ? "yes" : "no"}`);
@@ -1011,7 +1096,7 @@ program.command("init").description("Open onboarding and wait until a repo is co
 program.command("sim").description("Ensure a run and its tunnel are ready for device commands").option("--new", "force a fresh run even if one is live").addOption(new Option("--platform <platform>", "ios: macOS runner; android: Linux/KVM runner").choices([
   "ios",
   "android"
-])).option("--runner <label-or-json>", "override runner label or JSON label array; requires --platform").option("--json", "print {tunnel_url, daemon_token, run_id, expires_at} as JSON only").action((opts) => {
+])).option("--runner <label-or-json>", "override runner label or JSON label array; requires --platform").option("--foldable", "boot a foldable: iPhone Duo (needs Xcode 27.1+, e.g. --runner xcode-27) or a 7.6in Android foldable; requires --platform").option("--xcode <version>", "iOS: select this Xcode (e.g. 27.1) before the device daemon starts").option("--json", "print {tunnel_url, daemon_token, run_id, expires_at} as JSON only").action((opts) => {
   requireToken();
   return run(cmdSim(opts));
 });

package/package.json

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