single-file-core 1.5.28 → 1.5.30

package/core/index.js

@@ -1298,6 +1298,7 @@ class Processor {
 			options.saveFilenameTemplateData = false;
 			options.selected = false;
 			options.embeddedImage = null;
+			options.embeddedPdf = null;
 			options.url = frameData.baseURI;
 			options.windowId = frameWindowId;
 			options.content = frameData.content;

package/package.json

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

package/processors/compression/compression.js

@@ -43,21 +43,29 @@ const NO_COMPRESSION_EXTENSIONS = [".jpg", ".jpeg", ".png", ".avi", ".apng", ".p
 const SCRIPT_PATH = "/lib/single-file-zip.min.js";
 const EXTRA_DATA_TAGS = [
 	["<noscript>", "</noscript>"],
+	["<noframes>", "</noframes>"],
+	["<noembed>", "</noembed>"],
 	["<script type=sfz-data>", "</script>"],
+	["<style type=sfz-data>", "</style>"],
+	["<iframe>", "</iframe>"],
 	["<xmp>", "</xmp>"],
 	["<plaintext>", "</plaintext>"]
 ];
-const EMBEDDED_IMAGE_DATA_TAGS = [
+const EMBEDDED_DATA_TAGS = [
 	["<!--", "-->"],
 	...EXTRA_DATA_TAGS,
 ];
 const EXTRA_DATA_REGEXPS = [
 	[/<noscript/i, /<\/noscript>/i],
+	[/<noframes/i, /<\/noframes>/i],
+	[/<noembed/i, /<\/noembed>/i],
 	[/<script/i, /<\/script>/i],
+	[/<style/i, /<\/style>/i],
+	[/<iframe/i, /<\/iframe>/i],
 	[/<xmp/i, /<\/xmp>/i],
 	[/<plaintext/i, /<\/plaintext>/i]
 ];
-const EMBEDDED_IMAGE_DATA_REGEXPS = [
+const EMBEDDED_DATA_REGEXPS = [
 	[/<!--/i, /-->/i],
 	...EXTRA_DATA_REGEXPS,
 ];
@@ -96,13 +104,17 @@ async function process(pageData, options, lastModDate = new Date()) {
 		await writeData(zipDataWriter.writable, options.embeddedImage.slice(0, PNG_SIGNATURE_LENGTH + PNG_IHDR_LENGTH));
 		if (options.selfExtractingArchive) {
 			const embeddedImageText = embeddedImageData.reduce((text, charCode) => text + String.fromCharCode(charCode), "");
-			const tagIndex = EMBEDDED_IMAGE_DATA_REGEXPS.findIndex(tests => !embeddedImageText.match(tests[1]));
+			const tagIndex = EMBEDDED_DATA_REGEXPS.findIndex(tests => !embeddedImageText.match(tests[1]));
 			let startTag;
-			[startTag, endTag] = tagIndex == -1 ? ["", ""] : EMBEDDED_IMAGE_DATA_TAGS[tagIndex];
-			const html = getHTMLStartData(pageData, options) + startTag;
-			const hmtlData = new Uint8Array([...getLength(html.length + 4), ...[0x74, 0x45, 0x58, 0x74, 0x50, 0x4e, 0x47, 0], ...new TextEncoder().encode(html)]);
+			[startTag, endTag] = tagIndex == -1 ? ["", ""] : EMBEDDED_DATA_TAGS[tagIndex];
+			const htmlArray = getStartHTMLArray(pageData, options, startTag);
+			const hmtlData = new Uint8Array([...getLength(htmlArray.length + 4), ...[0x74, 0x45, 0x58, 0x74, 0x50, 0x4e, 0x47, 0], ...htmlArray]);
 			await writeData(zipDataWriter.writable, hmtlData);
 			await writeData(zipDataWriter.writable, getCRC32(hmtlData, 4));
+		} else if (options.embeddedPdf) {
+			const data = new Uint8Array([...getLength(options.embeddedPdf.length + 4), ...[0x74, 0x45, 0x58, 0x74, 0x50, 0x44, 0x46, 0], ...new Uint8Array(options.embeddedPdf)]);
+			await writeData(zipDataWriter.writable, data);
+			await writeData(zipDataWriter.writable, getCRC32(data, 4));
 		}
 		await writeData(zipDataWriter.writable, embeddedImageData);
 		await writeData(zipDataWriter.writable, new Uint8Array(4));
@@ -114,6 +126,8 @@ async function process(pageData, options, lastModDate = new Date()) {
 	}
 	if (options.selfExtractingArchive) {
 		extraDataOffset = await prependHTMLData(pageData, zipDataWriter, script, options);
+	} else if (!options.embeddedImage && options.embeddedPdf) {
+		await writeData(zipDataWriter.writable, new Uint8Array(options.embeddedPdf));
 	}
 	const zipWriter = new ZipWriter(zipDataWriter, { bufferedWrite: true, keepOrder: false, lastModDate });
 	const startOffset = zipDataWriter.offset;
@@ -225,7 +239,7 @@ function setUint32(data, value) {
 async function prependHTMLData(pageData, zipDataWriter, script, options) {
 	let pageContent = "";
 	if (!options.embeddedImage) {
-		pageContent += getHTMLStartData(pageData, options);
+		await writeData(zipDataWriter.writable, getStartHTMLArray(pageData, options));
 	}
 	pageContent += "<div id=sfz-wait-message>Please wait...</div>";
 	if (!options.extractDataFromPage) {
@@ -281,17 +295,38 @@ async function prependHTMLData(pageData, zipDataWriter, script, options) {
 	return extraDataOffset;
 }
 
-function getHTMLStartData(pageData, options) {
-	let pageContent = "";
+function getStartHTMLArray(pageData, options, startTag = "") {
+	let html = "";
 	if (options.includeBOM && !options.extractDataFromPage && !options.embeddedImage) {
-		pageContent += "\ufeff";
+		html += "\ufeff";
 	}
+	html += options.embeddedImage ? "" : pageData.doctype;
+	html += "<html data-sfz>";
+	html += pageData.comment && !options.embeddedImage ? "<!--" + pageData.comment + "-->" : "";
 	const charset = options.extractDataFromPage ? "windows-1252" : "utf-8";
+	html += "<meta charset=" + charset + ">";
+	const htmlHeadData = getHTMLHeadData(pageData, options);
+	let htmlArray;
+	if (options.embeddedPdf) {
+		const embeddedPdfText = options.embeddedPdf.reduce((text, charCode) => text + String.fromCharCode(charCode), "");
+		const pdfTagIndex = EMBEDDED_DATA_REGEXPS.findIndex(tests => !embeddedPdfText.match(tests[1]));
+		const [pdfStartTag, pdfEndTag] = pdfTagIndex == -1 ? ["", ""] : EMBEDDED_DATA_TAGS[pdfTagIndex];
+		const htmlArray1 = new TextEncoder().encode(html + pdfStartTag);
+		const htmlArray2 = new TextEncoder().encode(pdfEndTag + htmlHeadData + startTag);
+		htmlArray = new Uint8Array(htmlArray1.length + htmlArray2.length + options.embeddedPdf.length);
+		htmlArray.set(htmlArray1);
+		htmlArray.set(options.embeddedPdf, htmlArray1.length);
+		htmlArray.set(htmlArray2, htmlArray1.length + options.embeddedPdf.length);
+	} else {
+		htmlArray = new TextEncoder().encode(html + htmlHeadData + startTag);
+	}
+	return htmlArray;
+}
+
+function getHTMLHeadData(pageData, options) {
+	let pageContent = "";
 	const title = options.extractDataFromPage ? "" : getPageTitle(pageData);
-	pageContent += options.embeddedImage ? "" : pageData.doctype;
-	pageContent += "<html data-sfz>";
-	pageContent += pageData.comment && !options.embeddedImage ? "<!--" + pageData.comment + "-->" : "";
-	pageContent += "<meta charset=" + charset + "><title>" + title + "</title>";
+	pageContent += "<title>" + title + "</title>";
 	if (options.insertCanonicalLink) {
 		pageContent += "<link rel=canonical href=\"" + options.url + "\">";
 	}

package/single-file.js

@@ -119,7 +119,8 @@ async function getPageData(options = {}, initOptions, doc = globalThis.document,
 			insertMetaCSP: options.insertMetaCSP,
 			password: options.password,
 			zipScript: options.zipScript,
-			embeddedImage: options.embeddedImage
+			embeddedImage: options.embeddedImage,
+			embeddedPdf: options.embeddedPdf
 		});
 		delete pageData.resources;
 		const reader = new globalThis.FileReader();