single-file-cli 2.0.63 → 2.0.64

package/compile.sh

@@ -8,7 +8,7 @@ deno compile --allow-read --allow-write --allow-net --allow-env --allow-run --ex
 deno compile --allow-read --allow-write --allow-net --allow-env --allow-run --ext=js --output=./dist/single-file-x86_64-apple-darwin --target=x86_64-apple-darwin ./single-file
 deno compile --allow-read --allow-write --allow-net --allow-env --allow-run --ext=js --output=./dist/single-file-x86_64-linux --target=x86_64-unknown-linux-gnu ./single-file
 deno compile --allow-read --allow-write --allow-net --allow-env --allow-run --ext=js --output=./dist/single-file-aarch64-linux --target=aarch64-unknown-linux-gnu ./single-file
-deno compile --allow-read --allow-write --allow-net --allow-env --allow-run --ext=js --output=./dist/single-file.exe --target=x86_64-pc-windows-msvc ./single-file
+deno compile --allow-read --allow-write --allow-net --allow-env --allow-run --ext=js --output=./dist/single-file.exe --target=x86_64-pc-windows-msvc --icon=./resources/single-file.ico ./single-file
 
 dev_id=$(security find-identity -p codesigning -v | grep "Apple Development" | awk '{print $2}')
 codesign -f -s $dev_id ./dist/single-file-aarch64-apple-darwin

package/deno.json

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

package/lib/cdp-client.js

@@ -33,9 +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 PRINT_TO_PDF_FUNCTION_NAME = "printToPDF";
 const SET_SCREENSHOT_FUNCTION_NAME = "setScreenshot";
-const SET_PDF_FUNCTION_NAME = "setPdf";
+const SET_PDF_FUNCTION_NAME = "setPDF";
 const SET_PAGE_DATA_FUNCTION_NAME = "setPageData";
 const REDIRECT_STATUS_CODES = [301, 302, 303, 307, 308];
 
@@ -208,21 +208,28 @@ async function getPageData(options) {
 			Runtime.addEventListener("bindingCalled", async ({ params }) => {
 				if (params.name === CAPTURE_SCREENSHOT_FUNCTION_NAME) {
 					try {
-						await onCaptureScreenshot({ Page, Runtime }, contextId);
+						let screenshotOptions = { captureBeyondViewport: true };
+						if (options.embedScreenshotOptions) {
+							try {
+								screenshotOptions = JSON.parse(options.embedScreenshotOptions);
+							} catch (error) {
+								// ignored
+							}
+						}
+						screenshotOptions.format = "png";
+						const { data } = await Page.captureScreenshot(screenshotOptions);
+						await Runtime.evaluate({ expression: `globalThis.${SET_SCREENSHOT_FUNCTION_NAME}(${JSON.stringify(data)})`, contextId });
 					} catch (error) {
-						await Runtime.evaluate({
-							expression: `globalThis.${SET_SCREENSHOT_FUNCTION_NAME}(${JSON.stringify([])})`,
-							contextId
-						});
+						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 });
+			await Runtime.addBinding({ name: PRINT_TO_PDF_FUNCTION_NAME, executionContextId: contextId });
 			Runtime.addEventListener("bindingCalled", async ({ params }) => {
-				if (params.name === CAPTURE_PDF_FUNCTION_NAME) {
-					let pdfOptions;
+				if (params.name === PRINT_TO_PDF_FUNCTION_NAME) {
+					let pdfOptions = {};
 					if (options.embedPdfOptions) {
 						try {
 							pdfOptions = JSON.parse(options.embedPdfOptions);
@@ -231,18 +238,16 @@ async function getPageData(options) {
 						}
 					}
 					try {
-						await onCapturePdf({ Page, Runtime }, contextId, pdfOptions);
+						const { data } = await Page.printToPDF(pdfOptions);
+						await Runtime.evaluate({ expression: `globalThis.${SET_PDF_FUNCTION_NAME}(${JSON.stringify(data)})`, contextId });
 					} catch (error) {
-						await Runtime.evaluate({
-							expression: `globalThis.${SET_PDF_FUNCTION_NAME}ƒƒ(${JSON.stringify([])})`,
-							contextId
-						});
+						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_PDF_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, CAPTURE_SCREENSHOT_FUNCTION_NAME, PRINT_TO_PDF_FUNCTION_NAME])})`,
 			awaitPromise: true,
 			returnByValue: true,
 			contextId
@@ -270,44 +275,27 @@ 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
-	});
-}
-
-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) {
+function getPageDataScriptSource(options, [SET_SCREENSHOT_FUNCTION_NAME, SET_PDF_FUNCTION_NAME, SET_PAGE_DATA_FUNCTION_NAME, CAPTURE_SCREENSHOT_FUNCTION_NAME, PRINT_TO_PDF_FUNCTION_NAME]) {
+	if ((options.embedScreenshot || options.embedPdf) && options.compressContent) {
 		let screenshot, pdf;
-		if (options.embedScreenshot && options.compressContent) {
-			screenshot = new Promise(resolve => globalThis[SET_SCREENSHOT_FUNCTION_NAME] = resolve);
+		if (options.embedScreenshot) {
+			screenshot = new Promise(resolve => globalThis[SET_SCREENSHOT_FUNCTION_NAME] = async data =>
+				resolve(Array.from(new Uint8Array(await (await fetch("data:image/png;base64," + data)).arrayBuffer()))));
 		}
 		if (options.embedPdf) {
-			pdf = new Promise(resolve => globalThis[SET_PDF_FUNCTION_NAME] = resolve);
+			pdf = new Promise(resolve => globalThis[SET_PDF_FUNCTION_NAME] = async data =>
+				resolve(Array.from(new Uint8Array(await (await fetch("data:application/pdf;base64," + data)).arrayBuffer()))));
 		}
 		let pendingCapture;
 		options.onprogress = async event => {
 			if (event.type == event.RESOURCES_INITIALIZING && window == top && !pendingCapture) {
 				pendingCapture = true;
-				if (globalThis.captureScreenshot) {
-					globalThis.captureScreenshot("");
+				if (globalThis[CAPTURE_SCREENSHOT_FUNCTION_NAME]) {
+					globalThis[CAPTURE_SCREENSHOT_FUNCTION_NAME]("");
 					options.embeddedImage = await screenshot;
 				}
-				if (globalThis.capturePdf) {
-					globalThis.capturePdf("");
+				if (globalThis[PRINT_TO_PDF_FUNCTION_NAME]) {
+					globalThis[PRINT_TO_PDF_FUNCTION_NAME]("");
 					options.embeddedPdf = await pdf;
 				}
 			}

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.63";
+export const version = "2.0.64";

package/options.js

@@ -132,6 +132,7 @@ const OPTIONS_INFO = {
 	"extract-data-from-page": { description: "Extract compressed data from the page instead of fetching the page in order to create universal self-extracting HTML files", type: "boolean", defaultValue: true },
 	"prevent-appended-data": { description: "Prevent appending data after the compressed data when creating self-extracting HTML files", type: "boolean" },
 	"embed-screenshot": { description: "Embed a screenshot of the page as a PNG file in the compressed file (self-extracting HTML or ZIP file). When enabled, the resulting file can be read as a ZIP file or a PNG image.", type: "boolean" },
+	"embed-screenshot-options": { description: "Options passed to the CDP method `Page.captureScreenshot()` given as a JSON string (e.g. { \"captureBeyondViewport\": false })", type: "string" },
 	"embedded-image": { description: "Path to a PNG image to embed in the compressed file.", type: "string" },
 	"embed-pdf": { description: "Embed a PDF file in the ZIP or self-extracting file. When enabled, the resulting file can be read as a ZIP file or a PDF file.", type: "boolean" },
 	"embed-pdf-options": { description: "Options passed to the CDP method `Page.printToPDF()` given as a JSON string (e.g. { \"pageRanges\": \"1-1\", \"paperWidth\": 11, \"paperHeight\": 8.5 })", type: "string" },

package/package.json

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