single-file-cli 2.0.24 → 2.0.26

package/deno.json

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

package/lib/browser.js

@@ -34,7 +34,7 @@ async function launchBrowser(options = {}, indexPath = 0) {
 	const executablePath = options.executablePath || BROWSER_PATHS[build.os][indexPath];
 	const args = Array.from(BROWSER_ARGS);
 	profilePath = await makeTempDir();
-	if (options.headless) {
+	if (options.headless && !options.debug) {
 		args.push("--headless");
 	} else {
 		args.push("--start-maximized");

package/lib/cdp-client.js

@@ -34,7 +34,7 @@ const MINIMIZED_WINDOW_STATE = "minimized";
 const SINGLE_FILE_WORLD_NAME = "singlefile";
 const EMPTY_PAGE_URL = "about:blank";
 
-export { initialize, getPageData, hasTargets, closeBrowser };
+export { initialize, getPageData, hasPageTargets, closeBrowser };
 
 async function initialize(options) {
 	if (options.browserRemoteDebuggingURL) {
@@ -45,11 +45,10 @@ async function initialize(options) {
 }
 
 async function getPageData(options) {
-	let Browser, Security, Page, Emulation, Fetch, Network, Runtime, Debugger, Target;
 	let targetInfo;
 	try {
 		targetInfo = await CDP.createTarget(EMPTY_PAGE_URL);
-		({ Browser, Security, Page, Emulation, Fetch, Network, Runtime, Debugger, Target } = new CDP(targetInfo));
+		const { Browser, Security, Page, Emulation, Fetch, Network, Runtime, Debugger } = new CDP(targetInfo);
 		if (options.browserStartMinimized) {
 			const { windowId, bounds } = await Browser.getWindowForTarget({ targetId: targetInfo.id });
 			if (bounds.windowState !== MINIMIZED_WINDOW_STATE) {
@@ -131,13 +130,13 @@ async function getPageData(options) {
 		}
 		throw error;
 	} finally {
-		if (targetInfo) {
+		if (targetInfo && !options.browserDebug) {
 			await CDP.closeTarget(targetInfo.id);
 		}
 	}
 }
 
-async function hasTargets() {
+async function hasPageTargets() {
 	const targets = await CDP.getTargets();
 	return targets.filter(target => target.type === "page").length > 0;
 }
@@ -145,18 +144,18 @@ async function hasTargets() {
 async function loadPage({ Page, Runtime }, options) {
 	await Runtime.enable();
 	await Page.enable();
+	const loadTimeoutAbortController = new AbortController();
+	const loadTimeoutAbortSignal = loadTimeoutAbortController.signal;
 	try {
-		const loadTimeoutAbortController = new AbortController();
-		const loadTimeoutAbortSignal = loadTimeoutAbortController.signal;
 		const [contextId] = await Promise.race([
 			Promise.all([getTopFrameContextId({ Page, Runtime }, options), Page.navigate({ url: options.url })]),
 			waitForLoadTimeout(loadTimeoutAbortSignal, options.browserLoadMaxTime)
 		]);
+		return contextId;
+	} finally {
 		if (!loadTimeoutAbortSignal.aborted) {
 			loadTimeoutAbortController.abort();
 		}
-		return contextId;
-	} finally {
 		await Runtime.disable();
 		await Page.disable();
 	}
@@ -166,50 +165,50 @@ function getTopFrameContextId({ Page, Runtime }, options) {
 	return new Promise((resolve, reject) => {
 		const FRAME_NAVIGATED_EVENT = "frameNavigated";
 		const CONTEXT_CREATED_EVENT = "executionContextCreated";
-		const CONTEXT_DESTROYED_EVENT = "executionContextDestroyed";
 		const contextIds = [];
-		let frameId, navigationAbortController;
+		let frameId;
 		Page.addEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
 		Runtime.addEventListener(CONTEXT_CREATED_EVENT, onExecutionContextCreated);
-		Runtime.addEventListener(CONTEXT_DESTROYED_EVENT, onExecutionContextDestroyed);
 
 		async function onFrameNavigated({ params }) {
-			const { frame } = params;
-			if (!frame.parentId) {
-				frameId = frame.id;
-				if (navigationAbortController) {
-					navigationAbortController.abort();
-					contextIds.length = 0;
+			try {
+				const { frame } = params;
+				if (!frame.parentId) {
+					if (frame.unreachableUrl) {
+						reject(new Error("Unreachable URL: " + frame.unreachableUrl));
+					} else {
+						frameId = frame.id;
+						await onTopFrameNavigated();
+					}
 				}
-				navigationAbortController = new AbortController();
-				await onTopFrameNavigated(navigationAbortController.signal);
+			} finally {
+				Page.removeEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
+				Runtime.removeEventListener(CONTEXT_CREATED_EVENT, onExecutionContextCreated);
 			}
 		}
 
-		async function onTopFrameNavigated(navigationSignal) {
-			await waitForPageReady({ Page }, frameId, options, navigationSignal);
-			if (!navigationSignal.aborted) {
-				Page.removeEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
-				Runtime.removeEventListener(CONTEXT_CREATED_EVENT, onExecutionContextCreated);
-				Runtime.removeEventListener(CONTEXT_DESTROYED_EVENT, onExecutionContextDestroyed);
-				let contextId;
-				if (contextIds.length) {
-					let contextIdIndex = 0;
-					do {
-						if (await testExecutionContext(contextIds[contextIdIndex])) {
-							contextId = contextIds[contextIdIndex];
-						}
-						contextIdIndex++;
-					} while (contextId === undefined && contextIdIndex < contextIds.length && !navigationSignal.aborted);
-				}
-				if (!navigationSignal.aborted) {
-					if (contextId === undefined) {
-						reject(new Error("Execution context not found"));
-					} else {
-						resolve(contextId);
+		async function onTopFrameNavigated() {
+			await waitForPageReady({ Page }, frameId, options);
+			const contextId = await getContextId();
+			if (contextId === undefined) {
+				reject(new Error("Execution context not found"));
+			} else {
+				resolve(contextId);
+			}
+		}
+
+		async function getContextId() {
+			let contextId;
+			if (contextIds.length) {
+				let contextIdIndex = 0;
+				do {
+					if (await testExecutionContext(contextIds[contextIdIndex])) {
+						contextId = contextIds[contextIdIndex];
 					}
-				}
+					contextIdIndex++;
+				} while (contextId === undefined && contextIdIndex < contextIds.length);
 			}
+			return contextId;
 		}
 
 		function onExecutionContextCreated({ params }) {
@@ -219,14 +218,6 @@ function getTopFrameContextId({ Page, Runtime }, options) {
 				contextIds.push(context.id);
 			}
 		}
-
-		function onExecutionContextDestroyed({ params }) {
-			const { executionContextId } = params;
-			const index = contextIds.indexOf(executionContextId);
-			if (index > -1) {
-				contextIds.splice(index, 1);
-			}
-		}
 	});
 
 	async function testExecutionContext(contextId) {
@@ -248,6 +239,7 @@ function waitForLoadTimeout(abortSignal, maxDelay) {
 		const ABORT_EVENT = "abort";
 		abortSignal.addEventListener(ABORT_EVENT, onAbort);
 		const timeoutId = setTimeout(() => {
+			abortSignal.removeEventListener(ABORT_EVENT, onAbort);
 			const error = new Error("Load timeout");
 			error.code = LOAD_TIMEOUT_ERROR;
 			reject(error);
@@ -261,7 +253,7 @@ function waitForLoadTimeout(abortSignal, maxDelay) {
 	});
 }
 
-async function waitForPageReady({ Page }, topFrameId, options, navigationSignal) {
+async function waitForPageReady({ Page }, topFrameId, options) {
 	await Page.setLifecycleEventsEnabled({ enabled: true });
 	try {
 		await new Promise(resolve => {
@@ -270,16 +262,14 @@ async function waitForPageReady({ Page }, topFrameId, options, navigationSignal)
 
 			function onLifecycleEvent({ params }) {
 				const { name, frameId } = params;
-				if (frameId === topFrameId && (name === options.browserWaitUntil || name === DEFAULT_NETWORK_STATE || navigationSignal.aborted)) {
+				if (frameId === topFrameId && (name === options.browserWaitUntil || name === DEFAULT_NETWORK_STATE)) {
 					Page.removeEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
 					resolve();
 				}
 			}
 		});
 	} finally {
-		if (!navigationSignal.aborted) {
-			await Page.setLifecycleEventsEnabled({ enabled: false });
-		}
+		await Page.setLifecycleEventsEnabled({ enabled: false });
 	}
 }
 
@@ -304,7 +294,7 @@ async function waitForDebuggerReady({ Debugger }) {
 function getBrowserOptions(options) {
 	const browserOptions = {};
 	browserOptions.args = options.browserArgs;
-	browserOptions.headless = options.browserHeadless && !options.browserDebug;
+	browserOptions.headless = options.browserHeadless;
 	browserOptions.executablePath = options.browserExecutablePath;
 	browserOptions.debug = options.browserDebug;
 	browserOptions.disableWebSecurity = options.browserDisableWebSecurity === undefined || options.browserDisableWebSecurity;

package/lib/constants.js

@@ -37,20 +37,17 @@ const BROWSER_ARGS = [
 	"--disable-dev-shm-usage",
 	"--disable-extensions",
 	"--disable-features=ImprovedCookieControls,LazyFrameLoading,GlobalMediaControls,DestroyProfileOnBrowserClose,MediaRouter,DialMediaRouteProvider,AcceptCHFrame,AutoExpandDetailsElement,CertificateTransparencyComponentUpdater,AvoidUnnecessaryBeforeUnloadCheckSync,Translate,HttpsUpgrades,PaintHolding",
-	"--allow-pre-commit-input",
 	"--disable-hang-monitor",
 	"--disable-ipc-flooding-protection",
 	"--disable-popup-blocking",
 	"--disable-prompt-on-repost",
 	"--disable-renderer-backgrounding",
 	"--force-color-profile=srgb",
-	"--metrics-recording-only",
 	"--no-first-run",
 	"--enable-automation",
 	"--password-store=basic",
 	"--use-mock-keychain",
 	"--no-service-autorun",
-	"--export-tagged-pdf",
 	"--disable-search-engine-choice-screen",
 	"--enable-use-zoom-for-dsf=false",
 	"--no-sandbox",

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.24";
+export const version = "2.0.26";

package/options.js

@@ -103,7 +103,7 @@ const OPTIONS_INFO = {
 	"max-resource-size-enabled": { description: "Enable removal of embedded resources exceeding a given size", type: "boolean" },
 	"max-resource-size": { description: "Maximum size of embedded resources in MB (i.e. images, stylesheets, scripts and iframes)", type: "number", defaultValue: 10 },
 	"move-styles-in-head": { description: "Move style elements outside the head element into the head element", type: "boolean" },
-	"password": { description: "Password of the zip file", type: "string" },
+	"password": { description: "Password of the zip file when using --compress-content or --self-extracting-archive", type: "string" },
 	"remove-frames": { description: "Remove frames", type: "boolean" },
 	"remove-hidden-elements": { description: "Remove HTML elements which are not displayed", type: "boolean", defaultValue: true },
 	"remove-unused-styles": { description: "Remove unused CSS rules and unneeded declarations", type: "boolean", defaultValue: true },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-cli",
-	"version": "2.0.24",
+	"version": "2.0.26",
 	"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.hasTargets())) {
+	if (!options.browserDebug && !options.browserRemoteDebuggingURL && !(await backend.hasPageTargets())) {
 		return backend.closeBrowser();
 	}
 }

package/single-file-node.bat

@@ -0,0 +1,2 @@
+@echo off
+node "%~dp0\single-file" %*