single-file-cli 2.0.24 → 2.0.25

package/deno.json

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

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,32 +130,33 @@ 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;
 }
 
 async function loadPage({ Page, Runtime }, options) {
+	let loadTimeoutAbortController, loadTimeoutAbortSignal;
 	await Runtime.enable();
 	await Page.enable();
 	try {
-		const loadTimeoutAbortController = new AbortController();
-		const loadTimeoutAbortSignal = loadTimeoutAbortController.signal;
+		loadTimeoutAbortController = new AbortController();
+		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();
 	}
@@ -175,7 +175,9 @@ function getTopFrameContextId({ Page, Runtime }, options) {
 
 		async function onFrameNavigated({ params }) {
 			const { frame } = params;
-			if (!frame.parentId) {
+			if (frame.unreachableUrl) {
+				reject(new Error("Unreachable URL: " + frame.unreachableUrl));
+			} else if (!frame.parentId) {
 				frameId = frame.id;
 				if (navigationAbortController) {
 					navigationAbortController.abort();

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.25";

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.25",
 	"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" %*