bb-browser 0.5.1 → 0.6.0

package/dist/cli.js

@@ -126,6 +126,21 @@ async function isDaemonRunning() {
     return false;
   }
 }
+async function isExtensionConnected() {
+  try {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 2e3);
+    const response = await fetch(`${DAEMON_BASE_URL}/status`, {
+      signal: controller.signal
+    });
+    clearTimeout(timeoutId);
+    if (!response.ok) return false;
+    const data = await response.json();
+    return !!data.extensionConnected;
+  } catch {
+    return false;
+  }
+}
 async function waitForDaemon(timeoutMs) {
   const startTime = Date.now();
   while (Date.now() - startTime < timeoutMs) {
@@ -156,6 +171,11 @@ async function ensureDaemonRunning() {
       "\u65E0\u6CD5\u542F\u52A8 Daemon\u3002\u8BF7\u624B\u52A8\u8FD0\u884C bb-browser daemon \u6216 bb-daemon \u542F\u52A8\u670D\u52A1"
     );
   }
+  const extStart = Date.now();
+  while (Date.now() - extStart < 1e4) {
+    if (await isExtensionConnected()) return;
+    await new Promise((r) => setTimeout(r, POLL_INTERVAL));
+  }
 }
 async function stopDaemon() {
   try {
@@ -561,6 +581,58 @@ async function siteRun(name, args, options) {
   const jsBody = jsContent.replace(/\/\*\s*@meta[\s\S]*?\*\//, "").trim();
   const argsJson = JSON.stringify(argMap);
   const script = `(${jsBody})(${argsJson})`;
+  if (options.openclaw) {
+    const { ocGetTabs, ocFindTabByDomain, ocOpenTab, ocEvaluate } = await import("./openclaw-bridge-P3G4KGYM.js");
+    let targetId;
+    if (site.domain) {
+      const tabs = ocGetTabs();
+      const existing = ocFindTabByDomain(tabs, site.domain);
+      if (existing) {
+        targetId = existing.targetId;
+      } else {
+        targetId = ocOpenTab(`https://${site.domain}`);
+        await new Promise((resolve2) => setTimeout(resolve2, 3e3));
+      }
+    } else {
+      const tabs = ocGetTabs();
+      if (tabs.length === 0) {
+        throw new Error("No tabs open in OpenClaw browser");
+      }
+      targetId = tabs[0].targetId;
+    }
+    const wrappedFn = `async () => { const __fn = ${jsBody}; return await __fn(${argsJson}); }`;
+    const parsed2 = ocEvaluate(targetId, wrappedFn);
+    if (typeof parsed2 === "object" && parsed2 !== null && "error" in parsed2) {
+      const errObj = parsed2;
+      const checkText = `${errObj.error} ${errObj.hint || ""}`;
+      const isAuthError = /401|403|unauthorized|forbidden|not.?logged|login.?required|sign.?in|auth/i.test(checkText);
+      const loginHint = isAuthError && site.domain ? `Please log in to https://${site.domain} in your OpenClaw browser first, then retry.` : void 0;
+      const hint = loginHint || errObj.hint;
+      const reportHint = `If this is an adapter bug, report via: gh issue create --repo epiral/bb-sites --title "[${name}] <description>" OR: bb-browser site github/issue-create epiral/bb-sites --title "[${name}] <description>"`;
+      if (options.json) {
+        console.log(JSON.stringify({ id: "openclaw", success: false, error: errObj.error, hint, reportHint }));
+      } else {
+        console.error(`[error] site ${name}: ${errObj.error}`);
+        if (hint) console.error(`  Hint: ${hint}`);
+        console.error(`  Report: gh issue create --repo epiral/bb-sites --title "[${name}] ..."`);
+        console.error(`     or: bb-browser site github/issue-create epiral/bb-sites --title "[${name}] ..."`);
+      }
+      process.exit(1);
+    }
+    if (options.jq) {
+      const { applyJq: applyJq2 } = await import("./jq-HHMLHEPA.js");
+      const expr = options.jq.replace(/^\.data\./, ".");
+      const results = applyJq2(parsed2, expr);
+      for (const r of results) {
+        console.log(typeof r === "string" ? r : JSON.stringify(r));
+      }
+    } else if (options.json) {
+      console.log(JSON.stringify({ id: "openclaw", success: true, data: parsed2 }));
+    } else {
+      console.log(JSON.stringify(parsed2, null, 2));
+    }
+    return;
+  }
   await ensureDaemonRunning();
   let targetTabId = options.tabId;
   if (!targetTabId && site.domain) {
@@ -2318,6 +2390,8 @@ function parseArgs(argv) {
         result.flags.jq = args[nextIdx];
         result.flags.json = true;
       }
+    } else if (arg === "--openclaw") {
+      result.flags.openclaw = true;
     } else if (arg === "--help" || arg === "-h") {
       result.flags.help = true;
     } else if (arg === "--version" || arg === "-v") {
@@ -2721,7 +2795,8 @@ async function main() {
           json: parsed.flags.json,
           jq: parsed.flags.jq,
           days: parsed.flags.days,
-          tabId: globalTabId
+          tabId: globalTabId,
+          openclaw: parsed.flags.openclaw
         });
         break;
       }