@zip.js/zip.js 2.16.1 → 2.17.0

package/dist/zip-fs-core.js

@@ -1900,7 +1900,9 @@
 
 	const ERR_INVALID_UNCOMPRESSED_SIZE = "Invalid uncompressed size";
 	const ERR_INVALID_COMPRESSED_DATA = "Invalid compressed data";
+	const ERR_CODEC_OUT_OF_MEMORY = "Codec out of memory";
 	const ERR_INVALID_CRC32 = "Invalid CRC32";
+	const Z_MEM_ERROR_CODE = "Z_MEM_ERROR";
 	const FORMAT_DEFLATE_RAW = "deflate-raw";
 	const FORMAT_DEFLATE64_RAW = "deflate64-raw";
 	const FORMAT_GZIP = "gzip";
@@ -1935,13 +1937,13 @@
 						readable = pipeThroughCompressionStream(readable, useCompressionStream, { level, chunkSize }, CompressionStream, CompressionStreamFallback);
 					} catch (error) {
 						if (!useCompressionStream && CompressionStreamFallback) {
-							throw error;
+							throw mapMemoryError(error);
 						}
 						let gzipStream;
 						try {
 							gzipStream = new CompressionStream(FORMAT_GZIP);
 						} catch {
-							throw error;
+							throw mapMemoryError(error);
 						}
 						readable = pipeThroughBackpressured(readable, gzipStream);
 						readable = pipeThrough(readable, new GzipToRawDeflateStream());
@@ -2005,50 +2007,30 @@
 		}
 	}
 
-	function pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, crc32) {
+	function pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, crc32, sourceErrors) {
 		const writer = gzipStream.writable.getWriter();
 		const reader = gzipStream.readable.getReader();
 		const outputCrc32 = crc32 === UNDEFINED_VALUE ? new Crc32() : UNDEFINED_VALUE;
 		let outputLength = 0;
-		let inputDone = false;
 		let trailerWritten = false;
-		let idleCheckArmed = false;
-		let readCount = 0;
-		let readPending = false;
-		let resolveTrailerReady, rejectTrailerReady;
-		const trailerReady = new Promise((resolve, reject) => {
-			resolveTrailerReady = resolve;
-			rejectTrailerReady = reject;
-		});
-		trailerReady.catch(() => { });
-		pump();
-		return new ReadableStream({
-			async pull(controller) {
-				try {
-					const { value, done } = await read();
-					if (done) {
-						controller.close();
-					} else {
-						outputLength += value.length;
-						if (outputLength > outputSize) {
-							throw new Error(ERR_INVALID_UNCOMPRESSED_SIZE);
-						}
-						if (outputCrc32) {
-							outputCrc32.append(value);
-						}
-						controller.enqueue(value);
-					}
-				} catch (error) {
-					rejectTrailerReady(error);
-					await cancel(reader, error);
-					throw trailerWritten ? getTrailerError(error) : error;
-				}
+		let settled = false;
+		let resolvePull, controller;
+		const output = new ReadableStream({
+			start(streamController) {
+				controller = streamController;
+			},
+			pull() {
+				resumePump();
 			},
 			cancel(reason) {
-				rejectTrailerReady(reason);
+				settled = true;
+				resumePump();
 				return reader.cancel(reason);
 			}
 		});
+		pump();
+		drain();
+		return output;
 
 		async function pump() {
 			const inputReader = readable.getReader();
@@ -2057,19 +2039,16 @@
 				header.set(GZIP_HEADER_BYTES);
 				await writer.write(header);
 				for (; ;) {
+					await outputCapacity();
 					await writer.ready;
-					const { value, done } = await inputReader.read();
+					const { value, done } = await readSource(inputReader, sourceErrors);
 					if (done) {
 						break;
 					}
 					await writer.write(value);
 				}
-				inputDone = true;
 				if (outputCrc32) {
-					if (readPending) {
-						armIdleCheck();
-					}
-					await trailerReady;
+					await writer.write(new Uint8Array(0));
 				}
 				const trailer = new Uint8Array(GZIP_TRAILER_LENGTH);
 				const dataView = getDataView(trailer);
@@ -2084,54 +2063,68 @@
 			}
 		}
 
-		function read() {
-			readCount++;
-			readPending = true;
-			const result = reader.read();
-			result.then(onReadSettled, onReadSettled);
-			if (inputDone && outputCrc32) {
-				armIdleCheck();
+		async function drain() {
+			try {
+				for (; ;) {
+					const { value, done } = await read();
+					if (done) {
+						break;
+					}
+					outputLength += value.length;
+					if (outputLength > outputSize) {
+						throw new Error(ERR_INVALID_UNCOMPRESSED_SIZE);
+					}
+					if (outputCrc32) {
+						outputCrc32.append(value);
+					}
+					controller.enqueue(value);
+				}
+				if (!settled) {
+					settled = true;
+					controller.close();
+				}
+			} catch (error) {
+				fail(error);
+				await cancel(reader, error);
 			}
-			return result;
 		}
 
-		function onReadSettled() {
-			readPending = false;
-		}
-
-		async function armIdleCheck() {
-			if (!idleCheckArmed) {
-				idleCheckArmed = true;
-				const count = readCount;
-				await nextTask();
-				idleCheckArmed = false;
-				if (readPending) {
-					if (readCount == count) {
-						resolveTrailerReady();
-					} else {
-						armIdleCheck();
+		function read() {
+			return reader.read().catch(error => {
+				if (trailerWritten) {
+					if (!outputCrc32) {
+						throw mapError(error, ERR_INVALID_CRC32);
 					}
+					if (outputLength != outputSize) {
+						throw mapError(error, ERR_INVALID_UNCOMPRESSED_SIZE);
+					}
+					return { done: true };
 				}
-			}
+				throw mapCodecError(error, sourceErrors);
+			});
 		}
 
-		function getTrailerError(error) {
-			const trailerError = new Error(outputLength == outputSize ? ERR_INVALID_CRC32 : ERR_INVALID_UNCOMPRESSED_SIZE);
-			trailerError.cause = error;
-			return trailerError;
+		function outputCapacity() {
+			if (!settled && controller.desiredSize <= 0) {
+				return new Promise(resolve => resolvePull = resolve);
+			}
 		}
-	}
 
-	function nextTask() {
-		return new Promise(resolve => {
-			const { port1, port2 } = new MessageChannel();
-			port2.onmessage = () => {
-				port1.close();
-				port2.close();
+		function resumePump() {
+			if (resolvePull) {
+				const resolve = resolvePull;
+				resolvePull = UNDEFINED_VALUE;
 				resolve();
-			};
-			port1.postMessage(UNDEFINED_VALUE);
-		});
+			}
+		}
+
+		function fail(error) {
+			if (!settled) {
+				settled = true;
+				controller.error(error);
+				resumePump();
+			}
+		}
 	}
 
 	class InflateStream extends TransformStream {
@@ -2150,11 +2143,12 @@
 				}
 			}
 			if (compressed) {
+				const sourceErrors = new Set();
 				const codecStreams = format && getCodecStreams(format);
+				let gzipStream;
 				if (codecStreams) {
-					readable = pipeThroughBackpressured(readable, createCodecStream(codecStreams.DecompressionStream, format, { chunkSize, compressionMethod, rawBitFlag, uncompressedSize: outputSize }));
+					readable = pipeThroughBackpressured(readable, createCodecStream(codecStreams.DecompressionStream, format, { chunkSize, compressionMethod, rawBitFlag, uncompressedSize: outputSize }), sourceErrors);
 				} else {
-					let gzipStream;
 					const GzipDecompressionStream = getGzipCodecStream(useCompressionStream, DecompressionStream, DecompressionStreamFallback);
 					if (checkCrc32 && !deflate64 && crc32 !== UNDEFINED_VALUE && outputSize !== UNDEFINED_VALUE && GzipDecompressionStream) {
 						try {
@@ -2165,24 +2159,25 @@
 					}
 					if (!gzipStream) {
 						try {
-							readable = pipeThroughCompressionStream(readable, useCompressionStream, { chunkSize, deflate64 }, DecompressionStream, DecompressionStreamFallback);
+							readable = pipeThroughCompressionStream(readable, useCompressionStream, { chunkSize, deflate64 }, DecompressionStream, DecompressionStreamFallback, sourceErrors);
 						} catch (error) {
 							if (deflate64 || outputSize === UNDEFINED_VALUE || (!useCompressionStream && DecompressionStreamFallback)) {
-								throw error;
+								throw mapMemoryError(error);
 							}
 							try {
 								gzipStream = new DecompressionStream(FORMAT_GZIP);
 							} catch {
-								throw error;
+								throw mapMemoryError(error);
 							}
 						}
 					}
-					if (gzipStream) {
-						gzipCrc32 = true;
-						readable = pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, crc32);
-					}
 				}
-				readable = mapInflateStreamError(readable);
+				if (gzipStream) {
+					gzipCrc32 = true;
+					readable = pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, crc32, sourceErrors);
+				} else {
+					readable = mapInflateStreamError(readable, sourceErrors);
+				}
 			}
 			if (checkCrc32 && !gzipCrc32) {
 				crc32Stream = new Crc32Stream();
@@ -2255,7 +2250,7 @@
 		}
 	}
 
-	function pipeThroughCompressionStream(readable, useCompressionStream, options, CompressionStreamNative, CompressionStreamFallback) {
+	function pipeThroughCompressionStream(readable, useCompressionStream, options, CompressionStreamNative, CompressionStreamFallback, sourceErrors) {
 		const Stream = useCompressionStream && CompressionStreamNative ?
 			CompressionStreamNative :
 			CompressionStreamFallback || CompressionStreamNative;
@@ -2270,14 +2265,14 @@
 				throw error;
 			}
 		}
-		return pipeThroughBackpressured(readable, codecStream);
+		return pipeThroughBackpressured(readable, codecStream, sourceErrors);
 	}
 
 	function pipeThrough(readable, transformStream) {
 		return toCompatibleReadable(readable).pipeThrough(transformStream);
 	}
 
-	function pipeThroughBackpressured(readable, transformStream) {
+	function pipeThroughBackpressured(readable, transformStream, sourceErrors) {
 		const writer = transformStream.writable.getWriter();
 		const reader = readable.getReader();
 		pump();
@@ -2287,7 +2282,7 @@
 			try {
 				for (; ;) {
 					await writer.ready;
-					const result = await reader.read();
+					const result = await readSource(reader, sourceErrors);
 					if (result.done) {
 						await writer.close();
 						break;
@@ -2317,7 +2312,36 @@
 		}
 	}
 
-	function mapInflateStreamError(readable) {
+	function readSource(reader, sourceErrors) {
+		const result = reader.read();
+		return sourceErrors ? result.catch(error => {
+			sourceErrors.add(error);
+			throw error;
+		}) : result;
+	}
+
+	function mapCodecError(error, sourceErrors) {
+		if (sourceErrors.has(error)) {
+			return error;
+		}
+		return mapError(error, isMemoryError(error) ? ERR_CODEC_OUT_OF_MEMORY : ERR_INVALID_COMPRESSED_DATA);
+	}
+
+	function mapMemoryError(error) {
+		return isMemoryError(error) ? mapError(error, ERR_CODEC_OUT_OF_MEMORY) : error;
+	}
+
+	function isMemoryError(error) {
+		return isErrorObject(error) && error.code == Z_MEM_ERROR_CODE;
+	}
+
+	function mapError(error, message) {
+		const mappedError = new Error(message);
+		mappedError.cause = error;
+		return mappedError;
+	}
+
+	function mapInflateStreamError(readable, sourceErrors) {
 		const reader = readable.getReader();
 		return new ReadableStream({
 			async pull(controller) {
@@ -2330,12 +2354,7 @@
 					}
 				} catch (error) {
 					await cancel(reader, error);
-					if (error && error.message) {
-						throw error;
-					}
-					const mappedError = new Error(ERR_INVALID_COMPRESSED_DATA);
-					mappedError.cause = error;
-					throw mappedError;
+					throw mapCodecError(error, sourceErrors);
 				}
 			},
 			cancel(reason) {
@@ -2699,10 +2718,11 @@
 			}
 			codecStream = new CodecStream(options, config);
 			chunkStream = new ChunkStream(getChunkSize(config));
+			const { signal } = workerOptions.streamOptions;
 			await readable
 				.pipeThrough(codecStream)
 				.pipeThrough(chunkStream)
-				.pipeTo(writable, { preventClose: true, preventAbort: true });
+				.pipeTo(writable, { preventClose: true, preventAbort: true, signal });
 			const {
 				crc32,
 				inputSize,
@@ -2770,6 +2790,7 @@
 	const MODULE_WORKER_OPTIONS = { type: "module" };
 	const ERROR_EVENT_TYPE = "error";
 	const MESSAGE_ERROR_EVENT_TYPE = "messageerror";
+	const ABORT_EVENT_TYPE = "abort";
 
 	let webWorkerSource, webWorkerURI, webWorkerOptions;
 	let transferStreamsSupported = true;
@@ -2946,6 +2967,13 @@
 				Object.assign(workerData, { destinationFailed: true, destinationError: error });
 			}
 		});
+		const { signal } = workerData.workerOptions.streamOptions;
+		if (signal) {
+			const onAbort = () => abortController.abort(signal.reason);
+			const removeAbortListener = () => signal.removeEventListener(ABORT_EVENT_TYPE, onAbort);
+			signal.addEventListener(ABORT_EVENT_TYPE, onAbort);
+			closed.then(removeAbortListener, removeAbortListener);
+		}
 		return {
 			writable, closed, abortPipe: () => {
 				aborting = true;
@@ -3208,9 +3236,6 @@
 			responseError = errorValue.value;
 		} else {
 			responseError = Object.assign(new Error(message), { stack, code, name });
-			if (cause) {
-				responseError.cause = Object.assign(new Error(cause.message), { name: cause.name });
-			}
 		}
 		if (isErrorObject(responseError)) {
 			try {
@@ -3220,6 +3245,9 @@
 				if (codecImportFailed) {
 					responseError.codecImportFailed = true;
 				}
+				if (cause && !isErrorObject(responseError.cause)) {
+					responseError.cause = Object.assign(new Error(cause.message), { name: cause.name });
+				}
 				if (errorValue) {
 					if (responseError.name !== name) {
 						responseError.name = name;
@@ -5562,6 +5590,7 @@
 					({ writable } = writer);
 					const readable = toCompatibleReadable(reader.createReadable({ offset: dataOffset, size }));
 					const { outputSize: writtenSize } = await runWorker({ readable, writable }, workerOptions);
+					throwIfAborted(signal);
 					if (writtenSize != outputSize) {
 						throw Object.assign(new Error(ERR_INVALID_UNCOMPRESSED_SIZE), { outputSize: writtenSize });
 					}
@@ -6357,6 +6386,7 @@
 		ERR_AMBIGUOUS_ARCHIVE: ERR_AMBIGUOUS_ARCHIVE,
 		ERR_BAD_FORMAT: ERR_BAD_FORMAT,
 		ERR_CENTRAL_DIRECTORY_NOT_FOUND: ERR_CENTRAL_DIRECTORY_NOT_FOUND,
+		ERR_CODEC_OUT_OF_MEMORY: ERR_CODEC_OUT_OF_MEMORY,
 		ERR_ENCRYPTED: ERR_ENCRYPTED,
 		ERR_ENCRYPTED_CENTRAL_DIRECTORY: ERR_ENCRYPTED_CENTRAL_DIRECTORY,
 		ERR_ENTRY_DATA_OUT_OF_BOUNDS: ERR_ENTRY_DATA_OUT_OF_BOUNDS,
@@ -7804,6 +7834,7 @@
 				const result = await runWorker({ readable, writable }, workerOptions);
 				compressedSize = result.outputSize;
 				writer.size += compressedSize;
+				throwIfAborted(signal);
 				if (!passThroughCompression) {
 					uncompressedSize = result.inputSize;
 					if (!encrypted || zipCrypto) {
@@ -8983,7 +9014,7 @@
 	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	 */
 
-	const VERSION = "2.16.1";
+	const VERSION = "2.17.0";
 
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.
@@ -9481,6 +9512,7 @@
 	const ERR_ABORT_EXPORT = "zipjs-abort-export";
 	const ABORT_ERROR_NAME = "AbortError";
 	const EMPTY_RAW_PASSWORD = new Uint8Array(0);
+	const FALSE_ACCEPT_ERRORS = new Set([ERR_INVALID_CRC32, ERR_INVALID_UNCOMPRESSED_SIZE, ERR_INVALID_COMPRESSED_DATA]);
 
 	class ZipEntry {
 
@@ -10468,7 +10500,12 @@
 				release();
 			}
 		}
-		throw new Error(tried.size ? ERR_INVALID_PASSWORD : ERR_ENCRYPTED);
+		if (!tried.size) {
+			throw new Error(ERR_ENCRYPTED);
+		}
+		const passwordError = new Error(ERR_INVALID_PASSWORD);
+		passwordError.cause = error;
+		throw passwordError;
 
 		async function tryPasswordCandidate(candidate) {
 			tried.add(candidate.key);
@@ -10489,7 +10526,7 @@
 				rememberPassword(passwordState, candidate);
 				return { done: true, data };
 			} catch (readError) {
-				if (isAbortError(readError, signal) || (!entry.zipCrypto && !isInvalidPasswordError(readError))) {
+				if (isAbortError(readError, signal) || !isWrongPasswordError(readError, entry)) {
 					throw readError;
 				}
 				return { done: false, error: readError };
@@ -10501,6 +10538,10 @@
 		return isErrorObject(error) && error.message == ERR_INVALID_PASSWORD;
 	}
 
+	function isWrongPasswordError(error, entry) {
+		return isInvalidPasswordError(error) || (entry.zipCrypto && isErrorObject(error) && FALSE_ACCEPT_ERRORS.has(error.message));
+	}
+
 	function isAbortError(error, signal) {
 		return Boolean(signal && signal.aborted) || (isErrorObject(error) && error.name == ABORT_ERROR_NAME);
 	}
@@ -10930,6 +10971,7 @@
 	exports.ERR_ANCESTOR_ENTRY = ERR_ANCESTOR_ENTRY;
 	exports.ERR_BAD_FORMAT = ERR_BAD_FORMAT;
 	exports.ERR_CENTRAL_DIRECTORY_NOT_FOUND = ERR_CENTRAL_DIRECTORY_NOT_FOUND;
+	exports.ERR_CODEC_OUT_OF_MEMORY = ERR_CODEC_OUT_OF_MEMORY;
 	exports.ERR_DUPLICATED_NAME = ERR_DUPLICATED_NAME;
 	exports.ERR_DUPLICATE_IMPORTED_ENTRY = ERR_DUPLICATE_IMPORTED_ENTRY;
 	exports.ERR_ENCRYPTED = ERR_ENCRYPTED;