@touchtechclub/simbox 0.3.0 → 0.4.1

package/dist/cli.js

@@ -438,7 +438,57 @@ class Spinner {
 
 // src/remote.ts
 import { spawn } from "node:child_process";
+import { join as join3 } from "node:path";
+
+// src/device-registration.ts
+import { randomUUID } from "node:crypto";
+import { existsSync, mkdirSync as mkdirSync2, readdirSync, statSync, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { homedir as homedir2 } from "node:os";
 import { join as join2 } from "node:path";
+var MAX_AGE_MS = 5 * 60000;
+function registerDevice(info, options = {}) {
+  if (!process.env.T3CODE_HOME && !process.env.SIMBOX_DEVICE_REGISTRATION_DIR && ![".s5code", ".t3"].some((home) => existsSync(join2(homedir2(), home, "userdata", "server-runtime.json"))))
+    return;
+  try {
+    const directory = process.env.SIMBOX_DEVICE_REGISTRATION_DIR ?? join2(configDir(), "device-registrations");
+    mkdirSync2(directory, { recursive: true, mode: 448 });
+    for (const file of readdirSync(directory)) {
+      if (!/^[a-f0-9-]{36}\.json$/.test(file))
+        continue;
+      const path = join2(directory, file);
+      if (Date.now() - statSync(path).mtimeMs > MAX_AGE_MS)
+        unlinkSync(path);
+    }
+    const args = options.args ?? [];
+    const flag = (name) => {
+      const end = args.indexOf("--");
+      const flags = end < 0 ? args : args.slice(0, end);
+      const index = flags.indexOf(name);
+      return index >= 0 ? flags[index + 1] : flags.find((arg) => arg.startsWith(`${name}=`))?.slice(name.length + 1);
+    };
+    const id = randomUUID();
+    writeFileSync2(join2(directory, `${id}.json`), JSON.stringify({
+      version: 1,
+      createdAt: Date.now(),
+      ...info,
+      platform: flag("--platform") ?? options.platform,
+      deviceId: flag("--udid") ?? flag("--serial"),
+      deviceName: flag("--device"),
+      agentSession: flag("--session"),
+      stop: options.stop === true,
+      autoBoot: !options.args,
+      apiUrl: apiBaseUrl(),
+      userToken: loadToken()
+    }), { mode: 384, flag: "wx" });
+    process.stderr.write(`[simbox-device:${id}]
+`);
+  } catch {
+    process.stderr.write(`Could not notify S5 Code about this device; Simbox remains connected.
+`);
+  }
+}
+
+// src/remote.ts
 var STARTUP_TIMEOUT_MS = 300000;
 async function waitForAndroid(runId, options = {}) {
   const deadline = Date.now() + (options.timeoutMs ?? 12 * 60000);
@@ -546,13 +596,15 @@ async function cmdExec(args) {
   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")), {
+    const child = spawn(bin, remoteArgs(args, info, join3(configDir(), "agent-device")), {
       stdio: "inherit",
       env
     });
     child.on("error", reject);
     child.on("exit", (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");
   }
@@ -699,6 +751,7 @@ async function cmdSim(opts) {
   info = await waitForRemote(info);
   if (opts.platform === "android")
     await waitForAndroid(info.runId);
+  registerDevice(info, { platform: opts.platform });
   if (json) {
     const payload = {
       tunnel_url: info.tunnelUrl,
@@ -740,6 +793,13 @@ async function cmdStop() {
     return;
   }
   await stopRun(run.id);
+  if (run.tunnelUrl && run.daemonToken)
+    registerDevice({
+      runId: run.id,
+      tunnelUrl: run.tunnelUrl,
+      daemonToken: run.daemonToken,
+      expiresAt: run.expiresAt
+    }, { stop: true });
   console.log(`${pc3.green("✔")} Stop requested for run ${pc3.bold(run.id)}.`);
 }
 async function cmdRepair() {

package/package.json

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