@ejazullah/browser-mcp 0.0.59 → 0.0.60

package/lib/mcp/transport.js

@@ -128,7 +128,37 @@ async function handleSSE(serverBackendFactory, req, res, url, sessions) {
     res.statusCode = 405;
     res.end('Method not allowed');
 }
-async function handleStreamable(serverBackendFactory, req, res, sessions) {
+function cdpSessionKeyFromUrl(value) {
+    try {
+        const parsed = new URL(value);
+        const match = parsed.pathname.match(/\/devtools\/([^/]+)/i);
+        return match?.[1];
+    }
+    catch {
+        const match = value.match(/\/devtools\/([^/]+)/i);
+        return match?.[1];
+    }
+}
+function resolveClientCdpSessionKey(req) {
+    const explicitSessionId = req.headers['x-cdp-session-id'];
+    if (explicitSessionId)
+        return explicitSessionId;
+    const cdpUrl = req.headers['x-cdp-url']
+        ?? req.headers['x-cdp-endpoint']
+        ?? req.headers['x-browser-url'];
+    if (!cdpUrl)
+        return undefined;
+    return cdpSessionKeyFromUrl(cdpUrl);
+}
+function findSessionIdByCdpKey(sessionCdpKeys, sessions, cdpSessionKey) {
+    for (const [knownSessionId, knownCdpSessionKey] of sessionCdpKeys.entries()) {
+        if (knownCdpSessionKey === cdpSessionKey && sessions.has(knownSessionId))
+            return knownSessionId;
+    }
+    return undefined;
+}
+async function handleStreamable(serverBackendFactory, req, res, sessions, sessionCdpKeys) {
+    const cdpSessionKey = resolveClientCdpSessionKey(req);
     const sessionId = req.headers['mcp-session-id'];
     if (sessionId) {
         const transport = sessions.get(sessionId);
@@ -142,14 +172,43 @@ async function handleStreamable(serverBackendFactory, req, res, sessions) {
             testDebug(`stale http session id: ${sessionId}, creating a new session`);
         }
         else {
-            return await transport.handleRequest(req, res);
+            if (cdpSessionKey) {
+                const knownCdpSessionKey = sessionCdpKeys.get(sessionId);
+                if (knownCdpSessionKey && knownCdpSessionKey !== cdpSessionKey) {
+                    delete req.headers['mcp-session-id'];
+                    testDebug(`browser changed for mcp session ${sessionId} (${knownCdpSessionKey} -> ${cdpSessionKey}), creating a new session`);
+                }
+                else {
+                    if (!knownCdpSessionKey)
+                        sessionCdpKeys.set(sessionId, cdpSessionKey);
+                    return await transport.handleRequest(req, res);
+                }
+            }
+            else {
+                return await transport.handleRequest(req, res);
+            }
         }
     }
+    if (!sessionId && cdpSessionKey && req.method === 'POST') {
+        const matchedSessionId = findSessionIdByCdpKey(sessionCdpKeys, sessions, cdpSessionKey);
+        if (matchedSessionId) {
+            const matchedTransport = sessions.get(matchedSessionId);
+            testDebug(`missing mcp-session-id, reusing cdp-matched session: ${matchedSessionId} (${cdpSessionKey})`);
+            return await matchedTransport.handleRequest(req, res);
+        }
+    }
+    if (!sessionId && req.method === 'POST' && sessions.size === 1) {
+        const [singleSessionId, singleTransport] = sessions.entries().next().value;
+        testDebug(`missing mcp-session-id, reusing single active session: ${singleSessionId}`);
+        return await singleTransport.handleRequest(req, res);
+    }
     if (req.method === 'POST') {
         const transport = new StreamableHTTPServerTransport({
             sessionIdGenerator: () => crypto.randomUUID(),
             onsessioninitialized: async (sessionId) => {
                 testDebug(`create http session: ${transport.sessionId}`);
+                if (cdpSessionKey)
+                    sessionCdpKeys.set(sessionId, cdpSessionKey);
                 await mcpServer.connect(serverBackendFactory, transport, true);
                 sessions.set(sessionId, transport);
             }
@@ -158,6 +217,7 @@ async function handleStreamable(serverBackendFactory, req, res, sessions) {
             if (!transport.sessionId)
                 return;
             sessions.delete(transport.sessionId);
+            sessionCdpKeys.delete(transport.sessionId);
             testDebug(`delete http session: ${transport.sessionId}`);
         };
         await transport.handleRequest(req, res);
@@ -169,6 +229,7 @@ async function handleStreamable(serverBackendFactory, req, res, sessions) {
 function startHttpTransport(httpServer, serverBackendFactory, auth) {
     const sseSessions = new Map();
     const streamableSessions = new Map();
+    const streamableSessionCdpKeys = new Map();
     // Configure CORS with permissive settings for MCP tools
     const corsHandler = cors({
         origin: true, // Allow all origins
@@ -193,7 +254,7 @@ function startHttpTransport(httpServer, serverBackendFactory, auth) {
             if (url.pathname.startsWith('/sse'))
                 await handleSSE(serverBackendFactory, req, res, url, sseSessions);
             else
-                await handleStreamable(serverBackendFactory, req, res, streamableSessions);
+                await handleStreamable(serverBackendFactory, req, res, streamableSessions, streamableSessionCdpKeys);
         });
     });
     const url = httpAddressToString(httpServer.address());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ejazullah/browser-mcp",
-  "version": "0.0.59",
+  "version": "0.0.60",
   "description": "@ejazullah/browser-mcp - Enhanced Playwright Tools for MCP with CDP Support",
   "type": "module",
   "repository": {