single-file-cli 2.0.16 → 2.0.18

package/deno.json

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

package/lib/cdp-client.js

@@ -128,13 +128,15 @@ async function getPageData(options) {
 		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;
 				if (frameId === topFrameId) {
-					if (name === "DOMContentLoaded") {
+					if (!contentLoaded && name === "init" || name === "firstPaint") {
 						contentLoaded = true;
 					}
 					if (contentLoaded && name === (options.browserWaitUntil || NETWORK_IDLE_STATE)) {
@@ -142,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();
@@ -149,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) {
@@ -182,7 +192,7 @@ async function getPageData(options) {
 
 		async function executionContextCreated({ params }) {
 			const { context } = params;
-			if (context.name === SINGLE_FILE_WORLD_NAME && context.auxData && context.auxData.frameId === topFrameId) {
+			if (contextId === undefined && context.name === SINGLE_FILE_WORLD_NAME && context.auxData && context.auxData.frameId === topFrameId) {
 				contextId = context.id;
 			}
 		}

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.16";
+export const version = "2.0.18";

package/package.json

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