echoclaw-relay-agent 0.3.3 → 0.4.1

package/dist/main.js

@@ -2837,10 +2837,13 @@ var GatewayConnection = class extends import_events.EventEmitter {
 var import_events2 = require("events");
 var MAX_FRAMES_PER_STREAM = 256;
 var MAX_BYTES_PER_STREAM = 1 * 1024 * 1024;
+var STREAMING_METHODS = /* @__PURE__ */ new Set(["chat.send"]);
 var GatewayRpcProxy = class extends import_events2.EventEmitter {
   gateway;
   streams = /* @__PURE__ */ new Map();
   // rpcId → stream
+  runIdToRpc = /* @__PURE__ */ new Map();
+  // runId → rpcId (for event routing)
   requestToRpc = /* @__PURE__ */ new Map();
   // requestId → rpcId
   constructor(gateway) {
@@ -2870,13 +2873,15 @@ var GatewayRpcProxy = class extends import_events2.EventEmitter {
       return false;
     }
     if (frame.type === "req") {
+      const isStreaming = STREAMING_METHODS.has(frame.method ?? "");
       const stream = {
         requestId: payload.request_id,
         rpcId: frame.id,
         generation: this.gateway.currentGeneration,
         frameCount: 0,
         byteCount: 0,
-        createdAt: Date.now()
+        createdAt: Date.now(),
+        streaming: isStreaming
       };
       this.streams.set(frame.id, stream);
       this.requestToRpc.set(payload.request_id, frame.id);
@@ -2924,6 +2929,7 @@ var GatewayRpcProxy = class extends import_events2.EventEmitter {
       }, true);
     }
     this.streams.clear();
+    this.runIdToRpc.clear();
     this.requestToRpc.clear();
   }
   // ── Internal: Gateway frame handling ───────────────────────
@@ -2942,33 +2948,48 @@ var GatewayRpcProxy = class extends import_events2.EventEmitter {
       this.removeStream(frame.id, "stale");
       return;
     }
-    this.emitTunnelResponse(stream.requestId, frame, true);
-    this.removeStream(frame.id, "complete");
+    if (stream.streaming && frame.ok) {
+      const runId = frame.payload?.runId;
+      if (runId) {
+        stream.runId = runId;
+        this.runIdToRpc.set(runId, frame.id);
+        console.log(`[rpc-proxy] Streaming ACK for ${frame.id} \u2192 runId=${runId}, keeping stream open`);
+      }
+      this.emitTunnelResponse(stream.requestId, frame, false);
+    } else {
+      this.emitTunnelResponse(stream.requestId, frame, true);
+      this.removeStream(frame.id, "complete");
+    }
   }
   handleEvent(frame, generation) {
+    const runId = frame.payload?.runId;
+    const state = frame.payload?.state;
     const streamId = frame.payload?.streamId || frame.payload?.id;
-    const stream = streamId ? this.streams.get(streamId) : null;
+    console.log(`[rpc-proxy] Event received: event=${frame.event}, state=${state}, runId=${runId?.slice(0, 8) ?? "none"}, streams=${this.streams.size}, runIdMap=${this.runIdToRpc.size}`);
+    let rpcId = runId ? this.runIdToRpc.get(runId) : void 0;
+    if (!rpcId && streamId) rpcId = streamId;
+    const stream = rpcId ? this.streams.get(rpcId) : null;
     if (!stream) {
+      console.log(`[rpc-proxy] No matching stream for runId=${runId?.slice(0, 8) ?? "none"}, forwarding as unmatched event`);
       this.emit("gateway_event", frame);
       return;
     }
     if (stream.generation !== generation) {
-      console.warn(`[rpc-proxy] Dropping stale event for ${streamId}`);
+      console.warn(`[rpc-proxy] Dropping stale event for ${rpcId}`);
       return;
     }
     const frameSize = JSON.stringify(frame).length;
     stream.frameCount++;
     stream.byteCount += frameSize;
     if (stream.frameCount > MAX_FRAMES_PER_STREAM || stream.byteCount > MAX_BYTES_PER_STREAM) {
-      console.warn(`[rpc-proxy] Stream ${streamId} exceeded limits (frames=${stream.frameCount}, bytes=${stream.byteCount})`);
+      console.warn(`[rpc-proxy] Stream ${rpcId} exceeded limits (frames=${stream.frameCount}, bytes=${stream.byteCount})`);
       this.cancelStream(stream.requestId);
       return;
     }
-    const state = frame.payload?.state;
     const isFinal = state === "final" || state === "aborted" || state === "error";
     this.emitTunnelResponse(stream.requestId, frame, isFinal);
     if (isFinal) {
-      this.removeStream(streamId, state);
+      this.removeStream(rpcId, state);
     }
   }
   // ── Internal: emit tunnel response ─────────────────────────
@@ -2988,6 +3009,9 @@ var GatewayRpcProxy = class extends import_events2.EventEmitter {
     if (!stream) return;
     this.streams.delete(rpcId);
     this.requestToRpc.delete(stream.requestId);
+    if (stream.runId) {
+      this.runIdToRpc.delete(stream.runId);
+    }
   }
 };
 
@@ -3049,6 +3073,16 @@ function startGateway(gwConfig) {
   rpcProxy.on("response", (response) => {
     sendEncryptedPayload(response);
   });
+  rpcProxy.on("gateway_event", (frame) => {
+    console.log(`[relay-agent] Forwarding unmatched gateway event: ${frame.event ?? frame.type}`);
+    sendEncryptedPayload({
+      request_id: `evt-${Date.now().toString(36)}`,
+      direction: "response",
+      type: "ws-rpc",
+      frame,
+      final: false
+    });
+  });
   gatewayConn.on("state", (newState, oldState) => {
     console.log(`[relay-agent] Gateway: ${oldState} \u2192 ${newState}`);
     broadcastControlState();
@@ -3866,7 +3900,7 @@ async function discoverGatewayToken() {
 }
 
 // src/main.ts
-var VERSION = "0.3.3";
+var VERSION = "0.4.1";
 function parseArgs() {
   const args = process.argv.slice(2);
   const opts = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echoclaw-relay-agent",
-  "version": "0.3.3",
+  "version": "0.4.1",
   "description": "EchoClaw Relay Agent — connects OpenClaw bridge to the EchoClaw Relay Server with E2E encryption",
   "main": "./dist/main.js",
   "bin": {