cdp-tunnel 2.5.21 → 2.6.0

package/extension-new/core/debugger.js

@@ -33,25 +33,12 @@ var DebuggerManager = (function() {
     if (tagName.toLowerCase() === 'iframe') {
       var originalSetAttribute = element.setAttribute;
       element.setAttribute = function(name, value) {
-        if (name.toLowerCase() === 'src' && isInternalUrl(value)) {
+        if (name.toLowerCase() === 'src' && isInternalUrl(String(value || ''))) {
           console.warn('[CDP-BLOCK] Blocked iframe src:', value);
-          return;
+          return element;
         }
         return originalSetAttribute.call(this, name, value);
       };
-      
-      Object.defineProperty(element, 'src', {
-        set: function(value) {
-          if (isInternalUrl(value)) {
-            console.warn('[CDP-BLOCK] Blocked iframe src via property:', value);
-            return;
-          }
-          originalSetAttribute.call(this, 'src', value);
-        },
-        get: function() {
-          return element.getAttribute('src');
-        }
-      });
     }
     return element;
   };
@@ -68,18 +55,25 @@ var DebuggerManager = (function() {
   
   // 拦截 location 修改
   var locationDescriptor = Object.getOwnPropertyDescriptor(window, 'location');
-  Object.defineProperty(window, 'location', {
-    set: function(value) {
-      if (isInternalUrl(String(value))) {
-        console.warn('[CDP-BLOCK] Blocked location change:', value);
-        return;
-      }
-      locationDescriptor.set.call(window, value);
-    },
-    get: function() {
-      return locationDescriptor.get.call(window);
+  if (locationDescriptor && typeof locationDescriptor.set === 'function') {
+    try {
+      Object.defineProperty(window, 'location', {
+        set: function(value) {
+          if (isInternalUrl(String(value))) {
+            console.warn('[CDP-BLOCK] Blocked location change:', value);
+            return;
+          }
+          locationDescriptor.set.call(window, value);
+        },
+        get: function() {
+          return locationDescriptor.get.call(window);
+        },
+        configurable: true
+      });
+    } catch(e) {
+      // location property cannot be redefined on some contexts, skip silently
     }
-  });
+  }
   
   console.log('[CDP-BLOCK] Internal URL block script injected');
 })();
@@ -222,17 +216,22 @@ var DebuggerManager = (function() {
         return;
       }
       
-      // 在新的执行上下文中也注入拦截脚本
+      // 在新的执行上下文中也注入拦截脚本（data: URL 上下文跳过，避免干扰导航）
       if (isDefaultContext) {
-        chrome.debugger.sendCommand(
-          { tabId: source.tabId },
-          'Runtime.evaluate',
-          { 
-            expression: INTERNAL_URL_BLOCK_SCRIPT,
-            contextId: context.id,
-            runImmediately: true
-          }
-        ).catch(function() {});
+        chrome.tabs.get(source.tabId, function(tab) {
+          if (chrome.runtime.lastError) return;
+          var tabUrl = tab ? (tab.url || tab.pendingUrl || '') : '';
+          if (tabUrl.startsWith('data:')) return;
+          chrome.debugger.sendCommand(
+            { tabId: source.tabId },
+            'Runtime.evaluate',
+            { 
+              expression: INTERNAL_URL_BLOCK_SCRIPT,
+              contextId: context.id,
+              runImmediately: true
+            }
+          ).catch(function() {});
+        });
       }
     }
     

package/extension-new/core/websocket.js

@@ -11,45 +11,51 @@ var WebSocketManager = (function() {
     }
 
     Config.getWsUrl(function(wsUrl) {
-      Logger.info('[WS] Connecting to', wsUrl);
-      setBadgeStatus('ON');
-
-      try {
-        ws = new WebSocket(wsUrl);
-        State.setWs(ws);
-
-        ws.onopen = function() {
-          Logger.info('[WS] Connected');
-          setBadgeStatus('ON');
-          State.clearReconnectTimer();
-          processQueue();
-          broadcastStateUpdate();
-          var extVersion = (typeof chrome !== 'undefined' && chrome.runtime && chrome.runtime.getManifest) 
-            ? chrome.runtime.getManifest().version : 'unknown';
-          send({ type: 'plugin-hello', version: extVersion });
-        };
-
-        ws.onclose = function(event) {
-          Logger.info('[WS] Closed:', event.code, event.reason);
-          setBadgeStatus('OFF');
-          scheduleReconnect();
-          broadcastStateUpdate();
-        };
+      Config.getPluginId(function(pluginId) {
+        if (pluginId) {
+          var sep = wsUrl.indexOf('?') >= 0 ? '&' : '?';
+          wsUrl += sep + 'pluginId=' + encodeURIComponent(pluginId);
+        }
+        Logger.info('[WS] Connecting to', wsUrl);
+        setBadgeStatus('ON');
 
-        ws.onerror = function(error) {
-          Logger.error('[WS] Error:', error);
+        try {
+          ws = new WebSocket(wsUrl);
+          State.setWs(ws);
+
+          ws.onopen = function() {
+            Logger.info('[WS] Connected');
+            setBadgeStatus('ON');
+            State.clearReconnectTimer();
+            processQueue();
+            broadcastStateUpdate();
+            var extVersion = (typeof chrome !== 'undefined' && chrome.runtime && chrome.runtime.getManifest) 
+              ? chrome.runtime.getManifest().version : 'unknown';
+            send({ type: 'plugin-hello', version: extVersion });
+          };
+
+          ws.onclose = function(event) {
+            Logger.info('[WS] Closed:', event.code, event.reason);
+            setBadgeStatus('OFF');
+            scheduleReconnect();
+            broadcastStateUpdate();
+          };
+
+          ws.onerror = function(error) {
+            Logger.error('[WS] Error:', error);
+            setBadgeStatus('ERR');
+            broadcastStateUpdate();
+          };
+
+          ws.onmessage = function(event) {
+            handleRawMessage(event.data);
+          };
+        } catch (error) {
+          Logger.error('[WS] Failed to create:', error);
           setBadgeStatus('ERR');
-          broadcastStateUpdate();
-        };
-
-        ws.onmessage = function(event) {
-          handleRawMessage(event.data);
-        };
-      } catch (error) {
-        Logger.error('[WS] Failed to create:', error);
-        setBadgeStatus('ERR');
-        scheduleReconnect();
-      }
+          scheduleReconnect();
+        }
+      });
     });
   }
 

package/extension-new/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "CDP Bridge",
-  "version": "2.5.21",
+  "version": "2.5.22",
   "description": "Chrome DevTools Protocol Bridge for Playwright/Puppeteer automation",
   "permissions": [
     "debugger",
@@ -19,6 +19,7 @@
     "service_worker": "background.js"
   },
   "action": {
+    "default_popup": "popup.html",
     "default_title": "CDP Bridge",
     "default_icon": {
       "16": "icons/icon16.png",
@@ -42,4 +43,4 @@
       ]
     }
   ]
-}
+}

package/extension-new/popup.html

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<style>
+* { margin: 0; padding: 0; box-sizing: border-box; }
+body { width: 340px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; background: #1a1a2e; color: #e0e0e0; font-size: 13px; }
+
+.header { display: flex; align-items: center; justify-content: space-between; padding: 12px 16px; border-bottom: 1px solid #2a2a4a; }
+.header h1 { font-size: 15px; font-weight: 600; color: #fff; }
+.status-badge { display: flex; align-items: center; gap: 6px; font-size: 12px; font-weight: 500; padding: 3px 10px; border-radius: 12px; }
+.status-badge.on { background: rgba(76,175,80,0.15); color: #4CAF50; }
+.status-badge.off { background: rgba(158,158,158,0.15); color: #9E9E9E; }
+.status-badge.err { background: rgba(244,67,54,0.15); color: #F44336; }
+.status-dot { width: 8px; height: 8px; border-radius: 50%; }
+.status-badge.on .status-dot { background: #4CAF50; box-shadow: 0 0 6px #4CAF50; }
+.status-badge.off .status-dot { background: #9E9E9E; }
+.status-badge.err .status-dot { background: #F44336; }
+
+.section { padding: 12px 16px; border-bottom: 1px solid #2a2a4a; }
+.section-title { font-size: 11px; text-transform: uppercase; letter-spacing: 0.5px; color: #888; margin-bottom: 8px; }
+
+.ws-address { display: flex; align-items: center; gap: 8px; }
+.ws-address input { flex: 1; background: #16213e; border: 1px solid #2a2a4a; border-radius: 6px; padding: 7px 10px; color: #e0e0e0; font-size: 12px; font-family: monospace; outline: none; }
+.ws-address input:focus { border-color: #4a9eff; }
+.btn-sm { background: #2a2a4a; border: 1px solid #3a3a5a; border-radius: 6px; padding: 6px 12px; color: #e0e0e0; font-size: 12px; cursor: pointer; white-space: nowrap; }
+.btn-sm:hover { background: #3a3a5a; }
+
+.cdp-row { margin-bottom: 8px; }
+.cdp-row:last-child { margin-bottom: 0; }
+.cdp-label { font-size: 11px; color: #888; margin-bottom: 3px; }
+.cdp-url { display: flex; align-items: center; gap: 6px; background: #16213e; border-radius: 6px; padding: 6px 10px; }
+.cdp-url code { flex: 1; font-size: 11px; font-family: monospace; color: #4a9eff; word-break: break-all; line-height: 1.4; }
+.copy-btn { background: none; border: 1px solid #3a3a5a; border-radius: 4px; padding: 3px 8px; color: #aaa; font-size: 11px; cursor: pointer; flex-shrink: 0; }
+.copy-btn:hover { background: #3a3a5a; color: #fff; }
+.copy-btn.copied { color: #4CAF50; border-color: #4CAF50; }
+
+.clients-info { font-size: 12px; color: #aaa; }
+.clients-info span { color: #4a9eff; }
+
+.footer { padding: 8px 16px; text-align: center; }
+.footer a { color: #666; font-size: 11px; text-decoration: none; }
+.footer a:hover { color: #4a9eff; }
+</style>
+</head>
+<body>
+<div class="header">
+  <h1>CDP Bridge</h1>
+  <div class="status-badge off" id="statusBadge">
+    <div class="status-dot"></div>
+    <span id="statusText">未连接</span>
+  </div>
+</div>
+
+<div class="section">
+  <div class="section-title">WebSocket 地址</div>
+  <div class="ws-address">
+    <input type="text" id="wsInput" placeholder="ws://localhost:9221/plugin" spellcheck="false">
+    <button class="btn-sm" id="saveBtn">保存</button>
+  </div>
+</div>
+
+<div class="section" id="cdpSection" style="display:none;">
+  <div class="section-title">CDP 连接地址</div>
+  <div id="cdpAddresses"></div>
+</div>
+
+<div class="section" id="clientsSection" style="display:none;">
+  <div class="section-title">连接信息</div>
+  <div class="clients-info" id="clientsInfo"></div>
+</div>
+
+<div class="footer">
+  <a href="https://github.com" target="_blank">v2.5.21</a>
+</div>
+
+<script src="popup.js"></script>
+</body>
+</html>

package/extension-new/popup.js

@@ -0,0 +1,114 @@
+(function() {
+  var $ = function(id) { return document.getElementById(id); };
+
+  var wsInput = $('wsInput');
+  var saveBtn = $('saveBtn');
+  var statusBadge = $('statusBadge');
+  var statusText = $('statusText');
+  var cdpSection = $('cdpSection');
+  var cdpAddresses = $('cdpAddresses');
+  var clientsSection = $('clientsSection');
+  var clientsInfo = $('clientsInfo');
+
+  function loadState() {
+    chrome.storage.local.get(['wsAddress'], function(result) {
+      wsInput.value = result.wsAddress || '';
+    });
+    chrome.runtime.sendMessage({ type: 'popup-query' }, function(state) {
+      if (!state) return;
+      updateStatus(state);
+      updateCDP(state);
+      updateClients(state);
+    });
+  }
+
+  function updateStatus(state) {
+    var cls = state.connected ? 'on' : 'off';
+    var text = state.connected ? '已连接' : '未连接';
+    if (!state.connected && state.lastError) {
+      cls = 'err';
+      text = '错误';
+    }
+    statusBadge.className = 'status-badge ' + cls;
+    statusText.textContent = text;
+  }
+
+  function updateCDP(state) {
+    if (!state.connected || !state.pluginId) {
+      cdpSection.style.display = 'none';
+      return;
+    }
+    cdpSection.style.display = '';
+
+    var wsUrl = wsInput.value || 'ws://localhost:9221/plugin';
+    var cdpBase = wsUrl.replace(/\/plugin(\?.*)?$/, '');
+    var pluginId = state.pluginId;
+    var cdpPath = '/devtools/browser/' + pluginId;
+
+    var urls = [];
+    var parsed = parseWsUrl(wsUrl);
+    if (parsed) {
+      urls.push({ label: 'CDP 地址', url: parsed.protocol + '://' + parsed.host + cdpPath });
+    }
+
+    var html = '';
+    urls.forEach(function(item) {
+      html += '<div class="cdp-row">';
+      html += '<div class="cdp-label">' + item.label + '</div>';
+      html += '<div class="cdp-url">';
+      html += '<code>' + escapeHtml(item.url) + '</code>';
+      html += '<button class="copy-btn" data-url="' + escapeAttr(item.url) + '">复制</button>';
+      html += '</div></div>';
+    });
+    cdpAddresses.innerHTML = html;
+  }
+
+  function updateClients(state) {
+    if (!state.connected) {
+      clientsSection.style.display = 'none';
+      return;
+    }
+    clientsSection.style.display = '';
+    var clients = state.cdpClients || [];
+    var attached = state.attachedPages || [];
+    clientsInfo.innerHTML = '活跃连接: <span>' + clients.length + '</span> | 已附加页面: <span>' + attached.length + '</span>';
+  }
+
+  function parseWsUrl(url) {
+    var m = url.match(/^(wss?):\/\/([^\/]+)/);
+    if (!m) return null;
+    return { protocol: m[1], host: m[2] };
+  }
+
+  function escapeHtml(s) {
+    return s.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+  }
+  function escapeAttr(s) {
+    return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+  }
+
+  saveBtn.addEventListener('click', function() {
+    var val = wsInput.value.trim();
+    chrome.storage.local.set({ wsAddress: val }, function() {
+      saveBtn.textContent = '已保存';
+      setTimeout(function() { saveBtn.textContent = '保存'; }, 1500);
+      chrome.runtime.sendMessage({ type: 'ws-reconnect' });
+    });
+  });
+
+  cdpAddresses.addEventListener('click', function(e) {
+    var btn = e.target.closest('.copy-btn');
+    if (!btn) return;
+    var url = btn.getAttribute('data-url');
+    navigator.clipboard.writeText(url).then(function() {
+      btn.textContent = '已复制';
+      btn.classList.add('copied');
+      setTimeout(function() {
+        btn.textContent = '复制';
+        btn.classList.remove('copied');
+      }, 2000);
+    });
+  });
+
+  loadState();
+})();

package/extension-new/utils/config.js

@@ -1,5 +1,5 @@
 var Config = {
-  WS_URL: 'ws://localhost:19221/plugin',
+  WS_URL: 'ws://localhost:9221/plugin',
   RECONNECT_DELAY: 3000,
   DEBUGGER_VERSION: '1.3',
   HEARTBEAT_INTERVAL: 25000,
@@ -17,6 +17,18 @@ var Config = {
       callback(result.wsAddress || Config.WS_URL);
     });
   },
+  getPluginId: function(callback) {
+    chrome.storage.local.get(['pluginId'], function(result) {
+      if (result.pluginId) {
+        callback(result.pluginId);
+      } else {
+        var id = 'browser_' + Date.now() + '_' + Math.random().toString(36).substr(2, 8);
+        chrome.storage.local.set({ pluginId: id }, function() {
+          callback(id);
+        });
+      }
+    });
+  },
   AUTO_MUTE: true,
   getAutoMute: function(callback) {
     chrome.storage.local.get(['autoMute'], function(result) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdp-tunnel",
-  "version": "2.5.21",
+  "version": "2.6.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",
@@ -53,8 +53,13 @@
     "LICENSE"
   ],
   "dependencies": {
+    "bcryptjs": "^3.0.3",
+    "better-sqlite3": "^12.10.0",
     "cdp-tunnel": "^2.5.17",
     "commander": "^12.0.0",
+    "http-proxy": "^1.18.1",
+    "jsonwebtoken": "^9.0.3",
+    "uuid": "^14.0.0",
     "ws": "^8.16.0"
   },
   "devDependencies": {