@playcademy/sandbox 0.6.1-beta.5 → 0.6.1-beta.6

package/dist/cli.js

@@ -1084,7 +1084,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@playcademy/sandbox",
-    version: "0.6.1-beta.5",
+    version: "0.6.1-beta.6",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -5689,6 +5689,14 @@ var init_schema = __esm(() => {
     platformServiceJwt: platformServiceJwtConfigSchema.optional(),
     uploadBucket: exports_external.string().optional(),
     queueIngressSecret: exports_external.string().optional()
+  }).superRefine((config2, ctx) => {
+    if (config2.isLocal && !config2.baseUrl) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        path: ["baseUrl"],
+        message: "baseUrl is required when isLocal is true"
+      });
+    }
   });
 });
 
@@ -27520,26 +27528,70 @@ var init_playcademy = __esm(() => {
 });
 
 // ../utils/src/tunnel.ts
-async function getTunnelUrl() {
-  let response;
+function servicePort(service) {
+  if (!service) {
+    return null;
+  }
   try {
-    response = await fetch(`${METRICS_BASE}/config`);
+    const url = new URL(service);
+    return url.port || (url.protocol === "https:" ? "443" : "80");
   } catch {
-    throw new Error("Local tunnel is not running. Start it with `bun dev` or `bun scripts/infra/tunnel.ts`.");
+    return null;
   }
-  if (!response.ok) {
-    throw new Error(`Tunnel metrics endpoint returned ${response.status}`);
+}
+async function readTunnelIngress(port) {
+  try {
+    const response = await fetch(`http://127.0.0.1:${port}/config`, {
+      signal: AbortSignal.timeout(1000)
+    });
+    if (!response.ok) {
+      return null;
+    }
+    const data = await response.json();
+    return data.config?.ingress ?? [];
+  } catch {
+    return null;
+  }
+}
+function matchingHostname(rules, expectedPort) {
+  for (const rule of rules ?? []) {
+    if (rule.hostname && servicePort(rule.service) === expectedPort) {
+      return rule.hostname;
+    }
+  }
+  return null;
+}
+async function getTunnelUrl(platformBaseUrl) {
+  const expectedPort = servicePort(platformBaseUrl);
+  if (!expectedPort) {
+    throw new Error(`Cannot resolve a tunnel for unparseable platform URL '${platformBaseUrl}'`);
+  }
+  const cachedPort = matchedPorts.get(expectedPort);
+  if (cachedPort !== undefined) {
+    const hostname = matchingHostname(await readTunnelIngress(cachedPort), expectedPort);
+    if (hostname) {
+      return `https://${hostname}`;
+    }
+    matchedPorts.delete(expectedPort);
   }
-  const data = await response.json();
-  const hostname = data.config.ingress.find((r) => r.hostname)?.hostname;
-  if (!hostname) {
-    throw new Error("Tunnel is running but no hostname found in ingress config");
+  const ports = Array.from({ length: TUNNEL_METRICS_PORT_RANGE }, (_, offset) => TUNNEL_METRICS_PORT + offset);
+  const results = await Promise.all(ports.map(async (port) => ({ port, rules: await readTunnelIngress(port) })));
+  for (const { port, rules } of results) {
+    const hostname = matchingHostname(rules, expectedPort);
+    if (hostname) {
+      matchedPorts.set(expectedPort, port);
+      return `https://${hostname}`;
+    }
   }
-  return `https://${hostname}`;
+  const foreign = results.flatMap(({ rules }) => (rules ?? []).filter((rule) => rule.hostname).map((rule) => `${rule.hostname} -> ${rule.service}`));
+  if (foreign.length > 0) {
+    throw new Error(`A local tunnel is running, but none route to the platform at ${platformBaseUrl} (found: ${foreign.join(", ")}). ${TUNNEL_START_HINT}`);
+  }
+  throw new Error(`Local tunnel is not running. ${TUNNEL_START_HINT}`);
 }
-var TUNNEL_METRICS_PORT = 20241, METRICS_BASE;
+var TUNNEL_METRICS_PORT = 20241, TUNNEL_METRICS_PORT_RANGE = 10, TUNNEL_START_HINT = "Start this platform's tunnel with `bun dev` or `bun run tunnel`.", matchedPorts;
 var init_tunnel = __esm(() => {
-  METRICS_BASE = `http://127.0.0.1:${TUNNEL_METRICS_PORT}`;
+  matchedPorts = new Map;
 });
 
 // ../utils/src/stages.ts
@@ -28183,13 +28235,13 @@ class DeployService {
       return this.deps.config.baseUrl;
     }
     try {
-      return await getTunnelUrl();
-    } catch {
+      return await getTunnelUrl(this.deps.config.baseUrl);
+    } catch (error) {
       setAttributes({
         "app.deploy.tunnel_available": false,
         "app.deploy.failure_kind": "local_tunnel_unavailable"
       });
-      throw new ValidationError("Local tunnel is not running. Ensure cloudflared is installed (`brew install cloudflared`) and the tunnel DevCommand started successfully.");
+      throw new ValidationError(errorMessage(error));
     }
   }
   async deployToCloudflare(args2) {
@@ -140714,7 +140766,7 @@ var init_session_controller = __esm(() => {
     let baseUrl;
     if (ctx.config.isLocal) {
       try {
-        baseUrl = await getTunnelUrl();
+        baseUrl = await getTunnelUrl(ctx.config.baseUrl);
       } catch {}
     }
     return { token, exp, baseUrl };

package/dist/server.js

@@ -1083,7 +1083,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@playcademy/sandbox",
-    version: "0.6.1-beta.5",
+    version: "0.6.1-beta.6",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -5688,6 +5688,14 @@ var init_schema = __esm(() => {
     platformServiceJwt: platformServiceJwtConfigSchema.optional(),
     uploadBucket: exports_external.string().optional(),
     queueIngressSecret: exports_external.string().optional()
+  }).superRefine((config2, ctx) => {
+    if (config2.isLocal && !config2.baseUrl) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        path: ["baseUrl"],
+        message: "baseUrl is required when isLocal is true"
+      });
+    }
   });
 });
 
@@ -27519,26 +27527,70 @@ var init_playcademy = __esm(() => {
 });
 
 // ../utils/src/tunnel.ts
-async function getTunnelUrl() {
-  let response;
+function servicePort(service) {
+  if (!service) {
+    return null;
+  }
   try {
-    response = await fetch(`${METRICS_BASE}/config`);
+    const url = new URL(service);
+    return url.port || (url.protocol === "https:" ? "443" : "80");
   } catch {
-    throw new Error("Local tunnel is not running. Start it with `bun dev` or `bun scripts/infra/tunnel.ts`.");
+    return null;
   }
-  if (!response.ok) {
-    throw new Error(`Tunnel metrics endpoint returned ${response.status}`);
+}
+async function readTunnelIngress(port) {
+  try {
+    const response = await fetch(`http://127.0.0.1:${port}/config`, {
+      signal: AbortSignal.timeout(1000)
+    });
+    if (!response.ok) {
+      return null;
+    }
+    const data = await response.json();
+    return data.config?.ingress ?? [];
+  } catch {
+    return null;
+  }
+}
+function matchingHostname(rules, expectedPort) {
+  for (const rule of rules ?? []) {
+    if (rule.hostname && servicePort(rule.service) === expectedPort) {
+      return rule.hostname;
+    }
+  }
+  return null;
+}
+async function getTunnelUrl(platformBaseUrl) {
+  const expectedPort = servicePort(platformBaseUrl);
+  if (!expectedPort) {
+    throw new Error(`Cannot resolve a tunnel for unparseable platform URL '${platformBaseUrl}'`);
+  }
+  const cachedPort = matchedPorts.get(expectedPort);
+  if (cachedPort !== undefined) {
+    const hostname = matchingHostname(await readTunnelIngress(cachedPort), expectedPort);
+    if (hostname) {
+      return `https://${hostname}`;
+    }
+    matchedPorts.delete(expectedPort);
   }
-  const data = await response.json();
-  const hostname = data.config.ingress.find((r) => r.hostname)?.hostname;
-  if (!hostname) {
-    throw new Error("Tunnel is running but no hostname found in ingress config");
+  const ports = Array.from({ length: TUNNEL_METRICS_PORT_RANGE }, (_, offset) => TUNNEL_METRICS_PORT + offset);
+  const results = await Promise.all(ports.map(async (port) => ({ port, rules: await readTunnelIngress(port) })));
+  for (const { port, rules } of results) {
+    const hostname = matchingHostname(rules, expectedPort);
+    if (hostname) {
+      matchedPorts.set(expectedPort, port);
+      return `https://${hostname}`;
+    }
   }
-  return `https://${hostname}`;
+  const foreign = results.flatMap(({ rules }) => (rules ?? []).filter((rule) => rule.hostname).map((rule) => `${rule.hostname} -> ${rule.service}`));
+  if (foreign.length > 0) {
+    throw new Error(`A local tunnel is running, but none route to the platform at ${platformBaseUrl} (found: ${foreign.join(", ")}). ${TUNNEL_START_HINT}`);
+  }
+  throw new Error(`Local tunnel is not running. ${TUNNEL_START_HINT}`);
 }
-var TUNNEL_METRICS_PORT = 20241, METRICS_BASE;
+var TUNNEL_METRICS_PORT = 20241, TUNNEL_METRICS_PORT_RANGE = 10, TUNNEL_START_HINT = "Start this platform's tunnel with `bun dev` or `bun run tunnel`.", matchedPorts;
 var init_tunnel = __esm(() => {
-  METRICS_BASE = `http://127.0.0.1:${TUNNEL_METRICS_PORT}`;
+  matchedPorts = new Map;
 });
 
 // ../utils/src/stages.ts
@@ -28182,13 +28234,13 @@ class DeployService {
       return this.deps.config.baseUrl;
     }
     try {
-      return await getTunnelUrl();
-    } catch {
+      return await getTunnelUrl(this.deps.config.baseUrl);
+    } catch (error) {
       setAttributes({
         "app.deploy.tunnel_available": false,
         "app.deploy.failure_kind": "local_tunnel_unavailable"
       });
-      throw new ValidationError("Local tunnel is not running. Ensure cloudflared is installed (`brew install cloudflared`) and the tunnel DevCommand started successfully.");
+      throw new ValidationError(errorMessage(error));
     }
   }
   async deployToCloudflare(args2) {
@@ -140713,7 +140765,7 @@ var init_session_controller = __esm(() => {
     let baseUrl;
     if (ctx.config.isLocal) {
       try {
-        baseUrl = await getTunnelUrl();
+        baseUrl = await getTunnelUrl(ctx.config.baseUrl);
       } catch {}
     }
     return { token, exp, baseUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playcademy/sandbox",
-    "version": "0.6.1-beta.5",
+    "version": "0.6.1-beta.6",
     "description": "Local development server for Playcademy game development",
     "type": "module",
     "exports": {