single-file-cli 2.0.27 → 2.0.29

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@single-file/single-file-cli",
-  "version": "2.0.27",
+  "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;
@@ -161,64 +161,83 @@ async function loadPage({ Page, Runtime }, options) {
 	}
 }
 
-function getTopFrameContextId({ Page, Runtime }, options) {
-	return new Promise((resolve, reject) => {
-		const FRAME_NAVIGATED_EVENT = "frameNavigated";
-		const CONTEXT_CREATED_EVENT = "executionContextCreated";
-		const contextIds = [];
-		let frameId;
-		Page.addEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
+async function getTopFrameContextId({ Page, Runtime }, options) {
+	const CONTEXT_CREATED_EVENT = "executionContextCreated";
+	const contextIds = [];
+	let topFrameId;
+	try {
 		Runtime.addEventListener(CONTEXT_CREATED_EVENT, onExecutionContextCreated);
-
-		async function onFrameNavigated({ params }) {
-			try {
-				const { frame } = params;
-				if (!frame.parentId) {
-					if (frame.unreachableUrl) {
-						reject(new Error("Unreachable URL: " + frame.unreachableUrl));
-					} else {
-						frameId = frame.id;
-						await onTopFrameNavigated();
-					}
-				}
-			} finally {
-				Page.removeEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
-				Runtime.removeEventListener(CONTEXT_CREATED_EVENT, onExecutionContextCreated);
-			}
+		await waitForPageReady({ Page }, options);
+		const contextId = await getContextId();
+		if (contextId === undefined) {
+			throw new Error("Execution context not found");
+		} else {
+			return contextId;
 		}
+	} finally {
+		Runtime.removeEventListener(CONTEXT_CREATED_EVENT, onExecutionContextCreated);
+	}
 
-		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);
-			}
+	function onExecutionContextCreated({ params }) {
+		const { context } = params;
+		const { name, auxData = {} } = context;
+		if (name === SINGLE_FILE_WORLD_NAME && topFrameId !== undefined && auxData.frameId === topFrameId) {
+			contextIds.unshift(context.id);
 		}
+	}
+
+	async function waitForPageReady({ Page }, options) {
+		await Page.setLifecycleEventsEnabled({ enabled: true });
+		try {
+			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);
 
-		async function getContextId() {
-			let contextId;
-			if (contextIds.length) {
-				let contextIdIndex = 0;
-				do {
-					if (await testExecutionContext(contextIds[contextIdIndex])) {
-						contextId = contextIds[contextIdIndex];
+				function onLifecycleEvent({ params }) {
+					const { frameId, name } = params;
+					if (frameId === topFrameId && (name === options.browserWaitUntil || name === DEFAULT_NETWORK_STATE)) {
+						removeListeners();
+						resolve();
 					}
-					contextIdIndex++;
-				} while (contextId === undefined && contextIdIndex < contextIds.length);
-			}
-			return contextId;
+				}
+
+				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 });
 		}
+	}
 
-		function onExecutionContextCreated({ params }) {
-			const { context } = params;
-			const { name, origin, auxData } = context;
-			if (frameId !== undefined && origin === "://" && name === SINGLE_FILE_WORLD_NAME && auxData && auxData.frameId === frameId) {
-				contextIds.push(context.id);
-			}
+	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;
+	}
 
 	async function testExecutionContext(contextId) {
 		try {
@@ -253,26 +272,6 @@ function waitForLoadTimeout(abortSignal, maxDelay) {
 	});
 }
 
-async function waitForPageReady({ Page }, topFrameId, options) {
-	await Page.setLifecycleEventsEnabled({ enabled: true });
-	try {
-		await new Promise(resolve => {
-			const LIFE_CYCLE_EVENT = "lifecycleEvent";
-			Page.addEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
-
-			function onLifecycleEvent({ params }) {
-				const { name, frameId } = params;
-				if (frameId === topFrameId && (name === options.browserWaitUntil || name === DEFAULT_NETWORK_STATE)) {
-					Page.removeEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
-					resolve();
-				}
-			}
-		});
-	} finally {
-		await Page.setLifecycleEventsEnabled({ enabled: false });
-	}
-}
-
 async function waitForDebuggerReady({ Debugger }) {
 	await Debugger.enable();
 	try {

package/lib/deno-polyfill.js

@@ -80,7 +80,7 @@ const Command = DENO_RUNTIME_DETECTED ? Deno.Command : class Command {
 		return {
 			status: new Promise((resolve, reject) => {
 				child.on("exit", code => {
-					if (code === 0 || code === 143) {
+					if (code === 0 || code === 143 || code === 130) {
 						resolve();
 					} else {
 						reject(new Error(`Process exited with code ${code}`));
@@ -108,6 +108,7 @@ const DenoAPI = {
 	remove,
 	stdout,
 	exit,
+	addSignalListener,
 	build,
 	errors,
 	Command
@@ -207,6 +208,14 @@ function exit(code) {
 	}
 }
 
+function addSignalListener(signal, listener) {
+	if (DENO_RUNTIME_DETECTED) {
+		Deno.addSignalListener(signal, listener);
+	} else {
+		process.once(signal, listener);
+	}
+}
+
 async function dirname(filePath) {
 	return path.dirname(filePath);
 }

package/lib/version.js

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

package/package.json

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

package/single-file-launcher.js

@@ -22,10 +22,14 @@
  */
 
 import { initialize } from "./single-file-cli-api.js";
+import { closeBrowser } from "./lib/browser.js";
 import { Deno } from "./lib/deno-polyfill.js";
 import options from "./options.js";
 
-const { readTextFile, exit } = Deno;
+const { readTextFile, exit, addSignalListener } = Deno;
+
+addSignalListener("SIGTERM", closeBrowserAndExit);
+addSignalListener("SIGINT", closeBrowserAndExit);
 
 export { run };
 
@@ -104,4 +108,9 @@ function parseCookies(textValue) {
 			}
 		})
 		.filter(cookieData => cookieData);
+}
+
+async function closeBrowserAndExit() {
+	await closeBrowser();
+	exit();
 }