@touchtechclub/simbox 0.4.6 → 0.4.8

package/dist/cli.js

@@ -280,7 +280,42 @@ Run \`simbox repair\` to fix the repo setup.`);
 }
 
 // src/commands.ts
-import { rmSync } from "node:fs";
+import { rmSync as rmSync2 } from "node:fs";
+
+// src/run-cache.ts
+import { chmodSync as chmodSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, rmSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { join as join2 } from "node:path";
+var cachePath = () => join2(configDir(), "current-run.json");
+function readCachedRun(now = Date.now()) {
+  try {
+    const info = JSON.parse(readFileSync2(cachePath(), "utf8"));
+    if (typeof info.runId !== "string" || typeof info.tunnelUrl !== "string" || typeof info.daemonToken !== "string")
+      return null;
+    const expiresAt = typeof info.expiresAt === "number" ? info.expiresAt : null;
+    if (expiresAt !== null && expiresAt <= now)
+      return null;
+    return {
+      runId: info.runId,
+      tunnelUrl: info.tunnelUrl,
+      daemonToken: info.daemonToken,
+      expiresAt
+    };
+  } catch {
+    return null;
+  }
+}
+function writeCachedRun(info) {
+  try {
+    mkdirSync2(configDir(), { recursive: true, mode: 448 });
+    writeFileSync2(cachePath(), JSON.stringify(info), { mode: 384 });
+    chmodSync2(cachePath(), 384);
+  } catch {}
+}
+function clearCachedRun() {
+  rmSync(cachePath(), { force: true });
+}
+
+// src/commands.ts
 import pc3 from "picocolors";
 
 // src/connect.ts
@@ -438,24 +473,24 @@ class Spinner {
 
 // src/remote.ts
 import { spawn } from "node:child_process";
-import { join as join3 } from "node:path";
+import { join as join4 } 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 { existsSync, mkdirSync as mkdirSync3, readdirSync, statSync, unlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { join as join2 } from "node:path";
+import { join as join3 } 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"))))
+  if (!process.env.T3CODE_HOME && !process.env.SIMBOX_DEVICE_REGISTRATION_DIR && ![".s5code", ".t3"].some((home) => existsSync(join3(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 });
+    const directory = process.env.SIMBOX_DEVICE_REGISTRATION_DIR ?? join3(configDir(), "device-registrations");
+    mkdirSync3(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);
+      const path = join3(directory, file);
       if (Date.now() - statSync(path).mtimeMs > MAX_AGE_MS)
         unlinkSync(path);
     }
@@ -467,7 +502,7 @@ function registerDevice(info, options = {}) {
       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({
+    writeFileSync3(join3(directory, `${id}.json`), JSON.stringify({
       version: 1,
       createdAt: Date.now(),
       ...info,
@@ -582,13 +617,21 @@ async function cmdExec(args) {
   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`.");
-  if (args.some((arg, i) => arg === "--platform=android" || arg === "--platform" && args[i + 1] === "android")) {
-    await waitForAndroid(initial.runId);
+  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))
+    info = null;
+  if (!info) {
+    const initial = await refreshRemote();
+    if (!initial) {
+      clearCachedRun();
+      throw new CliError("No live run. Start one with `simbox sim`.");
+    }
+    if (android)
+      await waitForAndroid(initial.runId);
+    info = await waitForRemote(initial);
   }
-  const info = await waitForRemote(initial);
+  writeCachedRun(info);
   const env = {
     ...process.env,
     AGENT_DEVICE_DAEMON_AUTH_TOKEN: info.daemonToken
@@ -596,7 +639,7 @@ 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, join3(configDir(), "agent-device")), {
+    const child = spawn(bin, remoteArgs(args, info, join4(configDir(), "agent-device")), {
       stdio: "inherit",
       env
     });
@@ -751,6 +794,7 @@ async function cmdSim(opts) {
   info = await waitForRemote(info);
   if (opts.platform === "android")
     await waitForAndroid(info.runId);
+  writeCachedRun(info);
   registerDevice(info, { platform: opts.platform });
   if (json) {
     const payload = {
@@ -793,6 +837,7 @@ async function cmdStop() {
     return;
   }
   await stopRun(run.id);
+  clearCachedRun();
   if (run.tunnelUrl && run.daemonToken)
     registerDevice({
       runId: run.id,
@@ -814,7 +859,7 @@ async function cmdRepair() {
 }
 async function cmdLogout() {
   try {
-    rmSync(authPath());
+    rmSync2(authPath());
     console.log(`${pc3.green("✔")} Logged out.`);
   } catch {
     console.log("Already logged out.");

package/package.json

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