single-file-core 1.5.84 → 1.5.86

package/modules/template-parser.js

@@ -26,7 +26,7 @@
 /*
  * Generated by PEG.js 0.10.0.
  *
- * http://pegjs.org/
+ * https://github.com/pegjs/pegjs
  */
 
 /* Modified manually by Gildas Lormeau in order to support async/await callbacks */

package/package.json

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

package/processors/compression/compression-display.js

@@ -29,7 +29,7 @@ export {
 
 async function display(document, docContent, { disableFramePointerEvents } = {}) {
 	docContent = docContent.replace(/<noscript/gi, "<template disabled-noscript");
-	docContent = docContent.replaceAll(/<\/noscript/gi, "</template");
+	docContent = docContent.replace(/<\/noscript/gi, "</template");
 	const doc = (new DOMParser()).parseFromString(docContent, "text/html");
 	if (disableFramePointerEvents) {
 		doc.querySelectorAll("iframe").forEach(element => {

package/processors/compression/compression.js

@@ -25,6 +25,7 @@
 
 import {
 	configure,
+	deflateRaw,
 	BlobReader,
 	TextReader,
 	ZipWriter,
@@ -37,7 +38,10 @@ import {
 	display
 } from "./compression-display.js";
 
-const { Blob, fetch, TextEncoder, DOMParser } = globalThis;
+const { Blob, fetch, TextEncoder, TextDecoder, DOMParser } = globalThis;
+
+// windows-1252 never decodes bytes >= 0x80 into the ASCII range, the scanned patterns are all ASCII
+const TEXT_DECODER = new TextDecoder("windows-1252");
 
 const NO_COMPRESSION_EXTENSIONS = [".jpg", ".jpeg", ".png", ".avi", ".apng", ".pdf", ".woff2", ".mp4", ".mp3", ".ogg", ".webp", ".webm", ".avi", ".mpeg", ".ts", ".ogv", ".heif", ".heic"];
 const SCRIPT_PATH = "/lib/single-file-zip.min.js";
@@ -56,17 +60,17 @@ 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]
+	[/<noscript/i, /<\/noscript[\t\n\f\r />]/i],
+	[/<noframes/i, /<\/noframes[\t\n\f\r />]/i],
+	[/<noembed/i, /<\/noembed[\t\n\f\r />]/i],
+	[/<script/i, /<\/script[\t\n\f\r />]/i],
+	[/<style/i, /<\/style[\t\n\f\r />]/i],
+	[/<iframe/i, /<\/iframe[\t\n\f\r />]/i],
+	[/<xmp/i, /<\/xmp[\t\n\f\r />]/i],
+	[/<plaintext/i, /<\/plaintext[\t\n\f\r />]/i]
 ];
 const EMBEDDED_DATA_REGEXPS = [
-	[/<!--/i, /-->/i],
+	[/<!--/i, /--!?>/i],
 	...EXTRA_DATA_REGEXPS,
 ];
 const CRC32_TABLE = new Uint32Array(256).map((_, indexTable) => {
@@ -83,7 +87,8 @@ const PNG_IHDR_LENGTH = 25;
 const browser = globalThis.browser;
 
 export {
-	process
+	process,
+	createArchive
 };
 
 async function process(pageData, options, lastModDate = new Date()) {
@@ -91,20 +96,28 @@ async function process(pageData, options, lastModDate = new Date()) {
 	if (options.zipScript) {
 		script = options.zipScript;
 	} else if (browser && browser.runtime && browser.runtime.getURL) {
-		configure({ workerScripts: { deflate: ["/lib/single-file-z-worker.js"] } });
+		configure({ workerURI: "/lib/single-file-z-worker.js" });
 		script = await (await fetch(browser.runtime.getURL(SCRIPT_PATH))).text();
 	}
+	return createArchive(pageData, options, script, zipWriter => {
+		pageData.url = options.url;
+		pageData.archiveTime = (new Date()).toISOString();
+		return addPageResources(zipWriter, pageData, { password: options.password, disableCompression: options.disableCompression }, options.createRootDirectory ? String(Date.now()) + "_" + (options.tabId || 0) + "/" : "", options.url);
+	}, lastModDate);
+}
+
+async function createArchive(pageData, options, script, writeEntries, lastModDate = new Date()) {
 	const zipDataWriter = new Uint8ArrayWriter();
 	zipDataWriter.init();
 	zipDataWriter.writable.size = 0;
 	let extraDataOffset, extraData, embeddedImageDataOffset, endTag;
 	if (options.embeddedImage) {
-		options.embeddedImage = Array.from(options.embeddedImage);
+		options.embeddedImage = new Uint8Array(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) {
-			const embeddedImageText = embeddedImageData.reduce((text, charCode) => text + String.fromCharCode(charCode), "");
-			const tagIndex = EMBEDDED_DATA_REGEXPS.findIndex(tests => !embeddedImageText.match(tests[1]));
+			const embeddedImageText = TEXT_DECODER.decode(embeddedImageData);
+			const tagIndex = EMBEDDED_DATA_REGEXPS.slice(0, -1).findIndex(tests => !embeddedImageText.match(tests[1]));
 			let startTag;
 			[startTag, endTag] = tagIndex == -1 ? ["", ""] : EMBEDDED_DATA_TAGS[tagIndex];
 			const htmlArray = getStartHTMLArray(pageData, options, startTag);
@@ -129,33 +142,45 @@ async function process(pageData, options, lastModDate = new Date()) {
 	} else if (!options.embeddedImage && options.embeddedPdf) {
 		await writeData(zipDataWriter.writable, new Uint8Array(options.embeddedPdf));
 	}
-	const zipWriter = new ZipWriter(zipDataWriter, { bufferedWrite: true, keepOrder: true, lastModDate });
+	const zipWriter = new ZipWriter(zipDataWriter, { bufferedWrite: true, keepOrder: true, lastModDate, useCompressionStream: true });
 	const startOffset = zipDataWriter.offset;
-	pageData.url = options.url;
-	pageData.archiveTime = (new Date()).toISOString();
-	await addPageResources(zipWriter, pageData, { password: options.password, disableCompression: options.disableCompression }, options.createRootDirectory ? String(Date.now()) + "_" + (options.tabId || 0) + "/" : "", options.url);
+	await writeEntries(zipWriter);
 	const data = await zipWriter.close(null, { preventClose: true });
 	if (options.selfExtractingArchive) {
-		const insertionsCRLF = [];
-		const substitutionsLF = [];
+		const lfCodes = [];
+		let crc32 = -1;
 		if (options.extractDataFromPage) {
-			if (!options.extractDataFromPageTags) {
-				let textContent = "";
-				data.slice(startOffset).forEach(charCode => textContent += String.fromCharCode(charCode));
-				const matchCommentTags = textContent.match(/<!--/i) || textContent.match(/-->/i);
-				if (matchCommentTags) {
-					return findExtraDataTags(textContent, pageData, options, lastModDate);
+			if (!options.extractDataFromPageTags || options.extractDataFromPageTags[0] != "<plaintext>") {
+				const textContent = TEXT_DECODER.decode(data.subarray(startOffset));
+				if (options.extractDataFromPageTags) {
+					const tagIndex = EXTRA_DATA_TAGS.indexOf(options.extractDataFromPageTags);
+					const regExpsTag = EXTRA_DATA_REGEXPS[tagIndex];
+					if (textContent.match(regExpsTag[0]) || textContent.match(regExpsTag[1])) {
+						return findExtraDataTags(textContent, pageData, options, script, writeEntries, lastModDate, tagIndex + 1);
+					}
+				} else {
+					const matchCommentTags = textContent.match(/<!--/i) || textContent.match(/--!?>/i);
+					if (matchCommentTags) {
+						return findExtraDataTags(textContent, pageData, options, script, writeEntries, lastModDate);
+					}
 				}
 			}
 			for (let index = startOffset; index < data.length; index++) {
-				if (data[index] == 13) {
+				const byte = data[index];
+				crc32 = (crc32 >>> 8) ^ CRC32_TABLE[(crc32 ^ byte) & 0xff];
+				if (byte == 10) {
+					lfCodes.push(0);
+				} else if (byte == 13) {
 					if (data[index + 1] == 10) {
-						insertionsCRLF.push(index - startOffset);
+						index++;
+						crc32 = (crc32 >>> 8) ^ CRC32_TABLE[(crc32 ^ 10) & 0xff];
+						lfCodes.push(2);
 					} else {
-						substitutionsLF.push(index - startOffset);
+						lfCodes.push(1);
 					}
 				}
 			}
+			crc32 = (crc32 ^ -1) >>> 0;
 		}
 		let pageContent = "";
 		if (!options.preventAppendedData) {
@@ -167,21 +192,22 @@ async function process(pageData, options, lastModDate = new Date()) {
 		}
 		const endTags = options.preventAppendedData || options.embeddedImage ? "" : "</body></html>";
 		if (options.extractDataFromPage) {
-			const payload = new Uint32Array(insertionsCRLF.length + substitutionsLF.length + 2);
-			payload.set(new Uint32Array([insertionsCRLF.length]), 0);
-			payload.set(new Uint32Array(insertionsCRLF), 1);
-			payload.set(new Uint32Array([substitutionsLF.length]), insertionsCRLF.length + 1);
-			payload.set(new Uint32Array(substitutionsLF), insertionsCRLF.length + 2);
-			extraData = "<sfz-extra-data>" + compress(payload.buffer) + "</sfz-extra-data>";
+			// payload layout: [crc32, zip data length, LF codes count, 2-bit codes (0=LF, 1=CR, 2=CRLF) packed LSB-first]
+			const payload = new Uint32Array(3 + Math.ceil(lfCodes.length / 16));
+			payload[0] = crc32;
+			payload[1] = data.length - startOffset;
+			payload[2] = lfCodes.length;
+			lfCodes.forEach((lfCode, indexLFCode) => payload[3 + (indexLFCode >> 4)] |= lfCode << ((indexLFCode & 15) * 2));
+			extraData = "<sfz-extra-data>" + base64Encode(deflateRaw(new Uint8Array(payload.buffer))) + "</sfz-extra-data>";
 			if (options.preventAppendedData || extraData.length > 65535 - endTags.length - (options.embeddedImage ? PNG_IEND_LENGTH : 0)) {
 				if (!options.extraDataSize) {
 					options.extraDataSize = Math.floor(extraData.length * 1.001);
-					return process(pageData, options, lastModDate);
+					return createArchive(pageData, options, script, writeEntries, lastModDate);
 				}
 			} else {
 				if (options.extraDataSize) {
 					options.extraDataSize = undefined;
-					return process(pageData, options, lastModDate);
+					return createArchive(pageData, options, script, writeEntries, lastModDate);
 				} else {
 					pageContent += extraData;
 				}
@@ -194,11 +220,11 @@ async function process(pageData, options, lastModDate = new Date()) {
 	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);
+			pageContent.set(new TextEncoder().encode(extraData), startOffset - extraDataOffset);
 		} else {
 			options.extraData = extraData;
 			options.extraDataSize = Math.floor(extraData.length * 1.001);
-			return process(pageData, options, lastModDate);
+			return createArchive(pageData, options, script, writeEntries, lastModDate);
 		}
 	}
 	if (options.embeddedImage) {
@@ -206,7 +232,7 @@ async function process(pageData, options, lastModDate = new Date()) {
 		return new Blob([
 			pageContent,
 			getCRC32(pageContent, embeddedImageDataOffset),
-			new Uint8Array(options.embeddedImage.slice(options.embeddedImage.length - PNG_IEND_LENGTH))
+			options.embeddedImage.slice(options.embeddedImage.length - PNG_IEND_LENGTH)
 		], { type: "application/octet-stream" });
 	} else {
 		return new Blob([pageContent], { type: "application/octet-stream" });
@@ -243,7 +269,10 @@ async function prependHTMLData(pageData, zipDataWriter, script, options) {
 		await writeData(zipDataWriter.writable, getStartHTMLArray(pageData, options));
 	}
 	pageContent += "<div id=sfz-wait-message>Please wait...</div>";
-	if (!options.extractDataFromPage) {
+	if (options.extractDataFromPage) {
+		pageContent += "<div id=sfz-error-message><strong>Error</strong>: Cannot extract the data of the page.";
+		pageContent += " The file is still a valid ZIP file, you can rename it with a \"zip\" extension and unzip it to display the page and its resources.</div>";
+	} else {
 		pageContent += "<div id=sfz-error-message><strong>Error</strong>: Cannot open the page from the filesystem.";
 		pageContent += "<ul style='line-height:20px;'>";
 		pageContent += "<li style='margin-bottom:10px'><strong>Chrome/Edge/Brave</strong>: Install <a href='https://www.getsinglefile.com'>SingleFile</a> and enable the option \"Allow access to file URLs\" in the details page of the extension.</li>";
@@ -277,7 +306,13 @@ async function prependHTMLData(pageData, zipDataWriter, script, options) {
 		"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," + JSON.stringify(displayOptions) + "));return bootstrapStarted;}})();(" +
-		getContent.toString().replace(/\n|\t/g, "") + ")().then(globalThis.bootstrap).then(() => document.dispatchEvent(new CustomEvent(\"single-file-display-infobar\"))).catch(()=>{});" +
+		getContent.toString().replace(/\n|\t/g, "") + ")().then(globalThis.bootstrap).then(() => document.dispatchEvent(new CustomEvent(\"single-file-display-infobar\"))).catch(error => {" +
+		"console.error(error);" +
+		"const waitMessage = document.getElementById(\"sfz-wait-message\");" +
+		"if (waitMessage) { waitMessage.remove(); }" +
+		"const errorMessage = document.getElementById(\"sfz-error-message\");" +
+		"if (errorMessage) { errorMessage.hidden = false; document.body.hidden = false; }" +
+		"});" +
 		"</script>";
 	pageContent += script;
 	let extraData = "";
@@ -287,8 +322,9 @@ async function prependHTMLData(pageData, zipDataWriter, script, options) {
 	}
 	pageContent += extraData;
 	const startTag = options.extractDataFromPageTags ? options.extractDataFromPageTags[0] : "<!--";
-	pageContent += startTag;
-	const extraDataOffset = startTag.length + extraData.length;
+	// the space guarantees a text node between <sfz-extra-data> and the start tag
+	pageContent += (extraData ? " " : "") + startTag;
+	const extraDataOffset = startTag.length + extraData.length + (extraData ? 1 : 0);
 	await writeData(zipDataWriter.writable, (new TextEncoder()).encode(pageContent));
 	return extraDataOffset;
 }
@@ -306,8 +342,8 @@ function getStartHTMLArray(pageData, options, startTag = "") {
 	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 embeddedPdfText = TEXT_DECODER.decode(new Uint8Array(options.embeddedPdf));
+		const pdfTagIndex = EMBEDDED_DATA_REGEXPS.slice(0, -1).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);
@@ -347,19 +383,24 @@ function getPageTitle(pageData) {
 	return pageData.title.replace(/</g, "&lt;").replace(/>/g, "&gt;") || "";
 }
 
-function findExtraDataTags(textContent, pageData, options, lastModDate, indexExtractDataFromPageTags = 0) {
+function findExtraDataTags(textContent, pageData, options, script, writeEntries, lastModDate, indexExtractDataFromPageTags = 0) {
 	const regExpsTag = EXTRA_DATA_REGEXPS[indexExtractDataFromPageTags];
-	const matchTag = textContent.match(regExpsTag[0]) || textContent.match(regExpsTag[1]);
+	const plaintextTag = EXTRA_DATA_TAGS[indexExtractDataFromPageTags][0] == "<plaintext>";
+	const matchTag = !plaintextTag && (textContent.match(regExpsTag[0]) || textContent.match(regExpsTag[1]));
 	if (matchTag) {
 		if (indexExtractDataFromPageTags < EXTRA_DATA_TAGS.length - 1) {
-			return findExtraDataTags(textContent, pageData, options, lastModDate, indexExtractDataFromPageTags + 1);
+			return findExtraDataTags(textContent, pageData, options, script, writeEntries, lastModDate, indexExtractDataFromPageTags + 1);
 		} else {
 			options.extractDataFromPage = false;
-			return process(pageData, options, lastModDate);
+			return createArchive(pageData, options, script, writeEntries, lastModDate);
 		}
 	} else {
 		options.extractDataFromPageTags = EXTRA_DATA_TAGS[indexExtractDataFromPageTags];
-		return process(pageData, options, lastModDate);
+		if (options.extractDataFromPageTags[0] == "<plaintext>") {
+			// <plaintext> cannot be closed, the file must end with the zip data
+			options.preventAppendedData = true;
+		}
+		return createArchive(pageData, options, script, writeEntries, lastModDate);
 	}
 }
 
@@ -422,29 +463,45 @@ async function getContent() {
 		[352, 138], [8249, 139], [338, 140], [381, 142], [8216, 145], [8217, 146], [8220, 147], [8221, 148], [8226, 149], [8211, 150],
 		[8212, 151], [732, 152], [8482, 153], [353, 154], [8250, 155], [339, 156], [382, 158], [376, 159]
 	]);
+	const crc32Table = new Uint32Array(256).map((_, indexTable) => {
+		let crc = indexTable;
+		for (let indexBits = 0; indexBits < 8; indexBits++) {
+			crc = crc & 1 ? 0xEDB88320 ^ (crc >>> 1) : crc >>> 1;
+		}
+		return crc;
+	});
 	return new Promise((resolve, reject) => {
 		let aborted = false;
-		getPageData();
+		if (location.protocol == "file:") {
+			extractDataFromDocument();
+		} else {
+			getPageData();
+		}
+
+		async function extractDataFromDocument() {
+			try {
+				await waitForDocumentReady(document);
+				document.body.querySelectorAll("meta, style").forEach(element => document.head.appendChild(element));
+				const pageData = extractPageData();
+				displayMessage("sfz-wait-message", 2);
+				resolve(pageData);
+			} catch (error) {
+				console.error(error);
+				displayMessage("sfz-error-message", 2);
+				reject(error);
+			}
+		}
 
 		function getPageData() {
 			const xhr = new XMLHttpRequest();
 			xhr.responseType = "blob";
 			xhr.open("GET", "");
-			xhr.onerror = async () => {
+			xhr.onerror = () => {
 				if (aborted) {
 					displayMessage("sfz-error-message", 2);
 					reject();
 				} else {
-					try {
-						await waitForDocumentReady(document);
-						document.body.querySelectorAll("meta, style").forEach(element => document.head.appendChild(element));
-						const pageData = extractPageData();
-						displayMessage("sfz-wait-message", 2);
-						resolve(pageData);
-					} catch {
-						displayMessage("sfz-error-message", 2);
-						reject();
-					};
+					extractDataFromDocument();
 				}
 			};
 			xhr.send();
@@ -485,9 +542,14 @@ async function getContent() {
 		if (element) {
 			Array.from(document.body.childNodes).forEach(node => {
 				if (node.id != elementId) {
-					node.remove();
+					if (node.id == "sfz-wait-message" || node.id == "sfz-error-message") {
+						node.hidden = true;
+					} else {
+						node.remove();
+					}
 				}
 			});
+			element.hidden = false;
 			document.body.hidden = false;
 			element.style = "opacity: 0; animation: 0s linear " + delay + "s display-wait-message 1 normal forwards";
 		}
@@ -506,59 +568,46 @@ async function getContent() {
 			} else {
 				dataNode = zipDataElement.previousSibling;
 			}
-			const zipData = [];
-			let { textContent } = dataNode;
+			const inflatedPayload = zip.inflateRaw(base64Decode(zipDataElement.textContent));
+			const payload = new Uint32Array(inflatedPayload.buffer, inflatedPayload.byteOffset, inflatedPayload.length >> 2);
+			const expectedCRC32 = payload[0];
+			const zipDataLength = payload[1];
+			const lfCodesLength = payload[2];
+			const zipData = new Uint8Array(zipDataLength);
+			const { textContent } = dataNode;
+			let offset = 0;
+			let indexLFCode = 0;
+			let crc32 = -1;
 			for (let index = 0; index < textContent.length; index++) {
 				const charCode = textContent.charCodeAt(index);
-				zipData.push(charCode > 255 ? characterMap.get(charCode) : charCode);
-			}
-			const payload = new Uint32Array(decompress(zipDataElement.textContent).buffer);
-			const insertionsCRLFLength = payload[0];
-			const insertionsCRLF = payload.slice(1, 1 + insertionsCRLFLength);
-			const substitutionsLFLength = payload[1 + insertionsCRLFLength];
-			const substitutionsLF = payload.slice(2 + insertionsCRLFLength, 2 + insertionsCRLFLength + substitutionsLFLength);
-			insertionsCRLF.forEach(index => zipData.splice(index, 1, 13, 10));
-			substitutionsLF.forEach(index => zipData[index] = 13);
-			return new Blob([new Uint8Array(zipData)], { type: "application/octet-stream" });
-		}
-		throw new Error("Extra zip data data not found");
-	}
-
-	function decompress(src) {
-		src = base64Decode(src);
-		let out = new Uint8Array(1024);
-		let outLen = 0;
-		for (let i = 0; i < src.length;) {
-			const ctrl = src[i++];
-			if ((ctrl & 0x80) === 0) {
-				const L = ctrl;
-				ensure(outLen + L);
-				for (let j = 0; j < L && i < src.length; j++) {
-					out[outLen++] = src[i++];
-				}
-			} else {
-				const L = (ctrl & 0x7f) + 3;
-				const off = (src[i++] << 8) | src[i++];
-				const start = outLen - off;
-				ensure(outLen + L);
-				for (let k = 0; k < L; k++) {
-					out[outLen++] = out[start + k];
+				if (charCode == 10) {
+					const lfCode = (payload[3 + (indexLFCode >> 4)] >>> ((indexLFCode & 15) * 2)) & 3;
+					indexLFCode++;
+					if (lfCode == 0) {
+						writeByte(10);
+					} else {
+						writeByte(13);
+						if (lfCode == 2) {
+							writeByte(10);
+						}
+					}
+				} else {
+					writeByte(charCode > 255 ? characterMap.get(charCode) : charCode);
 				}
 			}
-		}
-		return new Uint8Array(out.buffer.slice(0, outLen));
+			crc32 = (crc32 ^ -1) >>> 0;
+			if (offset != zipDataLength || indexLFCode != lfCodesLength || crc32 != expectedCRC32) {
+				throw new Error("Invalid checksum of the extracted zip data");
+			}
+			return new Blob([zipData], { type: "application/octet-stream" });
 
-		function ensure(n) {
-			if (out.length < n) {
-				let nl = out.length * 2;
-				while (nl < n) {
-					nl *= 2;
-				}
-				const nbuf = new Uint8Array(nl);
-				nbuf.set(out.subarray(0, outLen));
-				out = nbuf;
+			function writeByte(byte) {
+				zipData[offset] = byte;
+				crc32 = (crc32 >>> 8) ^ crc32Table[(crc32 ^ byte) & 0xff];
+				offset++;
 			}
-		};
+		}
+		throw new Error("Extra zip data data not found");
 	}
 
 	function base64Decode(b64) {
@@ -603,94 +652,3 @@ function base64Encode(bytes) {
 	}
 	return out;
 }
-
-function compress(input) {
-	const src = new Uint8Array(input);
-	const N = src.length;
-	const out = [];
-	const litBuf = [];
-	const MAX_OFFSET = 0xffff;
-	const MAX_MATCH = 130;
-	const MAX_CANDIDATES = 64;
-	const map = new Map();
-	let i = 0;
-	while (i < N) {
-		let bestLen = 0, bestOff = 0;
-		if (i + 2 < N) {
-			const key = (src[i] << 16) | (src[i + 1] << 8) | src[i + 2];
-			const cand = map.get(key) || [];
-			for (let c = cand.length - 1; c >= 0; c--) {
-				const j = cand[c];
-				const off = i - j;
-				if (off <= 0 || off > MAX_OFFSET) {
-					continue;
-				}
-				let k = 0;
-				while (k < MAX_MATCH && i + k < N && src[j + k] === src[i + k]) {
-					k++;
-				}
-				if (k > bestLen && k >= 3) {
-					bestLen = k; bestOff = off;
-					if (bestLen === MAX_MATCH) {
-						break;
-					}
-				}
-			}
-		}
-
-		if (bestLen >= 3) {
-			if (litBuf.length) {
-				flushLiterals();
-			}
-			let remain = bestLen;
-			let produced = 0;
-			while (remain > 0) {
-				const take = Math.min(remain, MAX_MATCH);
-				out.push(0x80 | ((take - 3) & 0x7f));
-				out.push((bestOff >> 8) & 0xff);
-				out.push(bestOff & 0xff);
-				remain -= take;
-				produced += take;
-			}
-			const start = i;
-			for (let p = start; p < start + produced; p++) {
-				addPos(p);
-			}
-			i += produced;
-		} else {
-			litBuf.push(src[i]);
-			addPos(i);
-			i++;
-			if (litBuf.length === 127) {
-				flushLiterals();
-			}
-		}
-	}
-	if (litBuf.length) {
-		flushLiterals();
-	}
-	const u8 = new Uint8Array(out);
-	return base64Encode(u8);
-
-	function flushLiterals() {
-		while (litBuf.length) {
-			const take = Math.min(127, litBuf.length);
-			out.push(take);
-			for (let t = 0; t < take; t++) {
-				out.push(litBuf.shift());
-			}
-		}
-	}
-
-	function addPos(pos) {
-		if (pos + 2 < N) {
-			const key = (src[pos] << 16) | (src[pos + 1] << 8) | src[pos + 2];
-			const arr = map.get(key) || [];
-			arr.push(pos);
-			if (arr.length > MAX_CANDIDATES) {
-				arr.shift();
-			}
-			map.set(key, arr);
-		}
-	}
-}