single-file-cli 2.0.59 → 2.0.61

package/build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-deno vendor "npm:single-file-core@1.5.25"
+deno vendor "npm:single-file-core@1.5.29"
 
 echo "
 import { build } from 'npm:esbuild';

package/deno.json

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

package/lib/cdp-client.js

@@ -33,7 +33,9 @@ const MINIMIZED_WINDOW_STATE = "minimized";
 const SINGLE_FILE_WORLD_NAME = "singlefile";
 const EMPTY_PAGE_URL = "about:blank";
 const CAPTURE_SCREENSHOT_FUNCTION_NAME = "captureScreenshot";
+const CAPTURE_PDF_FUNCTION_NAME = "capturePdf";
 const SET_SCREENSHOT_FUNCTION_NAME = "setScreenshot";
+const SET_PDF_FUNCTION_NAME = "setPdf";
 const SET_PAGE_DATA_FUNCTION_NAME = "setPageData";
 const REDIRECT_STATUS_CODES = [301, 302, 303, 307, 308];
 
@@ -51,7 +53,7 @@ async function getPageData(options) {
 	let targetInfo;
 	try {
 		targetInfo = await CDP.createTarget(EMPTY_PAGE_URL);
-		const { Browser, Security, Page, Emulation, Fetch, Network, Runtime, Debugger } = new CDP(targetInfo);
+		const { Browser, Security, Page, Emulation, Fetch, Network, Runtime, Debugger, IO } = new CDP(targetInfo);
 		if (options.browserStartMinimized) {
 			const { windowId, bounds } = await Browser.getWindowForTarget({ targetId: targetInfo.id });
 			if (bounds.windowState !== MINIMIZED_WINDOW_STATE) {
@@ -89,12 +91,9 @@ async function getPageData(options) {
 				});
 			}
 			if (options.browserMobileEmulation || options.platform || options.acceptLanguage) {
-				let browserUserAgent;
-				if (!options.userAgent) {
-					({ browserUserAgent } = await Browser.getVersion());
-				}
+				const { userAgent, product } = await Browser.getVersion();
 				const agentOptions = {
-					userAgent: options.userAgent || (options.browserMobileEmulation ? "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome Mobile Safari/537.36" : browserUserAgent)
+					userAgent: options.userAgent || (options.browserMobileEmulation ? "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) " + product + " Mobile Safari/537.36" : userAgent)
 				};
 				if (options.acceptLanguage) {
 					agentOptions.acceptLanguage = options.acceptLanguage;
@@ -206,14 +205,44 @@ async function getPageData(options) {
 		});
 		if (options.embedScreenshot && options.compressContent) {
 			await Runtime.addBinding({ name: CAPTURE_SCREENSHOT_FUNCTION_NAME, executionContextId: contextId });
-			Runtime.addEventListener("bindingCalled", ({ params }) => {
+			Runtime.addEventListener("bindingCalled", async ({ params }) => {
 				if (params.name === CAPTURE_SCREENSHOT_FUNCTION_NAME) {
-					onCaptureScreenshot({ Page, Runtime }, contextId);
+					try {
+						await onCaptureScreenshot({ Page, Runtime }, contextId);
+					} catch (error) {
+						await Runtime.evaluate({
+							expression: `globalThis.${SET_SCREENSHOT_FUNCTION_NAME}(${JSON.stringify([])})`,
+							contextId
+						});
+					}
+				}
+			});
+		}
+		if (options.embedPdf) {
+			await Runtime.addBinding({ name: CAPTURE_PDF_FUNCTION_NAME, executionContextId: contextId });
+			Runtime.addEventListener("bindingCalled", async ({ params }) => {
+				if (params.name === CAPTURE_PDF_FUNCTION_NAME) {
+					let pdfOptions;
+					if (options.embedPdfOptions) {
+						try {
+							pdfOptions = JSON.parse(options.embedPdfOptions);
+						} catch (error) {
+							// ignored
+						}
+					}
+					try {
+						await onCapturePdf({ Page, Runtime }, contextId, pdfOptions);
+					} catch (error) {
+						await Runtime.evaluate({
+							expression: `globalThis.${SET_PDF_FUNCTION_NAME}ƒƒ(${JSON.stringify([])})`,
+							contextId
+						});
+					}
 				}
 			});
 		}
 		const { result } = await Runtime.evaluate({
-			expression: `(${getPageDataScriptSource.toString()})(${JSON.stringify(options)},${JSON.stringify([SET_SCREENSHOT_FUNCTION_NAME, SET_PAGE_DATA_FUNCTION_NAME])})`,
+			expression: `(${getPageDataScriptSource.toString()})(${JSON.stringify(options)},${JSON.stringify([SET_SCREENSHOT_FUNCTION_NAME, SET_PDF_FUNCTION_NAME, SET_PAGE_DATA_FUNCTION_NAME])})`,
 			awaitPromise: true,
 			returnByValue: true,
 			contextId
@@ -251,15 +280,36 @@ async function onCaptureScreenshot({ Page, Runtime }, 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);
+async function onCapturePdf({ Page, Runtime }, contextId, options = {}) {
+	const { data } = await Page.printToPDF(options);
+	const pdfData = Array.from(new Uint8Array(await (await fetch("data:application/pdf;base64," + data)).arrayBuffer()));
+	await Runtime.evaluate({
+		expression: `globalThis.${SET_PDF_FUNCTION_NAME}(${JSON.stringify(pdfData)})`,
+		contextId
+	});
+}
+
+function getPageDataScriptSource(options, [SET_SCREENSHOT_FUNCTION_NAME, SET_PDF_FUNCTION_NAME, SET_PAGE_DATA_FUNCTION_NAME]) {
+	if ((options.embedScreenshot && options.compressContent) || options.embedPdf) {
+		let screenshot, pdf;
+		if (options.embedScreenshot && options.compressContent) {
+			screenshot = new Promise(resolve => globalThis[SET_SCREENSHOT_FUNCTION_NAME] = resolve);
+		}
+		if (options.embedPdf) {
+			pdf = new Promise(resolve => globalThis[SET_PDF_FUNCTION_NAME] = resolve);
+		}
 		let pendingCapture;
 		options.onprogress = async event => {
-			if (event.type == event.RESOURCES_INITIALIZING && globalThis.captureScreenshot && window == top && !pendingCapture) {
+			if (event.type == event.RESOURCES_INITIALIZING && window == top && !pendingCapture) {
 				pendingCapture = true;
-				globalThis.captureScreenshot("");
-				options.embeddedImage = await screenshot;
+				if (globalThis.captureScreenshot) {
+					globalThis.captureScreenshot("");
+					options.embeddedImage = await screenshot;
+				}
+				if (globalThis.capturePdf) {
+					globalThis.capturePdf("");
+					options.embeddedPdf = await pdf;
+				}
 			}
 		};
 	}