single-file-cli 2.0.64 → 2.0.65

package/.github/workflows/docker-publish.yml

@@ -0,0 +1,29 @@
+name: Publish Docker image
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: ${{ secrets.DOCKER_USERNAME }}/singlefile:latest
+          platforms: linux/amd64,linux/arm64doc

package/build.sh

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

package/deno.json

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

package/lib/cdp-client.js

@@ -53,7 +53,15 @@ 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 consoleMessages = [];
+		const { Browser, Security, Page, Emulation, Fetch, Network, Runtime, Debugger, Console } = new CDP(targetInfo);
+		if (options.consoleMessagesFile) {
+			await Console.enable();
+			Console.addEventListener("messageAdded", ({ params }) => {
+				const { message } = params;
+				consoleMessages.push(message);
+			});
+		}
 		if (options.browserStartMinimized) {
 			const { windowId, bounds } = await Browser.getWindowForTarget({ targetId: targetInfo.id });
 			if (bounds.windowState !== MINIMIZED_WINDOW_STATE) {
@@ -182,27 +190,7 @@ async function getPageData(options) {
 			loadPage({ Page, Runtime }, options),
 			options.browserDebug ? waitForDebuggerReady({ Debugger }) : Promise.resolve()
 		]);
-		if (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", async ({ params }) => {
@@ -246,6 +234,26 @@ async function getPageData(options) {
 				}
 			});
 		}
+		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.browserWaitDelay) {
+			await new Promise(resolve => setTimeout(resolve, options.browserWaitDelay));
+		}
 		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, CAPTURE_SCREENSHOT_FUNCTION_NAME, PRINT_TO_PDF_FUNCTION_NAME])})`,
 			awaitPromise: true,
@@ -257,6 +265,10 @@ async function getPageData(options) {
 			throw new Error(description);
 		}
 		const pageData = await pageDataPromise;
+		if (options.consoleMessagesFile) {
+			await Console.disable();
+			pageData.consoleMessages = consoleMessages;
+		}
 		Object.assign(pageData, httpInfo);
 		return pageData;
 	} catch (error) {