@apifuse/provider-sdk 2.2.0-beta.3 → 2.2.0-beta.30

package/src/runtime/browser.ts

@@ -1,11 +1,12 @@
 import { createRequire } from "node:module";
 import type { Frame, LaunchOptions, Locator, Page, Request, Route } from "playwright";
 
-import { ProviderError } from "../errors";
+import { ProviderError } from "../errors.js";
 import type {
 	BrowserChallengeRequest,
 	BrowserChallengeResult,
 	BrowserClient as BrowserClientContract,
+	BrowserCookie,
 	BrowserEngine,
 	BrowserFrame,
 	BrowserLocator,
@@ -16,7 +17,7 @@ import type {
 	BrowserResourceMethod,
 	BrowserResourcePolicy,
 	BrowserResourceRequest,
-} from "../types";
+} from "../types.js";
 
 const require = createRequire(import.meta.url);
 const DEFAULT_WAIT_TIMEOUT_MS = 30_000;
@@ -29,9 +30,7 @@ type PlaywrightExtraModule = {
 	chromium: PlaywrightModule["chromium"] & { use(plugin: unknown): unknown };
 };
 
-type StealthPluginFactory = (options?: {
-	enabledEvasions?: Set<string>;
-}) => unknown;
+type StealthPluginFactory = (options?: { enabledEvasions?: Set<string> }) => unknown;
 
 type PoolAcquireResponse = {
 	browserContextId?: string;
@@ -44,19 +43,35 @@ type PoolReleaseRequest = {
 	pageId: string;
 };
 
-type JsonRpcId = number;
+type WebSocketCommandId = number;
 
-type JsonRpcError = {
+type WebSocketCommandError = {
 	code?: number;
 	message?: string;
 };
 
-type JsonRpcMessage = {
-	error?: JsonRpcError;
-	id?: JsonRpcId;
+type WebSocketCommandMessage = {
+	error?: WebSocketCommandError;
+	id?: WebSocketCommandId;
+	jsonrpc?: "2.0";
 	method?: string;
 	params?: Record<string, unknown>;
 	result?: Record<string, unknown>;
+	sessionId?: string;
+};
+
+type CdpCommandFrame = {
+	id: WebSocketCommandId;
+	method: string;
+	params: Record<string, unknown>;
+	sessionId?: string;
+};
+
+type JsonRpcCommandFrame = {
+	id: WebSocketCommandId;
+	jsonrpc: "2.0";
+	method: string;
+	params: Record<string, unknown>;
 };
 
 type CdpFrameTreeNode = {
@@ -81,9 +96,7 @@ type CdpFetchFulfillParams = {
 
 type BrowserPageContract = BrowserPage;
 
-function toResourceBody(
-	body: BrowserResourceBody | undefined,
-): Buffer | string | undefined {
+function toResourceBody(body: BrowserResourceBody | undefined): Buffer | string | undefined {
 	if (body === undefined || typeof body === "string" || Buffer.isBuffer(body)) {
 		return body;
 	}
@@ -99,9 +112,7 @@ function isResourceMethod(method: string): method is BrowserResourceMethod {
 	return method === "GET" || method === "HEAD";
 }
 
-async function toResourceRequest(
-	request: Request,
-): Promise<BrowserResourceRequest | null> {
+async function toResourceRequest(request: Request): Promise<BrowserResourceRequest | null> {
 	const method = request.method().toUpperCase();
 	if (!isResourceMethod(method)) {
 		return null;
@@ -139,8 +150,7 @@ function toCdpResourceRequest(
 		request: {
 			headers: toCdpResourceHeaders(rawRequest.headers),
 			method,
-			resourceType:
-				typeof params.resourceType === "string" ? params.resourceType : undefined,
+			resourceType: typeof params.resourceType === "string" ? params.resourceType : undefined,
 			url,
 		},
 	};
@@ -189,15 +199,14 @@ function toCdpFulfillParams(
 ): CdpFetchFulfillParams {
 	const body = toResourceBody(decision.body);
 	return {
-		...(body === undefined
-			? {}
-			: { body: Buffer.from(body).toString("base64") }),
+		...(body === undefined ? {} : { body: Buffer.from(body).toString("base64") }),
 		...(decision.headers === undefined
 			? {}
 			: {
-					responseHeaders: Object.entries(decision.headers).map(
-						([name, value]) => ({ name, value }),
-					),
+					responseHeaders: Object.entries(decision.headers).map(([name, value]) => ({
+						name,
+						value,
+					})),
 				}),
 		requestId,
 		responseCode: decision.status ?? 200,
@@ -228,18 +237,14 @@ type SupportedBrowserClient = {
 	close(): Promise<void>;
 	newPage(): Promise<BrowserPageContract>;
 	rawPage(): Promise<BrowserPageContract>;
-	withIsolatedContext<T>(
-		handler: (page: BrowserPageContract) => Promise<T>,
-	): Promise<T>;
+	withIsolatedContext<T>(handler: (page: BrowserPageContract) => Promise<T>): Promise<T>;
 };
 
 function getDefaultCdpPoolUrl(env = process.env): string | undefined {
 	return env.APIFUSE__CDP_POOL__URL;
 }
 
-async function importOptionalModule<T extends object>(
-	moduleName: string,
-): Promise<T> {
+async function importOptionalModule<T extends object>(moduleName: string): Promise<T> {
 	return (await import(moduleName)) as T;
 }
 
@@ -285,7 +290,13 @@ function formatExpression<T>(fn: string | (() => T)): string {
 
 function toLaunchOptions(options: BrowserClientOptions): LaunchOptions {
 	return {
-		args: options.extraArgs,
+		// `extraArgs` is optional, but playwright-extra's stealth evasions mutate
+		// `options.args` unguarded (navigator.webdriver does
+		// `options.args.findIndex(...)` in beforeLaunch). Forwarding `undefined`
+		// therefore crashes every stealth launch that omits extraArgs with
+		// "TypeError: undefined is not an object (evaluating 'options.args.findIndex')".
+		// Always hand the launcher a concrete array.
+		args: options.extraArgs ?? [],
 		executablePath: options.executablePath,
 		headless: options.headless ?? true,
 		proxy: options.proxy ? { server: options.proxy } : undefined,
@@ -369,9 +380,7 @@ async function loadPlaywright(): Promise<PlaywrightModule> {
 	}
 
 	try {
-		return unwrapModuleDefault(
-			await importOptionalModule<PlaywrightModule>("playwright"),
-		);
+		return unwrapModuleDefault(await importOptionalModule<PlaywrightModule>("playwright"));
 	} catch (error) {
 		if (isModuleNotFoundError(error)) {
 			throw new ProviderError("Playwright is not installed", {
@@ -419,19 +428,14 @@ async function loadPlaywrightExtra(): Promise<PlaywrightExtraModule> {
 async function loadStealthPluginFactory(): Promise<StealthPluginFactory> {
 	try {
 		return unwrapModuleDefault(
-			await importOptionalModule<StealthPluginFactory>(
-				"puppeteer-extra-plugin-stealth",
-			),
+			await importOptionalModule<StealthPluginFactory>("puppeteer-extra-plugin-stealth"),
 		);
 	} catch (error) {
 		if (isModuleNotFoundError(error)) {
-			throw new ProviderError(
-				"puppeteer-extra-plugin-stealth is not installed",
-				{
-					cause: error instanceof Error ? error : undefined,
-					fix: "Run: bun add playwright-extra puppeteer-extra-plugin-stealth",
-				},
-			);
+			throw new ProviderError("puppeteer-extra-plugin-stealth is not installed", {
+				cause: error instanceof Error ? error : undefined,
+				fix: "Run: bun add playwright-extra puppeteer-extra-plugin-stealth",
+			});
 		}
 
 		throw error;
@@ -503,10 +507,7 @@ class PlaywrightBrowserPage implements BrowserPageContract {
 		return await this.page.evaluate(fn);
 	}
 
-	async waitForSelector(
-		selector: string,
-		options?: { timeout?: number },
-	): Promise<void> {
+	async waitForSelector(selector: string, options?: { timeout?: number }): Promise<void> {
 		await this.page.waitForSelector(selector, options);
 	}
 
@@ -551,13 +552,12 @@ class PlaywrightBrowserPage implements BrowserPageContract {
 		await this.page.close();
 	}
 
-	async withResourcePolicy<T>(
-		policy: BrowserResourcePolicy,
-		run: () => Promise<T>,
-	): Promise<T> {
-		const allowedMethods = new Set(
-			policy.allowedMethods ?? DEFAULT_RESOURCE_METHODS,
-		);
+	async cookies(): Promise<readonly BrowserCookie[]> {
+		return (await this.page.context().cookies()).map(toBrowserCookie);
+	}
+
+	async withResourcePolicy<T>(policy: BrowserResourcePolicy, run: () => Promise<T>): Promise<T> {
+		const allowedMethods = new Set(policy.allowedMethods ?? DEFAULT_RESOURCE_METHODS);
 		const handler = async (route: Route): Promise<void> => {
 			const request = await toResourceRequest(route.request());
 			if (!request || !allowedMethods.has(request.method)) {
@@ -623,9 +623,7 @@ class PlaywrightBrowserClient implements SupportedBrowserClient {
 		});
 	}
 
-	async withIsolatedContext<T>(
-		handler: (page: BrowserPageContract) => Promise<T>,
-	): Promise<T> {
+	async withIsolatedContext<T>(handler: (page: BrowserPageContract) => Promise<T>): Promise<T> {
 		const browser = await this.ensureBrowser();
 		const context = await browser.newContext();
 		const page = await context.newPage();
@@ -670,15 +668,12 @@ function normalizeWebSocketEndpoint(endpoint: string): string {
 	throw new Error(`Unsupported WebSocket endpoint protocol: ${url.protocol}`);
 }
 
-class JsonRpcWebSocketClient {
+abstract class WebSocketCommandClient {
 	private nextId = 1;
 	private readonly endpoint: string;
-	private readonly listeners = new Map<
-		string,
-		Set<(params: unknown) => void>
-	>();
+	private readonly listeners = new Map<string, Set<(params: unknown) => void>>();
 	private readonly pending = new Map<
-		JsonRpcId,
+		WebSocketCommandId,
 		{
 			reject: (reason?: unknown) => void;
 			resolve: (value: Record<string, unknown>) => void;
@@ -714,14 +709,7 @@ class JsonRpcWebSocketClient {
 		return await new Promise<Record<string, unknown>>((resolve, reject) => {
 			this.pending.set(id, { resolve, reject });
 
-			socket.send(
-				JSON.stringify({
-					id,
-					jsonrpc: "2.0",
-					method,
-					params,
-				}),
-			);
+			socket.send(JSON.stringify(this.createCommandFrame(id, method, params)));
 		});
 	}
 
@@ -737,6 +725,12 @@ class JsonRpcWebSocketClient {
 		this.socketPromise = undefined;
 	}
 
+	protected abstract createCommandFrame(
+		id: WebSocketCommandId,
+		method: string,
+		params: Record<string, unknown>,
+	): CdpCommandFrame | JsonRpcCommandFrame;
+
 	private async getSocket(): Promise<WebSocket> {
 		if (this.socket?.readyState === WebSocket.OPEN) {
 			return this.socket;
@@ -759,7 +753,7 @@ class JsonRpcWebSocketClient {
 					typeof event.data === "string"
 						? event.data
 						: Buffer.from(event.data as ArrayBufferLike).toString("utf8");
-				const payload = JSON.parse(rawData) as JsonRpcMessage;
+				const payload = JSON.parse(rawData) as WebSocketCommandMessage;
 
 				if (typeof payload.id === "number") {
 					const pending = this.pending.get(payload.id);
@@ -770,9 +764,11 @@ class JsonRpcWebSocketClient {
 					this.pending.delete(payload.id);
 
 					if (payload.error) {
-						pending.reject(
-							new Error(payload.error.message ?? "JSON-RPC command failed"),
-						);
+						const error = new Error(payload.error.message ?? "JSON-RPC command failed");
+						if (typeof payload.error.code === "number") {
+							Object.assign(error, { code: payload.error.code });
+						}
+						pending.reject(error);
 						return;
 					}
 
@@ -800,11 +796,7 @@ class JsonRpcWebSocketClient {
 			});
 
 			socket.addEventListener("error", () => {
-				reject(
-					new Error(
-						`Unable to connect to WebSocket endpoint: ${this.endpoint}`,
-					),
-				);
+				reject(new Error(`Unable to connect to WebSocket endpoint: ${this.endpoint}`));
 			});
 		});
 
@@ -812,6 +804,38 @@ class JsonRpcWebSocketClient {
 	}
 }
 
+class CdpWebSocketClient extends WebSocketCommandClient {
+	constructor(
+		endpoint: string,
+		private readonly sessionId?: string,
+	) {
+		super(endpoint);
+	}
+
+	protected createCommandFrame(
+		id: WebSocketCommandId,
+		method: string,
+		params: Record<string, unknown>,
+	): CdpCommandFrame {
+		return {
+			id,
+			method,
+			params,
+			...(this.sessionId === undefined ? {} : { sessionId: this.sessionId }),
+		};
+	}
+}
+
+class JsonRpcWebSocketClient extends WebSocketCommandClient {
+	protected createCommandFrame(
+		id: WebSocketCommandId,
+		method: string,
+		params: Record<string, unknown>,
+	): JsonRpcCommandFrame {
+		return { id, jsonrpc: "2.0", method, params };
+	}
+}
+
 function flattenCdpFrameTree(
 	node: CdpFrameTreeNode | undefined,
 	out: CdpFrameTreeNode["frame"][] = [],
@@ -832,6 +856,64 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
+function isBrowserCookieSameSite(value: unknown): value is BrowserCookie["sameSite"] {
+	return value === "Strict" || value === "Lax" || value === "None";
+}
+
+function toBrowserCookie(cookie: {
+	readonly name: string;
+	readonly value: string;
+	readonly domain: string;
+	readonly path: string;
+	readonly expires?: number;
+	readonly httpOnly: boolean;
+	readonly secure: boolean;
+	readonly sameSite?: unknown;
+}): BrowserCookie {
+	return {
+		name: cookie.name,
+		value: cookie.value,
+		domain: cookie.domain,
+		path: cookie.path,
+		...(cookie.expires !== undefined && cookie.expires > 0 ? { expires: cookie.expires } : {}),
+		httpOnly: cookie.httpOnly,
+		secure: cookie.secure,
+		...(isBrowserCookieSameSite(cookie.sameSite) ? { sameSite: cookie.sameSite } : {}),
+	};
+}
+
+function parseCdpCookies(value: unknown): readonly BrowserCookie[] {
+	if (!Array.isArray(value)) {
+		throw new Error("CDP Network.getCookies returned an invalid cookie list");
+	}
+
+	return value.map((cookie) => {
+		if (
+			!isRecord(cookie) ||
+			typeof cookie.name !== "string" ||
+			typeof cookie.value !== "string" ||
+			typeof cookie.domain !== "string" ||
+			typeof cookie.path !== "string" ||
+			typeof cookie.expires !== "number" ||
+			typeof cookie.httpOnly !== "boolean" ||
+			typeof cookie.secure !== "boolean"
+		) {
+			throw new Error("CDP Network.getCookies returned an invalid cookie");
+		}
+
+		return toBrowserCookie({
+			name: cookie.name,
+			value: cookie.value,
+			domain: cookie.domain,
+			path: cookie.path,
+			expires: cookie.expires,
+			httpOnly: cookie.httpOnly,
+			secure: cookie.secure,
+			sameSite: cookie.sameSite,
+		});
+	});
+}
+
 function parsePoolAcquireResponse(value: unknown): PoolAcquireResponse {
 	if (
 		!isRecord(value) ||
@@ -843,19 +925,14 @@ function parsePoolAcquireResponse(value: unknown): PoolAcquireResponse {
 		});
 	}
 
-	if (
-		value.browserContextId !== undefined &&
-		typeof value.browserContextId !== "string"
-	) {
+	if (value.browserContextId !== undefined && typeof value.browserContextId !== "string") {
 		throw new ProviderError("CDP Pool returned an invalid acquire response", {
 			code: "BROWSER_RUNTIME_UNSUPPORTED",
 		});
 	}
 
 	return {
-		...(value.browserContextId
-			? { browserContextId: value.browserContextId }
-			: {}),
+		...(value.browserContextId ? { browserContextId: value.browserContextId } : {}),
 		pageId: value.pageId,
 		wsEndpoint: value.wsEndpoint,
 	};
@@ -881,10 +958,7 @@ function parseCdpFrameTreeNode(value: unknown): CdpFrameTreeNode | undefined {
 		frame: {
 			id: frameId,
 			name: typeof value.frame.name === "string" ? value.frame.name : undefined,
-			parentId:
-				typeof value.frame.parentId === "string"
-					? value.frame.parentId
-					: undefined,
+			parentId: typeof value.frame.parentId === "string" ? value.frame.parentId : undefined,
 			url: typeof value.frame.url === "string" ? value.frame.url : undefined,
 		},
 		...(childFrames ? { childFrames } : {}),
@@ -902,22 +976,30 @@ function getCdpExecutionContext(params: unknown): {
 	const contextId = params.context.id;
 	const auxData = params.context.auxData;
 	return {
-		frameId:
-			isRecord(auxData) && typeof auxData.frameId === "string"
-				? auxData.frameId
-				: undefined,
+		frameId: isRecord(auxData) && typeof auxData.frameId === "string" ? auxData.frameId : undefined,
 		id: typeof contextId === "number" ? contextId : undefined,
 	};
 }
 
+function getCdpDestroyedExecutionContextId(params: unknown): number | undefined {
+	if (!isRecord(params)) {
+		return undefined;
+	}
+
+	return typeof params.executionContextId === "number"
+		? params.executionContextId
+		: undefined;
+}
+
+function isMissingExecutionContextError(error: unknown): boolean {
+	return error instanceof Error && /\b(?:cannot|failed to) find context\b/i.test(error.message);
+}
+
 class CdpBrowserLocator implements BrowserLocator {
 	constructor(
 		private readonly frame: {
 			evaluate<T>(fn: string | (() => T)): Promise<T>;
-			waitForSelector?(
-				selector: string,
-				options?: { timeout?: number },
-			): Promise<void>;
+			waitForSelector?(selector: string, options?: { timeout?: number }): Promise<void>;
 		},
 		private readonly selector: string,
 	) {}
@@ -989,9 +1071,7 @@ class CdpBrowserFrame implements BrowserFrame {
 	) {}
 
 	async url(): Promise<string> {
-		const evaluatedUrl = await this.evaluate<string | undefined>(
-			"window.location.href",
-		);
+		const evaluatedUrl = await this.evaluate<string | undefined>("window.location.href");
 		return evaluatedUrl || this.initialUrl;
 	}
 
@@ -1011,10 +1091,7 @@ class CdpBrowserFrame implements BrowserFrame {
 		return new CdpBrowserLocator(this, selector);
 	}
 
-	async waitForSelector(
-		selector: string,
-		options?: { timeout?: number },
-	): Promise<void> {
+	async waitForSelector(selector: string, options?: { timeout?: number }): Promise<void> {
 		await this.page.waitForSelectorInFrame(this.id, selector, options);
 	}
 
@@ -1031,7 +1108,7 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 	constructor(
 		readonly pageId: string,
 		private readonly browserContextId: string | undefined,
-		private readonly pageClient: JsonRpcWebSocketClient,
+		private readonly pageClient: CdpWebSocketClient,
 		private readonly release: (request: PoolReleaseRequest) => Promise<void>,
 	) {}
 
@@ -1049,10 +1126,7 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 
 		try {
 			await this.pageClient.send("Page.navigate", { url });
-			await this.waitForDocumentReady(
-				startedAt + DEFAULT_WAIT_TIMEOUT_MS,
-				() => loadEventSeen,
-			);
+			await this.waitForDocumentReady(startedAt + DEFAULT_WAIT_TIMEOUT_MS, () => loadEventSeen);
 		} finally {
 			unsubscribe();
 		}
@@ -1063,13 +1137,23 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 		return await this.evaluateWithContext<T>(fn);
 	}
 
-	async evaluateInFrame<T>(
-		frameId: string,
-		fn: string | (() => T),
-	): Promise<T> {
+	async evaluateInFrame<T>(frameId: string, fn: string | (() => T)): Promise<T> {
 		await this.initialize();
 		const contextId = await this.getFrameExecutionContextId(frameId);
-		return await this.evaluateWithContext<T>(fn, contextId);
+		try {
+			return await this.evaluateWithContext<T>(fn, contextId);
+		} catch (error) {
+			if (!isMissingExecutionContextError(error)) {
+				throw error;
+			}
+
+			if (this.frameExecutionContexts.get(frameId) === contextId) {
+				this.frameExecutionContexts.delete(frameId);
+			}
+
+			const refreshedContextId = await this.getFrameExecutionContextId(frameId);
+			return await this.evaluateWithContext<T>(fn, refreshedContextId);
+		}
 	}
 
 	async waitForSelectorInFrame(
@@ -1096,10 +1180,7 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 		throw new Error(`Timed out waiting for selector: ${selector}`);
 	}
 
-	private async evaluateWithContext<T>(
-		fn: string | (() => T),
-		contextId?: number,
-	): Promise<T> {
+	private async evaluateWithContext<T>(fn: string | (() => T), contextId?: number): Promise<T> {
 		const result = await this.pageClient.send("Runtime.evaluate", {
 			awaitPromise: true,
 			...(contextId === undefined ? {} : { contextId }),
@@ -1109,20 +1190,14 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 
 		if (result.exceptionDetails) {
 			throw new Error(
-				String(
-					(result.exceptionDetails as { text?: string }).text ??
-						"Browser evaluation failed",
-				),
+				String((result.exceptionDetails as { text?: string }).text ?? "Browser evaluation failed"),
 			);
 		}
 
 		return (result.result as { value?: T } | undefined)?.value as T;
 	}
 
-	async waitForSelector(
-		selector: string,
-		options?: { timeout?: number },
-	): Promise<void> {
+	async waitForSelector(selector: string, options?: { timeout?: number }): Promise<void> {
 		const timeout = options?.timeout ?? DEFAULT_WAIT_TIMEOUT_MS;
 		const deadline = Date.now() + timeout;
 
@@ -1188,14 +1263,7 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 		const result = await this.pageClient.send("Page.getFrameTree");
 		const frames = flattenCdpFrameTree(parseCdpFrameTreeNode(result.frameTree));
 		return frames.map(
-			(frame) =>
-				new CdpBrowserFrame(
-					frame.id,
-					this,
-					frame.url ?? "",
-					frame.name,
-					frame.parentId,
-				),
+			(frame) => new CdpBrowserFrame(frame.id, this, frame.url ?? "", frame.name, frame.parentId),
 		);
 	}
 
@@ -1209,8 +1277,7 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 
 	async url(): Promise<string> {
 		const [mainFrame] = await this.frames();
-		const frameUrl =
-			mainFrame instanceof CdpBrowserFrame ? mainFrame.fallbackUrl() : "";
+		const frameUrl = mainFrame instanceof CdpBrowserFrame ? mainFrame.fallbackUrl() : "";
 		return frameUrl || (await this.evaluate<string>("window.location.href"));
 	}
 
@@ -1229,6 +1296,12 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 		return Buffer.from(String(result.data ?? ""), "base64");
 	}
 
+	async cookies(): Promise<readonly BrowserCookie[]> {
+		await this.initialize();
+		const result = await this.pageClient.send("Network.getCookies");
+		return parseCdpCookies(result.cookies);
+	}
+
 	async close(): Promise<void> {
 		if (this.closed) {
 			return;
@@ -1238,9 +1311,7 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 
 		try {
 			await this.release({
-				...(this.browserContextId
-					? { browserContextId: this.browserContextId }
-					: {}),
+				...(this.browserContextId ? { browserContextId: this.browserContextId } : {}),
 				pageId: this.pageId,
 			});
 		} finally {
@@ -1248,25 +1319,13 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 		}
 	}
 
-	async withResourcePolicy<T>(
-		policy: BrowserResourcePolicy,
-		run: () => Promise<T>,
-	): Promise<T> {
-		const allowedMethods = new Set(
-			policy.allowedMethods ?? DEFAULT_RESOURCE_METHODS,
-		);
+	async withResourcePolicy<T>(policy: BrowserResourcePolicy, run: () => Promise<T>): Promise<T> {
+		const allowedMethods = new Set(policy.allowedMethods ?? DEFAULT_RESOURCE_METHODS);
 		const handlePausedRequest = (params: unknown): void => {
-			void this.handleResourcePolicyPausedRequest(
-				params,
-				policy,
-				allowedMethods,
-			);
+			void this.handleResourcePolicyPausedRequest(params, policy, allowedMethods);
 		};
 
-		const unsubscribe = this.pageClient.on(
-			"Fetch.requestPaused",
-			handlePausedRequest,
-		);
+		const unsubscribe = this.pageClient.on("Fetch.requestPaused", handlePausedRequest);
 
 		try {
 			await this.pageClient.send("Fetch.enable", {
@@ -1358,6 +1417,21 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 				this.frameExecutionContexts.set(context.frameId, context.id);
 			}
 		});
+		this.pageClient.on("Runtime.executionContextDestroyed", (params) => {
+			const destroyedContextId = getCdpDestroyedExecutionContextId(params);
+			if (destroyedContextId === undefined) {
+				return;
+			}
+
+			for (const [frameId, contextId] of this.frameExecutionContexts) {
+				if (contextId === destroyedContextId) {
+					this.frameExecutionContexts.delete(frameId);
+				}
+			}
+		});
+		this.pageClient.on("Runtime.executionContextsCleared", () => {
+			this.frameExecutionContexts.clear();
+		});
 		await this.pageClient.send("Page.enable");
 		await this.pageClient.send("Runtime.enable");
 		this.initialized = true;
@@ -1376,9 +1450,7 @@ class CdpPoolBrowserPage implements BrowserPageContract {
 		});
 		const contextId = result.executionContextId;
 		if (typeof contextId !== "number") {
-			throw new Error(
-				`Unable to resolve execution context for frame: ${frameId}`,
-			);
+			throw new Error(`Unable to resolve execution context for frame: ${frameId}`);
 		}
 
 		this.frameExecutionContexts.set(frameId, contextId);
@@ -1424,20 +1496,14 @@ class CdpPoolBrowserClient implements SupportedBrowserClient {
 		return await this.acquirePage({ isolatedContext: true });
 	}
 
-	private async acquirePage(options?: {
-		isolatedContext?: boolean;
-	}): Promise<BrowserPageContract> {
+	private async acquirePage(options?: { isolatedContext?: boolean }): Promise<BrowserPageContract> {
 		const acquireResult = parsePoolAcquireResponse(
 			await this.poolClient.send("acquire", {
-				...(this.allowedHosts.length > 0
-					? { allowedHosts: this.allowedHosts }
-					: {}),
-				...(options?.isolatedContext
-					? { isolationMode: "browserContext" }
-					: {}),
+				...(this.allowedHosts.length > 0 ? { allowedHosts: this.allowedHosts } : {}),
+				...(options?.isolatedContext ? { isolationMode: "browserContext" } : {}),
 			}),
 		);
-		const pageClient = new JsonRpcWebSocketClient(acquireResult.wsEndpoint);
+		const pageClient = new CdpWebSocketClient(acquireResult.wsEndpoint);
 		const page = new CdpPoolBrowserPage(
 			acquireResult.pageId,
 			acquireResult.browserContextId,
@@ -1463,9 +1529,7 @@ class CdpPoolBrowserClient implements SupportedBrowserClient {
 		return await this.newPage();
 	}
 
-	async withIsolatedContext<T>(
-		handler: (page: BrowserPageContract) => Promise<T>,
-	): Promise<T> {
+	async withIsolatedContext<T>(handler: (page: BrowserPageContract) => Promise<T>): Promise<T> {
 		const page = await this.acquirePage({ isolatedContext: true });
 
 		try {
@@ -1481,9 +1545,7 @@ class CdpPoolBrowserClient implements SupportedBrowserClient {
 }
 
 class UnsupportedBrowserEngineClient implements SupportedBrowserClient {
-	constructor(
-		readonly engine: Extract<BrowserEngine, "nodriver" | "selenium-uc">,
-	) {}
+	constructor(readonly engine: Extract<BrowserEngine, "nodriver" | "selenium-uc">) {}
 
 	async newPage(): Promise<never> {
 		if (this.engine === "nodriver") {
@@ -1510,15 +1572,11 @@ class UnsupportedBrowserEngineClient implements SupportedBrowserClient {
 	async close(): Promise<void> {}
 }
 
-function createPlaywrightStealthClient(
-	options: BrowserClientOptions = {},
-): SupportedBrowserClient {
+function createPlaywrightStealthClient(options: BrowserClientOptions = {}): SupportedBrowserClient {
 	return new PlaywrightBrowserClient(options);
 }
 
-function createCdpPoolBrowserClient(
-	options: BrowserClientOptions,
-): SupportedBrowserClient {
+function createCdpPoolBrowserClient(options: BrowserClientOptions): SupportedBrowserClient {
 	return new CdpPoolBrowserClient(options);
 }
 
@@ -1547,13 +1605,10 @@ export class BrowserClient implements BrowserClientContract {
 		this.cdpUrl = resolvedOptions.cdpUrl;
 
 		if (resolvedOptions.requireCdpPool && !resolvedOptions.cdpUrl) {
-			throw new ProviderError(
-				"Managed CDP Pool is required for browser providers in production",
-				{
-					code: "BROWSER_CDP_POOL_REQUIRED",
-					fix: "Set APIFUSE__CDP_POOL__URL for deployed browser providers. Local standalone development may omit it.",
-				},
-			);
+			throw new ProviderError("Managed CDP Pool is required for browser providers in production", {
+				code: "BROWSER_CDP_POOL_REQUIRED",
+				fix: "Set APIFUSE__CDP_POOL__URL for deployed browser providers. Local standalone development may omit it.",
+			});
 		}
 
 		switch (engine) {
@@ -1591,9 +1646,7 @@ export class BrowserClient implements BrowserClientContract {
 		return this.activatePage(page);
 	}
 
-	async withIsolatedContext<T>(
-		handler: (page: BrowserPageContract) => Promise<T>,
-	): Promise<T> {
+	async withIsolatedContext<T>(handler: (page: BrowserPageContract) => Promise<T>): Promise<T> {
 		const previousActivePage = this.activePage;
 		let trackedPage: BrowserPageContract | undefined;
 
@@ -1638,16 +1691,11 @@ export class BrowserClient implements BrowserClientContract {
 		return trackedPage;
 	}
 
-	async solveChallenge(
-		request: BrowserChallengeRequest,
-	): Promise<BrowserChallengeResult> {
+	async solveChallenge(request: BrowserChallengeRequest): Promise<BrowserChallengeResult> {
 		if (request.type !== "recaptcha") {
-			throw new ProviderError(
-				`Unsupported browser challenge: ${request.type}`,
-				{
-					code: "BROWSER_RUNTIME_UNSUPPORTED",
-				},
-			);
+			throw new ProviderError(`Unsupported browser challenge: ${request.type}`, {
+				code: "BROWSER_RUNTIME_UNSUPPORTED",
+			});
 		}
 
 		if (this.activePage) {
@@ -1709,8 +1757,7 @@ async function findRecaptchaFrame(
 	for (const frame of frames) {
 		const url = await frame.url();
 		const matchesRecaptcha =
-			url.includes("google.com/recaptcha") ||
-			url.includes("recaptcha.net/recaptcha");
+			url.includes("google.com/recaptcha") || url.includes("recaptcha.net/recaptcha");
 		const matchesSiteKey = !siteKey || url.includes(siteKey);
 		if (matchesRecaptcha && matchesSiteKey) {
 			return frame;
@@ -1720,8 +1767,6 @@ async function findRecaptchaFrame(
 	return undefined;
 }
 
-export function createBrowserClient(
-	options: BrowserClientOptions = {},
-): BrowserClient {
+export function createBrowserClient(options: BrowserClientOptions = {}): BrowserClient {
 	return new BrowserClient(options);
 }