single-file-cli 2.9.1 → 2.10.0

package/build.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-CORE_PACKAGE="npm:single-file-core@1.5.123"
+CORE_PACKAGE="npm:single-file-core@1.5.126"
 ESBUILD_PACKAGE="npm:esbuild@0.27.7"
 WEB_STREAMS_PACKAGE="npm:web-streams-polyfill@4.3.0"
 

package/deno.json

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

package/lib/bidi-client.js

@@ -34,6 +34,8 @@ import {
 	FETCH_FUNCTION_NAME,
 	RESOLVE_FETCH_FUNCTION_NAME,
 	REJECT_FETCH_FUNCTION_NAME,
+	SCRIPT_READY_PROPERTY_NAME,
+	SCRIPT_ERROR_PROPERTY_NAME,
 	getScriptSource,
 	getHookScriptSource,
 	getPageDataScriptSource
@@ -65,8 +67,7 @@ const PRINT_TO_PDF_FUNCTION_NAME = "printToPDF";
 const SET_SCREENSHOT_FUNCTION_NAME = "setScreenshot";
 const SET_PDF_FUNCTION_NAME = "setPDF";
 const SET_PAGE_DATA_FUNCTION_NAME = "setPageData";
-const SINGLE_FILE_GLOBAL_DECLARATION = /var singlefile\s*=\s*/;
-const SINGLE_FILE_GLOBAL_ASSIGNMENT = "globalThis.singlefile=window.singlefile=";
+const SINGLE_FILE_GLOBAL_ASSIGNMENT = "globalThis.singlefile=window.singlefile=singlefile;";
 const SERVER_CONNECT_TIMEOUT = 30000;
 const SESSION_TIMEOUT = 120000;
 const SERVER_SESSION_PATH = "/session";
@@ -404,7 +405,7 @@ async function setupCookies(pageContext) {
 
 async function setupScriptInjection(pageContext) {
 	const { options, context, preloadScripts } = pageContext;
-	const scriptSource = (await getScriptSource(options)).replace(SINGLE_FILE_GLOBAL_DECLARATION, SINGLE_FILE_GLOBAL_ASSIGNMENT);
+	const scriptSource = await getScriptSource(options, SINGLE_FILE_GLOBAL_ASSIGNMENT);
 	const hookScript = await session.send("script.addPreloadScript", {
 		functionDeclaration: "() => {" + getHookScriptSource() + "}",
 		contexts: [context]
@@ -1100,7 +1101,7 @@ function waitForPageReadyState(state, waitUntil, pageContext) {
 }
 
 async function checkSingleFileContext(pageContext) {
-	const SINGLE_FILE_DETECTION_TEST = "typeof singlefile !== 'undefined'";
+	const SINGLE_FILE_DETECTION_TEST = "typeof singlefile !== 'undefined' && globalThis." + SCRIPT_READY_PROPERTY_NAME + " === true";
 	const NO_VALID_CONTEXT_ERROR_MESSAGE = "No valid SingleFile execution context found";
 	const { context } = pageContext;
 	logData(["Getting execution context"], pageContext);
@@ -1110,10 +1111,19 @@ async function checkSingleFileContext(pageContext) {
 		awaitPromise: false
 	});
 	if (!result || result.value !== true) {
-		throw new Error(NO_VALID_CONTEXT_ERROR_MESSAGE);
+		throw new Error(NO_VALID_CONTEXT_ERROR_MESSAGE + await getInjectionErrorSuffix(context));
 	}
 }
 
+async function getInjectionErrorSuffix(context) {
+	const { result } = await session.send("script.evaluate", {
+		expression: "globalThis." + SCRIPT_ERROR_PROPERTY_NAME,
+		target: getSingleFileTarget(context),
+		awaitPromise: false
+	}).catch(() => ({}));
+	return result && result.value ? ": " + result.value : "";
+}
+
 async function capturePageData(pageContext) {
 	const CAPTURE_TIMEOUT_ERROR_MESSAGE = "Capture timeout";
 	const EXCEPTION_TYPE = "exception";

package/lib/cdp-client.js

@@ -37,6 +37,8 @@ import {
 	FETCH_FUNCTION_NAME,
 	RESOLVE_FETCH_FUNCTION_NAME,
 	REJECT_FETCH_FUNCTION_NAME,
+	SCRIPT_READY_PROPERTY_NAME,
+	SCRIPT_ERROR_PROPERTY_NAME,
 	getScriptSource,
 	getHookScriptSource,
 	getPageDataScriptSource
@@ -670,7 +672,7 @@ function createFrameNavigatedHandler(state, timeoutState, reject, cleanup, { opt
 }
 
 async function getSingleFileContext({ Page, Runtime }, topFrameId, { options, debugMessages }) {
-	const SINGLE_FILE_DETECTION_TEST = "typeof singlefile !== 'undefined'";
+	const SINGLE_FILE_DETECTION_TEST = "typeof singlefile !== 'undefined' && globalThis." + SCRIPT_READY_PROPERTY_NAME + " === true";
 	const NO_VALID_CONTEXT_ERROR_MESSAGE = "No valid SingleFile execution context found";
 	logData(["Getting execution context"], { options, debugMessages });
 	// the world already exists, so asking for it by name returns the context the
@@ -687,11 +689,19 @@ async function getSingleFileContext({ Page, Runtime }, topFrameId, { options, de
 		contextId: executionContextId
 	});
 	if (result.value !== true) {
-		throw new Error(NO_VALID_CONTEXT_ERROR_MESSAGE);
+		throw new Error(NO_VALID_CONTEXT_ERROR_MESSAGE + await getInjectionErrorSuffix(Runtime, executionContextId));
 	}
 	return executionContextId;
 }
 
+async function getInjectionErrorSuffix(Runtime, executionContextId) {
+	const { result } = await Runtime.evaluate({
+		expression: "globalThis." + SCRIPT_ERROR_PROPERTY_NAME,
+		contextId: executionContextId
+	}).catch(() => ({}));
+	return result && result.value ? ": " + result.value : "";
+}
+
 function setupPageDataCapture({ Runtime }, { options, debugMessages }) {
 	return new Promise((resolve, reject) => {
 		let pageDataResponse = "";