single-file-cli 2.0.70 → 2.0.72

package/build.sh

@@ -3,7 +3,7 @@
 mv package.json package.json.tmp
 mv deno.json deno.json.tmp
 mv deno.lock deno.lock.tmp
-deno install --vendor --quiet "npm:single-file-core@1.5.40"
+deno install --vendor --quiet "npm:single-file-core@1.5.42"
 mv package.json.tmp package.json
 mv deno.json.tmp deno.json
 mv deno.lock.tmp deno.lock

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 --icon=./resources/single-file.ico ./single-file
+deno compile --allow-all --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.70",
+  "version": "2.0.72",
   "description": "SingleFile CLI",
   "nodeModulesDir": "auto",
   "exports": {
@@ -8,6 +8,6 @@
   },
   "imports": {
     "simple-cdp": "jsr:@simple-cdp/simple-cdp@^1.8.5",
-    "path": "jsr:@std/path@^0.220.1"
+    "path": "jsr:@std/path@^0.224.0"
   }
 }

package/deno.lock

@@ -1,43 +1,38 @@
 {
-  "version": "3",
-  "packages": {
-    "specifiers": {
-      "jsr:@simple-cdp/simple-cdp@^1.8.5": "jsr:@simple-cdp/simple-cdp@1.8.5",
-      "jsr:@std/assert@^0.220.1": "jsr:@std/assert@0.220.1",
-      "jsr:@std/path@^0.220.1": "jsr:@std/path@0.220.1",
-      "npm:simple-cdp@^1.8.5": "npm:simple-cdp@1.8.5",
-      "npm:ws@^8.16.0": "npm:ws@8.16.0"
+  "version": "4",
+  "specifiers": {
+    "jsr:@simple-cdp/simple-cdp@^1.8.5": "1.8.5",
+    "jsr:@std/assert@0.224": "0.224.0",
+    "jsr:@std/path@0.224": "0.224.0",
+    "npm:simple-cdp@^1.8.5": "1.8.5",
+    "npm:ws@^8.16.0": "8.16.0"
+  },
+  "jsr": {
+    "@simple-cdp/simple-cdp@1.8.5": {
+      "integrity": "7386ca561cd6293bb3115eadf14b8c98d1c41c35a69c79774ea70e5101159413"
+    },
+    "@std/assert@0.224.0": {
+      "integrity": "8643233ec7aec38a940a8264a6e3eed9bfa44e7a71cc6b3c8874213ff401967f"
     },
-    "jsr": {
-      "@simple-cdp/simple-cdp@1.8.5": {
-        "integrity": "7386ca561cd6293bb3115eadf14b8c98d1c41c35a69c79774ea70e5101159413"
-      },
-      "@std/assert@0.220.1": {
-        "integrity": "88710d54f3afdd7a5761e7805abba1f56cd14e4b212feffeb3e73a9f77482425"
-      },
-      "@std/path@0.220.1": {
-        "integrity": "cc63c1b5e5192e2f718dc2f365a3514fffb26cc0380959bab0f8fb5988a52f0c",
-        "dependencies": [
-          "jsr:@std/assert@^0.220.1"
-        ]
-      }
+    "@std/path@0.224.0": {
+      "integrity": "55bca6361e5a6d158b9380e82d4981d82d338ec587de02951e2b7c3a24910ee6",
+      "dependencies": [
+        "jsr:@std/assert"
+      ]
+    }
+  },
+  "npm": {
+    "simple-cdp@1.8.5": {
+      "integrity": "sha512-bpXoeCk0mwFrr+8C8vVkhCug5h4HO49GI+MZdnyLQcFVKzTlokrimTjEoc69X2Y2n7mtjzDHTriq6B/kgUeUcA=="
     },
-    "npm": {
-      "simple-cdp@1.8.5": {
-        "integrity": "sha512-bpXoeCk0mwFrr+8C8vVkhCug5h4HO49GI+MZdnyLQcFVKzTlokrimTjEoc69X2Y2n7mtjzDHTriq6B/kgUeUcA==",
-        "dependencies": {}
-      },
-      "ws@8.16.0": {
-        "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
-        "dependencies": {}
-      }
+    "ws@8.16.0": {
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ=="
     }
   },
-  "remote": {},
   "workspace": {
     "dependencies": [
       "jsr:@simple-cdp/simple-cdp@^1.8.5",
-      "jsr:@std/path@^0.220.1"
+      "jsr:@std/path@0.224"
     ],
     "packageJson": {
       "dependencies": [

package/lib/cdp-client.js

@@ -28,6 +28,7 @@ import { getScriptSource, getHookScriptSource } from "./single-file-script.js";
 import { CDP, options } from "simple-cdp";
 
 const LOAD_TIMEOUT_ERROR = "ERR_LOAD_TIMEOUT";
+const CAPTURE_TIMEOUT_ERROR = "ERR_CAPTURE_TIMEOUT";
 const NETWORK_STATES = ["InteractiveTime", "networkIdle", "networkAlmostIdle", "load", "DOMContentLoaded"];
 const MINIMIZED_WINDOW_STATE = "minimized";
 const SINGLE_FILE_WORLD_NAME = "singlefile";
@@ -319,18 +320,31 @@ async function getPageData(options) {
 			}
 			await new Promise(resolve => setTimeout(resolve, options.browserWaitDelay));
 		}
-		if (options.debugMessagesFile) {
-			debugMessages.push([Date.now(), ["Capturing page"]]);
-		}
-		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,
-			returnByValue: true,
-			contextId
-		});
-		const { subtype, description } = result;
-		if (subtype === "error") {
-			throw new Error(description);
+		const captureTimeoutAbortController = new AbortController();
+		const captureTimeoutAbortSignal = captureTimeoutAbortController.signal;
+		try {
+			if (options.debugMessagesFile) {
+				debugMessages.push([Date.now(), ["Capturing page"]]);
+			}
+			const { result } = await Promise.race([
+				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,
+					returnByValue: true,
+					contextId
+				}),
+				waitForTimeout(captureTimeoutAbortSignal, options.browserCaptureMaxTime, "Capture timeout", CAPTURE_TIMEOUT_ERROR)
+			]);
+			const { subtype, description } = result;
+			if (subtype === "error") {
+				throw new Error(description);
+			}
+		} finally {
+			if (!captureTimeoutAbortSignal.aborted) {
+				captureTimeoutAbortController.abort();
+			}
+			await Runtime.disable();
+			await Page.disable();
 		}
 		const pageData = await pageDataPromise;
 		if (options.consoleMessagesFile) {
@@ -429,7 +443,7 @@ async function loadPage({ Page, Runtime }, options, debugMessages) {
 		}
 		const [contextId] = await Promise.race([
 			Promise.all([getTopFrameContextId({ Page, Runtime }, options, debugMessages), Page.navigate({ url: options.url })]),
-			waitForLoadTimeout(loadTimeoutAbortSignal, options.browserLoadMaxTime)
+			waitForTimeout(loadTimeoutAbortSignal, options.browserLoadMaxTime, "Load timeout", LOAD_TIMEOUT_ERROR)
 		]);
 		return contextId;
 	} finally {
@@ -555,14 +569,14 @@ async function getTopFrameContextId({ Page, Runtime }, options, debugMessages) {
 	}
 }
 
-function waitForLoadTimeout(abortSignal, maxDelay) {
+function waitForTimeout(abortSignal, maxDelay, errorMessage, errorCode) {
 	return new Promise((resolve, reject) => {
 		const ABORT_EVENT = "abort";
 		abortSignal.addEventListener(ABORT_EVENT, onAbort);
 		const timeoutId = setTimeout(() => {
 			abortSignal.removeEventListener(ABORT_EVENT, onAbort);
-			const error = new Error("Load timeout");
-			error.code = LOAD_TIMEOUT_ERROR;
+			const error = new Error(errorMessage);
+			error.code = errorCode;
 			reject(error);
 		}, maxDelay);