single-file-cli 2.0.67 → 2.0.69

package/README.MD

@@ -65,7 +65,7 @@ Make sure Chrome or a Chromium-based browser is installed in the default folder.
 
 - There are 3 ways to download the code of SingleFile, choose the one you prefer:
   
-  - Install with `npm` (`npm` is installed with Node.js) and run with `npx`
+  - Install with `npm` and run `single-file` via `npx` (`npm` and `npx` are installed with Node.js)
   
     ```sh
     npm install "single-file-cli"

package/build.sh

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

package/deno.json

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

package/lib/browser.js

@@ -92,7 +92,7 @@ async function launchBrowser(options = {}, indexPath = 0) {
 async function getDebugPort(port = getRandomDebugPort(), usedPorts = []) {
 	try {
 		await fetch("http://localhost:" + port + "/json/version");
-	} catch (error) {
+	} catch {
 		return port;
 	}
 	if (usedPorts.length < DEBUG_PORT_RANGE) {
@@ -121,7 +121,7 @@ async function closeBrowser() {
 		try {
 			await remove(profilePath, { recursive: true });
 			profilePath = undefined;
-		} catch (error) {
+		} catch {
 			console.log("Warning: failed to remove profile directory: " + profilePath); // eslint-disable-line no-console
 		}
 	}

package/lib/cdp-client.js

@@ -159,7 +159,7 @@ async function getPageData(options) {
 			}
 			try {
 				await Fetch.continueRequest({ requestId });
-			} catch (error) {
+			} catch {
 				// ignored
 			}
 		});
@@ -177,6 +177,7 @@ async function getPageData(options) {
 		if (options.browserCookies && options.browserCookies.length) {
 			await Network.setCookies({ cookies: options.browserCookies });
 		}
+		await Browser.setDownloadBehavior({ behavior: "deny" });
 		await Page.addScriptToEvaluateOnNewDocument({
 			source: getHookScriptSource(),
 			runImmediately: true
@@ -200,14 +201,14 @@ async function getPageData(options) {
 						if (options.embedScreenshotOptions) {
 							try {
 								screenshotOptions = JSON.parse(options.embedScreenshotOptions);
-							} catch (error) {
+							} catch {
 								// 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) {
+					} catch {
 						await Runtime.evaluate({ expression: `globalThis.${SET_SCREENSHOT_FUNCTION_NAME}(${JSON.stringify("")})`, contextId });
 					}
 				}
@@ -221,14 +222,14 @@ async function getPageData(options) {
 					if (options.embedPdfOptions) {
 						try {
 							pdfOptions = JSON.parse(options.embedPdfOptions);
-						} catch (error) {
+						} catch {
 							// ignored
 						}
 					}
 					try {
 						const { data } = await Page.printToPDF(pdfOptions);
 						await Runtime.evaluate({ expression: `globalThis.${SET_PDF_FUNCTION_NAME}(${JSON.stringify(data)})`, contextId });
-					} catch (error) {
+					} catch {
 						await Runtime.evaluate({ expression: `globalThis.${SET_PDF_FUNCTION_NAME}(${JSON.stringify("")})`, contextId });
 					}
 				}
@@ -236,7 +237,7 @@ async function getPageData(options) {
 		}
 		const pageDataPromise = new Promise(resolve => {
 			let pageDataResponse = "";
-			Runtime.addEventListener("bindingCalled", async ({ params }) => {
+			Runtime.addEventListener("bindingCalled", ({ params }) => {
 				if (params.name === SET_PAGE_DATA_FUNCTION_NAME) {
 					const { payload } = params;
 					if (payload.length) {
@@ -276,13 +277,19 @@ async function getPageData(options) {
 			const browserWaitUntil = NETWORK_STATES[(NETWORK_STATES.indexOf(options.browserWaitUntil) + 1)];
 			if (browserWaitUntil) {
 				options.browserWaitUntil = browserWaitUntil;
+				await closeTarget();
 				return await getPageData(options);
 			}
 		}
 		throw error;
 	} finally {
+		await closeTarget();
+	}
+
+	async function closeTarget() {
 		if (targetInfo && !options.browserDebug) {
 			await CDP.closeTarget(targetInfo.id);
+			targetInfo = null;
 		}
 	}
 }
@@ -374,6 +381,7 @@ async function getTopFrameContextId({ Page, Runtime }, options) {
 	}
 
 	async function waitForPageReady({ Page }, options) {
+		let resolveCallbackTimeout;
 		await Page.setLifecycleEventsEnabled({ enabled: true });
 		try {
 			await new Promise((resolve, reject) => {
@@ -384,9 +392,12 @@ async function getTopFrameContextId({ Page, Runtime }, options) {
 
 				function onLifecycleEvent({ params }) {
 					const { frameId, name } = params;
-					if (frameId === topFrameId && name === options.browserWaitUntil) {
-						removeListeners();
-						resolve();
+					if (frameId === topFrameId && name === options.browserWaitUntil || (resolveCallbackTimeout && NETWORK_STATES.indexOf(name) < NETWORK_STATES.indexOf(options.browserWaitUntil))) {
+						clearTimeout(resolveCallbackTimeout);
+						setTimeout(() => {
+							removeListeners();
+							resolve();
+						}, options.browserWaitUntilDelay);
 					}
 				}
 
@@ -394,6 +405,7 @@ async function getTopFrameContextId({ Page, Runtime }, options) {
 					const { frame } = params;
 					if (!frame.parentId) {
 						if (frame.unreachableUrl) {
+							clearTimeout(resolveCallbackTimeout);
 							removeListeners();
 							reject(new Error("Unreachable URL: " + frame.unreachableUrl));
 						} else {
@@ -433,7 +445,7 @@ async function getTopFrameContextId({ Page, Runtime }, options) {
 				contextId
 			});
 			return result.value === true;
-		} catch (error) {
+		} catch {
 			// ignored
 		}
 		return false;

package/lib/deno-polyfill.js

@@ -21,6 +21,8 @@
  *   Source.
  */
 
+// deno-lint-ignore-file no-node-globals
+
 /* global globalThis, URL, Deno, process */
 
 import * as path from "path";
@@ -244,7 +246,7 @@ async function cwd() {
 	}
 }
 
-async function dirname(filePath) {
+function dirname(filePath) {
 	return path.dirname(filePath);
 }