@touchtechclub/simbox 0.2.0 → 0.2.1

package/dist/cli.js

@@ -3,6 +3,7 @@
 // src/cli.ts
 import { Command } from "commander";
 import pc4 from "picocolors";
+import { createRequire } from "node:module";
 
 // src/config.ts
 import { mkdirSync, readFileSync, writeFileSync, chmodSync } from "node:fs";
@@ -223,32 +224,33 @@ function connectFlow(info, quiet = false) {
   const base = daemonBaseUrl(info.tunnelUrl);
   const bin = findAgentDevice();
   if (bin) {
-    out.write(`${pc.green("▶")} Connecting via ${pc.bold("agent-device")}…
+    out.write(`${pc.green("▶")} Ready for ${pc.bold("agent-device")} via Simbox.
 `);
-    const res = spawnSync(bin, ["connect", "proxy", "--daemon-base-url", base], {
-      stdio: quiet ? ["inherit", "ignore", "inherit"] : "inherit",
-      env: { ...process.env, AGENT_DEVICE_DAEMON_AUTH_TOKEN: info.daemonToken }
-    });
-    if (res.error || res.status !== 0) {
-      out.write(pc.yellow(`  agent-device connect failed — use the manual commands below.
-`));
-    } else {
-      out.write(`
-Next: ${pc.cyan("agent-device open <app> --platform ios")} ${pc.dim("(or --platform android)")}
-
-`);
-    }
   } else {
     out.write(`${pc.yellow("!")} ${pc.bold("agent-device")} not found on PATH — install it, then:
 `);
   }
+  out.write(`
+  ${pc.cyan("simbox exec devices")}
+`);
+  out.write(`  ${pc.cyan('simbox exec open <app> --platform ios --device "<device from inventory>"')}
+`);
+  out.write(`  ${pc.cyan("simbox exec snapshot -i")}
+`);
+  out.write(`  Use --udid for iOS or --serial for Android when selecting a specific device.
+`);
+  out.write(`  exec supplies auth, refreshes tunnel URLs, and allows 5 minutes for cold startup.
+
+`);
   out.write(pc.dim(`  manual connect:
 `));
   out.write(`  ${pc.cyan(`export AGENT_DEVICE_DAEMON_AUTH_TOKEN=${info.daemonToken}`)}
 `);
-  out.write(`  ${pc.cyan(`agent-device connect proxy --daemon-base-url ${base}`)}
+  out.write(`  ${pc.cyan(`export AGENT_DEVICE_DAEMON_BASE_URL=${base}`)}
+`);
+  out.write(`  ${pc.cyan(`agent-device open <app> --platform ios --udid <udid> --session simbox-${info.runId} --timeout 300000`)}
 `);
-  out.write(`  ${pc.cyan("agent-device open <app> --platform ios")}
+  out.write(`  Raw agent-device commands need these exports again if the tunnel changes.
 `);
 }
 
@@ -356,6 +358,110 @@ class Spinner {
   }
 }
 
+// src/remote.ts
+import { spawn } from "node:child_process";
+import { join as join2 } from "node:path";
+var STARTUP_TIMEOUT_MS = 300000;
+async function waitForRemote(initial, options = {}) {
+  const probe = options.probe ?? probeRemote;
+  const refresh = options.refresh ?? refreshRemote;
+  const deadline = Date.now() + (options.timeoutMs ?? 90000);
+  let info = initial;
+  do {
+    if (await probe(info))
+      return info;
+    const next = await refresh();
+    if (!next || next.runId !== initial.runId) {
+      throw new CliError("The run ended or was replaced. Run `simbox sim` to connect again.");
+    }
+    info = next;
+    await (options.pause?.() ?? sleep(1000));
+  } while (Date.now() < deadline);
+  throw new CliError("The run is live but its tunnel/daemon is not ready. Retry `simbox sim` or inspect the Actions logs. No device command was sent.");
+}
+async function probeRemote(info) {
+  try {
+    const res = await fetch(`${daemonBaseUrl(info.tunnelUrl)}/health`, {
+      signal: AbortSignal.timeout(15000)
+    });
+    if (!res.ok)
+      return false;
+    const body = await res.json();
+    return body.ok === true && body.upstream?.ok !== false;
+  } catch {
+    return false;
+  }
+}
+async function refreshRemote() {
+  const run = await currentRun();
+  if (run?.state !== "live" || !run.tunnelUrl || !run.daemonToken)
+    return null;
+  return {
+    runId: run.id,
+    tunnelUrl: run.tunnelUrl,
+    daemonToken: run.daemonToken,
+    expiresAt: run.expiresAt
+  };
+}
+function remoteArgs(args, info, stateDir) {
+  const separator = args.indexOf("--");
+  const result = separator < 0 ? [...args] : args.slice(0, separator);
+  const tail = separator < 0 ? [] : args.slice(separator);
+  if (["open", "boot", "prepare"].includes(args[0] ?? "") && !hasFlag(args, "--timeout")) {
+    result.push("--timeout", String(STARTUP_TIMEOUT_MS));
+  }
+  if (!hasFlag(args, "--session"))
+    result.push("--session", `simbox-${info.runId}`);
+  result.push("--state-dir", stateDir, "--daemon-base-url", daemonBaseUrl(info.tunnelUrl), "--daemon-transport", "http");
+  return [...result, ...tail];
+}
+function hasFlag(args, flag) {
+  const end = args.indexOf("--");
+  return (end < 0 ? args : args.slice(0, end)).some((arg) => arg === flag || arg.startsWith(`${flag}=`));
+}
+async function cmdExec(args) {
+  if (!args.length)
+    throw new CliError("Usage: simbox exec <agent-device command> [arguments]");
+  const reserved = [
+    "--daemon-base-url",
+    "--daemon-auth-token",
+    "--daemon-transport",
+    "--remote-config",
+    "--state-dir"
+  ];
+  if (reserved.some((flag) => hasFlag(args, flag))) {
+    throw new CliError("Simbox manages the remote URL, credentials and state directory for `exec`.");
+  }
+  if (["connect", "disconnect", "proxy", "auth"].includes(args[0])) {
+    throw new CliError("Use device commands with `simbox exec`, not connection/auth commands.");
+  }
+  const bin = findAgentDevice();
+  if (!bin)
+    throw new CliError("Install agent-device first: npm i -g agent-device@0.21.20");
+  const initial = await refreshRemote();
+  if (!initial)
+    throw new CliError("No live run. Start one with `simbox sim`.");
+  const info = await waitForRemote(initial);
+  const env = {
+    ...process.env,
+    AGENT_DEVICE_DAEMON_AUTH_TOKEN: info.daemonToken
+  };
+  delete env.AGENT_DEVICE_REMOTE_CONFIG;
+  delete env.AGENT_DEVICE_DAEMON_BASE_URL;
+  const code = await new Promise((resolve, reject) => {
+    const child = spawn(bin, remoteArgs(args, info, join2(configDir(), "agent-device")), {
+      stdio: "inherit",
+      env
+    });
+    child.on("error", reject);
+    child.on("exit", (status) => resolve(status ?? 1));
+  });
+  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;
+}
+
 // src/commands.ts
 async function cmdLogin() {
   const flow = await startDeviceFlow();
@@ -484,6 +590,7 @@ async function cmdSim(opts) {
       expiresAt: live.run.expiresAt
     };
   }
+  info = await waitForRemote(info);
   if (json) {
     const payload = {
       tunnel_url: info.tunnelUrl,
@@ -545,17 +652,21 @@ async function cmdLogout() {
 }
 
 // src/cli.ts
-var program = new Command;
-program.name("simbox").description("On-demand iOS simulators & Android emulators on your own GitHub Actions minutes.").version("0.1.0");
+var program = new Command().enablePositionalOptions();
+program.name("simbox").description("On-demand iOS simulators & Android emulators on your own GitHub Actions minutes.").version(getVersion());
 program.command("login").description("Authenticate via device flow").action(() => run(cmdLogin()));
 program.command("init").description("Open onboarding and wait until a repo is connected").action(() => {
   requireToken();
   return run(cmdInit());
 });
-program.command("sim").description("Ensure a run is live and connect agent-device to it").option("--new", "force a fresh run even if one is live").option("--json", "print {tunnel_url, daemon_token, run_id, expires_at} as JSON only").action((opts) => {
+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").option("--json", "print {tunnel_url, daemon_token, run_id, expires_at} as JSON only").action((opts) => {
   requireToken();
   return run(cmdSim(opts));
 });
+program.command("exec").description("Run agent-device with fresh tunnel credentials and a cold-boot startup budget").argument("[args...]", "agent-device command and arguments").allowUnknownOption().allowExcessArguments().passThroughOptions().action((args) => {
+  requireToken();
+  return run(cmdExec(args));
+});
 program.command("ps").description("Show the current run").action(() => {
   requireToken();
   return run(cmdPs());
@@ -569,6 +680,15 @@ program.command("repair").description("Re-commit the workflow, rotate the repo s
   return run(cmdRepair());
 });
 program.command("logout").description("Delete the saved auth token").action(() => run(cmdLogout()));
+function getVersion() {
+  try {
+    const require2 = createRequire(import.meta.url);
+    const pkg = require2("../package.json");
+    return pkg.version ?? "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
 async function run(p) {
   try {
     await p;

package/package.json

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