Reuse local Studio expose sessions

Author: DjDeveloperr

scripts/studio-provider-bridge.mjs

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 
+import crypto from "node:crypto";
+import os from "node:os";
+
 const cloudUrl = (
   process.env.SIMDECK_CLOUD_URL || "https://simdeck.djdev.me"
 ).replace(/\/$/, "");
@@ -13,52 +16,64 @@ let localToken = process.env.SIMDECK_LOCAL_TOKEN || providerToken;
 const registerIntervalMs = Number(
   process.env.SIMDECK_PROVIDER_REGISTER_INTERVAL_MS || 15000,
 );
+const providerId =
+  process.env.SIMDECK_STUDIO_PROVIDER_ID || stableLocalProviderId();
 
 let stopped = false;
 let lastRegisterAt = 0;
+let registered = false;
 for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) {
   process.once(signal, () => {
     stopped = true;
   });
 }
 
-if (!previewId || !providerToken) {
-  const session = await createLocalProviderSession();
-  previewId = session.sessionId;
-  providerToken = session.providerToken;
-  publicUrl = session.url;
-}
+try {
+  if (!previewId || !providerToken) {
+    const session = await createLocalProviderSession();
+    previewId = session.sessionId;
+    providerToken = session.providerToken;
+    publicUrl = session.url;
+  }
 
-if (!publicUrl) {
-  publicUrl = `${cloudUrl}/simulator/${encodeURIComponent(previewId)}`;
-}
-if (!localToken) {
-  localToken = providerToken;
-}
+  if (!publicUrl) {
+    publicUrl = `${cloudUrl}/simulator/${encodeURIComponent(previewId)}`;
+  }
+  if (!localToken) {
+    localToken = providerToken;
+  }
 
-console.log(`[simdeck-provider-bridge] ${publicUrl}`);
+  console.log(`[simdeck-provider-bridge] ${publicUrl}`);
 
-await registerProvider();
+  await registerProvider();
 
-while (!stopped) {
-  try {
-    if (Date.now() - lastRegisterAt > registerIntervalMs) {
-      await registerProvider();
-    }
-    const next = await fetchJson(`${cloudUrl}/api/actions/providers/rpc/next`, {
-      previewId,
-      providerToken,
-    });
-    if (!next || !next.request) {
-      await sleep(250);
-      continue;
+  while (!stopped) {
+    try {
+      if (Date.now() - lastRegisterAt > registerIntervalMs) {
+        await registerProvider();
+      }
+      const next = await fetchJson(
+        `${cloudUrl}/api/actions/providers/rpc/next`,
+        {
+          previewId,
+          providerToken,
+        },
+      );
+      if (!next || !next.request) {
+        await sleep(250);
+        continue;
+      }
+      await handleRequest(next.request);
+    } catch (error) {
+      console.error(
+        `[simdeck-provider-bridge] ${error instanceof Error ? error.message : String(error)}`,
+      );
+      await sleep(1000);
     }
-    await handleRequest(next.request);
-  } catch (error) {
-    console.error(
-      `[simdeck-provider-bridge] ${error instanceof Error ? error.message : String(error)}`,
-    );
-    await sleep(1000);
+  }
+} finally {
+  if (registered) {
+    await markProviderExpired();
   }
 }
 
@@ -74,6 +89,7 @@ async function registerProvider() {
       simulatorName: metadata.simulator?.name,
       runtimeName: metadata.simulator?.runtimeName,
     });
+    registered = true;
     lastRegisterAt = Date.now();
   } catch (error) {
     console.error(
@@ -84,6 +100,7 @@ async function registerProvider() {
 
 async function createLocalProviderSession() {
   const response = await fetchJson(`${cloudUrl}/api/local-provider-sessions`, {
+    providerId,
     simulatorName: process.env.SIMDECK_STUDIO_SIMULATOR_NAME,
     runtimeName: process.env.SIMDECK_STUDIO_RUNTIME_NAME,
   });
@@ -93,6 +110,21 @@ async function createLocalProviderSession() {
   return response;
 }
 
+async function markProviderExpired() {
+  try {
+    await fetchJson(`${cloudUrl}/api/actions/providers/register`, {
+      previewId,
+      providerToken,
+      baseUrl: publicUrl,
+      status: "expired",
+    });
+  } catch (error) {
+    console.error(
+      `[simdeck-provider-bridge] provider expiration failed: ${error instanceof Error ? error.message : String(error)}`,
+    );
+  }
+}
+
 async function localProviderMetadata() {
   try {
     const simulators = await localJson("/api/simulators");
@@ -200,3 +232,12 @@ async function fetchJson(url, body) {
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+
+function stableLocalProviderId() {
+  const fingerprint = [
+    os.hostname(),
+    localUrl,
+    process.env.SIMDECK_STUDIO_SIMULATOR_UDID || "",
+  ].join("\n");
+  return `local-${crypto.createHash("sha256").update(fingerprint).digest("hex").slice(0, 24)}`;
+}

server/src/main.rs

@@ -1321,6 +1321,13 @@ fn expose_to_studio(options: StudioExposeOptions) -> anyhow::Result<()> {
                 .map(|simulator| simulator.name.as_str())
                 .unwrap_or("Local Mac simulator"),
         )
+        .env(
+            "SIMDECK_STUDIO_SIMULATOR_UDID",
+            selected
+                .as_ref()
+                .map(|simulator| simulator.udid.as_str())
+                .unwrap_or(""),
+        )
         .env(
             "SIMDECK_STUDIO_RUNTIME_NAME",
             selected