single-file-cli 2.0.75 → 2.0.77

package/lib/single-file-script.js

@@ -21,41 +21,68 @@
  *   Source.
  */
 
-/* global singlefile, XMLHttpRequest */
+/* global singlefile, atob, Headers */
 
 import { script, hookScript, zipScript } from "../lib/single-file-bundle.js";
 import { Deno } from "./deno-polyfill.js";
 
+const FETCH_FUNCTION_NAME = "__singleFileFetch";
+const RESOLVE_FETCH_FUNCTION_NAME = "__singleFileResolveFetch";
+const REJECT_FETCH_FUNCTION_NAME = "__singleFileRejectFetch";
+
 const { readTextFile } = Deno;
-export { getScriptSource, getHookScriptSource, getZipScriptSource };
 
-function initSingleFile() {
-	singlefile.init({
-		fetch: (url, options) => {
-			return new Promise(function (resolve, reject) {
-				const xhrRequest = new XMLHttpRequest();
-				xhrRequest.withCredentials = true;
-				xhrRequest.responseType = "arraybuffer";
-				xhrRequest.onerror = event => reject(new Error(event.detail));
-				xhrRequest.onabort = () => reject(new Error("aborted"));
-				xhrRequest.onreadystatechange = () => {
-					if (xhrRequest.readyState == XMLHttpRequest.DONE) {
-						resolve({
-							arrayBuffer: () => xhrRequest.response || new ArrayBuffer(),
-							headers: { get: headerName => xhrRequest.getResponseHeader(headerName) },
-							status: xhrRequest.status
-						});
-					}
-				};
-				xhrRequest.open("GET", url, true);
-				if (options.headers) {
-					for (const entry of Object.entries(options.headers)) {
-						xhrRequest.setRequestHeader(entry[0], entry[1]);
-					}
-				}
-				xhrRequest.send();
+export {
+	FETCH_FUNCTION_NAME,
+	RESOLVE_FETCH_FUNCTION_NAME,
+	REJECT_FETCH_FUNCTION_NAME,
+	getScriptSource,
+	getHookScriptSource,
+	getZipScriptSource
+};
+
+function initSingleFile(constants) {
+	const nativeFetch = globalThis.fetch;
+	const pendingRequests = new Map();
+	let lastRequestId = 0;
+	const { RESOLVE_FETCH_FUNCTION_NAME, REJECT_FETCH_FUNCTION_NAME, FETCH_FUNCTION_NAME } = constants;
+
+	globalThis[RESOLVE_FETCH_FUNCTION_NAME] = (requestId, result) => {
+		const pendingRequest = pendingRequests.get(requestId);
+		if (pendingRequest) {
+			pendingRequests.delete(requestId);
+			const binaryString = atob(result.data);
+			const bytes = new Uint8Array(binaryString.length);
+			for (let i = 0; i < binaryString.length; i++) {
+				bytes[i] = binaryString.charCodeAt(i);
+			}
+			pendingRequest.resolve({
+				status: result.status,
+				headers: new Headers(result.headers),
+				arrayBuffer: () => Promise.resolve(bytes.buffer)
 			});
 		}
+	};
+	globalThis[REJECT_FETCH_FUNCTION_NAME] = (requestId, error) => {
+		const pendingRequest = pendingRequests.get(requestId);
+		if (pendingRequest) {
+			pendingRequests.delete(requestId);
+			pendingRequest.reject(new Error(error.error));
+		}
+	};
+
+	singlefile.init({
+		fetch: async (url, options) => {
+			try {
+				return await nativeFetch(url, options);
+			} catch {
+				const requestId = lastRequestId++;
+				return new Promise((resolve, reject) => {
+					pendingRequests.set(requestId, { resolve, reject });
+					globalThis[FETCH_FUNCTION_NAME](JSON.stringify({ requestId, url, options }));
+				});
+			}
+		}
 	});
 }
 
@@ -66,7 +93,11 @@ async function getScriptSource(options) {
 	if (options.browserStylesheets && options.browserStylesheets.length) {
 		source += "addEventListener(\"load\",()=>{const styleElement=document.createElement(\"style\");styleElement.textContent=" + JSON.stringify(await readScriptFiles(options.browserStylesheets)) + ";document.body.appendChild(styleElement);});";
 	}
-	source += "(" + initSingleFile.toString() + ")();";
+	source += "(" + initSingleFile.toString() + ")(" + JSON.stringify({
+		FETCH_FUNCTION_NAME,
+		RESOLVE_FETCH_FUNCTION_NAME,
+		REJECT_FETCH_FUNCTION_NAME
+	}) + ");";
 	return source;
 }
 

package/lib/version.js

@@ -1 +1 @@
-export const version = "2.0.75";
+export const version = "2.0.77";

package/options.js

@@ -39,7 +39,9 @@ const OPTIONS_INFO = {
 	"block-audios": { description: "Block audios", type: "boolean", defaultValue: true },
 	"block-fonts": { description: "Block fonts", type: "boolean" },
 	"block-images": { description: "Block images", type: "boolean" },
+	"block-alternative-images": { description: "Block alternative images", type: "boolean", defaultValue: true },
 	"block-scripts": { description: "Block scripts", type: "boolean", defaultValue: true },
+	"block-stylesheets": { description: "Block stylesheets", type: "boolean", defaultValue: false },
 	"block-videos": { description: "Block videos", type: "boolean", defaultValue: true },
 	"block-mixed-content": { description: "Block mixed contents", type: "boolean" },
 	"blocked-URL-pattern": { description: "Regular expression matching URLs to block (e.g. 'annoying-banners\\.com')", type: "string[]" },
@@ -129,6 +131,7 @@ const OPTIONS_INFO = {
 	"remove-alternative-fonts": { description: "Remove alternative fonts to the ones displayed", type: "boolean", defaultValue: true },
 	"remove-alternative-medias": { description: "Remove alternative CSS stylesheets", type: "boolean", defaultValue: true },
 	"remove-alternative-images": { description: "Remove images for alternative sizes of screen", type: "boolean", defaultValue: true },
+	"remove-no-script-tags": { description: "Remove <noscript> tags", type: "boolean", defaultValue: true },
 	"save-original-URLs": { description: "Save the original URLS in the embedded contents", type: "boolean" },
 	"save-raw-page": { description: "Save the original page without interpreting it into the browser", type: "boolean" },
 	"urls-file": { description: "Path to a text file containing a list of URLs (separated by a newline) to save. You can also pass the options after each URL (e.g. 'https://www.example.com --filename-template={page-title}.html')", type: "string" },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-cli",
-	"version": "2.0.75",
+	"version": "2.0.77",
 	"description": "SingleFile CLI",
 	"author": "Gildas Lormeau",
 	"engines": {
@@ -13,10 +13,10 @@
 		"single-file": "single-file-node.js"
 	},
 	"dependencies": {
-		"simple-cdp": "^1.8.5",
-		"ws": "^8.18.0"
+		"simple-cdp": "^1.8.6",
+		"ws": "^8.18.3"
 	},
 	"devDependencies": {
-		"@eslint/js": "^9.20.0"
+		"@eslint/js": "^9.39.0"
 	}
 }

package/single-file-cli-api.js

@@ -36,7 +36,7 @@ const DEFAULT_OPTIONS = {
 	compressHTML: true,
 	loadDeferredImages: true,
 	loadDeferredImagesMaxIdleTime: 1500,
-	filenameTemplate: "{page-title} ({date-locale} {time-locale}).html",
+	filenameTemplate: "%if-empty<{page-title}|No title> ({date-locale} {time-locale}).{filename-extension}",
 	filenameMaxLength: 192,
 	filenameMaxLengthUnit: "bytes",
 	filenameReplacedCharacters: ["~", "+", "?", "%", "*", ":", "|", "\"", "<", ">", "\\\\", "\x00-\x1f", "\x7F"],