@zip.js/zip.js 2.8.37 → 2.8.39

package/README.md

@@ -14,18 +14,6 @@ See https://gildas-lormeau.github.io/zip-manager
 
 See here for more info: https://gildas-lormeau.github.io/zip.js/
 
-# Bundle size
-
-zip.js is tree-shakeable: import named identifiers and your bundler removes what you do
-not use, e.g. the whole write path if you only read zip files. `import * as zip from
-"@zip.js/zip.js"` keeps everything.
-
-Smaller entry points are also available, e.g. `@zip.js/zip.js/lib/zip-core.js` embeds
-neither the Web Worker code nor the WASM module, pass `workerURI` and `wasmURI` to
-`configure()` instead. The prebuilt bundles in
-[`/dist`](https://github.com/gildas-lormeau/zip.js/tree/master/dist) are standalone files
-for script tags and AMD loaders, they are not tree-shaken.
-
 # Examples
 
 ## Hello world

package/deno.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zip-js/zip-js",
-	"version": "2.8.37",
+	"version": "2.8.39",
 	"exports": {
 		".": "./index.js"
 	},
@@ -24,6 +24,7 @@
 		"benchmarks",
 		"docs",
 		".github",
-		"tests/corpus"
+		"tests/corpus",
+		"tests/fidelity/corpus"
 	]
 }

package/dist/zip-core.js

@@ -46,6 +46,7 @@
 	const LOCAL_FILE_HEADER_SIGNATURE = 0x04034b50;
 	const SPLIT_ZIP_FILE_SIGNATURE = 0x08074b50;
 	const DATA_DESCRIPTOR_RECORD_SIGNATURE = SPLIT_ZIP_FILE_SIGNATURE;
+	const ARCHIVE_EXTRA_DATA_SIGNATURE = 0x08064b50;
 	const CENTRAL_FILE_HEADER_SIGNATURE = 0x02014b50;
 	const END_OF_CENTRAL_DIR_SIGNATURE = 0x06054b50;
 	const ZIP64_END_OF_CENTRAL_DIR_SIGNATURE = 0x06064b50;
@@ -77,6 +78,7 @@
 	const BITFLAG_LEVEL_FAST_MASK = 0b100;
 	const BITFLAG_LEVEL_SUPER_FAST_MASK = 0b110;
 	const BITFLAG_DATA_DESCRIPTOR = 0b1000;
+	const BITFLAG_STRONG_ENCRYPTION = 0b1000000;
 	const BITFLAG_LANG_ENCODING_FLAG = 0b100000000000;
 	const FILE_ATTR_MSDOS_DIR_MASK = 0b10000;
 	const FILE_ATTR_MSDOS_READONLY_MASK = 0x01;
@@ -160,6 +162,7 @@
 		maxWorkers,
 		terminateWorkerTimeout: 5000,
 		workerStarvationTimeout: 5000,
+		workerStartupTimeout: 5000,
 		useWebWorkers: true,
 		useCompressionStream: true,
 		transferStreams: true,
@@ -175,6 +178,7 @@
 		"maxWorkers",
 		"terminateWorkerTimeout",
 		"workerStarvationTimeout",
+		"workerStartupTimeout",
 		"useCompressionStream",
 		"useWebWorkers",
 		"transferStreams",
@@ -1710,7 +1714,7 @@
 					if (zipCrypto.password || zipCrypto.rawPassword) {
 						const decryptedHeader = decrypt(zipCrypto, chunk.subarray(0, HEADER_LENGTH));
 						zipCrypto.password = zipCrypto.rawPassword = null;
-						if ((decryptedHeader.at(-1) ^ zipCrypto.passwordVerification) != 0) {
+						if ((decryptedHeader[HEADER_LENGTH - 1] ^ zipCrypto.passwordVerification) != 0) {
 							throw new Error(ERR_INVALID_PASSWORD);
 						}
 						chunk = chunk.subarray(HEADER_LENGTH);
@@ -1883,7 +1887,7 @@
 					readable = pipeThroughBackpressured(readable, new CompressionStream(FORMAT_GZIP));
 					readable = pipeThrough(readable, gzipCrc32Stream);
 				} else {
-					readable = pipeThroughCommpressionStream(readable, useCompressionStream, { level, chunkSize }, CompressionStream, CompressionStreamZlib, CompressionStream);
+					readable = pipeThroughCompressionStream(readable, useCompressionStream, { level, chunkSize }, CompressionStream, CompressionStreamZlib);
 				}
 			}
 			if (encrypted) {
@@ -1968,7 +1972,7 @@
 				if (codecStreams) {
 					readable = pipeThroughBackpressured(readable, createCodecStream(codecStreams.DecompressionStream, format, { chunkSize }));
 				} else {
-					readable = pipeThroughCommpressionStream(readable, useCompressionStream, { chunkSize, deflate64 }, DecompressionStream, DecompressionStreamZlib, DecompressionStream);
+					readable = pipeThroughCompressionStream(readable, useCompressionStream, { chunkSize, deflate64 }, DecompressionStream, DecompressionStreamZlib);
 				}
 				readable = mapInflateStreamError(readable);
 			}
@@ -1987,6 +1991,25 @@
 		}
 	}
 
+	const deflateRawSupportByStream = new Map();
+
+	function supportsDeflateRaw(StreamClass) {
+		if (!StreamClass) {
+			return false;
+		}
+		let supported = deflateRawSupportByStream.get(StreamClass);
+		if (supported === UNDEFINED_VALUE) {
+			try {
+				new StreamClass(FORMAT_DEFLATE_RAW);
+				supported = true;
+			} catch {
+				supported = false;
+			}
+			deflateRawSupportByStream.set(StreamClass, supported);
+		}
+		return supported;
+	}
+
 	function setReadable(stream, readable, flush) {
 		readable = pipeThrough(readable, new TransformStream({ flush }));
 		Object.defineProperty(stream, "readable", {
@@ -2003,21 +2026,17 @@
 		return new CodecStreamClass(format, options);
 	}
 
-	function pipeThroughCommpressionStream(readable, useCompressionStream, options, CompressionStreamNative, CompressionStreamZlib, CompressionStream) {
-		const Stream = useCompressionStream && CompressionStreamNative ? CompressionStreamNative : CompressionStreamZlib || CompressionStream;
+	function pipeThroughCompressionStream(readable, useCompressionStream, options, CompressionStreamNative, CompressionStreamZlib) {
+		const Stream = useCompressionStream && CompressionStreamNative ?
+			CompressionStreamNative :
+			CompressionStreamZlib || CompressionStreamNative;
 		const format = options.deflate64 ? FORMAT_DEFLATE64_RAW : FORMAT_DEFLATE_RAW;
 		let codecStream;
 		try {
 			codecStream = new Stream(format, options);
 		} catch (error) {
-			if (useCompressionStream) {
-				if (CompressionStreamZlib) {
-					codecStream = new CompressionStreamZlib(format, options);
-				} else if (CompressionStream) {
-					codecStream = new CompressionStream(format, options);
-				} else {
-					throw error;
-				}
+			if (useCompressionStream && CompressionStreamZlib && Stream != CompressionStreamZlib) {
+				codecStream = new CompressionStreamZlib(format, options);
 			} else {
 				throw error;
 			}
@@ -2278,6 +2297,7 @@
 	const MODULE_WORKER_OPTIONS = { type: "module" };
 	const ERROR_EVENT_TYPE = "error";
 	const MESSAGE_ERROR_EVENT_TYPE = "messageerror";
+	const ERR_WORKER_STARTUP_TIMEOUT = "Worker startup timeout";
 
 	let webWorkerSupported, webWorkerSource, webWorkerURI, webWorkerOptions;
 	let transferStreamsSupported = true;
@@ -2288,6 +2308,10 @@
 	}
 	let initModule = () => { };
 
+	function resetWebWorkerSupport() {
+		webWorkerSupported = UNDEFINED_VALUE;
+	}
+
 	class CodecWorker {
 
 		constructor(workerData, { readable, writable }, { options, config, streamOptions, useWebWorkers, transferStreams, workerURI }, onTaskFinished) {
@@ -2381,7 +2405,7 @@
 	}
 
 	function createWebWorkerInterface(workerData, config) {
-		const { baseURI, chunkSize } = config;
+		const { baseURI, chunkSize, workerStartupTimeout } = config;
 		let { wasmURI } = config;
 
 		if (!workerData.interface) {
@@ -2398,9 +2422,26 @@
 			}
 			Object.assign(workerData, {
 				worker,
+				workerAlive: false,
 				terminated: false,
 				interface: {
-					run: () => runWebWorker(workerData, { chunkSize, wasmURI, baseURI })
+					run: async () => {
+						try {
+							return await runWebWorker(workerData, { chunkSize, wasmURI, baseURI, workerStartupTimeout });
+						} catch (error) {
+							if (error && error.workerStartupFailed) {
+								webWorkerSupported = false;
+								const { reader } = workerData;
+								if (reader) {
+									reader.releaseLock();
+								}
+								workerData.reader = null;
+								workerData.writer = null;
+								return runWorker$1(workerData, config);
+							}
+							throw error;
+						}
+					}
 				}
 			});
 		}
@@ -2410,15 +2451,23 @@
 	async function runWorker$1({ options, readable, writable, onTaskFinished }, config) {
 		let codecStream;
 		try {
-			if (!options.useCompressionStream) {
-				try {
-					await initModule(config);
-				} catch {
-					const ZlibStream = options.codecType.startsWith(CODEC_DEFLATE) ?
-						config.CompressionStreamZlib :
-						config.DecompressionStreamZlib;
-					if (!ZlibStream || ZlibStream.requiresModule) {
-						options.useCompressionStream = true;
+			if (options.compressed && !options.format) {
+				const deflate = options.codecType.startsWith(CODEC_DEFLATE);
+				const ZlibStream = deflate ? config.CompressionStreamZlib : config.DecompressionStreamZlib;
+				const NativeStream = deflate ? config.CompressionStream : config.DecompressionStream;
+				if (!options.useCompressionStream) {
+					try {
+						await initModule(config);
+					} catch {
+						if (!ZlibStream || ZlibStream.requiresModule) {
+							options.useCompressionStream = true;
+						}
+					}
+				} else if (ZlibStream && ZlibStream.requiresModule && !supportsDeflateRaw(NativeStream)) {
+					try {
+						await initModule(config);
+					} catch {
+						// ignored
 					}
 				}
 			}
@@ -2487,6 +2536,10 @@
 				writer: writable.getWriter()
 			});
 		}
+		const { workerStartupTimeout } = config;
+		if (!workerData.workerAlive && Number.isFinite(workerStartupTimeout) && workerStartupTimeout >= 0) {
+			workerData.startupTimeout = setTimeout(() => onStartupTimeout(workerData), workerStartupTimeout);
+		}
 		try {
 			const resultValue = await result;
 			await closeWritable();
@@ -2599,28 +2652,68 @@
 		} else {
 			worker = new Worker(webWorkerURI, webWorkerOptions);
 		}
-		worker.addEventListener(MESSAGE_EVENT_TYPE, event => onMessage(event, workerData));
+		worker.addEventListener(MESSAGE_EVENT_TYPE, event => {
+			workerData.workerAlive = true;
+			clearStartupTimeout(workerData);
+			onMessage(event, workerData);
+		});
 		worker.addEventListener(ERROR_EVENT_TYPE, event => onWorkerError(event, workerData));
 		worker.addEventListener(MESSAGE_ERROR_EVENT_TYPE, event => onWorkerError(event, workerData));
 		return worker;
 	}
 
+	function onStartupTimeout(workerData) {
+		workerData.startupTimeout = null;
+		if (workerData.workerAlive) {
+			return;
+		}
+		const { rejectResult, writer } = workerData;
+		terminateWorker$1(workerData);
+		workerData.worker = null;
+		if (rejectResult) {
+			const error = new Error(ERR_WORKER_STARTUP_TIMEOUT);
+			error.workerStartupFailed = true;
+			rejectResult(error);
+			if (writer) {
+				writer.releaseLock();
+			}
+		}
+	}
+
+	function clearStartupTimeout(workerData) {
+		const { startupTimeout } = workerData;
+		if (startupTimeout) {
+			clearTimeout(startupTimeout);
+			workerData.startupTimeout = null;
+		}
+	}
+
 	function onWorkerError(event, workerData) {
 		if (event.preventDefault) {
 			event.preventDefault();
 		}
-		const { rejectResult, writer, onTaskFinished } = workerData;
+		clearStartupTimeout(workerData);
+		const { workerAlive, rejectResult, writer, onTaskFinished } = workerData;
 		terminateWorker$1(workerData);
+		if (!workerAlive) {
+			workerData.worker = null;
+		}
 		if (rejectResult) {
-			rejectResult(event.error || new Error(event.message || ERROR_EVENT_TYPE));
+			let error = event.error || new Error(event.message || ERROR_EVENT_TYPE);
+			if (!workerAlive) {
+				error = Object.assign(new Error(error.message || ERROR_EVENT_TYPE), { workerStartupFailed: true });
+			}
+			rejectResult(error);
 			if (writer) {
 				writer.releaseLock();
 			}
-			onTaskFinished();
+			if (workerAlive) {
+				onTaskFinished();
+			}
 		}
 	}
 
-	function sendMessage(message, { worker, writer, transferStreams }) {
+	function sendMessage(message, { worker, writer, transferStreams, workerAlive }) {
 		try {
 			const { value, readable, writable } = message;
 			const transferables = [];
@@ -2628,7 +2721,7 @@
 				message.value = toExactUint8Array(value);
 				transferables.push(message.value.buffer);
 			}
-			if (transferStreams && transferStreamsSupported) {
+			if (transferStreams && transferStreamsSupported && workerAlive) {
 				if (readable) {
 					transferables.push(readable);
 				}
@@ -2866,6 +2959,7 @@
 			clearTerminateTimeout(workerData);
 			return workerData.terminate();
 		}));
+		resetWebWorkerSupport();
 	}
 
 	/*
@@ -3642,7 +3736,7 @@
 
 		getDiskOffset(diskNumber) {
 			const { diskOffsets, size } = this;
-			const diskOffset = diskOffsets.at(diskNumber);
+			const diskOffset = diskOffsets[diskNumber];
 			return diskOffset === UNDEFINED_VALUE ? size : diskOffset;
 		}
 
@@ -4149,6 +4243,7 @@
 	const ERR_SPLIT_ZIP_FILE = "Split zip file";
 	const ERR_OVERLAPPING_ENTRY = "Overlapping entry found";
 	const ERR_AMBIGUOUS_ARCHIVE = "Ambiguous archive";
+	const ERR_ENCRYPTED_CENTRAL_DIRECTORY = "Encrypted central directory is not supported";
 	const CHARSET_UTF8 = "utf-8";
 	const PROPERTY_NAME_UTF8_SUFFIX = "UTF8";
 	const CHARSET_CP437 = "cp437";
@@ -4226,6 +4321,7 @@
 			let prependedDataLength = 0;
 			let startOffset;
 			let zip64EndOfDirectory;
+			let zip64EndOfDirectoryVersion2;
 			const requiresZip64 = directoryDataOffset == MAX_32_BITS || directoryDataLength == MAX_32_BITS || filesLength == MAX_16_BITS || diskNumber == MAX_16_BITS;
 			if (directoryDataOffset != MAX_32_BITS && diskNumber != MAX_16_BITS) {
 				directoryDataOffset += getDiskOffset$1(reader, diskNumber);
@@ -4255,6 +4351,7 @@
 						throw new Error(ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND);
 					}
 					zip64EndOfDirectory = true;
+					zip64EndOfDirectoryVersion2 = getBigUint64(endOfDirectoryView, 4) > ZIP64_END_OF_CENTRAL_DIR_LENGTH - 12;
 					if (lastDiskNumber == MAX_16_BITS) {
 						lastDiskNumber = getUint32(endOfDirectoryView, 16);
 					} else if (checkAmbiguity && lastDiskNumber != getUint32(endOfDirectoryView, 16)) {
@@ -4334,6 +4431,9 @@
 			for (let indexFile = 0; indexFile < filesLength; indexFile++) {
 				const fileEntry = new ZipEntry(reader, config, zipReader.options);
 				if (offset + CENTRAL_FILE_HEADER_LENGTH > directoryArray.length || getUint32(directoryView, offset) != CENTRAL_FILE_HEADER_SIGNATURE) {
+					if (indexFile == 0 && (zip64EndOfDirectoryVersion2 || detectEncryptedCentralDirectory(directoryView))) {
+						throw new Error(ERR_ENCRYPTED_CENTRAL_DIRECTORY);
+					}
 					throw new Error(ERR_CENTRAL_DIRECTORY_NOT_FOUND);
 				}
 				readCommonHeader(fileEntry, directoryView, offset + 6);
@@ -4601,6 +4701,9 @@
 				fileEntry.zipCrypto = zipCrypto;
 			}
 			if (encrypted) {
+				if ((localDirectory.rawBitFlag & BITFLAG_STRONG_ENCRYPTION) == BITFLAG_STRONG_ENCRYPTION) {
+					throw new Error(ERR_UNSUPPORTED_ENCRYPTION);
+				}
 				if (!zipCrypto && (extraFieldAES.strength < 1 || extraFieldAES.strength > 3)) {
 					throw new Error(ERR_UNSUPPORTED_ENCRYPTION);
 				} else if (!password && !rawPassword) {
@@ -4694,6 +4797,16 @@
 		}
 	}
 
+	function detectEncryptedCentralDirectory(directoryView) {
+		const maxOffset = Math.min(directoryView.byteLength, 1024) - 3;
+		for (let offset = 0; offset < maxOffset; offset++) {
+			if (getUint32(directoryView, offset) == ARCHIVE_EXTRA_DATA_SIGNATURE) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	function readCommonHeader(directory, dataView, offset) {
 		const rawBitFlag = directory.rawBitFlag = getUint16(dataView, offset + 2);
 		const encrypted = (rawBitFlag & BITFLAG_ENCRYPTED) == BITFLAG_ENCRYPTED;
@@ -5208,6 +5321,7 @@
 		ERR_BAD_FORMAT: ERR_BAD_FORMAT,
 		ERR_CENTRAL_DIRECTORY_NOT_FOUND: ERR_CENTRAL_DIRECTORY_NOT_FOUND,
 		ERR_ENCRYPTED: ERR_ENCRYPTED,
+		ERR_ENCRYPTED_CENTRAL_DIRECTORY: ERR_ENCRYPTED_CENTRAL_DIRECTORY,
 		ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND: ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND,
 		ERR_EOCDR_NOT_FOUND: ERR_EOCDR_NOT_FOUND,
 		ERR_EXTRAFIELD_ZIP64_NOT_FOUND: ERR_EXTRAFIELD_ZIP64_NOT_FOUND,
@@ -5620,7 +5734,11 @@
 		if (versionMadeBy > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_VERSION);
 		}
-		let externalFileAttributes = getOptionValue(zipWriter, options, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTES, 0);
+		let externalFileAttributes = getOptionValue(zipWriter, options, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTES);
+		const externalFileAttributesProvided = externalFileAttributes !== UNDEFINED_VALUE;
+		if (!externalFileAttributesProvided) {
+			externalFileAttributes = 0;
+		}
 		if (!options[PROPERTY_NAME_DIRECTORY] && name.endsWith(DIRECTORY_SIGNATURE)) {
 			options[PROPERTY_NAME_DIRECTORY] = true;
 		}
@@ -5629,13 +5747,13 @@
 			if (!name.endsWith(DIRECTORY_SIGNATURE)) {
 				name += DIRECTORY_SIGNATURE;
 			}
-			if (externalFileAttributes === 0) {
+			if (!externalFileAttributesProvided) {
 				externalFileAttributes = FILE_ATTR_MSDOS_DIR_MASK;
 				if (!msDosCompatible) {
 					externalFileAttributes |= (FILE_ATTR_UNIX_TYPE_DIR | FILE_ATTR_UNIX_EXECUTABLE_MASK | FILE_ATTR_UNIX_DEFAULT_MASK) << 16;
 				}
 			}
-		} else if (!msDosCompatible && externalFileAttributes === 0) {
+		} else if (!msDosCompatible && !externalFileAttributesProvided) {
 			if (executable) {
 				externalFileAttributes = (FILE_ATTR_UNIX_EXECUTABLE_MASK | FILE_ATTR_UNIX_DEFAULT_MASK) << 16;
 			} else {
@@ -5644,6 +5762,7 @@
 		}
 		let unixExternalUpper;
 		if (!msDosCompatible) {
+			const unixModeProvided = unixMode !== UNDEFINED_VALUE || Boolean(setuid || setgid || sticky);
 			unixExternalUpper = (externalFileAttributes >> 16) & MAX_16_BITS;
 			unixMode = unixMode === UNDEFINED_VALUE ? unixExternalUpper : (unixMode & MAX_16_BITS);
 			if (setuid) {
@@ -5661,10 +5780,12 @@
 			} else {
 				sticky = Boolean(unixMode & FILE_ATTR_UNIX_STICKY_MASK);
 			}
-			if (directory) {
-				unixMode |= FILE_ATTR_UNIX_TYPE_DIR;
+			if (!externalFileAttributesProvided || unixModeProvided) {
+				if (directory) {
+					unixMode |= FILE_ATTR_UNIX_TYPE_DIR;
+				}
+				externalFileAttributes = ((unixMode & MAX_16_BITS) << 16) | (externalFileAttributes & MAX_16_BITS);
 			}
-			externalFileAttributes = ((unixMode & MAX_16_BITS) << 16) | (externalFileAttributes & MAX_8_BITS);
 		}
 		({ msdosAttributesRaw, msdosAttributes } = normalizeMsdosAttributes(msdosAttributesRaw, msdosAttributes));
 		if (hasMsDosProvided) {
@@ -6387,6 +6508,7 @@
 		if (extraFieldLength > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
 		}
+		const dosLastModDate = new Date(Math.ceil(lastModDate.getTime() / 2000) * 2000);
 		const {
 			headerArray,
 			headerView,
@@ -6396,7 +6518,7 @@
 			bitFlag: getBitFlag(level, useUnicodeFileNames, dataDescriptor, encrypted, compressionMethod),
 			compressionMethod,
 			uncompressedSize,
-			lastModDate: lastModDate < MIN_DATE ? MIN_DATE : lastModDate > MAX_DATE ? MAX_DATE : lastModDate,
+			lastModDate: dosLastModDate < MIN_DATE ? MIN_DATE : dosLastModDate > MAX_DATE ? MAX_DATE : dosLastModDate,
 			rawFilename,
 			zip64CompressedSize,
 			zip64UncompressedSize,
@@ -7494,6 +7616,7 @@
 	exports.ERR_CENTRAL_DIRECTORY_NOT_FOUND = ERR_CENTRAL_DIRECTORY_NOT_FOUND;
 	exports.ERR_DUPLICATED_NAME = ERR_DUPLICATED_NAME;
 	exports.ERR_ENCRYPTED = ERR_ENCRYPTED;
+	exports.ERR_ENCRYPTED_CENTRAL_DIRECTORY = ERR_ENCRYPTED_CENTRAL_DIRECTORY;
 	exports.ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND = ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND;
 	exports.ERR_EOCDR_NOT_FOUND = ERR_EOCDR_NOT_FOUND;
 	exports.ERR_EXTRAFIELD_ZIP64_NOT_FOUND = ERR_EXTRAFIELD_ZIP64_NOT_FOUND;