single-file-core 1.3.17 → 1.3.19

package/package.json

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

package/processors/compression/compression-display.js

@@ -27,10 +27,21 @@ export {
 	display
 };
 
-async function display(document, docContent, { disableFramePointerEvents } = {}) {
+async function display(document, docContent, { disableFramePointerEvents, insertEmbeddedImage }) {
 	docContent = docContent.replace(/<noscript/gi, "<template disabled-noscript");
 	docContent = docContent.replaceAll(/<\/noscript/gi, "</template");
 	const doc = (new DOMParser()).parseFromString(docContent, "text/html");
+	if (!insertEmbeddedImage) {
+		if (doc.doctype) {
+			if (document.doctype) {
+				document.replaceChild(doc.doctype, document.doctype);
+			} else {
+				document.insertBefore(doc.doctype, document.documentElement);
+			}
+		} else if (document.doctype) {
+			document.doctype.remove();
+		}
+	}
 	if (disableFramePointerEvents) {
 		doc.querySelectorAll("iframe").forEach(element => {
 			const pointerEvents = "pointer-events";
@@ -38,10 +49,14 @@ async function display(document, docContent, { disableFramePointerEvents } = {})
 			element.style.setProperty(pointerEvents, "none", "important");
 		});
 	}
-	document.open();
-	document.write(getDoctypeString(doc));
-	document.write(doc.documentElement.outerHTML);
-	document.close();
+	if (insertEmbeddedImage) {
+		document.open();
+		document.write(getDoctypeString(doc));
+		document.write(doc.documentElement.outerHTML);
+		document.close();
+	} else {
+		document.replaceChild(document.importNode(doc.documentElement, true), document.documentElement);
+	}
 	document.querySelectorAll("template[disabled-noscript]").forEach(element => {
 		const noscriptElement = document.createElement("noscript");
 		element.removeAttribute("disabled-noscript");

package/processors/compression/compression.js

@@ -91,6 +91,7 @@ async function process(pageData, options, lastModDate = new Date()) {
 	zipDataWriter.writable.size = 0;
 	let extraDataOffset, extraData, embeddedImageDataOffset, endTag;
 	if (options.embeddedImage) {
+		options.embeddedImage = Array.from(options.embeddedImage);
 		const embeddedImageData = options.embeddedImage.slice(PNG_SIGNATURE_LENGTH + PNG_IHDR_LENGTH, options.embeddedImage.length - PNG_IEND_LENGTH);
 		await writeData(zipDataWriter.writable, options.embeddedImage.slice(0, PNG_SIGNATURE_LENGTH + PNG_IHDR_LENGTH));
 		if (options.selfExtractingArchive) {
@@ -250,13 +251,16 @@ async function prependHTMLData(pageData, zipDataWriter, script, options) {
 		textBody = textBody.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n +/g, "\n").replace(/\n\n\n+/g, "\n\n").trim();
 		pageContent += "\n<main hidden>\n" + textBody + "\n</main>\n";
 	}
+	const displayOptions = {
+		insertEmbeddedImage: Boolean(options.embeddedImage),
+	};
 	script = "<script>" +
 		script +
 		"document.currentScript.remove();" +
 		"globalThis.addEventListener('load', () => {" +
 		"globalThis.bootstrap=(()=>{let bootstrapStarted;return async content=>{if (bootstrapStarted) return bootstrapStarted; bootstrapStarted = (" +
 		extract.toString().replace(/\n|\t/g, "") + ")(content,{prompt}).then(({docContent}) => " +
-		display.toString().replace(/\n|\t/g, "") + "(document,docContent));return bootstrapStarted;}})();(" +
+		display.toString().replace(/\n|\t/g, "") + "(document,docContent," + JSON.stringify(displayOptions) + "));return bootstrapStarted;}})();(" +
 		getContent.toString().replace(/\n|\t/g, "") + ")().then(globalThis.bootstrap).then(() => document.dispatchEvent(new CustomEvent(\"single-file-display-infobar\"))).catch(()=>{});" +
 		"});" +
 		"</script>";