cdp-tunnel 2.2.2 → 2.4.0

package/extension-new/background.js

@@ -17,6 +17,7 @@ importScripts('features/automation-badge.js');
   'use strict';
 
   var keepAliveInterval = null;
+  var _initialized = false;
 
   function startKeepAlive() {
     if (keepAliveInterval) {
@@ -43,6 +44,11 @@ importScripts('features/automation-badge.js');
   }
 
   function init() {
+    if (_initialized) {
+      Logger.info('[Init] Already initialized, skipping');
+      return;
+    }
+    _initialized = true;
     Logger.info('[Init] CDP Bridge starting...');
 
     // 点击扩展图标时打开配置页面
@@ -118,11 +124,11 @@ importScripts('features/automation-badge.js');
     var sessionId = State.findSessionByTabId(tabId);
     if (sessionId) {
       var targetId = State.getTargetIdBySession(sessionId);
-      EventBuilder.send('Target.targetDestroyed', { targetId: targetId });
       EventBuilder.send('Target.detachedFromTarget', {
         sessionId: sessionId,
         targetId: targetId
       });
+      EventBuilder.send('Target.targetDestroyed', { targetId: targetId });
       State.unmapSession(sessionId);
       if (removedClientId) {
         SpecialHandler.updateTabGroupName(removedClientId);
@@ -132,6 +138,7 @@ importScripts('features/automation-badge.js');
     if (State.getCurrentTabId() === tabId) {
       State.persist(null, false);
     }
+    State.removeTabIdToClientId(tabId);
   });
 
   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) {
@@ -204,6 +211,12 @@ importScripts('features/automation-badge.js');
         
         var sessionId = CDPUtils.generateSessionId();
         State.mapSession(sessionId, tabId, targetId);
+
+        var openerClientId = openerTabId ? State.getClientIdByTabId(openerTabId) : null;
+        if (openerClientId) {
+          State.setTabIdToClientId(tabId, openerClientId);
+          Logger.info('[Tabs] Mapped child tab', tabId, '-> clientId:', openerClientId);
+        }
         
         Config.getAutoMute(function(enabled) {
           if (enabled) {

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

@@ -9,12 +9,12 @@ var ForwardHandler = (function() {
 
     if (!tabId) {
       Logger.warn('[Forward] No tabId for command:', method);
-      return Promise.resolve({});
+      return Promise.reject({ code: -32000, message: 'No target found for command: ' + method });
     }
 
     if (!State.isTabAttached(tabId)) {
       Logger.warn('[Forward] Tab not attached, skipping command:', method, 'tabId:', tabId);
-      return Promise.resolve({});
+      return Promise.reject({ code: -32000, message: 'Target is not attached' });
     }
 
     Logger.debug('[Forward]', method, '-> tabId:', tabId);

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

@@ -228,16 +228,17 @@ var SpecialHandler = (function() {
     if (targetId) {
       var tabId = State.getTabIdByTargetId(targetId);
       if (tabId) {
-        State.removeAttachedTab(tabId);
         var closeClientId = State.getClientIdByTabId(tabId);
         return new Promise(function(resolve) {
           chrome.tabs.remove(tabId, function() {
+            State.removeAttachedTab(tabId);
             if (closeClientId) {
               updateTabGroupName(closeClientId);
             }
             resolve({ success: true });
           });
         }).catch(function() {
+          State.removeAttachedTab(tabId);
           return { success: true };
         });
       }

package/extension-new/cdp/index.js

@@ -82,8 +82,8 @@ function routeCDPCommand(message) {
           resolve({ result: result });
         })
         .catch(function(error) {
-          Logger.error('[CDP] ERROR id=' + id + ' method=' + method + ' msg=' + error.message);
-          resolve({ error: { message: error.message } });
+          Logger.error('[CDP] ERROR id=' + id + ' method=' + method + ' msg=' + (error.message || error));
+          resolve({ error: { code: error.code || -32000, message: error.message || String(error) } });
         });
     } else {
       ForwardHandler.execute({ id: id, method: method, params: params, sessionId: sessionId, clientId: clientId })
@@ -92,8 +92,8 @@ function routeCDPCommand(message) {
           resolve({ result: result });
         })
         .catch(function(error) {
-          Logger.error('[CDP] ERROR id=' + id + ' method=' + method + ' msg=' + error.message + ' (forwarded)');
-          resolve({ error: { message: error.message } });
+          Logger.error('[CDP] ERROR id=' + id + ' method=' + method + ' msg=' + (error.message || error) + ' (forwarded)');
+          resolve({ error: { code: error.code || -32000, message: error.message || String(error) } });
         });
     }
   }).then(function(response) {

package/extension-new/core/debugger.js

@@ -169,6 +169,7 @@ var DebuggerManager = (function() {
         Logger.error('[Debugger] Failed to detach from tab', tabId, ':', error.message);
         State.removeAttachedTab(tabId);
         AutomationBadge.remove(tabId);
+        Screencast.stopPolling(tabId);
       });
   }
 

package/extension-new/core/state.js

@@ -38,6 +38,9 @@ var State = (function() {
     var tabId = _state.sessionIdToTabId.get(sessionId);
     _state.sessionIdToTabId.delete(sessionId);
     _state.sessionIdToTargetId.delete(sessionId);
+    if (tabId && !hasOtherSessionForTab(tabId)) {
+      _state.attachedTabIds.delete(tabId);
+    }
     return tabId;
   }
 
@@ -254,6 +257,7 @@ var State = (function() {
   function clearAllState() {
     clearSessionState();
     _state.attachedTabIds.clear();
+    _state.emittedTargets.clear();
     _state.screencastPollingSessions.clear();
     _state.browserContextIds = new Set(['default']);
     _state.autoAttachConfig = { 
@@ -265,7 +269,13 @@ var State = (function() {
     _state.hasConnectedClient = false;
     _state.tabIdToClientId.clear();
     _state.clientIdToGroupId.clear();
+    _state.clientIdToTabId.clear();
+    _state.clientIdToSessionId.clear();
     _state.preExistingTabIds.clear();
+    _state.pendingDebuggerTabs.clear();
+    _state.automatedTabs.clear();
+    _state.pendingCreatedTabUrls.clear();
+    _state.cdpClients = [];
   }
 
   function cleanupAllTabs() {
@@ -332,6 +342,10 @@ var State = (function() {
     _state.tabIdToClientId.set(tabId, clientId);
   }
 
+  function removeTabIdToClientId(tabId) {
+    _state.tabIdToClientId.delete(tabId);
+  }
+
   function getClientIdByTabId(tabId) {
     return _state.tabIdToClientId.get(tabId);
   }
@@ -471,6 +485,7 @@ var State = (function() {
     clearAllState: clearAllState,
     cleanupAllTabs: cleanupAllTabs,
     setTabIdToClientId: setTabIdToClientId,
+    removeTabIdToClientId: removeTabIdToClientId,
     getClientIdByTabId: getClientIdByTabId,
     setGroupIdForClient: setGroupIdForClient,
     getGroupIdForClient: getGroupIdForClient,

package/extension-new/core/websocket.js

@@ -339,16 +339,20 @@ var WebSocketManager = (function() {
       return;
     }
     Logger.info('[WS] Closing ' + tabIds.length + ' attached tabs for clientId:', clientId);
+    var pending = tabIds.length;
     tabIds.forEach(function(tabId) {
       chrome.tabs.remove(tabId, function() {
         if (chrome.runtime.lastError) {
           Logger.info('[WS] Tab already closed:', tabId);
         }
+        chrome.debugger.detach({ tabId: tabId }).catch(function() {});
+        State.removeAttachedTab(tabId);
+        pending--;
+        if (pending === 0) {
+          resolve();
+        }
       });
-      chrome.debugger.detach({ tabId: tabId }).catch(function() {});
-      State.removeAttachedTab(tabId);
     });
-    resolve();
   }
 
   function handleServerRestart() {
@@ -372,17 +376,27 @@ var WebSocketManager = (function() {
     Logger.info('[WS] Browser.close received, cleaning up... clientId:', clientId);
     
     closeTabGroupByClientId(clientId).then(function() {
-      var attachedTabIds = State.getAttachedTabIds();
-      var promises = attachedTabIds.map(function(tabId) {
-          return chrome.debugger.detach({ tabId: tabId }).catch(function(e) {
-            Logger.info('[WS] Detach failed for tab', tabId, ':', e.message);
-          });
+      return new Promise(function(resolve) {
+        closeTabsByClientId(clientId, resolve);
+      });
+    }).then(function() {
+      var preExistingTabs = State.getPreExistingTabs();
+      var clientPreExisting = preExistingTabs.filter(function(tabId) {
+        return State.getClientIdByTabId(tabId) === clientId;
       });
-      Promise.all(promises).then(function() {
+      clientPreExisting.forEach(function(tabId) {
+        chrome.debugger.detach({ tabId: tabId }).catch(function() {});
+        State.removeAttachedTab(tabId);
+      });
+      State.clearPreExistingTabsForClient(clientId);
+
+      State.removeCDPClient(clientId);
+      if (State.getCDPClients().length === 0) {
         State.clearAllState();
         State.persist(null, false);
-        Logger.info('[WS] Browser.close cleanup complete');
-      });
+      }
+      broadcastStateUpdate();
+      Logger.info('[WS] Browser.close cleanup complete for client:', clientId);
     });
   }
 
@@ -398,7 +412,18 @@ var WebSocketManager = (function() {
     var cdpClients = State.getCDPClients() || [];
     var attachedTabIds = State.getAttachedTabIds();
     
+    if (attachedTabIds.length === 0) {
+      chrome.runtime.sendMessage({
+        type: 'stateUpdate',
+        connected: isConnected,
+        cdpClients: cdpClients,
+        attachedPages: []
+      }).catch(function() {});
+      return;
+    }
+
     var attachedPages = [];
+    var pending = attachedTabIds.length;
     attachedTabIds.forEach(function(tabId) {
       chrome.tabs.get(tabId, function(tab) {
         if (tab && !chrome.runtime.lastError) {
@@ -408,15 +433,17 @@ var WebSocketManager = (function() {
             url: tab.url || ''
           });
         }
+        pending--;
+        if (pending === 0) {
+          chrome.runtime.sendMessage({
+            type: 'stateUpdate',
+            connected: isConnected,
+            cdpClients: cdpClients,
+            attachedPages: attachedPages
+          }).catch(function() {});
+        }
       });
     });
-    
-    chrome.runtime.sendMessage({
-      type: 'stateUpdate',
-      connected: isConnected,
-      cdpClients: cdpClients,
-      attachedPages: attachedPages
-    }).catch(function() {});
   }
 
   function getQueueStats() {

package/extension-new/manifest.json

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

package/package.json

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

@@ -506,8 +506,14 @@ function handlePluginConnection(ws, clientInfo) {
                 const sessionId = parsed.params?.sessionId;
                 
                 if (targetId && sessionId) {
-                    sessionToClientId.set(sessionId, targetId);
-                    console.log(`[SESSION MAPPED] sessionId=${sessionId?.substring(0,8) || 'none'} -> targetId=${targetId?.substring(0,8) || 'none'}`);
+                    const clientId = ws.pairedClientId;
+                    if (clientId) {
+                        sessionToClientId.set(sessionId, clientId);
+                        console.log(`[SESSION MAPPED] sessionId=${sessionId?.substring(0,8) || 'none'} -> clientId=${clientId?.substring(0,8) || 'none'}`);
+                    } else {
+                        sessionToClientId.set(sessionId, targetId);
+                        console.log(`[SESSION MAPPED] sessionId=${sessionId?.substring(0,8) || 'none'} -> targetId=${targetId?.substring(0,8) || 'none'} (no pairedClientId)`);
+                    }
                 }
             }
             
@@ -559,6 +565,12 @@ function handlePluginConnection(ws, clientInfo) {
                         console.log(`[BROWSER CONTEXT MAPPED] browserContextId=${browserContextId} -> clientId=${mapping.clientId}`);
                     }
                     
+                    // 如果是 Target.attachToTarget 响应，建立 sessionId -> clientId 映射
+                    if (parsed.result?.sessionId && mapping.method === 'Target.attachToTarget') {
+                        sessionToClientId.set(parsed.result.sessionId, mapping.clientId);
+                        console.log(`[SESSION MAPPED from attach response] sessionId=${parsed.result.sessionId?.substring(0,8)} -> clientId=${mapping.clientId?.substring(0,8)}`);
+                    }
+                    
                     // 如果是 Target.createTarget 响应，先发送缓存的 Target.attachedToTarget 事件
                     // 然后再发送响应
                     if (mapping.isCreateTarget && parsed.result?.targetId) {
@@ -867,7 +879,8 @@ function handleClientConnection(ws, clientInfo, customClientId = null) {
             globalRequestIdMap.set(globalId, { 
                 clientId: id, 
                 originalId: originalId,
-                sessionId: parsed.sessionId  // 保存请求的 sessionId
+                sessionId: parsed.sessionId,
+                method: parsed.method
             });
             
             // 修改请求ID为全局ID
@@ -877,12 +890,6 @@ function handleClientConnection(ws, clientInfo, customClientId = null) {
             console.log(`[REQUEST ID MAPPED] client=${id} original=${originalId} -> global=${globalId} sessionId=${parsed.sessionId?.substring(0,8) || 'none'}`);
         }
 
-        // 记录 Target.attachToTarget 请求，用于后续建立 session -> clientId 映射
-        if (parsed && parsed.method === 'Target.attachToTarget' && parsed.id !== undefined) {
-            pendingAttachRequests.set(parsed.id, id);
-            console.log(`[PENDING ATTACH] Request id=${parsed.id} from client=${id}, pending size=${pendingAttachRequests.size}`);
-        }
-
         // 记录 Target.createTarget 请求，用于后续建立 targetId -> clientId 映射
         // 注意：此时 parsed.id 已经是 globalId，originalId 已经保存在 mapping 中
         if (parsed && parsed.method === 'Target.createTarget' && parsed.id !== undefined) {
@@ -1010,6 +1017,20 @@ function handleClientConnection(ws, clientInfo, customClientId = null) {
         // 广播更新后的客户端列表
         broadcastClientList();
 
+        // 清理该 client 的所有映射
+        for (const [tId, cId] of targetIdToClientId.entries()) {
+            if (cId === id) targetIdToClientId.delete(tId);
+        }
+        for (const [bcId, cId] of browserContextToClientId.entries()) {
+            if (cId === id) browserContextToClientId.delete(bcId);
+        }
+        if (clientIdToBrowserContext.has(id)) {
+            clientIdToBrowserContext.delete(id);
+        }
+        for (const [gId, mapping] of globalRequestIdMap.entries()) {
+            if (mapping.clientId === id) globalRequestIdMap.delete(gId);
+        }
+
         // 清理配对关系
         if (ws.pairedPlugin) {
             ws.pairedPlugin.pairedClientId = null;