single-file-cli 2.0.28 → 2.0.29

package/deno.json

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

package/lib/cdp-client.js

@@ -116,7 +116,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;
@@ -162,12 +162,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 +175,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 +189,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);
+						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/version.js

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

package/package.json

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

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();
+}