cdp-tunnel 1.0.7 → 1.0.9

package/extension-new/background.js

@@ -13,6 +13,17 @@ importScripts('cdp/index.js');
 importScripts('features/screencast.js');
 importScripts('features/automation-badge.js');
 
+// 为字符串添加hashCode方法（用于生成颜色索引）
+String.prototype.hashCode = function() {
+  var hash = 0;
+  for (var i = 0; i < this.length; i++) {
+    var char = this.charCodeAt(i);
+    hash = ((hash << 5) - hash) + char;
+    hash = hash & hash; // Convert to 32bit integer
+  }
+  return hash;
+};
+
 (function() {
   'use strict';
 
@@ -132,7 +143,7 @@ importScripts('features/automation-badge.js');
 
   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) {
     if (changeInfo.status === 'complete' && State.isTabAttached(tabId)) {
-      AutomationBadge.inject(tabId);
+      // 不再注入自动化标识，改为通过标签分组区分
     }
   });
 
@@ -196,7 +207,60 @@ importScripts('features/automation-badge.js');
         var sessionId = CDPUtils.generateSessionId();
         State.mapSession(sessionId, tabId, targetId);
         
-        AutomationBadge.inject(tabId);
+        // 将标签页添加到CDP组（添加延迟等待）
+        setTimeout(function() {
+          // 获取当前CDP客户端列表
+          var cdpClients = State.getCDPClients() || [];
+          var groupName;
+          
+          // 如果有CDP客户端，使用第一个客户端的ID作为组名
+          if (cdpClients.length > 0) {
+            groupName = 'CDP-' + cdpClients[0].id.substring(0, 8);
+          } else {
+            // 如果没有CDP客户端，使用时间戳作为组名
+            groupName = 'CDP-' + Date.now().toString(36);
+          }
+          
+          chrome.tabGroups.query({ title: groupName }, function(groups) {
+            if (groups.length > 0) {
+              // 找到现有的组，将标签页添加到组
+              chrome.tabs.group({ tabIds: tabId, groupId: groups[0].id }, function(groupId) {
+                if (chrome.runtime.lastError) {
+                  Logger.error('[TabGroup] Failed to add tab to group:', chrome.runtime.lastError.message);
+                } else {
+                  Logger.info('[TabGroup] Tab added to group:', groupId, 'Group name:', groupName);
+                }
+              });
+            } 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) {
+                  // 为不同的组使用不同的颜色
+                  var colors = ['blue', 'red', 'yellow', 'green', 'pink', 'purple', 'cyan', 'orange'];
+                  var colorIndex = Math.abs(groupName.hashCode ? groupName.hashCode() : 0) % colors.length;
+                  var groupColor = colors[colorIndex];
+                  
+                  chrome.tabGroups.update(groupId, {
+                    title: groupName,
+                    color: groupColor
+                  }, function(group) {
+                    if (chrome.runtime.lastError) {
+                      Logger.error('[TabGroup] Failed to update group:', chrome.runtime.lastError.message);
+                    } else {
+                      Logger.info('[TabGroup] Group created and updated:', group);
+                    }
+                  });
+                }
+              });
+            }
+          });
+        }, 2000); // 等待2秒
+        
         Logger.info('[Tabs] Sending Target.attachedToTarget event');
         
         EventBuilder.send('Target.attachedToTarget', {

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

@@ -44,7 +44,7 @@ var SpecialHandler = (function() {
         var sessionId = CDPUtils.generateSessionId();
         State.mapSession(sessionId, tabId, targetId);
         
-        AutomationBadge.inject(tabId);
+        addTabToAutomationGroup(tabId);
         
         return { sessionId: sessionId };
       });
@@ -78,12 +78,17 @@ var SpecialHandler = (function() {
 
     return new Promise(function(resolve, reject) {
       State.addPendingCreatedTabUrl(url);
-      chrome.tabs.create({ url: url, active: !(params && params.background) }, function(tab) {
+      // 默认设置active: false，避免自动切换标签页
+      chrome.tabs.create({ url: url, active: false }, function(tab) {
         if (!tab || !tab.id) {
           State.removePendingCreatedTabUrl(url);
           reject(new Error('Failed to create tab'));
           return;
         }
+        
+        // 将标签页添加到CDP Automation组
+        addTabToAutomationGroup(tab.id);
+        
         var targetId = String(tab.id);
         State.addEmittedTarget(targetId);
         getTargetIdByTabId(tab.id).then(function(targetId) {
@@ -94,6 +99,86 @@ var SpecialHandler = (function() {
       });
     });
   }
+  
+  function addTabToAutomationGroup(tabId) {
+    Logger.info('[TabGroup] Starting addTabToAutomationGroup for tabId:', tabId);
+    
+    // 获取当前CDP客户端列表
+    var cdpClients = State.getCDPClients() || [];
+    var groupName;
+    
+    // 如果有CDP客户端，使用第一个客户端的ID作为组名
+    if (cdpClients.length > 0) {
+      groupName = 'CDP-' + cdpClients[0].id.substring(0, 8);
+      Logger.info('[TabGroup] Using CDP client ID for group name:', groupName);
+    } else {
+      // 如果没有CDP客户端，使用固定的组名
+      groupName = 'CDP-Automation';
+      Logger.info('[TabGroup] No CDP client, using default group name:', groupName);
+    }
+    
+    // 添加延迟等待，确保标签页完全加载后再分组
+    setTimeout(function() {
+      Logger.info('[TabGroup] Executing group operation after delay...');
+      
+      // 查找或创建标签组
+      chrome.tabGroups.query({ title: groupName }, function(groups) {
+        Logger.info('[TabGroup] Found groups:', groups);
+        
+        if (groups.length > 0) {
+          // 找到现有的组，将标签页添加到组
+          Logger.info('[TabGroup] Adding tab to existing group:', groups[0].id);
+          chrome.tabs.group({ tabIds: tabId, groupId: groups[0].id }, function(groupId) {
+            if (chrome.runtime.lastError) {
+              Logger.error('[TabGroup] Failed to add tab to group:', chrome.runtime.lastError.message);
+            } else {
+              Logger.info('[TabGroup] Tab added to group:', groupId, 'Group name:', groupName);
+            }
+          });
+        } else {
+          // 创建新组并添加标签页
+          Logger.info('[TabGroup] Creating new group...');
+          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) {
+              Logger.info('[TabGroup] Group created with ID:', groupId);
+              // 为不同的组使用不同的颜色
+              var colors = ['blue', 'red', 'yellow', 'green', 'pink', 'purple', 'cyan', 'orange'];
+              var colorIndex = Math.abs(groupName.hashCode ? groupName.hashCode() : 0) % colors.length;
+              var groupColor = colors[colorIndex];
+              
+              Logger.info('[TabGroup] Updating group with title:', groupName, 'color:', groupColor);
+              chrome.tabGroups.update(groupId, {
+                title: groupName,
+                color: groupColor
+              }, function(group) {
+                if (chrome.runtime.lastError) {
+                  Logger.error('[TabGroup] Failed to update group:', chrome.runtime.lastError.message);
+                } else {
+                  Logger.info('[TabGroup] Group created and updated:', group);
+                }
+              });
+            }
+          });
+        }
+      });
+    }, 2000); // 等待2秒
+  }
+  
+  // 为字符串添加hashCode方法（用于生成颜色索引）
+  String.prototype.hashCode = function() {
+    var hash = 0;
+    for (var i = 0; i < this.length; i++) {
+      var char = this.charCodeAt(i);
+      hash = ((hash << 5) - hash) + char;
+      hash = hash & hash; // Convert to 32bit integer
+    }
+    return hash;
+  };
 
   function targetActivateTarget(context) {
     var params = context.params;
@@ -258,7 +343,7 @@ function checkTabVisibility(tabId) {
             var sessionId = CDPUtils.generateSessionId();
             State.mapSession(sessionId, target.tabId, targetId);
 
-            AutomationBadge.inject(target.tabId);
+            addTabToAutomationGroup(target.tabId);
 
             if (config.waitForDebuggerOnStart) {
               State.addPendingDebuggerTab(target.tabId);
@@ -297,7 +382,7 @@ function checkTabVisibility(tabId) {
         var sessionId = CDPUtils.generateSessionId();
         State.mapSession(sessionId, tabId, targetId);
 
-        AutomationBadge.inject(tabId);
+        addTabToAutomationGroup(tabId);
 
         var config = State.getAutoAttachConfig();
         if (config.waitForDebuggerOnStart) {

package/extension-new/core/debugger.js

@@ -106,7 +106,6 @@ var DebuggerManager = (function() {
         State.addAttachedTab(tabId);
         State.setCurrentTabId(tabId);
         State.persist(tabId, true);
-        AutomationBadge.inject(tabId);
         
         // 注入内部URL拦截脚本
         return injectInternalUrlBlocker(tabId);

package/extension-new/manifest.json

@@ -9,7 +9,8 @@
     "activeTab",
     "scripting",
     "storage",
-    "downloads"
+    "downloads",
+    "tabGroups"
   ],
   "host_permissions": [
     "<all_urls>"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdp-tunnel",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Chrome Extension CDP Proxy - 通过 Chrome 扩展将 chrome.debugger API 暴露为 WebSocket 端点",
   "main": "server/proxy-server.js",
   "bin": "./cli/index.js",