single-file-core 1.3.0 → 1.3.2

package/core/index.js

@@ -336,9 +336,9 @@ class BatchRequest {
 		this.duplicates = new Map();
 	}
 
-	addURL(resourceURL, { asBinary, expectedType, groupDuplicates, baseURI, blockMixedContent } = {}) {
+	addURL(resourceURL, { asBinary, expectedType, groupDuplicates, baseURI, blockMixedContent, contentType } = {}) {
 		return new Promise((resolve, reject) => {
-			const requestKey = JSON.stringify([resourceURL, asBinary, expectedType, baseURI, blockMixedContent]);
+			const requestKey = JSON.stringify([resourceURL, asBinary, expectedType, baseURI, blockMixedContent, contentType]);
 			let resourceRequests = this.requests.get(requestKey);
 			if (!resourceRequests) {
 				resourceRequests = [];
@@ -365,7 +365,7 @@ class BatchRequest {
 		const resourceURLs = [...this.requests.keys()];
 		let indexResource = 0;
 		return Promise.all(resourceURLs.map(async requestKey => {
-			const [resourceURL, asBinary, expectedType, baseURI, blockMixedContent] = JSON.parse(requestKey);
+			const [resourceURL, asBinary, expectedType, baseURI, blockMixedContent, contentType] = JSON.parse(requestKey);
 			const resourceRequests = this.requests.get(requestKey);
 			try {
 				const currentIndexResource = indexResource;
@@ -374,6 +374,7 @@ class BatchRequest {
 					asBinary,
 					inline: !options.compressContent,
 					expectedType,
+					contentType,
 					maxResourceSize: options.maxResourceSize,
 					maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 					frameId: options.windowId,

package/core/infobar.js

@@ -154,7 +154,8 @@ function appendInfobar(doc, options, useShadowRoot) {
 			infoData = options.saveDate;
 		}
 		infoData = infoData || "No info";
-		const infobarElement = createElement(doc, INFOBAR_TAGNAME, doc.body);
+		const parentElement = doc.body.tagName == "BODY" ? doc.body : doc.documentElement;
+		const infobarElement = createElement(doc, INFOBAR_TAGNAME, parentElement);
 		let infobarContainer;
 		if (useShadowRoot) {
 			infobarContainer = infobarElement.attachShadow({ mode: "open" });
@@ -210,7 +211,6 @@ function appendInfobar(doc, options, useShadowRoot) {
 			shadowRootContent.appendChild(scriptElement);
 			infobarContainer.innerHTML = shadowRootContent.outerHTML;
 		}
-		doc.body.appendChild(infobarElement);
 	}
 }
 

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

@@ -305,9 +305,11 @@ function getProcessorHelperClass(utilInstance) {
 									// ignored
 								}
 								if (testValidURL(resourceURL)) {
+									const declaredContentType = ["OBJECT", "EMBED"].includes(resourceElement.tagName.toUpperCase()) ? resourceElement.getAttribute("type") : "";
+									const groupDuplicates = options.groupDuplicateImages && resourceElement.tagName.toUpperCase() == "IMG" && attributeName == "src";
 									let { content, indexResource, duplicate } = await batchRequest.addURL(
 										resourceURL,
-										{ asBinary: true, expectedType, groupDuplicates: options.groupDuplicateImages && resourceElement.tagName.toUpperCase() == "IMG" && attributeName == "src" });
+										{ asBinary: true, expectedType, contentType: declaredContentType, groupDuplicates });
 									if (originURL) {
 										if (this.testEmptyResource(content)) {
 											try {
@@ -321,6 +323,7 @@ function getProcessorHelperClass(utilInstance) {
 													asBinary: true,
 													inline: true,
 													expectedType,
+													contentType: declaredContentType,
 													maxResourceSize: options.maxResourceSize,
 													maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 													frameId: options.windowId,

package/core/lib/processor-helper.js

@@ -77,9 +77,9 @@ function getProcessorHelperClass(utilInstance) {
 				if (element.tagName.toUpperCase() == "LINK") {
 					await this.resolveLinkStylesheetURLs(stylesheetInfo, element, element.href, baseURI, options, workStyleElement, resources, stylesheets);
 				} else {
-					stylesheets.set({ element }, stylesheetInfo);
 					stylesheetInfo.stylesheet = cssTree.parse(element.textContent, { context: "stylesheet", parseCustomProperty: true });
 					await this.resolveImportURLs(stylesheetInfo, baseURI, options, workStyleElement, resources, stylesheets);
+					stylesheets.set({ element }, stylesheetInfo);
 				}
 			} else {
 				if (element.tagName.toUpperCase() == "LINK") {
@@ -92,7 +92,6 @@ function getProcessorHelperClass(utilInstance) {
 
 		replaceStylesheets(doc, stylesheets, options, resources) {
 			const entries = Array.from(stylesheets);
-			entries.reverse();
 			for (const [key, stylesheetInfo] of entries) {
 				if (key.urlNode) {
 					const name = "stylesheet_" + resources.stylesheets.size + ".css";
@@ -149,7 +148,6 @@ function getProcessorHelperClass(utilInstance) {
 									scoped,
 									mediaText
 								};
-								stylesheets.set({ urlNode }, stylesheetInfo);
 								const content = await this.getStylesheetContent(resourceURL, options);
 								stylesheetInfo.url = resourceURL = content.resourceURL;
 								const existingStylesheet = Array.from(stylesheets).find(([, stylesheetInfo]) => stylesheetInfo.resourceURL == resourceURL);
@@ -159,6 +157,7 @@ function getProcessorHelperClass(utilInstance) {
 									content.data = getUpdatedResourceContent(resourceURL, content, options);
 									stylesheetInfo.stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 									await this.resolveImportURLs(stylesheetInfo, resourceURL, options, workStylesheet, resources, stylesheets);
+									stylesheets.set({ urlNode }, stylesheetInfo);
 								}
 							}
 						}
@@ -178,7 +177,6 @@ function getProcessorHelperClass(utilInstance) {
 						mediaText: stylesheetInfo.mediaText
 					});
 				} else {
-					stylesheets.set({ element }, stylesheetInfo);
 					const content = await util.getContent(resourceURL, {
 						maxResourceSize: options.maxResourceSize,
 						maxResourceSizeEnabled: options.maxResourceSizeEnabled,
@@ -207,6 +205,7 @@ function getProcessorHelperClass(utilInstance) {
 						content.data = getUpdatedResourceContent(content.resourceURL, content, options);
 						stylesheetInfo.stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 						await this.resolveImportURLs(stylesheetInfo, resourceURL, options, workStylesheet, resources, stylesheets);
+						stylesheets.set({ element }, stylesheetInfo);
 					}
 				}
 			}
@@ -281,8 +280,9 @@ function getProcessorHelperClass(utilInstance) {
 									// ignored
 								}
 								if (testValidURL(resourceURL)) {
+									const declaredContentType = ["OBJECT", "EMBED"].includes(resourceElement.tagName.toUpperCase()) ? resourceElement.getAttribute("type") : "";
 									let { content, indexResource, extension, contentType } = await batchRequest.addURL(resourceURL,
-										{ asBinary: true, expectedType });
+										{ asBinary: true, expectedType, contentType: declaredContentType });
 									if (originURL) {
 										if (this.testEmptyResource(content)) {
 											try {
@@ -295,6 +295,7 @@ function getProcessorHelperClass(utilInstance) {
 												content = (await util.getContent(resourceURL, {
 													asBinary: true,
 													expectedType,
+													contentType: declaredContentType,
 													maxResourceSize: options.maxResourceSize,
 													maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 													frameId: options.windowId,

package/core/util.js

@@ -286,7 +286,10 @@ function getInstance(utilOptions) {
 			// ignored
 		}
 		if (!contentType || (contentType == CONTENT_TYPE_OCTET_STREAM && options.asBinary)) {
-			contentType = guessMIMEType(options.expectedType, buffer, options.asBinary);
+			contentType = guessMIMEType(options.expectedType, buffer);
+			if (!contentType) {
+				contentType = options.contentType ? options.contentType : options.asBinary ? CONTENT_TYPE_OCTET_STREAM : "";
+			}
 		}
 		if (!charset && options.charset) {
 			charset = options.charset;
@@ -366,7 +369,7 @@ async function getFetchResponse(resourceURL, options, data, charset, contentType
 	return { data, resourceURL, charset, contentType };
 }
 
-function guessMIMEType(expectedType, buffer, asBinary) {
+function guessMIMEType(expectedType, buffer) {
 	if (expectedType == "image") {
 		if (compareBytes([255, 255, 255, 255], [0, 0, 1, 0])) {
 			return "image/x-icon";
@@ -463,7 +466,6 @@ function guessMIMEType(expectedType, buffer, asBinary) {
 			return "audio/3gpp";
 		}
 	}
-	return asBinary ? CONTENT_TYPE_OCTET_STREAM : "";
 
 	function compareBytes(mask, pattern) {
 		let patternMatch = true, index = 0;

package/modules/template-formatter.js

@@ -16900,8 +16900,9 @@ async function evalTemplate(template = "", options, content, doc, dontReplaceSla
 	const dontReplaceSlashIfUndefined = dontReplaceSlash === undefined ? true : dontReplaceSlash;
 	const urlSuffix = PUBLIC_SUFFIX_LIST.find(urlTopLevelDomainName => url.hostname.endsWith("." + urlTopLevelDomainName) && urlTopLevelDomainName);
 	const urlDomainName = urlSuffix ? url.hostname.substring(0, url.hostname.length - urlSuffix.length - 1) : url.hostname;
-	let urlSubDomains = urlDomainName.substring(0, urlDomainName.lastIndexOf("."));
-	const urlDomain = urlDomainName.substring(urlSubDomains.length + 1);
+	const indexLastDotCharacter = urlDomainName.lastIndexOf(".");
+	let urlSubDomains = urlDomainName.substring(0, indexLastDotCharacter == -1 ? 0 : indexLastDotCharacter);
+	const urlDomain = urlDomainName.substring(urlSubDomains.length ? urlSubDomains.length + 1 : 0);
 	const urlRoot = urlDomain + "." + urlSuffix;
 	if (urlSubDomains.startsWith("www.")) {
 		urlSubDomains = urlSubDomains.substring(4);

package/package.json

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

package/processors/compression/compression-extract.js

@@ -62,7 +62,8 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 		"ttf": "font/ttf",
 		"woff": "font/woff",
 		"woff2": "font/woff2",
-		"eot": "application/vnd.ms-fontobject"
+		"eot": "application/vnd.ms-fontobject",
+		"pdf": "application/pdf"
 	};
 	const REGEXP_MATCH_STYLESHEET = /stylesheet_[0-9]+\.css/;
 	const REGEXP_MATCH_SCRIPT = /scripts\/[0-9]+\.js/;