@orkestrel/browser 0.0.10 → 0.0.12

package/dist/src/core/index.cjs

@@ -141,7 +141,7 @@ var BROWSER_MOUSE_BUTTON_MASKS = Object.freeze({
 /** Tool identity embedded in HAR 1.2 documents. */
 var BROWSER_HAR_CREATOR = Object.freeze({
 	name: "@orkestrel/browser",
-	version: "0.0.8"
+	version: "0.0.11"
 });
 /** Attribute used to tag temporary screenshot styles and masks. */
 var BROWSER_SCREENSHOT_ATTRIBUTE = "data-orkestrel-screenshot";
@@ -4958,9 +4958,9 @@ var BrowserFrame = class {
 		this.assert();
 		await this.#selectors.css(selector).wait(options);
 	}
-	async send(method, params) {
+	async send(method, params, timeout) {
 		this.assert();
-		return await this.#client.send(method, params, await this.#sessionId());
+		return await this.#client.send(method, params, await this.#sessionId(), timeout);
 	}
 	async subscribe(method, handler) {
 		this.assert();
@@ -4975,12 +4975,6 @@ var BrowserFrame = class {
 	assert() {
 		if (!this.#client.connected) throw new BrowserError("Browser frame is disconnected", void 0, { frame: this.#id });
 	}
-	async request(method, params, timeout) {
-		return await this.#client.send(method, params, await this.#sessionId(), timeout);
-	}
-	async raw(expression, timeout) {
-		return await this.#evaluate(expression, timeout);
-	}
 	update(url) {
 		this.#url = url;
 	}
@@ -6199,7 +6193,7 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 		this.assert();
 		const params = { ...browserScreenshotToParams(options) };
 		if (options?.full === true) {
-			const metrics = await this.request("Page.getLayoutMetrics");
+			const metrics = await this.send("Page.getLayoutMetrics");
 			const size = (0, _orkestrel_contract.isRecord)(metrics) && (0, _orkestrel_contract.isRecord)(metrics["cssContentSize"]) ? metrics["cssContentSize"] : (0, _orkestrel_contract.isRecord)(metrics) && (0, _orkestrel_contract.isRecord)(metrics["contentSize"]) ? metrics["contentSize"] : void 0;
 			const width = size?.["width"];
 			const height = size?.["height"];
@@ -6217,7 +6211,7 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 			const ratio = options.scale === "css" ? 1 : await this.evaluate("devicePixelRatio");
 			if (!(0, _orkestrel_contract.isFiniteNumber)(ratio) || ratio <= 0) throw new BrowserError("Browser screenshot device scale is malformed");
 			if (!(0, _orkestrel_contract.isRecord)(params["clip"])) {
-				const metrics = await this.request("Page.getLayoutMetrics");
+				const metrics = await this.send("Page.getLayoutMetrics");
 				const viewport = (0, _orkestrel_contract.isRecord)(metrics) && (0, _orkestrel_contract.isRecord)(metrics["cssVisualViewport"]) ? metrics["cssVisualViewport"] : void 0;
 				if (viewport === void 0 || !(0, _orkestrel_contract.isFiniteNumber)(viewport["pageX"]) || !(0, _orkestrel_contract.isFiniteNumber)(viewport["pageY"]) || !(0, _orkestrel_contract.isFiniteNumber)(viewport["clientWidth"]) || viewport["clientWidth"] <= 0 || !(0, _orkestrel_contract.isFiniteNumber)(viewport["clientHeight"]) || viewport["clientHeight"] <= 0) throw new BrowserError("Browser screenshot viewport metrics are malformed");
 				params["clip"] = {
@@ -6239,7 +6233,7 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 				token = value;
 			}
 			if (options?.transparent === true) {
-				await this.request("Emulation.setDefaultBackgroundColorOverride", { color: {
+				await this.send("Emulation.setDefaultBackgroundColorOverride", { color: {
 					r: 0,
 					g: 0,
 					b: 0,
@@ -6247,7 +6241,7 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 				} });
 				transparent = true;
 			}
-			const result = await this.request("Page.captureScreenshot", params);
+			const result = await this.send("Page.captureScreenshot", params);
 			if (!(0, _orkestrel_contract.isRecord)(result) || !(0, _orkestrel_contract.isString)(result["data"])) throw new BrowserError("Screenshot failed: no data returned");
 			const bytes = decodeBase64(result["data"]);
 			if (options?.path !== void 0) await this.save(options.path, bytes);
@@ -6256,13 +6250,13 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 				path: options?.path
 			};
 		} finally {
-			if (transparent) await this.request("Emulation.setDefaultBackgroundColorOverride").catch(() => void 0);
+			if (transparent) await this.send("Emulation.setDefaultBackgroundColorOverride").catch(() => void 0);
 			if (token !== void 0) await this.evaluate(compileScreenshotCleanupExpression(token)).catch(() => void 0);
 		}
 	}
 	async pdf(options) {
 		this.assert();
-		const result = await this.request("Page.printToPDF", browserPDFToParams(options));
+		const result = await this.send("Page.printToPDF", browserPDFToParams(options));
 		if (!(0, _orkestrel_contract.isRecord)(result) || !(0, _orkestrel_contract.isString)(result["data"])) throw new BrowserError("PDF failed: no data returned");
 		const bytes = decodeBase64(result["data"]);
 		if (options?.path !== void 0) await this.save(options.path, bytes);
@@ -6280,12 +6274,12 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 	}
 	async frames() {
 		this.assert();
-		return readBrowserFrames(await this.request("Page.getFrameTree")).map((frame) => this.#frame(frame));
+		return readBrowserFrames(await this.send("Page.getFrameTree")).map((frame) => this.#frame(frame));
 	}
 	async snapshot(options) {
 		this.assert();
 		const styles = options?.styles ?? [];
-		return new BrowserSnapshot(decodeBrowserSnapshot(await this.request("DOMSnapshot.captureSnapshot", {
+		return new BrowserSnapshot(decodeBrowserSnapshot(await this.send("DOMSnapshot.captureSnapshot", {
 			computedStyles: [...styles],
 			includePaintOrder: options?.paint ?? false,
 			includeDOMRects: options?.rects ?? false
@@ -6338,7 +6332,7 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 		wait.catch(() => void 0);
 		let loader;
 		try {
-			const result = await this.request("Page.navigate", { url }, timeout);
+			const result = await this.send("Page.navigate", { url }, timeout);
 			if ((0, _orkestrel_contract.isRecord)(result) && (0, _orkestrel_contract.isString)(result["errorText"])) throw new BrowserError(`Navigation failed: ${result["errorText"]}`);
 			if ((0, _orkestrel_contract.isRecord)(result) && (0, _orkestrel_contract.isString)(result["loaderId"])) loader = result["loaderId"];
 			await wait;
@@ -6357,7 +6351,7 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 		const wait = this.#waitForLoadEvent(options?.condition ?? "load", timeout);
 		wait.catch(() => void 0);
 		try {
-			await this.request("Page.reload", void 0, timeout);
+			await this.send("Page.reload", void 0, timeout);
 			await wait;
 		} catch (error) {
 			this.#clearNavigationWatch(watch);
@@ -6382,7 +6376,7 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 	async #navigateHistory(offset, options) {
 		const timeout = options?.timeout ?? 3e4;
 		validateBrowserTimeout(timeout);
-		const history = await this.request("Page.getNavigationHistory");
+		const history = await this.send("Page.getNavigationHistory");
 		if (!(0, _orkestrel_contract.isRecord)(history) || !(0, _orkestrel_contract.isInteger)(history["currentIndex"]) || !(0, _orkestrel_contract.isArray)(history["entries"])) throw new BrowserError("Navigation history is malformed");
 		const entry = history["entries"][history["currentIndex"] + offset];
 		if (!(0, _orkestrel_contract.isRecord)(entry) || !(0, _orkestrel_contract.isInteger)(entry["id"])) return {
@@ -6394,7 +6388,7 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 		const wait = this.#waitForLoadEvent(options?.condition ?? "load", timeout);
 		wait.catch(() => void 0);
 		try {
-			await this.request("Page.navigateToHistoryEntry", { entryId: entry["id"] }, timeout);
+			await this.send("Page.navigateToHistoryEntry", { entryId: entry["id"] }, timeout);
 			await wait;
 		} catch (error) {
 			this.#clearNavigationWatch(watch);
@@ -6424,7 +6418,7 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 	}
 	async #completeNavigation(watch, loader) {
 		try {
-			const resolved = requireBrowserString(await this.raw("location.href"), "Navigation URL");
+			const resolved = requireBrowserString(await this.evaluate("location.href"), "Navigation URL");
 			this.update(resolved);
 			return this.#navigationResult(watch, resolved, loader);
 		} catch (error) {
@@ -6558,7 +6552,7 @@ var BrowserPage = class BrowserPage extends BrowserFrame {
 	}
 	async #stopLoading(timeout) {
 		try {
-			await this.request("Page.stopLoading", void 0, timeout);
+			await this.send("Page.stopLoading", void 0, timeout);
 		} catch {}
 	}
 	#handleNavigationResponse(response) {