single-file-core 1.0.54 → 1.0.56

package/common/content-infobar-web.js

@@ -136,6 +136,11 @@
 			displayIcon();
 		}
 	}
+	if (globalThis.singlefile) {
+		globalThis.singlefile.infobar = { 
+			displayIcon
+		};
+	}
 
 	async function displayIcon() {
 		const result = document.evaluate("//comment()", document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);

package/package.json

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

package/single-file-core.js

@@ -28,6 +28,9 @@ const DEBUG = false;
 const Set = globalThis.Set;
 const Map = globalThis.Map;
 const JSON = globalThis.JSON;
+const setTimeout = globalThis.setTimeout;
+const clearTimeout = globalThis.clearTimeout;
+const Image = globalThis.Image;
 
 let util, cssTree;
 
@@ -1218,9 +1221,9 @@ class Processor {
 	async processPageResources() {
 		const processAttributeArgs = [
 			["link[href][rel*=\"icon\"]", "href", false, true],
-			["object[type=\"image/svg+xml\"], object[type=\"image/svg-xml\"], object[data*=\".svg\"], object[data*=\".pdf\"]", "data"],
+			["object[type=\"image/svg+xml\"], object[type=\"image/svg-xml\"], object[data*=\".svg\"]", "data"],
 			["img[src], input[src][type=image]", "src", true],
-			["embed[src*=\".svg\"], embed[src*=\".pdf\"]", "src"],
+			["embed[src*=\".svg\"]", "src"],
 			["video[poster]", "poster"],
 			["*[background]", "background"],
 			["image", "xlink:href"],
@@ -1230,11 +1233,13 @@ class Processor {
 			this.doc.querySelectorAll("svg").forEach(element => element.remove());
 		}
 		let resourcePromises = processAttributeArgs.map(([selector, attributeName, processDuplicates, removeElementIfMissing]) =>
-			ProcessorHelper.processAttribute(this.doc, this.doc.querySelectorAll(selector), attributeName, this.baseURI, this.options, "image", this.cssVariables, this.styles, this.batchRequest, processDuplicates, removeElementIfMissing)
+			ProcessorHelper.processAttribute(this.doc.querySelectorAll(selector), attributeName, this.baseURI, this.options, "image", this.cssVariables, this.styles, this.batchRequest, processDuplicates, removeElementIfMissing)
 		);
+		resourcePromises.push(ProcessorHelper.processAttribute(this.doc.querySelectorAll("object[data*=\".pdf\"]"), "data", this.baseURI, this.options, null, this.cssVariables, this.styles, this.batchRequest));
+		resourcePromises.push(ProcessorHelper.processAttribute(this.doc.querySelectorAll("embed[src*=\".pdf\"]"), "src", this.baseURI, this.options, null, this.cssVariables, this.styles, this.batchRequest));
 		resourcePromises = resourcePromises.concat([ProcessorHelper.processXLinks(this.doc.querySelectorAll("use"), this.doc, this.baseURI, this.options, this.batchRequest), ProcessorHelper.processSrcset(this.doc.querySelectorAll("img[srcset], source[srcset]"), this.baseURI, this.options, this.batchRequest)]);
-		resourcePromises.push(ProcessorHelper.processAttribute(this.doc, this.doc.querySelectorAll("audio[src], audio > source[src]"), "src", this.baseURI, this.options, "audio", this.cssVariables, this.styles, this.batchRequest));
-		resourcePromises.push(ProcessorHelper.processAttribute(this.doc, this.doc.querySelectorAll("video[src], video > source[src]"), "src", this.baseURI, this.options, "video", this.cssVariables, this.styles, this.batchRequest));
+		resourcePromises.push(ProcessorHelper.processAttribute(this.doc.querySelectorAll("audio[src], audio > source[src]"), "src", this.baseURI, this.options, "audio", this.cssVariables, this.styles, this.batchRequest));
+		resourcePromises.push(ProcessorHelper.processAttribute(this.doc.querySelectorAll("video[src], video > source[src]"), "src", this.baseURI, this.options, "video", this.cssVariables, this.styles, this.batchRequest));
 		await Promise.all(resourcePromises);
 		if (this.options.saveFavicon) {
 			ProcessorHelper.processShortcutIcons(this.doc);
@@ -1747,7 +1752,7 @@ class ProcessorHelper {
 		}));
 	}
 
-	static async processAttribute(doc, resourceElements, attributeName, baseURI, options, expectedType, cssVariables, styles, batchRequest, processDuplicates, removeElementIfMissing) {
+	static async processAttribute(resourceElements, attributeName, baseURI, options, expectedType, cssVariables, styles, batchRequest, processDuplicates, removeElementIfMissing) {
 		await Promise.all(Array.from(resourceElements).map(async resourceElement => {
 			let resourceURL = resourceElement.getAttribute(attributeName);
 			if (resourceURL != null) {
@@ -1800,30 +1805,38 @@ class ProcessorHelper {
 									resourceElement.remove();
 								} else if (content !== util.EMPTY_RESOURCE) {
 									let forbiddenPrefixFound = PREFIXES_FORBIDDEN_DATA_URI.filter(prefixDataURI => content.startsWith(prefixDataURI)).length;
-									if (forbiddenPrefixFound) {
-										forbiddenPrefixFound = await new Promise((resolve) => {
-											// eslint-disable-next-line no-undef
-											globalThis,setTimeout(() => resolve(), 2000);
-											const element = doc.createElement(resourceElement.tagName);
-											element.setAttribute(attributeName, content);
-											element.onload = () => resolve();
-											element.onerror = () => resolve(true);
-										});
-									}
-									if (!forbiddenPrefixFound) {
-										const isSVG = content.startsWith(PREFIX_DATA_URI_IMAGE_SVG);
-										const maxSizeDuplicateImages = options.maxSizeDuplicateImages || SINGLE_FILE_VARIABLE_MAX_SIZE;
-										if (expectedType == "image" && processDuplicates && duplicate && !isSVG && util.getContentSize(content) < maxSizeDuplicateImages) {
-											if (ProcessorHelper.replaceImageSource(resourceElement, SINGLE_FILE_VARIABLE_NAME_PREFIX + indexResource, options)) {
-												cssVariables.set(indexResource, { content, url: originURL });
-												const declarationList = cssTree.parse(resourceElement.getAttribute("style"), { context: "declarationList", parseCustomProperty: true });
-												styles.set(resourceElement, declarationList);
+									if (expectedType == "image") {
+										if (forbiddenPrefixFound && Image) {
+											forbiddenPrefixFound = await new Promise((resolve) => {
+												const image = new Image();
+												const timeoutId = setTimeout(() => resolve(true), 100);
+												image.src = content;
+												image.onload = () => cleanupAndResolve();
+												image.onerror = () => cleanupAndResolve(true);
+	
+												function cleanupAndResolve(value) {
+													clearTimeout(timeoutId);
+													resolve(value);
+												}
+											});
+										}
+										if (!forbiddenPrefixFound) {
+											const isSVG = content.startsWith(PREFIX_DATA_URI_IMAGE_SVG);
+											const maxSizeDuplicateImages = options.maxSizeDuplicateImages || SINGLE_FILE_VARIABLE_MAX_SIZE;
+											if (processDuplicates && duplicate && !isSVG && util.getContentSize(content) < maxSizeDuplicateImages) {
+												if (ProcessorHelper.replaceImageSource(resourceElement, SINGLE_FILE_VARIABLE_NAME_PREFIX + indexResource, options)) {
+													cssVariables.set(indexResource, { content, url: originURL });
+													const declarationList = cssTree.parse(resourceElement.getAttribute("style"), { context: "declarationList", parseCustomProperty: true });
+													styles.set(resourceElement, declarationList);
+												} else {
+													resourceElement.setAttribute(attributeName, content);
+												}
 											} else {
 												resourceElement.setAttribute(attributeName, content);
 											}
-										} else {
-											resourceElement.setAttribute(attributeName, content);
 										}
+									} else {
+										resourceElement.setAttribute(attributeName, content);
 									}
 								}
 							}