single-file-cli 2.0.28 → 2.0.30

package/deno.json

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

package/lib/browser.js

@@ -34,6 +34,8 @@ async function launchBrowser(options = {}, indexPath = 0) {
 	const executablePath = options.executablePath || BROWSER_PATHS[build.os][indexPath];
 	const args = Array.from(BROWSER_ARGS);
 	profilePath = await makeTempDir();
+	const debugPort = await getDebugPort();
+	args.push("--remote-debugging-port=" + debugPort);
 	if (options.headless && !options.debug) {
 		args.push("--headless");
 	} else {
@@ -64,7 +66,7 @@ async function launchBrowser(options = {}, indexPath = 0) {
 	} catch (error) {
 		if (error instanceof errors.NotFound) {
 			if (indexPath + 1 < BROWSER_PATHS[build.os].length) {
-				await launchBrowser(options, indexPath + 1);
+				return launchBrowser(options, indexPath + 1);
 			} else {
 				throw error;
 			}
@@ -73,7 +75,20 @@ async function launchBrowser(options = {}, indexPath = 0) {
 		}
 	}
 	child.ref();
-	return child;
+	return debugPort;
+}
+
+async function getDebugPort(port = 9222) {
+	try {
+		await fetch("http://localhost:" + port + "/json/version");
+	} catch (error) {
+		return port;
+	}
+	if (port < 9286) {
+		return getDebugPort(port + 1);
+	} else {
+		throw new Error("No available debugging port");
+	}
 }
 
 async function closeBrowser() {

package/lib/cdp-client.js

@@ -25,22 +25,21 @@
 
 import { launchBrowser, closeBrowser } from "./browser.js";
 import { getScriptSource, getHookScriptSource } from "./single-file-script.js";
-import { CDP } from "simple-cdp";
+import { CDP, options } from "simple-cdp";
 
 const LOAD_TIMEOUT_ERROR = "ERR_LOAD_TIMEOUT";
-const DEFAULT_NETWORK_STATE = "networkIdle";
 const NETWORK_STATES = ["InteractiveTime", "networkIdle", "networkAlmostIdle", "load", "DOMContentLoaded"];
 const MINIMIZED_WINDOW_STATE = "minimized";
 const SINGLE_FILE_WORLD_NAME = "singlefile";
 const EMPTY_PAGE_URL = "about:blank";
 
-export { initialize, getPageData, hasPageTargets, closeBrowser };
+export { initialize, getPageData, closeBrowser };
 
-async function initialize(options) {
+async function initialize(singleFileOptions) {
 	if (options.browserRemoteDebuggingURL) {
-		CDP.remoteDebuggingUrl = options.browserRemoteDebuggingURL;
+		options.apiUrl = singleFileOptions.browserRemoteDebuggingURL;
 	} else {
-		await launchBrowser(getBrowserOptions(options));
+		options.apiUrl = "http://localhost:" + (await launchBrowser(getBrowserOptions(singleFileOptions)));
 	}
 }
 
@@ -116,7 +115,7 @@ async function getPageData(options) {
 		if (subtype === "error") {
 			throw new Error(description);
 		}
-		if (options.compressContent) {
+		if (Array.isArray(value.content)) {
 			value.content = new Uint8Array(value.content);
 		}
 		return value;
@@ -136,11 +135,6 @@ async function getPageData(options) {
 	}
 }
 
-async function hasPageTargets() {
-	const targets = await CDP.getTargets();
-	return targets.filter(target => target.type === "page").length > 0;
-}
-
 async function loadPage({ Page, Runtime }, options) {
 	await Runtime.enable();
 	await Page.enable();
@@ -162,12 +156,10 @@ async function loadPage({ Page, Runtime }, options) {
 }
 
 async function getTopFrameContextId({ Page, Runtime }, options) {
-	const FRAME_NAVIGATED_EVENT = "frameNavigated";
 	const CONTEXT_CREATED_EVENT = "executionContextCreated";
 	const contextIds = [];
 	let topFrameId;
 	try {
-		Page.addEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
 		Runtime.addEventListener(CONTEXT_CREATED_EVENT, onExecutionContextCreated);
 		await waitForPageReady({ Page }, options);
 		const contextId = await getContextId();
@@ -177,21 +169,9 @@ async function getTopFrameContextId({ Page, Runtime }, options) {
 			return contextId;
 		}
 	} finally {
-		Page.removeEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
 		Runtime.removeEventListener(CONTEXT_CREATED_EVENT, onExecutionContextCreated);
 	}
 
-	function onFrameNavigated({ params }) {
-		const { frame } = params;
-		if (!frame.parentId) {
-			if (frame.unreachableUrl) {
-				throw new Error("Unreachable URL: " + frame.unreachableUrl);
-			} else {
-				topFrameId = frame.id;
-			}
-		}
-	}
-
 	function onExecutionContextCreated({ params }) {
 		const { context } = params;
 		const { name, auxData = {} } = context;
@@ -203,17 +183,36 @@ async function getTopFrameContextId({ Page, Runtime }, options) {
 	async function waitForPageReady({ Page }, options) {
 		await Page.setLifecycleEventsEnabled({ enabled: true });
 		try {
-			await new Promise(resolve => {
+			await new Promise((resolve, reject) => {
 				const LIFE_CYCLE_EVENT = "lifecycleEvent";
+				const FRAME_NAVIGATED_EVENT = "frameNavigated";
 				Page.addEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
+				Page.addEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
 
 				function onLifecycleEvent({ params }) {
 					const { frameId, name } = params;
-					if (frameId === topFrameId && (name === options.browserWaitUntil || name === DEFAULT_NETWORK_STATE)) {
-						Page.removeEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
+					if (frameId === topFrameId && name === options.browserWaitUntil) {
+						removeListeners();
 						resolve();
 					}
 				}
+
+				function onFrameNavigated({ params }) {
+					const { frame } = params;
+					if (!frame.parentId) {
+						if (frame.unreachableUrl) {
+							removeListeners();
+							reject(new Error("Unreachable URL: " + frame.unreachableUrl));
+						} else {
+							topFrameId = frame.id;
+						}
+					}
+				}
+
+				function removeListeners() {
+					Page.removeEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
+					Page.removeEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
+				}
 			});
 		} finally {
 			await Page.setLifecycleEventsEnabled({ enabled: false });

package/lib/constants.js

@@ -52,7 +52,6 @@ const BROWSER_ARGS = [
 	"--enable-use-zoom-for-dsf=false",
 	"--no-sandbox",
 	"--no-startup-window",
-	"--remote-debugging-port=9222",
 	"--bwsi"
 ];
 const BROWSER_PATHS = {

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.28";
+export const version = "2.0.30";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-cli",
-	"version": "2.0.28",
+	"version": "2.0.30",
 	"description": "SingleFile CLI",
 	"author": "Gildas Lormeau",
 	"engines": {

package/single-file-cli-api.js

@@ -151,7 +151,7 @@ async function finish(options) {
 			}
 		}
 	}
-	if (!options.browserDebug && !options.browserRemoteDebuggingURL && !(await backend.hasPageTargets())) {
+	if (!options.browserDebug && !options.browserRemoteDebuggingURL) {
 		return backend.closeBrowser();
 	}
 }

package/single-file-launcher.js

@@ -28,15 +28,8 @@ import options from "./options.js";
 
 const { readTextFile, exit, addSignalListener } = Deno;
 
-addSignalListener("SIGTERM", async () => {
-	await closeBrowser();
-	exit();
-});
-
-addSignalListener("SIGINT", async () => {
-	await closeBrowser();
-	exit();
-});
+addSignalListener("SIGTERM", closeBrowserAndExit);
+addSignalListener("SIGINT", closeBrowserAndExit);
 
 export { run };
 
@@ -116,3 +109,8 @@ function parseCookies(textValue) {
 		})
 		.filter(cookieData => cookieData);
 }
+
+async function closeBrowserAndExit() {
+	await closeBrowser();
+	exit();
+}