@eyeclaw/eyeclaw 2.3.3 → 2.3.5

package/package.json

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

package/src/types.ts

@@ -20,3 +20,18 @@ export interface BotStatus {
   total_sessions: number
   uptime: number
 }
+
+export interface WebSocketMessage {
+  type: string
+  command?: string
+  params?: {
+    message?: string
+    [key: string]: any
+  }
+  metadata?: {
+    session_id?: string
+    source?: string
+    [key: string]: any
+  }
+  [key: string]: any
+}

package/src/websocket-client.ts

@@ -103,11 +103,17 @@ export class EyeClawWebSocketClient {
         return
       }
 
-      // Ping/pong
+      // Ping/pong (协议级别的 ping，直接响应 pong)
       if (message.type === 'ping') {
         this.send({ type: 'pong' })
         return
       }
+      
+      // 处理 Rails BotChannel 的 pong 响应
+      if (message.type === 'pong') {
+        this.api.logger.debug('[EyeClaw] Received pong from server')
+        return
+      }
 
       // Subscription confirmation
       if (message.type === 'confirm_subscription') {
@@ -155,23 +161,28 @@ export class EyeClawWebSocketClient {
    * 处理命令消息
    */
   private async handleCommand(payload: WebSocketMessage) {
-    const { type, message: text, session_id, command } = payload
+    const { type, params, metadata, command } = payload
 
     // 只处理 execute_command 类型的消息
     if (type !== 'execute_command' && type !== 'chat') {
       return
     }
-
-    const userMessage = text || command
+    
+    // 从 params.message 或 command 提取用户消息
+    const userMessage = params?.message || command
     if (!userMessage) {
       this.api.logger.warn('[EyeClaw] No message content')
       return
     }
-
+    
+    // 从 metadata 提取 session_id
+    const sessionId = metadata?.session_id
+    
     this.api.logger.info(`[EyeClaw] Processing: ${userMessage.substring(0, 50)}...`)
+    this.api.logger.info(`[EyeClaw] Session ID: ${sessionId}`)
 
     // 通过 OpenClaw API 处理消息，获取流式响应
-    await this.processWithOpenClaw(userMessage, session_id)
+    await this.processWithOpenClaw(userMessage, sessionId)
   }
 
   /**
@@ -320,7 +331,19 @@ export class EyeClawWebSocketClient {
    */
   private startPing() {
     this.pingInterval = setInterval(() => {
-      this.send({ type: 'ping' })
+      // 调用 Rails BotChannel 的 ping action
+      const channelIdentifier = JSON.stringify({
+        channel: 'BotChannel',
+        bot_id: this.config.botId,
+      })
+      
+      this.send({
+        command: 'message',
+        identifier: channelIdentifier,
+        data: JSON.stringify({
+          action: 'ping',
+        }),
+      })
     }, 60000) // 60秒心跳一次
   }