browserclaw 0.11.4 → 0.11.5

package/dist/index.cjs

@@ -1894,6 +1894,7 @@ function ensurePageState(page) {
     page.on("dialog", (dialog) => {
       if (state.armIdDialog > 0) return;
       if (state.dialogHandler) {
+        const handler = state.dialogHandler;
         let handled = false;
         const event = {
           type: dialog.type(),
@@ -1908,7 +1909,7 @@ function ensurePageState(page) {
             return dialog.dismiss();
           }
         };
-        Promise.resolve(state.dialogHandler(event)).then(() => {
+        Promise.resolve().then(() => handler(event)).then(() => {
           if (!handled) {
             dialog.dismiss().catch((err) => {
               console.warn(
@@ -2116,7 +2117,9 @@ async function fetchJsonForCdp(url, timeoutMs) {
     const res = await fetch(url, { signal: ctrl.signal });
     if (!res.ok) return null;
     return await res.json();
-  } catch {
+  } catch (err) {
+    if (process.env.DEBUG !== void 0 && process.env.DEBUG !== "")
+      console.warn(`[browserclaw] fetchJsonForCdp ${url} failed: ${err instanceof Error ? err.message : String(err)}`);
     return null;
   } finally {
     clearTimeout(t);
@@ -2324,7 +2327,10 @@ async function disconnectBrowser() {
     for (const p of connectingByCdpUrl.values()) {
       try {
         await p;
-      } catch {
+      } catch (err) {
+        console.warn(
+          `[browserclaw] disconnectBrowser: pending connect failed: ${err instanceof Error ? err.message : String(err)}`
+        );
       }
     }
   }
@@ -2450,12 +2456,17 @@ var forceDisconnectPlaywrightForTarget = forceDisconnectPlaywrightConnection;
 function getAllPages(browser) {
   return browser.contexts().flatMap((c) => c.pages());
 }
+var pageTargetIdCache = /* @__PURE__ */ new WeakMap();
 async function pageTargetId(page) {
+  const cached = pageTargetIdCache.get(page);
+  if (cached !== void 0) return cached;
   const session = await page.context().newCDPSession(page);
   try {
     const info = await session.send("Target.getTargetInfo");
     const targetInfo = info.targetInfo;
-    return (targetInfo?.targetId ?? "").trim() || null;
+    const id = (targetInfo?.targetId ?? "").trim() || null;
+    if (id !== null) pageTargetIdCache.set(page, id);
+    return id;
   } finally {
     await session.detach().catch(() => {
     });
@@ -2485,17 +2496,19 @@ async function findPageByTargetIdViaTargetList(pages, targetId, cdpUrl) {
 }
 async function findPageByTargetId(browser, targetId, cdpUrl) {
   const pages = getAllPages(browser);
-  let resolvedViaCdp = false;
-  for (const page of pages) {
-    let tid = null;
-    try {
-      tid = await pageTargetId(page);
-      resolvedViaCdp = true;
-    } catch {
-      tid = null;
-    }
-    if (tid !== null && tid !== "" && tid === targetId) return page;
-  }
+  const results = await Promise.all(
+    pages.map(async (page) => {
+      try {
+        const tid = await pageTargetId(page);
+        return { page, tid };
+      } catch {
+        return { page, tid: null };
+      }
+    })
+  );
+  const resolvedViaCdp = results.some(({ tid }) => tid !== null);
+  const matched = results.find(({ tid }) => tid !== null && tid !== "" && tid === targetId);
+  if (matched) return matched.page;
   if (cdpUrl !== void 0 && cdpUrl !== "") {
     try {
       return await findPageByTargetIdViaTargetList(pages, targetId, cdpUrl);
@@ -2551,9 +2564,7 @@ async function getPageForTargetId(opts) {
     );
   }
   if (isBlockedPageRef(opts.cdpUrl, found)) throw new BlockedBrowserTargetError();
-  const foundTargetId = await pageTargetId(found).catch(() => null);
-  if (foundTargetId !== null && foundTargetId !== "" && isBlockedTarget(opts.cdpUrl, foundTargetId))
-    throw new BlockedBrowserTargetError();
+  if (isBlockedTarget(opts.cdpUrl, opts.targetId)) throw new BlockedBrowserTargetError();
   return found;
 }
 async function resolvePageByTargetIdOrThrow(opts) {
@@ -6557,6 +6568,7 @@ var BrowserClaw = class _BrowserClaw {
   }
 };
 
+exports.BlockedBrowserTargetError = BlockedBrowserTargetError;
 exports.BrowserClaw = BrowserClaw;
 exports.BrowserTabNotFoundError = BrowserTabNotFoundError;
 exports.CrawlPage = CrawlPage;
@@ -6587,6 +6599,7 @@ exports.resolveBoundedDelayMs = resolveBoundedDelayMs;
 exports.resolveInteractionTimeoutMs = resolveInteractionTimeoutMs;
 exports.resolvePageByTargetIdOrThrow = resolvePageByTargetIdOrThrow;
 exports.resolvePinnedHostnameWithPolicy = resolvePinnedHostnameWithPolicy;
+exports.resolveStrictExistingPathsWithinRoot = resolveStrictExistingPathsWithinRoot;
 exports.resolveStrictExistingUploadPaths = resolveStrictExistingUploadPaths;
 exports.sanitizeUntrustedFileName = sanitizeUntrustedFileName;
 exports.setDialogHandler = setDialogHandler;