browserclaw 0.2.9 → 0.3.0

package/dist/index.d.cts

@@ -1,4 +1,5 @@
 import * as playwright_core from 'playwright-core';
+import { lookup } from 'node:dns/promises';
 
 interface FrameEvalResult {
     frameUrl: string;
@@ -196,7 +197,7 @@ interface ClickOptions {
     /** Mouse button to use */
     button?: 'left' | 'right' | 'middle';
     /** Modifier keys to hold during click */
-    modifiers?: ('Alt' | 'Control' | 'Meta' | 'Shift')[];
+    modifiers?: ('Alt' | 'Control' | 'ControlOrMeta' | 'Meta' | 'Shift')[];
     /** Timeout in milliseconds. Default: `8000` */
     timeoutMs?: number;
 }
@@ -683,6 +684,8 @@ declare class CrawlPage {
      */
     evaluate(fn: string, opts?: {
         ref?: string;
+        timeoutMs?: number;
+        signal?: AbortSignal;
     }): Promise<unknown>;
     /**
      * Run JavaScript in ALL frames on the page (including cross-origin iframes).
@@ -1107,6 +1110,7 @@ declare class BrowserClaw {
     stop(): Promise<void>;
 }
 
+type LookupFn = typeof lookup;
 /**
  * Thrown when a navigation URL is blocked by SSRF policy.
  * Callers can catch this specifically to distinguish navigation blocks
@@ -1121,5 +1125,13 @@ type BrowserNavigationPolicyOptions = {
 };
 /** Build a BrowserNavigationPolicyOptions from an SsrfPolicy. */
 declare function withBrowserNavigationPolicy(ssrfPolicy?: SsrfPolicy): BrowserNavigationPolicyOptions;
+/**
+ * Assert that a URL is allowed for browser navigation under the given SSRF policy.
+ * Throws `InvalidBrowserNavigationUrlError` if the URL is blocked.
+ */
+declare function assertBrowserNavigationAllowed(opts: {
+    url: string;
+    lookupFn?: LookupFn;
+} & BrowserNavigationPolicyOptions): Promise<void>;
 
-export { type AriaNode, type AriaSnapshotResult, BrowserClaw, type BrowserNavigationPolicyOptions, type BrowserTab, type ChromeExecutable, type ChromeKind, type ClickOptions, type ColorScheme, type ConnectOptions, type ConsoleMessage, type CookieData, CrawlPage, type DialogOptions, type DownloadResult, type FormField, type FrameEvalResult, type GeolocationOptions, type HttpCredentials, InvalidBrowserNavigationUrlError, type LaunchOptions, type NetworkRequest, type PageError, type ResponseBodyResult, type RoleRefInfo, type RoleRefs, type ScreenshotOptions, type SnapshotOptions, type SnapshotResult, type SnapshotStats, type SsrfPolicy, type StorageKind, type TraceStartOptions, type TypeOptions, type UntrustedContentMeta, type WaitOptions, withBrowserNavigationPolicy };
+export { type AriaNode, type AriaSnapshotResult, BrowserClaw, type BrowserNavigationPolicyOptions, type BrowserTab, type ChromeExecutable, type ChromeKind, type ClickOptions, type ColorScheme, type ConnectOptions, type ConsoleMessage, type CookieData, CrawlPage, type DialogOptions, type DownloadResult, type FormField, type FrameEvalResult, type GeolocationOptions, type HttpCredentials, InvalidBrowserNavigationUrlError, type LaunchOptions, type LookupFn, type NetworkRequest, type PageError, type ResponseBodyResult, type RoleRefInfo, type RoleRefs, type ScreenshotOptions, type SnapshotOptions, type SnapshotResult, type SnapshotStats, type SsrfPolicy, type StorageKind, type TraceStartOptions, type TypeOptions, type UntrustedContentMeta, type WaitOptions, assertBrowserNavigationAllowed, withBrowserNavigationPolicy };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import * as playwright_core from 'playwright-core';
+import { lookup } from 'node:dns/promises';
 
 interface FrameEvalResult {
     frameUrl: string;
@@ -196,7 +197,7 @@ interface ClickOptions {
     /** Mouse button to use */
     button?: 'left' | 'right' | 'middle';
     /** Modifier keys to hold during click */
-    modifiers?: ('Alt' | 'Control' | 'Meta' | 'Shift')[];
+    modifiers?: ('Alt' | 'Control' | 'ControlOrMeta' | 'Meta' | 'Shift')[];
     /** Timeout in milliseconds. Default: `8000` */
     timeoutMs?: number;
 }
@@ -683,6 +684,8 @@ declare class CrawlPage {
      */
     evaluate(fn: string, opts?: {
         ref?: string;
+        timeoutMs?: number;
+        signal?: AbortSignal;
     }): Promise<unknown>;
     /**
      * Run JavaScript in ALL frames on the page (including cross-origin iframes).
@@ -1107,6 +1110,7 @@ declare class BrowserClaw {
     stop(): Promise<void>;
 }
 
+type LookupFn = typeof lookup;
 /**
  * Thrown when a navigation URL is blocked by SSRF policy.
  * Callers can catch this specifically to distinguish navigation blocks
@@ -1121,5 +1125,13 @@ type BrowserNavigationPolicyOptions = {
 };
 /** Build a BrowserNavigationPolicyOptions from an SsrfPolicy. */
 declare function withBrowserNavigationPolicy(ssrfPolicy?: SsrfPolicy): BrowserNavigationPolicyOptions;
+/**
+ * Assert that a URL is allowed for browser navigation under the given SSRF policy.
+ * Throws `InvalidBrowserNavigationUrlError` if the URL is blocked.
+ */
+declare function assertBrowserNavigationAllowed(opts: {
+    url: string;
+    lookupFn?: LookupFn;
+} & BrowserNavigationPolicyOptions): Promise<void>;
 
-export { type AriaNode, type AriaSnapshotResult, BrowserClaw, type BrowserNavigationPolicyOptions, type BrowserTab, type ChromeExecutable, type ChromeKind, type ClickOptions, type ColorScheme, type ConnectOptions, type ConsoleMessage, type CookieData, CrawlPage, type DialogOptions, type DownloadResult, type FormField, type FrameEvalResult, type GeolocationOptions, type HttpCredentials, InvalidBrowserNavigationUrlError, type LaunchOptions, type NetworkRequest, type PageError, type ResponseBodyResult, type RoleRefInfo, type RoleRefs, type ScreenshotOptions, type SnapshotOptions, type SnapshotResult, type SnapshotStats, type SsrfPolicy, type StorageKind, type TraceStartOptions, type TypeOptions, type UntrustedContentMeta, type WaitOptions, withBrowserNavigationPolicy };
+export { type AriaNode, type AriaSnapshotResult, BrowserClaw, type BrowserNavigationPolicyOptions, type BrowserTab, type ChromeExecutable, type ChromeKind, type ClickOptions, type ColorScheme, type ConnectOptions, type ConsoleMessage, type CookieData, CrawlPage, type DialogOptions, type DownloadResult, type FormField, type FrameEvalResult, type GeolocationOptions, type HttpCredentials, InvalidBrowserNavigationUrlError, type LaunchOptions, type LookupFn, type NetworkRequest, type PageError, type ResponseBodyResult, type RoleRefInfo, type RoleRefs, type ScreenshotOptions, type SnapshotOptions, type SnapshotResult, type SnapshotStats, type SsrfPolicy, type StorageKind, type TraceStartOptions, type TypeOptions, type UntrustedContentMeta, type WaitOptions, assertBrowserNavigationAllowed, withBrowserNavigationPolicy };

package/dist/index.js

@@ -1404,7 +1404,7 @@ async function assertBrowserNavigationAllowed(opts) {
     const hostname = parsed.hostname.toLowerCase();
     if (allowedHostnames.some((h) => h.toLowerCase() === hostname)) return;
   }
-  if (await isInternalUrlResolved(opts.url)) {
+  if (await isInternalUrlResolved(opts.url, opts.lookupFn)) {
     throw new InvalidBrowserNavigationUrlError(
       `Navigation to internal/loopback address blocked: "${opts.url}". Use ssrfPolicy: { allowPrivateNetwork: true } if this is intentional.`
     );
@@ -1532,7 +1532,7 @@ function isInternalUrl(url) {
   }
   return false;
 }
-async function isInternalUrlResolved(url) {
+async function isInternalUrlResolved(url, lookupFn = lookup) {
   if (isInternalUrl(url)) return true;
   let parsed;
   try {
@@ -1541,7 +1541,7 @@ async function isInternalUrlResolved(url) {
     return true;
   }
   try {
-    const { address } = await lookup(parsed.hostname);
+    const { address } = await lookupFn(parsed.hostname);
     if (isInternalIP(address)) return true;
   } catch {
     return true;
@@ -1699,6 +1699,7 @@ async function evaluateViaPlaywright(opts) {
   const page = await getPageForTargetId({ cdpUrl: opts.cdpUrl, targetId: opts.targetId });
   ensurePageState(page);
   restoreRoleRefsForTarget({ cdpUrl: opts.cdpUrl, targetId: opts.targetId, page });
+  const timeout = opts.timeoutMs != null ? opts.timeoutMs : void 0;
   if (opts.ref) {
     const locator = refLocator(page, opts.ref);
     return await locator.evaluate(
@@ -1711,10 +1712,11 @@ async function evaluateViaPlaywright(opts) {
           throw new Error("Invalid evaluate function: " + (err instanceof Error ? err.message : String(err)));
         }
       },
-      fnText
+      fnText,
+      { timeout }
     );
   }
-  return await page.evaluate(
+  const evalPromise = page.evaluate(
     // eslint-disable-next-line no-eval
     (fnBody) => {
       try {
@@ -1726,6 +1728,13 @@ async function evaluateViaPlaywright(opts) {
     },
     fnText
   );
+  if (!opts.signal) return evalPromise;
+  return Promise.race([
+    evalPromise,
+    new Promise((_, reject) => {
+      opts.signal.addEventListener("abort", () => reject(new Error("Evaluate aborted")), { once: true });
+    })
+  ]);
 }
 
 // src/actions/download.ts
@@ -2504,7 +2513,9 @@ var CrawlPage = class {
       cdpUrl: this.cdpUrl,
       targetId: this.targetId,
       fn,
-      ref: opts?.ref
+      ref: opts?.ref,
+      timeoutMs: opts?.timeoutMs,
+      signal: opts?.signal
     });
   }
   /**
@@ -3097,6 +3108,6 @@ var BrowserClaw = class _BrowserClaw {
   }
 };
 
-export { BrowserClaw, CrawlPage, InvalidBrowserNavigationUrlError, withBrowserNavigationPolicy };
+export { BrowserClaw, CrawlPage, InvalidBrowserNavigationUrlError, assertBrowserNavigationAllowed, withBrowserNavigationPolicy };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map