@zip.js/zip.js 2.8.36 → 2.8.38

package/dist/zip-fs-core.js

@@ -45,6 +45,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;
@@ -76,6 +77,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;
@@ -103,7 +105,7 @@
 	const HEADER_OFFSET_UNCOMPRESSED_SIZE = 18;
 	const LOCAL_HEADER_COMMON_OFFSET = 4;
 
-	const MAX_DATE = new Date(2107, 11, 31);
+	const MAX_DATE = new Date(2107, 11, 31, 23, 59, 58);
 	const MIN_DATE = new Date(1980, 0, 1);
 
 	const UNDEFINED_VALUE = undefined;
@@ -159,6 +161,7 @@
 		maxWorkers,
 		terminateWorkerTimeout: 5000,
 		workerStarvationTimeout: 5000,
+		workerStartupTimeout: 5000,
 		useWebWorkers: true,
 		useCompressionStream: true,
 		transferStreams: true,
@@ -1171,6 +1174,61 @@
 		return reader.readUint8Array(offset, size);
 	}
 
+	/*
+	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.
+
+	 Redistribution and use in source and binary forms, with or without
+	 modification, are permitted provided that the following conditions are met:
+
+	 1. Redistributions of source code must retain the above copyright notice,
+	 this list of conditions and the following disclaimer.
+
+	 2. Redistributions in binary form must reproduce the above copyright
+	 notice, this list of conditions and the following disclaimer in
+	 the documentation and/or other materials provided with the distribution.
+
+	 3. The names of the authors may not be used to endorse or promote products
+	 derived from this software without specific prior written permission.
+
+	 THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+	 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+	 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+	 INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+	 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+	 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+	 OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+	 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+	 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 */
+
+	const ERR_INVALID_CODEC_MODULE = "Invalid codec module";
+
+	const registeredCodecs = new Map();
+	const codecStreams = new Map();
+
+	function getRegisteredCodec(compressionMethod) {
+		return registeredCodecs.get(compressionMethod);
+	}
+
+	function getCodecStreams(format) {
+		return codecStreams.get(format);
+	}
+
+	function setCodecStreams(format, streams) {
+		const { CompressionStream, DecompressionStream } = streams;
+		if (typeof CompressionStream != FUNCTION_TYPE && typeof DecompressionStream != FUNCTION_TYPE) {
+			throw new Error(ERR_INVALID_CODEC_MODULE);
+		}
+		codecStreams.set(format, { CompressionStream, DecompressionStream });
+	}
+
+	async function ensureCodecStreams(format, codecURI) {
+		if (!codecStreams.has(format) && codecURI) {
+			setCodecStreams(format, await import(codecURI));
+		}
+	}
+
 	/*
 	 Copyright (c) 2022 Gildas Lormeau. All rights reserved.
 
@@ -2663,6 +2721,7 @@
 
 	const ERR_INVALID_UNCOMPRESSED_SIZE = "Invalid uncompressed size";
 	const ERR_INVALID_COMPRESSED_DATA = "Invalid compressed data";
+	const ERR_UNSUPPORTED_COMPRESSION$2 = "Compression method not supported";
 	const FORMAT_DEFLATE_RAW = "deflate-raw";
 	const FORMAT_DEFLATE64_RAW = "deflate64-raw";
 	const FORMAT_GZIP = "gzip";
@@ -2673,23 +2732,26 @@
 
 		constructor(options, { chunkSize, CompressionStreamZlib, CompressionStream }) {
 			super({});
-			const { compressed, encrypted, useCompressionStream, zipCrypto, signed, level, deflate64 } = options;
+			const { compressed, encrypted, useCompressionStream, zipCrypto, signed, level, deflate64, format } = options;
 			const stream = this;
 			let crc32Stream, encryptionStream, gzipCrc32Stream;
 			let readable = super.readable;
-			const useGzipCrc32 = signed && compressed && !deflate64 && (!encrypted || zipCrypto) &&
+			const codecStreams = format && getCodecStreams(format);
+			const useGzipCrc32 = signed && compressed && !deflate64 && !codecStreams && (!encrypted || zipCrypto) &&
 				Boolean(useCompressionStream && CompressionStream);
 			if ((!encrypted || zipCrypto) && signed && !useGzipCrc32) {
 				crc32Stream = new Crc32Stream();
 				readable = pipeThrough(readable, crc32Stream);
 			}
 			if (compressed) {
-				if (useGzipCrc32) {
+				if (codecStreams) {
+					readable = pipeThroughBackpressured(readable, createCodecStream(codecStreams.CompressionStream, format, { level, chunkSize }));
+				} else if (useGzipCrc32) {
 					gzipCrc32Stream = new GzipToRawDeflateStream();
 					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) {
@@ -2758,7 +2820,7 @@
 
 		constructor(options, { chunkSize, DecompressionStreamZlib, DecompressionStream }) {
 			super({});
-			const { zipCrypto, encrypted, signed, signature, compressed, useCompressionStream, deflate64 } = options;
+			const { zipCrypto, encrypted, signed, signature, compressed, useCompressionStream, deflate64, format } = options;
 			let crc32Stream, decryptionStream;
 			let readable = super.readable;
 			if (encrypted) {
@@ -2770,7 +2832,12 @@
 				}
 			}
 			if (compressed) {
-				readable = pipeThroughCommpressionStream(readable, useCompressionStream, { chunkSize, deflate64 }, DecompressionStream, DecompressionStreamZlib, DecompressionStream);
+				const codecStreams = format && getCodecStreams(format);
+				if (codecStreams) {
+					readable = pipeThroughBackpressured(readable, createCodecStream(codecStreams.DecompressionStream, format, { chunkSize }));
+				} else {
+					readable = pipeThroughCompressionStream(readable, useCompressionStream, { chunkSize, deflate64 }, DecompressionStream, DecompressionStreamZlib);
+				}
 				readable = mapInflateStreamError(readable);
 			}
 			if ((!encrypted || zipCrypto) && signed) {
@@ -2788,6 +2855,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", {
@@ -2797,21 +2883,24 @@
 		});
 	}
 
-	function pipeThroughCommpressionStream(readable, useCompressionStream, options, CompressionStreamNative, CompressionStreamZlib, CompressionStream) {
-		const Stream = useCompressionStream && CompressionStreamNative ? CompressionStreamNative : CompressionStreamZlib || CompressionStream;
+	function createCodecStream(CodecStreamClass, format, options) {
+		if (!CodecStreamClass) {
+			throw new Error(ERR_UNSUPPORTED_COMPRESSION$2);
+		}
+		return new CodecStreamClass(format, options);
+	}
+
+	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;
 			}
@@ -3072,6 +3161,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;
@@ -3175,7 +3265,7 @@
 	}
 
 	function createWebWorkerInterface(workerData, config) {
-		const { baseURI, chunkSize } = config;
+		const { baseURI, chunkSize, workerStartupTimeout } = config;
 		let { wasmURI } = config;
 
 		if (!workerData.interface) {
@@ -3192,9 +3282,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;
+						}
+					}
 				}
 			});
 		}
@@ -3204,15 +3311,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
 					}
 				}
 			}
@@ -3281,6 +3396,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();
@@ -3393,28 +3512,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 = [];
@@ -3422,7 +3581,7 @@
 				message.value = toExactUint8Array(value);
 				transferables.push(message.value.buffer);
 			}
-			if (transferStreams && transferStreamsSupported) {
+			if (transferStreams && transferStreamsSupported && workerAlive) {
 				if (readable) {
 					transferables.push(readable);
 				}
@@ -3541,11 +3700,18 @@
 
 	async function runWorker(stream, workerOptions) {
 		const { options, config } = workerOptions;
-		const { transferStreams, useWebWorkers, useCompressionStream, compressed, signed, encrypted } = options;
+		const { transferStreams, useWebWorkers, useCompressionStream, compressed, signed, encrypted, format, codecURI } = options;
 		const { workerURI, maxWorkers } = config;
+		if (format) {
+			if (codecURI) {
+				options.codecURI = resolveCodecURI(codecURI, config.baseURI);
+			}
+			await ensureCodecStreams(format, options.codecURI);
+		}
 		workerOptions.transferStreams = transferStreams || (transferStreams === UNDEFINED_VALUE && config.transferStreams);
 		const streamCopy = !compressed && !signed && !encrypted;
-		workerOptions.useWebWorkers = !streamCopy && (useWebWorkers || (useWebWorkers === UNDEFINED_VALUE && config.useWebWorkers));
+		const workerSupported = format === UNDEFINED_VALUE || Boolean(options.codecURI);
+		workerOptions.useWebWorkers = !streamCopy && workerSupported && (useWebWorkers || (useWebWorkers === UNDEFINED_VALUE && config.useWebWorkers));
 		workerOptions.workerURI = workerOptions.useWebWorkers && workerURI ? workerURI : UNDEFINED_VALUE;
 		options.useCompressionStream = useCompressionStream || (useCompressionStream === UNDEFINED_VALUE && config.useCompressionStream);
 		return (await getWorker()).run();
@@ -3585,6 +3751,14 @@
 		}
 	}
 
+	function resolveCodecURI(codecURI, baseURI) {
+		try {
+			return new URL(codecURI, baseURI).toString();
+		} catch {
+			return codecURI;
+		}
+	}
+
 	function armStarvationTimeout() {
 		if (!starvationTimeout && pendingRequests.length && Number.isFinite(starvationDelay) && starvationDelay >= 0) {
 			starvationTimeout = setTimeout(onWorkerStarvation, starvationDelay);
@@ -3903,6 +4077,7 @@
 	const OPTION_PREVENT_CLOSE = "preventClose";
 	const OPTION_ENCRYPTION_STRENGTH = "encryptionStrength";
 	const OPTION_EXTENDED_TIMESTAMP = "extendedTimestamp";
+	const OPTION_NTFS_TIMESTAMP = "ntfsTimestamp";
 	const OPTION_KEEP_ORDER = "keepOrder";
 	const OPTION_LEVEL = "level";
 	const OPTION_BUFFERED_WRITE = "bufferedWrite";
@@ -3962,6 +4137,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";
@@ -4039,6 +4215,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);
@@ -4068,6 +4245,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)) {
@@ -4147,6 +4325,9 @@
 			for (let indexFile = 0; indexFile < filesLength; indexFile++) {
 				const fileEntry = new ZipEntry$1(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);
@@ -4334,7 +4515,8 @@
 					throw new Error(ERR_UNSUPPORTED_COMPRESSION$1);
 				}
 			}
-			if ((compressionMethod != COMPRESSION_METHOD_STORE && compressionMethod != COMPRESSION_METHOD_DEFLATE && compressionMethod != COMPRESSION_METHOD_DEFLATE_64) && !passThrough) {
+			const registeredCodec = passThrough ? UNDEFINED_VALUE : getRegisteredCodec(compressionMethod);
+			if ((compressionMethod != COMPRESSION_METHOD_STORE && compressionMethod != COMPRESSION_METHOD_DEFLATE && compressionMethod != COMPRESSION_METHOD_DEFLATE_64 && !registeredCodec) && !passThrough) {
 				throw new Error(ERR_UNSUPPORTED_COMPRESSION$1);
 			}
 			if (dataArray.length < HEADER_SIZE || getUint32(dataView, 0) != LOCAL_FILE_HEADER_SIGNATURE) {
@@ -4373,7 +4555,10 @@
 				fileEntry.zipCrypto = zipCrypto;
 			}
 			if (encrypted) {
-				if (!zipCrypto && extraFieldAES.strength === UNDEFINED_VALUE) {
+				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) {
 					throw new Error(ERR_ENCRYPTED);
@@ -4412,6 +4597,8 @@
 					useCompressionStream,
 					transferStreams: getOptionValue$1(zipEntry, options, OPTION_TRANSFER_STREAMS),
 					deflate64,
+					format: registeredCodec ? registeredCodec.format : UNDEFINED_VALUE,
+					codecURI: registeredCodec ? registeredCodec.codecURI : UNDEFINED_VALUE,
 					checkPasswordOnly
 				},
 				config,
@@ -4464,6 +4651,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;
@@ -4978,6 +5175,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,
@@ -5028,6 +5226,7 @@
 	const ERR_INVALID_ENTRY_NAME = "File entry name exceeds 64KB";
 	const ERR_INVALID_VERSION = "Version exceeds 65535";
 	const ERR_INVALID_ENCRYPTION_STRENGTH = "The strength must equal 1, 2, or 3";
+	const ERR_UNSUPPORTED_ENCRYPTION_USDZ = "Encryption is not supported in USDZ files";
 	const ERR_INVALID_EXTRAFIELD_TYPE = "Extra field type exceeds 65535";
 	const ERR_INVALID_EXTRAFIELD_DATA = "Extra field data exceeds 64KB";
 	const ERR_UNSUPPORTED_COMPRESSION = "Compression method not supported";
@@ -5326,7 +5525,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;
 		}
@@ -5335,13 +5538,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 {
@@ -5350,6 +5553,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) {
@@ -5367,10 +5571,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) {
@@ -5430,6 +5636,7 @@
 		const encryptionStrength = getOptionValue(zipWriter, options, OPTION_ENCRYPTION_STRENGTH, 3);
 		const zipCrypto = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIPCRYPTO);
 		const extendedTimestamp = getOptionValue(zipWriter, options, OPTION_EXTENDED_TIMESTAMP, true);
+		const ntfsTimestamp = getOptionValue(zipWriter, options, OPTION_NTFS_TIMESTAMP);
 		const keepOrder = getOptionValue(zipWriter, options, OPTION_KEEP_ORDER, true);
 		const useWebWorkers = getOptionValue(zipWriter, options, OPTION_USE_WEB_WORKERS);
 		const transferStreams = getOptionValue(zipWriter, options, OPTION_TRANSFER_STREAMS);
@@ -5439,11 +5646,20 @@
 		const signal = getOptionValue(zipWriter, options, OPTION_SIGNAL);
 		const useUnicodeFileNames = getOptionValue(zipWriter, options, OPTION_USE_UNICODE_FILE_NAMES, true);
 		const compressionMethod = getOptionValue(zipWriter, options, PROPERTY_NAME_COMPRESSION_METHOD);
+		const registeredCodec = passThrough || compressionMethod === UNDEFINED_VALUE ? UNDEFINED_VALUE : getRegisteredCodec(compressionMethod);
 		if (!passThrough && compressionMethod !== UNDEFINED_VALUE &&
-			compressionMethod !== COMPRESSION_METHOD_STORE && compressionMethod !== COMPRESSION_METHOD_DEFLATE) {
+			compressionMethod !== COMPRESSION_METHOD_STORE && compressionMethod !== COMPRESSION_METHOD_DEFLATE && !registeredCodec) {
 			throw new Error(ERR_UNSUPPORTED_COMPRESSION);
 		}
 		let level = getOptionValue(zipWriter, options, OPTION_LEVEL);
+		if (zipWriter.options[OPTION_USDZ]) {
+			if (password !== UNDEFINED_VALUE || rawPassword !== UNDEFINED_VALUE) {
+				throw new Error(ERR_UNSUPPORTED_ENCRYPTION_USDZ);
+			}
+			if (level === UNDEFINED_VALUE && compressionMethod === UNDEFINED_VALUE) {
+				level = 0;
+			}
+		}
 		let useCompressionStream = getOptionValue(zipWriter, options, OPTION_USE_COMPRESSION_STREAM);
 		let dataDescriptor = getOptionValue(zipWriter, options, OPTION_DATA_DESCRIPTOR);
 		if (bufferedWrite && dataDescriptor === UNDEFINED_VALUE) {
@@ -5455,7 +5671,7 @@
 		if (level !== UNDEFINED_VALUE && level != 6) {
 			useCompressionStream = false;
 		}
-		if (!useCompressionStream && (zipWriter.config.CompressionStream === UNDEFINED_VALUE && zipWriter.config.CompressionStreamZlib === UNDEFINED_VALUE)) {
+		if (!useCompressionStream && !registeredCodec && (zipWriter.config.CompressionStream === UNDEFINED_VALUE && zipWriter.config.CompressionStreamZlib === UNDEFINED_VALUE)) {
 			level = 0;
 		}
 		const zip64 = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIP64);
@@ -5499,6 +5715,7 @@
 				encryptionStrength,
 				zipCrypto,
 				extendedTimestamp,
+				ntfsTimestamp,
 				keepOrder,
 				useWebWorkers,
 				transferStreams,
@@ -5508,6 +5725,9 @@
 				signal,
 				useUnicodeFileNames,
 				compressionMethod,
+				format: registeredCodec ? registeredCodec.format : UNDEFINED_VALUE,
+				codecURI: registeredCodec ? registeredCodec.codecURI : UNDEFINED_VALUE,
+				codecVersionNeeded: registeredCodec ? registeredCodec.versionNeeded : UNDEFINED_VALUE,
 				level,
 				useCompressionStream,
 				dataDescriptor,
@@ -5804,7 +6024,9 @@
 			msdosAttributesRaw,
 			msdosAttributes,
 			useCompressionStream,
-			passThrough
+			passThrough,
+			format,
+			codecURI
 		} = options;
 		const fileEntry = {
 			lock,
@@ -5864,7 +6086,9 @@
 					encrypted: encrypted && !passThrough,
 					useWebWorkers,
 					useCompressionStream,
-					transferStreams
+					transferStreams,
+					format,
+					codecURI
 				},
 				config,
 				streamOptions: { signal, size, onstart, onprogress, onend }
@@ -5936,6 +6160,7 @@
 			rawExtraField,
 			encryptionStrength,
 			extendedTimestamp,
+			ntfsTimestamp,
 			passThrough,
 			encrypted,
 			zip64UncompressedSize,
@@ -5981,7 +6206,8 @@
 		let extraFieldExtendedTimestampFlag;
 		if (extendedTimestamp) {
 			const lastModTimeUnix = getTimeUnix(lastModDate);
-			if (inUnixTimeRange(lastModTimeUnix)) {
+			const lastModTimeUnixInRange = inUnixTimeRange(lastModTimeUnix);
+			if (lastModTimeUnixInRange) {
 				const extraFieldTimestampLength = 9 + (lastAccessDate ? 4 : 0) + (creationDate ? 4 : 0);
 				const extraFieldTimestamp = createRecordWriter(extraFieldTimestampLength);
 				extraFieldExtendedTimestampFlag = 0x1 + (lastAccessDate ? 0x2 : 0) + (creationDate ? 0x4 : 0);
@@ -5999,19 +6225,26 @@
 			} else {
 				rawExtraFieldExtendedTimestamp = EMPTY_UINT8_ARRAY;
 			}
-			try {
-				const lastModTimeNTFS = getTimeNTFS(lastModDate);
-				const extraFieldNTFS = createRecordWriter(36);
-				extraFieldNTFS.uint16(EXTRAFIELD_TYPE_NTFS);
-				extraFieldNTFS.uint16(32);
-				extraFieldNTFS.skip(4);
-				extraFieldNTFS.uint16(EXTRAFIELD_TYPE_NTFS_TAG1);
-				extraFieldNTFS.uint16(24);
-				extraFieldNTFS.uint64(lastModTimeNTFS);
-				extraFieldNTFS.uint64(getTimeNTFS(lastAccessDate) || lastModTimeNTFS);
-				extraFieldNTFS.uint64(getTimeNTFS(creationDate) || lastModTimeNTFS);
-				rawExtraFieldNTFS = extraFieldNTFS.array;
-			} catch {
+			const writeExtraFieldNTFS = ntfsTimestamp === UNDEFINED_VALUE ?
+				!lastModTimeUnixInRange || Boolean(lastAccessDate || creationDate) :
+				ntfsTimestamp;
+			if (writeExtraFieldNTFS) {
+				try {
+					const lastModTimeNTFS = getTimeNTFS(lastModDate);
+					const extraFieldNTFS = createRecordWriter(36);
+					extraFieldNTFS.uint16(EXTRAFIELD_TYPE_NTFS);
+					extraFieldNTFS.uint16(32);
+					extraFieldNTFS.skip(4);
+					extraFieldNTFS.uint16(EXTRAFIELD_TYPE_NTFS_TAG1);
+					extraFieldNTFS.uint16(24);
+					extraFieldNTFS.uint64(lastModTimeNTFS);
+					extraFieldNTFS.uint64(getTimeNTFS(lastAccessDate) || lastModTimeNTFS);
+					extraFieldNTFS.uint64(getTimeNTFS(creationDate) || lastModTimeNTFS);
+					rawExtraFieldNTFS = extraFieldNTFS.array;
+				} catch {
+					rawExtraFieldNTFS = EMPTY_UINT8_ARRAY;
+				}
+			} else {
 				rawExtraFieldNTFS = EMPTY_UINT8_ARRAY;
 			}
 		} else {
@@ -6049,6 +6282,10 @@
 		if (compressionMethod === UNDEFINED_VALUE) {
 			compressionMethod = compressed ? COMPRESSION_METHOD_DEFLATE : COMPRESSION_METHOD_STORE;
 		}
+		const { codecVersionNeeded } = options;
+		if (compressed && codecVersionNeeded !== UNDEFINED_VALUE) {
+			version = version > codecVersionNeeded ? version : codecVersionNeeded;
+		}
 		if (zip64) {
 			version = version > VERSION_ZIP64 ? version : VERSION_ZIP64;
 		}
@@ -6062,6 +6299,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,
@@ -6071,7 +6309,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,