@zip.js/zip.js 2.18.1 → 2.19.0

package/dist/zip-fs-core.js

@@ -185,7 +185,6 @@
 	const OPTION_CHECK_AUTHENTICATION_CODE = "checkAuthenticationCode";
 	const OPTION_USE_WEB_WORKERS = "useWebWorkers";
 	const OPTION_USE_COMPRESSION_STREAM = "useCompressionStream";
-	const OPTION_TRANSFER_STREAMS = "transferStreams";
 	const OPTION_PREVENT_CLOSE = "preventClose";
 	const OPTION_ENCRYPTION_STRENGTH = "encryptionStrength";
 	const OPTION_EXTENDED_TIMESTAMP = "extendedTimestamp";
@@ -303,7 +302,7 @@
 	 */
 
 
-	const DEFAULT_CHUNK_SIZE$1 = 64 * 1024;
+	const DEFAULT_CHUNK_SIZE$1 = 256 * 1024;
 	const MINIMUM_CHUNK_SIZE = 64;
 	const MINIMUM_PROPERTY_VALUE = 1;
 	const ERR_INVALID_MAX_WORKERS = "Invalid maxWorkers (must be an integer greater than 0)";
@@ -2392,7 +2391,7 @@
 	 */
 
 
-	const DEFAULT_CHUNK_SIZE = 64 * 1024;
+	const DEFAULT_CHUNK_SIZE = 256 * 1024;
 	const MESSAGE_EVENT_TYPE = "message";
 	const MESSAGE_START = "start";
 	const MESSAGE_PULL = "pull";
@@ -2598,7 +2597,7 @@
 	class CodecWorker {
 
 		constructor(workerData, { readable, writable }, workerOptions, onTaskFinished) {
-			const { options, config, streamOptions, useWebWorkers, transferStreams, workerURI } = workerOptions;
+			const { options, config, streamOptions, useWebWorkers, workerURI } = workerOptions;
 			let { createWorker } = workerOptions;
 			const { signal } = streamOptions;
 			if (createWorkerFailed) {
@@ -2615,7 +2614,6 @@
 				workerOptions,
 				workerURI,
 				createWorker,
-				transferStreams,
 				terminate() {
 					return new Promise(resolve => {
 						const { worker, busy } = workerData;
@@ -2793,12 +2791,6 @@
 	const ABORT_EVENT_TYPE = "abort";
 
 	let webWorkerSource, webWorkerURI, webWorkerOptions;
-	let transferStreamsSupported = true;
-	try {
-		transferStreamsSupported = typeof structuredClone == FUNCTION_TYPE && structuredClone(new DOMException("", "AbortError")).code !== UNDEFINED_VALUE;
-	} catch {
-		// ignored
-	}
 
 	setWebWorkerBackend(createWebWorkerInterface);
 
@@ -2885,14 +2877,11 @@
 		});
 		const { readable, options } = workerData;
 		const { writable, closed, abortPipe } = watchClosedStream(workerData.writable, workerData);
-		let streamsTransferred;
 		try {
-			streamsTransferred = sendMessage({
+			sendMessage({
 				type: MESSAGE_START,
 				options,
-				config,
-				readable,
-				writable
+				config
 			}, workerData);
 		} catch (error) {
 			abortPipe();
@@ -2904,12 +2893,10 @@
 			workerData.onTaskFinished();
 			throw error;
 		}
-		if (!streamsTransferred) {
-			Object.assign(workerData, {
-				reader: readable.getReader(),
-				writer: writable.getWriter()
-			});
-		}
+		Object.assign(workerData, {
+			reader: readable.getReader(),
+			writer: writable.getWriter()
+		});
 		const { workerStartupTimeout } = config;
 		if (!workerData.workerAlive && Number.isFinite(workerStartupTimeout) && workerStartupTimeout >= 0) {
 			workerData.startupTimeout = setTimeout(() => onStartupTimeout(workerData), workerStartupTimeout);
@@ -2942,7 +2929,7 @@
 		}
 
 		async function closeWritable() {
-			if (!streamsTransferred && !writable.locked) {
+			if (!writable.locked) {
 				try {
 					await writable.getWriter().close();
 				} catch {
@@ -3133,31 +3120,14 @@
 		}
 	}
 
-	function sendMessage(message, { worker, writer, transferStreams, workerAlive }) {
+	function sendMessage(message, { worker, writer }) {
 		try {
-			const { value, readable, writable } = message;
-			const transferables = [];
+			const { value } = message;
 			if (value) {
 				message.value = toExactUint8Array(value);
-				transferables.push(message.value.buffer);
-			}
-			if (transferStreams && transferStreamsSupported && workerAlive) {
-				if (readable) {
-					transferables.push(readable);
-				}
-				if (writable) {
-					transferables.push(writable);
-				}
-			} else {
-				message.readable = message.writable = null;
-			}
-			if (transferables.length) {
 				try {
-					worker.postMessage(message, transferables);
-					return true;
+					worker.postMessage(message, [message.value.buffer]);
 				} catch {
-					transferStreamsSupported = false;
-					message.readable = message.writable = null;
 					worker.postMessage(message);
 				}
 			} else {
@@ -3306,7 +3276,7 @@
 
 	async function runWorker(stream, workerOptions) {
 		const { options, config } = workerOptions;
-		const { transferStreams, useWebWorkers, useCompressionStream, compressed, checkCrc32, computeCrc32, encrypted, format, codecURI } = options;
+		const { useWebWorkers, useCompressionStream, compressed, checkCrc32, computeCrc32, encrypted, format, codecURI } = options;
 		const { workerURI, createWorker, maxWorkers } = config;
 		if (format) {
 			if (codecURI) {
@@ -3314,7 +3284,6 @@
 			}
 			await ensureCodecStreams(format, options.codecURI);
 		}
-		workerOptions.transferStreams = !format && (transferStreams || (transferStreams === UNDEFINED_VALUE && config.transferStreams));
 		const streamCopy = !compressed && !checkCrc32 && !computeCrc32 && !encrypted;
 		const workerSupported = format === UNDEFINED_VALUE || Boolean(options.codecURI);
 		workerOptions.useWebWorkers = !streamCopy && workerSupported && (useWebWorkers || (useWebWorkers === UNDEFINED_VALUE && config.useWebWorkers));
@@ -5116,17 +5085,6 @@
 				if (filename === UNDEFINED_VALUE) {
 					filename = decodeText(rawFilename, rawFilenameEncoding);
 				}
-				if (normalizeFilename) {
-					const normalizedFilename = normalizeFilename(filename);
-					if (normalizedFilename !== UNDEFINED_VALUE) {
-						filename = normalizedFilename;
-					}
-				}
-				if (isUnsafeFilename(filename, filenameValidation)) {
-					const error = new Error(ERR_UNSAFE_FILENAME);
-					error.filename = filename;
-					throw error;
-				}
 				let comment = decode(rawComment, rawCommentEncoding, TEXT_TYPE_COMMENT);
 				if (comment === UNDEFINED_VALUE) {
 					comment = decodeText(rawComment, rawCommentEncoding);
@@ -5154,7 +5112,20 @@
 					filename,
 					comment
 				});
-				if (readCommonFooter(fileEntry, fileEntry, directoryView, offset + 6)) {
+				const malformedExtraField = readCommonFooter(fileEntry, fileEntry, directoryView, offset + 6);
+				filename = fileEntry.filename;
+				if (normalizeFilename) {
+					const normalizedFilename = normalizeFilename(filename);
+					if (normalizedFilename !== UNDEFINED_VALUE) {
+						filename = fileEntry.filename = normalizedFilename;
+					}
+				}
+				if (isUnsafeFilename(filename, filenameValidation)) {
+					const error = new Error(ERR_UNSAFE_FILENAME);
+					error.filename = filename;
+					throw error;
+				}
+				if (malformedExtraField) {
 					addWarning(warnings, WARNING_MALFORMED_EXTRA_FIELD, filename);
 				}
 				fileEntry.offset += prependedDataLength;
@@ -5558,7 +5529,6 @@
 					encrypted,
 					useWebWorkers: getOptionValue$1(zipEntry, options, OPTION_USE_WEB_WORKERS),
 					useCompressionStream,
-					transferStreams: getOptionValue$1(zipEntry, options, OPTION_TRANSFER_STREAMS),
 					deflate64,
 					format: registeredCodec ? registeredCodec.format : UNDEFINED_VALUE,
 					codecURI: registeredCodec ? registeredCodec.codecURI : UNDEFINED_VALUE,
@@ -5788,19 +5758,17 @@
 			readExtraFieldNTFS(extraFieldNTFS, directory);
 			directory.extraFieldNTFS = extraFieldNTFS;
 		}
-		const extraFieldUnix = extraField.get(EXTRAFIELD_TYPE_UNIX);
+		const extraFieldInfoZip = extraField.get(EXTRAFIELD_TYPE_INFOZIP);
 		let unixIdsRead;
+		if (extraFieldInfoZip) {
+			unixIdsRead = readExtraFieldUnix(extraFieldInfoZip, directory, true);
+			directory.extraFieldInfoZip = extraFieldInfoZip;
+		}
+		const extraFieldUnix = extraField.get(EXTRAFIELD_TYPE_UNIX);
 		if (extraFieldUnix) {
-			unixIdsRead = readExtraFieldUnix(extraFieldUnix, directory, false);
+			readExtraFieldUnix(extraFieldUnix, unixIdsRead ? {} : directory, false);
 			directory.extraFieldUnix = extraFieldUnix;
 		}
-		if (!unixIdsRead) {
-			const extraFieldInfoZip = extraField.get(EXTRAFIELD_TYPE_INFOZIP);
-			if (extraFieldInfoZip) {
-				readExtraFieldUnix(extraFieldInfoZip, directory, true);
-				directory.extraFieldInfoZip = extraFieldInfoZip;
-			}
-		}
 		const extraFieldExtendedTimestamp = extraField.get(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
 		if (extraFieldExtendedTimestamp) {
 			readExtraFieldExtendedTimestamp(extraFieldExtendedTimestamp, directory, localDirectory);
@@ -6026,19 +5994,11 @@
 			const zip64 = Boolean(extraFieldZip64);
 			const dataDescriptorArray = await readUint8Array(reader, dataOffset + compressedSize, DATA_DESCRIPTOR_RECORD_ZIP_64_LENGTH + DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH);
 			const dataDescriptorView = getDataView(dataDescriptorArray);
-			const ignoreCrc32 = fileEntry.encrypted && !fileEntry.zipCrypto;
-			let localDataDescriptor;
-			for (const [zip64Layout, signature] of [[zip64, true], [zip64, false], [!zip64, true], [!zip64, false]]) {
-				const candidate = readDataDescriptor(dataDescriptorView, zip64Layout, signature);
-				if (candidate && (ignoreCrc32 || candidate.crc32 == crc32) &&
-					candidate.compressedSize == compressedSize && candidate.uncompressedSize == uncompressedSize) {
-					localDataDescriptor = candidate;
-					break;
-				}
-			}
-			if (!localDataDescriptor) {
-				localDataDescriptor = readDataDescriptor(dataDescriptorView, zip64, false);
-			}
+			const candidates = [[zip64, true], [zip64, false], [!zip64, true], [!zip64, false]]
+				.map(([zip64Layout, signature]) => readDataDescriptor(dataDescriptorView, zip64Layout, signature))
+				.filter(candidate => candidate && candidate.compressedSize == compressedSize && candidate.uncompressedSize == uncompressedSize);
+			const localDataDescriptor = candidates.find(candidate => candidate.crc32 == crc32) || candidates[0] ||
+				readDataDescriptor(dataDescriptorView, zip64, true) || readDataDescriptor(dataDescriptorView, zip64, false);
 			if (localDataDescriptor) {
 				fileEntry.localDirectory.dataDescriptor = localDataDescriptor;
 				dataDescriptorLength = getDataDescriptorLength(localDataDescriptor.zip64, localDataDescriptor.signature);
@@ -6695,6 +6655,7 @@
 						rawExtraFieldExtendedTimestamp: EMPTY_UINT8_ARRAY,
 						rawExtraFieldNTFS: EMPTY_UINT8_ARRAY,
 						rawExtraFieldUnix: EMPTY_UINT8_ARRAY,
+						rawCentralExtraFieldUnix: EMPTY_UINT8_ARRAY,
 						rawExtraField,
 						rawCentralExtraField: EMPTY_UINT8_ARRAY,
 						headerArray,
@@ -7263,7 +7224,6 @@
 		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);
 		const bufferedWrite = getOptionValue(zipWriter, options, OPTION_BUFFERED_WRITE);
 		const createTempStream = getFunctionOptionValue(zipWriter, options, OPTION_CREATE_TEMP_STREAM);
 		const dataDescriptorSignature = getOptionValue(zipWriter, options, OPTION_DATA_DESCRIPTOR_SIGNATURE, true);
@@ -7329,7 +7289,6 @@
 				ntfsTimestamp,
 				keepOrder,
 				useWebWorkers,
-				transferStreams,
 				bufferedWrite,
 				createTempStream,
 				dataDescriptorSignature,
@@ -7388,7 +7347,7 @@
 		if (reader) {
 			reader = new GenericReader(reader);
 			await initStream(reader);
-			if (!reader.readable && !reader.readUint8Array) {
+			if (!reader.readUint8Array && !reader.readable) {
 				throw new Error(ERR_INVALID_READER);
 			}
 			({ size: contentSize } = reader);
@@ -7749,6 +7708,7 @@
 			extraFieldExtendedTimestampTime,
 			rawExtraFieldNTFS,
 			rawExtraFieldUnix,
+			rawCentralExtraFieldUnix,
 			rawExtraFieldAES,
 		} = headerInfo;
 		const { dataDescriptorArray } = dataDescriptorInfo;
@@ -7773,7 +7733,6 @@
 			rawExtraField,
 			rawCentralExtraField,
 			useWebWorkers,
-			transferStreams,
 			onstart,
 			onprogress,
 			onend,
@@ -7815,6 +7774,7 @@
 			rawExtraFieldExtendedTimestamp,
 			rawExtraFieldNTFS,
 			rawExtraFieldUnix,
+			rawCentralExtraFieldUnix,
 			rawExtraFieldAES,
 			rawExtraField,
 			rawCentralExtraField,
@@ -7861,7 +7821,6 @@
 					encrypted: encrypted && !passThroughEncryption,
 					useWebWorkers,
 					useCompressionStream,
-					transferStreams,
 					format,
 					codecURI,
 					compressionMethod
@@ -8039,6 +7998,7 @@
 			rawExtraFieldNTFS = rawExtraFieldExtendedTimestamp = EMPTY_UINT8_ARRAY;
 		}
 		let rawExtraFieldUnix;
+		let rawCentralExtraFieldUnix;
 		try {
 			const { uid, gid, unixExtraFieldType } = options;
 			if (unixExtraFieldType == INFOZIP_EXTRA_FIELD_TYPE && (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE)) {
@@ -8053,7 +8013,7 @@
 				extraFieldUnix.writeBytes(uidBytes);
 				extraFieldUnix.writeUint8(gidBytes.length);
 				extraFieldUnix.writeBytes(gidBytes);
-				rawExtraFieldUnix = extraFieldUnix.array;
+				rawExtraFieldUnix = rawCentralExtraFieldUnix = extraFieldUnix.array;
 			} else if (unixExtraFieldType == UNIX_EXTRA_FIELD_TYPE && (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE)) {
 				const extraFieldUnix = createRecordWriter(8);
 				extraFieldUnix.writeUint16(EXTRAFIELD_TYPE_UNIX);
@@ -8061,11 +8021,15 @@
 				extraFieldUnix.writeUint16((uid === UNDEFINED_VALUE ? 0 : uid) & MAX_16_BITS);
 				extraFieldUnix.writeUint16((gid === UNDEFINED_VALUE ? 0 : gid) & MAX_16_BITS);
 				rawExtraFieldUnix = extraFieldUnix.array;
+				const centralExtraFieldUnix = createRecordWriter(4);
+				centralExtraFieldUnix.writeUint16(EXTRAFIELD_TYPE_UNIX);
+				centralExtraFieldUnix.writeUint16(0);
+				rawCentralExtraFieldUnix = centralExtraFieldUnix.array;
 			} else {
-				rawExtraFieldUnix = EMPTY_UINT8_ARRAY;
+				rawExtraFieldUnix = rawCentralExtraFieldUnix = EMPTY_UINT8_ARRAY;
 			}
 		} catch {
-			rawExtraFieldUnix = EMPTY_UINT8_ARRAY;
+			rawExtraFieldUnix = rawCentralExtraFieldUnix = EMPTY_UINT8_ARRAY;
 		}
 		if (compressionMethod === UNDEFINED_VALUE) {
 			compressionMethod = compressed ? COMPRESSION_METHOD_DEFLATE : COMPRESSION_METHOD_STORE;
@@ -8157,6 +8121,7 @@
 			rawExtraFieldExtendedTimestamp,
 			rawExtraFieldNTFS,
 			rawExtraFieldUnix,
+			rawCentralExtraFieldUnix,
 			rawExtraFieldAES,
 			extraFieldLength
 		};
@@ -8332,7 +8297,7 @@
 				rawExtraFieldAES,
 				rawComment,
 				rawExtraFieldNTFS,
-				rawExtraFieldUnix,
+				rawCentralExtraFieldUnix,
 				rawExtraField,
 				rawCentralExtraField,
 				extraFieldExtendedTimestampFlag,
@@ -8394,7 +8359,7 @@
 				rawExtraFieldZip64,
 				rawExtraFieldAES,
 				rawExtraFieldNTFS,
-				rawExtraFieldUnix,
+				rawCentralExtraFieldUnix,
 				rawExtraFieldTimestamp,
 				rawExtraField,
 				rawCentralExtraField);
@@ -8423,7 +8388,7 @@
 				rawExtraFieldAES,
 				rawExtraFieldExtendedTimestamp,
 				rawExtraFieldNTFS,
-				rawExtraFieldUnix,
+				rawCentralExtraFieldUnix,
 				rawExtraField,
 				rawCentralExtraField,
 				rawComment,
@@ -8440,7 +8405,7 @@
 				uncompressedSize,
 				compressedSize
 			} = fileEntry;
-			const extraFieldLength = getLength(rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawExtraFieldUnix, rawExtraField, rawCentralExtraField);
+			const extraFieldLength = getLength(rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawCentralExtraFieldUnix, rawExtraField, rawCentralExtraField);
 			const directoryRecordLength = CENTRAL_FILE_HEADER_LENGTH + getLength(rawFilename, rawComment) + extraFieldLength;
 			if (exceedsAvailableSize(writer, offset + directoryRecordLength - directoryDiskOffset)) {
 				await writeData(writer, directoryArray.slice(directoryDiskOffset, offset));
@@ -8476,7 +8441,7 @@
 			directoryRecord.writeBytes(rawExtraFieldAES);
 			directoryRecord.writeBytes(rawExtraFieldExtendedTimestamp);
 			directoryRecord.writeBytes(rawExtraFieldNTFS);
-			directoryRecord.writeBytes(rawExtraFieldUnix);
+			directoryRecord.writeBytes(rawCentralExtraFieldUnix);
 			directoryRecord.writeBytes(rawExtraField);
 			directoryRecord.writeBytes(rawCentralExtraField);
 			directoryRecord.writeBytes(rawComment);
@@ -9053,7 +9018,7 @@
 	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	 */
 
-	const VERSION = "2.18.1";
+	const VERSION = "2.19.0";
 
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.