single-file-core 1.5.106 → 1.5.107

package/package.json

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

package/processors/compression/compression-extract.js

@@ -89,6 +89,9 @@ async function extract(content, { password, prompt = () => { }, zipOptions = { u
 		zipReader = new zip.ZipReader(reader);
 		entries = await zipReader.getEntries();
 	}
+	// page.pdf data lies in the HTML head, outside the zip region recovered in
+	// universal mode, and is never referenced by the displayed page
+	entries = entries.filter(entry => entry.filename != "page.pdf");
 	if (aliases) {
 		const allEntries = entries;
 		entries = entries.map(entry => {

package/processors/compression/compression.js

@@ -84,6 +84,7 @@ const CRC32_TABLE = new Uint32Array(256).map((_, indexTable) => {
 	return crc;
 });
 const PNG_IEND_LENGTH = 12;
+const PNG_CHUNK_CRC_LENGTH = 4;
 const PNG_SIGNATURE_LENGTH = 8;
 const PNG_IHDR_LENGTH = 25;
 const PDF_ENTRY_FILENAME = "page.pdf";
@@ -135,9 +136,9 @@ async function createArchive(pageData, options, script, writeEntries, lastModDat
 				// the htmlArray starts after the 4-byte length and the 8-byte type of the tEXt chunk
 				pdfEntry.offset += zipDataWriter.offset + 12;
 			}
-			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));
+			const htmlData = new Uint8Array([...getLength(htmlArray.length + 4), ...[0x74, 0x45, 0x58, 0x74, 0x50, 0x4e, 0x47, 0], ...htmlArray]);
+			await writeData(zipDataWriter.writable, htmlData);
+			await writeData(zipDataWriter.writable, getCRC32(htmlData, 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);
@@ -230,7 +231,10 @@ async function createArchive(pageData, options, script, writeEntries, lastModDat
 			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)) {
+			// the bytes appended after the EOCD record (wrapper end tag, extra data, end tags
+			// and, with an embedded image, the tEXt CRC and IEND chunk) must fit the 65535-byte
+			// window readers scan backward to find the EOCD record
+			if (options.preventAppendedData || extraData.length > 65535 - pageContent.length - endTags.length - (options.embeddedImage ? PNG_IEND_LENGTH + PNG_CHUNK_CRC_LENGTH : 0)) {
 				if (!options.extraDataSize) {
 					options.extraDataSize = Math.floor(extraData.length * 1.001);
 					return createArchive(pageData, options, script, writeEntries, lastModDate);
@@ -627,18 +631,24 @@ async function getContent() {
 			};
 			xhr.send();
 			xhr.onreadystatechange = () => {
-				if (xhr.readyState === 2 && xhr.status === 200 && !aborted) {
-					aborted = true;
-					const httpRangeSupport = xhr.getResponseHeader("Accept-Ranges") === "bytes";
-					xhr.abort();
-					displayMessage("sfz-wait-message", 2);
-					if (httpRangeSupport) {
-						resolve(new zip.HttpRangeReader(location.href, {
-							useXHR: true,
-							combineSizeEocd: true
-						}));
+				if (xhr.readyState === 2 && !aborted) {
+					if (xhr.status === 200) {
+						aborted = true;
+						const httpRangeSupport = xhr.getResponseHeader("Accept-Ranges") === "bytes";
+						xhr.abort();
+						displayMessage("sfz-wait-message", 2);
+						if (httpRangeSupport) {
+							resolve(new zip.HttpRangeReader(location.href, {
+								useXHR: true,
+								combineSizeEocd: true
+							}));
+						} else {
+							getPageData();
+						}
 					} else {
-						getPageData();
+						// an HTTP error status fires no error event; fall back like a network failure
+						xhr.abort();
+						extractDataFromDocument();
 					}
 				}
 			};
@@ -728,7 +738,7 @@ async function getContent() {
 				offset++;
 			}
 		}
-		throw new Error("Extra zip data data not found");
+		throw new Error("Extra zip data not found");
 	}
 
 	function base64Decode(b64) {

package/vendor/zip/zip.js

@@ -6647,6 +6647,13 @@ async function addFile(zipWriter, name, reader, options) {
 	const { comment } = metadataInfo;
 	const extraField = options[PROPERTY_NAME_EXTRA_FIELD];
 	zipWriter.fileEntries.set(name, UNDEFINED_VALUE);
+	const previousFileEntry = zipWriter.lastFileEntry;
+	const pendingFileEntry = {};
+	let releaseLockFileEntry;
+	if (metadataInfo.resolvedOptions.keepOrder) {
+		pendingFileEntry.lockFileEntry = new Promise(resolve => releaseLockFileEntry = resolve);
+	}
+	zipWriter.lastFileEntry = pendingFileEntry;
 	let fileEntry;
 	try {
 		const { resolvedOptions } = metadataInfo;
@@ -6668,10 +6675,21 @@ async function addFile(zipWriter, name, reader, options) {
 		const headerInfo = getHeaderInfo(options);
 		const dataDescriptorInfo = getDataDescriptorInfo(options);
 		const metadataSize = getLength(headerInfo.localHeaderArray, dataDescriptorInfo.dataDescriptorArray);
-		fileEntry = await getFileEntry(zipWriter, name, reader, { headerInfo, dataDescriptorInfo, metadataSize }, options);
+		fileEntry = await getFileEntry(zipWriter, name, reader, {
+			headerInfo,
+			dataDescriptorInfo,
+			metadataSize,
+			fileEntry: pendingFileEntry,
+			previousFileEntry,
+			releaseLockFileEntry
+		}, options);
 	} catch (error) {
 		zipWriter.fileEntries.delete(name);
 		throw error;
+	} finally {
+		if (releaseLockFileEntry) {
+			releaseLockFileEntry(previousFileEntry && previousFileEntry.lockFileEntry);
+		}
 	}
 	Object.assign(fileEntry, {
 		name,
@@ -7057,27 +7075,23 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		signal
 	} = options;
 	const {
-		headerInfo
+		headerInfo,
+		fileEntry: pendingFileEntry,
+		previousFileEntry,
+		releaseLockFileEntry
 	} = entryInfo;
 	const usdz = zipWriter.options[OPTION_USDZ];
-	const previousFileEntry = zipWriter.lastFileEntry;
-	let fileEntry = {};
+	let fileEntry = pendingFileEntry;
 	let bufferedWrite;
 	let releaseLockWriter;
-	let releaseLockCurrentFileEntry;
 	let writingBufferedEntryData;
 	let writingEntryData;
 	let writerSizeBeforeEntry;
 	let flushedBufferedSize = 0;
 	let fileWriter;
+	const lockPreviousFileEntry = keepOrder && previousFileEntry ? previousFileEntry.lockFileEntry : UNDEFINED_VALUE;
 	fileEntries.set(name, fileEntry);
-	zipWriter.lastFileEntry = fileEntry;
 	try {
-		let lockPreviousFileEntry;
-		if (keepOrder) {
-			lockPreviousFileEntry = previousFileEntry && previousFileEntry.lockFileEntry;
-			requestLockCurrentFileEntry();
-		}
 		if (options.bufferedWrite || !keepOrder || zipWriter.writerLocked || zipWriter.bufferedWrites || (!dataDescriptor && !emptyEntry)) {
 			bufferedWrite = true;
 			zipWriter.bufferedWrites++;
@@ -7090,6 +7104,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			await initStream(writer);
 		} else {
 			fileWriter = writer;
+			await lockPreviousFileEntry;
 			await requestLockWriter();
 		}
 		await initStream(fileWriter);
@@ -7102,7 +7117,6 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		}
 		const { localHeaderArray } = headerInfo;
 		if (!bufferedWrite) {
-			await lockPreviousFileEntry;
 			await skipDiskIfNeeded();
 		}
 		const diskNumberStart = getDiskNumber(writer);
@@ -7167,8 +7181,8 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		if (bufferedWrite) {
 			zipWriter.bufferedWrites--;
 		}
-		if (releaseLockCurrentFileEntry) {
-			releaseLockCurrentFileEntry();
+		if (releaseLockFileEntry) {
+			releaseLockFileEntry(lockPreviousFileEntry);
 		}
 		if (releaseLockWriter) {
 			releaseLockWriter();
@@ -7182,10 +7196,6 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		}
 	}
 
-	function requestLockCurrentFileEntry() {
-		fileEntry.lockFileEntry = new Promise(resolve => releaseLockCurrentFileEntry = resolve);
-	}
-
 	async function requestLockWriter() {
 		zipWriter.writerLocked = true;
 		const { lockWriter } = zipWriter;
@@ -8505,7 +8515,7 @@ function formatSupported(StreamClass, format) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const VERSION = "2.8.60";
+const VERSION = "2.8.61";
 
 /*
  Copyright (c) 2025 Gildas Lormeau. All rights reserved.

package/zip-build/package-lock.json

@@ -7,7 +7,7 @@
 			"name": "single-file-core-zip-build",
 			"devDependencies": {
 				"@rollup/plugin-terser": "1.0.0",
-				"@zip.js/zip.js": "2.8.60",
+				"@zip.js/zip.js": "2.8.61",
 				"rollup": "4.62.4",
 				"terser": "5.50.0"
 			}
@@ -502,9 +502,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@zip.js/zip.js": {
-			"version": "2.8.60",
-			"resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.8.60.tgz",
-			"integrity": "sha512-pULv0waMlnKAUUxrsuAOa0ADONGRuhdHORtuXVgClNlScDB5YjImCV8DZrE1SicaROyE6MwGkH8CLJ+o4Nx07g==",
+			"version": "2.8.61",
+			"resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.8.61.tgz",
+			"integrity": "sha512-F9RnQJXgvCSdAJfMtSrH5Uh/LcLg8fZlg5ARC4u5N4w9v/DG27cN3C/ngUrY1JdJGX2LRv5DDViXeZJgbcppWA==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"engines": {

package/zip-build/package.json

@@ -8,7 +8,7 @@
 	},
 	"devDependencies": {
 		"@rollup/plugin-terser": "1.0.0",
-		"@zip.js/zip.js": "2.8.60",
+		"@zip.js/zip.js": "2.8.61",
 		"rollup": "4.62.4",
 		"terser": "5.50.0"
 	}