create-multicast 0.3.0 → 0.4.1

package/dist/cli.js

@@ -7,6 +7,8 @@ import { existsSync } from "node:fs";
 import { resolve, join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { homedir } from "node:os";
+import { createServer } from "node:http";
+import { randomBytes } from "node:crypto";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const TEMPLATES_DIR = resolve(__dirname, "..", "templates", "default");
@@ -70,6 +72,189 @@ async function processTemplates(targetDir, replacements) {
         await unlink(tmplPath);
     }
 }
+// ── OAuth Flow ───────────────────────────────────────────────
+// Discovers OAuth metadata, registers client, opens browser for auth,
+// receives callback with code, exchanges for tokens.
+async function discoverOAuthMetadata(serverUrl) {
+    const baseUrl = new URL(serverUrl);
+    const wellKnownPaths = [
+        `${baseUrl.origin}/.well-known/oauth-authorization-server`,
+        `${baseUrl.origin}/.well-known/openid-configuration`,
+    ];
+    for (const path of wellKnownPaths) {
+        try {
+            const res = await fetch(path, { signal: AbortSignal.timeout(5000) });
+            if (res.ok) {
+                const metadata = (await res.json());
+                if (metadata.authorization_endpoint && metadata.token_endpoint) {
+                    return metadata;
+                }
+            }
+        }
+        catch {
+            // Try next
+        }
+    }
+    return null;
+}
+async function registerOAuthClient(registrationEndpoint, redirectUri) {
+    try {
+        const res = await fetch(registrationEndpoint, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+                client_name: "Multicast MCP Gateway",
+                redirect_uris: [redirectUri],
+                grant_types: ["authorization_code", "refresh_token"],
+                response_types: ["code"],
+                token_endpoint_auth_method: "none",
+            }),
+            signal: AbortSignal.timeout(10000),
+        });
+        if (!res.ok)
+            return null;
+        return (await res.json());
+    }
+    catch {
+        return null;
+    }
+}
+function generateCodeVerifier() {
+    return randomBytes(32).toString("base64url");
+}
+async function generateCodeChallenge(verifier) {
+    const { createHash } = await import("node:crypto");
+    return createHash("sha256").update(verifier).digest("base64url");
+}
+function openBrowser(url) {
+    const cmd = process.platform === "darwin"
+        ? "open"
+        : process.platform === "win32"
+            ? "cmd"
+            : "xdg-open";
+    const args = process.platform === "win32" ? ["/c", "start", "", url] : [url];
+    try {
+        spawnSync(cmd, args, { stdio: "ignore" });
+    }
+    catch {
+        // Browser open failed silently — URL is shown in terminal
+    }
+}
+async function runOAuthFlow(serverUrl, metadata) {
+    const port = 9876 + Math.floor(Math.random() * 100);
+    const redirectUri = `http://localhost:${port}/oauth/callback`;
+    // Dynamic Client Registration
+    let clientId = "multicast-mcp-gateway";
+    let clientSecret;
+    if (metadata.registration_endpoint) {
+        const reg = await registerOAuthClient(metadata.registration_endpoint, redirectUri);
+        if (reg) {
+            clientId = reg.client_id;
+            clientSecret = reg.client_secret;
+        }
+    }
+    // PKCE
+    const codeVerifier = generateCodeVerifier();
+    const codeChallenge = await generateCodeChallenge(codeVerifier);
+    const state = randomBytes(16).toString("hex");
+    // Build authorization URL
+    const authUrl = new URL(metadata.authorization_endpoint);
+    authUrl.searchParams.set("response_type", "code");
+    authUrl.searchParams.set("client_id", clientId);
+    authUrl.searchParams.set("redirect_uri", redirectUri);
+    authUrl.searchParams.set("code_challenge", codeChallenge);
+    authUrl.searchParams.set("code_challenge_method", "S256");
+    authUrl.searchParams.set("state", state);
+    authUrl.searchParams.set("scope", "mcp");
+    authUrl.searchParams.set("resource", serverUrl);
+    return new Promise((resolve) => {
+        let resolved = false;
+        const timer = setTimeout(() => {
+            if (!resolved) {
+                resolved = true;
+                httpServer.close();
+                resolve(null);
+            }
+        }, 120000);
+        const httpServer = createServer(async (req, res) => {
+            const url = new URL(req.url || "/", `http://localhost:${port}`);
+            if (url.pathname !== "/oauth/callback") {
+                res.writeHead(404);
+                res.end("Not found");
+                return;
+            }
+            const code = url.searchParams.get("code");
+            const returnedState = url.searchParams.get("state");
+            const error = url.searchParams.get("error");
+            if (error || !code || returnedState !== state) {
+                res.writeHead(400, { "Content-Type": "text/html" });
+                res.end("<html><body><h2>Authorization failed</h2><p>You can close this window.</p></body></html>");
+                if (!resolved) {
+                    resolved = true;
+                    clearTimeout(timer);
+                    httpServer.close();
+                    resolve(null);
+                }
+                return;
+            }
+            try {
+                const tokenParams = new URLSearchParams({
+                    grant_type: "authorization_code",
+                    code,
+                    redirect_uri: redirectUri,
+                    client_id: clientId,
+                    code_verifier: codeVerifier,
+                });
+                if (clientSecret)
+                    tokenParams.set("client_secret", clientSecret);
+                const tokenRes = await fetch(metadata.token_endpoint, {
+                    method: "POST",
+                    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+                    body: tokenParams.toString(),
+                });
+                if (!tokenRes.ok) {
+                    res.writeHead(500, { "Content-Type": "text/html" });
+                    res.end("<html><body><h2>Token exchange failed</h2><p>You can close this window.</p></body></html>");
+                    if (!resolved) {
+                        resolved = true;
+                        clearTimeout(timer);
+                        httpServer.close();
+                        resolve(null);
+                    }
+                    return;
+                }
+                const tokenData = (await tokenRes.json());
+                res.writeHead(200, { "Content-Type": "text/html" });
+                res.end("<html><body><h2>Authorized!</h2><p>You can close this window and return to the terminal.</p></body></html>");
+                if (!resolved) {
+                    resolved = true;
+                    clearTimeout(timer);
+                    httpServer.close();
+                    resolve({
+                        access_token: tokenData.access_token,
+                        refresh_token: tokenData.refresh_token,
+                        token_endpoint: metadata.token_endpoint,
+                        client_id: clientId,
+                        expires_at: Math.floor(Date.now() / 1000) + (tokenData.expires_in || 3600),
+                    });
+                }
+            }
+            catch {
+                res.writeHead(500, { "Content-Type": "text/html" });
+                res.end("<html><body><h2>Error</h2><p>You can close this window.</p></body></html>");
+                if (!resolved) {
+                    resolved = true;
+                    clearTimeout(timer);
+                    httpServer.close();
+                    resolve(null);
+                }
+            }
+        });
+        httpServer.listen(port, () => {
+            openBrowser(authUrl.toString());
+        });
+    });
+}
 // ── MCP Config Discovery ─────────────────────────────────────
 // Scans known locations for existing MCP server configurations.
 function getMcpConfigPaths() {
@@ -270,13 +455,17 @@ async function main() {
             if (auth) {
                 // Auth found in existing config — use it
                 authStatus = "credentials found in config";
+                selectedServers.push({ name, url: server.url, auth });
             }
             else {
                 // No auth in config — probe the server
                 try {
                     const probe = await fetch(server.url, {
                         method: "POST",
-                        headers: { "Content-Type": "application/json" },
+                        headers: {
+                            "Content-Type": "application/json",
+                            "Accept": "application/json, text/event-stream",
+                        },
                         body: JSON.stringify({
                             jsonrpc: "2.0",
                             method: "initialize",
@@ -290,43 +479,61 @@ async function main() {
                         signal: AbortSignal.timeout(5000),
                     });
                     if (probe.status === 401 || probe.status === 403) {
-                        // Server requires auth but we don't have it — need to ask
+                        // Server requires auth — check if it's OAuth
                         authStatus = "needs-auth";
                     }
                     else {
                         // Server responded without auth — no auth needed
                         authStatus = "no auth required";
+                        selectedServers.push({ name, url: server.url });
                     }
                 }
                 catch {
-                    // Can't reach server — assume no auth (will fail later with clear error)
                     authStatus = "unreachable (skipping auth)";
+                    selectedServers.push({ name, url: server.url });
                 }
             }
             if (authStatus === "needs-auth") {
-                // Only ask when we KNOW the server needs auth but we don't have it
-                authSpinner.stop(`${pc.yellow("!")} ${name} requires authentication.`);
-                const authResult = await p.text({
-                    message: `Enter auth header for ${pc.bold(name)}:`,
-                    placeholder: "Bearer your-token-here",
-                    validate: (v) => {
-                        if (!v.trim())
-                            return "Auth header is required — server returned 401";
-                        return undefined;
-                    },
-                });
-                if (p.isCancel(authResult)) {
-                    p.cancel("Setup cancelled.");
-                    process.exit(0);
+                // Check if server supports OAuth
+                authSpinner.stop(`${pc.yellow("!")} ${name} requires authentication. Checking for OAuth...`);
+                const oauthMetadata = await discoverOAuthMetadata(server.url);
+                if (oauthMetadata) {
+                    // OAuth server — run the authorization flow
+                    p.log.info(`${pc.bold(name)} uses OAuth. Opening browser for authorization...`);
+                    p.log.info(pc.dim(`Authorization URL: ${oauthMetadata.authorization_endpoint}`));
+                    const oauthResult = await runOAuthFlow(server.url, oauthMetadata);
+                    if (oauthResult) {
+                        p.log.success(`${name} authorized via OAuth.`);
+                        selectedServers.push({
+                            name,
+                            url: server.url,
+                            oauth: oauthResult,
+                        });
+                    }
+                    else {
+                        p.log.warn(`OAuth authorization failed for ${name}. Skipping.\n` +
+                            `  ${pc.dim("You can add it manually later or re-run the installer.")}`);
+                    }
+                }
+                else {
+                    // Not OAuth — ask for static auth header
+                    const authResult = await p.text({
+                        message: `Enter auth header for ${pc.bold(name)}:`,
+                        placeholder: "Bearer your-token-here",
+                        validate: (v) => {
+                            if (!v.trim())
+                                return "Auth header is required — server returned 401";
+                            return undefined;
+                        },
+                    });
+                    if (p.isCancel(authResult)) {
+                        p.cancel("Setup cancelled.");
+                        process.exit(0);
+                    }
+                    selectedServers.push({ name, url: server.url, auth: authResult });
                 }
-                auth = authResult;
                 authSpinner.start("Detecting authentication requirements...");
             }
-            selectedServers.push({
-                name,
-                url: server.url,
-                auth: auth || undefined,
-            });
         }
         authSpinner.stop("Authentication configured.");
         // Show auth summary
@@ -509,8 +716,35 @@ async function main() {
             else {
                 p.log.success(`${server.name} URL set.`);
             }
-            // Set auth if present
-            if (server.auth) {
+            // Set auth: static header OR OAuth tokens
+            if (server.oauth) {
+                // OAuth server — store tokens in D1 and set MCP_OAUTH_ flag
+                const oauthFlag = spawnSync("npx", ["wrangler", "secret", "put", `MCP_OAUTH_${envName}`], {
+                    cwd: targetDir,
+                    input: "true\n",
+                    stdio: ["pipe", "inherit", "inherit"],
+                    encoding: "utf-8",
+                });
+                if (oauthFlag.status !== 0) {
+                    p.log.warn(`Failed to set OAuth flag for ${server.name}.`);
+                }
+                // Insert tokens into D1
+                const sql = `INSERT OR REPLACE INTO oauth_tokens (server_name, access_token, refresh_token, token_endpoint, client_id, expires_at) VALUES ('${server.name}', '${server.oauth.access_token}', ${server.oauth.refresh_token ? `'${server.oauth.refresh_token}'` : "NULL"}, '${server.oauth.token_endpoint}', '${server.oauth.client_id}', ${server.oauth.expires_at})`;
+                const dbInsert = spawnSync("npx", ["wrangler", "d1", "execute", `${projectName}-db`, "--remote", `--command=${sql}`], {
+                    cwd: targetDir,
+                    stdio: ["inherit", "inherit", "inherit"],
+                    encoding: "utf-8",
+                });
+                if (dbInsert.status !== 0) {
+                    p.log.warn(`Failed to store OAuth tokens for ${server.name} in D1.\n` +
+                        `  ${pc.dim("You may need to re-run the installer to authorize again.")}`);
+                }
+                else {
+                    p.log.success(`${server.name} OAuth tokens stored.`);
+                }
+            }
+            else if (server.auth) {
+                // Static auth header
                 const authResult = spawnSync("npx", ["wrangler", "secret", "put", `MCP_AUTH_${envName}`], {
                     cwd: targetDir,
                     input: server.auth + "\n",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-multicast",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Create a Multicast MCP gateway — one command to scaffold, configure, and deploy your parallel MCP server.",
   "type": "module",
   "bin": "./dist/cli.js",

package/templates/default/migrations/0001_init.sql

@@ -39,6 +39,19 @@ CREATE TABLE IF NOT EXISTS result_cache (
     created_at TEXT DEFAULT (datetime('now'))
 );
 
+-- OAuth tokens: cached access/refresh tokens for OAuth-based MCP servers
+-- Installer stores initial tokens during setup. Worker refreshes automatically
+-- when access_token expires using the refresh_token + token_endpoint.
+CREATE TABLE IF NOT EXISTS oauth_tokens (
+    server_name TEXT PRIMARY KEY,
+    access_token TEXT NOT NULL,
+    refresh_token TEXT,
+    token_endpoint TEXT NOT NULL,
+    client_id TEXT NOT NULL,
+    expires_at INTEGER NOT NULL,         -- unix timestamp (seconds)
+    updated_at TEXT DEFAULT (datetime('now'))
+);
+
 -- Indexes for common queries
 CREATE INDEX IF NOT EXISTS idx_tools_server ON tools(server_name);
 CREATE INDEX IF NOT EXISTS idx_servers_status ON servers(status);

package/templates/default/src/index.ts

@@ -14,6 +14,16 @@ interface RegisteredServer {
   name: string;
   url: string;
   auth?: string;
+  isOAuth?: boolean; // true if server uses OAuth (tokens in D1)
+}
+
+interface OAuthTokenRow {
+  server_name: string;
+  access_token: string;
+  refresh_token: string | null;
+  token_endpoint: string;
+  client_id: string;
+  expires_at: number;
 }
 
 interface CallResult {
@@ -39,9 +49,10 @@ interface CachedTool {
 const INLINE_RESULT_MAX_CHARS = 5000;
 
 // ── Server Registry ──────────────────────────────────────────
-// Parses MCP_SERVER_* and MCP_AUTH_* env vars at request time.
+// Parses MCP_SERVER_*, MCP_AUTH_*, and MCP_OAUTH_* env vars at request time.
 // MCP_SERVER_CONTEXT_HUB=https://... → server name: "context-hub"
-// MCP_AUTH_CONTEXT_HUB=Bearer key... → auth header for "context-hub"
+// MCP_AUTH_CONTEXT_HUB=Bearer key... → static auth header
+// MCP_OAUTH_NEOSAPIEN=true → OAuth server (tokens managed in D1)
 
 function getRegisteredServers(env: Env): Map<string, RegisteredServer> {
   const servers = new Map<string, RegisteredServer>();
@@ -51,15 +62,118 @@ function getRegisteredServers(env: Env): Map<string, RegisteredServer> {
       const rawName = key.replace("MCP_SERVER_", "");
       const name = rawName.toLowerCase().replace(/_/g, "-");
       const authKey = `MCP_AUTH_${rawName}`;
+      const oauthKey = `MCP_OAUTH_${rawName}`;
       const auth = typeof env[authKey] === "string" ? (env[authKey] as string) : undefined;
+      const isOAuth = typeof env[oauthKey] === "string" && env[oauthKey] === "true";
 
-      servers.set(name, { name, url: value, auth });
+      servers.set(name, { name, url: value, auth, isOAuth });
     }
   }
 
   return servers;
 }
 
+// ── SSE Response Parser ──────────────────────────────────────
+// MCP Streamable HTTP servers may respond with either application/json
+// or text/event-stream. This helper parses both formats.
+
+async function parseJsonOrSse(response: Response): Promise<unknown> {
+  const contentType = response.headers.get("content-type") || "";
+
+  if (contentType.includes("text/event-stream")) {
+    // Parse SSE: extract the last JSON data line
+    const text = await response.text();
+    const lines = text.split("\n");
+    let lastData = "";
+    for (const line of lines) {
+      if (line.startsWith("data: ")) {
+        lastData = line.slice(6);
+      }
+    }
+    if (lastData) {
+      return JSON.parse(lastData);
+    }
+    throw new Error("No data in SSE response");
+  }
+
+  // Plain JSON
+  return response.json();
+}
+
+// ── OAuth Token Management ───────────────────────────────────
+// Resolves auth for OAuth servers: checks D1 for cached token,
+// refreshes if expired, returns a valid Bearer header.
+
+async function resolveOAuthToken(
+  serverName: string,
+  db: D1Database
+): Promise<{ auth: string; error?: undefined } | { auth?: undefined; error: string }> {
+  const row = await db
+    .prepare("SELECT * FROM oauth_tokens WHERE server_name = ?")
+    .bind(serverName)
+    .first<OAuthTokenRow>();
+
+  if (!row) {
+    return { error: `no OAuth tokens found for "${serverName}". Re-run npx create-multicast to authorize.` };
+  }
+
+  const nowSeconds = Math.floor(Date.now() / 1000);
+
+  // Token still valid (with 60s buffer)
+  if (row.expires_at > nowSeconds + 60) {
+    return { auth: `Bearer ${row.access_token}` };
+  }
+
+  // Token expired — try to refresh
+  if (!row.refresh_token) {
+    return { error: `OAuth token expired for "${serverName}" and no refresh token available. Re-run npx create-multicast to re-authorize.` };
+  }
+
+  try {
+    const refreshResponse = await fetch(row.token_endpoint, {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        grant_type: "refresh_token",
+        refresh_token: row.refresh_token,
+        client_id: row.client_id,
+      }).toString(),
+    });
+
+    if (!refreshResponse.ok) {
+      return { error: `OAuth token refresh failed for "${serverName}": HTTP ${refreshResponse.status}. Re-run npx create-multicast to re-authorize.` };
+    }
+
+    const tokenData = (await refreshResponse.json()) as {
+      access_token: string;
+      refresh_token?: string;
+      expires_in?: number;
+    };
+
+    const newExpiresAt = nowSeconds + (tokenData.expires_in || 3600);
+
+    // Update D1 with new tokens
+    await db
+      .prepare(
+        `UPDATE oauth_tokens
+         SET access_token = ?, refresh_token = ?, expires_at = ?, updated_at = datetime('now')
+         WHERE server_name = ?`
+      )
+      .bind(
+        tokenData.access_token,
+        tokenData.refresh_token || row.refresh_token,
+        newExpiresAt,
+        serverName
+      )
+      .run();
+
+    return { auth: `Bearer ${tokenData.access_token}` };
+  } catch (err: unknown) {
+    const message = err instanceof Error ? err.message : "unknown error";
+    return { error: `OAuth token refresh failed for "${serverName}": ${message}` };
+  }
+}
+
 // ── Downstream MCP Client ────────────────────────────────────
 // Calls a downstream MCP server via JSON-RPC over HTTP.
 // Supports optional "setup" steps that run sequentially on the same
@@ -75,7 +189,8 @@ async function callMcpServer(
   tool: string,
   args: Record<string, unknown>,
   timeoutMs: number,
-  setup?: ToolStep[]
+  setup?: ToolStep[],
+  db?: D1Database
 ): Promise<CallResult> {
   const start = Date.now();
   const controller = new AbortController();
@@ -86,7 +201,21 @@ async function callMcpServer(
       "Content-Type": "application/json",
       "Accept": "application/json, text/event-stream",
     };
-    if (server.auth) {
+
+    // Resolve auth: static header OR OAuth token from D1
+    if (server.isOAuth && db) {
+      const oauthResult = await resolveOAuthToken(server.name, db);
+      if (oauthResult.error) {
+        return {
+          server: server.name,
+          tool,
+          success: false,
+          error: oauthResult.error,
+          duration_ms: Date.now() - start,
+        };
+      }
+      baseHeaders["Authorization"] = oauthResult.auth!;
+    } else if (server.auth) {
       baseHeaders["Authorization"] = server.auth;
     }
 
@@ -151,7 +280,7 @@ async function callMcpServer(
           };
         }
 
-        const setupData = (await setupResponse.json()) as {
+        const setupData = (await parseJsonOrSse(setupResponse)) as {
           result?: { content?: Array<{ text?: string }>; isError?: boolean };
           error?: { message?: string };
         };
@@ -195,7 +324,7 @@ async function callMcpServer(
       };
     }
 
-    const data = (await response.json()) as {
+    const data = (await parseJsonOrSse(response)) as {
       result?: unknown;
       error?: { message?: string; code?: number };
     };
@@ -289,7 +418,15 @@ async function discoverServerTools(
       "Content-Type": "application/json",
       "Accept": "application/json, text/event-stream",
     };
-    if (server.auth) {
+
+    // Resolve auth: static header OR OAuth token from D1
+    if (server.isOAuth) {
+      const oauthResult = await resolveOAuthToken(server.name, db);
+      if (oauthResult.error) {
+        return { tool_count: 0, error: oauthResult.error };
+      }
+      headers["Authorization"] = oauthResult.auth!;
+    } else if (server.auth) {
       headers["Authorization"] = server.auth;
     }
 
@@ -343,7 +480,7 @@ async function discoverServerTools(
       return { tool_count: 0, error: errText };
     }
 
-    const data = (await response.json()) as {
+    const data = (await parseJsonOrSse(response)) as {
       result?: { tools?: Array<{ name: string; description?: string; inputSchema?: unknown }> };
       error?: { message?: string };
     };
@@ -640,14 +777,14 @@ Different servers still run in parallel with each other.`,
 
         // Execute all valid calls in parallel
         // Each call gets its own session; setup steps run sequentially within that session
+        // Pass db for OAuth token resolution
+        const db = this.env.DB;
         const promises = validCalls.map((call) =>
-          callMcpServer(call.server, call.tool, call.args, timeout, call.setup)
+          callMcpServer(call.server, call.tool, call.args, timeout, call.setup, db)
         );
 
         const settled = await Promise.allSettled(promises);
 
-        const db = this.env.DB;
-
         // Clean expired cache entries (older than 1 hour)
         await db
           .prepare(