@zip.js/zip.js 2.18.1 → 2.19.0

package/lib/core/zip-reader.js

@@ -175,7 +175,6 @@ import {
 	STRICTNESS_TOLERANT,
 	OPTION_USE_WEB_WORKERS,
 	OPTION_USE_COMPRESSION_STREAM,
-	OPTION_TRANSFER_STREAMS,
 	OPTION_PREVENT_CLOSE,
 	checkFunctionOption,
 	checkSignalOption,
@@ -499,17 +498,6 @@ class ZipReader {
 			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);
@@ -537,7 +525,20 @@ class ZipReader {
 				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;
@@ -990,7 +991,6 @@ class ZipEntry {
 				encrypted,
 				useWebWorkers: getOptionValue(zipEntry, options, OPTION_USE_WEB_WORKERS),
 				useCompressionStream,
-				transferStreams: getOptionValue(zipEntry, options, OPTION_TRANSFER_STREAMS),
 				deflate64,
 				format: registeredCodec ? registeredCodec.format : UNDEFINED_VALUE,
 				codecURI: registeredCodec ? registeredCodec.codecURI : UNDEFINED_VALUE,
@@ -1220,19 +1220,17 @@ function readCommonFooter(fileEntry, directory, dataView, offset, localDirectory
 		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);
@@ -1458,19 +1456,11 @@ async function detectOverlappingEntry({
 		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);

package/lib/core/zip-writer.js

@@ -218,7 +218,6 @@ import {
 	OPTION_SIGNAL,
 	OPTION_USE_WEB_WORKERS,
 	OPTION_USE_COMPRESSION_STREAM,
-	OPTION_TRANSFER_STREAMS,
 	OPTION_PREVENT_CLOSE,
 	OPTION_ENCRYPTION_STRENGTH,
 	OPTION_EXTENDED_TIMESTAMP,
@@ -449,6 +448,7 @@ class ZipWriter {
 					rawExtraFieldExtendedTimestamp: EMPTY_UINT8_ARRAY,
 					rawExtraFieldNTFS: EMPTY_UINT8_ARRAY,
 					rawExtraFieldUnix: EMPTY_UINT8_ARRAY,
+					rawCentralExtraFieldUnix: EMPTY_UINT8_ARRAY,
 					rawExtraField,
 					rawCentralExtraField: EMPTY_UINT8_ARRAY,
 					headerArray,
@@ -1063,7 +1063,6 @@ function resolveMetadata(zipWriter, name, options) {
 	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);
@@ -1129,7 +1128,6 @@ function resolveMetadata(zipWriter, name, options) {
 			ntfsTimestamp,
 			keepOrder,
 			useWebWorkers,
-			transferStreams,
 			bufferedWrite,
 			createTempStream,
 			dataDescriptorSignature,
@@ -1188,7 +1186,7 @@ async function resolveSizes(zipWriter, reader, { resolvedOptions: metadata }, op
 	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);
@@ -1549,6 +1547,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lockFileEntry
 		extraFieldExtendedTimestampTime,
 		rawExtraFieldNTFS,
 		rawExtraFieldUnix,
+		rawCentralExtraFieldUnix,
 		rawExtraFieldAES,
 	} = headerInfo;
 	const { dataDescriptorArray } = dataDescriptorInfo;
@@ -1573,7 +1572,6 @@ async function createFileEntry(reader, writer, { diskNumberStart, lockFileEntry
 		rawExtraField,
 		rawCentralExtraField,
 		useWebWorkers,
-		transferStreams,
 		onstart,
 		onprogress,
 		onend,
@@ -1615,6 +1613,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lockFileEntry
 		rawExtraFieldExtendedTimestamp,
 		rawExtraFieldNTFS,
 		rawExtraFieldUnix,
+		rawCentralExtraFieldUnix,
 		rawExtraFieldAES,
 		rawExtraField,
 		rawCentralExtraField,
@@ -1661,7 +1660,6 @@ async function createFileEntry(reader, writer, { diskNumberStart, lockFileEntry
 				encrypted: encrypted && !passThroughEncryption,
 				useWebWorkers,
 				useCompressionStream,
-				transferStreams,
 				format,
 				codecURI,
 				compressionMethod
@@ -1839,6 +1837,7 @@ function getHeaderInfo(options) {
 		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)) {
@@ -1853,7 +1852,7 @@ function getHeaderInfo(options) {
 			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);
@@ -1861,11 +1860,15 @@ function getHeaderInfo(options) {
 			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;
@@ -1957,6 +1960,7 @@ function getHeaderInfo(options) {
 		rawExtraFieldExtendedTimestamp,
 		rawExtraFieldNTFS,
 		rawExtraFieldUnix,
+		rawCentralExtraFieldUnix,
 		rawExtraFieldAES,
 		extraFieldLength
 	};
@@ -2132,7 +2136,7 @@ function createDirectoryRecords(files) {
 			rawExtraFieldAES,
 			rawComment,
 			rawExtraFieldNTFS,
-			rawExtraFieldUnix,
+			rawCentralExtraFieldUnix,
 			rawExtraField,
 			rawCentralExtraField,
 			extraFieldExtendedTimestampFlag,
@@ -2194,7 +2198,7 @@ function createDirectoryRecords(files) {
 			rawExtraFieldZip64,
 			rawExtraFieldAES,
 			rawExtraFieldNTFS,
-			rawExtraFieldUnix,
+			rawCentralExtraFieldUnix,
 			rawExtraFieldTimestamp,
 			rawExtraField,
 			rawCentralExtraField);
@@ -2223,7 +2227,7 @@ async function writeDirectoryRecords(zipWriter, directoryDataLength, options) {
 			rawExtraFieldAES,
 			rawExtraFieldExtendedTimestamp,
 			rawExtraFieldNTFS,
-			rawExtraFieldUnix,
+			rawCentralExtraFieldUnix,
 			rawExtraField,
 			rawCentralExtraField,
 			rawComment,
@@ -2240,7 +2244,7 @@ async function writeDirectoryRecords(zipWriter, directoryDataLength, options) {
 			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));
@@ -2276,7 +2280,7 @@ async function writeDirectoryRecords(zipWriter, directoryDataLength, options) {
 		directoryRecord.writeBytes(rawExtraFieldAES);
 		directoryRecord.writeBytes(rawExtraFieldExtendedTimestamp);
 		directoryRecord.writeBytes(rawExtraFieldNTFS);
-		directoryRecord.writeBytes(rawExtraFieldUnix);
+		directoryRecord.writeBytes(rawCentralExtraFieldUnix);
 		directoryRecord.writeBytes(rawExtraField);
 		directoryRecord.writeBytes(rawCentralExtraField);
 		directoryRecord.writeBytes(rawComment);

package/package.json

@@ -3,7 +3,7 @@
   "description": "A JavaScript library to zip and unzip files in the browser, Deno and Node.js",
   "author": "Gildas Lormeau",
   "license": "BSD-3-Clause",
-  "version": "2.18.1",
+  "version": "2.19.0",
   "type": "module",
   "keywords": [
     "zip",

package/worker-message-property-names.js

@@ -1,3 +1,3 @@
-const WORKER_MESSAGE_PROPERTY_NAMES = ["baseURI", "cause", "checkAuthenticationCode", "checkCrc32", "checkPasswordOnly", "chunkSize", "code", "codecImportFailed", "codecType", "codecURI", "compressed", "compressionMethod", "computeCrc32", "config", "crc32", "deflate64", "done", "encrypted", "encryptionStrength", "error", "errorValue", "format", "inputSize", "level", "message", "messageId", "name", "options", "outputSize", "password", "passwordVerification", "rawBitFlag", "rawPassword", "readable", "result", "stack", "transferStreams", "type", "useCompressionStream", "useWebWorkers", "value", "wasmURI", "workerStartupTimeout", "writable", "zipCrypto"];
+const WORKER_MESSAGE_PROPERTY_NAMES = ["baseURI", "cause", "checkAuthenticationCode", "checkCrc32", "checkPasswordOnly", "chunkSize", "code", "codecImportFailed", "codecType", "codecURI", "compressed", "compressionMethod", "computeCrc32", "config", "crc32", "deflate64", "done", "encrypted", "encryptionStrength", "error", "errorValue", "format", "inputSize", "level", "message", "messageId", "name", "options", "outputSize", "password", "passwordVerification", "rawBitFlag", "rawPassword", "result", "stack", "type", "useCompressionStream", "useWebWorkers", "value", "wasmURI", "workerStartupTimeout", "zipCrypto"];
 
 export { WORKER_MESSAGE_PROPERTY_NAMES };