@touchtechclub/simbox 0.2.6 → 0.2.8

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { Command } from "commander";
+import { Command, Option } from "commander";
 import pc4 from "picocolors";
 import { createRequire } from "node:module";
 
@@ -163,7 +163,7 @@ var repoStatus = () => api("/v1/repo/status");
 var repairRepo = () => api("/v1/repo/repair", {
   method: "POST"
 });
-var ensureRun = (fresh) => api("/v1/runs/ensure", { method: "POST", body: { new: fresh } });
+var ensureRun = (fresh, platform2) => api("/v1/runs/ensure", { method: "POST", body: { new: fresh, platform: platform2 } });
 async function currentRun() {
   try {
     const res = await api("/v1/runs/current");
@@ -370,6 +370,9 @@ async function waitForAndroid(runId, options = {}) {
     if (!run || run.id !== runId || run.state !== "live") {
       throw new CliError("The run ended or was replaced while preparing Android. Run `simbox sim` again.");
     }
+    if (run.platform === "ios") {
+      throw new CliError("Android needs a Linux/KVM run. Run `simbox repair`, then `simbox sim --new --platform android`.");
+    }
     if (run.androidReady)
       return;
     await (options.pause?.() ?? sleep(3000));
@@ -566,7 +569,7 @@ var SIM_POLL_MS = 3000;
 async function cmdSim(opts) {
   const json = opts.json === true;
   const out = json ? process.stderr : process.stdout;
-  const first = await ensureRun(opts.new === true);
+  const first = await ensureRun(opts.new === true, opts.platform);
   let info;
   if (first.state === "live") {
     info = {
@@ -614,6 +617,8 @@ async function cmdSim(opts) {
     };
   }
   info = await waitForRemote(info);
+  if (opts.platform === "android")
+    await waitForAndroid(info.runId);
   if (json) {
     const payload = {
       tunnel_url: info.tunnelUrl,
@@ -639,6 +644,7 @@ async function cmdPs() {
   const stateColor = run.state === "live" ? pc3.green : run.state === "failed" ? pc3.red : pc3.yellow;
   console.log(`${pc3.bold("run")} ${run.id}`);
   console.log(`  state:          ${stateColor(run.state)}`);
+  console.log(`  platform:       ${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"}`);
@@ -682,7 +688,10 @@ program.command("init").description("Open onboarding and wait until a repo is co
   requireToken();
   return run(cmdInit());
 });
-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) => {
+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("--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.2.6",
+  "version": "0.2.8",
   "description": "On-demand iOS simulators & Android emulators on your own GitHub Actions minutes.",
   "repository": {
     "type": "git",