single-file-cli 2.0.20 → 2.0.22

package/deno.json

@@ -1,13 +1,13 @@
 {
   "name": "@single-file/single-file-cli",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "description": "SingleFile CLI",
   "nodeModulesDir": true,
   "exports": {
     ".": "./single-file-cli-api.js"
   },
   "imports": {
-    "simple-cdp": "jsr:@simple-cdp/simple-cdp@^1.8.2",
+    "simple-cdp": "jsr:@simple-cdp/simple-cdp@^1.8.5",
     "path": "jsr:@std/path@^0.220.1"
   }
 }

package/deno.lock

@@ -2,15 +2,15 @@
   "version": "3",
   "packages": {
     "specifiers": {
-      "jsr:@simple-cdp/simple-cdp@^1.8.2": "jsr:@simple-cdp/simple-cdp@1.8.2",
+      "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.2": "npm:simple-cdp@1.8.2",
+      "npm:simple-cdp@^1.8.5": "npm:simple-cdp@1.8.5",
       "npm:ws@^8.16.0": "npm:ws@8.16.0"
     },
     "jsr": {
-      "@simple-cdp/simple-cdp@1.8.2": {
-        "integrity": "171f82ef24c464c83f0ffc1148096a04fcd8256c6bb6b5454640614c53689165"
+      "@simple-cdp/simple-cdp@1.8.5": {
+        "integrity": "7386ca561cd6293bb3115eadf14b8c98d1c41c35a69c79774ea70e5101159413"
       },
       "@std/assert@0.220.1": {
         "integrity": "88710d54f3afdd7a5761e7805abba1f56cd14e4b212feffeb3e73a9f77482425"
@@ -23,8 +23,8 @@
       }
     },
     "npm": {
-      "simple-cdp@1.8.2": {
-        "integrity": "sha512-Ts4RpMMuJjdp+mLB2OJeJSUyTJZw3tUDc7ZWKytK6/4zSegwzKJEIqKv0Z2UgX0DPvma0eYg10MfaceM6CYQfA==",
+      "simple-cdp@1.8.5": {
+        "integrity": "sha512-bpXoeCk0mwFrr+8C8vVkhCug5h4HO49GI+MZdnyLQcFVKzTlokrimTjEoc69X2Y2n7mtjzDHTriq6B/kgUeUcA==",
         "dependencies": {}
       },
       "ws@8.16.0": {
@@ -36,12 +36,12 @@
   "remote": {},
   "workspace": {
     "dependencies": [
-      "jsr:@simple-cdp/simple-cdp@^1.8.2",
+      "jsr:@simple-cdp/simple-cdp@^1.8.5",
       "jsr:@std/path@^0.220.1"
     ],
     "packageJson": {
       "dependencies": [
-        "npm:simple-cdp@^1.8.2",
+        "npm:simple-cdp@^1.8.5",
         "npm:ws@^8.16.0"
       ]
     }

package/lib/browser.js

@@ -66,13 +66,7 @@ async function launchBrowser(options = {}, indexPath = 0) {
 			if (indexPath + 1 < BROWSER_PATHS[build.os].length) {
 				await launchBrowser(options, indexPath + 1);
 			} else {
-				let message = "Chromium executable not found. ";
-				if (options.executablePath) {
-					message += "Make sure --browser-executable-path is correct.";
-				} else {
-					message += "Set the path using the --browser-executable-path option.";
-				}
-				throw new Error(message);
+				throw error;
 			}
 		} else {
 			throw error;

package/lib/cdp-client.js

@@ -37,13 +37,17 @@ const EMPTY_PAGE_URL = "about:blank";
 export { initialize, getPageData, closeBrowser };
 
 async function initialize(options) {
-	await launchBrowser(getBrowserOptions(options));
+	if (!options.browserRemoteDebuggingURL) {
+		await launchBrowser(getBrowserOptions(options));
+	} else {
+		CDP.remoteDebuggingUrl = options.browserRemoteDebuggingURL;
+	}
 }
 
 async function getPageData(options) {
 	let targetInfo;
 	try {
-		const targetInfo = await CDP.createTarget(EMPTY_PAGE_URL);
+		targetInfo = await CDP.createTarget(EMPTY_PAGE_URL);
 		const { Browser, Security, Page, Emulation, Fetch, Network, Runtime, Debugger } = new CDP(targetInfo);
 		if (options.browserStartMinimized) {
 			const { windowId, bounds } = await Browser.getWindowForTarget({ targetId: targetInfo.targetId });
@@ -60,7 +64,7 @@ async function getPageData(options) {
 		if (options.browserMobileEmulation) {
 			await Emulation.setDeviceMetricsOverride({ mobile: true });
 		}
-		if (options.httpProxyServer && options.httpProxyUsername) {
+		if (options.httpProxyUsername) {
 			await Fetch.enable({ handleAuthRequests: true });
 			Fetch.addEventListener("authRequired", ({ params }) => Fetch.continueWithAuth({
 				requestId: params.requestId,
@@ -127,7 +131,7 @@ async function getPageData(options) {
 		throw error;
 	} finally {
 		if (targetInfo && !options.browserDebug) {
-			await CDP.closeTarget(targetInfo.targetId);
+			await CDP.closeTarget(targetInfo.id);
 		}
 	}
 }
@@ -169,6 +173,7 @@ function getTopFrameContextId({ Page, Runtime }, options) {
 				frameId = frame.id;
 				if (navigationAbortController) {
 					navigationAbortController.abort();
+					contextIds.length = 0;
 				}
 				navigationAbortController = new AbortController();
 				await onTopFrameNavigated(navigationAbortController.signal);
@@ -214,20 +219,20 @@ function getTopFrameContextId({ Page, Runtime }, options) {
 				contextIds.splice(index, 1);
 			}
 		}
+	});
 
-		async function testExecutionContext(contextId) {
-			try {
-				const { result } = await Runtime.evaluate({
-					expression: "singlefile !== undefined",
-					contextId
-				});
-				return result.value === true;
-			} catch (error) {
-				// ignored
-			}
-			return false;
+	async function testExecutionContext(contextId) {
+		try {
+			const { result } = await Runtime.evaluate({
+				expression: "singlefile !== undefined",
+				contextId
+			});
+			return result.value === true;
+		} catch (error) {
+			// ignored
 		}
-	});
+		return false;
+	}
 }
 
 function waitForLoadTimeout(abortSignal, maxDelay) {

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.20";
+export const version = "2.0.22";

package/options.js

@@ -60,6 +60,7 @@ const OPTIONS_INFO = {
 	"browser-cookie": { description: "Ordered list of cookie parameters separated by a comma (name,value,domain,path,expires,httpOnly,secure,sameSite,url)", type: "string[]" },
 	"browser-cookies-file": { description: "Path of the cookies file formatted as a JSON file or a Netscape text file", type: "string" },
 	"browser-ignore-insecure-certs": { description: "Ignore HTTPs errors", type: "boolean" },
+	"browser-remote-debugging-URL": { description: "Remote debugging URL", type: "string" },
 	"compress-content": { description: "Compress the output file into a ZIP file", type: "boolean" },
 	"compress-CSS": { description: "Compress CSS stylesheets", type: "boolean" },
 	"compress-HTML": { description: "Compress HTML content", type: "boolean", defaultValue: true },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-cli",
-	"version": "2.0.20",
+	"version": "2.0.22",
 	"description": "SingleFile CLI",
 	"author": "Gildas Lormeau",
 	"engines": {
@@ -13,7 +13,7 @@
 		"single-file": "./single-file-node.js"
 	},
 	"dependencies": {
-		"simple-cdp": "^1.8.2",
+		"simple-cdp": "^1.8.5",
 		"ws": "^8.16.0"
 	}
 }

package/single-file-cli-api.js

@@ -76,7 +76,7 @@ const DEFAULT_OPTIONS = {
 const STATE_PROCESSING = "processing";
 const STATE_PROCESSED = "processed";
 
-const { readTextFile, writeTextFile, writeFile, stdout, mkdir, stat } = Deno;
+const { readTextFile, writeTextFile, writeFile, stdout, mkdir, stat, errors } = Deno;
 let tasks = [], maxParallelWorkers, sessionFilename;
 
 export { DEFAULT_OPTIONS, VALID_URL_TEST, initialize };
@@ -84,7 +84,21 @@ export { DEFAULT_OPTIONS, VALID_URL_TEST, initialize };
 async function initialize(options) {
 	options = Object.assign({}, DEFAULT_OPTIONS, options);
 	maxParallelWorkers = options.maxParallelWorkers || 8;
-	await backend.initialize(options);
+	try {
+		await backend.initialize(options);
+	} catch (error) {
+		if (error instanceof errors.NotFound) {
+			let message = "Chromium executable not found. ";
+			if (options.browserExecutablePath) {
+				message += "Make sure --browser-executable-path is correct.";
+			} else {
+				message += "Set the path using the --browser-executable-path option.";
+			}
+			throw new Error(message);
+		} else {
+			throw error;
+		}
+	}
 	if (options.crawlSyncSession || options.crawlLoadSession) {
 		try {
 			tasks = JSON.parse(await readTextFile(options.crawlSyncSession || options.crawlLoadSession));