openclaw-navigator 4.3.2 → 4.3.4

package/cli.mjs

@@ -16,7 +16,7 @@
 import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
-import { createServer } from "node:http";
+import { createServer, request as httpRequest } from "node:http";
 import { networkInterfaces, hostname, userInfo } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -55,6 +55,9 @@ const recentEvents = [];
 const MAX_EVENTS = 200;
 const validTokens = new Set();
 
+// OC Web UI reverse proxy target (configurable via --ui-port or env)
+let ocUIPort = parseInt(process.env.OPENCLAW_UI_PORT ?? "4000", 10);
+
 // Pairing code state
 let pairingCode = null;
 let pairingData = null;
@@ -443,8 +446,84 @@ function handleRequest(req, res) {
   }
 
   // ── Health check ──
-  if (req.method === "GET" && (path === "/" || path === "/health")) {
-    sendJSON(res, 200, { ok: true, service: "openclaw-navigator-bridge", version: "4.0.0" });
+  if (req.method === "GET" && path === "/health") {
+    sendJSON(res, 200, { ok: true, service: "openclaw-navigator-bridge", version: "4.3.4" });
+    return;
+  }
+
+  // ── Reverse proxy: /ui/* → OC Web UI (localhost:ocUIPort) ──────────────
+  // Strips /ui prefix so /ui/dashboard → localhost:4000/dashboard
+  if (path === "/ui" || path.startsWith("/ui/")) {
+    const targetPath = path === "/ui" ? "/" : path.slice(3); // strip "/ui"
+    const targetURL = `${targetPath}${url.search}`;
+
+    const proxyOpts = {
+      hostname: "127.0.0.1",
+      port: ocUIPort,
+      path: targetURL,
+      method: req.method,
+      headers: {
+        ...req.headers,
+        host: `127.0.0.1:${ocUIPort}`,
+      },
+    };
+
+    const proxyReq = httpRequest(proxyOpts, (proxyRes) => {
+      // Forward status + headers (add CORS for cross-origin tunnel access)
+      const headers = { ...proxyRes.headers };
+      headers["access-control-allow-origin"] = "*";
+      headers["access-control-allow-methods"] = "GET, POST, PUT, DELETE, OPTIONS";
+      headers["access-control-allow-headers"] = "Content-Type, Authorization";
+      res.writeHead(proxyRes.statusCode ?? 502, headers);
+      proxyRes.pipe(res, { end: true });
+    });
+
+    proxyReq.on("error", (err) => {
+      sendJSON(res, 502, {
+        ok: false,
+        error: `OC Web UI not reachable on port ${ocUIPort}`,
+        detail: err.message,
+        hint: "Make sure the OC gateway is running (openclaw gateway start)",
+      });
+    });
+
+    // Forward request body for POST/PUT
+    req.pipe(proxyReq, { end: true });
+    return;
+  }
+
+  // ── Root → redirect to /ui/ if OC Web UI is available ──
+  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: "/", method: "HEAD", timeout: 1000 },
+      (probeRes) => {
+        probeRes.resume(); // drain
+        // OC UI is running — redirect to it
+        res.writeHead(302, { Location: "/ui/" });
+        res.end();
+      },
+    );
+    probe.on("error", () => {
+      // OC UI not running — show bridge status
+      sendJSON(res, 200, {
+        ok: true,
+        service: "openclaw-navigator-bridge",
+        version: "4.3.4",
+        ui: { available: false, port: ocUIPort, hint: "Start the OC gateway to enable /ui/" },
+        navigator: { connected: bridgeState.connected },
+      });
+    });
+    probe.on("timeout", () => {
+      probe.destroy();
+      sendJSON(res, 200, {
+        ok: true,
+        service: "openclaw-navigator-bridge",
+        version: "4.3.4",
+        ui: { available: false, port: ocUIPort, hint: "OC UI timed out" },
+      });
+    });
+    probe.end();
     return;
   }
 
@@ -523,6 +602,9 @@ async function main() {
     if (args[i] === "--mcp") {
       withMcp = true;
     }
+    if (args[i] === "--ui-port" && args[i + 1]) {
+      ocUIPort = parseInt(args[i + 1], 10);
+    }
     if (args[i] === "--help" || args[i] === "-h") {
       console.log(`
 ${BOLD}openclaw-navigator${RESET} — One-command bridge + tunnel for Navigator
@@ -536,6 +618,7 @@ ${BOLD}Usage:${RESET}
 ${BOLD}Options:${RESET}
   --port <port>    Bridge server port (default: 18790)
   --mcp            Also start the MCP server (stdio) for OpenClaw agent
+  --ui-port <port> OC web UI port to reverse-proxy (default: 4000)
   --no-tunnel      Skip auto-tunnel, use SSH or LAN instead
   --bind <host>    Bind address (default: 127.0.0.1)
   --help           Show this help
@@ -655,6 +738,11 @@ ${BOLD}How it works:${RESET}
     info(`  Token: ${token}`);
   }
 
+  // ── Show OC Web UI access ────────────────────────────────────────────
+  const uiURL = tunnelURL ? `${tunnelURL}/ui/` : `http://localhost:${port}/ui/`;
+  console.log(`  ${BOLD}OC Web UI:${RESET} ${CYAN}${uiURL}${RESET}`);
+  info(`  (reverse-proxies to localhost:${ocUIPort} — make sure OC gateway is running)`);
+
   console.log("");
   console.log(`${BOLD}${GREEN}Bridge is running.${RESET} Waiting for Navigator to connect...`);
   console.log(`${DIM}Press Ctrl+C to stop.${RESET}\n`);
@@ -733,55 +821,6 @@ ${BOLD}How it works:${RESET}
       // mcporter not installed — skip silently
     }
 
-    // ── Auto-register with OpenClaw agent config (~/.openclaw/openclaw.json) ──
-    // The OC agent reads MCP servers from this file, not mcporter.
-    // This ensures the 15 Navigator tools show up in the agent's tool schema.
-    try {
-      const { readFileSync, writeFileSync, mkdirSync } = await import("node:fs");
-      const { homedir } = await import("node:os");
-      const ocDir = join(homedir(), ".openclaw");
-      const ocConfigPath = join(ocDir, "openclaw.json");
-
-      let ocConfig = {};
-      try {
-        ocConfig = JSON.parse(readFileSync(ocConfigPath, "utf8"));
-      } catch {
-        // File doesn't exist or invalid — start fresh
-      }
-
-      // Ensure the nested structure exists
-      if (!ocConfig.agents) ocConfig.agents = {};
-      if (!ocConfig.agents.defaults) ocConfig.agents.defaults = {};
-      if (!ocConfig.agents.defaults.mcp) ocConfig.agents.defaults.mcp = {};
-      if (!ocConfig.agents.defaults.mcp.servers) ocConfig.agents.defaults.mcp.servers = {};
-
-      // Check if navigator is already configured correctly
-      const existing = ocConfig.agents.defaults.mcp.servers.navigator;
-      const desired = {
-        command: process.execPath,
-        args: [mcpPath],
-        env: { NAVIGATOR_BRIDGE_URL: `http://localhost:${port}` },
-      };
-
-      const needsUpdate =
-        !existing ||
-        existing.command !== desired.command ||
-        JSON.stringify(existing.args) !== JSON.stringify(desired.args);
-
-      if (needsUpdate) {
-        ocConfig.agents.defaults.mcp.servers.navigator = desired;
-        mkdirSync(ocDir, { recursive: true });
-        writeFileSync(ocConfigPath, JSON.stringify(ocConfig, null, 2) + "\n", "utf8");
-        ok("Registered Navigator MCP in ~/.openclaw/openclaw.json (15 tools → OC agent)");
-        info("  Restart the OC gateway to pick up the new tools");
-      } else {
-        info("  Navigator already registered in ~/.openclaw/openclaw.json");
-      }
-    } catch (err) {
-      warn(`Could not auto-register with OpenClaw config: ${err.message}`);
-      info("  Manually add to ~/.openclaw/openclaw.json → agents.defaults.mcp.servers.navigator");
-    }
-
     console.log("");
   }
 

package/package.json

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