@zip.js/zip.js 2.14.1 → 2.15.0

package/dist/zip-fs-core.js

@@ -1869,8 +1869,8 @@
 			let crc32Stream, encryptionStream, gzipCrc32Stream;
 			let readable = super.readable;
 			const codecStreams = format && getCodecStreams(format);
-			const useGzipCrc32 = computeCrc32 && compressed && !deflate64 && !codecStreams && (!encrypted || zipCrypto) &&
-				Boolean(useCompressionStream && CompressionStream);
+			const GzipCompressionStream = getGzipCompressionStream(useCompressionStream, CompressionStream, CompressionStreamFallback);
+			const useGzipCrc32 = computeCrc32 && compressed && !deflate64 && !codecStreams && (!encrypted || zipCrypto) && Boolean(GzipCompressionStream);
 			if ((!encrypted || zipCrypto) && computeCrc32 && !useGzipCrc32) {
 				crc32Stream = new Crc32Stream();
 				readable = pipeThrough(readable, crc32Stream);
@@ -1880,7 +1880,7 @@
 					readable = pipeThroughBackpressured(readable, createCodecStream(codecStreams.CompressionStream, format, { level, chunkSize, compressionMethod, uncompressedSize: inputSize }));
 				} else if (useGzipCrc32) {
 					gzipCrc32Stream = new GzipToRawDeflateStream();
-					readable = pipeThroughBackpressured(readable, new CompressionStream(FORMAT_GZIP));
+					readable = pipeThroughBackpressured(readable, new GzipCompressionStream(FORMAT_GZIP, { level, chunkSize }));
 					readable = pipeThrough(readable, gzipCrc32Stream);
 				} else {
 					try {
@@ -1954,8 +1954,7 @@
 		}
 	}
 
-	function pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize) {
-		const crc32 = new Crc32();
+	function pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, crc32) {
 		let outputLength = 0;
 		let inputDone = false;
 		let watchdogTimeout;
@@ -2029,7 +2028,7 @@
 		constructor(options, { chunkSize, DecompressionStreamFallback, DecompressionStream }) {
 			super({});
 			const { zipCrypto, encrypted, checkCrc32, crc32, compressed, useCompressionStream, deflate64, format, compressionMethod, rawBitFlag, outputSize } = options;
-			let crc32Stream, decryptionStream;
+			let crc32Stream, decryptionStream, gzipCrc32;
 			let readable = super.readable;
 			if (encrypted) {
 				if (zipCrypto) {
@@ -2056,19 +2055,20 @@
 						} catch {
 							throw error;
 						}
-						readable = pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize);
+						gzipCrc32 = new Crc32();
+						readable = pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, gzipCrc32);
 					}
 				}
 				readable = mapInflateStreamError(readable);
 			}
-			if (checkCrc32) {
+			if (checkCrc32 && !gzipCrc32) {
 				crc32Stream = new Crc32Stream();
 				readable = pipeThrough(readable, crc32Stream);
 			}
 			setReadable(this, readable, () => {
 				if (checkCrc32) {
-					const computedCrc32View = new DataView(crc32Stream.value.buffer);
-					if (crc32 != computedCrc32View.getUint32(0, false)) {
+					const computedCrc32 = gzipCrc32 ? gzipCrc32.get() >>> 0 : new DataView(crc32Stream.value.buffer).getUint32(0, false);
+					if (crc32 != computedCrc32) {
 						throw new Error(ERR_INVALID_CRC32);
 					}
 				}
@@ -2124,6 +2124,14 @@
 		return new CodecStreamClass(format, options);
 	}
 
+	function getGzipCompressionStream(useCompressionStream, CompressionStreamNative, CompressionStreamFallback) {
+		if (useCompressionStream && CompressionStreamNative) {
+			return CompressionStreamNative;
+		} else if (CompressionStreamFallback && CompressionStreamFallback.requiresModule) {
+			return CompressionStreamFallback;
+		}
+	}
+
 	function pipeThroughCompressionStream(readable, useCompressionStream, options, CompressionStreamNative, CompressionStreamFallback) {
 		const Stream = useCompressionStream && CompressionStreamNative ?
 			CompressionStreamNative :
@@ -2492,10 +2500,12 @@
 								workerData.terminated = true;
 								worker.terminate();
 							}
-							terminateResolvers.forEach(resolve => resolve());
 						}
 						workerData.busy = false;
-						onTaskFinished(workerData);
+						const pendingTasks = onTaskFinished(workerData);
+						if (terminateResolvers) {
+							terminateResolvers.forEach(resolve => resolve(pendingTasks));
+						}
 					}
 				}
 			});
@@ -3180,7 +3190,10 @@
 
 		function onTaskFinished(workerData) {
 			clearStarvationTimeout();
-			if (pendingRequests.length) {
+			if (workerData.terminated) {
+				workerData.terminated = false;
+				return runPendingRequestsInline();
+			} else if (pendingRequests.length) {
 				const [{ resolve, stream, workerOptions }] = pendingRequests.splice(0, 1);
 				resolve(new CodecWorker(workerData, stream, workerOptions, onTaskFinished));
 				armStarvationTimeout();
@@ -3218,12 +3231,26 @@
 		starvationTimeout = null;
 		if (pendingRequests.length) {
 			const [{ resolve, stream, workerOptions }] = pendingRequests.splice(0, 1);
-			const inlineWorkerOptions = Object.assign({}, workerOptions, { useWebWorkers: false, workerURI: UNDEFINED_VALUE, createWorker: UNDEFINED_VALUE });
-			resolve(new CodecWorker({}, stream, inlineWorkerOptions, onInlineTaskFinished));
+			resolve(new CodecWorker({}, stream, getInlineWorkerOptions(workerOptions), onInlineTaskFinished));
 			armStarvationTimeout();
 		}
 	}
 
+	function runPendingRequestsInline() {
+		const tasks = pendingRequests.splice(0).map(({ resolve, stream, workerOptions }) => new Promise(resolveTask => {
+			resolve(new CodecWorker({}, stream, getInlineWorkerOptions(workerOptions), () => {
+				onInlineTaskFinished();
+				resolveTask();
+			}));
+		}));
+		clearStarvationTimeout();
+		return Promise.all(tasks);
+	}
+
+	function getInlineWorkerOptions(workerOptions) {
+		return Object.assign({}, workerOptions, { useWebWorkers: false, workerURI: UNDEFINED_VALUE, createWorker: UNDEFINED_VALUE });
+	}
+
 	function onInlineTaskFinished() {
 		clearStarvationTimeout();
 		armStarvationTimeout();
@@ -3233,18 +3260,14 @@
 		const { config } = workerOptions;
 		const { terminateWorkerTimeout } = config;
 		if (Number.isFinite(terminateWorkerTimeout) && terminateWorkerTimeout >= 0) {
-			if (workerData.terminated) {
-				workerData.terminated = false;
-			} else {
-				workerData.terminateTimeout = setTimeout(async () => {
-					pool = pool.filter(data => data != workerData);
-					try {
-						await workerData.terminate();
-					} catch {
-						// ignored
-					}
-				}, terminateWorkerTimeout);
-			}
+			workerData.terminateTimeout = setTimeout(async () => {
+				pool = pool.filter(data => data != workerData);
+				try {
+					await workerData.terminate();
+				} catch {
+					// ignored
+				}
+			}, terminateWorkerTimeout);
 		}
 	}
 
@@ -3257,10 +3280,13 @@
 	}
 
 	async function terminateWorkers() {
-		await Promise.allSettled(pool.map(workerData => {
-			clearTerminateTimeout(workerData);
-			return workerData.terminate();
-		}));
+		await Promise.allSettled([
+			runPendingRequestsInline(),
+			...pool.map(workerData => {
+				clearTerminateTimeout(workerData);
+				return workerData.terminate();
+			})
+		]);
 		resetWebWorkerSupport();
 	}
 
@@ -3335,6 +3361,19 @@
 		return decode(value, encoding, true);
 	}
 
+	function isUTF8Text(value) {
+		if (value.some(byte => byte > 0x7f)) {
+			try {
+				new TextDecoder("utf-8", { fatal: true }).decode(value);
+				return true;
+			} catch {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+
 	function decodeTextRemovingBOM(value, encoding) {
 		return decode(value, encoding, false);
 	}
@@ -4644,6 +4683,7 @@
 	const WARNING_MISMATCHED_LOCAL_FILE_HEADER_CRC32_OR_SIZES = "mismatched local file header (crc32 or sizes)";
 	const MAX_KNOWN_VERSION = 63;
 	const DRIVE_LETTER_REGEXP = /^[a-zA-Z]:/;
+	const PARENT_DIRECTORY_REGEXP = /(^|[\\/])\.\.([\\/]|$)/;
 	const CHARSET_UTF8 = "utf-8";
 	const PROPERTY_NAME_UTF8_SUFFIX = "UTF8";
 	const CHARSET_CP437 = "cp437";
@@ -4896,12 +4936,13 @@
 				const versionMadeBy = getUint16$1(directoryView, offset + 4);
 				const msDosCompatible = versionMadeBy >> 8 == 0;
 				const unixCompatible = versionMadeBy >> 8 == 3;
-				const rawFilename = directoryArray.subarray(filenameOffset, extraFieldOffset);
 				const commentLength = getUint16$1(directoryView, offset + 32);
 				const endOffset = commentOffset + commentLength;
-				const rawComment = directoryArray.subarray(commentOffset, endOffset);
-				const filenameUTF8 = languageEncodingFlag;
-				const commentUTF8 = languageEncodingFlag;
+				const rawEntryData = new Uint8Array(directoryArray.subarray(filenameOffset, endOffset));
+				const rawFilename = rawEntryData.subarray(0, fileEntry.filenameLength);
+				const rawComment = rawEntryData.subarray(fileEntry.filenameLength + fileEntry.extraFieldLength);
+				const filenameUTF8 = languageEncodingFlag || (!filenameEncoding && isUTF8Text(rawFilename));
+				const commentUTF8 = languageEncodingFlag || (!commentEncoding && isUTF8Text(rawComment));
 				const externalFileAttributes = getUint32$1(directoryView, offset + 38);
 				const msdosAttributesRaw = externalFileAttributes & MAX_8_BITS;
 				const msdosAttributes = {
@@ -4952,7 +4993,7 @@
 					rawFilename,
 					filenameUTF8,
 					commentUTF8,
-					rawExtraField: directoryArray.subarray(extraFieldOffset, commentOffset),
+					rawExtraField: rawEntryData.subarray(fileEntry.filenameLength, fileEntry.filenameLength + fileEntry.extraFieldLength),
 					rawComment,
 					filename,
 					comment
@@ -5460,7 +5501,7 @@
 			if (getUint32$1(signatureRecordView, 0) == DIGITAL_SIGNATURE_RECORD_SIGNATURE) {
 				const signatureDataLength = getUint16$1(signatureRecordView, 4);
 				if (6 + signatureDataLength <= signatureRecordArray.length) {
-					return signatureRecordArray.subarray(6, 6 + signatureDataLength);
+					return new Uint8Array(signatureRecordArray.subarray(6, 6 + signatureDataLength));
 				}
 			}
 		}
@@ -5983,10 +6024,10 @@
 		if (pathParts.length > 1 && pathParts[pathParts.length - 1] === "") {
 			pathParts.pop();
 		}
-		if (pathParts.includes("..") || filename.startsWith("/") || filename.startsWith("\\\\") || DRIVE_LETTER_REGEXP.test(filename)) {
+		if (PARENT_DIRECTORY_REGEXP.test(filename) || filename.startsWith("/") || filename.startsWith("\\") || DRIVE_LETTER_REGEXP.test(filename)) {
 			return true;
 		}
-		return filenameValidation == STRICTNESS_STRICT && (pathParts.includes(".") || pathParts.includes(""));
+		return filenameValidation == STRICTNESS_STRICT && (pathParts.includes(".") || pathParts.includes("") || filename.includes("\0"));
 	}
 
 	function getMaxAppendedDataSize(maxAppendedDataSize, strictness) {
@@ -6072,7 +6113,7 @@
 	}
 
 	function getEndOfCentralDirectoryInfo(scanArray, indexByte, offset) {
-		return { offset, buffer: scanArray.slice(indexByte, indexByte + END_OF_CENTRAL_DIR_LENGTH).buffer };
+		return { offset, buffer: new Uint8Array(scanArray.subarray(indexByte, indexByte + END_OF_CENTRAL_DIR_LENGTH)).buffer };
 	}
 
 	async function getCentralDirectoryReachability(reader, view, anchoredOffset, indexByte, offset, size, remoteProbeBudget) {
@@ -8817,7 +8858,7 @@
 	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	 */
 
-	const VERSION = "2.14.1";
+	const VERSION = "2.15.0";
 
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.