@eyeclaw/eyeclaw 2.4.5 → 2.4.6

package/package.json

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

package/src/websocket-client.ts

@@ -63,6 +63,23 @@ export class EyeClawWebSocketClient {
       return
     }
 
+    // 如果已经有活跃的 WebSocket，不重复创建
+    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+      this.api.logger?.debug?.('[EyeClaw] WebSocket already connected, skipping')
+      return
+    }
+    
+    // 清理旧的 WebSocket 实例
+    if (this.ws) {
+      this.api.logger?.debug?.('[EyeClaw] Cleaning up old WebSocket instance')
+      try {
+        this.ws.close()
+      } catch (e) {
+        // 忽略关闭错误
+      }
+      this.ws = null
+    }
+
     // 启动网络状态监控
     this.startNetworkMonitoring()
 
@@ -79,6 +96,7 @@ export class EyeClawWebSocketClient {
         this.consecutiveFailures = 0 // 重置连续失败计数
         this.lastConnectedAt = Date.now()
         this.wasConnected = true
+        this.lastCloseCode = 0 // 重置关闭码
         
         // 如果检测到部署重启（之前已连接过），立即触发一次快速心跳
         if (this.deploymentDetected) {
@@ -189,13 +207,13 @@ export class EyeClawWebSocketClient {
    * 检测网络状态并在需要时触发重连
    */
   private async checkNetworkAndReconnectIfNeeded() {
-    // 如果 WebSocket 已经连接，跳过（不需要重连）
-    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+    // 如果正在重连中，跳过（防止重复调度）
+    if (this.reconnecting) {
       return
     }
     
-    // 如果正在重连中，跳过
-    if (this.reconnecting) {
+    // 如果 WebSocket 已经连接，跳过（不需要重连）
+    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
       return
     }
     
@@ -717,6 +735,11 @@ export class EyeClawWebSocketClient {
    * 如果连接异常，自动触发重连
    */
   private checkConnectionHealth() {
+    // 如果已经在重连中，跳过
+    if (this.reconnecting) {
+      return
+    }
+    
     if (!this.ws) {
       this.api.logger?.warn?.('[EyeClaw] ⚠️ No WebSocket instance')
       this.scheduleReconnect()
@@ -780,9 +803,12 @@ export class EyeClawWebSocketClient {
       this.reconnectTimer = null
     }
     
+    // 如果已经在重连中，不要重复调度
     if (this.reconnecting) {
+      this.api.logger?.debug?.('[EyeClaw] Already reconnecting, skipping duplicate schedule')
       return
     }
+    
     this.reconnecting = true
     
     // 如果超过最大重试次数，继续重试