single-file-cli 2.1.1 → 2.1.3

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 --minimum-dependency-age=0 "npm:single-file-core@1.5.85"
+deno install --vendor --quiet --minimum-dependency-age=0 "npm:single-file-core@1.5.86"
 mv package.json.tmp package.json
 mv deno.json.tmp deno.json
 mv deno.lock.tmp deno.lock

package/compile.sh

@@ -12,11 +12,11 @@ cp -R ./resources "$stage_dir/resources"
 mkdir -p "$dist_dir"
 cd "$stage_dir"
 
-deno compile --allow-read --allow-write --allow-net --allow-env --allow-run --ext=js --output="$dist_dir/single-file-aarch64-apple-darwin" --target=aarch64-apple-darwin ./single-file
-deno compile --allow-read --allow-write --allow-net --allow-env --allow-run --ext=js --output="$dist_dir/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_dir/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_dir/single-file-aarch64-linux" --target=aarch64-unknown-linux-gnu ./single-file
-deno compile --allow-all --ext=js --output="$dist_dir/single-file.exe" --target=x86_64-pc-windows-msvc --icon=./resources/single-file.ico ./single-file
+deno compile --minimum-dependency-age=0 --allow-read --allow-write --allow-net --allow-env --allow-run --ext=js --output="$dist_dir/single-file-aarch64-apple-darwin" --target=aarch64-apple-darwin ./single-file
+deno compile --minimum-dependency-age=0 --allow-read --allow-write --allow-net --allow-env --allow-run --ext=js --output="$dist_dir/single-file-x86_64-apple-darwin" --target=x86_64-apple-darwin ./single-file
+deno compile --minimum-dependency-age=0 --allow-read --allow-write --allow-net --allow-env --allow-run --ext=js --output="$dist_dir/single-file-x86_64-linux" --target=x86_64-unknown-linux-gnu ./single-file
+deno compile --minimum-dependency-age=0 --allow-read --allow-write --allow-net --allow-env --allow-run --ext=js --output="$dist_dir/single-file-aarch64-linux" --target=aarch64-unknown-linux-gnu ./single-file
+deno compile --minimum-dependency-age=0 --allow-all --ext=js --output="$dist_dir/single-file.exe" --target=x86_64-pc-windows-msvc --icon=./resources/single-file.ico ./single-file
 
 cd - > /dev/null
 

package/deno.json

@@ -1,12 +1,12 @@
 {
   "name": "@single-file/single-file-cli",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "SingleFile CLI",
   "exports": {
     ".": "./single-file-cli-api.js"
   },
   "imports": {
-    "simple-cdp": "jsr:@simple-cdp/simple-cdp@^1.10.0",
-    "path": "jsr:@std/path@^1.1.2"
+    "simple-cdp": "jsr:@simple-cdp/simple-cdp@^1.10.1",
+    "path": "jsr:@std/path@^1.1.6"
   }
 }

package/deno.lock

@@ -1,17 +1,17 @@
 {
   "version": "5",
   "specifiers": {
-    "jsr:@simple-cdp/simple-cdp@^1.10.0": "1.10.0",
+    "jsr:@simple-cdp/simple-cdp@^1.10.1": "1.10.1",
     "jsr:@std/internal@^1.0.14": "1.0.14",
-    "jsr:@std/path@^1.1.2": "1.1.6",
-    "npm:@eslint/js@^9.39.1": "9.39.5",
-    "npm:esbuild@~0.27.4": "0.27.7",
+    "jsr:@std/path@^1.1.6": "1.1.6",
+    "npm:@eslint/js@^9.39.5": "9.39.5",
+    "npm:esbuild@~0.27.7": "0.27.7",
     "npm:eslint@^10.8.1": "10.8.1",
-    "npm:simple-cdp@^1.10.0": "1.10.0"
+    "npm:simple-cdp@^1.10.1": "1.10.1"
   },
   "jsr": {
-    "@simple-cdp/simple-cdp@1.10.0": {
-      "integrity": "3f8c91e22598c3e15a680f14ee3d2aa174c21b9b528caad5ec8552e3df0c3897"
+    "@simple-cdp/simple-cdp@1.10.1": {
+      "integrity": "33c686242e812a53d13ba7fcebd18ed81b4685fb02da37c2ee6ed9a5123f9b8c"
     },
     "@std/internal@1.0.14": {
       "integrity": "291516b3d4c35024d6ffbc0a9df5bf4c64116e05b50012cf846710152d2ffdf7"
@@ -527,8 +527,8 @@
     "shebang-regex@3.0.0": {
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
-    "simple-cdp@1.10.0": {
-      "integrity": "sha512-UXDAaiges1GqNKtBy39po+CD4hXDJxQEDtR1GF9bK2J9MNN0epTo2GpoSmEc8o5ofW8dutpHafBjowEchSNgig=="
+    "simple-cdp@1.10.1": {
+      "integrity": "sha512-svGX76zc2MY2ErGAWGb9NWP9aF5XQgDyx00iqAGCgRi1qQd5MQjtBwuC7mcktliFH263gpHdnHicfsB+n7Vnyg=="
     },
     "type-check@0.4.0": {
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
@@ -558,15 +558,15 @@
   },
   "workspace": {
     "dependencies": [
-      "jsr:@simple-cdp/simple-cdp@^1.10.0",
-      "jsr:@std/path@^1.1.2"
+      "jsr:@simple-cdp/simple-cdp@^1.10.1",
+      "jsr:@std/path@^1.1.6"
     ],
     "packageJson": {
       "dependencies": [
-        "npm:@eslint/js@^9.39.1",
-        "npm:esbuild@~0.27.4",
+        "npm:@eslint/js@^9.39.5",
+        "npm:esbuild@~0.27.7",
         "npm:eslint@^10.8.1",
-        "npm:simple-cdp@^1.10.0"
+        "npm:simple-cdp@^1.10.1"
       ]
     }
   }

package/lib/browser.js

@@ -80,8 +80,13 @@ async function launchBrowser(options = {}, indexPath = 0) {
 	} catch (error) {
 		await remove(profilePath, { recursive: true }).catch(() => { });
 		profilePath = undefined;
-		if (error instanceof errors.NotFound && indexPath + 1 < BROWSER_PATHS[build.os].length) {
-			return launchBrowser(options, indexPath + 1);
+		if (error instanceof errors.NotFound) {
+			if (!options.executablePath && indexPath + 1 < BROWSER_PATHS[build.os].length) {
+				return launchBrowser(options, indexPath + 1);
+			}
+			throw new Error(options.executablePath ?
+				`The browser executable was not found at ${JSON.stringify(executablePath)}` :
+				"The browser executable was not found, use --browser-executable-path to set its location");
 		}
 		throw error;
 	}

package/lib/cdp-client.js

@@ -102,7 +102,7 @@ function relaunchBrowser() {
 
 async function getPageData(options) {
 	const EMPTY_PAGE_URL = "about:blank";
-	const pageContext = { options, consoleMessages: [], debugMessages: [], httpInfo: {} };
+	const pageContext = { options, consoleMessages: [], debugMessages: [], httpInfo: {}, fetchAbortController: new AbortController() };
 	let targetInfo, cdp;
 	try {
 		logData(["Loading page", EMPTY_PAGE_URL], pageContext);
@@ -131,6 +131,7 @@ async function getPageData(options) {
 		throw error;
 	} finally {
 		logData(["Closing page"], pageContext);
+		pageContext.fetchAbortController.abort();
 		await closeTarget();
 		logData(["Finishing"], pageContext);
 	}
@@ -454,14 +455,16 @@ async function loadPage({ Page, Runtime }, { options, debugMessages }) {
 			]),
 			waitForTimeout(loadTimeoutAbortSignal, options.browserLoadMaxTime, LOAD_TIMEOUT_ERROR_MESSAGE, LOAD_TIMEOUT_ERROR)
 		]);
+		// only called when the page loaded, these calls can hang forever on an
+		// unresponsive page and would mask the load timeout error
+		await Page.setLifecycleEventsEnabled({ enabled: false });
+		await Runtime.disable();
+		await Page.disable();
 		return contextId;
 	} finally {
 		if (!loadTimeoutAbortSignal.aborted) {
 			loadTimeoutAbortController.abort();
 		}
-		await Page.setLifecycleEventsEnabled({ enabled: false });
-		await Runtime.disable();
-		await Page.disable();
 	}
 }
 
@@ -571,7 +574,7 @@ function setupPageDataCapture({ Runtime }, _contextId, { options, debugMessages
 	});
 }
 
-async function setupBindings({ Page, Runtime }, contextId, { options, debugMessages }) {
+async function setupBindings({ Page, Runtime }, contextId, { options, debugMessages, fetchAbortController }) {
 	await Runtime.addBinding({ name: SET_PAGE_DATA_FUNCTION_NAME, executionContextId: contextId });
 	if (options.embedScreenshot && options.compressContent) {
 		await setupScreenshotCapture({ Page, Runtime }, contextId, { options, debugMessages });
@@ -582,7 +585,7 @@ async function setupBindings({ Page, Runtime }, contextId, { options, debugMessa
 	await Runtime.addBinding({ name: FETCH_FUNCTION_NAME, executionContextId: contextId });
 	Runtime.addEventListener(BINDING_CALLED_EVENT_TYPE, ignoringErrors(async ({ params }) => {
 		if (params.name === FETCH_FUNCTION_NAME) {
-			await handleFetchRequest({ Runtime }, params, contextId, { options, debugMessages });
+			await handleFetchRequest({ Runtime }, params, contextId, { options, debugMessages, fetchAbortController });
 		}
 	}, { options, debugMessages }));
 }
@@ -645,12 +648,12 @@ async function setupPdfCapture({ Page, Runtime }, contextId, { options, debugMes
 	}
 }
 
-async function handleFetchRequest({ Runtime }, params, contextId, { options, debugMessages }) {
+async function handleFetchRequest({ Runtime }, params, contextId, { options, debugMessages, fetchAbortController }) {
 	const { payload } = params;
 	const { requestId, url, options: fetchOptions } = JSON.parse(payload);
 	logData(["Fetching URL", url], { options, debugMessages });
 	try {
-		const response = await fetch(url, fetchOptions);
+		const response = await fetch(url, Object.assign({}, fetchOptions, { signal: fetchAbortController.signal }));
 		const arrayBuffer = await response.arrayBuffer();
 		const base64Data = arrayBufferToBase64(arrayBuffer);
 		const result = {
@@ -694,7 +697,7 @@ async function capturePageData({ Runtime }, contextId, { options, debugMessages
 			CAPTURE_SCREENSHOT_FUNCTION_NAME,
 			PRINT_TO_PDF_FUNCTION_NAME
 		])})`;
-		const { result } = await Promise.race([
+		const { result, exceptionDetails } = await Promise.race([
 			Runtime.evaluate({
 				expression: captureScript,
 				awaitPromise: true,
@@ -703,6 +706,12 @@ async function capturePageData({ Runtime }, contextId, { options, debugMessages
 			}),
 			waitForTimeout(captureTimeoutAbortSignal, options.browserCaptureMaxTime, CAPTURE_TIMEOUT_ERROR_MESSAGE, CAPTURE_TIMEOUT_ERROR)
 		]);
+		// `returnByValue` serializes the rejection value to an empty object, so
+		// the error is only readable in `exceptionDetails`
+		if (exceptionDetails) {
+			const { exception, text } = exceptionDetails;
+			throw new Error(exception && exception.description ? exception.description : text);
+		}
 		if (result.subtype === ERROR_SUBTYPE) {
 			throw new Error(result.description);
 		}

package/lib/deno-polyfill.js

@@ -53,6 +53,12 @@ const errors = {
 			super(message);
 			this.name = "NotFound";
 		}
+	},
+	AlreadyExists: DENO_RUNTIME_DETECTED ? Deno.errors.AlreadyExists : class AlreadyExists extends Error {
+		constructor(message) {
+			super(message);
+			this.name = "AlreadyExists";
+		}
 	}
 };
 
@@ -157,7 +163,7 @@ async function writeTextFile(path, data, options = {}) {
 		if (options.append) {
 			return fsPromise.appendFile(path, data, options);
 		} else {
-			return fsPromise.writeFile(path, data, options);
+			return nodeWriteFile(fsPromise, path, data, options);
 		}
 	}
 }
@@ -167,7 +173,18 @@ async function writeFile(path, data, options = {}) {
 		return Deno.writeFile(path, data, options);
 	} else {
 		const fsPromise = await import(NODE_MODULES["fs"]);
-		return fsPromise.writeFile(path, data, options);
+		return nodeWriteFile(fsPromise, path, data, options);
+	}
+}
+
+async function nodeWriteFile(fsPromise, path, data, options) {
+	if (options.createNew) {
+		options.flag = "wx";
+	}
+	try {
+		return await fsPromise.writeFile(path, data, options);
+	} catch (error) {
+		throw error.code == "EEXIST" ? new errors.AlreadyExists(error.message) : error;
 	}
 }