@eyeclaw/eyeclaw 2.2.5 → 2.3.1

package/index.ts

@@ -25,41 +25,68 @@ const eyeclawPlugin = {
     // 解析配置
     const rawConfig = api.config?.plugins?.entries?.eyeclaw?.config
     const config: EyeClawConfig = {
-      sdkToken: rawConfig?.sdkToken || '',
+      sdkToken: rawConfig?.sdkToken as string || '',
       botId: rawConfig?.botId ? String(rawConfig.botId) : '',
-      serverUrl: rawConfig?.serverUrl || '',
+      serverUrl: rawConfig?.serverUrl as string || '',
     }
     
-    // HTTP 处理器（SSE 流式）
-    api.registerHttpHandler(createHttpHandler(api, () => config))
-    logger.info('[EyeClaw] HTTP handler registered: /eyeclaw/*')
+    // 获取 Gateway 端口
+    const gatewayPort = api.config?.gateway?.port ?? 18789
     
-    // WebSocket 客户端（连接 Rails 接收消息）
-    if (config.sdkToken && config.botId && config.serverUrl) {
-      // 延迟启动 WebSocket，避免在插件加载/更新时阻塞
-      setTimeout(() => {
-        const wsClient = new EyeClawWebSocketClient(api, config)
-        wsClient.start()
-        logger.info('[EyeClaw] WebSocket client starting...')
-        
-        // 存储客户端引用，防止被垃圾回收
-        ;(global as any).__eyeclaw_ws = wsClient
-      }, 2000) // 延迟 2 秒启动
-    } else {
-      logger.warn('[EyeClaw] WebSocket not started: missing config (sdkToken, botId, serverUrl)')
+    // 配置获取函数
+    const getConfig = () => config
+    const getState = () => ({
+      config,
+      gatewayPort,
+    })
+    
+    // 1. 注册 HTTP 处理器（SSE 流式）
+    if (typeof api.registerHttpHandler === 'function') {
+      api.registerHttpHandler(createHttpHandler(api, getConfig))
+      logger.info('[EyeClaw] HTTP handler registered: /eyeclaw/*')
     }
     
-    // 打印启动信息
-    const gatewayPort = api.config?.gateway?.port ?? 18789
-    console.log('')
-    console.log('╔═══════════════════════════════════════════════════════════════════════╗')
-    console.log('║ EyeClaw Plugin 已启动                                                ║')
-    console.log('╠═══════════════════════════════════════════════════════════════════════╣')
-    console.log(`║ HTTP 端点: POST http://127.0.0.1:${gatewayPort}/eyeclaw/chat         ║`)
-    console.log(`║ WebSocket: ${config.serverUrl ? '已配置' : '未配置'}                                            ║`)
-    console.log(`║ SDK Token: ${config.sdkToken ? config.sdkToken.substring(0, 8) + '...' : '未配置'}                                          ║`)
-    console.log('╚═══════════════════════════════════════════════════════════════════════╝')
-    console.log('')
+    // 2. 注册 WebSocket 服务
+    if (typeof api.registerService === 'function') {
+      api.registerService({
+        id: 'eyeclaw-websocket',
+        start: () => {
+          if (!config.sdkToken || !config.botId || !config.serverUrl) {
+            logger.warn('[EyeClaw] WebSocket not started: missing config (sdkToken, botId, serverUrl)')
+            return
+          }
+          
+          const wsClient = new EyeClawWebSocketClient(api, config, getState)
+          wsClient.start()
+          
+          // 存储客户端引用，防止被垃圾回收
+          ;(global as any).__eyeclaw_ws = wsClient
+          
+          // 打印启动信息
+          console.log('')
+          console.log('╔═══════════════════════════════════════════════════════════════════════╗')
+          console.log('║ EyeClaw Plugin 已启动                                                ║')
+          console.log('╠═══════════════════════════════════════════════════════════════════════╣')
+          console.log(`║ HTTP 端点: POST http://127.0.0.1:${gatewayPort}/eyeclaw/chat         ║`)
+          console.log(`║ WebSocket: ${config.serverUrl ? '已配置' : '未配置'}                                            ║`)
+          console.log(`║ SDK Token: ${config.sdkToken ? config.sdkToken.substring(0, 8) + '...' : '未配置'}                                          ║`)
+          console.log('╚═══════════════════════════════════════════════════════════════════════╝')
+          console.log('')
+          
+          logger.info('[EyeClaw] WebSocket service started')
+        },
+        stop: () => {
+          const wsClient = (global as any).__eyeclaw_ws
+          if (wsClient) {
+            wsClient.stop()
+            delete (global as any).__eyeclaw_ws
+          }
+          logger.info('[EyeClaw] WebSocket service stopped')
+        },
+      })
+    } else {
+      logger.warn('[EyeClaw] registerService API not available, WebSocket will not start')
+    }
   },
 }
 

package/package.json

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

package/src/websocket-client.ts

@@ -20,15 +20,17 @@ export class EyeClawWebSocketClient {
   private ws: WebSocket | null = null
   private api: OpenClawPluginApi
   private config: EyeClawConfig
+  private getState: () => any
   private reconnectAttempts = 0
   private maxReconnectAttempts = 5
   private reconnectDelay = 3000
   private subscribed = false
   private pingInterval: any = null
 
-  constructor(api: OpenClawPluginApi, config: EyeClawConfig) {
+  constructor(api: OpenClawPluginApi, config: EyeClawConfig, getState: () => any) {
     this.api = api
     this.config = config
+    this.getState = getState
   }
 
   /**
@@ -174,38 +176,38 @@ export class EyeClawWebSocketClient {
 
   /**
    * 使用 OpenClaw API 处理消息（流式）
+   * 调用自己的 HTTP 端点 /eyeclaw/chat
    */
   private async processWithOpenClaw(message: string, sessionId?: string) {
-    const gatewayPort = this.api.config?.gateway?.port ?? 18789
-    const gatewayToken = this.api.config?.gateway?.auth?.token
-
-    const openclawUrl = `http://127.0.0.1:${gatewayPort}/v1/chat/completions`
-    const openclawBody = {
-      model: 'openclaw:main',
-      stream: true,
-      messages: [{ role: 'user', content: message }],
-      user: sessionId ? `eyeclaw:${sessionId}` : 'eyeclaw:ws',
+    const state = this.getState()
+    const gatewayPort = state.gatewayPort
+    const eyeclawUrl = `http://127.0.0.1:${gatewayPort}/eyeclaw/chat`
+    
+    const requestBody = {
+      message,
+      session_id: sessionId,
     }
 
-    const headers: Record<string, string> = { 'Content-Type': 'application/json' }
-    if (gatewayToken) headers['Authorization'] = `Bearer ${gatewayToken}`
+    const headers: Record<string, string> = {
+      'Content-Type': 'application/json',
+      'Authorization': `Bearer ${this.config.sdkToken}`,
+    }
 
-    this.api.logger.info(`[EyeClaw] Calling OpenClaw API: ${openclawUrl}`)
-    this.api.logger.info(`[EyeClaw] Gateway port: ${gatewayPort}, Has token: ${!!gatewayToken}`)
+    this.api.logger.info(`[EyeClaw] Calling own HTTP endpoint: ${eyeclawUrl}`)
 
     try {
-      const response = await fetch(openclawUrl, {
+      const response = await fetch(eyeclawUrl, {
         method: 'POST',
         headers,
-        body: JSON.stringify(openclawBody),
+        body: JSON.stringify(requestBody),
       })
 
-      this.api.logger.info(`[EyeClaw] OpenClaw response status: ${response.status}`)
+      this.api.logger.info(`[EyeClaw] HTTP response status: ${response.status}`)
 
       if (!response.ok) {
         const errorText = await response.text()
-        this.api.logger.error(`[EyeClaw] OpenClaw API error details: status=${response.status}, body=${errorText}`)
-        throw new Error(`OpenClaw API error: ${response.status} - ${errorText}`)
+        this.api.logger.error(`[EyeClaw] HTTP error: status=${response.status}, body=${errorText}`)
+        throw new Error(`HTTP error: ${response.status} - ${errorText}`)
       }
 
       const reader = response.body?.getReader()
@@ -213,8 +215,9 @@ export class EyeClawWebSocketClient {
 
       const decoder = new TextDecoder()
       let buffer = ''
+      let currentEvent = ''
 
-      // 发送流式响应回 Rails
+      // 解析 SSE 流式响应
       while (true) {
         const { done, value } = await reader.read()
         if (done) break
@@ -225,22 +228,51 @@ export class EyeClawWebSocketClient {
 
         for (const line of lines) {
           const trimmed = line.trim()
-          if (!trimmed.startsWith('data: ')) continue
-          const data = trimmed.slice(6)
-          if (data === '[DONE]') continue
-
-          try {
-            const chunk = JSON.parse(data)
-            const content = chunk.choices?.[0]?.delta?.content
-            if (content) {
-              this.sendChunk(content, sessionId)
+          
+          // 跳过空行和注释
+          if (!trimmed || trimmed.startsWith(':')) {
+            // 空行表示事件结束，重置 currentEvent
+            if (!trimmed) {
+              currentEvent = ''
+            }
+            continue
+          }
+          
+          // 解析 SSE 事件类型
+          if (trimmed.startsWith('event: ')) {
+            currentEvent = trimmed.slice(7).trim()
+            continue
+          }
+          
+          // 解析 SSE 数据
+          if (trimmed.startsWith('data: ')) {
+            const data = trimmed.slice(6)
+            
+            try {
+              const eventData = JSON.parse(data)
+              
+              // stream_chunk 事件：发送内容
+              if (currentEvent === 'stream_chunk' && eventData.content) {
+                this.sendChunk(eventData.content, sessionId)
+              }
+              
+              // stream_end 事件：流结束（由 HTTP handler 发送）
+              if (currentEvent === 'stream_end') {
+                this.api.logger.info(`[EyeClaw] Stream ended: ${eventData.stream_id}`)
+              }
+              
+              // stream_error 事件：错误
+              if (currentEvent === 'stream_error') {
+                this.api.logger.error(`[EyeClaw] Stream error: ${eventData.error}`)
+              }
+            } catch (e) {
+              this.api.logger.warn(`[EyeClaw] Failed to parse SSE data: ${data}`)
             }
-          } catch { /* ignore */ }
+          }
         }
       }
 
-      // 发送完成信号
-      this.sendMessage('stream_end', { session_id: sessionId })
+      this.api.logger.info(`[EyeClaw] Stream processing completed for session: ${sessionId}`)
 
     } catch (error) {
       const errorMsg = error instanceof Error ? error.message : String(error)