single-file-core 1.5.94 → 1.5.96

package/core/helper.js

@@ -91,6 +91,8 @@ const CustomEvent = globalThis.CustomEvent;
 const MutationObserver = globalThis.MutationObserver;
 const URL = globalThis.URL;
 const DOMParser = globalThis.DOMParser;
+const Uint8Array = globalThis.Uint8Array;
+const btoa = globalThis.btoa;
 
 export {
 	initUserScriptHandler,
@@ -105,6 +107,7 @@ export {
 	getShadowRoot,
 	appendInfobar,
 	getContentSize,
+	getDataURI,
 	digest,
 	getValidFilename,
 	parseDocContent,
@@ -297,7 +300,10 @@ function markInvalidNesting(doc) {
 
 	function addTrackIds(element, index = 0, parentTrackId = "") {
 		const trackId = parentTrackId ? `${parentTrackId}.${index + 1}` : `${index + 1}`;
-		element.setAttribute(NESTING_TRACK_ID_ATTRIBUTE_NAME, trackId);
+		const tagName = element.tagName.toUpperCase();
+		if (!(parentTrackId && (tagName == "BODY" || tagName == "HEAD" || tagName == "HTML"))) {
+			element.setAttribute(NESTING_TRACK_ID_ATTRIBUTE_NAME, trackId);
+		}
 		Array.from(element.children).forEach((child, indexChild) => addTrackIds(child, indexChild, trackId));
 	}
 
@@ -338,7 +344,7 @@ function fixInvalidNesting(document, NESTING_TRACK_ID_ATTRIBUTE_NAME, preventCle
 		if (idParts.length > 1) {
 			const parentId = idParts.slice(0, -1).join(".");
 			const expectedParent = trackIds[parentId];
-			if (expectedParent && element.parentElement !== expectedParent) {
+			if (expectedParent && element.parentElement !== expectedParent && !element.contains(expectedParent)) {
 				expectedParent.appendChild(element);
 			}
 		}
@@ -793,6 +799,15 @@ function getContentSize(content) {
 	return new Blob([content]).size;
 }
 
+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));
+	}
+	return "data:" + (blob.type || "application/octet-stream") + ";base64," + btoa(content);
+}
+
 async function digest(algo, text) {
 	try {
 		const data = new TextEncoder("utf-8").encode(text);

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

@@ -23,7 +23,8 @@
 
 import {
 	normalizeFontFamily,
-	getFontWeight
+	getFontWeight,
+	getDataURI
 } from "./../helper.js";
 
 const DATA_URI_PREFIX = "data:";
@@ -60,7 +61,6 @@ const FONT_STRETCHES = {
 	"ultra-expanded": "200%"
 };
 const Blob = globalThis.Blob;
-const FileReader = globalThis.FileReader;
 const Image = globalThis.Image;
 const OffscreenCanvas = globalThis.OffscreenCanvas;
 
@@ -710,10 +710,5 @@ async function resizeImage(doc, dataURI, { imageReductionFactor }) {
 
 function toDataURI(content, contentType, charset) {
 	const blob = content instanceof Blob ? content : new Blob([content], { type: (contentType || "") + (charset ? ";charset=" + charset : "") });
-	return new Promise((resolve, reject) => {
-		const reader = new FileReader();
-		reader.onload = () => resolve(reader.result);
-		reader.onerror = () => reject(new Error(reader.error));
-		reader.readAsDataURL(blob);
-	});
+	return getDataURI(blob);
 }

package/core/util.js

@@ -66,7 +66,6 @@ const CONTENT_TYPE_OCTET_STREAM = "application/octet-stream";
 const URL = globalThis.URL;
 const DOMParser = globalThis.DOMParser;
 const Blob = globalThis.Blob;
-const FileReader = globalThis.FileReader;
 const fetch = (url, options) => {
 	options.cache = "force-cache";
 	options.referrerPolicy = "strict-origin-when-cross-origin";
@@ -351,12 +350,7 @@ async function getFetchResponse(resourceURL, options, data, charset, contentType
 	if (data) {
 		if (options.asBinary) {
 			if (options.inline) {
-				const reader = new FileReader();
-				reader.readAsDataURL(new Blob([data], { type: contentType + (options.charset ? ";charset=" + options.charset : "") }));
-				data = await new Promise((resolve, reject) => {
-					reader.addEventListener("load", () => resolve(reader.result), false);
-					reader.addEventListener("error", reject, false);
-				});
+				data = await helper.getDataURI(new Blob([data], { type: contentType + (options.charset ? ";charset=" + options.charset : "") }));
 			} else {
 				data = new Uint8Array(data);
 			}

package/css-tree-build/build.js

@@ -4,7 +4,6 @@ import { build } from "esbuild";
 
 const require = createRequire(import.meta.url);
 const packagePath = require.resolve("css-tree/package.json");
-const tokenStreamPath = packagePath.replace(/package\.json$/, "lib/tokenizer/TokenStream.js");
 const licensePath = packagePath.replace(/package\.json$/, "LICENSE");
 const { version } = JSON.parse(readFileSync(packagePath));
 

package/eslint.config.mjs

@@ -1,6 +1,12 @@
 import js from "@eslint/js";
 
 export default [
+	{
+		ignores: [
+			"vendor/**",
+			"zip-build/lib/**"
+		]
+	},
 	js.configs.recommended,
 	{
 		languageOptions: {
@@ -27,5 +33,22 @@ export default [
 				"warn"
 			]
 		}
+	},
+	{
+		files: ["test/sfz-harness/**"],
+		languageOptions: {
+			globals: {
+				Deno: "readonly",
+				setTimeout: "readonly",
+				Blob: "readonly",
+				TextDecoder: "readonly",
+				TextEncoder: "readonly",
+				URL: "readonly",
+				performance: "readonly"
+			}
+		},
+		rules: {
+			"no-console": "off"
+		}
 	}
 ];

package/modules/template-formatter.js

@@ -27,7 +27,6 @@ import { parse } from "./template-parser.js";
 import { getContentSize, digest, getValidFilename } from "./../core/helper.js";
 
 const Blob = globalThis.Blob;
-const FileReader = globalThis.FileReader;
 const URL = globalThis.URL;
 const Intl = globalThis.Intl;
 const URLSearchParams = globalThis.URLSearchParams;
@@ -17187,6 +17186,10 @@ async function evalTemplate(template = "", options, content, doc, context = {})
 		variables[prefix + "minutes-utc"] = { getter: () => String(date.getUTCMinutes()).padStart(2, "0") };
 		variables[prefix + "seconds-utc"] = { getter: () => String(date.getUTCSeconds()).padStart(2, "0") };
 		variables[prefix + "time-ms"] = { getter: () => String(date.getTime()) };
+		variables[prefix + "weekday-locale"] = { getter: () => date.toLocaleDateString(undefined, { weekday: "long" }) };
+		variables[prefix + "weekday-short-locale"] = { getter: () => date.toLocaleDateString(undefined, { weekday: "short" }) };
+		variables[prefix + "weekday-utc"] = { getter: () => date.toLocaleDateString(undefined, { weekday: "long", timeZone: "UTC" }) };
+		variables[prefix + "weekday-short-utc"] = { getter: () => date.toLocaleDateString(undefined, { weekday: "short", timeZone: "UTC" }) };
 	}
 }
 
@@ -17259,26 +17262,14 @@ function getLastSegment(url, replacementCharacter) {
 	return lastSegment;
 }
 
-function truncateText(content, maxSize) {
+async function truncateText(content, maxSize) {
 	const blob = new Blob([content]);
-	const reader = new FileReader();
-	reader.readAsText(blob.slice(0, maxSize));
-	return new Promise((resolve, reject) => {
-		reader.addEventListener(
-			"load",
-			() => {
-				if (content.startsWith(reader.result)) {
-					resolve(reader.result);
-				} else {
-					truncateText(content, maxSize - 1)
-						.then(resolve)
-						.catch(reject);
-				}
-			},
-			false
-		);
-		reader.addEventListener("error", reject, false);
-	});
+	const result = await blob.slice(0, maxSize).text();
+	if (content.startsWith(result)) {
+		return result;
+	} else {
+		return truncateText(content, maxSize - 1);
+	}
 }
 
 function getFilenameExtension(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.5.94",
+  "version": "1.5.96",
   "description": "SingleFile Core",
   "author": "Gildas Lormeau",
   "license": "AGPL-3.0-or-later",
@@ -20,6 +20,7 @@
   },
   "homepage": "https://github.com/gildas-lormeau/single-file-core#readme",
   "devDependencies": {
-    "eslint": "^9.39.1"
+    "@eslint/js": "^9.39.5",
+    "eslint": "^10.9.1"
   }
 }

package/processors/compression/compression-extract.js

@@ -21,7 +21,7 @@
  *   Source.
  */
 
-/* global zip, Blob, FileReader, URL */
+/* global zip, Blob, btoa, URL */
 
 export {
 	extract
@@ -220,12 +220,13 @@ async function extract(content, { password, prompt = () => { }, zipOptions = { u
 	}
 
 	async function getDataURI(textContent, mimeType) {
-		const reader = new FileReader();
-		reader.readAsDataURL(new Blob([textContent], { type: mimeType }));
-		return new Promise((resolve, reject) => {
-			reader.onload = () => resolve(reader.result.replace(CHARSET_UTF8, ""));
-			reader.onerror = reject;
-		});
+		const blob = new Blob([textContent], { type: mimeType });
+		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)).replace(CHARSET_UTF8, "");
 	}
 
 	function replaceAll(string, search, replacement) {

package/processors/compression/compression-router.js

@@ -69,6 +69,7 @@ async function router(content, { extract, display }) {
 	const manifest = JSON.parse(await pagesEntry.getData(new zip.TextWriter()));
 	const tocEntry = entries.find(entry => entry.filename == TOC_FILENAME);
 	const { pages } = manifest;
+	const pageTransitions = manifest.pageTransitions || "auto";
 	const aliases = new Map(Object.entries(manifest.aliases || {}));
 	pages.forEach(page => {
 		urlToPath.set(stripFragment(page.url), page.path);
@@ -141,7 +142,7 @@ async function router(content, { extract, display }) {
 		const willRender = routed && path != currentPath && isRenderablePath(path);
 		// the whole render and scroll sequence runs inside the view transition
 		// so that the crossfade ends on the final scroll position
-		if (willRender && document.startViewTransition && !prefersReducedMotion()) {
+		if (willRender && document.startViewTransition && pageTransitionEnabled() && !prefersReducedMotion()) {
 			await document.startViewTransition(update).updateCallbackDone;
 		} else {
 			await update();
@@ -324,6 +325,30 @@ async function router(content, { extract, display }) {
 		return node;
 	}
 
+	// "auto" approximates the cross-document opt-in of live sites: the transition
+	// runs when the displayed page itself contains an @view-transition rule set
+	// to navigation: auto, so pages without transitions stay instant
+	function pageTransitionEnabled() {
+		if (pageTransitions == "fade") {
+			return true;
+		}
+		if (pageTransitions == "none") {
+			return false;
+		}
+		return Array.from(document.styleSheets).some(styleSheet => {
+			try {
+				return containsViewTransitionRule(styleSheet.cssRules);
+			} catch {
+				return false;
+			}
+		});
+	}
+
+	function containsViewTransitionRule(cssRules) {
+		return Array.from(cssRules).some(cssRule => cssRule.navigation == "auto" ||
+			(cssRule.cssRules && cssRule.cssRules.length && containsViewTransitionRule(cssRule.cssRules)));
+	}
+
 	function prefersReducedMotion() {
 		return Boolean(globalThis.matchMedia && globalThis.matchMedia("(prefers-reduced-motion: reduce)").matches);
 	}

package/processors/compression/compression.js

@@ -606,6 +606,7 @@ async function getContent() {
 				displayMessage("sfz-wait-message", 2);
 				resolve(pageData);
 			} catch (error) {
+				// eslint-disable-next-line no-console
 				console.error(error);
 				displayMessage("sfz-error-message", 2);
 				reject(error);

package/processors/frame-tree/content/content-frame-tree.js

@@ -397,8 +397,8 @@ function sendMessage(targetWindow, message, useChannel) {
 	}
 }
 
-function getFrameData(document, globalThis, windowId, options, scrolling) {
-	const docData = helper.preProcessDoc(document, globalThis, options);
+function getFrameData(document, win, windowId, options, scrolling) {
+	const docData = helper.preProcessDoc(document, win, options);
 	const content = helper.serialize(document);
 	helper.postProcessDoc(document, docData.markedElements, docData.invalidElements);
 	const baseURI = document.baseURI.split("#")[0];

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

@@ -21,7 +21,7 @@
  *   Source.
  */
 
-(globalThis => {
+(() => {
 
 	const LOAD_DEFERRED_IMAGES_START_EVENT = "single-file-load-deferred-images-start";
 	const LOAD_DEFERRED_IMAGES_END_EVENT = "single-file-load-deferred-images-end";
@@ -71,8 +71,8 @@
 	const Element = globalThis.Element;
 	const UIEvent = globalThis.UIEvent;
 	const Event = globalThis.Event;
-	const FileReader = globalThis.FileReader;
-	const Blob = globalThis.Blob;
+	const Uint8Array = globalThis.Uint8Array;
+	const btoa = globalThis.btoa;
 	const JSON = globalThis.JSON;
 	const MutationObserver = globalThis.MutationObserver;
 	const URL = globalThis.URL;
@@ -88,83 +88,126 @@
 	new MutationObserver(init).observe(document, { childList: true });
 
 	function init() {
-		document.addEventListener(LOAD_DEFERRED_IMAGES_START_EVENT, () => loadDeferredImagesStart());
-		document.addEventListener(LOAD_DEFERRED_IMAGES_KEEP_ZOOM_LEVEL_START_EVENT, () => loadDeferredImagesStart(true));
-		document.addEventListener(LOAD_DEFERRED_IMAGES_END_EVENT, () => loadDeferredImagesEnd());
-		document.addEventListener(LOAD_DEFERRED_IMAGES_KEEP_ZOOM_LEVEL_END_EVENT, () => loadDeferredImagesEnd(true));
+		document.addEventListener(LOAD_DEFERRED_IMAGES_START_EVENT, onLoadDeferredImagesStart);
+		document.addEventListener(LOAD_DEFERRED_IMAGES_KEEP_ZOOM_LEVEL_START_EVENT, onLoadDeferredImagesKeepZoomLevelStart);
+		document.addEventListener(LOAD_DEFERRED_IMAGES_END_EVENT, onLoadDeferredImagesEnd);
+		document.addEventListener(LOAD_DEFERRED_IMAGES_KEEP_ZOOM_LEVEL_END_EVENT, onLoadDeferredImagesKeepZoomLevelEnd);
 		document.addEventListener(LOAD_DEFERRED_IMAGES_RESET_EVENT, resetScreenSize);
-		document.addEventListener(LOAD_DEFERRED_IMAGES_RESET_ZOOM_LEVEL_EVENT, () => {
-			const transform = document.documentElement.style.getPropertyValue("-sf-transform");
-			const transformPriority = document.documentElement.style.getPropertyPriority("-sf-transform");
-			const transformOrigin = document.documentElement.style.getPropertyValue("-sf-transform-origin");
-			const transformOriginPriority = document.documentElement.style.getPropertyPriority("-sf-transform-origin");
-			const minHeight = document.documentElement.style.getPropertyValue("-sf-min-height");
-			const minHeightPriority = document.documentElement.style.getPropertyPriority("-sf-min-height");
-			document.documentElement.style.setProperty("transform", transform, transformPriority);
-			document.documentElement.style.setProperty("transform-origin", transformOrigin, transformOriginPriority);
-			document.documentElement.style.setProperty("min-height", minHeight, minHeightPriority);
-			document.documentElement.style.removeProperty("-sf-transform");
-			document.documentElement.style.removeProperty("-sf-transform-origin");
-			document.documentElement.style.removeProperty("-sf-min-height");
-			resetScreenSize();
-		});
-		document.addEventListener(DISPATCH_SCROLL_START_EVENT, () => { dispatchScrollEvent = true; });
-		document.addEventListener(DISPATCH_SCROLL_END_EVENT, () => { dispatchScrollEvent = false; });
-		document.addEventListener(BLOCK_COOKIES_START_EVENT, () => {
-			try {
-				document.__defineGetter__("cookie", () => { throw new Error("document.cookie temporary blocked by SingleFile"); });
-				// eslint-disable-next-line no-unused-vars
-			} catch (error) {
-				// ignored
-			}
-		});
-		document.addEventListener(BLOCK_COOKIES_END_EVENT, () => { delete document.cookie; });
-		document.addEventListener(BLOCK_STORAGE_START_EVENT, () => {
-			if (!globalThis._singleFile_localStorage) {
-				globalThis._singleFile_localStorage = globalThis.localStorage;
-				globalThis.__defineGetter__("localStorage", () => { throw new Error("localStorage temporary blocked by SingleFile"); });
-			}
-			if (!globalThis._singleFile_indexedDB) {
-				globalThis._singleFile_indexedDB = globalThis.indexedDB;
-				globalThis.__defineGetter__("indexedDB", () => { throw new Error("indexedDB temporary blocked by SingleFile"); });
-			}
-		});
-		document.addEventListener(BLOCK_STORAGE_END_EVENT, () => {
-			if (globalThis._singleFile_localStorage) {
-				delete globalThis.localStorage;
-				globalThis.localStorage = globalThis._singleFile_localStorage;
-				delete globalThis._singleFile_localStorage;
-			}
-			if (!globalThis._singleFile_indexedDB) {
-				delete globalThis.indexedDB;
-				globalThis.indexedDB = globalThis._singleFile_indexedDB;
-				delete globalThis._singleFile_indexedDB;
-			}
-		});
-		document.addEventListener(FETCH_SUPPORTED_REQUEST_EVENT, () =>
-			document.dispatchEvent(new CustomEvent(FETCH_SUPPORTED_RESPONSE_EVENT)));
-		document.addEventListener(FETCH_REQUEST_EVENT, async event => {
-			const { url, options } = JSON.parse(event.detail);
-			let detail;
-			try {
-				const response = await fetch(url, options);
-				detail = { url, response: await response.arrayBuffer(), headers: [...response.headers], status: response.status };
-			} catch (error) {
-				detail = { url, error: error && (error.message || error.toString()) };
-			}
-			document.dispatchEvent(new CustomEvent(FETCH_RESPONSE_EVENT, { detail }));
-		});
+		document.addEventListener(LOAD_DEFERRED_IMAGES_RESET_ZOOM_LEVEL_EVENT, onLoadDeferredImagesResetZoomLevel);
+		document.addEventListener(DISPATCH_SCROLL_START_EVENT, onDispatchScrollStart);
+		document.addEventListener(DISPATCH_SCROLL_END_EVENT, onDispatchScrollEnd);
+		document.addEventListener(BLOCK_COOKIES_START_EVENT, onBlockCookiesStart);
+		document.addEventListener(BLOCK_COOKIES_END_EVENT, onBlockCookiesEnd);
+		document.addEventListener(BLOCK_STORAGE_START_EVENT, onBlockStorageStart);
+		document.addEventListener(BLOCK_STORAGE_END_EVENT, onBlockStorageEnd);
+		document.addEventListener(FETCH_SUPPORTED_REQUEST_EVENT, onFetchSupportedRequest);
+		document.addEventListener(FETCH_REQUEST_EVENT, onFetchRequest);
 		document.addEventListener(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, getAdoptedStylesheetsListener);
-		document.addEventListener(BOOTSTRAP_EVENT, event => {
-			try {
-				if (globalThis.bootstrap && event.detail.data) {
-					globalThis.bootstrap(event.detail.data);
-				}
-				// eslint-disable-next-line no-unused-vars
-			} catch (error) {
-				// ignored
+		document.addEventListener(BOOTSTRAP_EVENT, onBootstrap);
+	}
+
+	function onLoadDeferredImagesStart() {
+		loadDeferredImagesStart();
+	}
+
+	function onLoadDeferredImagesKeepZoomLevelStart() {
+		loadDeferredImagesStart(true);
+	}
+
+	function onLoadDeferredImagesEnd() {
+		loadDeferredImagesEnd();
+	}
+
+	function onLoadDeferredImagesKeepZoomLevelEnd() {
+		loadDeferredImagesEnd(true);
+	}
+
+	function onLoadDeferredImagesResetZoomLevel() {
+		const transform = document.documentElement.style.getPropertyValue("-sf-transform");
+		const transformPriority = document.documentElement.style.getPropertyPriority("-sf-transform");
+		const transformOrigin = document.documentElement.style.getPropertyValue("-sf-transform-origin");
+		const transformOriginPriority = document.documentElement.style.getPropertyPriority("-sf-transform-origin");
+		const minHeight = document.documentElement.style.getPropertyValue("-sf-min-height");
+		const minHeightPriority = document.documentElement.style.getPropertyPriority("-sf-min-height");
+		document.documentElement.style.setProperty("transform", transform, transformPriority);
+		document.documentElement.style.setProperty("transform-origin", transformOrigin, transformOriginPriority);
+		document.documentElement.style.setProperty("min-height", minHeight, minHeightPriority);
+		document.documentElement.style.removeProperty("-sf-transform");
+		document.documentElement.style.removeProperty("-sf-transform-origin");
+		document.documentElement.style.removeProperty("-sf-min-height");
+		resetScreenSize();
+	}
+
+	function onDispatchScrollStart() {
+		dispatchScrollEvent = true;
+	}
+
+	function onDispatchScrollEnd() {
+		dispatchScrollEvent = false;
+	}
+
+	function onBlockCookiesStart() {
+		try {
+			document.__defineGetter__("cookie", () => { throw new Error("document.cookie temporary blocked by SingleFile"); });
+			// eslint-disable-next-line no-unused-vars
+		} catch (error) {
+			// ignored
+		}
+	}
+
+	function onBlockCookiesEnd() {
+		delete document.cookie;
+	}
+
+	function onBlockStorageStart() {
+		if (!globalThis._singleFile_localStorage) {
+			globalThis._singleFile_localStorage = globalThis.localStorage;
+			globalThis.__defineGetter__("localStorage", () => { throw new Error("localStorage temporary blocked by SingleFile"); });
+		}
+		if (!globalThis._singleFile_indexedDB) {
+			globalThis._singleFile_indexedDB = globalThis.indexedDB;
+			globalThis.__defineGetter__("indexedDB", () => { throw new Error("indexedDB temporary blocked by SingleFile"); });
+		}
+	}
+
+	function onBlockStorageEnd() {
+		if (globalThis._singleFile_localStorage) {
+			delete globalThis.localStorage;
+			globalThis.localStorage = globalThis._singleFile_localStorage;
+			delete globalThis._singleFile_localStorage;
+		}
+		if (!globalThis._singleFile_indexedDB) {
+			delete globalThis.indexedDB;
+			globalThis.indexedDB = globalThis._singleFile_indexedDB;
+			delete globalThis._singleFile_indexedDB;
+		}
+	}
+
+	function onFetchSupportedRequest() {
+		document.dispatchEvent(new CustomEvent(FETCH_SUPPORTED_RESPONSE_EVENT));
+	}
+
+	async function onFetchRequest(event) {
+		const { url, options } = JSON.parse(event.detail);
+		let detail;
+		try {
+			const response = await fetch(url, options);
+			detail = { url, response: await response.arrayBuffer(), headers: [...response.headers], status: response.status };
+		} catch (error) {
+			detail = { url, error: error && (error.message || error.toString()) };
+		}
+		document.dispatchEvent(new CustomEvent(FETCH_RESPONSE_EVENT, { detail }));
+	}
+
+	function onBootstrap(event) {
+		try {
+			if (globalThis.bootstrap && event.detail.data) {
+				globalThis.bootstrap(event.detail.data);
 			}
-		});
+			// eslint-disable-next-line no-unused-vars
+		} catch (error) {
+			// ignored
+		}
 	}
 
 	function loadDeferredImagesStart(keepZoomLevel) {
@@ -521,18 +564,15 @@
 				}
 			});
 		}
-		return new Promise(resolve => {
-			if (detail.src instanceof ArrayBuffer) {
-				const reader = new FileReader();
-				reader.readAsDataURL(new Blob([detail.src]));
-				reader.addEventListener("load", () => {
-					detail.src = "url(" + reader.result + ")";
-					resolve(detail);
-				});
-			} else {
-				resolve(detail);
+		if (detail.src instanceof ArrayBuffer) {
+			const bytes = new Uint8Array(detail.src);
+			let content = "";
+			for (let offset = 0; offset < bytes.length; offset += 8192) {
+				content += String.fromCharCode(...bytes.subarray(offset, offset + 8192));
 			}
-		});
+			detail.src = "url(data:application/octet-stream;base64," + btoa(content) + ")";
+		}
+		return detail;
 	}
 
 	function dispatchResizeEvent() {
@@ -547,4 +587,4 @@
 		}
 	}
 
-})(typeof globalThis == "object" ? globalThis : globalThis.window);
+})();

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

@@ -65,26 +65,36 @@ new MutationObserver(init).observe(document, { childList: true });
 
 function init() {
 	if (document instanceof Document) {
-		document.addEventListener(NEW_FONT_FACE_EVENT, event => {
-			const detail = event.detail;
-			const key = Object.assign({}, detail);
-			delete key.src;
-			fontFaces.set(JSON.stringify(key), detail);
-		});
-		document.addEventListener(DELETE_FONT_EVENT, event => {
-			const detail = event.detail;
-			const key = Object.assign({}, detail);
-			delete key.src;
-			fontFaces.delete(JSON.stringify(key));
-		});
-		document.addEventListener(CLEAR_FONTS_EVENT, () => fontFaces = new Map());
-		document.addEventListener(NEW_WORKLET_EVENT, event => {
-			const detail = event.detail;
-			worklets.set(detail.moduleURL, detail);
-		});
+		document.addEventListener(NEW_FONT_FACE_EVENT, onNewFontFace);
+		document.addEventListener(DELETE_FONT_EVENT, onDeleteFont);
+		document.addEventListener(CLEAR_FONTS_EVENT, onClearFonts);
+		document.addEventListener(NEW_WORKLET_EVENT, onNewWorklet);
 	}
 }
 
+function onNewFontFace(event) {
+	const detail = event.detail;
+	const key = Object.assign({}, detail);
+	delete key.src;
+	fontFaces.set(JSON.stringify(key), detail);
+}
+
+function onDeleteFont(event) {
+	const detail = event.detail;
+	const key = Object.assign({}, detail);
+	delete key.src;
+	fontFaces.delete(JSON.stringify(key));
+}
+
+function onClearFonts() {
+	fontFaces.clear();
+}
+
+function onNewWorklet(event) {
+	const detail = event.detail;
+	worklets.set(detail.moduleURL, detail);
+}
+
 export {
 	getFontsData,
 	getWorkletsData,

package/single-file-infobar.js

@@ -21,11 +21,11 @@
  *   Source.
  */
 
-/* global window, document */
+/* global document */
 
 import { appendInfobar, refreshInfobarInfo, extractInfobarData } from "./core/infobar.js";
 
-(globalThis => {
+(() => {
 
 	const browser = globalThis.browser;
 	const MutationObserver = globalThis.MutationObserver;
@@ -36,7 +36,8 @@ import { appendInfobar, refreshInfobarInfo, extractInfobarData } from "./core/in
 		if (globalThis.window == globalThis.top) {
 			document.addEventListener("single-file-display-infobar", displayIcon, false);
 			if (document.documentElement.getAttribute("data-sfz") == "" && !mutationObserver) {
-				mutationObserver = new MutationObserver(init).observe(document, { childList: true });
+				mutationObserver = new MutationObserver(init);
+				mutationObserver.observe(document, { childList: true });
 			} else {
 				if (document.readyState == "loading") {
 					document.addEventListener("DOMContentLoaded", displayIcon, false);
@@ -77,4 +78,4 @@ import { appendInfobar, refreshInfobarInfo, extractInfobarData } from "./core/in
 		}
 	}
 
-})(typeof globalThis == "object" ? globalThis : window);
+})();