single-file-core 1.5.74 → 1.5.76

package/core/helper.js

@@ -463,7 +463,7 @@ function getResourcesInfo(win, doc, element, options, data, elementHidden, compu
 	if (tagName == "CANVAS") {
 		try {
 			data.canvases.push({
-				dataURI: element.toDataURL("image/png", ""),
+				dataURI: element.toDataURL("image/png"),
 				backgroundColor: computedStyle.getPropertyValue("background-color")
 			});
 			element.setAttribute(CANVAS_ATTRIBUTE_NAME, data.canvases.length - 1);
@@ -523,7 +523,7 @@ function getResourcesInfo(win, doc, element, options, data, elementHidden, compu
 			canvasElement.height = element.videoHeight;
 			try {
 				context.drawImage(element, 0, 0, canvasElement.width, canvasElement.height);
-				data.posters.push(canvasElement.toDataURL("image/png", ""));
+				data.posters.push(canvasElement.toDataURL("image/png"));
 				element.setAttribute(POSTER_ATTRIBUTE_NAME, data.posters.length - 1);
 				data.markedElements.push(element);
 				// eslint-disable-next-line no-unused-vars

package/core/index.js

@@ -1190,15 +1190,17 @@ class Processor {
 								canvasElement.height = videoData.size.videoHeight;
 								context.drawImage(temporaryVideoElement, 0, 0, canvasElement.width, canvasElement.height);
 								try {
-									videoElement.poster = canvasElement.toDataURL("image/png", "");
+									videoElement.poster = canvasElement.toDataURL("image/png");
 									// eslint-disable-next-line no-unused-vars
 								} catch (error) {
+									videoElement.poster = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='" + videoData.size.videoWidth + "' height='" + videoData.size.videoHeight + "'%3E%3C/svg%3E";
 									// ignored
 								}
 								temporaryVideoElement.remove();
 								resolve();
 							};
 							temporaryVideoElement.onerror = () => {
+								videoElement.poster = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='" + videoData.size.videoWidth + "' height='" + videoData.size.videoHeight + "'%3E%3C/svg%3E";
 								temporaryVideoElement.remove();
 								resolve();
 							};

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

@@ -105,19 +105,19 @@ class ProcessorHelperCommon {
 			doc.querySelectorAll("svg").forEach(element => element.remove());
 		}
 		let resourcePromises = processAttributeArgs.map(([selector, attributeName, removeElementIfMissing, processDuplicates]) =>
-			this.processAttribute(doc.querySelectorAll(selector), attributeName, baseURI, options, "image", resources, removeElementIfMissing, batchRequest, styles, processDuplicates)
+			this.processAttribute(doc, doc.querySelectorAll(selector), attributeName, baseURI, options, "image", resources, removeElementIfMissing, batchRequest, styles, processDuplicates)
 		);
 		resourcePromises = resourcePromises.concat([
 			this.processXLinks(doc.querySelectorAll("use"), doc, baseURI, options, batchRequest, "xlink:href"),
 			this.processXLinks(doc.querySelectorAll("use"), doc, baseURI, options, batchRequest, "href"),
 			this.processSrcset(doc.querySelectorAll("img[srcset], source[srcset]"), baseURI, options, resources, batchRequest)
 		]);
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("object[data*=\".pdf\"]"), "data", baseURI, options, null, resources, false, batchRequest, styles));
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("embed[src*=\".pdf\"]"), "src", baseURI, options, null, resources, false, batchRequest, styles));
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("audio[src], audio > source[src]"), "src", baseURI, options, "audio", resources, false, batchRequest, styles));
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("video[src], video > source[src]"), "src", baseURI, options, "video", resources, false, batchRequest, styles));
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("audio track[src], video track[src]"), "src", baseURI, options, null, resources, false, batchRequest, styles));
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("model[src]"), "src", baseURI, options, null, resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("object[data*=\".pdf\"]"), "data", baseURI, options, null, resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("embed[src*=\".pdf\"]"), "src", baseURI, options, null, resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("audio[src], audio > source[src]"), "src", baseURI, options, "audio", resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("video[src], video > source[src]"), "src", baseURI, options, "video", resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("audio track[src], video track[src]"), "src", baseURI, options, null, resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("model[src]"), "src", baseURI, options, null, resources, false, batchRequest, styles));
 		await Promise.all(resourcePromises);
 		if (options.saveFavicon) {
 			this.processShortcutIcons(doc);
@@ -662,7 +662,7 @@ function getFontStretch(stretch) {
 	return FONT_STRETCHES[stretch] || stretch;
 }
 
-async function resizeImage(dataURI, { imageReductionFactor }) {
+async function resizeImage(doc, dataURI, { imageReductionFactor }) {
 	if (dataURI) {
 		const contentType = dataURI.substring(5, dataURI.indexOf(";"));
 		if (contentType == "image/jpeg" ||
@@ -677,10 +677,26 @@ async function resizeImage(dataURI, { imageReductionFactor }) {
 				});
 				const width = image.naturalWidth / imageReductionFactor;
 				const height = image.naturalHeight / imageReductionFactor;
-				const canvas = new OffscreenCanvas(width, height);
-				const context = canvas.getContext("2d");
-				context.drawImage(image, 0, 0, width, height);
-				const blob = await canvas.convertToBlob({ type: contentType });
+				let blob;
+				try {
+					const canvas = new OffscreenCanvas(width, height);
+					const context = canvas.getContext("2d");
+					context.drawImage(image, 0, 0, width, height);
+					blob = await canvas.convertToBlob({ type: contentType });
+				} catch {
+					const canvas = doc.createElement("canvas");
+					canvas.width = width;
+					canvas.height = height;
+					const context = canvas.getContext("2d");
+					context.drawImage(image, 0, 0, width, height);
+					blob = await new Promise(resolve => canvas.toBlob(blob => {
+						if (blob) {
+							resolve(blob);
+						} else {
+							throw new Error("Canvas toBlob failed");
+						}
+					}, contentType));
+				}
 				if (blob.type == contentType) {
 					dataURI = await toDataURI(blob, contentType);
 				}

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

@@ -335,7 +335,7 @@ function getProcessorHelperClass(utilInstance) {
 			}));
 		}
 
-		async processAttribute(resourceElements, attributeName, baseURI, options, expectedType, resources, removeElementIfMissing, batchRequest, styles, processDuplicates) {
+		async processAttribute(doc, resourceElements, attributeName, baseURI, options, expectedType, resources, removeElementIfMissing, batchRequest, styles, processDuplicates) {
 			await Promise.all(Array.from(resourceElements).map(async resourceElement => {
 				let resourceURL = resourceElement.getAttribute(attributeName);
 				if (resourceURL != null) {
@@ -389,9 +389,6 @@ function getProcessorHelperClass(utilInstance) {
 											}
 										}
 									}
-									if (options.imageReductionFactor > 1) {
-										content = await resizeImage(content, options);
-									}
 									if (removeElementIfMissing && this.testEmptyResource(content)) {
 										resourceElement.remove();
 									} else if (!this.testEmptyResource(content)) {
@@ -415,6 +412,9 @@ function getProcessorHelperClass(utilInstance) {
 												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 (options.imageReductionFactor > 1 && expectedType == "image") {
+														content = await resizeImage(doc, content, options);
+													}
 													if (this.replaceImageSource(resourceElement, SINGLE_FILE_VARIABLE_NAME_PREFIX + indexResource, options)) {
 														resources.cssVariables.set(indexResource, { content, url: originURL });
 														const declarationList = cssTree.parse(resourceElement.getAttribute("style"), { context: "declarationList", parseCustomProperty: true });

package/core/lib/processor-helper.js

@@ -305,7 +305,7 @@ function getProcessorHelperClass(utilInstance) {
 			}));
 		}
 
-		async processAttribute(resourceElements, attributeName, baseURI, options, expectedType, resources, removeElementIfMissing, batchRequest) {
+		async processAttribute(doc, resourceElements, attributeName, baseURI, options, expectedType, resources, removeElementIfMissing, batchRequest) {
 			await Promise.all(Array.from(resourceElements).map(async resourceElement => {
 				let resourceURL = resourceElement.getAttribute(attributeName);
 				if (resourceURL != null) {
@@ -356,8 +356,8 @@ function getProcessorHelperClass(utilInstance) {
 											}
 										}
 									}
-									if (options.imageReductionFactor > 1) {
-										const dataURI = await resizeImage(await toDataURI(new Blob([content], { type: contentType }), charset), options);
+									if (options.imageReductionFactor > 1 && expectedType == "image") {
+										const dataURI = await resizeImage(doc, await toDataURI(new Blob([content], { type: contentType }), charset), options);
 										content = (await util.getContent(dataURI, { asBinary: true })).data;
 									}
 									if (removeElementIfMissing && this.testEmptyResource(content)) {

package/modules/css-selector-sanitizer.js

@@ -60,7 +60,6 @@ const UNMATCHABLE_PSEUDO_CLASSES = [
     "focus-visible",
     "target-current",
     "enabled",
-    "disabled",
     "read-only",
     "read-write",
     "placeholder-shown",

package/package.json

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