browserclaw 0.11.3 → 0.11.5

package/dist/index.cjs

@@ -1319,7 +1319,10 @@ function normalizeCdpHttpBaseForJsonEndpoints(cdpUrl) {
     url.pathname = url.pathname.replace(/\/cdp$/, "");
     return url.toString().replace(/\/$/, "");
   } catch {
-    return cdpUrl.replace(/^ws:/, "http:").replace(/^wss:/, "https:").replace(/\/devtools\/browser\/.*$/, "").replace(/\/cdp$/, "").replace(/\/$/, "");
+    let normalized = cdpUrl.replace(/^ws:/, "http:").replace(/^wss:/, "https:");
+    const dtIdx = normalized.indexOf("/devtools/browser/");
+    if (dtIdx >= 0) normalized = normalized.slice(0, dtIdx);
+    return normalized.replace(/\/cdp$/, "").replace(/\/$/, "");
   }
 }
 function appendCdpPath(cdpUrl, cdpPath) {
@@ -1790,20 +1793,17 @@ var pageStates = /* @__PURE__ */ new WeakMap();
 var contextStates = /* @__PURE__ */ new WeakMap();
 var observedContexts = /* @__PURE__ */ new WeakSet();
 var observedPages = /* @__PURE__ */ new WeakSet();
-var nextUploadArmId = 0;
-var nextDialogArmId = 0;
-var nextDownloadArmId = 0;
-function bumpUploadArmId() {
-  nextUploadArmId += 1;
-  return nextUploadArmId;
+function bumpUploadArmId(state) {
+  state.nextArmIdUpload += 1;
+  return state.nextArmIdUpload;
 }
-function bumpDialogArmId() {
-  nextDialogArmId += 1;
-  return nextDialogArmId;
+function bumpDialogArmId(state) {
+  state.nextArmIdDialog += 1;
+  return state.nextArmIdDialog;
 }
-function bumpDownloadArmId() {
-  nextDownloadArmId += 1;
-  return nextDownloadArmId;
+function bumpDownloadArmId(state) {
+  state.nextArmIdDownload += 1;
+  return state.nextArmIdDownload;
 }
 function ensureContextState(context) {
   const existing = contextStates.get(context);
@@ -1833,7 +1833,10 @@ function ensurePageState(page) {
     nextRequestId: 0,
     armIdUpload: 0,
     armIdDialog: 0,
-    armIdDownload: 0
+    armIdDownload: 0,
+    nextArmIdUpload: 0,
+    nextArmIdDialog: 0,
+    nextArmIdDownload: 0
   };
   pageStates.set(page, state);
   if (!observedPages.has(page)) {
@@ -1891,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(),
@@ -1905,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(
@@ -2113,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);
@@ -2162,51 +2168,41 @@ function isLoopbackCdpUrl(url) {
     return false;
   }
 }
-var NoProxyLeaseManager = class {
-  leaseCount = 0;
-  snapshot = null;
-  acquire(url) {
-    if (!isLoopbackCdpUrl(url) || !hasProxyEnvConfigured()) return null;
-    if (this.leaseCount === 0 && !noProxyAlreadyCoversLocalhost()) {
-      const noProxy = process.env.NO_PROXY;
-      const noProxyLower = process.env.no_proxy;
-      const current = noProxy ?? noProxyLower ?? "";
-      const applied = current ? `${current},${LOOPBACK_ENTRIES}` : LOOPBACK_ENTRIES;
-      process.env.NO_PROXY = applied;
-      process.env.no_proxy = applied;
-      this.snapshot = { noProxy, noProxyLower, applied };
-    }
-    this.leaseCount += 1;
-    let released = false;
-    return () => {
-      if (released) return;
-      released = true;
-      this.release();
-    };
-  }
-  release() {
-    if (this.leaseCount <= 0) return;
-    this.leaseCount -= 1;
-    if (this.leaseCount > 0 || !this.snapshot) return;
-    const { noProxy, noProxyLower, applied } = this.snapshot;
-    const currentNoProxy = process.env.NO_PROXY;
-    const currentNoProxyLower = process.env.no_proxy;
-    if (currentNoProxy === applied && (currentNoProxyLower === applied || currentNoProxyLower === void 0)) {
-      if (noProxy !== void 0) process.env.NO_PROXY = noProxy;
-      else delete process.env.NO_PROXY;
-      if (noProxyLower !== void 0) process.env.no_proxy = noProxyLower;
-      else delete process.env.no_proxy;
+var envMutexPromise = Promise.resolve();
+async function withNoProxyForCdpUrl(url, fn) {
+  if (!isLoopbackCdpUrl(url) || !hasProxyEnvConfigured()) return fn();
+  const prev = envMutexPromise;
+  let release = () => {
+  };
+  envMutexPromise = new Promise((r) => {
+    release = r;
+  });
+  await prev;
+  if (noProxyAlreadyCoversLocalhost()) {
+    try {
+      return await fn();
+    } finally {
+      release();
     }
-    this.snapshot = null;
   }
-};
-var noProxyLeaseManager = new NoProxyLeaseManager();
-async function withNoProxyForCdpUrl(url, fn) {
-  const release = noProxyLeaseManager.acquire(url);
+  const savedNoProxy = process.env.NO_PROXY;
+  const savedNoProxyLower = process.env.no_proxy;
+  const current = savedNoProxy ?? savedNoProxyLower ?? "";
+  const applied = current ? `${current},${LOOPBACK_ENTRIES}` : LOOPBACK_ENTRIES;
+  process.env.NO_PROXY = applied;
+  process.env.no_proxy = applied;
   try {
     return await fn();
   } finally {
-    release?.();
+    if (process.env.NO_PROXY === applied) {
+      if (savedNoProxy !== void 0) process.env.NO_PROXY = savedNoProxy;
+      else delete process.env.NO_PROXY;
+    }
+    if (process.env.no_proxy === applied) {
+      if (savedNoProxyLower !== void 0) process.env.no_proxy = savedNoProxyLower;
+      else delete process.env.no_proxy;
+    }
+    release();
   }
 }
 new http__default.default.Agent();
@@ -2331,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)}`
+        );
       }
     }
   }
@@ -2436,7 +2435,7 @@ async function tryTerminateExecutionViaCdp(cdpUrl, targetId) {
     };
   });
 }
-async function forceDisconnectPlaywrightForTarget(opts) {
+async function forceDisconnectPlaywrightConnection(opts) {
   const normalized = normalizeCdpUrl(opts.cdpUrl);
   const cur = cachedByCdpUrl.get(normalized);
   if (!cur) return;
@@ -2453,15 +2452,21 @@ async function forceDisconnectPlaywrightForTarget(opts) {
   cur.browser.close().catch(() => {
   });
 }
+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(() => {
     });
@@ -2491,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);
@@ -2557,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) {
@@ -2685,7 +2690,7 @@ async function evaluateViaPlaywright(opts) {
   }
   if (signal !== void 0) {
     const disconnect = () => {
-      forceDisconnectPlaywrightForTarget({
+      forceDisconnectPlaywrightConnection({
         cdpUrl: opts.cdpUrl,
         targetId: opts.targetId}).catch(() => {
       });
@@ -2752,7 +2757,6 @@ function withBrowserNavigationPolicy(ssrfPolicy) {
 }
 var NETWORK_NAVIGATION_PROTOCOLS = /* @__PURE__ */ new Set(["http:", "https:"]);
 var SAFE_NON_NETWORK_URLS = /* @__PURE__ */ new Set(["about:blank"]);
-var PROXY_ENV_KEYS2 = ["HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "http_proxy", "https_proxy", "all_proxy"];
 var BLOCKED_HOSTNAMES = /* @__PURE__ */ new Set(["localhost", "localhost.localdomain", "metadata.google.internal"]);
 function isAllowedNonNetworkNavigationUrl(parsed) {
   return SAFE_NON_NETWORK_URLS.has(parsed.href);
@@ -2760,13 +2764,6 @@ function isAllowedNonNetworkNavigationUrl(parsed) {
 function isPrivateNetworkAllowedByPolicy(policy) {
   return policy?.dangerouslyAllowPrivateNetwork === true || policy?.allowPrivateNetwork === true;
 }
-function hasProxyEnvConfigured2(env = process.env) {
-  for (const key of PROXY_ENV_KEYS2) {
-    const value = env[key];
-    if (typeof value === "string" && value.trim().length > 0) return true;
-  }
-  return false;
-}
 function normalizeHostname(hostname) {
   let h = hostname.trim().toLowerCase();
   if (h.startsWith("[") && h.endsWith("]")) h = h.slice(1, -1);
@@ -3077,7 +3074,7 @@ async function assertBrowserNavigationAllowed(opts) {
     if (isAllowedNonNetworkNavigationUrl(parsed)) return;
     throw new InvalidBrowserNavigationUrlError(`Navigation blocked: unsupported protocol "${parsed.protocol}"`);
   }
-  if (hasProxyEnvConfigured2() && !isPrivateNetworkAllowedByPolicy(opts.ssrfPolicy)) {
+  if (hasProxyEnvConfigured() && !isPrivateNetworkAllowedByPolicy(opts.ssrfPolicy)) {
     throw new InvalidBrowserNavigationUrlError(
       "Navigation blocked: strict browser SSRF policy cannot be enforced while env proxy variables are set"
     );
@@ -3532,7 +3529,7 @@ async function armDialogViaPlaywright(opts) {
   const page = await getPageForTargetId({ cdpUrl: opts.cdpUrl, targetId: opts.targetId });
   const state = ensurePageState(page);
   const timeout = normalizeTimeoutMs(opts.timeoutMs, 12e4);
-  state.armIdDialog = bumpDialogArmId();
+  state.armIdDialog = bumpDialogArmId(state);
   const armId = state.armIdDialog;
   page.waitForEvent("dialog", { timeout }).then(async (dialog) => {
     if (state.armIdDialog !== armId) return;
@@ -3550,7 +3547,7 @@ async function armFileUploadViaPlaywright(opts) {
   const page = await getPageForTargetId({ cdpUrl: opts.cdpUrl, targetId: opts.targetId });
   const state = ensurePageState(page);
   const timeout = normalizeTimeoutMs(opts.timeoutMs, 12e4);
-  state.armIdUpload = bumpUploadArmId();
+  state.armIdUpload = bumpUploadArmId(state);
   const armId = state.armIdUpload;
   page.waitForEvent("filechooser", { timeout }).then(async (fileChooser) => {
     if (state.armIdUpload !== armId) return;
@@ -3710,7 +3707,7 @@ async function navigateViaPlaywright(opts) {
     response = await navigate();
   } catch (err) {
     if (!isRetryableNavigateError(err)) throw err;
-    await forceDisconnectPlaywrightForTarget({
+    await forceDisconnectPlaywrightConnection({
       cdpUrl: opts.cdpUrl,
       targetId: opts.targetId}).catch(() => {
     });
@@ -3852,18 +3849,12 @@ async function resizeViewportViaPlaywright(opts) {
 
 // src/actions/wait.ts
 var MAX_WAIT_TIME_MS = 3e4;
-function resolveBoundedDelayMs2(value, label, maxMs) {
-  const normalized = Math.floor(value ?? 0);
-  if (!Number.isFinite(normalized) || normalized < 0) throw new Error(`${label} must be >= 0`);
-  if (normalized > maxMs) throw new Error(`${label} exceeds maximum of ${String(maxMs)}ms`);
-  return normalized;
-}
 async function waitForViaPlaywright(opts) {
   const page = await getPageForTargetId({ cdpUrl: opts.cdpUrl, targetId: opts.targetId });
   ensurePageState(page);
   const timeout = normalizeTimeoutMs(opts.timeoutMs, 2e4);
   if (typeof opts.timeMs === "number" && Number.isFinite(opts.timeMs)) {
-    await page.waitForTimeout(resolveBoundedDelayMs2(opts.timeMs, "wait timeMs", MAX_WAIT_TIME_MS));
+    await page.waitForTimeout(resolveBoundedDelayMs(opts.timeMs, "wait timeMs", MAX_WAIT_TIME_MS));
   }
   if (opts.text !== void 0 && opts.text !== "") {
     await page.waitForFunction((text) => (document.body?.innerText ?? "").includes(text), opts.text, { timeout });
@@ -4120,7 +4111,7 @@ async function downloadViaPlaywright(opts) {
   const timeout = normalizeTimeoutMs(opts.timeoutMs, 12e4);
   const outPath = opts.path.trim();
   if (!outPath) throw new Error("path is required");
-  state.armIdDownload = bumpDownloadArmId();
+  state.armIdDownload = bumpDownloadArmId(state);
   const armId = state.armIdDownload;
   const waiter = createPageDownloadWaiter(page, timeout);
   try {
@@ -4140,7 +4131,7 @@ async function waitForDownloadViaPlaywright(opts) {
   const page = await getPageForTargetId({ cdpUrl: opts.cdpUrl, targetId: opts.targetId });
   const state = ensurePageState(page);
   const timeout = normalizeTimeoutMs(opts.timeoutMs, 12e4);
-  state.armIdDownload = bumpDownloadArmId();
+  state.armIdDownload = bumpDownloadArmId(state);
   const armId = state.armIdDownload;
   const waiter = createPageDownloadWaiter(page, timeout);
   try {
@@ -6577,6 +6568,7 @@ var BrowserClaw = class _BrowserClaw {
   }
 };
 
+exports.BlockedBrowserTargetError = BlockedBrowserTargetError;
 exports.BrowserClaw = BrowserClaw;
 exports.BrowserTabNotFoundError = BrowserTabNotFoundError;
 exports.CrawlPage = CrawlPage;
@@ -6591,6 +6583,7 @@ exports.createPinnedLookup = createPinnedLookup;
 exports.detectChallengeViaPlaywright = detectChallengeViaPlaywright;
 exports.ensureContextState = ensureContextState;
 exports.executeSingleAction = executeSingleAction;
+exports.forceDisconnectPlaywrightConnection = forceDisconnectPlaywrightConnection;
 exports.forceDisconnectPlaywrightForTarget = forceDisconnectPlaywrightForTarget;
 exports.getChromeWebSocketUrl = getChromeWebSocketUrl;
 exports.getRestoredPageForTarget = getRestoredPageForTarget;
@@ -6606,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;