zevairouter 1.0.62 → 1.0.65

package/cli/hooks/camoufoxRuntime.js

@@ -1,9 +1,16 @@
 // Ensure camoufox-js (optional stealth Firefox engine) is installed AND its
-// browser binary is downloaded. The package is in optionalDependencies, so
-// `npm install -g zevairouter` may legitimately ship without it (e.g. when npm
-// skipped optional install on a constrained network). When the user picks
-// Camoufox in the bulk-import modal we install lazily \u2014 same shape as the
-// sqlite/playwright runtime helpers \u2014 instead of failing the worker.
+// browser binary is downloaded + kept in sync with the JS package.
+//
+// Failure mode we fix for end users (Mac + Ubuntu/Linux + Windows):
+//   camoufox-js emits fingerprint keys (e.g. audio:seed) that an *old* cached
+//   Camoufox binary rejects → "Unknown property audio:seed in config".
+//
+// Strategy:
+//   1) Install camoufox-js into ~/.zevai/runtime when missing
+//   2) On every process first-use: if binary missing OR package version changed
+//      OR no zevai stamp, run `camoufox-js fetch` (no-op when already current)
+//   3) Export force-refresh so launch can recover after Unknown-property errors
+//   4) Linux: best-effort install of GUI libs via playwright install-deps
 const { spawnSync } = require("child_process");
 const { createRequire } = require("module");
 const fs = require("fs");
@@ -14,6 +21,9 @@ const { runNpmInstall, getRuntimeDir, getRuntimeNodeModules } = require("./sqlit
 
 const CAMOUFOX_PACKAGE = "camoufox-js";
 const CAMOUFOX_VERSION = "^0.11.0";
+// Bump when we need every install to re-check binary even if package version
+// string is unchanged (e.g. known bad binary fingerprints).
+const BINARY_POLICY = "v2-audio-seed";
 
 // This helper is reached through webpack-bundled server code, which rewrites
 // bare `require(...)` into its own module registry — so `require("camoufox-js")`
@@ -37,6 +47,7 @@ function getRuntimeRequire() {
 }
 
 let cachedReady = null;
+let binaryCheckedThisProcess = false;
 
 function tryRequireCamoufox() {
   // 1) Direct absolute-path resolution via a runtime-anchored createRequire —
@@ -62,6 +73,34 @@ function tryRequireCamoufox() {
   return null;
 }
 
+function findCamoufoxPackageDir() {
+  try {
+    const rreq = getRuntimeRequire();
+    const candidate = path.join(getRuntimeNodeModules(), CAMOUFOX_PACKAGE);
+    if (fs.existsSync(path.join(candidate, "package.json"))) return candidate;
+    if (rreq) {
+      try {
+        return path.dirname(rreq.resolve(`${CAMOUFOX_PACKAGE}/package.json`));
+      } catch {}
+    }
+  } catch {}
+  try {
+    return path.dirname(nodeRequire.resolve(`${CAMOUFOX_PACKAGE}/package.json`));
+  } catch {}
+  return null;
+}
+
+function getCamoufoxJsPackageVersion() {
+  try {
+    const dir = findCamoufoxPackageDir();
+    if (!dir) return null;
+    const pkg = JSON.parse(fs.readFileSync(path.join(dir, "package.json"), "utf8"));
+    return String(pkg.version || "").trim() || null;
+  } catch {
+    return null;
+  }
+}
+
 function findCamoufoxCli() {
   const candidates = [];
   // camoufox-js ships its CLI entry as dist/__main__.js (there is no cli.js).
@@ -73,6 +112,8 @@ function findCamoufoxCli() {
   try {
     candidates.push(path.join(getRuntimeNodeModules(), CAMOUFOX_PACKAGE, ...rel));
   } catch {}
+  const pkgDir = findCamoufoxPackageDir();
+  if (pkgDir) candidates.push(path.join(pkgDir, ...rel));
   for (const candidate of candidates) {
     if (candidate && fs.existsSync(candidate)) return candidate;
   }
@@ -92,6 +133,10 @@ function getCamoufoxBinaryDir() {
   return path.join(homeDir, ".cache", "camoufox");
 }
 
+function getStampPath() {
+  return path.join(getCamoufoxBinaryDir(), ".zevai-binary-stamp.json");
+}
+
 // The launch binary camoufox-js resolves per OS (dist/pkgman.js LAUNCH_FILE),
 // relative to the install dir. Linux is the primary target (Ubuntu VPS).
 function getCamoufoxLaunchBinary() {
@@ -109,6 +154,70 @@ function isCamoufoxBinaryAvailable() {
   }
 }
 
+function getInstalledBinaryVersion() {
+  try {
+    const versionPath = path.join(getCamoufoxBinaryDir(), "version.json");
+    if (!fs.existsSync(versionPath)) return null;
+    const data = JSON.parse(fs.readFileSync(versionPath, "utf8"));
+    if (!data?.version) return null;
+    return `${data.version}${data.release ? `-${data.release}` : ""}`;
+  } catch {
+    return null;
+  }
+}
+
+function readBinaryStamp() {
+  try {
+    const p = getStampPath();
+    if (!fs.existsSync(p)) return null;
+    return JSON.parse(fs.readFileSync(p, "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+function writeBinaryStamp({ packageVersion, binaryVersion } = {}) {
+  try {
+    const dir = getCamoufoxBinaryDir();
+    fs.mkdirSync(dir, { recursive: true });
+    const stamp = {
+      policy: BINARY_POLICY,
+      packageVersion: packageVersion || getCamoufoxJsPackageVersion(),
+      binaryVersion: binaryVersion || getInstalledBinaryVersion(),
+      platform: process.platform,
+      arch: process.arch,
+      fetchedAt: new Date().toISOString(),
+    };
+    fs.writeFileSync(getStampPath(), JSON.stringify(stamp, null, 2));
+    return stamp;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Decide whether we should run `camoufox-js fetch`.
+ * - Missing binary → yes
+ * - No stamp (legacy installs, Mac beta.24 era) → yes (fetch is no-op if current)
+ * - Package version or policy changed → yes
+ * - force → yes
+ */
+function shouldFetchCamoufoxBinary({ force = false } = {}) {
+  if (force) return true;
+  if (process.env.ZEVAI_CAMOUFOX_SKIP_FETCH === "1") return false;
+  if (!isCamoufoxBinaryAvailable()) return true;
+  if (!getInstalledBinaryVersion()) return true;
+
+  const stamp = readBinaryStamp();
+  if (!stamp) return true;
+
+  const pkgVer = getCamoufoxJsPackageVersion();
+  if (pkgVer && stamp.packageVersion && stamp.packageVersion !== pkgVer) return true;
+  if (stamp.policy !== BINARY_POLICY) return true;
+
+  return false;
+}
+
 function ensureCamoufoxPackage({ silent = false } = {}) {
   const mod = tryRequireCamoufox();
   if (mod) return { ok: true, module: mod };
@@ -140,15 +249,30 @@ function fetchCamoufoxBinary({ silent = false, timeout = 600_000 } = {}) {
   if (!cliPath) {
     return { ok: false, reason: "camoufox-js cli script not found after install" };
   }
-  if (!silent) console.log("\u23f3 Downloading Camoufox browser binary (first run, ~150MB)...");
+  if (!silent) {
+    console.log(
+      isCamoufoxBinaryAvailable()
+        ? "\u23f3 Checking/updating Camoufox browser binary (keeps fingerprint config compatible)..."
+        : "\u23f3 Downloading Camoufox browser binary (first run, ~150–300MB)..."
+    );
+  }
   const res = spawnSync(process.execPath, [cliPath, "fetch"], {
     stdio: silent ? ["ignore", "pipe", "pipe"] : "inherit",
     timeout,
     encoding: "utf8",
+    env: {
+      ...process.env,
+      // Never skip: users hit audio:seed / unknown property when binary lags.
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: undefined,
+    },
   });
   if (res.status === 0) {
+    writeBinaryStamp({
+      packageVersion: getCamoufoxJsPackageVersion(),
+      binaryVersion: getInstalledBinaryVersion(),
+    });
     if (!silent) console.log("\u2705 Camoufox browser ready");
-    return { ok: true };
+    return { ok: true, binaryVersion: getInstalledBinaryVersion() };
   }
   const stderr = String(res.stderr || "");
   let reason = "unknown error";
@@ -159,6 +283,66 @@ function fetchCamoufoxBinary({ silent = false, timeout = 600_000 } = {}) {
   return { ok: false, reason };
 }
 
+/**
+ * Ensure binary exists and matches current camoufox-js expectations.
+ * Safe to call often: after the first successful check this process, subsequent
+ * calls are free unless force=true.
+ */
+function ensureCamoufoxBinary({ silent = false, force = false } = {}) {
+  if (!force && binaryCheckedThisProcess && isCamoufoxBinaryAvailable()) {
+    return { ok: true, skipped: "already-checked", binaryVersion: getInstalledBinaryVersion() };
+  }
+
+  if (!shouldFetchCamoufoxBinary({ force })) {
+    // Stamp already valid — still write stamp if somehow missing binary version field
+    if (!readBinaryStamp()) {
+      writeBinaryStamp();
+    }
+    binaryCheckedThisProcess = true;
+    return { ok: true, skipped: "up-to-date", binaryVersion: getInstalledBinaryVersion() };
+  }
+
+  const fetched = fetchCamoufoxBinary({ silent });
+  if (!fetched.ok) {
+    // If we already have *some* binary, degrade gracefully — launch path will
+    // sanitize unsupported fingerprint keys. Only hard-fail when missing entirely.
+    if (isCamoufoxBinaryAvailable()) {
+      if (!silent) {
+        console.log(
+          `\u26a0 Camoufox binary update failed (${fetched.reason}); using existing binary with config sanitization.`
+        );
+      }
+      binaryCheckedThisProcess = true;
+      return {
+        ok: true,
+        degraded: true,
+        reason: fetched.reason,
+        binaryVersion: getInstalledBinaryVersion(),
+      };
+    }
+    return fetched;
+  }
+
+  binaryCheckedThisProcess = true;
+  return fetched;
+}
+
+/**
+ * Force re-download after launch errors like "Unknown property audio:seed".
+ * Clears process cache so the next ensure re-checks.
+ */
+function refreshCamoufoxBinary({ silent = false } = {}) {
+  binaryCheckedThisProcess = false;
+  cachedReady = null;
+  try {
+    const stamp = getStampPath();
+    if (fs.existsSync(stamp)) fs.unlinkSync(stamp);
+  } catch {
+    // ignore
+  }
+  return ensureCamoufoxBinary({ silent, force: true });
+}
+
 function findPlaywrightCli() {
   const candidates = [];
   for (const pkg of ["playwright", "playwright-core"]) {
@@ -184,7 +368,11 @@ function findPlaywrightCli() {
 function ensureLinuxBrowserDeps({ silent = false } = {}) {
   if (process.platform !== "linux") return { ok: true, skipped: "not-linux" };
   if (typeof process.getuid === "function" && process.getuid() !== 0) {
-    if (!silent) console.log("\u2139 Skipping auto-install of Camoufox system libs (not root). If Camoufox fails to launch, run: npx playwright install-deps firefox");
+    if (!silent) {
+      console.log(
+        "\u2139 Skipping auto-install of Camoufox system libs (not root). If Camoufox fails to launch, run: npx playwright install-deps firefox"
+      );
+    }
     return { ok: true, skipped: "not-root" };
   }
   const cliPath = findPlaywrightCli();
@@ -199,37 +387,41 @@ function ensureLinuxBrowserDeps({ silent = false } = {}) {
     if (!silent) console.log("\u2705 Camoufox system libraries ready");
     return { ok: true };
   }
-  if (!silent) console.log("\u26a0 Could not auto-install system libs; if Camoufox fails to launch run: npx playwright install-deps firefox");
+  if (!silent) {
+    console.log(
+      "\u26a0 Could not auto-install system libs; if Camoufox fails to launch run: npx playwright install-deps firefox"
+    );
+  }
   return { ok: false, reason: String(res.stderr || "").trim().split(/\r?\n/).pop()?.slice(0, 200) };
 }
 
-function ensureCamoufoxRuntime({ silent = false } = {}) {
-  if (cachedReady === true) return { ok: true };
+function ensureCamoufoxRuntime({ silent = false, forceBinaryRefresh = false } = {}) {
+  if (cachedReady === true && !forceBinaryRefresh) {
+    return { ok: true, module: tryRequireCamoufox() };
+  }
 
   const pkg = ensureCamoufoxPackage({ silent });
   if (!pkg.ok) {
     cachedReady = false;
     const error = new Error(
       `Camoufox engine not available. ${pkg.reason}. ` +
-      `Install manually with "npm install -g camoufox-js && npx camoufox-js fetch", then retry. ` +
-      `You can also switch back to the Chromium engine in the bulk-import modal.`
+        `Install manually with "npm install -g camoufox-js && npx camoufox-js fetch", then retry. ` +
+        `You can also switch back to the Chromium engine in the bulk-import modal.`
     );
     error.code = "CAMOUFOX_PACKAGE_MISSING";
     return { ok: false, error };
   }
 
-  if (!isCamoufoxBinaryAvailable()) {
-    const fetched = fetchCamoufoxBinary({ silent });
-    if (!fetched.ok) {
-      cachedReady = false;
-      const error = new Error(
-        `Camoufox browser binary not downloaded. ${fetched.reason}. ` +
+  const binary = ensureCamoufoxBinary({ silent, force: forceBinaryRefresh });
+  if (!binary.ok) {
+    cachedReady = false;
+    const error = new Error(
+      `Camoufox browser binary not downloaded. ${binary.reason}. ` +
         `Run "npx camoufox-js fetch" manually, then retry. ` +
         `You can also switch back to the Chromium engine in the bulk-import modal.`
-      );
-      error.code = "CAMOUFOX_BINARY_MISSING";
-      return { ok: false, error };
-    }
+    );
+    error.code = "CAMOUFOX_BINARY_MISSING";
+    return { ok: false, error };
   }
 
   // Ensure Linux GUI libraries are present (idempotent). Runs even when the
@@ -238,7 +430,12 @@ function ensureCamoufoxRuntime({ silent = false } = {}) {
   ensureLinuxBrowserDeps({ silent });
 
   cachedReady = true;
-  return { ok: true, module: pkg.module };
+  return {
+    ok: true,
+    module: pkg.module,
+    binaryVersion: binary.binaryVersion || getInstalledBinaryVersion(),
+    binaryDegraded: Boolean(binary.degraded),
+  };
 }
 
 function loadCamoufoxModule() {
@@ -247,11 +444,17 @@ function loadCamoufoxModule() {
 
 function resetCache() {
   cachedReady = null;
+  binaryCheckedThisProcess = false;
 }
 
 module.exports = {
   ensureCamoufoxRuntime,
+  ensureCamoufoxBinary,
+  refreshCamoufoxBinary,
   loadCamoufoxModule,
   isCamoufoxBinaryAvailable,
+  getInstalledBinaryVersion,
+  getCamoufoxJsPackageVersion,
+  getCamoufoxBinaryDir,
   resetCache,
 };

package/cli/hooks/cloakbrowserRuntime.js

@@ -53,13 +53,6 @@ function tryRequireCloakbrowser() {
       return nodeRequire(candidate);
     }
   } catch {}
-  try {
-    const home = process.env.HOME || process.env.USERPROFILE || "";
-    const aurix = path.join(home, ".aurix/agent/node_modules", CLOAKBROWSER_PACKAGE);
-    if (fs.existsSync(path.join(aurix, "package.json"))) {
-      return nodeRequire(aurix);
-    }
-  } catch {}
   return null;
 }
 

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter-cli",
-  "version": "1.0.62",
+  "version": "1.0.65",
   "description": "ZevaiRouter CLI - Start and manage ZevaiRouter server",
   "bin": {
     "zevai": "./cli.js"