@eyeclaw/eyeclaw 2.0.11 → 2.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eyeclaw/eyeclaw",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "description": "EyeClaw channel plugin for OpenClaw - Connect your local OpenClaw instance to EyeClaw platform",
   "type": "module",
   "main": "./index.ts",

package/src/client.ts

@@ -39,24 +39,37 @@ export class EyeClawClient {
   }
 
   private handleOpen(): void {
-    this.logger.info('WebSocket connected, subscribing to BotChannel...')
+    this.logger.info('WebSocket connected, subscribing to channels...')
     this.connected = true
 
-    // Subscribe to BotChannel (token already passed in connection URL)
-    const subscribeMessage = {
+    // Subscribe to BotChannel (for responses back to EyeClaw platform)
+    const subscribeBotChannel = {
       command: 'subscribe',
       identifier: JSON.stringify({
         channel: 'BotChannel',
       }),
     }
+    this.send(subscribeBotChannel)
 
-    this.send(subscribeMessage)
+    // Subscribe to bot_{id}_commands channel (for commands from Rails)
+    // This is where /sse/rokid broadcasts commands
+    const botId = this.config.botId
+    const subscribeCommands = {
+      command: 'subscribe',
+      identifier: JSON.stringify({
+        channel: `bot_${botId}_commands`,
+      }),
+    }
+    this.logger.info(`Subscribing to bot_${botId}_commands channel...`)
+    this.send(subscribeCommands)
   }
 
   private handleMessage(data: WebSocket.Data): void {
     try {
-      const message = JSON.parse(data.toString())
-      this.logger.debug(`Received message: ${JSON.stringify(message)}`)
+      const rawMessage = data.toString()
+      const message = JSON.parse(rawMessage)
+      this.logger.debug(`Raw message: ${rawMessage.substring(0, 200)}`)
+      this.logger.debug(`Parsed message type: ${message.type}, identifier: ${message.identifier}`)
 
       // ActionCable protocol messages
       if (message.type === 'ping') {
@@ -70,14 +83,20 @@ export class EyeClawClient {
       }
 
       if (message.type === 'confirm_subscription') {
-        this.logger.info('✅ Successfully subscribed to BotChannel')
-        this.startHeartbeat()
+        const identifier = message.identifier ? JSON.parse(message.identifier) : {}
+        this.logger.info(`✅ Subscribed to channel: ${identifier.channel || 'unknown'}`)
+        if (identifier.channel === 'BotChannel') {
+          this.startHeartbeat()
+        }
         return
       }
 
-      // Channel messages
-      if (message.message) {
-        this.handleChannelMessage(message.message)
+      // Channel messages - handle both nested and direct formats
+      // BotChannel: message.message
+      // bot_X_commands: message.message or direct
+      const channelMessage = message.message || message
+      if (channelMessage && typeof channelMessage === 'object') {
+        this.handleChannelMessage(channelMessage)
       }
     } catch (error) {
       this.logger.error(`Failed to parse message: ${error}`)