claude-browser-bridge 4.0.1 → 4.0.3

package/bin/cli.js

@@ -10,7 +10,7 @@
 import { fileURLToPath } from "node:url";
 import { dirname, join, resolve } from "node:path";
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
-import { randomBytes } from "node:crypto";
+import { randomBytes, createHash } from "node:crypto";
 import { execSync } from "node:child_process";
 
 const __filename = fileURLToPath(import.meta.url);
@@ -44,14 +44,31 @@ Docs: https://github.com/HimanshuKanwar2001/claude-browser-bridge
 `);
 }
 
-function init() {
+async function init() {
   const extPath = args[args.indexOf("init") + 1] || null;
-  const tokenPath = join(SERVER_DIR, ".bridge-token");
-  const token = randomBytes(24).toString("hex");
-
-  // Write server token
-  writeFileSync(tokenPath, token + "\n");
-  console.log(`✓ Token written to ${tokenPath}`);
+  const os = await import("node:os");
+  const home = os.homedir();
+  const port = process.env.BRIDGE_PORT || "8787";
+
+  // Use deterministic token by default (same every time on this machine)
+  const useRandom = args.includes("--random");
+  const token = useRandom
+    ? randomBytes(24).toString("hex")
+    : createHash("sha256").update(`claude-browser-bridge:${os.userInfo().username}@${os.hostname()}:${port}`).digest("hex");
+
+  // Write to canonical path: ~/.claude/browser-bridge-token
+  const claudeDir = join(home, ".claude");
+  if (!existsSync(claudeDir)) mkdirSync(claudeDir, { recursive: true });
+  const canonicalPath = join(home, ".claude", "browser-bridge-token");
+  writeFileSync(canonicalPath, token + "\n");
+  console.log(`✓ Token written to ${canonicalPath}`);
+
+  // Also write to server/.bridge-token (legacy fallback)
+  try {
+    const legacyPath = join(SERVER_DIR, ".bridge-token");
+    writeFileSync(legacyPath, token + "\n");
+    console.log(`✓ Token written to ${legacyPath}`);
+  } catch {}
 
   // Write extension config if we can find the extension directory
   const searchPaths = [

package/gen-token.js

@@ -1,13 +1,58 @@
-// Generates the shared secret used to authenticate the extension to the
-// bridge: writes server/.bridge-token and extension/config.js.
-import { randomBytes } from "node:crypto";
-import { writeFileSync } from "node:fs";
-
-const token = randomBytes(24).toString("hex");
-writeFileSync(new URL("./.bridge-token", import.meta.url), token + "\n");
-writeFileSync(
-  new URL("../extension/config.js", import.meta.url),
-  `// Generated by server/gen-token.js — keep out of version control.\nconst BRIDGE_TOKEN = ${JSON.stringify(token)};\n`
-);
-console.log("Wrote server/.bridge-token and extension/config.js");
-console.log("Reload the extension in chrome://extensions to pick up the new token.");
+// Generates the auth token for the browser bridge.
+// By default uses a deterministic token derived from the machine identity
+// (username + hostname) so it's always the same — no sync issues.
+// Pass --random for a cryptographically random token instead.
+
+import { createHash, randomBytes } from "node:crypto";
+import { writeFileSync, existsSync, mkdirSync } from "node:fs";
+import { join } from "node:path";
+import { homedir, hostname, userInfo } from "node:os";
+
+const PORT = Number(process.env.BRIDGE_PORT) || 8787;
+const useRandom = process.argv.includes("--random");
+
+let token;
+if (useRandom) {
+  token = randomBytes(24).toString("hex");
+  console.log("Generated random token (unique, not machine-derived)");
+} else {
+  const identity = `claude-browser-bridge:${userInfo().username}@${hostname()}:${PORT}`;
+  token = createHash("sha256").update(identity).digest("hex");
+  console.log("Generated deterministic token (same every time on this machine)");
+}
+
+// 1. Write to ~/.claude/browser-bridge-token (canonical path)
+const claudeDir = join(homedir(), ".claude");
+if (!existsSync(claudeDir)) mkdirSync(claudeDir, { recursive: true });
+const canonicalPath = join(claudeDir, "browser-bridge-token");
+writeFileSync(canonicalPath, token + "\n");
+console.log(`✓ Token written to ${canonicalPath}`);
+
+// 2. Write to server/.bridge-token (legacy fallback)
+try {
+  writeFileSync(new URL("./.bridge-token", import.meta.url), token + "\n");
+  console.log("✓ Token written to server/.bridge-token");
+} catch {}
+
+// 3. Write extension/config.js
+const searchPaths = [
+  new URL("../extension/config.js", import.meta.url).pathname,
+  join(process.cwd(), "extension", "config.js"),
+];
+let extensionWritten = false;
+for (const p of searchPaths) {
+  try {
+    if (existsSync(join(p, "..", "manifest.json"))) {
+      writeFileSync(p, `// Generated by gen-token.js — keep out of version control.\nconst BRIDGE_TOKEN = ${JSON.stringify(token)};\n`);
+      console.log(`✓ Extension config written to ${p}`);
+      extensionWritten = true;
+      break;
+    }
+  } catch {}
+}
+if (!extensionWritten) {
+  console.log(`⚠ Extension directory not found — create extension/config.js manually:`);
+  console.log(`  const BRIDGE_TOKEN = "${token}";`);
+}
+
+console.log("\n✓ Done. Reload the extension in chrome://extensions to apply.");

package/index.js

@@ -6,7 +6,10 @@
 // "owns" the bridge; later sessions detect EADDRINUSE and relay their tool
 // calls through the owner. If the owner exits, a relay takes over the port.
 
-import { readFileSync } from "node:fs";
+import { readFileSync, existsSync, writeFileSync, mkdirSync } from "node:fs";
+import { join } from "node:path";
+import { homedir, hostname, userInfo } from "node:os";
+import { createHash } from "node:crypto";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import {
@@ -17,21 +20,46 @@ import WebSocket, { WebSocketServer } from "ws";
 
 const PORT = Number(process.env.BRIDGE_PORT) || 8787;
 
-// F2 FIX: Re-read token on every auth attempt so `init` token regeneration
-// takes effect without restarting the server.
-const TOKEN_PATH = new URL("./.bridge-token", import.meta.url);
+// Deterministic token: derived from machine identity (username + hostname).
+// Same token every time on the same machine — no file sync issues, no
+// regeneration needed, no stale-token bugs across sessions.
+// Falls back to file-based token if BRIDGE_TOKEN env var or token file exists.
+function deriveToken() {
+  const identity = `claude-browser-bridge:${userInfo().username}@${hostname()}:${PORT}`;
+  return createHash("sha256").update(identity).digest("hex");
+}
+
 function readToken() {
-  try {
-    return readFileSync(TOKEN_PATH, "utf8").trim();
-  } catch {
-    return null;
+  // 1. Explicit env var override
+  if (process.env.BRIDGE_TOKEN) return process.env.BRIDGE_TOKEN;
+  // 2. File-based token (legacy — checked for backwards compatibility)
+  const filePaths = [
+    process.env.BRIDGE_TOKEN_PATH,
+    join(homedir(), ".claude", "browser-bridge-token"),
+    new URL("./.bridge-token", import.meta.url).pathname,
+    join(process.cwd(), "server", ".bridge-token"),
+    join(process.cwd(), ".bridge-token"),
+  ].filter(Boolean);
+  for (const p of filePaths) {
+    try {
+      const t = readFileSync(p, "utf8").trim();
+      if (t) return t;
+    } catch {}
   }
+  // 3. Deterministic token (always works, no files needed)
+  return deriveToken();
 }
-if (!readToken()) {
-  console.error(
-    "[bridge] WARNING: server/.bridge-token is missing — run `claude-browser-bridge init` " +
-      "or `node gen-token.js`. Refusing all extension connections until then."
-  );
+
+// Write the deterministic token to the canonical location so gen-token.js
+// isn't required anymore (but still works for custom tokens).
+const canonicalDir = join(homedir(), ".claude");
+const canonicalPath = join(canonicalDir, "browser-bridge-token");
+if (!existsSync(canonicalPath)) {
+  try {
+    if (!existsSync(canonicalDir)) mkdirSync(canonicalDir, { recursive: true });
+    writeFileSync(canonicalPath, deriveToken() + "\n");
+    console.error(`[bridge] Auto-generated token at ${canonicalPath}`);
+  } catch {}
 }
 
 // --- WebSocket bridge (owner or relay) -------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-browser-bridge",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "Connect your live Chrome tabs to Claude Code — 65 tools for debugging, performance, accessibility, visual inspection, and browser automation.",
   "type": "module",
   "bin": {