openclaw-navigator 5.5.1 → 5.5.3

package/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * openclaw-navigator v5.5.1
+ * openclaw-navigator v5.5.3
  *
  * One-command bridge + tunnel for the Navigator browser.
  * Starts a local bridge, creates a Cloudflare tunnel automatically,
@@ -1330,25 +1330,37 @@ function handleRequest(req, res) {
   }
 
   // ── Fallback: proxy unmatched paths → OC Web UI ──────────────────────
-  // Catches /login, /_next/*, /static/*, /favicon.ico, etc.
+  // Catches /api/*, /login, /_next/*, /static/*, /favicon.ico, etc.
   // MUST apply the same cookie/redirect/forwarded-header treatment as /ui/*
   // or login won't work (session cookies get lost through the tunnel).
+  //
+  // SSE safety: If the web UI returns text/event-stream but the browser
+  // expects JSON (e.g. /api/agents), we collect the SSE events and return
+  // them as a JSON array. This prevents "data: ... is not valid JSON" errors.
   {
     const targetURL = `${path}${url.search}`;
     const incomingHost = req.headers.host || "localhost";
 
+    // Encourage JSON responses from the web UI's API routes
+    const proxyHeaders = {
+      ...req.headers,
+      host: `127.0.0.1:${ocUIPort}`,
+      "x-forwarded-host": incomingHost,
+      "x-forwarded-proto": activeTunnelURL ? "https" : "http",
+      "x-forwarded-for": req.socket.remoteAddress || "127.0.0.1",
+    };
+
+    // For /api/* requests, prefer JSON over SSE
+    if (path.startsWith("/api/")) {
+      proxyHeaders["accept"] = "application/json, text/plain, */*";
+    }
+
     const proxyOpts = {
       hostname: "127.0.0.1",
       port: ocUIPort,
       path: targetURL,
       method: req.method,
-      headers: {
-        ...req.headers,
-        host: `127.0.0.1:${ocUIPort}`,
-        "x-forwarded-host": incomingHost,
-        "x-forwarded-proto": activeTunnelURL ? "https" : "http",
-        "x-forwarded-for": req.socket.remoteAddress || "127.0.0.1",
-      },
+      headers: proxyHeaders,
     };
 
     const proxyReq = httpRequest(proxyOpts, (proxyRes) => {
@@ -1377,6 +1389,140 @@ function handleRequest(req, res) {
         );
       }
 
+      // ── SSE→JSON conversion for non-streaming /api/* endpoints ──────
+      // Some API endpoints (e.g. /api/agents) return SSE when the frontend
+      // expects JSON. We convert those to JSON. But STREAMING endpoints
+      // like /api/chat must pass through as SSE so the frontend can read
+      // the real-time token stream via EventSource/fetch streaming.
+      const contentType = (proxyRes.headers["content-type"] || "").toLowerCase();
+      const isSSE = contentType.includes("text/event-stream");
+      const isStreamingEndpoint = path.startsWith("/api/chat") || path.startsWith("/api/stream");
+
+      if (isSSE && path.startsWith("/api/") && !isStreamingEndpoint) {
+        console.log(`  ${DIM}SSE→JSON: converting ${path}${RESET}`);
+        let buffer = "";
+        const items = [];
+
+        proxyRes.setEncoding("utf-8");
+        proxyRes.on("data", (chunk) => {
+          buffer += chunk;
+          const lines = buffer.split("\n");
+          buffer = lines.pop() || "";
+          for (const line of lines) {
+            if (line.startsWith("data: ")) {
+              const raw = line.slice(6).trim();
+              if (raw === "[DONE]" || !raw) {
+                continue;
+              }
+              try {
+                items.push(JSON.parse(raw));
+              } catch {
+                // Non-JSON SSE data — wrap as text
+                if (raw) {
+                  items.push({ text: raw });
+                }
+              }
+            }
+          }
+        });
+
+        proxyRes.on("end", () => {
+          // Process remaining buffer
+          if (buffer.startsWith("data: ")) {
+            const raw = buffer.slice(6).trim();
+            if (raw && raw !== "[DONE]") {
+              try {
+                items.push(JSON.parse(raw));
+              } catch {
+                if (raw) {
+                  items.push({ text: raw });
+                }
+              }
+            }
+          }
+
+          // Return as JSON — single object if 1 item, array if multiple
+          const result = items.length === 1 ? items[0] : items;
+          headers["content-type"] = "application/json";
+          delete headers["content-length"];
+          delete headers["transfer-encoding"];
+          res.writeHead(proxyRes.statusCode ?? 200, headers);
+          res.end(JSON.stringify(result));
+        });
+
+        proxyRes.on("error", () => {
+          sendJSON(res, 502, { ok: false, error: "SSE stream error" });
+        });
+        return;
+      }
+
+      // ── SSE passthrough for streaming endpoints (/api/chat) ──────────
+      // Let the SSE stream through to the browser AND tap it to broadcast
+      // chunks via our WebSocket (so Navigator's sidepane chat gets them).
+      if (isSSE && isStreamingEndpoint) {
+        console.log(`  ${DIM}SSE passthrough + WS tap: ${path}${RESET}`);
+        res.writeHead(proxyRes.statusCode ?? 200, headers);
+
+        let fullText = "";
+        proxyRes.on("data", (chunk) => {
+          // Forward the chunk to the browser immediately
+          res.write(chunk);
+
+          // Also parse and broadcast to WebSocket
+          const text = chunk.toString("utf-8");
+          for (const line of text.split("\n")) {
+            if (line.startsWith("data: ")) {
+              const raw = line.slice(6).trim();
+              if (raw === "[DONE]" || !raw) {
+                continue;
+              }
+              try {
+                const evt = JSON.parse(raw);
+                const delta =
+                  evt.choices?.[0]?.delta?.content ||
+                  evt.delta?.text ||
+                  evt.text ||
+                  evt.content ||
+                  "";
+                if (delta) {
+                  fullText += delta;
+                  broadcastToWS({
+                    type: "chat.delta",
+                    text: fullText,
+                    delta,
+                    sessionKey: "main",
+                    timestamp: Date.now(),
+                  });
+                }
+              } catch {
+                /* non-JSON SSE event — skip */
+              }
+            }
+          }
+        });
+
+        proxyRes.on("end", () => {
+          // Stream ended — broadcast final message via WebSocket
+          if (fullText) {
+            broadcastToWS({
+              type: "chat.final",
+              text: fullText,
+              content: fullText,
+              sessionKey: "main",
+              role: "assistant",
+              timestamp: Date.now(),
+            });
+          }
+          res.end();
+        });
+
+        proxyRes.on("error", () => {
+          res.end();
+        });
+        return;
+      }
+
+      // Non-SSE responses — stream through as-is
       res.writeHead(proxyRes.statusCode ?? 502, headers);
       proxyRes.pipe(res, { end: true });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-navigator",
-  "version": "5.5.1",
+  "version": "5.5.3",
   "description": "One-command bridge + tunnel for the Navigator browser — works on any machine, any OS",
   "keywords": [
     "browser",