single-file-core 1.5.96 → 1.5.98

package/core/helper.js

@@ -81,6 +81,7 @@ const DEFAULT_REPLACEMENT_CHARACTERS = ["～", "＋", "？", "％", "＊", "："
 const CHARACTER_CLASS_SPECIAL_CHARACTERS = ["[", "]", "^", "-", "\\"];
 const NESTING_TRACK_ID_ATTRIBUTE_NAME = "data-sf-nesting-track-id";
 const addEventListener = (type, listener, options) => globalThis.addEventListener(type, listener, options);
+const removeEventListener = (type, listener, options) => globalThis.removeEventListener(type, listener, options);
 // eslint-disable-next-line no-unused-vars
 const dispatchEvent = event => { try { globalThis.dispatchEvent(event); } catch (error) {  /* ignored */ } };
 const JSON = globalThis.JSON;
@@ -93,6 +94,7 @@ const URL = globalThis.URL;
 const DOMParser = globalThis.DOMParser;
 const Uint8Array = globalThis.Uint8Array;
 const btoa = globalThis.btoa;
+const FileReader = globalThis.FileReader;
 
 export {
 	initUserScriptHandler,
@@ -172,30 +174,29 @@ function onInitUserScript({ detail }) {
 			// ignored
 		}
 		const event = new CustomEvent(eventPrefixName + "-request", { cancelable: true, detail: detailUserScript });
+		const responseEventName = eventPrefixName + "-response";
 		let resolvePromiseResponse;
-		const promiseResponse = new Promise(resolve => {
-			resolvePromiseResponse = resolve;
-			addEventListener(eventPrefixName + "-response", event => {
-				if (event.detail) {
-					try {
-						const detail = typeof event.detail == "string" ? JSON.parse(event.detail) : event.detail;
-						if (detail.options) {
-							Object.assign(options, detail.options);
-						}
-						// eslint-disable-next-line no-unused-vars
-					} catch (error) {
-						// ignored
+		const promiseResponse = new Promise(resolve => (resolvePromiseResponse = resolve));
+		const onResponse = event => {
+			if (event.detail) {
+				try {
+					const detail = typeof event.detail == "string" ? JSON.parse(event.detail) : event.detail;
+					if (detail.options) {
+						Object.assign(options, detail.options);
 					}
+					// eslint-disable-next-line no-unused-vars
+				} catch (error) {
+					// ignored
 				}
-				resolve();
-			});
-		});
+			}
+			resolvePromiseResponse();
+		};
+		addEventListener(responseEventName, onResponse);
 		dispatchEvent(event);
 		if (event.defaultPrevented) {
 			await promiseResponse;
-		} else {
-			resolvePromiseResponse();
 		}
+		removeEventListener(responseEventName, onResponse);
 	};
 }
 
@@ -800,12 +801,21 @@ function getContentSize(content) {
 }
 
 async function getDataURI(blob) {
-	const bytes = new Uint8Array(await blob.arrayBuffer());
-	let content = "";
-	for (let offset = 0; offset < bytes.length; offset += 8192) {
-		content += String.fromCharCode(...bytes.subarray(offset, offset + 8192));
+	if (FileReader) {
+		const reader = new FileReader();
+		reader.readAsDataURL(blob);
+		return new Promise((resolve, reject) => {
+			reader.addEventListener("load", () => resolve(reader.result), false);
+			reader.addEventListener("error", reject, false);
+		});
+	} else {
+		const bytes = new Uint8Array(await blob.arrayBuffer());
+		let content = "";
+		for (let offset = 0; offset < bytes.length; offset += 8192) {
+			content += String.fromCharCode(...bytes.subarray(offset, offset + 8192));
+		}
+		return "data:" + (blob.type || "application/octet-stream") + ";base64," + btoa(content);
 	}
-	return "data:" + (blob.type || "application/octet-stream") + ";base64," + btoa(content);
 }
 
 async function digest(algo, text) {

package/core/lib/processor-helper-common.js

@@ -152,12 +152,15 @@ class ProcessorHelperCommon {
 							const response = await batchRequest.addURL(resourceURL, { expectedType: "image" });
 							const svgDoc = util.parseSVGContent(response.content);
 							if (hashMatch && hashMatch[0]) {
-								let symbolElement;
-								try {
-									symbolElement = svgDoc.querySelector(hashMatch[0]);
-									// eslint-disable-next-line no-unused-vars
-								} catch (error) {
-									// ignored
+								const symbolId = hashMatch[0].substring(1);
+								let symbolElement = svgDoc.getElementById(symbolId);
+								if (!symbolElement) {
+									try {
+										symbolElement = svgDoc.getElementById(decodeURIComponent(symbolId));
+										// eslint-disable-next-line no-unused-vars
+									} catch (error) {
+										// ignored
+									}
 								}
 								if (symbolElement) {
 									resourceElement.setAttribute(attributeName, hashMatch[0]);

package/modules/template-formatter.js

@@ -17264,7 +17264,18 @@ function getLastSegment(url, replacementCharacter) {
 
 async function truncateText(content, maxSize) {
 	const blob = new Blob([content]);
-	const result = await blob.slice(0, maxSize).text();
+	const truncatedBlob = blob.slice(0, maxSize);
+	let result;
+	if (globalThis.FileReader) {
+		const reader = new globalThis.FileReader();
+		reader.readAsText(truncatedBlob);
+		result = await new Promise((resolve, reject) => {
+			reader.addEventListener("load", () => resolve(reader.result), false);
+			reader.addEventListener("error", reject, false);
+		});
+	} else {
+		result = await truncatedBlob.text();
+	}
 	if (content.startsWith(result)) {
 		return result;
 	} else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.5.96",
+  "version": "1.5.98",
   "description": "SingleFile Core",
   "author": "Gildas Lormeau",
   "license": "AGPL-3.0-or-later",

package/processors/hooks/content/content-hooks-frames-web.js

@@ -401,6 +401,7 @@
 		};
 		globalThis.FontFace.prototype = origFontFace.prototype;
 		globalThis.FontFace.toString = function () { return "function FontFace() { [native code] }"; };
+		setFunctionName(globalThis.FontFace, "FontFace");
 		const deleteFont = document.fonts.delete;
 		document.fonts.delete = function (fontFace) {
 			try {
@@ -426,12 +427,12 @@
 	}
 
 	if (globalThis.IntersectionObserver) {
-		const IntersectionObserver = globalThis.IntersectionObserver;
-		globalThis.IntersectionObserver = function () {
+		const origIntersectionObserver = globalThis.IntersectionObserver;
+		globalThis.IntersectionObserver = function IntersectionObserver() {
 			try {
-				const intersectionObserver = new IntersectionObserver(...arguments);
-				const observeIntersection = IntersectionObserver.prototype.observe || intersectionObserver.observe;
-				const unobserveIntersection = IntersectionObserver.prototype.unobserve || intersectionObserver.unobserve;
+				const intersectionObserver = new origIntersectionObserver(...arguments);
+				const observeIntersection = origIntersectionObserver.prototype.observe || intersectionObserver.observe;
+				const unobserveIntersection = origIntersectionObserver.prototype.unobserve || intersectionObserver.unobserve;
 				const callback = arguments[0];
 				const options = arguments[1];
 				if (observeIntersection) {
@@ -479,8 +480,9 @@
 				throw error;
 			}
 		};
-		globalThis.IntersectionObserver.prototype = IntersectionObserver.prototype;
+		globalThis.IntersectionObserver.prototype = origIntersectionObserver.prototype;
 		globalThis.IntersectionObserver.toString = function () { return "function IntersectionObserver() { [native code] }"; };
+		setFunctionName(globalThis.IntersectionObserver, "IntersectionObserver");
 	}
 
 	const originalReplaceSync = CSSStyleSheet.prototype.replaceSync;
@@ -575,6 +577,10 @@
 		return detail;
 	}
 
+	function setFunctionName(fn, name) {
+		Object.defineProperty(fn, "name", { value: name, configurable: true });
+	}
+
 	function dispatchResizeEvent() {
 		try {
 			globalThis.dispatchEvent(new UIEvent("resize"));

package/single-file.js

@@ -128,7 +128,18 @@ async function getPageData(options = {}, initOptions, doc, win) {
 			embeddedPdf: options.embeddedPdf
 		});
 		delete pageData.resources;
-		pageData.content = Array.from(new Uint8Array(await blob.arrayBuffer()));
+		let arrayBuffer;
+		if (globalThis.FileReader) {
+			const reader = new globalThis.FileReader();
+			reader.readAsArrayBuffer(blob);
+			arrayBuffer = await new Promise((resolve, reject) => {
+				reader.addEventListener("load", () => resolve(reader.result), false);
+				reader.addEventListener("error", reject, false);
+			});
+		} else {
+			arrayBuffer = await blob.arrayBuffer();
+		}
+		pageData.content = Array.from(new Uint8Array(arrayBuffer));
 	}
 	return pageData;
 }