single-file-cli 2.0.29 → 2.0.31

package/deno.json

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

package/lib/browser.js

@@ -25,6 +25,8 @@ import { BROWSER_PATHS, BROWSER_ARGS } from "./constants.js";
 import { Deno } from "./deno-polyfill.js";
 
 const PIPED_STD_CONFIG = "piped";
+const DEBUG_PORT_MIN = 9222;
+const DEBUG_PORT_RANGE = 256;
 
 const { build, makeTempDir, Command, errors, remove } = Deno;
 let child, profilePath;
@@ -32,7 +34,9 @@ export { launchBrowser, closeBrowser };
 
 async function launchBrowser(options = {}, indexPath = 0) {
 	const executablePath = options.executablePath || BROWSER_PATHS[build.os][indexPath];
-	const args = Array.from(BROWSER_ARGS);
+	let args = Array.from(BROWSER_ARGS);
+	const debugPort = await getDebugPort();
+	args.push("--remote-debugging-port=" + debugPort);
 	profilePath = await makeTempDir();
 	if (options.headless && !options.debug) {
 		args.push("--headless");
@@ -56,6 +60,8 @@ async function launchBrowser(options = {}, indexPath = 0) {
 	}
 	args.push("--user-data-dir=" + profilePath);
 	if (options.args) {
+		const argNames = options.args.map(arg => arg.split("=")[0]);
+		args = args.filter(arg => !argNames.includes(arg.split("=")[0]));
 		args.push(...options.args);
 	}
 	const command = new Command(executablePath, { args, stdout: PIPED_STD_CONFIG, stderr: PIPED_STD_CONFIG });
@@ -64,7 +70,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 +79,24 @@ async function launchBrowser(options = {}, indexPath = 0) {
 		}
 	}
 	child.ref();
-	return child;
+	return debugPort;
+}
+
+async function getDebugPort(port = 9222, usedPorts = []) {
+	try {
+		await fetch("http://localhost:" + port + "/json/version");
+	} catch (error) {
+		return port;
+	}
+	if (usedPorts.length < DEBUG_PORT_RANGE) {
+		usedPorts.push(port);
+		do {
+			port = Math.floor(Math.random() * DEBUG_PORT_RANGE) + DEBUG_PORT_MIN;
+		} while (usedPorts.includes(port));
+		return getDebugPort(port, usedPorts);
+	} 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)));
 	}
 }
 
@@ -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();
@@ -197,7 +191,7 @@ async function getTopFrameContextId({ Page, Runtime }, options) {
 
 				function onLifecycleEvent({ params }) {
 					const { frameId, name } = params;
-					if (frameId === topFrameId && (name === options.browserWaitUntil || name === DEFAULT_NETWORK_STATE)) {
+					if (frameId === topFrameId && name === options.browserWaitUntil) {
 						removeListeners();
 						resolve();
 					}

package/lib/constants.js

@@ -35,7 +35,6 @@ const BROWSER_ARGS = [
 	"--no-default-browser-check",
 	"--disable-default-apps",
 	"--disable-dev-shm-usage",
-	"--disable-extensions",
 	"--disable-features=ImprovedCookieControls,LazyFrameLoading,GlobalMediaControls,DestroyProfileOnBrowserClose,MediaRouter,DialMediaRouteProvider,AcceptCHFrame,AutoExpandDetailsElement,CertificateTransparencyComponentUpdater,AvoidUnnecessaryBeforeUnloadCheckSync,Translate,HttpsUpgrades,PaintHolding",
 	"--disable-hang-monitor",
 	"--disable-ipc-flooding-protection",
@@ -52,7 +51,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.29";
+export const version = "2.0.31";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-cli",
-	"version": "2.0.29",
+	"version": "2.0.31",
 	"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,8 +28,16 @@ import options from "./options.js";
 
 const { readTextFile, exit, addSignalListener } = Deno;
 
-addSignalListener("SIGTERM", closeBrowserAndExit);
-addSignalListener("SIGINT", closeBrowserAndExit);
+try {
+	addSignalListener("SIGTERM", closeBrowserAndExit);
+} catch (_error) {
+	// ignored
+}
+try {
+	addSignalListener("SIGINT", closeBrowserAndExit);
+} catch (_error) {
+	// ignored
+}
 
 export { run };