cdp-tunnel 2.5.15 → 2.5.17

package/extension-new/cdp/handler/local.js

@@ -1,10 +1,11 @@
 var LocalHandler = (function() {
   function browserGetVersion() {
     var userAgent = navigator.userAgent || '';
-    var chromeVersion = CDPUtils.getChromeVersion(userAgent);
+    var match = userAgent.match(/Chrome\/([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/);
+    var product = match ? 'Chrome/' + match[1] : 'Chrome';
     return {
       protocolVersion: '1.3',
-      product: chromeVersion ? 'Chrome/' + chromeVersion : 'Chrome',
+      product: product,
       revision: '',
       userAgent: userAgent,
       jsVersion: ''

package/extension-new/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "CDP Bridge",
-  "version": "2.5.15",
+  "version": "2.5.17",
   "description": "Chrome DevTools Protocol Bridge for Playwright/Puppeteer automation",
   "permissions": [
     "debugger",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdp-tunnel",
-  "version": "2.5.15",
+  "version": "2.5.17",
   "description": "Bridge Chrome's debugger API to WebSocket — control your existing browser with Playwright/Puppeteer via CDP",
   "main": "server/proxy-server.js",
   "bin": "./cli/index.js",
@@ -53,7 +53,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "cdp-tunnel": "^2.5.14",
+    "cdp-tunnel": "^2.5.15",
     "commander": "^12.0.0",
     "ws": "^8.16.0"
   },

package/server/proxy-server.js

@@ -159,6 +159,7 @@ const { version: PKG_VERSION } = require('../package.json');
 
 let cachedTargets = [];
 let lastTargetsUpdate = 0;
+let cachedBrowserVersion = null;
 
 console.log('='.repeat(60));
 console.log(`  WebSocket CDP Proxy Server v${PKG_VERSION}`);
@@ -187,6 +188,41 @@ function buildTargetWebSocketUrl(req, targetId) {
     return `ws://${getHost(req)}/devtools/page/${targetId}`;
 }
 
+function invalidateTargetsCache() {
+    lastTargetsUpdate = 0;
+}
+
+async function requestVersionFromPlugin() {
+    if (cachedBrowserVersion) return cachedBrowserVersion;
+
+    const plugin = pluginConnections.values().next().value;
+    if (!plugin || plugin.readyState !== WebSocket.OPEN) {
+        return null;
+    }
+
+    return new Promise((resolve) => {
+        const requestId = `version_${Date.now()}`;
+        const timeout = setTimeout(() => resolve(null), 2000);
+
+        const handler = (data) => {
+            try {
+                const msg = JSON.parse(data.toString());
+                if (msg.id === requestId && msg.result) {
+                    clearTimeout(timeout);
+                    plugin.off('message', handler);
+                    if (msg.result.product || msg.result.userAgent) {
+                        cachedBrowserVersion = msg.result;
+                    }
+                    resolve(cachedBrowserVersion || msg.result);
+                }
+            } catch (e) {}
+        };
+
+        plugin.on('message', handler);
+        plugin.send(JSON.stringify({ id: requestId, method: 'Browser.getVersion' }));
+    });
+}
+
 async function requestTargetsFromPlugin() {
     const now = Date.now();
     if (now - lastTargetsUpdate < CONFIG.TARGETS_CACHE_TTL && cachedTargets.length > 0) {
@@ -229,11 +265,14 @@ async function handleHttpRequest(req, res) {
     const url = new URL(req.url, `http://localhost:${PORT}`);
     
     if (url.pathname === '/json/version' || url.pathname === '/json/version/') {
+        const ver = await requestVersionFromPlugin();
+        const userAgent = ver?.userAgent || 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.6778.86 Safari/537.36';
+        const product = ver?.product || 'Chrome/131.0.6778.86';
         const payload = {
-            Browser: `Chrome/131.0.6778.86`,
-            'Protocol-Version': '1.3',
-            'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.6778.86 Safari/537.36',
-            'V8-Version': '13.1.201.8',
+            Browser: product,
+            'Protocol-Version': ver?.protocolVersion || '1.3',
+            'User-Agent': userAgent,
+            'V8-Version': ver?.jsVersion || '',
             'WebKit-Version': '537.36',
             webSocketDebuggerUrl: buildWebSocketDebuggerUrl(req)
         };
@@ -587,6 +626,8 @@ function handlePluginConnection(ws, clientInfo) {
             if (!match) {
                 console.log(`  ↳ Run "cdp-tunnel update" or reload the extension to sync versions`);
             }
+            cachedBrowserVersion = null;
+            requestVersionFromPlugin();
             return;
         }
         
@@ -745,6 +786,16 @@ function handlePluginConnection(ws, clientInfo) {
                             clientWs.send(msgStr);
                             console.log(`[ATTACHED EVENT] Sent cached event to client: ${mapping.clientId}`);
                         }
+                        const newTargetInfo = cachedCreated?.parsed?.params?.targetInfo
+                            || cachedEvent?.parsed?.params?.targetInfo;
+                        if (newTargetInfo) {
+                            const exists = cachedTargets.some(t => t.targetId === targetId);
+                            if (!exists) {
+                                cachedTargets.push(newTargetInfo);
+                            }
+                        } else {
+                            invalidateTargetsCache();
+                        }
                     }
                     // 过滤 Target.getTargets 响应，只返回该客户端拥有的 target
                     if (mapping.isGetTargets && parsed.result && parsed.result.targetInfos) {
@@ -762,6 +813,7 @@ function handlePluginConnection(ws, clientInfo) {
                             targetIdToClientId.delete(mapping.closeTargetId);
                             console.log(`[CLOSE TARGET CLEANUP] removed targetId=${mapping.closeTargetId?.substring(0,8)} from mapping`);
                         }
+                        invalidateTargetsCache();
                     }
                     
                     // 然后发送响应给客户端