single-file-cli 2.7.1 → 2.8.0

package/build.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-CORE_PACKAGE="npm:single-file-core@1.5.120"
+CORE_PACKAGE="npm:single-file-core@1.5.121"
 ESBUILD_PACKAGE="npm:esbuild@0.27.7"
 
 project_dir=$(pwd)

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@single-file/single-file-cli",
-  "version": "2.7.1",
+  "version": "2.8.0",
   "description": "SingleFile CLI",
   "exports": {
     ".": "./single-file-cli-api.js"

package/lib/cdp-client.js

@@ -618,17 +618,20 @@ async function waitForPageReadyState({ Page }, state, { options, debugMessages }
 
 function createLifecycleEventHandler(state, timeoutState, resolve, cleanup, { options, debugMessages }) {
 	return ({ params }) => {
-		const { frameId, name } = params;
-		if (frameId === state.topFrameId) {
-			logData(["Detecting lifecycle event", name], { options, debugMessages });
-			const stateIndex = NETWORK_STATES.indexOf(name);
-			if (stateIndex != -1 && (state.reachedStateIndex == -1 || stateIndex < state.reachedStateIndex)) {
-				state.reachedStateIndex = stateIndex;
-			}
+		const { frameId, loaderId, name } = params;
+		// the frame keeps its ID across documents: the events of the blank page,
+		// whose network goes idle while the server has not answered yet, would
+		// satisfy the wait and the page would be captured as soon as it commits
+		if (frameId !== state.topFrameId || loaderId !== state.loaderId) {
+			return;
+		}
+		logData(["Detecting lifecycle event", name], { options, debugMessages });
+		const stateIndex = NETWORK_STATES.indexOf(name);
+		if (stateIndex != -1 && (state.reachedStateIndex == -1 || stateIndex < state.reachedStateIndex)) {
+			state.reachedStateIndex = stateIndex;
 		}
-		const shouldResolve = frameId === state.topFrameId &&
-			(name === options.browserWaitUntil ||
-				(timeoutState.timeoutId && NETWORK_STATES.indexOf(name) < NETWORK_STATES.indexOf(options.browserWaitUntil)));
+		const shouldResolve = name === options.browserWaitUntil ||
+			(timeoutState.timeoutId && NETWORK_STATES.indexOf(name) < NETWORK_STATES.indexOf(options.browserWaitUntil));
 		if (shouldResolve) {
 			// the delay is restarted when the page reaches a further state, so
 			// that it is captured once it stopped settling
@@ -660,6 +663,7 @@ function createFrameNavigatedHandler(state, timeoutState, reject, cleanup, { opt
 				clearTimeout(timeoutState.timeoutId);
 				timeoutState.timeoutId = undefined;
 				state.reachedStateIndex = -1;
+				state.loaderId = frame.loaderId;
 			}
 		}
 	};