@zip.js/zip.js 2.8.44 → 2.8.45

package/deno.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zip-js/zip-js",
-	"version": "2.8.44",
+	"version": "2.8.45",
 	"exports": {
 		".": "./index.js",
 		"./external": "./lib/zip-fs-external.js",
@@ -8,6 +8,24 @@
 		"./lib/zip-core-external.js": "./lib/zip-core-external.js",
 		"./lib/zip-fs-core-external.js": "./lib/zip-fs-core-external.js"
 	},
+	"publish": {
+		"exclude": [
+			"tests/",
+			"dist/",
+			"!dist/zip-web-worker.js",
+			"!dist/zip-module.wasm",
+			"*.cjs",
+			"index.d.cts",
+			"index.min.js",
+			"index-native.js",
+			"index-native.min.js",
+			"package.json",
+			"package-lock.json",
+			".npmignore",
+			"eslint.config.mjs",
+			"worker-message-property-names.js"
+		]
+	},
 	"lint": {
 		"exclude": [
 			"dist/*.js",
@@ -22,6 +40,8 @@
 		"rollup*",
 		"reserved-property-names.js",
 		"mangled-property-names.js",
+		"mime-types.json",
+		"generate-mime-type-data.js",
 		"tsconfig.json",
 		".vscode",
 		".eslintrc.json",

package/dist/zip-core-external.js

@@ -62,6 +62,8 @@ const EXTRAFIELD_TYPE_UNICODE_COMMENT = 0x6375;
 const EXTRAFIELD_TYPE_USDZ = 0x1986;
 const EXTRAFIELD_TYPE_INFOZIP = 0x7875;
 const EXTRAFIELD_TYPE_UNIX = 0x7855;
+const EXTRAFIELD_TYPE_UNIX_TYPE1 = 0x5855;
+const EXTRAFIELD_TYPE_PKWARE_UNIX = 0x000d;
 
 const BITFLAG_ENCRYPTED = 0b1;
 const BITFLAG_LEVEL = 0b0110;
@@ -1447,7 +1449,7 @@ const DERIVED_BITS_ALGORITHM = Object.assign({ iterations: 1000, hash: { name: H
 const DERIVED_BITS_USAGE = ["deriveBits"];
 const SALT_LENGTH = [8, 12, 16];
 const KEY_LENGTH = [16, 24, 32];
-const SIGNATURE_LENGTH = 10;
+const AUTHENTICATION_CODE_LENGTH = 10;
 const COUNTER_DEFAULT_VALUE = [0, 0, 0, 0];
 // deno-lint-ignore valid-typeof
 const CRYPTO_API_SUPPORTED = typeof crypto != UNDEFINED_TYPE;
@@ -1487,8 +1489,8 @@ class AESDecryptionStream extends TransformStream {
 				} else {
 					await ready;
 				}
-				const output = new Uint8Array(chunk.length - SIGNATURE_LENGTH - ((chunk.length - SIGNATURE_LENGTH) % BLOCK_LENGTH));
-				controller.enqueue(append(aesCrypto, chunk, output, 0, SIGNATURE_LENGTH, true));
+				const output = new Uint8Array(chunk.length - AUTHENTICATION_CODE_LENGTH - ((chunk.length - AUTHENTICATION_CODE_LENGTH) % BLOCK_LENGTH));
+				controller.enqueue(append(aesCrypto, chunk, output, 0, AUTHENTICATION_CODE_LENGTH, true));
 			},
 			async flush(controller) {
 				const {
@@ -1499,8 +1501,8 @@ class AESDecryptionStream extends TransformStream {
 				} = this;
 				if (hmac && ctr) {
 					await ready;
-					const chunkToDecrypt = subarray(pending, 0, pending.length - SIGNATURE_LENGTH);
-					const originalSignature = subarray(pending, pending.length - SIGNATURE_LENGTH);
+					const chunkToDecrypt = subarray(pending, 0, pending.length - AUTHENTICATION_CODE_LENGTH);
+					const originalAuthenticationCode = subarray(pending, pending.length - AUTHENTICATION_CODE_LENGTH);
 					let decryptedChunkArray = EMPTY_UINT8_ARRAY;
 					if (chunkToDecrypt.length) {
 						const encryptedChunk = toBits(codecBytes, chunkToDecrypt);
@@ -1508,12 +1510,12 @@ class AESDecryptionStream extends TransformStream {
 						const decryptedChunk = ctr.update(encryptedChunk);
 						decryptedChunkArray = fromBits(codecBytes, decryptedChunk);
 					}
-					const signature = subarray(fromBits(codecBytes, hmac.digest()), 0, SIGNATURE_LENGTH);
-					let invalidSignature = pending.length < SIGNATURE_LENGTH ? 1 : 0;
-					for (let indexSignature = 0; indexSignature < SIGNATURE_LENGTH; indexSignature++) {
-						invalidSignature |= signature[indexSignature] ^ originalSignature[indexSignature];
+					const authenticationCode = subarray(fromBits(codecBytes, hmac.digest()), 0, AUTHENTICATION_CODE_LENGTH);
+					let invalidAuthenticationCode = pending.length < AUTHENTICATION_CODE_LENGTH ? 1 : 0;
+					for (let indexByte = 0; indexByte < AUTHENTICATION_CODE_LENGTH; indexByte++) {
+						invalidAuthenticationCode |= authenticationCode[indexByte] ^ originalAuthenticationCode[indexByte];
 					}
-					if (invalidSignature && checkAuthenticationCode) {
+					if (invalidAuthenticationCode && checkAuthenticationCode) {
 						throw new Error(ERR_INVALID_AUTHENTICATION_CODE);
 					}
 					controller.enqueue(decryptedChunkArray);
@@ -1526,8 +1528,6 @@ class AESDecryptionStream extends TransformStream {
 class AESEncryptionStream extends TransformStream {
 
 	constructor({ password, rawPassword, encryptionStrength }) {
-		// deno-lint-ignore prefer-const
-		let stream;
 		super({
 			start() {
 				initAesCrypto(this, password, rawPassword, encryptionStrength);
@@ -1566,12 +1566,11 @@ class AESEncryptionStream extends TransformStream {
 						hmac.update(encryptedChunk);
 						encryptedChunkArray = fromBits(codecBytes, encryptedChunk);
 					}
-					stream.signature = fromBits(codecBytes, hmac.digest()).slice(0, SIGNATURE_LENGTH);
-					controller.enqueue(concat(encryptedChunkArray, stream.signature));
+					const authenticationCode = fromBits(codecBytes, hmac.digest()).slice(0, AUTHENTICATION_CODE_LENGTH);
+					controller.enqueue(concat(encryptedChunkArray, authenticationCode));
 				}
 			}
 		});
-		stream = this;
 	}
 }
 
@@ -1584,7 +1583,7 @@ function initAesCrypto(aesCrypto, password, rawPassword, encryptionStrength) {
 	});
 }
 
-function append(aesCrypto, input, output, paddingStart, paddingEnd, verifySignature) {
+function append(aesCrypto, input, output, paddingStart, paddingEnd, verifyAuthenticationCode) {
 	const {
 		ctr,
 		hmac,
@@ -1598,11 +1597,11 @@ function append(aesCrypto, input, output, paddingStart, paddingEnd, verifySignat
 	let offset;
 	for (offset = 0; offset <= inputLength - BLOCK_LENGTH; offset += BLOCK_LENGTH) {
 		const inputChunk = toBits(codecBytes, subarray(input, offset, offset + BLOCK_LENGTH));
-		if (verifySignature) {
+		if (verifyAuthenticationCode) {
 			hmac.update(inputChunk);
 		}
 		const outputChunk = ctr.update(inputChunk);
-		if (!verifySignature) {
+		if (!verifyAuthenticationCode) {
 			hmac.update(outputChunk);
 		}
 		output.set(fromBits(codecBytes, outputChunk), offset + paddingStart);
@@ -2008,14 +2007,9 @@ class DeflateStream extends TransformStream {
 			}
 		}
 		setReadable(stream, readable, () => {
-			let signature;
-			if (encrypted && !zipCrypto) {
-				signature = encryptionStream.signature;
-			}
 			if ((!encrypted || zipCrypto) && computeCrc32) {
-				signature = useGzipCrc32 ? gzipCrc32Stream.signature : new DataView(crc32Stream.value.buffer).getUint32(0);
+				stream.crc32 = useGzipCrc32 ? gzipCrc32Stream.crc32 : new DataView(crc32Stream.value.buffer).getUint32(0);
 			}
-			stream.signature = signature;
 		});
 	}
 }
@@ -2053,7 +2047,7 @@ class GzipToRawDeflateStream extends TransformStream {
 			},
 			flush() {
 				const dataView = getDataView(trailerCandidate);
-				stream.signature = dataView.getUint32(0, true);
+				stream.crc32 = dataView.getUint32(0, true);
 				stream.uncompressedSize = dataView.getUint32(4, true);
 			}
 		});
@@ -2135,7 +2129,7 @@ class InflateStream extends TransformStream {
 
 	constructor(options, { chunkSize, DecompressionStreamZlib, DecompressionStream }) {
 		super({});
-		const { zipCrypto, encrypted, checkCrc32, signature, compressed, useCompressionStream, deflate64, format, compressionMethod, rawBitFlag, outputSize } = options;
+		const { zipCrypto, encrypted, checkCrc32, crc32, compressed, useCompressionStream, deflate64, format, compressionMethod, rawBitFlag, outputSize } = options;
 		let crc32Stream, decryptionStream;
 		let readable = super.readable;
 		if (encrypted) {
@@ -2174,8 +2168,8 @@ class InflateStream extends TransformStream {
 		}
 		setReadable(this, readable, () => {
 			if (checkCrc32) {
-				const dataViewSignature = new DataView(crc32Stream.value.buffer);
-				if (signature != dataViewSignature.getUint32(0, false)) {
+				const computedCrc32View = new DataView(crc32Stream.value.buffer);
+				if (crc32 != computedCrc32View.getUint32(0, false)) {
 					throw new Error(ERR_INVALID_CRC32);
 				}
 			}
@@ -2400,9 +2394,9 @@ class CodecStream extends TransformStream {
 				}
 			},
 			flush() {
-				const { signature } = stream;
+				const { crc32 } = stream;
 				Object.assign(codec, {
-					signature,
+					crc32,
 					inputSize
 				});
 			}
@@ -2705,12 +2699,12 @@ async function runWorker$1({ options, readable, writable, onTaskFinished }, conf
 			.pipeThrough(new ChunkStream(getChunkSize(config)))
 			.pipeTo(writable, { preventClose: true, preventAbort: true });
 		const {
-			signature,
+			crc32,
 			inputSize,
 			outputSize
 		} = codecStream;
 		return {
-			signature,
+			crc32,
 			inputSize,
 			outputSize
 		};
@@ -4308,6 +4302,8 @@ const PROPERTY_NAME_CRC32 = "crc32";
 const PROPERTY_NAME_EXTRA_FIELD = "extraField";
 const PROPERTY_NAME_EXTRA_FIELD_INFOZIP = "extraFieldInfoZip";
 const PROPERTY_NAME_EXTRA_FIELD_UNIX = "extraFieldUnix";
+const PROPERTY_NAME_EXTRA_FIELD_UNIX_TYPE1 = "extraFieldUnixType1";
+const PROPERTY_NAME_EXTRA_FIELD_PKWARE_UNIX = "extraFieldPkwareUnix";
 const PROPERTY_NAME_UID = "uid";
 const PROPERTY_NAME_GID = "gid";
 const PROPERTY_NAME_UNIX_MODE = "unixMode";
@@ -4324,6 +4320,7 @@ const PROPERTY_NAME_EXTRA_FIELD_UNICODE_COMMENT = "extraFieldUnicodeComment";
 const PROPERTY_NAME_EXTRA_FIELD_AES = "extraFieldAES";
 const PROPERTY_NAME_EXTRA_FIELD_NTFS = "extraFieldNTFS";
 const PROPERTY_NAME_EXTRA_FIELD_EXTENDED_TIMESTAMP = "extraFieldExtendedTimestamp";
+const PROPERTY_NAME_EXTRA_FIELD_USDZ = "extraFieldUSDZ";
 
 const PROPERTY_NAMES = [
 	PROPERTY_NAME_FILENAME,
@@ -4335,6 +4332,7 @@ const PROPERTY_NAMES = [
 	PROPERTY_NAME_COMMENT,
 	PROPERTY_NAME_RAW_COMMENT,
 	PROPERTY_NAME_LAST_ACCESS_DATE,
+	PROPERTY_NAME_RAW_LAST_ACCESS_DATE,
 	PROPERTY_NAME_CREATION_DATE,
 	PROPERTY_NAME_RAW_CREATION_DATE,
 	PROPERTY_NAME_OFFSET,
@@ -4357,6 +4355,8 @@ const PROPERTY_NAMES = [
 	PROPERTY_NAME_EXTRA_FIELD,
 	PROPERTY_NAME_EXTRA_FIELD_UNIX,
 	PROPERTY_NAME_EXTRA_FIELD_INFOZIP,
+	PROPERTY_NAME_EXTRA_FIELD_UNIX_TYPE1,
+	PROPERTY_NAME_EXTRA_FIELD_PKWARE_UNIX,
 	PROPERTY_NAME_UID,
 	PROPERTY_NAME_GID,
 	PROPERTY_NAME_UNIX_MODE,
@@ -4372,7 +4372,8 @@ const PROPERTY_NAMES = [
 	PROPERTY_NAME_EXTRA_FIELD_UNICODE_COMMENT,
 	PROPERTY_NAME_EXTRA_FIELD_AES,
 	PROPERTY_NAME_EXTRA_FIELD_NTFS,
-	PROPERTY_NAME_EXTRA_FIELD_EXTENDED_TIMESTAMP
+	PROPERTY_NAME_EXTRA_FIELD_EXTENDED_TIMESTAMP,
+	PROPERTY_NAME_EXTRA_FIELD_USDZ
 ];
 
 class Entry {
@@ -4446,6 +4447,7 @@ const OPTION_ENCODE_TEXT = "encodeText";
 const OPTION_OFFSET = "offset";
 const OPTION_USDZ = "usdz";
 const OPTION_UNIX_EXTRA_FIELD_TYPE = "unixExtraFieldType";
+const OPTION_LOCAL_EXTRA_FIELD = "localExtraField";
 const OPTION_STRICTNESS = "strictness";
 const OPTION_MAX_APPENDED_DATA_SIZE = "maxAppendedDataSize";
 const STRICTNESS_STRICT = "strict";
@@ -4498,7 +4500,7 @@ const CHARSET_UTF8 = "utf-8";
 const PROPERTY_NAME_UTF8_SUFFIX = "UTF8";
 const CHARSET_CP437 = "cp437";
 const BITFLAG_AMBIGUITY_MASK = BITFLAG_ENCRYPTED | BITFLAG_DATA_DESCRIPTOR | BITFLAG_LANG_ENCODING_FLAG;
-const VENDOR_VERSION_AE_1 = 1;
+const VENDOR_VERSION_AE_1$1 = 1;
 const ZIP64_PROPERTIES = [
 	[PROPERTY_NAME_UNCOMPRESSED_SIZE, MAX_32_BITS],
 	[PROPERTY_NAME_COMPRESSED_SIZE, MAX_32_BITS],
@@ -4891,7 +4893,7 @@ class ZipEntry {
 			config,
 			bitFlag,
 			rawBitFlag,
-			signature,
+			crc32,
 			rawLastModDate,
 			uncompressedSize,
 			compressedSize
@@ -4982,7 +4984,7 @@ class ZipEntry {
 		const checkCrc32 = (checkCrc32Option === UNDEFINED_VALUE ?
 			getOptionValue$1(zipEntry, options, OPTION_CHECK_SIGNATURE) :
 			checkCrc32Option) && !passThrough &&
-			(!encrypted || zipCrypto || (extraFieldAES && extraFieldAES.vendorVersion == VENDOR_VERSION_AE_1));
+			(!encrypted || zipCrypto || (extraFieldAES && extraFieldAES.vendorVersion == VENDOR_VERSION_AE_1$1));
 		const workerOptions = {
 			options: {
 				codecType: CODEC_INFLATE,
@@ -4992,9 +4994,9 @@ class ZipEntry {
 				encryptionStrength: extraFieldAES && extraFieldAES.strength,
 				checkCrc32,
 				checkAuthenticationCode: getOptionValue$1(zipEntry, options, OPTION_CHECK_AUTHENTICATION_CODE),
-				passwordVerification: zipCrypto && (dataDescriptor ? ((rawLastModDate >>> 8) & MAX_8_BITS) : ((signature >>> 24) & MAX_8_BITS)),
+				passwordVerification: zipCrypto && (dataDescriptor ? ((rawLastModDate >>> 8) & MAX_8_BITS) : ((crc32 >>> 24) & MAX_8_BITS)),
 				outputSize: passThrough ? compressedSize : uncompressedSize,
-				signature,
+				crc32,
 				compressed: compressionMethod != 0 && !passThrough,
 				encrypted,
 				useWebWorkers: getOptionValue$1(zipEntry, options, OPTION_USE_WEB_WORKERS),
@@ -5016,7 +5018,7 @@ class ZipEntry {
 				fileEntry,
 				index,
 				offset: localHeaderOffset,
-				signature,
+				crc32,
 				compressedSize,
 				uncompressedSize,
 				dataOffset,
@@ -5133,6 +5135,16 @@ function readCommonFooter(fileEntry, directory, dataView, offset, localDirectory
 	} else {
 		directory.compressionMethod = compressionMethod;
 	}
+	const extraFieldPkwareUnix = extraField.get(EXTRAFIELD_TYPE_PKWARE_UNIX);
+	if (extraFieldPkwareUnix) {
+		readExtraFieldUnixDates(extraFieldPkwareUnix, directory);
+		directory.extraFieldPkwareUnix = extraFieldPkwareUnix;
+	}
+	const extraFieldUnixType1 = extraField.get(EXTRAFIELD_TYPE_UNIX_TYPE1);
+	if (extraFieldUnixType1) {
+		readExtraFieldUnixDates(extraFieldUnixType1, directory);
+		directory.extraFieldUnixType1 = extraFieldUnixType1;
+	}
 	const extraFieldNTFS = extraField.get(EXTRAFIELD_TYPE_NTFS);
 	if (extraFieldNTFS) {
 		readExtraFieldNTFS(extraFieldNTFS, directory);
@@ -5182,15 +5194,15 @@ function readExtraFieldUnicode(extraFieldUnicode, propertyName, rawPropertyName,
 		return;
 	}
 	const extraFieldView = getDataView(extraFieldUnicode.data);
-	const crc32 = new Crc32();
-	crc32.append(fileEntry[rawPropertyName]);
-	const dataViewSignature = getDataView(new Uint8Array(4));
-	dataViewSignature.setUint32(0, crc32.get(), true);
-	const signature = getUint32(extraFieldView, 1);
+	const computedCrc32 = new Crc32();
+	computedCrc32.append(fileEntry[rawPropertyName]);
+	const computedCrc32View = getDataView(new Uint8Array(4));
+	computedCrc32View.setUint32(0, computedCrc32.get(), true);
+	const nameCrc32 = getUint32(extraFieldView, 1);
 	Object.assign(extraFieldUnicode, {
 		version: getUint8(extraFieldView, 0),
 		[propertyName]: decodeText(extraFieldUnicode.data.subarray(5)),
-		valid: !fileEntry.bitFlag.languageEncodingFlag && signature == getUint32(dataViewSignature, 0)
+		valid: !fileEntry.bitFlag.languageEncodingFlag && nameCrc32 == getUint32(computedCrc32View, 0)
 	});
 	if (extraFieldUnicode.valid) {
 		directory[propertyName] = extraFieldUnicode[propertyName];
@@ -5209,7 +5221,7 @@ function readExtraFieldAES(extraFieldAES, directory, compressionMethod) {
 		compressionMethod: getUint16(extraFieldView, 5)
 	});
 	directory.compressionMethod = extraFieldAES.compressionMethod;
-	if (extraFieldAES.vendorVersion != VENDOR_VERSION_AE_1) {
+	if (extraFieldAES.vendorVersion != VENDOR_VERSION_AE_1$1) {
 		directory.crc32 = UNDEFINED_VALUE;
 	}
 }
@@ -5249,6 +5261,22 @@ function readExtraFieldNTFS(extraFieldNTFS, directory) {
 	}
 }
 
+function readExtraFieldUnixDates(extraField, directory) {
+	if (extraField.data.length < 8) {
+		return;
+	}
+	const extraFieldView = getDataView(extraField.data);
+	const lastAccessDate = new Date(getUint32(extraFieldView, 0) * 1000);
+	const lastModDate = new Date(getUint32(extraFieldView, 4) * 1000);
+	const extraFieldData = { lastAccessDate, lastModDate };
+	if (extraField.data.length >= 12) {
+		extraFieldData.uid = getUint16(extraFieldView, 8);
+		extraFieldData.gid = getUint16(extraFieldView, 10);
+	}
+	Object.assign(extraField, extraFieldData);
+	Object.assign(directory, extraFieldData);
+}
+
 function readExtraFieldUnix(extraField, directory, isInfoZip) {
 	try {
 		const view = getDataView(extraField.data);
@@ -5327,7 +5355,7 @@ async function detectOverlappingEntry({
 	fileEntry,
 	index,
 	offset,
-	signature,
+	crc32,
 	compressedSize,
 	uncompressedSize,
 	dataOffset,
@@ -5348,7 +5376,7 @@ async function detectOverlappingEntry({
 		const dataDescriptorSignature = dataDescriptorArray.length == dataDescriptorLength + DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH &&
 			getUint32(getDataView(dataDescriptorArray), 0) == DATA_DESCRIPTOR_RECORD_SIGNATURE;
 		if (dataDescriptorSignature) {
-			const readSignature = getUint32(getDataView(dataDescriptorArray), 4);
+			const readCrc32 = getUint32(getDataView(dataDescriptorArray), 4);
 			let readCompressedSize;
 			let readUncompressedSize;
 			if (extraFieldZip64) {
@@ -5358,8 +5386,8 @@ async function detectOverlappingEntry({
 				readCompressedSize = getUint32(getDataView(dataDescriptorArray), 8);
 				readUncompressedSize = getUint32(getDataView(dataDescriptorArray), 12);
 			}
-			const matchSignature = (fileEntry.encrypted && !fileEntry.zipCrypto) || readSignature == signature;
-			if (matchSignature &&
+			const matchCrc32 = (fileEntry.encrypted && !fileEntry.zipCrypto) || readCrc32 == crc32;
+			if (matchCrc32 &&
 				readCompressedSize == compressedSize &&
 				readUncompressedSize == uncompressedSize) {
 				dataDescriptorLength += DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH;
@@ -5528,11 +5556,11 @@ function checkLocalDirectory(zipEntry, localDirectory, rawLocalFilename) {
 		throwAmbiguousArchive("mismatched local file header (compression method)");
 	}
 	if (!localDirectory.bitFlag.dataDescriptor &&
-		(localDirectory.signature || localDirectory.compressedSize || localDirectory.uncompressedSize) &&
-		(localDirectory.signature != zipEntry.signature ||
+		(localDirectory.crc32 || localDirectory.compressedSize || localDirectory.uncompressedSize) &&
+		(localDirectory.crc32 != zipEntry.crc32 ||
 			localDirectory.compressedSize != zipEntry.compressedSize ||
 			localDirectory.uncompressedSize != zipEntry.uncompressedSize)) {
-		throwAmbiguousArchive("mismatched local file header (signature or sizes)");
+		throwAmbiguousArchive("mismatched local file header (crc32 or sizes)");
 	}
 }
 
@@ -5652,6 +5680,8 @@ const ERR_INVALID_MSDOS_ATTRIBUTES = "Invalid msdosAttributesRaw (must be intege
 const ERR_INVALID_MSDOS_DATA = "Invalid msdosAttributes (must be an object with boolean flags)";
 
 const EXTRAFIELD_DATA_AES = new Uint8Array([0x07, 0x00, 0x02, 0x00, 0x41, 0x45, 0x03, 0x00, 0x00]);
+const EXTRAFIELD_OFFSET_AES_VENDOR_VERSION = 4;
+const VENDOR_VERSION_AE_1 = 1;
 const INFOZIP_EXTRA_FIELD_TYPE = "infozip";
 const UNIX_EXTRA_FIELD_TYPE = "unix";
 
@@ -5746,9 +5776,9 @@ class ZipWriter {
 				zip64UncompressedSize,
 				extraFieldLength
 			});
-			const { signature } = entry;
-			if (signature !== UNDEFINED_VALUE) {
-				setUint32(headerView, HEADER_OFFSET_SIGNATURE, signature);
+			const { crc32 } = entry;
+			if (crc32 !== UNDEFINED_VALUE) {
+				setUint32(headerView, HEADER_OFFSET_SIGNATURE, crc32);
 			}
 			Object.assign(entry, {
 				zip64UncompressedSize,
@@ -5933,6 +5963,7 @@ async function addFile(zipWriter, name, reader, options) {
 			internalFileAttribute: metadataInfo.resolvedOptions.internalFileAttributes,
 			externalFileAttribute: attributesInfo.resolvedOptions.externalFileAttributes,
 			signature: options[PROPERTY_NAME_SIGNATURE],
+			crc32: options.crc32 === UNDEFINED_VALUE ? options[PROPERTY_NAME_SIGNATURE] : options.crc32,
 			offset: zipWriter.offset - diskOffset,
 			diskNumberStart: diskNumber
 		});
@@ -6149,27 +6180,8 @@ function resolveMetadata(zipWriter, name, options) {
 	if (!zipCrypto && (password !== UNDEFINED_VALUE || rawPassword !== UNDEFINED_VALUE) && !(encryptionStrength >= 1 && encryptionStrength <= 3)) {
 		throw new Error(ERR_INVALID_ENCRYPTION_STRENGTH);
 	}
-	let rawExtraField = EMPTY_UINT8_ARRAY;
-	const extraField = options[PROPERTY_NAME_EXTRA_FIELD];
-	if (extraField) {
-		let extraFieldSize = 0;
-		let offset = 0;
-		extraField.forEach(data => extraFieldSize += 4 + getLength(data));
-		rawExtraField = new Uint8Array(extraFieldSize);
-		const rawExtraFieldView = getDataView(rawExtraField);
-		extraField.forEach((data, type) => {
-			if (type > MAX_16_BITS) {
-				throw new Error(ERR_INVALID_EXTRAFIELD_TYPE);
-			}
-			if (getLength(data) > MAX_16_BITS) {
-				throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
-			}
-			setUint16(rawExtraFieldView, offset, type);
-			setUint16(rawExtraFieldView, offset + 2, getLength(data));
-			arraySet(rawExtraField, data, offset + 4);
-			offset += 4 + getLength(data);
-		});
-	}
+	const rawExtraField = serializeExtraField(options[PROPERTY_NAME_EXTRA_FIELD]);
+	const rawLocalExtraField = serializeExtraField(options[OPTION_LOCAL_EXTRA_FIELD]);
 	return {
 		comment,
 		resolvedOptions: {
@@ -6203,11 +6215,36 @@ function resolveMetadata(zipWriter, name, options) {
 			useCompressionStream,
 			dataDescriptor,
 			zip64,
-			rawExtraField
+			rawExtraField,
+			rawLocalExtraField
 		}
 	};
 }
 
+function serializeExtraField(extraField) {
+	if (!extraField) {
+		return EMPTY_UINT8_ARRAY;
+	}
+	let extraFieldSize = 0;
+	let offset = 0;
+	extraField.forEach(data => extraFieldSize += 4 + getLength(data));
+	const rawExtraField = new Uint8Array(extraFieldSize);
+	const rawExtraFieldView = getDataView(rawExtraField);
+	extraField.forEach((data, type) => {
+		if (type > MAX_16_BITS) {
+			throw new Error(ERR_INVALID_EXTRAFIELD_TYPE);
+		}
+		if (getLength(data) > MAX_16_BITS) {
+			throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
+		}
+		setUint16(rawExtraFieldView, offset, type);
+		setUint16(rawExtraFieldView, offset + 2, getLength(data));
+		arraySet(rawExtraField, data, offset + 4);
+		offset += 4 + getLength(data);
+	});
+	return rawExtraField;
+}
+
 async function resolveSizes(zipWriter, reader, { resolvedOptions: metadata }, options) {
 	const { passThrough, zipCrypto, password, rawPassword, encryptionStrength } = metadata;
 	let { dataDescriptor, zip64, level, compressionMethod } = metadata;
@@ -6532,12 +6569,9 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		msdosAttributes
 	};
 	let {
-		crc32: signature,
+		crc32,
 		uncompressedSize
 	} = options;
-	if (signature === UNDEFINED_VALUE) {
-		({ signature } = options);
-	}
 	let compressedSize = 0;
 	if (!passThrough) {
 		uncompressedSize = 0;
@@ -6575,7 +6609,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 			if (!passThrough) {
 				uncompressedSize = result.inputSize;
 				if (!encrypted || zipCrypto) {
-					signature = result.signature;
+					crc32 = result.crc32;
 				}
 			}
 			if ((!zip64CompressedSize && compressedSize >= MAX_32_BITS) ||
@@ -6591,7 +6625,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 
 	}
 	setEntryInfo({
-		signature,
+		crc32,
 		compressedSize,
 		uncompressedSize,
 		headerInfo,
@@ -6614,8 +6648,8 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		version,
 		headerArray,
 		headerView,
-		signature,
-		crc32: encrypted && !zipCrypto ? UNDEFINED_VALUE : signature,
+		signature: crc32,
+		crc32: encrypted && !zipCrypto && !passThrough ? UNDEFINED_VALUE : crc32,
 		extraFieldExtendedTimestampFlag,
 		zip64UncompressedSize,
 		zip64CompressedSize
@@ -6636,6 +6670,7 @@ function getHeaderInfo(options) {
 		dataDescriptor,
 		directory,
 		rawExtraField,
+		rawLocalExtraField,
 		encryptionStrength,
 		extendedTimestamp,
 		ntfsTimestamp,
@@ -6643,7 +6678,8 @@ function getHeaderInfo(options) {
 		encrypted,
 		zip64UncompressedSize,
 		zip64CompressedSize,
-		uncompressedSize
+		uncompressedSize,
+		crc32
 	} = options;
 	let { version, compressionMethod } = options;
 	const compressed = !directory && (compressionMethod === UNDEFINED_VALUE
@@ -6769,11 +6805,14 @@ function getHeaderInfo(options) {
 	}
 	if (encrypted && !zipCrypto) {
 		version = version > VERSION_AES ? version : VERSION_AES;
+		if (passThrough && crc32 !== UNDEFINED_VALUE) {
+			rawExtraFieldAES[EXTRAFIELD_OFFSET_AES_VENDOR_VERSION] = VENDOR_VERSION_AE_1;
+		}
 		rawExtraFieldAES[9] = compressionMethod;
 		compressionMethod = COMPRESSION_METHOD_AES;
 	}
 	const localExtraFieldZip64Length = writeLocalExtraFieldZip64 ? getLength(rawLocalExtraFieldZip64) : 0;
-	const extraFieldLength = localExtraFieldZip64Length + getLength(rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawExtraFieldUnix, rawExtraField);
+	const extraFieldLength = localExtraFieldZip64Length + getLength(rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawExtraFieldUnix, rawExtraField, rawLocalExtraField);
 	if (extraFieldLength > MAX_16_BITS) {
 		throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
 	}
@@ -6807,6 +6846,7 @@ function getHeaderInfo(options) {
 	localHeader.bytes(rawExtraFieldNTFS);
 	localHeader.bytes(rawExtraFieldUnix);
 	localHeader.bytes(rawExtraField);
+	localHeader.bytes(rawLocalExtraField);
 	if (dataDescriptor) {
 		if (!zip64CompressedSize) {
 			setUint32(localHeaderView, HEADER_OFFSET_COMPRESSED_SIZE + LOCAL_HEADER_COMMON_OFFSET, 0);
@@ -6925,7 +6965,7 @@ function getDataDescriptorInfo({
 }
 
 function setEntryInfo({
-	signature,
+	crc32,
 	compressedSize,
 	uncompressedSize,
 	headerInfo,
@@ -6933,6 +6973,7 @@ function setEntryInfo({
 }, {
 	zip64,
 	zipCrypto,
+	passThrough,
 	dataDescriptor
 }) {
 	const {
@@ -6943,10 +6984,10 @@ function setEntryInfo({
 		dataDescriptorView,
 		dataDescriptorOffset
 	} = dataDescriptorInfo;
-	if ((!encrypted || zipCrypto) && signature !== UNDEFINED_VALUE) {
-		setUint32(headerView, HEADER_OFFSET_SIGNATURE, signature);
+	if ((!encrypted || zipCrypto || passThrough) && crc32 !== UNDEFINED_VALUE) {
+		setUint32(headerView, HEADER_OFFSET_SIGNATURE, crc32);
 		if (dataDescriptor) {
-			setUint32(dataDescriptorView, dataDescriptorOffset, signature);
+			setUint32(dataDescriptorView, dataDescriptorOffset, crc32);
 		}
 	}
 	if (zip64) {
@@ -6969,15 +7010,15 @@ function updateLocalHeader({
 	encrypted,
 	zip64,
 	localExtraFieldZip64Length,
-	signature,
+	crc32,
 	compressedSize,
 	uncompressedSize,
 	zip64UncompressedSize,
 	zip64CompressedSize
-}, localHeaderView, { dataDescriptor }) {
+}, localHeaderView, { dataDescriptor, passThrough }) {
 	if (!dataDescriptor) {
-		if (!encrypted) {
-			setUint32(localHeaderView, HEADER_OFFSET_SIGNATURE + LOCAL_HEADER_COMMON_OFFSET, signature);
+		if (!encrypted || (passThrough && crc32 !== UNDEFINED_VALUE)) {
+			setUint32(localHeaderView, HEADER_OFFSET_SIGNATURE + LOCAL_HEADER_COMMON_OFFSET, crc32);
 		}
 		if (!zip64CompressedSize) {
 			setUint32(localHeaderView, HEADER_OFFSET_COMPRESSED_SIZE + LOCAL_HEADER_COMMON_OFFSET, compressedSize);
@@ -8247,33 +8288,7 @@ function terminateWorkersAndModule() {
 	resetWasmModule();
 }
 
-/*
- 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.
- */
+/// <reference types="../index.d.ts" />
 
 
 configureExternalAssets();