openclaw-navigator 5.4.0 → 5.4.2

package/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * openclaw-navigator v5.4.0
+ * openclaw-navigator v5.4.2
  *
  * One-command bridge + tunnel for the Navigator browser.
  * Starts a local bridge, creates a Cloudflare tunnel automatically,
@@ -981,9 +981,11 @@ function handleRequest(req, res) {
   }
 
   // ── Reverse proxy: /ui/* → OC Web UI (localhost:ocUIPort) ──────────────
-  // Keep /ui prefix — Next.js basePath: "/ui" expects it
+  // Strip /ui prefix — the Next.js app serves at root on port 4000.
+  // /ui/ → /, /ui/dashboard → /dashboard, /ui/_next/* → /_next/*
   if (path === "/ui" || path.startsWith("/ui/")) {
-    const targetURL = `${path}${url.search}`;
+    const strippedPath = path === "/ui" ? "/" : path.slice(3); // remove "/ui"
+    const targetURL = `${strippedPath}${url.search}`;
     const incomingHost = req.headers.host || "localhost";
 
     const proxyOpts = {
@@ -1009,11 +1011,20 @@ function handleRequest(req, res) {
       headers["access-control-allow-headers"] = "Content-Type, Authorization, Cookie";
       headers["access-control-allow-credentials"] = "true";
 
-      // Fix redirects — rewrite Location from localhost:4000 to tunnel URL
+      // Fix redirects — rewrite Location: strip localhost, add /ui prefix back
+      // Since we stripped /ui before proxying, any redirect from the app
+      // (e.g. /login, /dashboard) needs the /ui prefix added back for the
+      // browser to stay within our /ui/* proxy.
       if (headers.location) {
-        headers.location = headers.location
+        let loc = headers.location
           .replace(`http://127.0.0.1:${ocUIPort}`, "")
           .replace(`http://localhost:${ocUIPort}`, "");
+        // If the redirect is a relative path (starts with /), add /ui prefix
+        // BUT don't double-prefix if it already starts with /ui
+        if (loc.startsWith("/") && !loc.startsWith("/ui")) {
+          loc = "/ui" + loc;
+        }
+        headers.location = loc;
       }
 
       // Fix cookies — remove domain restriction so they work through tunnel
@@ -1105,12 +1116,13 @@ function handleRequest(req, res) {
     return;
   }
 
-  // ── Reverse proxy: /api/sessions/* → OC Gateway (localhost:ocGatewayPort) ──
-  // Proxies /api/sessions/send and /api/sessions/history to the OC gateway.
-  // /api/sessions/respond and /api/sessions/stream are handled locally above.
-  // Other /api/* paths (e.g. /api/auth/* from NextAuth) fall through to the
-  // web UI fallback so login and other web UI API routes work correctly.
-  if (path.startsWith("/api/sessions/") || path === "/api/sessions") {
+  // ── Reverse proxy: /api/* → OC Gateway (localhost:ocGatewayPort) ──────────
+  // ALL /api/* requests go to the OC gateway EXCEPT:
+  //   - /api/auth/* → falls through to web UI (NextAuth login/session)
+  //   - /api/sessions/respond + /api/sessions/stream → handled locally above
+  // The OC web UI frontend expects /api/agents, /api/sessions/*, /api/chat/*,
+  // etc. to reach the gateway. Only /api/auth/* is a Next.js API route.
+  if (path.startsWith("/api/") && !path.startsWith("/api/auth/") && path !== "/api/auth") {
     const targetURL = `${path}${url.search}`;
 
     const proxyOpts = {
@@ -1153,7 +1165,7 @@ function handleRequest(req, res) {
   if (req.method === "GET" && path === "") {
     // Quick probe to check if OC UI is running
     const probe = httpRequest(
-      { hostname: "127.0.0.1", port: ocUIPort, path: "/ui/", method: "HEAD", timeout: 1000 },
+      { hostname: "127.0.0.1", port: ocUIPort, path: "/", method: "HEAD", timeout: 1000 },
       (probeRes) => {
         probeRes.resume(); // drain
         // OC UI is running — redirect to /ui/
@@ -1233,16 +1245,6 @@ function handleRequest(req, res) {
         );
       }
 
-      // If the web UI returns 404 for a GET request, redirect to /ui/ instead
-      // of showing a broken page. This catches post-login redirects to paths
-      // the Next.js app doesn't serve (e.g. / instead of /ui/).
-      if (proxyRes.statusCode === 404 && req.method === "GET") {
-        proxyRes.resume(); // drain the 404 body
-        res.writeHead(302, { ...headers, Location: "/ui/" });
-        res.end();
-        return;
-      }
-
       res.writeHead(proxyRes.statusCode ?? 502, headers);
       proxyRes.pipe(res, { end: true });
     });

package/package.json

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