cdp-tunnel 3.5.0 → 3.6.1

package/extension-new/core/connection-state.js

@@ -1,14 +1,12 @@
 function ConnectionState(connectionId, mode) {
   this.connectionId = connectionId;
   this.mode = mode || 'create';
-  this.connectionTag = null;
   this.clientIdToTag = new Map();
   this.ws = null;
   this.reconnectTimer = null;
   this._hasConnectedClient = false;
   this.cdpClients = [];
   this.currentTabId = null;
-  this.isAttached = false;
 
   this.sessionIdToTabId = new Map();
   this.sessionIdToTargetId = new Map();
@@ -308,6 +306,15 @@ ConnectionState.prototype.getTagForClient = function(clientId) {
   return this.clientIdToTag.get(clientId) || null;
 };
 
+ConnectionState.prototype.setGroupNameForClient = function(clientId, groupName) {
+  if (!this.clientIdToGroupName) this.clientIdToGroupName = new Map();
+  if (clientId && groupName) this.clientIdToGroupName.set(clientId, groupName);
+};
+
+ConnectionState.prototype.getGroupNameForClient = function(clientId) {
+  return (this.clientIdToGroupName && this.clientIdToGroupName.get(clientId)) || null;
+};
+
 ConnectionState.prototype.addCDPClient = function(clientId, info) {
   var exists = false;
   for (var i = 0; i < this.cdpClients.length; i++) {
@@ -363,18 +370,7 @@ ConnectionState.prototype.clearAllState = function() {
 
 ConnectionState.prototype.persist = function(tabId, attached) {
   this.currentTabId = tabId;
-  this.isAttached = attached;
   return new Promise(function(resolve) {
     chrome.storage.local.set({ currentTabId: tabId, isAttached: attached }, resolve);
   }.bind(this));
 };
-
-ConnectionState.prototype.loadPersisted = function() {
-  return new Promise(function(resolve) {
-    chrome.storage.local.get(['currentTabId', 'isAttached'], function(result) {
-      this.currentTabId = result.currentTabId || null;
-      this.isAttached = result.isAttached || false;
-      resolve(result);
-    }.bind(this));
-  }.bind(this));
-};

package/extension-new/core/debugger.js

@@ -187,10 +187,6 @@ var DebuggerManager = (function() {
       });
   }
 
-  function isAttached(tabId) {
-    return getActualAttachState(tabId);
-  }
-
   function getActualAttachState(tabId) {
     return chrome.debugger.getTargets().then(function(targets) {
       var target = targets.find(function(t) {
@@ -364,7 +360,6 @@ var DebuggerManager = (function() {
   return {
     attach: attach,
     detach: detach,
-    isAttached: isAttached,
     getActualAttachState: getActualAttachState,
     handleDebuggerEvent: handleDebuggerEvent,
     handleDetach: handleDetach

package/extension-new/core/state.js

@@ -62,14 +62,6 @@ var State = (function() {
     });
   }
 
-  function persist(tabId, attached) {
-    _state.currentTabId = tabId;
-    _state.isAttached = attached;
-    return new Promise(function(resolve) {
-      chrome.storage.local.set({ currentTabId: tabId, isAttached: attached }, resolve);
-    });
-  }
-
   function isTabAttached(tabId) {
     var entry = ConnectionManager.getConnectionByTabId(tabId);
     return entry ? entry.state.isTabAttached(tabId) : false;

package/extension-new/core/websocket.js

@@ -244,7 +244,12 @@ var WebSocketConnection = (function() {
         if (message.__connectionTag) {
           self.state.setTagForClient(message.clientId, message.__connectionTag);
         }
-        self._createGroupForClient(message.clientId, message.__mode);
+        // 存 groupName，供 doGroup 等后续分组操作使用
+        if (message.__groupName) {
+          self.state.setGroupNameForClient(message.clientId, message.__groupName);
+        }
+        // __groupName 来自 API Key 名称，用作 Chrome 分组名（一眼看出是谁的浏览器）
+        self._createGroupForClient(message.clientId, message.__mode, message.__groupName);
         self._broadcastStateUpdate();
         break;
 
@@ -338,21 +343,6 @@ var WebSocketConnection = (function() {
         self._handleServerRestart();
         break;
 
-      case 'cdp':
-        if (method) {
-          routeCDPCommand({
-            id: id,
-            method: method,
-            params: params,
-            tabId: tabId,
-            sessionId: sessionId,
-            clientId: message.__clientId,
-            mode: message.__mode,
-            connectionId: self.connectionId
-          }, self.state, self);
-        }
-        break;
-
       default:
         if (method) {
           routeCDPCommand({
@@ -555,7 +545,7 @@ var WebSocketConnection = (function() {
     });
   };
 
-  WebSocketConnection.prototype._createGroupForClient = function(clientId, mode) {
+  WebSocketConnection.prototype._createGroupForClient = function(clientId, mode, groupName) {
     var self = this;
     if (!clientId || !chrome.tabGroups) return;
     if (mode === 'takeover') {
@@ -581,7 +571,7 @@ var WebSocketConnection = (function() {
     self.state.setGroupCreationPromise(clientId, readyPromise);
 
     var tag = (self.state.getTagForClient ? self.state.getTagForClient(clientId) : null) || (self.config ? self.config.tag : null);
-    var baseName = CDPUtils.getGroupBaseName(clientId, tag, mode);
+    var baseName = CDPUtils.getGroupBaseName(clientId, tag, mode, groupName);
     chrome.tabs.query({ currentWindow: true }, function(tabs) {
       if (!tabs || tabs.length === 0) {
         Logger.warn('[WS:' + self.connectionId + '] No tabs found for group creation');

package/extension-new/manifest.json

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

package/extension-new/utils/helpers.js

@@ -42,8 +42,14 @@ var CDPUtils = (function() {
     return 0;
   }
 
-  function buildGroupName(clientId, connectionTag, mode) {
+  function buildGroupName(clientId, connectionTag, mode, groupName) {
     if (!clientId) return 'CDP';
+    // 如果传了 groupName（来自 API Key 的名称），直接用它作为分组名
+    // Chrome 分组显示为 "CDP-张三的浏览器"，一眼看出是谁的浏览器
+    if (groupName) {
+      var prefixG = (mode === 'takeover') ? 'TAKE-' : 'CDP-';
+      return prefixG + groupName;
+    }
     var hash = 0;
     for (var i = 0; i < clientId.length; i++) {
       var chr = clientId.charCodeAt(i);
@@ -56,8 +62,8 @@ var CDPUtils = (function() {
     return prefix + tag + suffix;
   }
 
-  function getGroupBaseName(clientId, connectionTag, mode) {
-    return buildGroupName(clientId, connectionTag, mode);
+  function getGroupBaseName(clientId, connectionTag, mode, groupName) {
+    return buildGroupName(clientId, connectionTag, mode, groupName);
   }
 
   function findGroupByName(allGroups, baseName) {

package/package.json

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