openclaw-navigator 4.3.3 → 4.3.5

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`);
@@ -684,53 +772,73 @@ ${BOLD}How it works:${RESET}
     ok(`MCP server started (PID ${mcpProcess.pid}) — bridge: http://localhost:${port}`);
 
     // ── Auto-register MCP server with mcporter (if available) ─────────
-    // This makes the 15 navigator tools discoverable by the OC agent.
-    // Uses --scope home so it persists in ~/.mcporter/mcporter.json.
+    // Writes directly to ~/.mcporter/mcporter.json for reliability.
+    //
+    // KEY FIX: We resolve stable paths instead of using process.execPath
+    // which may point to a temp npx cache (/Users/x/.npm/_npx/<hash>/node)
+    // that disappears after npx exits. We find the REAL node binary and
+    // the globally-installed mcp.mjs (or realpath of the current one).
     try {
-      const reg = spawn(
-        "mcporter",
-        [
-          "config",
-          "add",
-          "navigator",
-          "--command",
-          process.execPath,
-          "--arg",
-          mcpPath,
-          "--env",
-          `NAVIGATOR_BRIDGE_URL=http://localhost:${port}`,
-          "--description",
-          "Navigator browser control (15 tools: navigate, click, fill, read, etc.)",
-          "--scope",
-          "home",
-        ],
-        { stdio: ["ignore", "pipe", "pipe"] },
-      );
-
-      let regOut = "";
-      reg.stdout?.on("data", (d) => {
-        regOut += d.toString();
-      });
-      reg.stderr?.on("data", (d) => {
-        regOut += d.toString();
-      });
+      const { readFileSync, writeFileSync, mkdirSync, realpathSync } = await import("node:fs");
+      const { homedir } = await import("node:os");
+
+      // Resolve stable node binary (follow symlinks out of npx temp dir)
+      let stableNode;
+      try {
+        stableNode = realpathSync(process.execPath);
+      } catch {
+        stableNode = process.execPath;
+      }
 
-      reg.on("close", (code) => {
-        if (code === 0) {
-          ok("Registered MCP server with mcporter (15 browser tools available to OC agent)");
-        } else if (regOut.includes("already exists")) {
-          info("  mcporter: navigator server already registered");
-        } else {
-          // mcporter not installed or failed — that's fine, not required
-          info("  mcporter not found — OC agent can still use the MCP server directly");
+      // Resolve stable mcp.mjs path
+      let stableMcpPath;
+      try {
+        stableMcpPath = realpathSync(mcpPath);
+      } catch {
+        stableMcpPath = mcpPath;
+      }
+
+      // If paths are still in npx temp cache, try to find the real install
+      if (stableMcpPath.includes("_npx") || stableMcpPath.includes(".npm/_npx")) {
+        // Check if openclaw-navigator is installed globally
+        const nodeDir = dirname(stableNode);
+        const globalMcp = join(dirname(nodeDir), "lib/node_modules/openclaw-navigator/mcp.mjs");
+        if (existsSync(globalMcp)) {
+          stableMcpPath = globalMcp;
         }
-      });
+        // If still temp, that's OK — mcporter will use the path we give it
+        // and the bridge running alongside keeps the MCP server alive anyway
+      }
 
-      reg.on("error", () => {
-        info("  mcporter not found — OC agent can still use the MCP server directly");
-      });
-    } catch {
-      // mcporter not installed — skip silently
+      info(`  mcporter: node=${stableNode}`);
+      info(`  mcporter: mcp=${stableMcpPath}`);
+
+      // Write directly to ~/.mcporter/mcporter.json
+      const mcporterDir = join(homedir(), ".mcporter");
+      const mcporterConfigPath = join(mcporterDir, "mcporter.json");
+
+      let mcporterConfig = { mcpServers: {}, imports: [] };
+      try {
+        mcporterConfig = JSON.parse(readFileSync(mcporterConfigPath, "utf8"));
+        if (!mcporterConfig.mcpServers) mcporterConfig.mcpServers = {};
+      } catch {
+        // File doesn't exist or invalid — start fresh
+      }
+
+      // Set/update the navigator entry with stable paths
+      mcporterConfig.mcpServers.navigator = {
+        command: stableNode,
+        args: [stableMcpPath],
+        env: { NAVIGATOR_BRIDGE_URL: `http://localhost:${port}` },
+      };
+
+      mkdirSync(mcporterDir, { recursive: true });
+      writeFileSync(mcporterConfigPath, JSON.stringify(mcporterConfig, null, 2) + "\n", "utf8");
+      ok("Registered MCP server with mcporter (15 browser tools available)");
+      info(`  Config: ${mcporterConfigPath}`);
+    } catch (err) {
+      warn(`mcporter registration failed: ${err.message}`);
+      info("  You can manually configure mcporter for Navigator MCP");
     }
 
     console.log("");

package/package.json

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