ghost-bridge 0.5.1 → 0.5.2

package/README.md

@@ -139,7 +139,7 @@ ghost-bridge init
 
 | Setting | Default | Description |
 |---------|---------|-------------|
-| **Base Port** | `33333` | WS port. Auto-increments if occupied. |
+| **Base Port** | `33333` | Fixed WS port. If occupied, Ghost Bridge fails fast and asks you to free it or set `GHOST_BRIDGE_PORT`. |
 | **Token** | *Monthly UUID* | Local WS auth token, auto-rotates on the 1st of every month. |
 | **Auto Detach** | `false` | Keeps debugger attached to actively buffer invisible exceptions and network calls. |
 

package/dist/server.js

@@ -28536,7 +28536,6 @@ var GHOST_BRIDGE_VERSION = packageJson.version;
 
 // src/server.js
 var BASE_PORT = Number(process.env.GHOST_BRIDGE_PORT || 33333);
-var MAX_PORT_RETRIES = 10;
 function getMonthlyToken() {
   const now = /* @__PURE__ */ new Date();
   const firstDayOfMonth = new Date(now.getFullYear(), now.getMonth(), 1, 0, 0, 0, 0);
@@ -28567,6 +28566,10 @@ function getExistingService() {
     if (!fs2.existsSync(PORT_INFO_FILE)) return null;
     const info = JSON.parse(fs2.readFileSync(PORT_INFO_FILE, "utf-8"));
     if (!info.pid || !info.port) return null;
+    if (info.port !== BASE_PORT) {
+      fs2.unlinkSync(PORT_INFO_FILE);
+      return null;
+    }
     if (!isProcessRunning(info.pid)) {
       log(`\u65E7\u670D\u52A1 PID ${info.pid} \u5DF2\u4E0D\u5B58\u5728\uFF0C\u6E05\u7406\u65E7\u4FE1\u606F`);
       fs2.unlinkSync(PORT_INFO_FILE);
@@ -28618,22 +28621,14 @@ function isPortAvailable(port) {
   });
 }
 async function startWebSocketServer() {
-  for (let i = 0; i < MAX_PORT_RETRIES; i++) {
-    const port = BASE_PORT + i;
-    const available = await isPortAvailable(port);
-    if (available) {
-      actualPort = port;
-      const wss2 = new import_websocket_server.default({ port });
-      if (port !== BASE_PORT) {
-        log(`\u26A0\uFE0F \u7AEF\u53E3 ${BASE_PORT} \u88AB\u5360\u7528\uFF0C\u5DF2\u5207\u6362\u5230\u7AEF\u53E3 ${port}`);
-      }
-      log(`\u{1F680} WebSocket \u670D\u52A1\u5DF2\u542F\u52A8\uFF0C\u7AEF\u53E3 ${port}${WS_TOKEN ? "\uFF08\u542F\u7528 token \u6821\u9A8C\uFF09" : ""}`);
-      return wss2;
-    } else {
-      log(`\u7AEF\u53E3 ${port} \u88AB\u5360\u7528\uFF0C\u5C1D\u8BD5\u4E0B\u4E00\u4E2A...`);
-    }
+  const available = await isPortAvailable(BASE_PORT);
+  if (!available) {
+    throw new Error(`\u56FA\u5B9A\u7AEF\u53E3 ${BASE_PORT} \u4E0D\u53EF\u7528\uFF0C\u8BF7\u91CA\u653E\u8BE5\u7AEF\u53E3\u6216\u901A\u8FC7 GHOST_BRIDGE_PORT \u6307\u5B9A\u5176\u4ED6\u7AEF\u53E3`);
   }
-  throw new Error(`\u65E0\u6CD5\u627E\u5230\u53EF\u7528\u7AEF\u53E3\uFF08\u5DF2\u5C1D\u8BD5 ${BASE_PORT} - ${BASE_PORT + MAX_PORT_RETRIES - 1}\uFF09`);
+  actualPort = BASE_PORT;
+  const wss2 = new import_websocket_server.default({ port: BASE_PORT });
+  log(`\u{1F680} WebSocket \u670D\u52A1\u5DF2\u542F\u52A8\uFF0C\u7AEF\u53E3 ${BASE_PORT}${WS_TOKEN ? "\uFF08\u542F\u7528 token \u6821\u9A8C\uFF09" : ""}`);
+  return wss2;
 }
 async function initWebSocketService() {
   const existing = getExistingService();
@@ -28653,6 +28648,16 @@ async function initWebSocketService() {
       }
     }
   }
+  if (!await isPortAvailable(BASE_PORT)) {
+    const valid = await verifyExistingService(BASE_PORT);
+    if (valid) {
+      actualPort = BASE_PORT;
+      isMainInstance = false;
+      log(`\u2705 \u590D\u7528\u56FA\u5B9A\u7AEF\u53E3\u4E0A\u7684\u73B0\u6709\u670D\u52A1\uFF0C\u7AEF\u53E3 ${actualPort}`);
+      return null;
+    }
+    throw new Error(`\u56FA\u5B9A\u7AEF\u53E3 ${BASE_PORT} \u5DF2\u88AB\u5176\u4ED6\u8FDB\u7A0B\u5360\u7528\uFF0C\u8BF7\u91CA\u653E\u8BE5\u7AEF\u53E3\u6216\u901A\u8FC7 GHOST_BRIDGE_PORT \u6307\u5B9A\u5176\u4ED6\u7AEF\u53E3`);
+  }
   const wss2 = await startWebSocketServer();
   isMainInstance = true;
   fs2.writeFileSync(

package/extension/background.js

@@ -7,7 +7,6 @@ function getMonthlyToken() {
 
 const CONFIG = {
   basePort: 33333,
-  maxPortRetries: 10,
   token: getMonthlyToken(),
   autoDetach: false,
   maxErrors: 100,
@@ -23,7 +22,7 @@ let lastErrors = []
 let lastErrorLocation = null
 let requestMap = new Map()
 let networkRequests = []
-let state = { enabled: false, connected: false, port: null, currentPort: null, scanRound: 0 }
+let state = { enabled: false, connected: false, port: null, currentPort: null, connectionStatus: 'disconnected', connectionError: '' }
 
 // 待处理的请求（等待 offscreen 响应）
 const pendingRequests = new Map()
@@ -1396,10 +1395,8 @@ function broadcastStatus() {
     status = 'disconnected'
   } else if (state.connected) {
     status = 'connected'
-  } else if (state.scanRound >= 4) {
-    status = 'not_found'
   } else {
-    status = 'scanning'
+    status = state.connectionStatus || 'connecting'
   }
 
   let tabUrl = ''
@@ -1425,7 +1422,7 @@ function broadcastStatus() {
         port: state.port,
         currentPort: state.currentPort,
         basePort: CONFIG.basePort,
-        scanRound: state.scanRound,
+        connectionError: state.connectionError,
         errorCount: actualErrors.length,
         recentErrors: actualErrors.slice(0, 5),
         tabTitle,
@@ -1474,18 +1471,32 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
     if (message.status === 'connected') {
       state.connected = true
       state.port = message.port
+      state.currentPort = message.port
+      state.connectionStatus = 'connected'
+      state.connectionError = ''
       setBadgeState('on')
       log(`✅ 已连接到 ghost-bridge 服务 (端口 ${message.port})`)
       ensureAttached().catch((e) => log(`attach 失败：${e.message}`))
     } else if (message.status === 'disconnected') {
       state.connected = false
       state.port = null
+      state.connectionStatus = 'connecting'
+      state.connectionError = ''
       if (state.enabled) setBadgeState('connecting')
-    } else if (message.status === 'scanning') {
+    } else if (message.status === 'connecting') {
       state.currentPort = message.currentPort
+      state.connectionStatus = 'connecting'
+      state.connectionError = ''
       setBadgeState('connecting')
+    } else if (message.status === 'error') {
+      state.currentPort = message.currentPort
+      state.connectionStatus = 'error'
+      state.connectionError = message.errorMessage || ''
+      setBadgeState('err')
     } else if (message.status === 'not_found') {
-      state.scanRound++
+      state.currentPort = message.currentPort
+      state.connectionStatus = 'not_found'
+      state.connectionError = ''
       setBadgeState('connecting')
     }
     broadcastStatus() // 状态变化时主动推送
@@ -1516,10 +1527,8 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
       status = 'disconnected'
     } else if (state.connected) {
       status = 'connected'
-    } else if (state.scanRound >= 4) {
-      status = 'not_found'
     } else {
-      status = 'scanning'
+      status = state.connectionStatus || 'connecting'
     }
 
     let tabUrl = ''
@@ -1544,7 +1553,7 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
         port: state.port,
         currentPort: state.currentPort,
         basePort: CONFIG.basePort,
-        scanRound: state.scanRound,
+        connectionError: state.connectionError,
         errorCount: actualErrors.length,
         recentErrors: actualErrors.slice(0, 5),
         tabTitle,
@@ -1561,7 +1570,11 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
       chrome.storage.local.set({ basePort: message.port })
     }
     state.enabled = true
-    state.scanRound = 0
+    state.connected = false
+    state.port = null
+    state.currentPort = CONFIG.basePort
+    state.connectionStatus = 'connecting'
+    state.connectionError = ''
     setBadgeState('connecting')
 
     // 启动 offscreen 并开始连接
@@ -1570,7 +1583,6 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
         type: 'connect',
         basePort: CONFIG.basePort,
         token: CONFIG.token,
-        maxPortRetries: CONFIG.maxPortRetries,
       }).catch(() => {})
     })
 
@@ -1582,7 +1594,10 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
   if (message.type === 'disconnect') {
     state.enabled = false
     state.connected = false
-    state.scanRound = 0
+    state.port = null
+    state.currentPort = null
+    state.connectionStatus = 'disconnected'
+    state.connectionError = ''
     setBadgeState('off')
     detachAllTargets().catch(() => {})
 

package/extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Ghost Bridge",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Zero-restart Chrome debugger bridge for Claude MCP, optimized for no-sourcemap production debugging.",
   "permissions": [
     "debugger",

package/extension/offscreen.js

@@ -7,7 +7,6 @@ let manualDisconnect = false  // 用户主动断开标志，防止 onclose 触
 let config = {
   basePort: 33333,
   token: '',
-  maxPortRetries: 10,
 }
 
 function log(msg) {
@@ -23,29 +22,17 @@ function getMonthlyToken() {
 }
 
 // 连接到服务器
-function connect(portIndex = 0, isNewRound = false) {
+function connect() {
   // 如果已手动断开，不再尝试连接
   if (manualDisconnect) return
 
-  if (portIndex >= config.maxPortRetries) {
-    log(`扫描完毕，未找到服务，2秒后重试...`)
-    reconnectTimer = setTimeout(() => connect(0, true), 2000)
-    chrome.runtime.sendMessage({ type: 'status', status: 'not_found' }).catch(() => {})
-    return
-  }
-
-  const port = config.basePort + portIndex
+  const port = config.basePort
   const url = new URL(`ws://localhost:${port}`)
   url.searchParams.set('token', config.token)
-
-  if (portIndex === 0 && isNewRound) {
-    log(`开始扫描端口 ${config.basePort}-${config.basePort + config.maxPortRetries - 1}`)
-  }
-
-  log(`尝试连接端口 ${port}...`)
+  log(`尝试连接固定端口 ${port}...`)
   chrome.runtime.sendMessage({
     type: 'status',
-    status: 'scanning',
+    status: 'connecting',
     currentPort: port,
   }).catch(() => {})
 
@@ -59,8 +46,11 @@ function connect(portIndex = 0, isNewRound = false) {
   }, 2000) // 增加到 2 秒
 
   let identityVerified = false
+  let socketOpened = false
+  let terminalErrorMessage = ''
 
   ws.onopen = () => {
+    socketOpened = true
     clearTimeout(connectionTimeout)
     log(`WebSocket 已连接端口 ${port}，等待身份验证...`)
   }
@@ -84,9 +74,15 @@ function connect(portIndex = 0, isNewRound = false) {
             port: port,
           }).catch(() => {})
         } else {
-          log(`身份验证失败，尝试下一个端口...`)
+          terminalErrorMessage = `Port ${port} is occupied by a non-matching service, or the token does not match.`
+          log('身份验证失败，将在固定端口上重试...')
+          chrome.runtime.sendMessage({
+            type: 'status',
+            status: 'error',
+            currentPort: port,
+            errorMessage: terminalErrorMessage,
+          }).catch(() => {})
           ws.close()
-          setTimeout(() => connect(portIndex + 1), 50)
         }
         return
       }
@@ -107,15 +103,28 @@ function connect(portIndex = 0, isNewRound = false) {
     if (manualDisconnect) return
 
     if (!identityVerified) {
-      // 连接失败，尝试下一个端口
-      setTimeout(() => connect(portIndex + 1), 50)
+      if (terminalErrorMessage || socketOpened) {
+        const errorMessage = terminalErrorMessage || `Port ${port} is occupied or responding with a non-ghost-bridge protocol.`
+        log(`${errorMessage} 2秒后重试...`)
+        chrome.runtime.sendMessage({
+          type: 'status',
+          status: 'error',
+          currentPort: port,
+          errorMessage,
+        }).catch(() => {})
+        reconnectTimer = setTimeout(() => connect(), 2000)
+        return
+      }
+      log(`固定端口 ${port} 未发现可用服务，2秒后重试...`)
+      chrome.runtime.sendMessage({ type: 'status', status: 'not_found', currentPort: port }).catch(() => {})
+      reconnectTimer = setTimeout(() => connect(), 2000)
       return
     }
 
     // 连接断开，重试
-    log('连接断开，尝试重连...')
+    log(`端口 ${port} 连接断开，尝试重连...`)
     chrome.runtime.sendMessage({ type: 'status', status: 'disconnected' }).catch(() => {})
-    reconnectTimer = setTimeout(() => connect(0, true), 1000)
+    reconnectTimer = setTimeout(() => connect(), 1000)
   }
 
   ws.onerror = () => {
@@ -151,10 +160,9 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
   if (message.type === 'connect') {
     config.basePort = message.basePort || 33333
     config.token = message.token || getMonthlyToken()
-    config.maxPortRetries = message.maxPortRetries || 10
     disconnect()
     manualDisconnect = false  // 用户重新连接，清除断开标志
-    connect(0, true)
+    connect()
     sendResponse({ ok: true })
     return true
   }

package/extension/popup.html

@@ -121,6 +121,15 @@
     }
     body.connected-state .bg-ripple-2 { animation-delay: 1.25s; }
 
+    .ghost-error .ghost-body { fill: #ef4444; }
+    .ghost-error .ghost-eyes-normal { opacity: 1; }
+
+    body.error-state .bg-ripple {
+      stroke: #ef4444;
+      animation: bg-ripple-scan 1.8s infinite cubic-bezier(0, 0, 0.2, 1);
+    }
+    body.error-state .bg-ripple-2 { animation-delay: 0.9s; }
+
     @keyframes bg-ripple-scan {
       0% { r: 10%; opacity: 0.8; stroke-width: 3; }
       100% { r: 80%; opacity: 0; stroke-width: 0; }

package/extension/popup.js

@@ -53,7 +53,7 @@ const STATUS_MAP = {
 }
 
 function renderUI(state) {
-  const { status, port, scanRound, enabled, currentPort, basePort, errorCount, recentErrors, tabTitle } = state
+  const { status, port, enabled, currentPort, basePort, connectionError, errorCount, recentErrors, tabTitle } = state
   const config = STATUS_MAP[status] || STATUS_MAP.disconnected
 
   // Update classes for color & animations
@@ -66,6 +66,9 @@ function renderUI(state) {
   } else if (config.statusClass === 'connecting') {
     headerGhost.className = 'ghost-wrapper ghost-connecting'
     document.body.className = 'connecting-state'
+  } else if (config.statusClass === 'error') {
+    headerGhost.className = 'ghost-wrapper ghost-error'
+    document.body.className = 'error-state'
   } else {
     headerGhost.className = 'ghost-wrapper ghost-disconnected'
     document.body.className = 'disconnected-state'
@@ -117,8 +120,7 @@ function renderUI(state) {
     
     detailContainer.classList.remove('collapsed')
   } else if ((status === 'connecting' || status === 'verifying' || status === 'scanning') && currentPort) {
-    const roundText = scanRound > 0 ? ` [R${scanRound + 1}]` : ''
-    portVal.textContent = `Scanning: ${currentPort}${roundText}`
+    portVal.textContent = `Connecting: ${currentPort}`
     portVal.className = 'detail-value highlight'
     tabRow.classList.add('hidden')
     errorRow.classList.add('hidden')
@@ -131,6 +133,12 @@ function renderUI(state) {
     tabRow.classList.add('hidden')
     errorRow.classList.add('hidden')
     detailContainer.classList.remove('collapsed')
+  } else if (status === 'error') {
+    portVal.textContent = `Port ${currentPort || basePort || '-'} blocked`
+    portVal.className = 'detail-value warning'
+    tabRow.classList.add('hidden')
+    errorRow.classList.add('hidden')
+    detailContainer.classList.remove('collapsed')
   } else {
     detailContainer.classList.add('collapsed')
   }
@@ -145,8 +153,11 @@ function renderUI(state) {
   }
 
   // Scan info text
-  if ((status === 'connecting' || status === 'scanning') && scanRound > 2) {
-    scanInfo.textContent = `Round ${scanRound}: Is your MCP Server running?`
+  if (status === 'error' && connectionError) {
+    scanInfo.textContent = connectionError
+    scanInfo.classList.remove('collapsed')
+  } else if (status === 'not_found' && basePort) {
+    scanInfo.textContent = `Port ${basePort} unavailable. Is your MCP server running on this port?`
     scanInfo.classList.remove('collapsed')
   } else {
     scanInfo.classList.add('collapsed')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost-bridge",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "private": false,
   "type": "module",
   "description": "Ghost Bridge: Zero-restart Chrome debugger bridge for Claude MCP. Includes CLI for easy setup.",