@omnixal/openclaw-nats-plugin 0.1.14 → 0.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnixal/openclaw-nats-plugin",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "NATS JetStream event-driven plugin for OpenClaw",
   "license": "MIT",
   "type": "module",

package/sidecar/src/gateway/gateway-client.service.ts

@@ -15,6 +15,7 @@ export interface GatewayInjectPayload {
 export class GatewayClientService extends BaseService implements OnModuleInit, OnModuleDestroy {
   private ws: WebSocket | null = null;
   private connected = false;
+  private connectSent = false;
   private reconnectAttempt = 0;
   private reconnectTimer: Timer | null = null;
   private requestId = 0;
@@ -31,21 +32,21 @@ export class GatewayClientService extends BaseService implements OnModuleInit, O
 
   private connect(): void {
     try {
-      const url = this.token ? `${this.wsUrl}?token=${this.token}` : this.wsUrl;
-      this.ws = new WebSocket(url);
+      this.connectSent = false;
+      this.ws = new WebSocket(this.wsUrl);
 
       this.ws.onopen = () => {
-        this.logger.info('Gateway WebSocket connected');
         this.reconnectAttempt = 0;
-        this.sendConnect();
+        this.logger.info('Gateway WebSocket opened, waiting for challenge');
       };
 
       this.ws.onmessage = (event) => {
-        this.handleMessage(event);
+        this.handleMessage(String(event.data));
       };
 
       this.ws.onclose = () => {
         this.connected = false;
+        this.connectSent = false;
         this.scheduleReconnect();
       };
 
@@ -53,29 +54,79 @@ export class GatewayClientService extends BaseService implements OnModuleInit, O
         this.logger.warn('Gateway WebSocket error');
         this.connected = false;
       };
-    } catch {
-      this.logger.warn('Failed to connect to Gateway WebSocket');
+    } catch (err) {
+      this.logger.warn('Failed to connect to Gateway WebSocket', err);
       this.scheduleReconnect();
     }
   }
 
-  private handleMessage(event: { data: unknown }): void {
+  private handleMessage(data: string): void {
+    let frame: any;
     try {
-      const frame = JSON.parse(String(event.data));
-      if (frame.type === 'res' && frame.ok) {
+      frame = JSON.parse(data);
+    } catch {
+      this.logger.warn(`Failed to parse WebSocket message: ${data.slice(0, 200)}`);
+      return;
+    }
+
+    // Server challenge — respond with connect frame
+    if (frame.type === 'event' && frame.event === 'connect.challenge') {
+      this.logger.debug('Received connect.challenge from server');
+      this.sendConnectFrame();
+      return;
+    }
+
+    // Some gateway versions send an event before challenge; treat any pre-connect event as trigger
+    if (!this.connectSent && frame.type === 'event') {
+      this.logger.debug('Received event before connect sent, sending connect frame');
+      this.sendConnectFrame();
+      return;
+    }
+
+    // Successful connect response (hello-ok)
+    if (frame.type === 'res' && frame.ok === true) {
+      if (frame.payload?.type === 'hello-ok') {
         this.connected = true;
+        this.logger.info('OpenClaw handshake complete — connected');
+        return;
       }
-    } catch {
-      // ignore parse errors
+      // Regular RPC response — ignore for now
+      return;
+    }
+
+    // Error response
+    if (frame.type === 'res' && frame.ok === false) {
+      this.logger.warn('Gateway RPC error', { id: frame.id, error: frame.error });
     }
   }
 
-  private sendConnect(): void {
+  private sendConnectFrame(): void {
+    if (!this.ws || this.ws.readyState !== WebSocket.OPEN || this.connectSent) return;
+    this.connectSent = true;
+    this.logger.info('Sending connect frame');
+
     this.send({
       type: 'req',
-      id: ++this.requestId,
+      id: `connect-${++this.requestId}`,
       method: 'connect',
-      params: {},
+      params: {
+        minProtocol: 3,
+        maxProtocol: 3,
+        client: {
+          id: 'nats-sidecar',
+          version: '1.0.0',
+          platform: 'linux',
+          mode: 'backend',
+        },
+        role: 'operator',
+        scopes: ['operator.read'],
+        caps: [],
+        commands: [],
+        permissions: {},
+        auth: { token: this.token },
+        locale: 'en-US',
+        userAgent: 'nats-sidecar/1.0.0',
+      },
     });
   }
 
@@ -87,7 +138,7 @@ export class GatewayClientService extends BaseService implements OnModuleInit, O
 
   private scheduleReconnect(): void {
     if (this.reconnectTimer) return;
-    const delay = Math.min(1000 * Math.pow(2, this.reconnectAttempt), 30000);
+    const delay = Math.min(1000 * Math.pow(2, this.reconnectAttempt), 30_000);
     this.reconnectAttempt++;
     this.logger.debug(`Reconnecting to Gateway in ${delay}ms (attempt ${this.reconnectAttempt})`);
     this.reconnectTimer = setTimeout(() => {
@@ -102,7 +153,7 @@ export class GatewayClientService extends BaseService implements OnModuleInit, O
     }
     this.send({
       type: 'req',
-      id: ++this.requestId,
+      id: `rpc-${++this.requestId}`,
       method: 'send',
       params: {
         target: payload.target,
@@ -127,5 +178,6 @@ export class GatewayClientService extends BaseService implements OnModuleInit, O
       this.ws = null;
     }
     this.connected = false;
+    this.connectSent = false;
   }
 }