cdp-tunnel 2.2.2 → 2.3.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...');
 
     // 点击扩展图标时打开配置页面
@@ -204,6 +210,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/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() {

package/extension-new/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "CDP Bridge",
-  "version": "2.2.2",
+  "version": "2.3.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.3.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) {