right mcp url

Rhys Sullivan committed 8 months ago

Commit e8395261 parent 0056db22 files · +37 −10Browse files

Unified · Split

2 files

 import { ToolsView } from "../../../components/tools/tools-view";
+const normalizeOriginCandidate = (value: string | undefined): string | null => {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return null;
+  }
+  const withProtocol =
+    trimmed.startsWith("http://") || trimmed.startsWith("https://")
+      ? trimmed
+      : `https://${trimmed}`;
+  try {
+    return new URL(withProtocol).origin;
+  } catch {
+    return null;
+  }
+};
 const resolveMcpBaseUrl = (): string | null => {
   const candidates = [
     process.env.CONTROL_PLANE_UPSTREAM_URL,
     process.env.CONTROL_PLANE_SERVER_BASE_URL,
     process.env.NEXT_PUBLIC_CONTROL_PLANE_BASE_URL,
+    process.env.EXECUTOR_PUBLIC_ORIGIN,
+    process.env.NEXT_PUBLIC_APP_ORIGIN,
+    process.env.VERCEL_PROJECT_PRODUCTION_URL,
+    process.env.VERCEL_URL,
   ];
   for (const candidate of candidates) {
-    const value = candidate?.trim();
+    const origin = normalizeOriginCandidate(candidate);
-    if (!value) {
+    if (origin) {
-      continue;
+      return origin;
-    }
-    try {
-      return new URL(value).origin;
-    } catch {
-      // ignore invalid URL and continue
     }
   }

 const configuredControlPlaneBaseUrl =
   process.env.NEXT_PUBLIC_CONTROL_PLANE_BASE_URL?.trim() ?? "";
+const isLocalHost = (hostname: string): boolean =>
+  hostname === "localhost"
+  || hostname === "127.0.0.1"
+  || hostname === "0.0.0.0"
+  || hostname === "::1"
+  || hostname === "[::1]";
 // ---------------------------------------------------------------------------
 // Search helpers (ported from old executor explorer-derived.ts)
 // ---------------------------------------------------------------------------
       return `http://127.0.0.1:8788/v1/mcp?workspaceId=${encodeURIComponent(workspaceId)}`;
     }
-    const url = new URL("/v1/mcp", "http://127.0.0.1:8788");
+    const baseOrigin = isLocalHost(window.location.hostname)
+      ? "http://127.0.0.1:8788"
+      : window.location.origin;
+    const url = new URL("/v1/mcp", baseOrigin);
     url.searchParams.set("workspaceId", workspaceId);
     return url.toString();
   }, [props.mcpBaseUrl, workspaceId]);