cdp-tunnel 2.5.2 → 2.5.4

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

@@ -135,6 +135,19 @@ var LocalHandler = (function() {
     return {};
   }
 
+  function tabGetGroupInfo(context) {
+    var clientId = context.clientId;
+    var groupId = null;
+    var baseName = null;
+    try {
+      groupId = State.getGroupIdForClient(clientId);
+      baseName = CDPUtils.getGroupBaseName(clientId);
+    } catch (e) {
+      Logger.error('[TabGetGroupInfo] Error: ' + (e.message || e));
+    }
+    return Promise.resolve({ groupId: groupId, baseName: baseName, clientId: clientId });
+  }
+
   function tabGetMuteStatus(params) {
     var cdpOnly = params && params.cdpOnly;
     var attachedTabIds = State.getAttachedTabIds();
@@ -308,6 +321,7 @@ var LocalHandler = (function() {
     getTargetInfos: getTargetInfos,
     getTargetInfoById: getTargetInfoById,
     mapToTargetInfo: mapToTargetInfo,
-    tabGetMuteStatus: tabGetMuteStatus
+    tabGetMuteStatus: tabGetMuteStatus,
+    tabGetGroupInfo: tabGetGroupInfo
   };
 })();

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

@@ -142,47 +142,68 @@ var SpecialHandler = (function() {
       return;
     }
     var baseName = CDPUtils.getGroupBaseName(groupClientId);
-    
-    setTimeout(function() {
-      Logger.info('[TabGroup] Executing group operation for:', baseName);
-      
-      chrome.tabGroups.query({}, function(allGroups) {
-        var existing = CDPUtils.findGroupByName(allGroups, baseName);
-        if (existing) {
-          chrome.tabs.group({ tabIds: tabId, groupId: existing.id }, function(result) {
-            if (chrome.runtime.lastError) {
-              Logger.error('[TabGroup] Failed to add tab to group:', chrome.runtime.lastError.message);
-            } else {
-              State.setGroupIdForClient(groupClientId, existing.id);
-              updateTabGroupName(groupClientId);
-              Logger.info('[TabGroup] Tab', tabId, 'added to existing group:', existing.id);
-            }
-          });
+
+    var retries = 0;
+    var maxRetries = 20;
+    function tryGroup() {
+      chrome.tabs.get(tabId, function(tab) {
+        if (chrome.runtime.lastError || !tab) {
+          Logger.error('[TabGroup] Tab not found:', tabId, 'retries:', retries);
+          return;
+        }
+        if (tab.status === 'complete') {
+          Logger.info('[TabGroup] Tab ready, executing group operation for:', baseName);
+          doGroup(tabId, groupClientId, baseName);
+        } else if (retries < maxRetries) {
+          retries++;
+          Logger.info('[TabGroup] Tab not ready (', tab.status, '), retry', retries, '/', maxRetries);
+          setTimeout(tryGroup, 200);
         } else {
-          chrome.tabs.group({ tabIds: tabId }, function(groupId) {
-            if (chrome.runtime.lastError) {
-              Logger.error('[TabGroup] Failed to create group:', chrome.runtime.lastError.message);
-              return;
-            }
-            if (groupId) {
-              chrome.tabGroups.update(groupId, {
-                title: baseName,
-                color: CDPUtils.getGroupColorForClient(groupClientId),
-                collapsed: true
-              }, function() {
-                if (chrome.runtime.lastError) {
-                  Logger.error('[TabGroup] Failed to update group:', chrome.runtime.lastError.message);
-                } else {
-                  State.setGroupIdForClient(groupClientId, groupId);
-                  updateTabGroupName(groupClientId);
-                  Logger.info('[TabGroup] Created new group:', groupId, 'with tab:', tabId);
-                }
-              });
-            }
-          });
+          Logger.warn('[TabGroup] Tab never reached complete status, grouping anyway. tabId:', tabId);
+          doGroup(tabId, groupClientId, baseName);
         }
       });
-    }, 500);
+    }
+    tryGroup();
+  }
+
+  function doGroup(tabId, clientId, baseName) {
+    chrome.tabGroups.query({}, function(allGroups) {
+      var existing = CDPUtils.findGroupByName(allGroups, baseName);
+      if (existing) {
+        chrome.tabs.group({ tabIds: tabId, groupId: existing.id }, function(result) {
+          if (chrome.runtime.lastError) {
+            Logger.error('[TabGroup] Failed to add tab to group:', chrome.runtime.lastError.message);
+          } else {
+            State.setGroupIdForClient(clientId, existing.id);
+            updateTabGroupName(clientId);
+            Logger.info('[TabGroup] Tab', tabId, 'added to existing group:', existing.id);
+          }
+        });
+      } else {
+        chrome.tabs.group({ tabIds: tabId }, function(groupId) {
+          if (chrome.runtime.lastError) {
+            Logger.error('[TabGroup] Failed to create group:', chrome.runtime.lastError.message);
+            return;
+          }
+          if (groupId) {
+            chrome.tabGroups.update(groupId, {
+              title: baseName,
+              color: CDPUtils.getGroupColorForClient(clientId),
+              collapsed: true
+            }, function() {
+              if (chrome.runtime.lastError) {
+                Logger.error('[TabGroup] Failed to update group:', chrome.runtime.lastError.message);
+              } else {
+                State.setGroupIdForClient(clientId, groupId);
+                updateTabGroupName(clientId);
+                Logger.info('[TabGroup] Created new group:', groupId, 'with tab:', tabId);
+              }
+            });
+          }
+        });
+      }
+    });
   }
 
   function updateTabGroupName(clientId) {

package/extension-new/cdp/index.js

@@ -23,6 +23,7 @@ var CDP_HANDLERS = {
   'Target.attachToBrowserTarget': { type: 'LOCAL', handler: LocalHandler.targetAttachToBrowserTarget },
 
   'Tab.getMuteStatus': { type: 'LOCAL', handler: LocalHandler.tabGetMuteStatus },
+  'Tab.getGroupInfo': { type: 'LOCAL', handler: LocalHandler.tabGetGroupInfo },
 
   'SystemInfo.getInfo': { type: 'LOCAL', handler: LocalHandler.systemInfoGetInfo },
   'SystemInfo.getProcessInfo': { type: 'LOCAL', handler: LocalHandler.systemInfoGetProcessInfo },

package/extension-new/core/websocket.js

@@ -191,6 +191,7 @@ var WebSocketManager = (function() {
         Logger.info('[WS] Client connected, resuming event forwarding');
         State.setHasConnectedClient(true);
         State.addCDPClient(message.clientId, message.clientId);
+        startGroupMonitor();
         broadcastStateUpdate();
         break;
 
@@ -214,6 +215,7 @@ var WebSocketManager = (function() {
           State.removeCDPClient(discClientId);
           if (State.getCDPClients().length === 0) {
             State.setHasConnectedClient(false);
+            stopGroupMonitor();
           }
           broadcastStateUpdate();
         });
@@ -223,6 +225,11 @@ var WebSocketManager = (function() {
         Logger.info('[WS] Received client list:', message.clients);
         State.setCDPClients(message.clients || []);
         State.setHasConnectedClient((message.clients || []).length > 0);
+        if ((message.clients || []).length > 0) {
+          startGroupMonitor();
+        } else {
+          stopGroupMonitor();
+        }
         broadcastStateUpdate();
         break;
 
@@ -378,6 +385,49 @@ var WebSocketManager = (function() {
     });
   }
 
+  var _groupMonitorTimer = null;
+
+  function startGroupMonitor() {
+    Logger.info('[Monitor] Starting group monitor...');
+    if (_groupMonitorTimer) clearInterval(_groupMonitorTimer);
+    _groupMonitorTimer = setInterval(function() {
+      var attached = State.getAttachedTabIds();
+      attached.forEach(function(tabId) {
+        var clientId = State.getClientIdByTabId(tabId);
+        if (!clientId) return;
+        if (State.isPreExistingTab(tabId)) return;
+        chrome.tabs.get(tabId, function(tab) {
+          if (chrome.runtime.lastError || !tab) return;
+          if (tab.groupId) return;
+          Logger.info('[Monitor] Tab', tabId, 'has no group, regrouping for client:', clientId);
+          var baseName = CDPUtils.getGroupBaseName(clientId);
+          var groupId = State.getGroupIdForClient(clientId);
+          if (groupId) {
+            chrome.tabs.group({ tabIds: tabId, groupId: groupId }, function() {});
+          } else {
+            chrome.tabs.group({ tabIds: tabId }, function(newGroupId) {
+              if (chrome.runtime.lastError || !newGroupId) return;
+              chrome.tabGroups.update(newGroupId, {
+                title: baseName,
+                color: CDPUtils.getGroupColorForClient(clientId),
+                collapsed: true
+              }, function() {
+                State.setGroupIdForClient(clientId, newGroupId);
+              });
+            });
+          }
+        });
+      });
+    }, 10000);
+  }
+
+  function stopGroupMonitor() {
+    if (_groupMonitorTimer) {
+      clearInterval(_groupMonitorTimer);
+      _groupMonitorTimer = null;
+    }
+  }
+
   function handleServerRestart() {
     Logger.info('[WS] Server restarted, cleaning up all state...');
 

package/extension-new/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "CDP Bridge",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "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:43930/plugin',
+  WS_URL: 'ws://localhost:37171/plugin',
   RECONNECT_DELAY: 3000,
   DEBUGGER_VERSION: '1.3',
   HEARTBEAT_INTERVAL: 25000,

package/extension-new/utils/helpers.js

@@ -44,7 +44,8 @@ var CDPUtils = (function() {
 
   function buildGroupName(clientId) {
     if (!clientId) return 'CDP';
-    return 'CDP-' + clientId.substring(0, 8);
+    var suffix = clientId.length > 8 ? clientId.substring(clientId.length - 8) : clientId;
+    return 'CDP-' + suffix;
   }
 
   function getGroupBaseName(clientId) {

package/package.json

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

@@ -890,10 +890,12 @@ function handleClientConnection(ws, clientInfo, customClientId = null) {
 
         // 为每个请求分配全局唯一 ID，避免多客户端 ID 冲突
         let modifiedData = data;
+        let originalId = null;
+        let globalId = null;
         if (parsed && parsed.id !== undefined) {
-            const originalId = parsed.id;
+            originalId = parsed.id;
             globalRequestIdCounter++;
-            const globalId = globalRequestIdCounter;
+            globalId = globalRequestIdCounter;
             
             // 保存映射：全局ID -> {clientId, originalId, sessionId}
             // 如果请求有 sessionId，也保存它，用于响应路由
@@ -922,11 +924,36 @@ function handleClientConnection(ws, clientInfo, customClientId = null) {
             }
             console.log(`[PENDING CREATE TARGET] Request id=${parsed.id} from client=${id}`);
         }
-        if (parsed && parsed.method === 'Target.closeTarget' && parsed.id !== undefined) {
-            const currentMapping = globalRequestIdMap.get(parsed.id);
-            if (currentMapping) {
-                currentMapping.method = 'Target.closeTarget';
-                currentMapping.closeTargetId = parsed.params?.targetId;
+        if (parsed && parsed.id !== undefined) {
+            if (parsed.method === 'Target.closeTarget') {
+                const targetId = parsed.params?.targetId;
+                const ownerClient = targetId ? targetIdToClientId.get(targetId) : null;
+                if (ownerClient && ownerClient !== id) {
+                    console.log(`[BLOCKED] ${parsed.method} targetId=${targetId?.substring(0,8)} owner=${ownerClient?.substring(0,8)} requester=${id?.substring(0,8)} — not owner`);
+                    const errMsg = JSON.stringify({
+                        id: originalId,
+                        error: { code: -32000, message: 'Target is owned by another client' }
+                    });
+                    safeSend(ws, errMsg, 'client');
+                    return;
+                }
+                const currentMapping = globalRequestIdMap.get(parsed.id);
+                if (currentMapping) {
+                    currentMapping.method = 'Target.closeTarget';
+                    currentMapping.closeTargetId = targetId;
+                }
+            } else if (parsed.method === 'Target.attachToTarget') {
+                const targetId = parsed.params?.targetId;
+                const ownerClient = targetId ? targetIdToClientId.get(targetId) : null;
+                if (ownerClient && ownerClient !== id) {
+                    console.log(`[BLOCKED] ${parsed.method} targetId=${targetId?.substring(0,8)} owner=${ownerClient?.substring(0,8)} requester=${id?.substring(0,8)} — not owner`);
+                    const errMsg = JSON.stringify({
+                        id: originalId,
+                        error: { code: -32000, message: 'Target is owned by another client' }
+                    });
+                    safeSend(ws, errMsg, 'client');
+                    return;
+                }
             }
         }