single-file-cli 2.0.30 → 2.0.32

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@single-file/single-file-cli",
-  "version": "2.0.30",
+  "version": "2.0.32",
   "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,10 +34,10 @@ export { launchBrowser, closeBrowser };
 
 async function launchBrowser(options = {}, indexPath = 0) {
 	const executablePath = options.executablePath || BROWSER_PATHS[build.os][indexPath];
-	const args = Array.from(BROWSER_ARGS);
-	profilePath = await makeTempDir();
+	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");
 	} else {
@@ -58,8 +60,13 @@ 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);
 	}
+	if (options.args.includes("--headless=new") || args.includes("--auto-open-devtools-for-tabs")) {
+		args.push("--disable-site-isolation-trials");
+	}
 	const command = new Command(executablePath, { args, stdout: PIPED_STD_CONFIG, stderr: PIPED_STD_CONFIG });
 	try {
 		child = await command.spawn();
@@ -78,19 +85,28 @@ async function launchBrowser(options = {}, indexPath = 0) {
 	return debugPort;
 }
 
-async function getDebugPort(port = 9222) {
+async function getDebugPort(port = getRandomDebugPort(), usedPorts = []) {
 	try {
 		await fetch("http://localhost:" + port + "/json/version");
 	} catch (error) {
 		return port;
 	}
-	if (port < 9286) {
-		return getDebugPort(port + 1);
+	if (usedPorts.length < DEBUG_PORT_RANGE) {
+		usedPorts.push(port);
+		do {
+			port = getRandomDebugPort();
+		} while (usedPorts.includes(port));
+		return getDebugPort(port, usedPorts);
 	} else {
 		throw new Error("No available debugging port");
 	}
 }
 
+
+function getRandomDebugPort() {
+	return Math.floor(Math.random() * DEBUG_PORT_RANGE) + DEBUG_PORT_MIN;
+}
+
 async function closeBrowser() {
 	if (child !== undefined) {
 		child.kill();

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",

package/lib/version.js

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

package/package.json

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

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 };