@eyeclaw/eyeclaw 2.4.3 → 2.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eyeclaw/eyeclaw",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "description": "EyeClaw plugin for OpenClaw - HTTP SSE streaming + WebSocket client",
   "type": "module",
   "main": "./index.ts",

package/src/websocket-client.ts

@@ -123,12 +123,19 @@ export class EyeClawWebSocketClient {
         this.stopPing()
         this.lastCloseCode = closeCode
         
+        // 保存之前的连接状态用于检测部署
+        const previouslyConnected = this.wasConnected
+        const lastConnected = this.lastConnectedAt
+        
+        // 标记为未连接状态，防止死循环
+        this.wasConnected = false
+        
         // 统计连续失败
         this.consecutiveFailures++
         
         // 检测是否是部署导致的断连（之前已成功连接过，且断开时间 > 5 秒）
         // 或者关闭码为 1000/1001（正常关闭）但之前已连接
-        if (this.wasConnected && Date.now() - this.lastConnectedAt > 5000) {
+        if (previouslyConnected && Date.now() - lastConnected > 5000) {
           // 正常关闭或部署重启
           if (wasClean) {
             this.deploymentDetected = true
@@ -138,7 +145,7 @@ export class EyeClawWebSocketClient {
             this.deploymentDetected = true
             this.api.logger.info('[EyeClaw] 🔄 Server restart detected (unclean close), will reconnect immediately')
           }
-        } else if (!this.wasConnected && !wasClean) {
+        } else if (!previouslyConnected && !wasClean) {
           // 首次连接失败，增加重试延迟
           this.api.logger.warn('[EyeClaw] Initial connection failed, increasing delay...')
         }
@@ -182,14 +189,20 @@ export class EyeClawWebSocketClient {
    * 检测网络状态并在需要时触发重连
    */
   private async checkNetworkAndReconnectIfNeeded() {
-    // 如果已经在重连中或者 WebSocket 已经连接，跳过
-    if (this.reconnecting || (this.ws && this.ws.readyState === WebSocket.OPEN)) {
+    // 如果 WebSocket 已经连接，跳过（不需要重连）
+    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+      return
+    }
+    
+    // 如果正在重连中，跳过
+    if (this.reconnecting) {
       return
     }
     
     try {
       // 尝试一个简单的 HTTP 请求来检测网络是否可用
-      const serverUrl = this.config.serverUrl.replace(/^ws/, 'http').replace(/^wss/, 'https')
+      // 直接使用配置的 serverUrl，不需要转换
+      const serverUrl = this.config.serverUrl
       const controller = new AbortController()
       const timeoutId = setTimeout(() => controller.abort(), 3000)
       
@@ -205,7 +218,7 @@ export class EyeClawWebSocketClient {
       
       if (!wasOnline && this.networkOnline) {
         // 网络从离线变为在线，触发重连
-        this.api.logger.info('[EyeClaw] 🌐 Network restored, triggering immediate reconnect')
+        this.api.logger.info('[EyeClaw] 🌐 Network restored, triggering reconnect')
         this.deploymentDetected = true // 使用快速重连模式
         this.scheduleReconnect()
       } else if (this.networkOnline && !this.wasConnected) {
@@ -785,14 +798,22 @@ export class EyeClawWebSocketClient {
     }
 
     // 🚀 部署恢复场景或网络恢复：立即重连（无延迟）
+    // 但需要限制次数，防止无限立即重连失败导致死循环
     if (this.deploymentDetected) {
-      this.api.logger.info('[EyeClaw] ⚡ Deployment recovery or network restored: immediate reconnect')
-      this.reconnectTimer = setTimeout(() => {
-        this.reconnecting = false
-        this.start()
-      }, 100) // 100ms 延迟（给服务器一点启动时间）
-      this.deploymentDetected = false // 重置标志
-      return
+      // 如果连续 3 次立即重连都失败，说明可能是网络问题，不再使用立即重连
+      if (this.consecutiveFailures > 3) {
+        this.api.logger.warn('[EyeClaw] ⚠️ Too many immediate reconnects failed, switching to backoff mode')
+        this.deploymentDetected = false
+        // 继续使用正常重连逻辑
+      } else {
+        this.api.logger.info('[EyeClaw] ⚡ Deployment recovery or network restored: immediate reconnect')
+        this.reconnectTimer = setTimeout(() => {
+          this.reconnecting = false
+          this.start()
+        }, 100) // 100ms 延迟（给服务器一点启动时间）
+        this.deploymentDetected = false // 重置标志
+        return
+      }
     }
 
     // 检测是否是网络断开导致的失败（code 0）
@@ -824,9 +845,16 @@ export class EyeClawWebSocketClient {
    * 健康检查后重连
    */
   private async performHealthCheckAndReconnect() {
+    // 如果 WebSocket 已经连接，不需要重连
+    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+      this.api.logger?.debug?.('[EyeClaw] ✅ WebSocket already connected, skipping reconnect')
+      return
+    }
+    
     try {
       // 尝试 HTTP 健康检查
-      const serverUrl = this.config.serverUrl.replace(/^http/, 'http') // 使用 http 而非 ws
+      // 直接使用配置的 serverUrl，不需要转换
+      const serverUrl = this.config.serverUrl
       const healthUrl = `${serverUrl}/api/v1/health`
       
       const controller = new AbortController()
@@ -840,7 +868,7 @@ export class EyeClawWebSocketClient {
       clearTimeout(timeoutId)
       
       if (response.ok) {
-        this.api.logger.info('[EyeClaw] ✅ Health check passed, proceeding with reconnect')
+        this.api.logger.info('[EyeClaw] ✅ Health check passed, connecting...')
         this.start()
       } else {
         this.api.logger.warn(`[EyeClaw] ⚠️ Health check failed (${response.status}), retrying soon...`)
@@ -851,9 +879,12 @@ export class EyeClawWebSocketClient {
         }, 2000)
       }
     } catch (error) {
-      this.api.logger.warn(`[EyeClaw] ⚠️ Health check error: ${error}, proceeding with reconnect anyway`)
-      // 即使健康检查失败也尝试重连
-      this.start()
+      this.api.logger.warn(`[EyeClaw] ⚠️ Health check error: ${error}, retrying soon...`)
+      // 健康检查失败，稍后重试
+      this.reconnectTimer = setTimeout(() => {
+        this.reconnecting = false
+        this.scheduleReconnect()
+      }, 2000)
     }
   }