Fix studio provider expose URL normalization

Author: DjDeveloperr

.github/workflows/ci.yml

@@ -69,6 +69,9 @@ jobs:
       - name: Check Prettier formatting
         run: npx prettier --check .
 
+      - name: Test studio provider bridge
+        run: npm run test:studio-provider
+
       - name: Typecheck client
         run: npm run --prefix client typecheck
 

package.json

@@ -65,6 +65,7 @@
     "test:integration:fixture": "node scripts/integration/prebuild-fixture.mjs",
     "test:integration:js-api": "node scripts/integration/js-api.mjs",
     "test:integration:js-api:verbose": "SIMDECK_INTEGRATION_SHOW_SIMULATOR=1 node scripts/integration/js-api.mjs",
+    "test:studio-provider": "node --test scripts/studio-provider-bridge.test.mjs",
     "test:stress": "node scripts/stress/simdeck.mjs",
     "ci": "npm run lint && npm run build:all && npm run test && npm run package:vscode-extension",
     "dev": "npm run build:cli && node scripts/dev.mjs",

scripts/studio-provider-bridge.mjs

@@ -2,6 +2,7 @@
 
 import crypto from "node:crypto";
 import os from "node:os";
+import { pathToFileURL } from "node:url";
 
 const cloudUrl = (
   process.env.SIMDECK_CLOUD_URL || "https://simdeck.djdev.me"
@@ -22,58 +23,62 @@ const providerId =
 let stopped = false;
 let lastRegisterAt = 0;
 let registered = false;
-for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) {
-  process.once(signal, () => {
-    stopped = true;
-  });
-}
 
-try {
-  if (!previewId || !providerToken) {
-    const session = await createLocalProviderSession();
-    previewId = session.sessionId;
-    providerToken = session.providerToken;
-    publicUrl = session.url;
+if (isMainModule()) {
+  for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) {
+    process.once(signal, () => {
+      stopped = true;
+    });
   }
 
-  if (!publicUrl) {
-    publicUrl = `${cloudUrl}/simulator/${encodeURIComponent(previewId)}`;
-  }
-  if (!localToken) {
-    localToken = providerToken;
-  }
+  try {
+    if (!previewId || !providerToken) {
+      const session = await createLocalProviderSession();
+      previewId = session.sessionId;
+      providerToken = session.providerToken;
+      publicUrl = session.url;
+    }
 
-  console.log(`[simdeck-provider-bridge] ${publicUrl}`);
+    if (!publicUrl) {
+      publicUrl = `${cloudUrl}/simulator/${encodeURIComponent(previewId)}`;
+    }
+    publicUrl = normalizeStudioPublicUrl(publicUrl);
+    if (!localToken) {
+      localToken = providerToken;
+    }
 
-  await registerProvider();
+    console.log(`[simdeck-provider-bridge] ${publicUrl}`);
 
-  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 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;
+        }
+        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();
+  } finally {
+    if (registered) {
+      await markProviderExpired();
+    }
   }
 }
 
@@ -233,6 +238,36 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+function normalizeStudioPublicUrl(value) {
+  return normalizeStudioPublicUrlWithCloud(value, cloudUrl);
+}
+
+export function normalizeStudioPublicUrlWithCloud(value, baseCloudUrl) {
+  const trimmed = String(value || "").trim();
+  if (!trimmed) {
+    return "";
+  }
+
+  const normalizedCloudUrl = baseCloudUrl.replace(/\/$/, "");
+  const cloudOrigin = new URL(normalizedCloudUrl).origin;
+  const collapsed = trimmed
+    .replace(repeatedPrefixPattern(normalizedCloudUrl), normalizedCloudUrl)
+    .replace(repeatedPrefixPattern(cloudOrigin), cloudOrigin);
+  return new URL(collapsed, `${normalizedCloudUrl}/`).toString();
+}
+
+function repeatedPrefixPattern(prefix) {
+  return new RegExp(`^(?:${escapeRegExp(prefix)}){2,}`);
+}
+
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+function isMainModule() {
+  return import.meta.url === pathToFileURL(process.argv[1] || "").href;
+}
+
 function stableLocalProviderId() {
   const fingerprint = [
     os.hostname(),

scripts/studio-provider-bridge.test.mjs

@@ -0,0 +1,43 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { normalizeStudioPublicUrlWithCloud } from "./studio-provider-bridge.mjs";
+
+const cloudUrl = "https://simdeck.djdev.me";
+
+test("normalizes relative studio expose paths against the cloud URL", () => {
+  assert.equal(
+    normalizeStudioPublicUrlWithCloud("/simulator/preview-123", cloudUrl),
+    "https://simdeck.djdev.me/simulator/preview-123",
+  );
+});
+
+test("collapses duplicated full cloud URL prefixes", () => {
+  assert.equal(
+    normalizeStudioPublicUrlWithCloud(
+      "https://simdeck.djdev.mehttps://simdeck.djdev.me/simulator/preview-123",
+      cloudUrl,
+    ),
+    "https://simdeck.djdev.me/simulator/preview-123",
+  );
+});
+
+test("collapses duplicated cloud origins when base URL has a path", () => {
+  assert.equal(
+    normalizeStudioPublicUrlWithCloud(
+      "https://simdeck.djdev.mehttps://simdeck.djdev.me/simulator/preview-123",
+      "https://simdeck.djdev.me/actions",
+    ),
+    "https://simdeck.djdev.me/simulator/preview-123",
+  );
+});
+
+test("preserves valid external tunnel URLs", () => {
+  assert.equal(
+    normalizeStudioPublicUrlWithCloud(
+      "https://preview.example.test/simulator/preview-123",
+      cloudUrl,
+    ),
+    "https://preview.example.test/simulator/preview-123",
+  );
+});