single-file-core 1.2.4 → 1.2.6

package/core/helper.js

@@ -453,11 +453,6 @@ function postProcessDoc(doc, markedElements, invalidElements) {
 	doc.querySelectorAll("[" + DISABLED_NOSCRIPT_ATTRIBUTE_NAME + "]").forEach(element => {
 		element.textContent = element.getAttribute(DISABLED_NOSCRIPT_ATTRIBUTE_NAME);
 		element.removeAttribute(DISABLED_NOSCRIPT_ATTRIBUTE_NAME);
-		if (doc.body.firstChild) {
-			doc.body.insertBefore(element, doc.body.firstChild);
-		} else {
-			doc.body.appendChild(element);
-		}
 	});
 	doc.querySelectorAll("meta[disabled-http-equiv]").forEach(element => {
 		element.setAttribute("http-equiv", element.getAttribute("disabled-http-equiv"));

package/modules/template-formatter.js

@@ -1973,6 +1973,7 @@ async function evalTemplate(template = "", options, util, content, dontReplaceSl
 	template = await evalTemplateVariable(template, "bookmark-pathname", () => bookmarkFolder, dontReplaceSlash === undefined ? true : dontReplaceSlash, options.filenameReplacementCharacter);
 	template = await evalTemplateVariable(template, "bookmark-pathname-flat", () => bookmarkFolder, false, options.filenameReplacementCharacter);
 	template = await evalTemplateVariable(template, "profile-name", () => options.profileName, dontReplaceSlash, options.filenameReplacementCharacter);
+	template = await evalTemplateVariable(template, "filename-extension", () => getFilenameExtension(options), dontReplaceSlash, options.filenameReplacementCharacter);
 	return template.trim();
 
 	function decode(value) {
@@ -2102,3 +2103,19 @@ function truncateText(content, maxSize) {
 		reader.addEventListener("error", reject, false);
 	});
 }
+
+function getFilenameExtension(options) {
+	if (options.compressContent) {
+		if (options.selfExtractingArchive) {
+			if (options.extractDataFromPage) {
+				return "u.zip.html";
+			} else {
+				return "zip.html";
+			}
+		} else {
+			return "zip";
+		}
+	} else {
+		return "html";
+	}
+}

package/package.json

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

package/processors/compression/compression-display.js

@@ -51,6 +51,10 @@ async function display(document, docContent, { disableFramePointerEvents } = {})
 		});
 	}
 	document.replaceChild(document.importNode(doc.documentElement, true), document.documentElement);
+	document.querySelectorAll("[" + DISABLED_NOSCRIPT_ATTRIBUTE_NAME + "]").forEach(element => {
+		element.textContent = element.getAttribute(DISABLED_NOSCRIPT_ATTRIBUTE_NAME);
+		element.removeAttribute(DISABLED_NOSCRIPT_ATTRIBUTE_NAME);
+	});
 	document.documentElement.setAttribute("data-sfz", "");
 	document.querySelectorAll("link[rel*=icon]").forEach(element => element.parentElement.replaceChild(element, element));
 	document.open = document.write = document.close = () => { };

package/processors/compression/compression.js

@@ -21,7 +21,7 @@
  *   Source.
  */
 
-/* global globalThis, FileReader, TextDecoder */
+/* global globalThis, FileReader, TextDecoder, Node */
 
 import {
 	configure,
@@ -48,7 +48,7 @@ export {
 	process
 };
 
-async function process(pageData, options) {
+async function process(pageData, options, lastModDate = new Date()) {
 	let script;
 	if (options.zipScript) {
 		script = options.zipScript;
@@ -58,6 +58,7 @@ async function process(pageData, options) {
 	}
 	const zipDataWriter = new Uint8ArrayWriter();
 	zipDataWriter.init();
+	let extraDataOffset, extraData;
 	if (options.selfExtractingArchive) {
 		let pageContent = "";
 		if (options.includeBOM && !options.extractDataFromPage) {
@@ -101,14 +102,29 @@ async function process(pageData, 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";
 		}
-		if (options.extractDataFromPageTags) {
-			pageContent += options.extractDataFromPageTags[0];
-		} else {
-			pageContent += "<xmp>";
+		script = "<script>" +
+			script +
+			"document.currentScript.remove();" +
+			"globalThis.onload = () => {" +
+			"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;}})();(" +
+			getContent.toString().replace(/\n|\t/g, "") + ")().then(globalThis.bootstrap).catch(()=>{});" +
+			"};" +
+			"</script>";
+		pageContent += script;
+		let extraData = "";
+		if (options.extractDataFromPage && options.extraDataSize) {
+			const extraTags = "<sfz-extra-data></sfz-extra-data>";
+			extraData += extraTags + new Array(options.extraDataSize - extraTags.length).fill(" ").join("");
 		}
+		pageContent += extraData;
+		const startTag = options.extractDataFromPageTags ? options.extractDataFromPageTags[0] : "<!--";
+		pageContent += startTag;
+		extraDataOffset = startTag.length + extraData.length;
 		await writeData(zipDataWriter.writable, (new TextEncoder()).encode(pageContent));
 	}
-	const zipWriter = new ZipWriter(zipDataWriter, { bufferedWrite: true, keepOrder: false });
+	const zipWriter = new ZipWriter(zipDataWriter, { bufferedWrite: true, keepOrder: false, lastModDate });
 	let startOffset = zipDataWriter.offset;
 	pageData.url = options.url;
 	pageData.archiveTime = (new Date()).toISOString();
@@ -120,21 +136,21 @@ async function process(pageData, options) {
 		if (options.extractDataFromPage) {
 			if (!options.extractDataFromPageTags) {
 				const textContent = new TextDecoder().decode(data);
-				const matchEndTagXMP = textContent.match(/<\/\s*xmp>/i);
-				if (matchEndTagXMP) {
-					const matchEndTagComment = textContent.match(/-->/i);
-					if (matchEndTagComment) {
-						const matchTextAreaTagComment = textContent.match(/<\/\s*textarea>/i);
-						if (matchTextAreaTagComment) {
+				const matchEndTagComment = textContent.match(/-->/i);
+				if (matchEndTagComment) {
+					const matchEndTagXMP = textContent.match(/<\/\s*xmp>/i);
+					if (matchEndTagXMP) {
+						const matchEndTagPlainText = textContent.match(/<\/\s*plaintext>/i);
+						if (matchEndTagPlainText) {
 							options.extractDataFromPage = false;
-							return process(pageData, options);
+							return process(pageData, options, lastModDate);
 						} else {
-							options.extractDataFromPageTags = ["<textarea>", "</textarea>"];
-							return process(pageData, options);
+							options.extractDataFromPageTags = ["<plaintext>", "</plaintext>"];
+							return process(pageData, options, lastModDate);
 						}
 					} else {
-						options.extractDataFromPageTags = ["<!--", "-->"];
-						return process(pageData, options);
+						options.extractDataFromPageTags = ["<xmp>", "</xmp>"];
+						return process(pageData, options, lastModDate);
 					}
 				}
 			}
@@ -152,24 +168,44 @@ async function process(pageData, options) {
 		if (options.extractDataFromPageTags) {
 			pageContent += options.extractDataFromPageTags[1];
 		} else {
-			pageContent += "</xmp>";
+			pageContent += "-->";
 		}
-		if (insertionsCRLF.length || substitutionsLF.length) {
-			const extraData =
+		const endTags = "</body></html>";
+		if (options.extractDataFromPage) {
+			extraData = "<sfz-extra-data>" +
 				await arrayToBase64(insertionsCRLF) + "," +
 				await arrayToBase64(substitutionsLF) + "," +
-				await arrayToBase64([startOffset]);
-			pageContent += "<sfz-extra-data>" + extraData + "</sfz-extra-data>";
+				await arrayToBase64([startOffset]) +
+				"</sfz-extra-data>";
+			if (extraData.length > 65535 - endTags.length) {
+				if (!options.extraDataSize) {
+					options.extraDataSize = Math.floor(extraData.length * 1.001);
+					return process(pageData, options, lastModDate);
+				}
+			} else {
+				if (options.extraDataSize) {
+					options.extraDataSize = undefined;
+					return process(pageData, options, lastModDate);
+				} else {
+					pageContent += extraData;
+				}
+			}
 		}
-		script += "document.currentScript.remove();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;}})();(" +
-			getContent.toString().replace(/\n|\t/g, "") + ")().then(globalThis.bootstrap).catch(()=>{});";
-		pageContent += "<script>" + script + "</script></body></html>";
+		pageContent += endTags;
 		await writeData(zipDataWriter.writable, (new TextEncoder()).encode(pageContent));
 	}
 	await zipDataWriter.writable.close();
-	return new Blob([zipDataWriter.getData()], { type: "application/octet-stream" });
+	const pageContent = await zipDataWriter.getData();
+	if (options.extractDataFromPage && options.extraDataSize !== undefined) {
+		if (options.extraDataSize >= extraData.length) {
+			pageContent.set(Array.from(extraData).map(character => character.charCodeAt(0)), startOffset - extraDataOffset);
+		} else {
+			options.extraData = extraData;
+			options.extraDataSize = Math.floor(extraData.length * 1.001);
+			return process(pageData, options, lastModDate);
+		}
+	}
+	return new Blob([pageContent], { type: "application/octet-stream" });
 }
 
 async function arrayToBase64(data) {
@@ -281,7 +317,14 @@ async function getContent() {
 	async function extractPageData() {
 		const zipDataElement = document.querySelector("sfz-extra-data");
 		if (zipDataElement) {
-			const dataNode = zipDataElement.previousSibling;
+			let dataNode = zipDataElement.nextSibling;
+			if (dataNode) {
+				if (dataNode.nodeType == Node.TEXT_NODE) {
+					dataNode = dataNode.nextSibling;
+				}
+			} else {
+				dataNode = zipDataElement.previousSibling;
+			}
 			const zipData = [];
 			let { textContent } = dataNode;
 			for (let index = 0; index < textContent.length; index++) {