single-file-cli 2.0.76 → 2.0.77

package/build.sh

@@ -3,7 +3,7 @@
 mv package.json package.json.tmp
 mv deno.json deno.json.tmp
 mv deno.lock deno.lock.tmp
-deno install --vendor --quiet "npm:single-file-core@1.5.56"
+deno install --vendor --quiet "npm:single-file-core@1.5.57"
 mv package.json.tmp package.json
 mv deno.json.tmp deno.json
 mv deno.lock.tmp deno.lock

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@single-file/single-file-cli",
-  "version": "2.0.76",
+  "version": "2.0.77",
   "description": "SingleFile CLI",
   "nodeModulesDir": "auto",
   "exports": {

package/lib/browser.js

@@ -48,9 +48,6 @@ async function launchBrowser(options = {}, indexPath = 0) {
 	if (options.debug) {
 		args.push("--auto-open-devtools-for-tabs");
 	}
-	if (options.disableWebSecurity) {
-		args.push("--disable-web-security");
-	}
 	if (options.width && options.height) {
 		args.push("--window-size=" + options.width + "," + options.height);
 	}

package/lib/cdp-client.js

@@ -21,10 +21,16 @@
  *   Source.
  */
 
-/* global setTimeout, clearTimeout, URL, fetch, AbortController, window, top, singlefile */
+/* global setTimeout, clearTimeout, URL, fetch, AbortController, window, top, singlefile, btoa, Headers, Deno */
 
 import { launchBrowser, closeBrowser } from "./browser.js";
-import { getScriptSource, getHookScriptSource } from "./single-file-script.js";
+import {
+	FETCH_FUNCTION_NAME,
+	RESOLVE_FETCH_FUNCTION_NAME,
+	REJECT_FETCH_FUNCTION_NAME,
+	getScriptSource,
+	getHookScriptSource
+} from "./single-file-script.js";
 import { CDP, options } from "simple-cdp";
 
 const LOAD_TIMEOUT_ERROR = "ERR_LOAD_TIMEOUT";
@@ -42,6 +48,41 @@ const REDIRECT_STATUS_CODES = [301, 302, 303, 307, 308];
 
 export { initialize, getPageData, closeBrowser };
 
+async function fetchWithFileSupport(url, fetchOptions = {}) {
+	if (url.startsWith("file://")) {
+		const filePath = decodeURIComponent(url.replace(/^file:\/\//, ""));
+		let fileData;
+		if (typeof Deno !== "undefined") {
+			const response = await fetch(url, fetchOptions);
+			return response;
+		} else {
+			const { readFile } = await import("node:fs/promises");
+			try {
+				fileData = await readFile(filePath);
+				return {
+					status: 200,
+					headers: new Headers({
+						"content-type": "application/octet-stream",
+						"content-length": fileData.length.toString()
+					}),
+					arrayBuffer: async () => fileData.buffer
+				};
+			} catch {
+				return {
+					status: 404,
+					headers: new Headers({
+						"content-type": "text/plain",
+						"content-length": "0"
+					}),
+					arrayBuffer: async () => new ArrayBuffer(0)
+				};
+			}
+		}
+	} else {
+		return await fetch(url, fetchOptions);
+	}
+}
+
 async function initialize(singleFileOptions) {
 	if (singleFileOptions.browserServer) {
 		options.apiUrl = singleFileOptions.browserServer;
@@ -85,12 +126,6 @@ async function getPageData(options) {
 			}
 			await Security.setIgnoreCertificateErrors({ ignore: true });
 		}
-		if (options.browserByPassCSP === undefined || options.browserByPassCSP) {
-			if (options.debugMessagesFile) {
-				debugMessages.push([Date.now(), ["Bypassing CSP"]]);
-			}
-			await Page.setBypassCSP({ enabled: true });
-		}
 		if (options.browserMobileEmulation || options.browserDeviceWidth || options.browserDeviceHeight || options.browserDeviceScaleFactor || options.platform || options.acceptLanguage) {
 			if (options.browserMobileEmulation || options.browserDeviceWidth || options.browserDeviceHeight || options.browserDeviceScaleFactor) {
 				let browserDeviceWidth;
@@ -295,6 +330,41 @@ async function getPageData(options) {
 				}
 			});
 		}
+		await Runtime.addBinding({ name: FETCH_FUNCTION_NAME, executionContextId: contextId });
+		Runtime.addEventListener("bindingCalled", async ({ params }) => {
+			if (params.name === FETCH_FUNCTION_NAME) {
+				let { payload } = params;
+				payload = JSON.parse(payload);
+				const { requestId, url, options: fetchOptions } = payload;
+				if (options.debugMessagesFile) {
+					debugMessages.push([Date.now(), ["Fetching URL", url]]);
+				}
+				try {
+					const response = await fetchWithFileSupport(url, fetchOptions);
+					const arrayBuffer = await response.arrayBuffer();
+					const uint8Array = new Uint8Array(arrayBuffer);
+					const data = btoa(String.fromCharCode.apply(null, uint8Array));
+					const result = {
+						status: response.status,
+						headers: Object.fromEntries(response.headers.entries()),
+						data
+					};
+					await Runtime.evaluate({
+						expression: `globalThis.${RESOLVE_FETCH_FUNCTION_NAME}(${JSON.stringify(requestId)}, ${JSON.stringify(result)})`,
+						contextId
+					});
+				} catch (error) {
+					const errorResult = {
+						error: error.message,
+						code: error.code
+					};
+					await Runtime.evaluate({
+						expression: `globalThis.${REJECT_FETCH_FUNCTION_NAME}(${JSON.stringify(requestId)}, ${JSON.stringify(errorResult)})`,
+						contextId
+					});
+				}
+			}
+		});
 		const pageDataPromise = new Promise(resolve => {
 			let pageDataResponse = "";
 			Runtime.addEventListener("bindingCalled", ({ params }) => {
@@ -597,20 +667,16 @@ function waitForTimeout(abortSignal, maxDelay, errorMessage, errorCode) {
 
 async function waitForDebuggerReady({ Debugger }) {
 	await Debugger.enable();
-	try {
-		await Debugger.pause();
-		await new Promise(resolve => {
-			const RESUMED_EVENT = "resumed";
-			Debugger.addEventListener(RESUMED_EVENT, onResumed);
+	await Debugger.pause();
+	await new Promise(resolve => {
+		const RESUMED_EVENT = "resumed";
+		Debugger.addEventListener(RESUMED_EVENT, onResumed);
 
-			function onResumed() {
-				Debugger.removeEventListener(RESUMED_EVENT, onResumed);
-				resolve();
-			}
-		});
-	} finally {
-		await Debugger.disable();
-	}
+		function onResumed() {
+			Debugger.removeEventListener(RESUMED_EVENT, onResumed);
+			resolve();
+		}
+	});
 }
 
 function getBrowserOptions(options) {
@@ -619,7 +685,7 @@ function getBrowserOptions(options) {
 	browserOptions.headless = options.browserHeadless;
 	browserOptions.executablePath = options.browserExecutablePath;
 	browserOptions.debug = options.browserDebug;
-	browserOptions.disableWebSecurity = options.browserDisableWebSecurity === undefined || options.browserDisableWebSecurity;
+	browserOptions.disableWebSecurity = options.browserDisableWebSecurity;
 	browserOptions.width = options.browserWidth;
 	browserOptions.height = options.browserHeight;
 	browserOptions.userAgent = options.userAgent;