single-file-cli 2.0.15 → 2.0.17

package/README.MD

@@ -2,7 +2,7 @@
 
 ## Introduction
 
-SingleFile can be launched from the command line by running it into a (headless) browser. 
+[SingleFile](https://github.com/gildas-lormeau/SingleFile) can be launched from the command line by running it into a (headless) browser. 
 
 It runs through Deno as a standalone script injected into the web page via the Chrome DevTools Protocol instead of being embedded into a WebExtension.
 

package/deno.json

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

package/lib/cdp-client.js

@@ -110,7 +110,7 @@ async function getPageData(options) {
 			});
 		}
 		await Page.addScriptToEvaluateOnNewDocument({
-			source: await getHookScriptSource(),
+			source: getHookScriptSource(),
 			runImmediately: true
 		});
 		await Page.addScriptToEvaluateOnNewDocument({
@@ -120,26 +120,18 @@ async function getPageData(options) {
 		});
 		await Runtime.enable();
 		const topFrameId = targetInfo.id;
-		const executionContextIdPromise = new Promise(resolve => {
-			const CONTEXT_CREATED_EVENT = "executionContextCreated";
-			Runtime.addEventListener(CONTEXT_CREATED_EVENT, executionContextCreated);
-
-			async function executionContextCreated({ params }) {
-				const { context } = params;
-				if (context.name === SINGLE_FILE_WORLD_NAME && context.auxData && context.auxData.frameId === topFrameId) {
-					Runtime.removeEventListener(CONTEXT_CREATED_EVENT, executionContextCreated);
-					await Runtime.disable();
-					resolve(context.id);
-				}
-			}
-		});
+		let contextId;
+		const CONTEXT_CREATED_EVENT = "executionContextCreated";
+		Runtime.addEventListener(CONTEXT_CREATED_EVENT, executionContextCreated);
 		await Page.enable();
 		await Page.setLifecycleEventsEnabled({ enabled: true });
 		const pageNavigated = Page.navigate({ url: options.url });
 		const pageReady = new Promise(resolve => {
 			const LIFE_CYCLE_EVENT = "lifecycleEvent";
+			const FRAME_NAVIGATED_EVENT = "frameNavigated";
 			let contentLoaded;
 			Page.addEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
+			Page.addEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
 
 			async function onLifecycleEvent({ params }) {
 				const { name, frameId } = params;
@@ -152,6 +144,7 @@ async function getPageData(options) {
 							setTimeout(() => resolve, options.browserWaitDelay);
 						} else {
 							Page.removeEventListener(LIFE_CYCLE_EVENT, onLifecycleEvent);
+							Page.removeEventListener(FRAME_NAVIGATED_EVENT, onFrameNavigated);
 							await Page.setLifecycleEventsEnabled({ enabled: false });
 							await Page.disable();
 							resolve();
@@ -159,6 +152,13 @@ async function getPageData(options) {
 					}
 				}
 			}
+
+			async function onFrameNavigated({ params }) {
+				const { frame } = params;
+				if (!frame.parentId) {
+					contextId = undefined;
+				}
+			}
 		});
 		let timeoutReady, timeoutId, resolveTimeoutReady;
 		if (options.browserLoadMaxTime) {
@@ -172,11 +172,12 @@ async function getPageData(options) {
 			});
 		}
 		await Promise.race([Promise.all([pageNavigated, pageReady, debuggerReady]), timeoutReady]);
+		Runtime.removeEventListener(CONTEXT_CREATED_EVENT, executionContextCreated);
+		await Runtime.disable();
 		if (timeoutId) {
 			clearTimeout(timeoutId);
 			resolveTimeoutReady();
 		}
-		const contextId = await executionContextIdPromise;
 		const { result } = await Runtime.evaluate({
 			expression: `singlefile.getPageData(${JSON.stringify(options)})`,
 			awaitPromise: true,
@@ -188,6 +189,13 @@ async function getPageData(options) {
 			value.content = new Uint8Array(value.content);
 		}
 		return value;
+
+		async function executionContextCreated({ params }) {
+			const { context } = params;
+			if (contextId === undefined && context.name === SINGLE_FILE_WORLD_NAME && context.auxData && context.auxData.frameId === topFrameId) {
+				contextId = context.id;
+			}
+		}
 	} catch (error) {
 		if (error.code === LOAD_TIMEOUT_ERROR && options.browserWaitUntilFallback && options.browserWaitUntil) {
 			const browserWaitUntil = NETWORK_STATES[(NETWORK_STATES.indexOf(options.browserWaitUntil) + 1)];

package/lib/single-file-script.js

@@ -70,11 +70,11 @@ async function getScriptSource(options) {
 	return source;
 }
 
-async function getHookScriptSource() {
+function getHookScriptSource() {
 	return hookScript;
 }
 
-async function getZipScriptSource() {
+function getZipScriptSource() {
 	return zipScript;
 }
 

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.15";
+export const version = "2.0.17";

package/package.json

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

package/single-file-cli-api.js

@@ -240,7 +240,7 @@ function getHostURL(url) {
 async function capturePage(options) {
 	try {
 		let filename;
-		options.zipScript = await getZipScriptSource();
+		options.zipScript = getZipScriptSource();
 		const pageData = await backend.getPageData(options);
 		if (options.output) {
 			filename = await getFilename(options.output, options);