single-file-cli 2.0.34 → 2.0.36

package/build.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-deno vendor "npm:single-file-core@1.3.30"
+deno vendor "npm:single-file-core@1.4.0"
 
 echo "
 import { build } from 'npm:esbuild';

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@single-file/single-file-cli",
-  "version": "2.0.34",
+  "version": "2.0.36",
   "description": "SingleFile CLI",
   "nodeModulesDir": true,
   "exports": {

package/lib/cdp-client.js

@@ -32,6 +32,9 @@ const NETWORK_STATES = ["InteractiveTime", "networkIdle", "networkAlmostIdle", "
 const MINIMIZED_WINDOW_STATE = "minimized";
 const SINGLE_FILE_WORLD_NAME = "singlefile";
 const EMPTY_PAGE_URL = "about:blank";
+const CAPTURE_SCREENSHOT_FUNCTION_NAME = "captureScreenshot";
+const SET_SCREENSHOT_FUNCTION_NAME = "setScreenshot";
+const SET_PAGE_DATA_FUNCTION_NAME = "setPageData";
 
 export { initialize, getPageData, closeBrowser };
 
@@ -103,27 +106,45 @@ async function getPageData(options) {
 			options.browserDebug ? waitForDebuggerReady({ Debugger }) : Promise.resolve()
 		]);
 		if (options.browserWaitDelay) {
-			setTimeout(() => resolve, options.browserWaitDelay);
+			await new Promise(resolve => setTimeout(resolve, options.browserWaitDelay));
 		}
+		await Runtime.addBinding({ name: SET_PAGE_DATA_FUNCTION_NAME, executionContextId: contextId });
+		const pageDataPromise = new Promise(resolve => {
+			let pageDataResponse = "";
+			Runtime.addEventListener("bindingCalled", async ({ params }) => {
+				if (params.name === SET_PAGE_DATA_FUNCTION_NAME) {
+					const { payload } = params;
+					if (payload.length) {
+						pageDataResponse += payload;
+					} else {
+						const result = JSON.parse(pageDataResponse);
+						if (result.content instanceof Array) {
+							result.content = new Uint8Array(result.content);
+						}
+						resolve(result);
+					}
+				}
+			});
+		});
 		if (options.embedScreenshot && options.compressContent) {
-			const { data } = await Page.captureScreenshot({ format: "png", captureBeyondViewport: true });
-			const dataURI = "data:image/png;base64," + data;
-			options.embeddedImage = Array.from(new Uint8Array(await (await fetch(dataURI)).arrayBuffer()));
+			await Runtime.addBinding({ name: CAPTURE_SCREENSHOT_FUNCTION_NAME, executionContextId: contextId });
+			Runtime.addEventListener("bindingCalled", ({ params }) => {
+				if (params.name === CAPTURE_SCREENSHOT_FUNCTION_NAME) {
+					onCaptureScreenshot({ Page, Runtime }, contextId);
+				}
+			});
 		}
 		const { result } = await Runtime.evaluate({
-			expression: `singlefile.getPageData(${JSON.stringify(options)})`,
+			expression: `(${getPageDataScriptSource.toString()})(${JSON.stringify(options)},${JSON.stringify([SET_SCREENSHOT_FUNCTION_NAME, SET_PAGE_DATA_FUNCTION_NAME])})`,
 			awaitPromise: true,
 			returnByValue: true,
 			contextId
 		});
-		const { value, subtype, description } = result;
+		const { subtype, description } = result;
 		if (subtype === "error") {
 			throw new Error(description);
 		}
-		if (Array.isArray(value.content)) {
-			value.content = new Uint8Array(value.content);
-		}
-		return value;
+		return pageDataPromise;
 	} catch (error) {
 		if (error.code === LOAD_TIMEOUT_ERROR && options.browserWaitUntilFallback && options.browserWaitUntil) {
 			const browserWaitUntil = NETWORK_STATES[(NETWORK_STATES.indexOf(options.browserWaitUntil) + 1)];
@@ -140,6 +161,43 @@ async function getPageData(options) {
 	}
 }
 
+async function onCaptureScreenshot({ Page, Runtime }, contextId) {
+	const { data } = await Page.captureScreenshot({ format: "png", captureBeyondViewport: true });
+	const dataURI = "data:image/png;base64," + data;
+	const screenshotData = Array.from(new Uint8Array(await (await fetch(dataURI)).arrayBuffer()));
+	await Runtime.evaluate({
+		expression: `globalThis.${SET_SCREENSHOT_FUNCTION_NAME}(${JSON.stringify(screenshotData)})`,
+		contextId
+	});
+}
+
+function getPageDataScriptSource(options, [SET_SCREENSHOT_FUNCTION_NAME, SET_PAGE_DATA_FUNCTION_NAME]) {
+	if (options.embedScreenshot && options.compressContent) {
+		let screenshot = new Promise(resolve => globalThis[SET_SCREENSHOT_FUNCTION_NAME] = resolve);
+		let pendingCapture;
+		options.onprogress = async event => {
+			if (event.type == event.RESOURCES_INITIALIZING && globalThis.captureScreenshot && window == top && !pendingCapture) {
+				pendingCapture = true;
+				globalThis.captureScreenshot("");
+				options.embeddedImage = await screenshot;
+			}
+		};
+	}
+	const MAX_CONTENT_SIZE = 32 * 1024 * 1024;
+	return singlefile.getPageData(options).then(data => {
+		if (data.content instanceof Uint8Array) {
+			data.content = Array.from(data.content);
+		}
+		data = JSON.stringify(data);
+		let indexData = 0;
+		do {
+			globalThis[SET_PAGE_DATA_FUNCTION_NAME](data.slice(indexData, indexData + MAX_CONTENT_SIZE));
+			indexData += MAX_CONTENT_SIZE;
+		} while (indexData < data.length);
+		globalThis[SET_PAGE_DATA_FUNCTION_NAME]("");
+	});
+}
+
 async function loadPage({ Page, Runtime }, options) {
 	await Runtime.enable();
 	await Page.enable();