cdp-tunnel 2.10.9 → 2.10.12

package/cli/index.js

@@ -12,6 +12,7 @@ const PID_FILE = path.join(CONFIG_DIR, 'server.pid');
 const LOG_FILE = path.join(CONFIG_DIR, 'server.log');
 const EXTENSION_STATE_FILE = path.join(CONFIG_DIR, 'extension-state.json');
 const MAX_LOG_SIZE = 10 * 1024 * 1024; // 10MB
+const INSTANCE_LIFETIME = 2 * 60 * 60 * 1000; // 2小时
 
 const INSTANCES_DIR = path.join(CONFIG_DIR, 'instances');
 
@@ -53,6 +54,26 @@ function syncExtensionVersion() {
 
 syncExtensionVersion();
 
+function cleanupStaleInstances() {
+  if (!fs.existsSync(INSTANCES_DIR)) return;
+  try {
+    const ports = fs.readdirSync(INSTANCES_DIR);
+    let cleaned = 0;
+    ports.forEach(port => {
+      const p = parseInt(port);
+      if (isNaN(p)) return;
+      if (!isServerRunning(p)) {
+        fs.rmSync(path.join(INSTANCES_DIR, port), { recursive: true, force: true });
+        cleaned++;
+      }
+    });
+    if (cleaned > 0) {
+      console.log('');
+      log('gray', `已清理 ${cleaned} 个已停止的实例`);
+    }
+  } catch {}
+}
+
 function log(color, ...args) {
   const colors = {
     green: '\x1b[32m',
@@ -571,6 +592,7 @@ program
   .description('查看服务器状态')
   .option('-p, --port <port>', '指定端口', parseInt)
   .action((options) => {
+    cleanupStaleInstances();
     console.log('');
     console.log('CDP Tunnel 状态');
     console.log('─'.repeat(30));

package/extension-new/background.js

@@ -220,10 +220,12 @@ importScripts('features/automation-badge.js');
                 SpecialHandler.addTabToAutomationGroup(tabId, clientId, null, ctx);
               }
             });
-          } else if (!groupPromise) {
-            Logger.info('[Tabs] Tab', tabId, 'left group, no cache and no pending creation — skipping (onRemoved handles re-group)');
-          } else {
+          } else if (groupPromise) {
             Logger.info('[Tabs] Tab', tabId, 'left group, group creation pending — skipping');
+          } else {
+            Logger.info('[Tabs] Tab', tabId, 'left group, no cached groupId — force re-group');
+            var ctx = { _state: state, _wsManager: wsManager, clientId: clientId, mode: state.mode };
+            SpecialHandler.addTabToAutomationGroup(tabId, clientId, null, ctx);
           }
         }
       }

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

@@ -501,7 +501,8 @@ var LocalHandler = (function() {
       targetId: target.id || String(target.tabId),
       type: target.type || 'page',
       title: target.title || '',
-      url: target.url || '',
+      // 原生 Chrome CDP 中 page 类型 target 的 url 一定存在（至少 "about:blank"）
+      url: target.url || 'about:blank',
       attached: !!target.attached,
       canAccessOpener: false,
       browserContextId: 'default'

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

@@ -416,11 +416,14 @@ var SpecialHandler = (function() {
       var baseName = CDPUtils.getGroupBaseName(clientId, connectionTag, mode);
       var newName = baseName + ' (' + tabs.length + ')';
 
+      if (chrome.runtime.lastError || tabs.length === 0) return;
       chrome.tabGroups.update(groupId, {
         title: newName
       }, function() {
         if (chrome.runtime.lastError) {
-          Logger.error('[TabGroup] Failed to update group name:', chrome.runtime.lastError.message);
+          if (!chrome.runtime.lastError.message.includes('No group with id')) {
+            Logger.error('[TabGroup] Failed to update group name:', chrome.runtime.lastError.message);
+          }
         } else {
           Logger.info('[TabGroup] Updated group name:', newName);
         }

package/extension-new/core/debugger.js

@@ -72,6 +72,10 @@ var DebuggerManager = (function() {
 })();
 `;
 
+  // 跟踪每个 tab 最后一次非 about:blank 的导航 url
+  // 用于过滤 attach 时 Chrome 重放的 about:blank frameNavigated 事件
+  var tabLastRealUrl = {};
+
   function attach(tabId, connState) {
     var state = connState || _getAnyStateForTab(tabId);
     if (tabId == null) {
@@ -289,6 +293,23 @@ var DebuggerManager = (function() {
       }
     }
 
+    // 过滤 attach 时 Chrome 重放的 about:blank frameNavigated 事件
+    // 原生 Chrome CDP 中，navigate 成功后不会回退到 about:blank
+    if (method === 'Page.frameNavigated' && params && params.frame) {
+      var navUrl = params.frame.url || '';
+      var tabIdKey = String(source.tabId);
+
+      if (navUrl && navUrl !== 'about:blank') {
+        // 记录真实导航 url
+        tabLastRealUrl[tabIdKey] = navUrl;
+      } else if (navUrl === 'about:blank' && tabLastRealUrl[tabIdKey]) {
+        // tab 已经导航到真实 url，但收到 about:blank 的 frameNavigated
+        // 这是 attach 时 Chrome 重放的旧事件，过滤掉
+        Logger.info('[Event] Filtering stale about:blank frameNavigated for tab', source.tabId, '(real url:', tabLastRealUrl[tabIdKey] + ')');
+        return;
+      }
+    }
+
     for (var i = 0; i < sessionIds.length; i++) {
       EventBuilder.send(method, params, sessionIds[i], wsManager);
     }
@@ -297,6 +318,8 @@ var DebuggerManager = (function() {
   function handleDetach(source, reason) {
     Logger.info('[Debugger] Detached from tab', source.tabId, ', reason:', reason);
 
+    delete tabLastRealUrl[String(source.tabId)];
+
     var entry = ConnectionManager.getConnectionByTabId(source.tabId);
     var state = entry ? entry.state : null;
     var wsManager = entry ? entry.wsManager : null;

package/extension-new/manifest.json

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

package/extension-new/utils/config.js

@@ -1,5 +1,5 @@
 var Config = {
-  WS_URL: 'ws://localhost:14026/plugin',
+  WS_URL: 'ws://localhost:19286/plugin',
   RECONNECT_DELAY: 3000,
   DEBUGGER_VERSION: '1.3',
   HEARTBEAT_INTERVAL: 25000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdp-tunnel",
-  "version": "2.10.9",
+  "version": "2.10.12",
   "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",

package/server/proxy-server.js

@@ -361,6 +361,9 @@ async function handleHttpRequest(req, res) {
     if (url.pathname === '/json' || url.pathname === '/json/' ||
         url.pathname === '/json/list' || url.pathname === '/json/list/' ||
         url.pathname.match(/^\/json\/list\/[^/]+$/)) {
+        // 注意：Playwright connectOverCDP 和 Puppeteer connect 都依赖 /json/list 发现 targets
+        // HTTP 端无 clientId 上下文，无法做归属过滤，但 attach 路径（handlePageConnection）有归属校验
+        // 所以即使列表可见，无归属 target 也无法被 attach（close 1008）
         const pluginWs = resolvePluginFromUrl(url);
         const targets = await requestTargetsFromPlugin(pluginWs);
         const browserId = pluginWs ? pluginWs.pluginId : BROWSER_ID;
@@ -444,7 +447,8 @@ wss.on('connection', (ws, req) => {
         handleClientConnection(ws, clientInfo, customClientId, targetPluginId, mode);
     } else if (path.startsWith('/devtools/page/')) {
         const targetId = path.replace('/devtools/page/', '');
-        handlePageConnection(ws, clientInfo, targetId);
+        const mode = req._takeoverMode ? 'takeover' : 'create';
+        handlePageConnection(ws, clientInfo, targetId, mode);
     } else {
         console.log(`[REJECTED] Unknown path: ${path} from ${clientInfo.ip}:${clientInfo.port}`);
         ws.close(1008, 'Invalid path. Use /plugin or /client');
@@ -1457,11 +1461,11 @@ function handleClientConnection(ws, clientInfo, customClientId = null, targetPlu
     });
 }
 
-function handlePageConnection(ws, clientInfo, targetId) {
+function handlePageConnection(ws, clientInfo, targetId, mode = 'create') {
     clientConnections.add(ws);
     const id = generateId('page');
     if (shouldLog('info')) {
-        console.log(`\n[PAGE CONNECTED] ID: ${id}, targetId: ${targetId}`);
+        console.log(`\n[PAGE CONNECTED] ID: ${id}, targetId: ${targetId}, mode: ${mode}`);
         console.log(`  - Remote: ${clientInfo.ip}:${clientInfo.port}`);
         console.log(`  - Total client connections: ${clientConnections.size}`);
     }
@@ -1470,17 +1474,31 @@ function handlePageConnection(ws, clientInfo, targetId) {
     ws.isAlive = true;
     ws.cdpTrace = [];
     ws.targetId = targetId;
+    ws.mode = mode;
     ws.lastActivityTime = Date.now();
     clientById.set(id, ws);
 
+    // 查找 target 归属的 plugin
     let plugin = null;
+    let ownerClientId = null;
     for (const p of pluginConnections) {
         const ns = getNamespace(p);
         if (ns.targetIdToClientId.has(targetId)) {
             plugin = p;
+            ownerClientId = ns.targetIdToClientId.get(targetId);
             break;
         }
     }
+
+    // create 模式：target 必须有明确的 clientId 归属，否则拒绝 attach（防止跨 client 越权）
+    if (mode !== 'takeover' && !ownerClientId) {
+        console.log(`[PAGE REJECTED] targetId=${targetId?.substring(0, 8)} has no owner in create mode — possible cross-client attach attempt from ${clientInfo.ip}`);
+        ws.close(1008, 'Target does not belong to any client');
+        clientConnections.delete(ws);
+        clientById.delete(id);
+        return;
+    }
+    // takeover 模式：允许无归属 target（操作的是用户自己的 tab）
     if (!plugin) {
         plugin = pluginConnections.values().next().value;
     }
@@ -1996,7 +2014,10 @@ server.on('error', (err) => {
 
 server.listen(PORT, '0.0.0.0');
 
-const takeoverServer = http.createServer((req, res) => handleHttpRequest(req, res));
+const takeoverServer = http.createServer((req, res) => {
+    req._takeoverMode = true;
+    handleHttpRequest(req, res);
+});
 takeoverServer.on('upgrade', (req, socket, head) => {
     req._takeoverMode = true;
     const url = new URL(req.url, `http://localhost:${TAKEOVER_PORT}`);