single-file-cli 2.0.75 → 2.0.77

package/README.MD

@@ -2,7 +2,7 @@
 
 ## Introduction
 
-[SingleFile](https://github.com/gildas-lormeau/SingleFile) can be launched from the command line by running it into a (headless) browser. 
+[SingleFile](https://www.getsinglefile.com) 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/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.45"
+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,13 +1,13 @@
 {
   "name": "@single-file/single-file-cli",
-  "version": "2.0.75",
+  "version": "2.0.77",
   "description": "SingleFile CLI",
   "nodeModulesDir": "auto",
   "exports": {
     ".": "./single-file-cli-api.js"
   },
   "imports": {
-    "simple-cdp": "jsr:@simple-cdp/simple-cdp@^1.8.5",
-    "path": "jsr:@std/path@^0.224.0"
+    "simple-cdp": "jsr:@simple-cdp/simple-cdp@^1.8.6",
+    "path": "jsr:@std/path@^1.1.2"
   }
 }

package/deno.lock

@@ -1,48 +1,83 @@
 {
-  "version": "4",
+  "version": "5",
   "specifiers": {
-    "jsr:@simple-cdp/simple-cdp@^1.8.5": "1.8.6",
-    "jsr:@std/assert@0.224": "0.224.0",
-    "jsr:@std/path@0.224": "0.224.0",
-    "npm:@eslint/js@^9.20.0": "9.20.0",
-    "npm:simple-cdp@^1.8.5": "1.8.6",
-    "npm:ws@^8.18.0": "8.18.0"
+    "jsr:@b-fuze/deno-dom@*": "0.1.56",
+    "jsr:@simple-cdp/simple-cdp@^1.8.6": "1.8.6",
+    "jsr:@std/internal@^1.0.10": "1.0.12",
+    "jsr:@std/path@^1.1.2": "1.1.2",
+    "npm:@eslint/js@^9.39.0": "9.39.0",
+    "npm:simple-cdp@^1.8.6": "1.8.6",
+    "npm:ws@^8.18.3": "8.18.3"
   },
   "jsr": {
+    "@b-fuze/deno-dom@0.1.56": {
+      "integrity": "8030e2dc1d8750f1682b53462ab893d9c3470f2287feecbe22f44a88c54ab148"
+    },
     "@simple-cdp/simple-cdp@1.8.6": {
       "integrity": "beabfb0dd8cb8c964f09249b94ef23334d65a583f622f43d6302222b25ee3af8"
     },
-    "@std/assert@0.224.0": {
-      "integrity": "8643233ec7aec38a940a8264a6e3eed9bfa44e7a71cc6b3c8874213ff401967f"
+    "@std/internal@1.0.12": {
+      "integrity": "972a634fd5bc34b242024402972cd5143eac68d8dffaca5eaa4dba30ce17b027"
     },
-    "@std/path@0.224.0": {
-      "integrity": "55bca6361e5a6d158b9380e82d4981d82d338ec587de02951e2b7c3a24910ee6",
+    "@std/path@1.1.2": {
+      "integrity": "c0b13b97dfe06546d5e16bf3966b1cadf92e1cc83e56ba5476ad8b498d9e3038",
       "dependencies": [
-        "jsr:@std/assert"
+        "jsr:@std/internal"
       ]
     }
   },
   "npm": {
-    "@eslint/js@9.20.0": {
-      "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ=="
+    "@eslint/js@9.39.0": {
+      "integrity": "sha512-BIhe0sW91JGPiaF1mOuPy5v8NflqfjIcDNpC+LbW9f609WVRX1rArrhi6Z2ymvrAry9jw+5POTj4t2t62o8Bmw=="
     },
     "simple-cdp@1.8.6": {
       "integrity": "sha512-c33zKvBOOIBfdfDCr++N8Dv6kY03wD+cGuu3MEiBJHC4LtHE5aSwjw5E+dOSeuXolS+8MoDzYuWrJdT+IFp8bw=="
     },
-    "ws@8.18.0": {
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="
+    "ws@8.18.3": {
+      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg=="
     }
   },
+  "remote": {
+    "https://deno.land/std@0.200.0/assert/_constants.ts": "8a9da298c26750b28b326b297316cdde860bc237533b07e1337c021379e6b2a9",
+    "https://deno.land/std@0.200.0/assert/_diff.ts": "1a3c044aedf77647d6cac86b798c6417603361b66b54c53331b312caeb447aea",
+    "https://deno.land/std@0.200.0/assert/_format.ts": "a69126e8a469009adf4cf2a50af889aca364c349797e63174884a52ff75cf4c7",
+    "https://deno.land/std@0.200.0/assert/assert.ts": "9a97dad6d98c238938e7540736b826440ad8c1c1e54430ca4c4e623e585607ee",
+    "https://deno.land/std@0.200.0/assert/assert_almost_equals.ts": "e15ca1f34d0d5e0afae63b3f5d975cbd18335a132e42b0c747d282f62ad2cd6c",
+    "https://deno.land/std@0.200.0/assert/assert_array_includes.ts": "6856d7f2c3544bc6e62fb4646dfefa3d1df5ff14744d1bca19f0cbaf3b0d66c9",
+    "https://deno.land/std@0.200.0/assert/assert_equals.ts": "d8ec8a22447fbaf2fc9d7c3ed2e66790fdb74beae3e482855d75782218d68227",
+    "https://deno.land/std@0.200.0/assert/assert_exists.ts": "407cb6b9fb23a835cd8d5ad804e2e2edbbbf3870e322d53f79e1c7a512e2efd7",
+    "https://deno.land/std@0.200.0/assert/assert_false.ts": "a9962749f4bf5844e3fa494257f1de73d69e4fe0e82c34d0099287552163a2dc",
+    "https://deno.land/std@0.200.0/assert/assert_instance_of.ts": "09fd297352a5b5bbb16da2b5e1a0d8c6c44da5447772648622dcc7df7af1ddb8",
+    "https://deno.land/std@0.200.0/assert/assert_is_error.ts": "b4eae4e5d182272efc172bf28e2e30b86bb1650cd88aea059e5d2586d4160fb9",
+    "https://deno.land/std@0.200.0/assert/assert_match.ts": "c4083f80600bc190309903c95e397a7c9257ff8b5ae5c7ef91e834704e672e9b",
+    "https://deno.land/std@0.200.0/assert/assert_not_equals.ts": "9f1acab95bd1f5fc9a1b17b8027d894509a745d91bac1718fdab51dc76831754",
+    "https://deno.land/std@0.200.0/assert/assert_not_instance_of.ts": "0c14d3dfd9ab7a5276ed8ed0b18c703d79a3d106102077ec437bfe7ed912bd22",
+    "https://deno.land/std@0.200.0/assert/assert_not_match.ts": "3796a5b0c57a1ce6c1c57883dd4286be13a26f715ea662318ab43a8491a13ab0",
+    "https://deno.land/std@0.200.0/assert/assert_not_strict_equals.ts": "ca6c6d645e95fbc873d25320efeb8c4c6089a9a5e09f92d7c1c4b6e935c2a6ad",
+    "https://deno.land/std@0.200.0/assert/assert_object_match.ts": "d8fc2867cfd92eeacf9cea621e10336b666de1874a6767b5ec48988838370b54",
+    "https://deno.land/std@0.200.0/assert/assert_rejects.ts": "45c59724de2701e3b1f67c391d6c71c392363635aad3f68a1b3408f9efca0057",
+    "https://deno.land/std@0.200.0/assert/assert_strict_equals.ts": "b1f538a7ea5f8348aeca261d4f9ca603127c665e0f2bbfeb91fa272787c87265",
+    "https://deno.land/std@0.200.0/assert/assert_string_includes.ts": "b821d39ebf5cb0200a348863c86d8c4c4b398e02012ce74ad15666fc4b631b0c",
+    "https://deno.land/std@0.200.0/assert/assert_throws.ts": "63784e951475cb7bdfd59878cd25a0931e18f6dc32a6077c454b2cd94f4f4bcd",
+    "https://deno.land/std@0.200.0/assert/assertion_error.ts": "4d0bde9b374dfbcbe8ac23f54f567b77024fb67dbb1906a852d67fe050d42f56",
+    "https://deno.land/std@0.200.0/assert/equal.ts": "9f1a46d5993966d2596c44e5858eec821859b45f783a5ee2f7a695dfc12d8ece",
+    "https://deno.land/std@0.200.0/assert/fail.ts": "c36353d7ae6e1f7933d45f8ea51e358c8c4b67d7e7502028598fe1fea062e278",
+    "https://deno.land/std@0.200.0/assert/mod.ts": "08d55a652c22c5da0215054b21085cec25a5da47ce4a6f9de7d9ad36df35bdee",
+    "https://deno.land/std@0.200.0/assert/unimplemented.ts": "d56fbeecb1f108331a380f72e3e010a1f161baa6956fd0f7cf3e095ae1a4c75a",
+    "https://deno.land/std@0.200.0/assert/unreachable.ts": "4600dc0baf7d9c15a7f7d234f00c23bca8f3eba8b140286aaca7aa998cf9a536",
+    "https://deno.land/std@0.200.0/fmt/colors.ts": "a7eecffdf3d1d54db890723b303847b6e0a1ab4b528ba6958b8f2e754cf1b3bc",
+    "https://deno.land/std@0.200.0/testing/asserts.ts": "b4e4b1359393aeff09e853e27901a982c685cb630df30426ed75496961931946"
+  },
   "workspace": {
     "dependencies": [
-      "jsr:@simple-cdp/simple-cdp@^1.8.5",
-      "jsr:@std/path@0.224"
+      "jsr:@simple-cdp/simple-cdp@^1.8.6",
+      "jsr:@std/path@^1.1.2"
     ],
     "packageJson": {
       "dependencies": [
-        "npm:@eslint/js@^9.20.0",
-        "npm:simple-cdp@^1.8.5",
-        "npm:ws@^8.18.0"
+        "npm:@eslint/js@^9.39.0",
+        "npm:simple-cdp@^1.8.6",
+        "npm:ws@^8.18.3"
       ]
     }
   }

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;