single-file-core 1.5.73 → 1.5.75

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) {
@@ -390,7 +390,7 @@ function getProcessorHelperClass(utilInstance) {
 										}
 									}
 									if (options.imageReductionFactor > 1) {
-										content = await resizeImage(content, options);
+										content = await resizeImage(doc, content, options);
 									}
 									if (removeElementIfMissing && this.testEmptyResource(content)) {
 										resourceElement.remove();

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) {
@@ -357,7 +357,7 @@ function getProcessorHelperClass(utilInstance) {
 										}
 									}
 									if (options.imageReductionFactor > 1) {
-										const dataURI = await resizeImage(await toDataURI(new Blob([content], { type: contentType }), charset), options);
+										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

@@ -23,7 +23,6 @@
  */
 
 import * as cssTree from "./../vendor/css-tree.js";
-
 const UNMATCHABLE_PSEUDO_CLASSES = [
     "active-view-transition",
     "active-view-transition-type",
@@ -47,13 +46,42 @@ const UNMATCHABLE_PSEUDO_CLASSES = [
     "stalled",
     "volume-locked",
     "after",
-    "before"
+    "before",
+    "visited",
+    "link",
+    "any-link",
+    "local-link",
+    "target",
+    "scope",
+    "hover",
+    "active",
+    "focus",
+    "focus-within",
+    "focus-visible",
+    "target-current",
+    "enabled",
+    "disabled",
+    "read-only",
+    "read-write",
+    "placeholder-shown",
+    "autofill",
+    "default",
+    "checked",
+    "indeterminate",
+    "blank",
+    "valid",
+    "invalid",
+    "in-range",
+    "out-of-range",
+    "required",
+    "optional",
+    "user-valid",
+    "user-invalid"
 ];
 
 export {
     sanitizeSelector,
 };
-
 /**
  * Sanitize a selector AST into a QSA-safe selector string.
  * Optional `ancestors` array may be provided to expand nesting selectors (`&`).
@@ -74,7 +102,6 @@ function sanitizeSelector(selector, ancestors, docContext) {
     docContext.normalizedSelectorText.set(selector, normalized);
     return normalized;
 }
-
 function normalizeSelectorNode(selector, ancestors) {
     let current = selector.children.head;
     while (current) {

package/modules/template-formatter.js

@@ -21,7 +21,7 @@
  *   Source.
  */
 
-/* global btoa, atob */
+/* global btoa, atob, TextEncoder, TextDecoder */
 
 import { parse } from "./template-parser.js";
 import { getContentSize, digest, getValidFilename } from "./../core/helper.js";

package/package.json

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