cdp-tunnel 2.1.1 → 2.2.0

package/cli/index.js

@@ -20,6 +20,21 @@ program
   .description('Chrome DevTools Protocol Tunnel')
   .version(require(path.join(__dirname, '..', 'package.json')).version);
 
+function syncExtensionVersion() {
+  try {
+    const pkgVersion = require(path.join(__dirname, '..', 'package.json')).version;
+    const manifestPath = path.join(__dirname, '..', 'extension-new', 'manifest.json');
+    const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+    if (manifest.version !== pkgVersion) {
+      manifest.version = pkgVersion;
+      manifest.description = `CDP Tunnel v${pkgVersion} — ${manifest.description.split('—')[1] || manifest.description}`.trim();
+      fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
+    }
+  } catch {}
+}
+
+syncExtensionVersion();
+
 function log(color, ...args) {
   const colors = {
     green: '\x1b[32m',
@@ -104,6 +119,9 @@ function checkChromeExtension() {
 }
 
 function getExtensionPath() {
+  if (process.env.CDP_TUNNEL_DEV_EXT) {
+    return process.env.CDP_TUNNEL_DEV_EXT;
+  }
   const cliDir = __dirname;
   return path.join(cliDir, '..', 'extension-new');
 }

package/extension-new/config-page-preview.html

@@ -657,7 +657,7 @@
   <nav class="navbar">
     <div class="navbar-brand">
       <div class="logo">🔌</div>
-      <h1>CDP Bridge</h1>
+      <h1>CDP Bridge <small id="versionBadge" style="font-size:12px;color:#888;font-weight:normal"></small></h1>
     </div>
     <div class="status-badge disconnected" id="statusBadge">
       <div class="dot"></div>

package/extension-new/config-page.js

@@ -267,6 +267,12 @@
       chrome.storage.local.set({ autoMute: e.target.checked });
       addLog(e.target.checked ? '🔇 自动静音已开启' : '🔊 自动静音已关闭', 'action');
     });
+
+    var versionBadge = document.getElementById('versionBadge');
+    if (versionBadge) {
+      var manifest = chrome.runtime.getManifest();
+      versionBadge.textContent = 'v' + manifest.version;
+    }
     
     fetchState();
     

package/extension-new/core/state.js

@@ -285,7 +285,7 @@ var State = (function() {
           }
           
           var cdpGroups = groups.filter(function(g) {
-            return g.title && g.title.indexOf('CDP-') === 0;
+            return g.title && (g.title.indexOf('CDP-') === 0 || g.title.indexOf('CDP #') === 0);
           });
           
           if (cdpGroups.length === 0) {

package/extension-new/core/websocket.js

@@ -316,6 +316,7 @@ var WebSocketManager = (function() {
 
   function closeTabsByClientId(clientId, resolve) {
     var attachedTabs = State.getAttachedTabIds();
+    var groupId = State.getGroupIdForClient(clientId);
     var tabsToClose = [];
     
     attachedTabs.forEach(function(tabId) {
@@ -329,10 +330,35 @@ var WebSocketManager = (function() {
       resolve();
       return;
     }
-    
-    Logger.info('[WS] Closing ' + tabsToClose.length + ' attached tabs for clientId:', clientId);
-    
-    tabsToClose.forEach(function(tabId) {
+
+    if (groupId) {
+      chrome.tabs.query({ groupId: groupId }, function(groupTabs) {
+        if (chrome.runtime.lastError || !groupTabs) {
+          resolve();
+          return;
+        }
+        var groupTabIds = new Set(groupTabs.map(function(t) { return t.id; }));
+        var safeToClose = tabsToClose.filter(function(tabId) {
+          return groupTabIds.has(tabId);
+        });
+        var unsafeCount = tabsToClose.length - safeToClose.length;
+        if (unsafeCount > 0) {
+          Logger.info('[WS] Protecting ' + unsafeCount + ' tabs outside group from deletion');
+        }
+        doCloseTabs(safeToClose, clientId, resolve);
+      });
+    } else {
+      doCloseTabs(tabsToClose, clientId, resolve);
+    }
+  }
+
+  function doCloseTabs(tabIds, clientId, resolve) {
+    if (tabIds.length === 0) {
+      resolve();
+      return;
+    }
+    Logger.info('[WS] Closing ' + tabIds.length + ' attached tabs for clientId:', clientId);
+    tabIds.forEach(function(tabId) {
       chrome.tabs.remove(tabId, function() {
         if (chrome.runtime.lastError) {
           Logger.info('[WS] Tab already closed:', tabId);
@@ -341,7 +367,6 @@ var WebSocketManager = (function() {
       chrome.debugger.detach({ tabId: tabId }).catch(function() {});
       State.removeAttachedTab(tabId);
     });
-    
     resolve();
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdp-tunnel",
-  "version": "2.1.1",
+  "version": "2.2.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/modules/logger.js

@@ -1,13 +1,17 @@
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 
 const logDir = path.join(__dirname, '../../logs');
 if (!fs.existsSync(logDir)) {
   fs.mkdirSync(logDir, { recursive: true });
 }
 
+const cdpDir = path.join(os.homedir(), '.cdp-tunnel');
+
 const logFile = path.join(logDir, 'cdp-debug.log');
 const statusLogFile = path.join(logDir, 'server-status.log');
+const disconnectLogFile = path.join(cdpDir, 'disconnect.log');
 
 const MAX_LOG_SIZE = 10 * 1024 * 1024;
 const MAX_LOG_FILES = 5;
@@ -117,6 +121,26 @@ function clearLog() {
   }
 }
 
+function logDisconnect(event, details) {
+  const timestamp = new Date().toISOString();
+  const separator = '='.repeat(70);
+  const lines = [
+    separator,
+    `[${timestamp}] ${event}`,
+    JSON.stringify(details, null, 2),
+    ''
+  ].join('\n');
+  try {
+    const dir = path.dirname(disconnectLogFile);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.appendFileSync(disconnectLogFile, lines);
+  } catch (e) {
+    console.error('[LOGGER] Error writing disconnect log:', e.message);
+  }
+}
+
 const NOISY_METHODS = [
   'Runtime.consoleAPICalled',
   'Network.requestWillBeSent',
@@ -249,5 +273,6 @@ module.exports = {
   logFile, 
   logStatus, 
   logConnectionEvent,
-  flushAllLogs
+  flushAllLogs,
+  logDisconnect
 };

package/server/proxy-server.js

@@ -16,7 +16,7 @@ const path = require('path');
 const os = require('os');
 const { execSync, spawn: spawnProcess } = require('child_process');
 const { CONFIG, BROWSER_ID, shouldLog } = require('./modules/config');
-const { logCDP, logEvent, clearLog, logStatus, logConnectionEvent, flushAllLogs } = require('./modules/logger');
+const { logCDP, logEvent, clearLog, logStatus, logConnectionEvent, flushAllLogs, logDisconnect } = require('./modules/logger');
 
 const PORT = CONFIG.PORT;
 const CONFIG_DIR = path.join(os.homedir(), '.cdp-tunnel');
@@ -154,11 +154,13 @@ const browserContextToClientId = new Map();
 const clientIdToBrowserContext = new Map();
 let globalRequestIdCounter = 0;
 
+const { version: PKG_VERSION } = require('../package.json');
+
 let cachedTargets = [];
 let lastTargetsUpdate = 0;
 
 console.log('='.repeat(60));
-console.log('  WebSocket CDP Proxy Server');
+console.log(`  WebSocket CDP Proxy Server v${PKG_VERSION}`);
 console.log('='.repeat(60));
 console.log(`  Server started on port ${PORT}`);
 console.log(`  - Plugin path: ws://localhost:${PORT}/plugin`);
@@ -670,6 +672,16 @@ function handlePluginConnection(ws, clientInfo) {
             totalClients: clientConnections.size
         });
         
+        logDisconnect('PLUGIN_DISCONNECTED', {
+            pluginId: id,
+            code, reason: reason?.toString() || 'none',
+            remainingPlugins: pluginConnections.size,
+            affectedClients: affectedClients.map(c => c),
+            uptime: ws.connectedAt ? `${((Date.now() - ws.connectedAt) / 1000).toFixed(0)}s` : 'unknown',
+            activeSessions: sessionToClientId.size,
+            pendingRequests: pendingAttachRequests.size
+        });
+        
         if (pluginConnections.size === 0) {
             updateExtensionState(false);
         }
@@ -963,6 +975,20 @@ function handleClientConnection(ws, clientInfo, customClientId = null) {
             totalPlugins: pluginConnections.size,
             totalClients: clientConnections.size
         });
+
+        const isUnexpected = code !== 1000 && code !== 1001;
+        if (isUnexpected) {
+            logDisconnect('CLIENT_DISCONNECTED_UNEXPECTED', {
+                clientId: id,
+                code, reason: reason?.toString() || 'none',
+                sessionsLost: sessionsToClean.length,
+                cdpMethodsUsed: ws.cdpTrace ? [...new Set(ws.cdpTrace)] : [],
+                uptime: ws.connectedAt ? `${((Date.now() - ws.connectedAt) / 1000).toFixed(0)}s` : 'unknown',
+                remainingClients: clientConnections.size,
+                pluginAlive: pluginConnections.size > 0,
+                pairedPluginId: ws.pairedPlugin?.id || null
+            });
+        }
         
         if (ws.cdpTrace && ws.cdpTrace.length && shouldLog('debug')) {
             const unique = [...new Set(ws.cdpTrace)];
@@ -1343,6 +1369,14 @@ const heartbeatInterval = setInterval(() => {
                 console.log(`[${now}] Plugin ${ws.id} not responding, terminating...`);
             }
             logConnectionEvent('HEARTBEAT_TIMEOUT', { type: 'plugin', id: ws.id });
+            logDisconnect('HEARTBEAT_TIMEOUT_PLUGIN', {
+                pluginId: ws.id,
+                pairedClientId: ws.pairedClientId || null,
+                uptime: ws.connectedAt ? `${((Date.now() - ws.connectedAt) / 1000).toFixed(0)}s` : 'unknown',
+                remainingPlugins: pluginConnections.size,
+                activeClients: clientConnections.size,
+                activeSessions: sessionToClientId.size
+            });
             pluginConnections.delete(ws);
             if (ws.pairedClientId) {
                 connectionPairs.delete(ws.pairedClientId);
@@ -1365,6 +1399,12 @@ const heartbeatInterval = setInterval(() => {
                 console.log(`[${now}] Client ${ws.id} not responding, terminating...`);
             }
             logConnectionEvent('HEARTBEAT_TIMEOUT', { type: 'client', id: ws.id });
+            logDisconnect('HEARTBEAT_TIMEOUT_CLIENT', {
+                clientId: ws.id,
+                uptime: ws.connectedAt ? `${((Date.now() - ws.connectedAt) / 1000).toFixed(0)}s` : 'unknown',
+                remainingClients: clientConnections.size,
+                pluginAlive: pluginConnections.size > 0
+            });
             clientConnections.delete(ws);
             clientById.delete(ws.id);
             if (ws.pairedPlugin) {