single-file-cli 2.0.35 → 2.0.36

package/deno.json

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

package/lib/cdp-client.js

@@ -34,6 +34,7 @@ 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 };
 
@@ -105,8 +106,26 @@ 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) {
 			await Runtime.addBinding({ name: CAPTURE_SCREENSHOT_FUNCTION_NAME, executionContextId: contextId });
 			Runtime.addEventListener("bindingCalled", ({ params }) => {
@@ -116,19 +135,16 @@ async function getPageData(options) {
 			});
 		}
 		const { result } = await Runtime.evaluate({
-			expression: `(${getPageDataScriptSource.toString()})(${JSON.stringify(options)},${JSON.stringify(SET_SCREENSHOT_FUNCTION_NAME)})`,
+			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)];
@@ -155,7 +171,7 @@ async function onCaptureScreenshot({ Page, Runtime }, contextId) {
 	});
 }
 
-function getPageDataScriptSource(options, SET_SCREENSHOT_FUNCTION_NAME) {
+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;
@@ -167,7 +183,19 @@ function getPageDataScriptSource(options, SET_SCREENSHOT_FUNCTION_NAME) {
 			}
 		};
 	}
-	return singlefile.getPageData(options);
+	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) {

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.35";
+export const version = "2.0.36";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-cli",
-	"version": "2.0.35",
+	"version": "2.0.36",
 	"description": "SingleFile CLI",
 	"author": "Gildas Lormeau",
 	"engines": {