single-file-core 1.3.1 → 1.3.3

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,
@@ -1343,7 +1344,7 @@ class Processor {
 				}
 				if (testValidURL(resourceURL)) {
 					element.removeAttribute("src");
-					await this.processorHelper.processScript(element, resourceURL, this.options, this.charset);
+					await this.processorHelper.processScript(element, resourceURL, this.options, this.charset, this.batchRequest, this.resources);
 					if (element.getAttribute("async") == "async" || element.getAttribute(util.ASYNC_SCRIPT_ATTRIBUTE_NAME) == "") {
 						element.setAttribute("async", "");
 					}

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

@@ -21,6 +21,8 @@
  *   Source.
  */
 
+/* global globalThis */
+
 import {
 	normalizeFontFamily,
 	getFontWeight
@@ -59,6 +61,8 @@ const FONT_STRETCHES = {
 	"extra-expanded": "150%",
 	"ultra-expanded": "200%"
 };
+const Blob = globalThis.Blob;
+const FileReader = globalThis.FileReader;
 
 let util, cssTree;
 
@@ -74,7 +78,8 @@ export {
 	replaceOriginalURLs,
 	testIgnoredPath,
 	testValidPath,
-	testValidURL
+	testValidURL,
+	toDataURI
 };
 
 function getProcessorHelperCommonClass(utilInstance, cssTreeInstance) {
@@ -575,12 +580,10 @@ function processFontDetails(fontsDetails, fontResources) {
 	}
 }
 
-function getUpdatedResourceContent(resourceURL, content, options) {
+function getUpdatedResourceContent(resourceURL, options) {
 	if (options.rootDocument && options.updatedResources[resourceURL]) {
 		options.updatedResources[resourceURL].retrieved = true;
 		return options.updatedResources[resourceURL].content;
-	} else {
-		return content.data || "";
 	}
 }
 
@@ -652,4 +655,13 @@ function getURL(urlFunction) {
 
 function getFontStretch(stretch) {
 	return FONT_STRETCHES[stretch] || stretch;
+}
+
+function toDataURI(content, contentType, charset) {
+	return new Promise((resolve, reject) => {
+		const reader = new FileReader();
+		reader.onload = () => resolve(reader.result);
+		reader.onerror = () => reject(new Error(reader.error));
+		reader.readAsDataURL(new Blob([content], { type: (contentType || "") + (charset ? ";charset=" + charset : "") }));
+	});
 }

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

@@ -59,7 +59,8 @@ import {
 	replaceOriginalURLs,
 	testIgnoredPath,
 	testValidPath,
-	testValidURL
+	testValidURL,
+	toDataURI
 } from "./processor-helper-common.js";
 
 export {
@@ -152,7 +153,7 @@ function getProcessorHelperClass(utilInstance) {
 							options.inline = true;
 							const content = await this.getStylesheetContent(resourceURL, options);
 							resourceURL = content.resourceURL;
-							content.data = getUpdatedResourceContent(resourceURL, content, options);
+							content.data = getUpdatedResourceContent(resourceURL, options) || content.data;
 							if (content.data && content.data.match(/^<!doctype /i)) {
 								content.data = "";
 							}
@@ -200,13 +201,11 @@ function getProcessorHelperClass(utilInstance) {
 					return this.resolveLinkStylesheetURLs(resourceURL, baseURI, options, workStylesheet);
 				}
 				resourceURL = content.resourceURL;
-				content.data = getUpdatedResourceContent(content.resourceURL, content, options);
+				content.data = getUpdatedResourceContent(content.resourceURL, options) || content.data;
 				if (content.data && content.data.match(/^<!doctype /i)) {
 					content.data = "";
 				}
-
 				content.data = content.data.replace(/:defined/gi, "*");
-
 				let stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 				const importFound = await this.resolveImportURLs(stylesheet, resourceURL, options, workStylesheet);
 				if (importFound) {
@@ -305,9 +304,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 +322,7 @@ function getProcessorHelperClass(utilInstance) {
 													asBinary: true,
 													inline: true,
 													expectedType,
+													contentType: declaredContentType,
 													maxResourceSize: options.maxResourceSize,
 													maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 													frameId: options.windowId,
@@ -449,23 +451,28 @@ function getProcessorHelperClass(utilInstance) {
 			return {};
 		}
 
-		async processScript(element, resourceURL, options, charset) {
-			const content = await util.getContent(resourceURL, {
-				asBinary: true,
-				inline: true,
-				charset: charset != UTF8_CHARSET && charset,
-				maxResourceSize: options.maxResourceSize,
-				maxResourceSizeEnabled: options.maxResourceSizeEnabled,
-				frameId: options.windowId,
-				resourceReferrer: options.resourceReferrer,
-				baseURI: options.baseURI,
-				blockMixedContent: options.blockMixedContent,
-				expectedType: "script",
-				acceptHeaders: options.acceptHeaders,
-				networkTimeout: options.networkTimeout
-			});
-			content.data = getUpdatedResourceContent(resourceURL, content, options);
-			element.setAttribute("src", content.data);
+		async processScript(element, resourceURL, options, charset, batchRequest) {
+			let content = getUpdatedResourceContent(resourceURL, options);
+			if (content) {
+				content = await toDataURI(content, "text/javascript", charset);
+			} else {
+				const result = await batchRequest.addURL(resourceURL, {
+					asBinary: true,
+					inline: true,
+					charset: charset != UTF8_CHARSET && charset,
+					maxResourceSize: options.maxResourceSize,
+					maxResourceSizeEnabled: options.maxResourceSizeEnabled,
+					frameId: options.windowId,
+					resourceReferrer: options.resourceReferrer,
+					baseURI: options.baseURI,
+					blockMixedContent: options.blockMixedContent,
+					expectedType: "script",
+					acceptHeaders: options.acceptHeaders,
+					networkTimeout: options.networkTimeout
+				});
+				content = result.content;
+			}
+			element.setAttribute("src", content);
 		}
 
 		setMetaCSP(metaElement) {

package/core/lib/processor-helper.js

@@ -154,7 +154,7 @@ function getProcessorHelperClass(utilInstance) {
 								if (existingStylesheet) {
 									stylesheets.set({ urlNode }, { url: resourceURL, stylesheet: existingStylesheet[1].stylesheet, scoped });
 								} else {
-									content.data = getUpdatedResourceContent(resourceURL, content, options);
+									content.data = getUpdatedResourceContent(resourceURL, options) || content.data;
 									stylesheetInfo.stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 									await this.resolveImportURLs(stylesheetInfo, resourceURL, options, workStylesheet, resources, stylesheets);
 									stylesheets.set({ urlNode }, stylesheetInfo);
@@ -202,7 +202,7 @@ function getProcessorHelperClass(utilInstance) {
 							mediaText: stylesheetInfo.mediaText
 						});
 					} else {
-						content.data = getUpdatedResourceContent(content.resourceURL, content, options);
+						content.data = getUpdatedResourceContent(content.resourceURL, options) || content.data;
 						stylesheetInfo.stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 						await this.resolveImportURLs(stylesheetInfo, resourceURL, options, workStylesheet, resources, stylesheets);
 						stylesheets.set({ element }, stylesheetInfo);
@@ -280,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 {
@@ -294,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,
@@ -376,8 +378,8 @@ function getProcessorHelperClass(utilInstance) {
 			};
 		}
 
-		async processScript(element, resourceURL, options, charset) {
-			const content = await util.getContent(resourceURL, {
+		async processScript(element, resourceURL, options, charset, batchRequest, resources) {
+			let { content, indexResource, extension, contentType } = await batchRequest.addURL(resourceURL, {
 				asBinary: true,
 				charset: charset != UTF8_CHARSET && charset,
 				maxResourceSize: options.maxResourceSize,
@@ -390,8 +392,10 @@ function getProcessorHelperClass(utilInstance) {
 				acceptHeaders: options.acceptHeaders,
 				networkTimeout: options.networkTimeout
 			});
-			content.data = getUpdatedResourceContent(resourceURL, content, options);
-			element.setAttribute("src", content.data);
+			content = getUpdatedResourceContent(resourceURL, options) || content;
+			const name = "scripts/" + indexResource + extension;
+			element.setAttribute("src", name);
+			resources.scripts.set(indexResource, { name, content, extension, contentType, url: resourceURL });
 		}
 
 		setMetaCSP(metaElement) {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "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/;