browser-cookie-bridge 1.2.0 → 1.4.0

package/src/browserless.js

@@ -1,3 +1,5 @@
+import fs from "node:fs";
+import os from "node:os";
 import path from "node:path";
 import { spawn } from "node:child_process";
 import { projectRoot } from "./paths.js";
@@ -13,7 +15,10 @@ export async function uploadBrowserlessProfile({
   onlyDomains = [],
   token = process.env.BROWSERLESS_TOKEN,
   root = projectRoot(),
-  runner = runCLI,
+  runner = runBrowserlessCLI,
+  signal,
+  timeoutMs = 15 * 60 * 1000,
+  onProgress = () => {},
 } = {}) {
   if (!SUPPORTED_SOURCES.has(browser)) {
     throw new Error(`${browser === "comet" ? "Comet" : browser} is not supported by Browserless profile capture yet.`);
@@ -34,7 +39,15 @@ export async function uploadBrowserlessProfile({
     DO_NOT_TRACK: "1",
   };
   const client = ["--region", region, "--json"];
-  const shown = await runner(cliPath, ["profile", "show", profileName.trim(), ...client], environment, runnerPath);
+  onProgress({ phase: "validating", fraction: 0.10, detail: "Checking the destination profile…" });
+  const shown = await runner(
+    cliPath,
+    ["profile", "show", profileName.trim(), ...client],
+    environment,
+    runnerPath,
+    { signal, timeoutMs: Math.min(timeoutMs, 60_000) },
+  );
+  throwForInterruptedRun(shown, timeoutMs);
   const operation = shown.status === 0 ? "refresh" : isMissingProfile(shown.output) ? "upload" : null;
   if (!operation) throw new Error(lastLine(shown.output) || "Browserless could not validate the cloud profile.");
 
@@ -48,8 +61,28 @@ export async function uploadBrowserlessProfile({
     "--auto-fit",
   ];
   for (const domain of onlyDomains) capture.push("--only-domain", domain);
-  const result = await runner(cliPath, capture, environment, runnerPath);
-  if (result.status !== 0) throw new Error(lastLine(result.output) || "Browserless profile upload failed.");
+  const parseProgress = progressParser(onProgress);
+  const result = await runner(cliPath, capture, environment, runnerPath, {
+    signal,
+    timeoutMs,
+    onOutput: parseProgress,
+  });
+  parseProgress("\n");
+  throwForInterruptedRun(result, timeoutMs);
+  if (result.status !== 0) throw new Error(actionableFailure(result.output));
+
+  onProgress({ phase: "verifying", fraction: 0.97, detail: "Verifying the cloud profile…" });
+  const verified = await runner(
+    cliPath,
+    ["profile", "show", profileName.trim(), ...client],
+    environment,
+    runnerPath,
+    { signal, timeoutMs: Math.min(timeoutMs, 60_000) },
+  );
+  throwForInterruptedRun(verified, timeoutMs);
+  if (verified.status !== 0) {
+    throw new Error(`The upload finished, but Browserless could not verify the cloud profile: ${lastLine(verified.output) || "profile lookup failed"}`);
+  }
 
   const details = parseJSON(result.output);
   const cookies = details?.cookieCount;
@@ -59,28 +92,126 @@ export async function uploadBrowserlessProfile({
     : "";
   return {
     operation,
+    verified: true,
     profileName: details?.name || profileName.trim(),
     cookieCount: cookies,
     originCount: origins,
-    summary: `Browserless profile ${operation === "refresh" ? "updated" : "created"}: ${details?.name || profileName.trim()}${counts}`,
+    droppedOriginCount: droppedOrigins(result.output),
+    failedOriginCount: failedOrigins(result.output),
+    summary: uploadSummary({ operation, details, fallbackName: profileName.trim(), counts, output: result.output }),
   };
 }
 
-function runCLI(cliPath, args, environment, runnerPath) {
+export function runBrowserlessCLI(cliPath, args, environment, runnerPath, {
+  signal,
+  timeoutMs = 15 * 60 * 1000,
+  onOutput = () => {},
+} = {}) {
   return new Promise((resolve, reject) => {
+    const temporaryRoot = fs.mkdtempSync(path.join(os.tmpdir(), "browser-cookie-bridge-browserless-"));
+    fs.chmodSync(temporaryRoot, 0o700);
     const child = spawn(process.execPath, [runnerPath, cliPath, ...args], {
-      env: environment,
+      env: { ...environment, TMPDIR: temporaryRoot },
       stdio: ["ignore", "pipe", "pipe"],
+      detached: process.platform !== "win32",
     });
     let stdout = "";
     let stderr = "";
-    child.stdout.on("data", (chunk) => { stdout += chunk; });
-    child.stderr.on("data", (chunk) => { stderr += chunk; });
-    child.on("error", reject);
-    child.on("close", (status) => resolve({ status: status ?? 1, output: `${stderr}${stdout}` }));
+    let interruption = null;
+    let settled = false;
+    const append = (target, chunk) => {
+      const text = String(chunk);
+      if (target === "stdout") stdout += text;
+      else stderr += text;
+      onOutput(text);
+    };
+    const terminate = (reason) => {
+      if (settled || interruption) return;
+      interruption = reason;
+      try {
+        if (process.platform !== "win32" && child.pid) process.kill(-child.pid, "SIGTERM");
+        else child.kill("SIGTERM");
+      } catch {}
+      setTimeout(() => {
+        if (child.exitCode !== null || child.signalCode !== null) return;
+        try {
+          if (process.platform !== "win32" && child.pid) process.kill(-child.pid, "SIGKILL");
+          else child.kill("SIGKILL");
+        } catch {}
+      }, 2_000).unref();
+    };
+    const abort = () => terminate("canceled");
+    signal?.addEventListener("abort", abort, { once: true });
+    if (signal?.aborted) abort();
+    const timer = setTimeout(() => terminate("timedOut"), timeoutMs);
+    timer.unref();
+    child.stdout.on("data", (chunk) => append("stdout", chunk));
+    child.stderr.on("data", (chunk) => append("stderr", chunk));
+    child.on("error", (error) => {
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", abort);
+      fs.rmSync(temporaryRoot, { recursive: true, force: true });
+      reject(error);
+    });
+    child.on("close", (status) => {
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", abort);
+      fs.rmSync(temporaryRoot, { recursive: true, force: true });
+      resolve({
+        status: interruption === "canceled" ? 130 : interruption === "timedOut" ? 124 : (status ?? 1),
+        output: `${stderr}${stdout}`,
+        canceled: interruption === "canceled",
+        timedOut: interruption === "timedOut",
+      });
+    });
   });
 }
 
+export function progressParser(onProgress) {
+  let pending = "";
+  let lastPhase = "";
+  return (chunk) => {
+    pending += chunk;
+    const lines = pending.split(/\r\n|\n|\r/);
+    pending = lines.pop() ?? "";
+    for (const raw of lines) {
+      const line = raw.trim();
+      let progress = null;
+      if (/copying profile data/i.test(line)) {
+        progress = { phase: "copying", fraction: 0.18, detail: "Copying profile data into an isolated workspace…" };
+      } else if (/launching headless browser/i.test(line)) {
+        progress = { phase: "launching", fraction: 0.30, detail: "Launching the temporary browser…" };
+      } else if (/waiting for browser to be ready/i.test(line)) {
+        progress = { phase: "waiting", fraction: 0.38, detail: "Waiting for the temporary browser…" };
+      } else if (/capturing per-origin storage/i.test(line)) {
+        progress = { phase: "capturing", fraction: 0.42, detail: "Capturing cookies, local storage, and IndexedDB…" };
+      } else if (/^\d+\/\d+\s+/.test(line)) {
+        const match = line.match(/^(\d+)\/(\d+)\s+(.+)$/);
+        if (match) {
+          const current = Number(match[1]);
+          const total = Number(match[2]);
+          progress = {
+            phase: "capturing",
+            fraction: total > 0 ? 0.42 + 0.42 * Math.min(current / total, 1) : 0.42,
+            current,
+            total,
+            detail: `Capturing ${match[3]}`,
+          };
+        }
+      } else if (/uploading to browserless/i.test(line)) {
+        progress = { phase: "uploading", fraction: 0.90, detail: "Uploading the fitted authenticated profile…" };
+      }
+      if (!progress) continue;
+      const identity = `${progress.phase}:${progress.current ?? ""}:${progress.total ?? ""}:${progress.detail}`;
+      if (identity === lastPhase) continue;
+      lastPhase = identity;
+      onProgress(progress);
+    }
+  };
+}
+
 function isMissingProfile(output) {
   return /(?:not found|does not exist|404)/i.test(output);
 }
@@ -106,3 +237,45 @@ function parseJSON(output) {
 function lastLine(output) {
   return output.split("\n").map((line) => line.trim()).filter(Boolean).at(-1)?.replace(/^Error:\s*/, "");
 }
+
+function throwForInterruptedRun(result, timeoutMs) {
+  if (result?.canceled || result?.status === 130) {
+    throw new Error("Browserless upload canceled. Temporary profile data was removed.");
+  }
+  if (result?.timedOut || result?.status === 124) {
+    const minutes = Math.max(1, Math.round(timeoutMs / 60_000));
+    throw new Error(`Browserless upload timed out after ${minutes} minute${minutes === 1 ? "" : "s"}. Check the connection, close the source browser, and try again with a smaller domain allowlist.`);
+  }
+}
+
+function droppedOrigins(output) {
+  return Number(output.match(/--auto-fit:\s*dropped\s+(\d+)\s+origin/i)?.[1] || 0);
+}
+
+function failedOrigins(output) {
+  return Number(output.match(/!\s+(\d+)\s+origin\(s\) failed to capture/i)?.[1] || 0);
+}
+
+function uploadSummary({ operation, details, fallbackName, counts, output }) {
+  const dropped = droppedOrigins(output);
+  const failed = failedOrigins(output);
+  const warnings = [];
+  if (dropped > 0) warnings.push(`${dropped} heavy origin${dropped === 1 ? "" : "s"} omitted to fit Browserless's 2 MB cap`);
+  if (failed > 0) warnings.push(`${failed} origin${failed === 1 ? "" : "s"} could not be captured`);
+  const warning = warnings.length > 0 ? `; ${warnings.join("; ")}` : "";
+  return `Browserless profile ${operation === "refresh" ? "updated" : "created"} and verified: ${details?.name || fallbackName}${counts}${warning}`;
+}
+
+function actionableFailure(output) {
+  const detail = lastLine(output) || "Browserless profile upload failed.";
+  if (/(?:failed to reach|enotfound|econnreset|econnrefused|network|socket hang up|fetch failed)/i.test(output)) {
+    return `Browserless could not be reached. Check your internet connection and region, then try again. ${detail}`;
+  }
+  if (/(?:profile busy|singletonlock|browser.*running|source browser must be closed)/i.test(output)) {
+    return `The source browser is still using this profile. Quit it completely, wait a few seconds, and try again. ${detail}`;
+  }
+  if (/(?:2 MB|too large|artifact.*cap|payload.*large)/i.test(output)) {
+    return `The captured state could not fit Browserless's 2 MB profile cap. Add a domain allowlist for the sites you need, then try again. ${detail}`;
+  }
+  return detail;
+}

package/src/cli.js

@@ -10,6 +10,7 @@ import {
 } from "./codex-direct-import.js";
 import { readChromiumProfile } from "./chromium-reader.js";
 import { uploadBrowserlessProfile } from "./browserless.js";
+import { inspectBrowserlessProfile } from "./browserless-preflight.js";
 import { installConfig, installRuntime, readConfig, updatePreferences } from "./config.js";
 import {
   braveCookiePaths,
@@ -44,8 +45,9 @@ Commands:
   setup [--hour 9] [--minute 0] [--no-schedule]
   install-app [--no-open]
   bootstrap-bundled --app-path /Applications/Browser Cookie Bridge.app
-  preferences --source brave --target codex --cookies on --history off --menu-bar on --auto-check-updates on
+  preferences --source brave --target codex --cookies on --history off --menu-bar on --auto-check-updates on --auto-restart-codex off
   sync [--timeout 300] [--allow-cloud-upload]
+  browserless-preflight
   doctor
   enable-login-sync
   disable-login-sync
@@ -55,13 +57,15 @@ Commands:
   help
 `;
 
-export async function main(argv) {
+export async function main(argv, { signal } = {}) {
   const [command = "help", ...args] = argv;
   switch (command) {
     case "setup":
       return setup(args);
     case "sync":
-      return sync(args);
+      return sync(args, { signal });
+    case "browserless-preflight":
+      return browserlessPreflight();
     case "install-app":
       return installDesktopApp(args);
     case "bootstrap-bundled":
@@ -124,12 +128,13 @@ function preferences(args) {
     menuBar: booleanFlag(args, "--menu-bar", existing.ui?.menuBar === true),
     openAtLogin: booleanFlag(args, "--open-at-login", existing.ui?.openAtLogin !== false),
     autoCheckUpdates: booleanFlag(args, "--auto-check-updates", existing.ui?.autoCheckUpdates !== false),
+    autoRestartCodex: booleanFlag(args, "--auto-restart-codex", existing.ui?.autoRestartCodex === true),
     browserlessProfileName: stringFlag(args, "--browserless-profile", existing.browserless?.profileName || "browser-cookie-bridge"),
     browserlessRegion: stringFlag(args, "--browserless-region", existing.browserless?.region || "sfo"),
     browserlessOnlyDomains: optionalStringFlag(args, "--browserless-domains", (existing.browserless?.onlyDomains || []).join(",")),
   });
   console.log(
-    `Saved: source=${config.sourceBrowser}, target=${config.targetBrowser}, cookies=${config.imports.cookies ? "on" : "off"}, history=${config.imports.history ? "on" : "off"}, menu-bar=${config.ui.menuBar ? "on" : "off"}, open-at-login=${config.ui.openAtLogin ? "on" : "off"}, auto-check-updates=${config.ui.autoCheckUpdates ? "on" : "off"}`,
+    `Saved: source=${config.sourceBrowser}, target=${config.targetBrowser}, cookies=${config.imports.cookies ? "on" : "off"}, history=${config.imports.history ? "on" : "off"}, menu-bar=${config.ui.menuBar ? "on" : "off"}, open-at-login=${config.ui.openAtLogin ? "on" : "off"}, auto-check-updates=${config.ui.autoCheckUpdates ? "on" : "off"}, auto-restart-codex=${config.ui.autoRestartCodex ? "on" : "off"}`,
   );
 }
 
@@ -259,11 +264,11 @@ function setup(args) {
     : "Cookie values are transferred in memory and are not written to logs or disk.");
 }
 
-async function sync(args) {
+async function sync(args, { signal } = {}) {
   assertMacOS();
-  const seconds = integerFlag(args, "--timeout", 300, 5, 3600);
   const config = readConfig();
   const target = config.targetBrowser || "codex";
+  const seconds = integerFlag(args, "--timeout", target === "browserless" ? 900 : 300, 5, 3600);
   const isCodexTarget = target === "codex";
   if (target === "browserless") {
     if (!args.includes("--allow-cloud-upload")) {
@@ -271,6 +276,15 @@ async function sync(args) {
     }
     const source = config.sourceBrowser || "brave";
     const local = readChromiumProfile({ browser: source, imports: { cookies: false, history: false } });
+    emitBrowserlessProgress({ phase: "preflight", fraction: 0.03, detail: "Inspecting the local profile…" });
+    const assessment = inspectBrowserlessProfile({ profilePath: local.profilePath });
+    emitBrowserlessProgress({
+      phase: "preflight-complete",
+      fraction: 0.06,
+      detail: assessment.summary,
+      assessment,
+    });
+    console.log(`Profile preflight: ${assessment.summary}`);
     console.log(`Preparing ${source} profile ${local.profileName} for an explicit Browserless cloud upload…`);
     const result = await uploadBrowserlessProfile({
       browser: source,
@@ -278,7 +292,11 @@ async function sync(args) {
       profileName: config.browserless?.profileName || "browser-cookie-bridge",
       region: config.browserless?.region || "sfo",
       onlyDomains: config.browserless?.onlyDomains || [],
+      timeoutMs: seconds * 1000,
+      signal,
+      onProgress: emitBrowserlessProgress,
     });
+    emitBrowserlessProgress({ phase: "complete", fraction: 1, detail: result.summary });
     console.log(result.summary);
     return result;
   }
@@ -322,6 +340,21 @@ async function sync(args) {
   return result;
 }
 
+function browserlessPreflight() {
+  assertMacOS();
+  const config = readConfig();
+  const source = config.sourceBrowser || "brave";
+  if (source === "comet") throw new Error("Comet is not supported by Browserless profile capture yet.");
+  const local = readChromiumProfile({ browser: source, imports: { cookies: false, history: false } });
+  const assessment = inspectBrowserlessProfile({ profilePath: local.profilePath });
+  console.log(JSON.stringify({ browser: source, profileName: local.profileName, ...assessment }));
+  return assessment;
+}
+
+function emitBrowserlessProgress(event) {
+  console.log(`BCB_PROGRESS ${JSON.stringify(event)}`);
+}
+
 export function directCodexSummary(result) {
   const imported = result.imported + result.historyImported;
   const skipped = result.skipped + result.historySkipped;
@@ -403,6 +436,7 @@ function setAppLogin(enabled) {
     menuBar: existing.ui?.menuBar === true,
     openAtLogin: enabled,
     autoCheckUpdates: existing.ui?.autoCheckUpdates !== false,
+    autoRestartCodex: existing.ui?.autoRestartCodex === true,
     browserlessProfileName: existing.browserless?.profileName,
     browserlessRegion: existing.browserless?.region,
     browserlessOnlyDomains: existing.browserless?.onlyDomains,

package/src/config.js

@@ -50,6 +50,7 @@ export function installConfig({ home, hour = 9, minute = 0, nodePath = process.e
       menuBar: existing.ui?.menuBar !== false,
       openAtLogin: existing.ui?.openAtLogin !== false,
       autoCheckUpdates: existing.ui?.autoCheckUpdates !== false,
+      autoRestartCodex: existing.ui?.autoRestartCodex === true,
     },
     browserless: {
       profileName: cleanProfileName(existing.browserless?.profileName) || "browser-cookie-bridge",
@@ -77,6 +78,7 @@ export function updatePreferences({
   menuBar,
   openAtLogin,
   autoCheckUpdates,
+  autoRestartCodex,
   browserlessProfileName,
   browserlessRegion,
   browserlessOnlyDomains,
@@ -98,6 +100,7 @@ export function updatePreferences({
     menuBar: Boolean(menuBar),
     openAtLogin: Boolean(openAtLogin),
     autoCheckUpdates: Boolean(autoCheckUpdates),
+    autoRestartCodex: Boolean(autoRestartCodex),
   };
   const region = browserlessRegion ?? config.browserless?.region ?? "sfo";
   if (!["sfo", "lon", "ams"].includes(region)) throw new Error("Browserless region must be sfo, lon, or ams");