single-file-cli 2.0.19 → 2.0.20

package/README.MD

@@ -80,9 +80,6 @@ Make sure Chrome or a Chromium-based browser is installed in the default folder.
 
     ```sh
     unzip master.zip .
-    ```
-
-    ```sh
     cd single-file-cli-master
     ```
 
@@ -90,9 +87,6 @@ Make sure Chrome or a Chromium-based browser is installed in the default folder.
 
     ```sh
     git clone --depth 1 --recursive https://github.com/gildas-lormeau/single-file-cli.git
-    ```
-
-    ```sh
     cd single-file-cli
     ```
 

package/deno.json

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

package/lib/cdp-client.js

@@ -96,16 +96,22 @@ async function getPageData(options) {
 			worldName: SINGLE_FILE_WORLD_NAME
 		});
 		const [contextId] = await Promise.all([
-			navigate({ Page, Runtime }, options),
+			loadPage({ Page, Runtime }, options),
 			options.browserDebug ? waitForDebuggerReady({ Debugger }) : Promise.resolve()
 		]);
+		if (options.browserWaitDelay) {
+			setTimeout(() => resolve, options.browserWaitDelay);
+		}
 		const { result } = await Runtime.evaluate({
 			expression: `singlefile.getPageData(${JSON.stringify(options)})`,
 			awaitPromise: true,
 			returnByValue: true,
 			contextId
 		});
-		const { value } = result;
+		const { value, subtype, description } = result;
+		if (subtype === "error") {
+			throw new Error(description);
+		}
 		if (options.compressContent) {
 			value.content = new Uint8Array(value.content);
 		}
@@ -126,7 +132,7 @@ async function getPageData(options) {
 	}
 }
 
-async function navigate({ Page, Runtime }, options) {
+async function loadPage({ Page, Runtime }, options) {
 	await Runtime.enable();
 	await Page.enable();
 	try {
@@ -134,7 +140,7 @@ async function navigate({ Page, Runtime }, options) {
 		const loadTimeoutAbortSignal = loadTimeoutAbortController.signal;
 		const [contextId] = await Promise.race([
 			Promise.all([getTopFrameContextId({ Page, Runtime }, options), Page.navigate({ url: options.url })]),
-			options.browserLoadMaxTime ? waitForLoadTimeout(loadTimeoutAbortSignal, options.browserLoadMaxTime) : Promise.resolve()
+			waitForLoadTimeout(loadTimeoutAbortSignal, options.browserLoadMaxTime)
 		]);
 		if (!loadTimeoutAbortSignal.aborted) {
 			loadTimeoutAbortController.abort();
@@ -146,34 +152,82 @@ async function navigate({ Page, Runtime }, options) {
 	}
 }
 
-async function getTopFrameContextId({ Page, Runtime }, options) {
-	let frameId, contextId;
-	await new Promise(resolve => {
+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;
 		Page.addEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
-		Runtime.addEventListener(CONTEXT_CREATED_EVENT, executionContextCreated);
+		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;
-				await waitForPageReady({ Page }, frameId, options);
+				if (navigationAbortController) {
+					navigationAbortController.abort();
+				}
+				navigationAbortController = new AbortController();
+				await onTopFrameNavigated(navigationAbortController.signal);
+			}
+		}
+
+		async function onTopFrameNavigated(navigationSignal) {
+			await waitForPageReady({ Page }, frameId, options, navigationSignal);
+			if (!navigationSignal.aborted) {
 				Page.removeEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
-				Runtime.removeEventListener(CONTEXT_CREATED_EVENT, executionContextCreated);
-				resolve();
+				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);
+				}
+				if (contextId === undefined) {
+					reject(new Error("Execution context not found"));
+				} else {
+					resolve(contextId);
+				}
 			}
 		}
 
-		function executionContextCreated({ params }) {
+		function onExecutionContextCreated({ params }) {
 			const { context } = params;
 			const { name, origin, auxData } = context;
 			if (frameId !== undefined && origin === "://" && name === SINGLE_FILE_WORLD_NAME && auxData && auxData.frameId === frameId) {
-				contextId = context.id;
+				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) {
+			try {
+				const { result } = await Runtime.evaluate({
+					expression: "singlefile !== undefined",
+					contextId
+				});
+				return result.value === true;
+			} catch (error) {
+				// ignored
+			}
+			return false;
+		}
 	});
-	return contextId;
 }
 
 function waitForLoadTimeout(abortSignal, maxDelay) {
@@ -194,41 +248,46 @@ function waitForLoadTimeout(abortSignal, maxDelay) {
 	});
 }
 
-async function waitForPageReady({ Page }, topFrameId, options) {
+async function waitForPageReady({ Page }, topFrameId, options, navigationSignal) {
 	await Page.setLifecycleEventsEnabled({ enabled: true });
-	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) {
-				if ((name === options.browserWaitUntil || name === INTERACTIVE_TIME_STATE)) {
-					Page.removeEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
-					resolve();
+	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) {
+					if (name === options.browserWaitUntil || name === INTERACTIVE_TIME_STATE || navigationSignal.aborted) {
+						Page.removeEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
+						resolve();
+					}
 				}
 			}
+		});
+	} finally {
+		if (!navigationSignal.aborted) {
+			await Page.setLifecycleEventsEnabled({ enabled: false });
 		}
-	});
-	await Page.setLifecycleEventsEnabled({ enabled: false });
-	if (options.browserWaitDelay) {
-		setTimeout(() => resolve, options.browserWaitDelay);
 	}
 }
 
 async function waitForDebuggerReady({ Debugger }) {
 	await Debugger.enable();
-	await Debugger.pause();
-	await new Promise(resolve => {
-		const RESUMED_EVENT = "resumed";
-		Debugger.addEventListener(RESUMED_EVENT, onResumed);
+	try {
+		await Debugger.pause();
+		await new Promise(resolve => {
+			const RESUMED_EVENT = "resumed";
+			Debugger.addEventListener(RESUMED_EVENT, onResumed);
 
-		function onResumed() {
-			Debugger.removeEventListener(RESUMED_EVENT, onResumed);
-			resolve();
-		}
-	});
-	await Debugger.disable();
+			function onResumed() {
+				Debugger.removeEventListener(RESUMED_EVENT, onResumed);
+				resolve();
+			}
+		});
+	} finally {
+		await Debugger.disable();
+	}
 }
 
 function getBrowserOptions(options) {

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.19";
+export const version = "2.0.20";

package/package.json

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