@zip.js/zip.js 2.8.58 → 2.8.59

package/dist/zip-fs-core.js

@@ -82,6 +82,7 @@
 	const BITFLAG_LEVEL_FAST_MASK = 0b100;
 	const BITFLAG_LEVEL_SUPER_FAST_MASK = 0b110;
 	const BITFLAG_DATA_DESCRIPTOR = 0b1000;
+	const BITFLAG_COMPRESSED_PATCHED_DATA = 0b100000;
 	const BITFLAG_STRONG_ENCRYPTION = 0b1000000;
 	const BITFLAG_LANG_ENCODING_FLAG = 0b100000000000;
 	const BITFLAG_MASKED_LOCAL_HEADERS = 0b10000000000000;
@@ -199,6 +200,7 @@
 	const OPTION_USDZ = "usdz";
 	const OPTION_UNIX_EXTRA_FIELD_TYPE = "unixExtraFieldType";
 	const OPTION_LOCAL_EXTRA_FIELD = "localExtraField";
+	const OPTION_CENTRAL_EXTRA_FIELD = "centralExtraField";
 	const OPTION_STRICTNESS = "strictness";
 	const OPTION_FILENAME_VALIDATION = "filenameValidation";
 	const OPTION_NORMALIZE_FILENAME = "normalizeFilename";
@@ -4126,6 +4128,21 @@
 	const ERR_INVALID_FILENAME_VALIDATION = "Invalid filenameValidation (must be 'strict', 'balanced' or 'tolerant')";
 	const ERR_INVALID_MAX_APPENDED_DATA_SIZE = "Invalid maxAppendedDataSize (must be a number greater than or equal to 0)";
 	const ERR_UNSUPPORTED_UINT64 = "64-bit value exceeds Number.MAX_SAFE_INTEGER";
+	const WARNING_UNSORTED_CENTRAL_DIRECTORY = "unsorted central directory";
+	const WARNING_UNKNOWN_VERSION = "unknown version needed to extract";
+	const WARNING_COMPRESSED_PATCHED_DATA = "compressed patched data";
+	const WARNING_MALFORMED_EXTRA_FIELD = "malformed extra field";
+	const WARNING_UNKNOWN_ZIP64_EXTENSIBLE_DATA = "unknown zip64 extensible data";
+	const WARNING_WRAPPED_ENTRIES_COUNT = "wrapped entries count";
+	const WARNING_APPENDED_DATA = "appended data";
+	const WARNING_PREPENDED_DATA = "prepended data";
+	const WARNING_TRAILING_CENTRAL_DIRECTORY_DATA = "trailing central directory data";
+	const WARNING_DUPLICATE_FILENAME = "duplicate filename";
+	const WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY = "mismatched zip64 end of central directory record";
+	const WARNING_MISMATCHED_LOCAL_FILE_HEADER_BIT_FLAG = "mismatched local file header (general purpose bit flag)";
+	const WARNING_MISMATCHED_LOCAL_FILE_HEADER_COMPRESSION_METHOD = "mismatched local file header (compression method)";
+	const WARNING_MISMATCHED_LOCAL_FILE_HEADER_CRC32_OR_SIZES = "mismatched local file header (crc32 or sizes)";
+	const MAX_KNOWN_VERSION = 63;
 	const DRIVE_LETTER_REGEXP = /^[a-zA-Z]:/;
 	const CHARSET_UTF8 = "utf-8";
 	const PROPERTY_NAME_UTF8_SUFFIX = "UTF8";
@@ -4176,6 +4193,7 @@
 			if (reader.size < END_OF_CENTRAL_DIR_LENGTH) {
 				throw new Error(ERR_BAD_FORMAT);
 			}
+			const warnings = zipReader.warnings = [];
 			const strictness = getStrictness(options, zipReader.options);
 			const checkAmbiguity = strictness == STRICTNESS_STRICT;
 			const rejectAmbiguousEndOfDirectory = strictness != STRICTNESS_TOLERANT;
@@ -4199,8 +4217,12 @@
 			const commentOffset = endOfDirectoryInfo.offset;
 			const commentLength = getUint16$1(endOfDirectoryView, 20);
 			const appendedDataOffset = commentOffset + END_OF_CENTRAL_DIR_LENGTH + commentLength;
-			if (reader.size - appendedDataOffset > maxAppendedDataSize) {
-				throwAmbiguousArchive("appended data");
+			const appendedDataLength = reader.size - appendedDataOffset;
+			if (appendedDataLength > maxAppendedDataSize) {
+				throwAmbiguousArchive(WARNING_APPENDED_DATA);
+			}
+			if (appendedDataLength > 0) {
+				addWarning(warnings, WARNING_APPENDED_DATA);
 			}
 			let lastDiskNumber = getUint16$1(endOfDirectoryView, 4);
 			const expectedLastDiskNumber = reader.lastDiskNumber || 0;
@@ -4254,23 +4276,23 @@
 					}
 					if (lastDiskNumber == MAX_16_BITS) {
 						lastDiskNumber = getUint32$1(endOfDirectoryView, 16);
-					} else if (checkAmbiguity && lastDiskNumber != getUint32$1(endOfDirectoryView, 16)) {
-						throwAmbiguousArchive("mismatched zip64 end of central directory record");
+					} else if (lastDiskNumber != getUint32$1(endOfDirectoryView, 16)) {
+						reportAmbiguity(checkAmbiguity, warnings, WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY);
 					}
 					if (diskNumber == MAX_16_BITS) {
 						diskNumber = getUint32$1(endOfDirectoryView, 20);
-					} else if (checkAmbiguity && diskNumber != getUint32$1(endOfDirectoryView, 20)) {
-						throwAmbiguousArchive("mismatched zip64 end of central directory record");
+					} else if (diskNumber != getUint32$1(endOfDirectoryView, 20)) {
+						reportAmbiguity(checkAmbiguity, warnings, WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY);
 					}
 					if (filesLength == MAX_16_BITS) {
 						filesLength = getBigUint64(endOfDirectoryView, 32);
-					} else if (checkAmbiguity && filesLength != getBigUint64(endOfDirectoryView, 32)) {
-						throwAmbiguousArchive("mismatched zip64 end of central directory record");
+					} else if (filesLength != getBigUint64(endOfDirectoryView, 32)) {
+						reportAmbiguity(checkAmbiguity, warnings, WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY);
 					}
 					if (directoryDataLength == MAX_32_BITS) {
 						directoryDataLength = getBigUint64(endOfDirectoryView, 40);
-					} else if (checkAmbiguity && directoryDataLength != getBigUint64(endOfDirectoryView, 40)) {
-						throwAmbiguousArchive("mismatched zip64 end of central directory record");
+					} else if (directoryDataLength != getBigUint64(endOfDirectoryView, 40)) {
+						reportAmbiguity(checkAmbiguity, warnings, WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY);
 					}
 					directoryDataOffset = getDiskOffset$1(reader, diskNumber) + getBigUint64(endOfDirectoryView, 48) + prependedDataLength;
 				}
@@ -4339,14 +4361,22 @@
 				declaredDirectoryDataLength = directoryArray.length;
 				decryptedDirectory = true;
 			}
+			if (directoryEncryptionInfo && !decryptedDirectory &&
+				(directoryArray.length < 4 || getUint32$1(directoryView, 0) == CENTRAL_FILE_HEADER_SIGNATURE)) {
+				addWarning(warnings, WARNING_UNKNOWN_ZIP64_EXTENSIBLE_DATA);
+			}
 			startOffset = directoryDataOffset;
 			const filenameEncoding = getOptionValue$1(zipReader, options, OPTION_FILENAME_ENCODING);
 			const commentEncoding = getOptionValue$1(zipReader, options, OPTION_COMMENT_ENCODING);
-			const filenames = checkAmbiguity ? new Set() : UNDEFINED_VALUE;
+			const filenames = new Set();
 			let duplicateFilename;
+			let previousEntryPosition = -1;
 			const recoverWrappedFilesLength = !checkAmbiguity && !zip64EndOfDirectory;
 			if (!filesLength && recoverWrappedFilesLength) {
 				filesLength = getWrappedFilesLength(directoryView, directoryArray, offset);
+				if (filesLength) {
+					addWarning(warnings, WARNING_WRAPPED_ENTRIES_COUNT);
+				}
 			}
 			for (let indexFile = 0; indexFile < filesLength; indexFile++) {
 				const fileEntry = new ZipEntry$1(reader, zipReader.options);
@@ -4425,15 +4455,26 @@
 					filename,
 					comment
 				});
-				readCommonFooter(fileEntry, fileEntry, directoryView, offset + 6);
+				if (readCommonFooter(fileEntry, fileEntry, directoryView, offset + 6)) {
+					addWarning(warnings, WARNING_MALFORMED_EXTRA_FIELD, filename);
+				}
 				fileEntry.offset += prependedDataLength;
-				startOffset = Math.min(getDiskOffset$1(reader, fileEntry.diskNumberStart) + fileEntry.offset, startOffset);
-				if (checkAmbiguity) {
-					if (filenames.has(fileEntry.filename)) {
-						duplicateFilename = true;
-					}
-					filenames.add(fileEntry.filename);
+				const entryPosition = getDiskOffset$1(reader, fileEntry.diskNumberStart) + fileEntry.offset;
+				startOffset = Math.min(entryPosition, startOffset);
+				if (entryPosition < previousEntryPosition) {
+					addWarning(warnings, WARNING_UNSORTED_CENTRAL_DIRECTORY, filename);
+				}
+				previousEntryPosition = entryPosition;
+				if ((fileEntry.version & MAX_8_BITS) > MAX_KNOWN_VERSION) {
+					addWarning(warnings, WARNING_UNKNOWN_VERSION, filename);
+				}
+				if ((fileEntry.rawBitFlag & BITFLAG_COMPRESSED_PATCHED_DATA) == BITFLAG_COMPRESSED_PATCHED_DATA) {
+					addWarning(warnings, WARNING_COMPRESSED_PATCHED_DATA, filename);
+				}
+				if (filenames.has(fileEntry.filename)) {
+					duplicateFilename = true;
 				}
+				filenames.add(fileEntry.filename);
 				const unixExternalUpper = (fileEntry.externalFileAttributes >> 16) & MAX_16_BITS;
 				if (fileEntry.unixMode === UNDEFINED_VALUE && (unixExternalUpper & (FILE_ATTR_UNIX_DEFAULT_MASK | FILE_ATTR_UNIX_EXECUTABLE_MASK | FILE_ATTR_UNIX_TYPE_DIR)) != 0) {
 					fileEntry.unixMode = unixExternalUpper;
@@ -4471,7 +4512,11 @@
 				};
 				offset = endOffset;
 				if (indexFile == filesLength - 1 && recoverWrappedFilesLength) {
-					filesLength += getWrappedFilesLength(directoryView, directoryArray, offset);
+					const wrappedFilesLength = getWrappedFilesLength(directoryView, directoryArray, offset);
+					if (wrappedFilesLength) {
+						filesLength += wrappedFilesLength;
+						addWarning(warnings, WARNING_WRAPPED_ENTRIES_COUNT);
+					}
 				}
 				const { onprogress } = options;
 				if (onprogress) {
@@ -4497,18 +4542,22 @@
 				zipReader.digitalSignature = digitalSignature;
 				offsetAfterSignature = offset + 6 + digitalSignature.length;
 			}
-			if (checkAmbiguity && offset != declaredDirectoryDataLength && offsetAfterSignature != declaredDirectoryDataLength) {
-				throwAmbiguousArchive("trailing central directory data");
+			if ((offset != declaredDirectoryDataLength && offsetAfterSignature != declaredDirectoryDataLength) ||
+				(!decryptedDirectory && offset != directoryDataLength && offsetAfterSignature != directoryDataLength)) {
+				reportAmbiguity(checkAmbiguity, warnings, WARNING_TRAILING_CENTRAL_DIRECTORY_DATA);
 			}
 			if (duplicateFilename) {
-				throwAmbiguousArchive("duplicate filename");
+				reportAmbiguity(checkAmbiguity, warnings, WARNING_DUPLICATE_FILENAME);
 			}
 			const extractPrependedData = getOptionValue$1(zipReader, options, OPTION_EXTRACT_PREPENDED_DATA);
 			const extractAppendedData = getOptionValue$1(zipReader, options, OPTION_EXTRACT_APPENDED_DATA);
 			const splitZipSignatureLength = (checkAmbiguity || extractPrependedData) && filesLength &&
 				startOffset == SPLIT_ZIP_FILE_SIGNATURE_LENGTH && await startsWithSplitZipMarker(reader) ? SPLIT_ZIP_FILE_SIGNATURE_LENGTH : 0;
 			if (checkAmbiguity && (prependedDataLength || (filesLength && startOffset > splitZipSignatureLength))) {
-				throwAmbiguousArchive("prepended data");
+				throwAmbiguousArchive(WARNING_PREPENDED_DATA);
+			}
+			if (prependedDataLength || (filesLength && startOffset > SPLIT_ZIP_FILE_SIGNATURE_LENGTH)) {
+				addWarning(warnings, WARNING_PREPENDED_DATA);
 			}
 			if (extractPrependedData) {
 				zipReader.prependedData = startOffset > splitZipSignatureLength ?
@@ -4578,6 +4627,28 @@
 		}
 	}
 
+	async function isZipFile(reader, options = {}) {
+		reader = new GenericReader(reader);
+		await initStream(reader);
+		if (reader.size === UNDEFINED_VALUE || !reader.readUint8Array) {
+			reader = new BlobReader(await streamToBlob(reader.readable));
+			await initStream(reader);
+		}
+		if (reader.size < END_OF_CENTRAL_DIR_LENGTH) {
+			return false;
+		}
+		const strictness = getStrictness(options, {});
+		const rejectAmbiguousEndOfDirectory = strictness != STRICTNESS_TOLERANT;
+		const maxAppendedDataSize = getMaxAppendedDataSize(options[OPTION_MAX_APPENDED_DATA_SIZE], strictness);
+		const { endOfDirectoryInfo, endOfDirectoryReachingEndCount } = await findEndOfCentralDirectory(reader, rejectAmbiguousEndOfDirectory, maxAppendedDataSize);
+		if (!endOfDirectoryInfo || (strictness == STRICTNESS_STRICT && endOfDirectoryReachingEndCount > 1)) {
+			return false;
+		}
+		const commentLength = getUint16$1(getDataView(endOfDirectoryInfo), 20);
+		const appendedDataOffset = endOfDirectoryInfo.offset + END_OF_CENTRAL_DIR_LENGTH + commentLength;
+		return reader.size - appendedDataOffset <= maxAppendedDataSize;
+	}
+
 	let ZipEntry$1 = class ZipEntry {
 
 		constructor(reader, options) {
@@ -4609,6 +4680,7 @@
 				dataDescriptor
 			} = bitFlag;
 			const localDirectory = fileEntry.localDirectory = {};
+			const warnings = fileEntry.warnings = [];
 			const localHeaderOffset = getDiskOffset$1(reader, diskNumberStart) + offset;
 			const dataArray = await readUint8Array(reader, localHeaderOffset, HEADER_SIZE);
 			const dataView = getDataView(dataArray);
@@ -4649,10 +4721,10 @@
 			if (checkLocalFilename) {
 				localDirectory.rawFilename = rawLocalFilename;
 			}
-			readCommonFooter(zipEntry, localDirectory, dataView, 4, true);
-			if (checkLocalDirectory) {
-				validateLocalDirectory(zipEntry, localDirectory, rawLocalFilename, checkLocalFilename);
+			if (readCommonFooter(zipEntry, localDirectory, dataView, 4, true)) {
+				addWarning(warnings, WARNING_MALFORMED_EXTRA_FIELD);
 			}
+			validateLocalDirectory(zipEntry, localDirectory, rawLocalFilename, checkLocalFilename, checkLocalDirectory ? UNDEFINED_VALUE : warnings);
 			const { lastAccessDate, creationDate, uid, gid } = localDirectory;
 			if (lastAccessDate) {
 				fileEntry.lastAccessDate = lastAccessDate;
@@ -4878,6 +4950,7 @@
 		const extraField = directory.extraField = new Map();
 		const rawExtraFieldView = getDataView(rawExtraField);
 		let offsetExtraField = 0;
+		let malformedExtraField = false;
 		try {
 			while (offsetExtraField < rawExtraField.length) {
 				const type = getUint16$1(rawExtraFieldView, offsetExtraField);
@@ -4889,7 +4962,10 @@
 				offsetExtraField += 4 + size;
 			}
 		} catch {
-			// ignored
+			malformedExtraField = true;
+		}
+		if (offsetExtraField > rawExtraField.length) {
+			malformedExtraField = true;
 		}
 		const compressionMethod = getUint16$1(dataView, offset + 4);
 		Object.assign(directory, {
@@ -4957,6 +5033,7 @@
 		if (extraFieldUSDZ) {
 			directory.extraFieldUSDZ = extraFieldUSDZ;
 		}
+		return malformedExtraField;
 	}
 
 	function readExtraFieldZip64(extraFieldZip64, directory) {
@@ -5418,27 +5495,46 @@
 		return UNDEFINED_VALUE;
 	}
 
-	function validateLocalDirectory(zipEntry, localDirectory, rawLocalFilename, checkLocalFilename) {
+	function validateLocalDirectory(zipEntry, localDirectory, rawLocalFilename, checkLocalFilename, warnings) {
 		const { rawFilename } = zipEntry;
+		const reject = !warnings;
 		const maskedLocalDirectory = zipEntry.decryptedDirectory &&
 			(localDirectory.rawBitFlag & BITFLAG_MASKED_LOCAL_HEADERS) == BITFLAG_MASKED_LOCAL_HEADERS;
 		if (checkLocalFilename && !maskedLocalDirectory &&
 			(rawLocalFilename.length != rawFilename.length ||
 				rawLocalFilename.some((byteValue, indexByte) => byteValue != rawFilename[indexByte]))) {
-			throwAmbiguousArchive("mismatched local file header (filename)");
+			reportAmbiguity(reject, warnings, "mismatched local file header (filename)");
 		}
 		if ((localDirectory.rawBitFlag & BITFLAG_AMBIGUITY_MASK) != (zipEntry.rawBitFlag & BITFLAG_AMBIGUITY_MASK)) {
-			throwAmbiguousArchive("mismatched local file header (general purpose bit flag)");
+			reportAmbiguity(reject, warnings, WARNING_MISMATCHED_LOCAL_FILE_HEADER_BIT_FLAG);
 		}
 		if (localDirectory.compressionMethod != zipEntry.compressionMethod) {
-			throwAmbiguousArchive("mismatched local file header (compression method)");
+			reportAmbiguity(reject, warnings, WARNING_MISMATCHED_LOCAL_FILE_HEADER_COMPRESSION_METHOD);
 		}
 		if (!localDirectory.bitFlag.dataDescriptor && !maskedLocalDirectory &&
 			(localDirectory.crc32 || localDirectory.compressedSize || localDirectory.uncompressedSize) &&
 			(localDirectory.crc32 != zipEntry.crc32 ||
 				localDirectory.compressedSize != zipEntry.compressedSize ||
 				localDirectory.uncompressedSize != zipEntry.uncompressedSize)) {
-			throwAmbiguousArchive("mismatched local file header (crc32 or sizes)");
+			reportAmbiguity(reject, warnings, WARNING_MISMATCHED_LOCAL_FILE_HEADER_CRC32_OR_SIZES);
+		}
+	}
+
+	function reportAmbiguity(reject, warnings, reason) {
+		if (reject) {
+			throwAmbiguousArchive(reason);
+		} else {
+			addWarning(warnings, reason);
+		}
+	}
+
+	function addWarning(warnings, reason, filename) {
+		if (!warnings.some(warning => warning.reason == reason)) {
+			const warning = { reason };
+			if (filename !== UNDEFINED_VALUE) {
+				warning.filename = filename;
+			}
+			warnings.push(warning);
 		}
 	}
 
@@ -5515,8 +5611,23 @@
 		ERR_UNSUPPORTED_ENCRYPTION: ERR_UNSUPPORTED_ENCRYPTION,
 		ERR_UNSUPPORTED_UINT64: ERR_UNSUPPORTED_UINT64,
 		ERR_WORKER_STARTUP_TIMEOUT: ERR_WORKER_STARTUP_TIMEOUT,
+		WARNING_APPENDED_DATA: WARNING_APPENDED_DATA,
+		WARNING_COMPRESSED_PATCHED_DATA: WARNING_COMPRESSED_PATCHED_DATA,
+		WARNING_DUPLICATE_FILENAME: WARNING_DUPLICATE_FILENAME,
+		WARNING_MALFORMED_EXTRA_FIELD: WARNING_MALFORMED_EXTRA_FIELD,
+		WARNING_MISMATCHED_LOCAL_FILE_HEADER_BIT_FLAG: WARNING_MISMATCHED_LOCAL_FILE_HEADER_BIT_FLAG,
+		WARNING_MISMATCHED_LOCAL_FILE_HEADER_COMPRESSION_METHOD: WARNING_MISMATCHED_LOCAL_FILE_HEADER_COMPRESSION_METHOD,
+		WARNING_MISMATCHED_LOCAL_FILE_HEADER_CRC32_OR_SIZES: WARNING_MISMATCHED_LOCAL_FILE_HEADER_CRC32_OR_SIZES,
+		WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY: WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY,
+		WARNING_PREPENDED_DATA: WARNING_PREPENDED_DATA,
+		WARNING_TRAILING_CENTRAL_DIRECTORY_DATA: WARNING_TRAILING_CENTRAL_DIRECTORY_DATA,
+		WARNING_UNKNOWN_VERSION: WARNING_UNKNOWN_VERSION,
+		WARNING_UNKNOWN_ZIP64_EXTENSIBLE_DATA: WARNING_UNKNOWN_ZIP64_EXTENSIBLE_DATA,
+		WARNING_UNSORTED_CENTRAL_DIRECTORY: WARNING_UNSORTED_CENTRAL_DIRECTORY,
+		WARNING_WRAPPED_ENTRIES_COUNT: WARNING_WRAPPED_ENTRIES_COUNT,
 		ZipReader: ZipReader,
-		ZipReaderStream: ZipReaderStream
+		ZipReaderStream: ZipReaderStream,
+		isZipFile: isZipFile
 	});
 
 	/*
@@ -5729,6 +5840,7 @@
 						rawExtraFieldNTFS: EMPTY_UINT8_ARRAY,
 						rawExtraFieldUnix: EMPTY_UINT8_ARRAY,
 						rawExtraField,
+						rawCentralExtraField: EMPTY_UINT8_ARRAY,
 						extendedTimestamp: false,
 						headerArray,
 						headerView
@@ -5838,7 +5950,6 @@
 
 	async function addFileEntry(zipWriter, name, reader, options) {
 		options = Object.assign({}, options);
-		name = name.trim();
 		if (getOptionValue(zipWriter, options, PROPERTY_NAME_DIRECTORY) && !name.endsWith(DIRECTORY_SIGNATURE)) {
 			name += DIRECTORY_SIGNATURE;
 		}
@@ -5910,7 +6021,6 @@
 	}
 
 	function resolveAttributes(zipWriter, name, options) {
-		name = name.trim();
 		let msDosCompatible = getOptionValue(zipWriter, options, PROPERTY_NAME_MS_DOS_COMPATIBLE);
 		let versionMadeBy = getOptionValue(zipWriter, options, PROPERTY_NAME_VERSION_MADE_BY, msDosCompatible ? VERSION_MADE_BY_MSDOS : VERSION_MADE_BY_UNIX);
 		const executable = getOptionValue(zipWriter, options, PROPERTY_NAME_EXECUTABLE);
@@ -6115,6 +6225,7 @@
 		}
 		const rawExtraField = serializeExtraField(options[PROPERTY_NAME_EXTRA_FIELD]);
 		const rawLocalExtraField = serializeExtraField(options[OPTION_LOCAL_EXTRA_FIELD]);
+		const rawCentralExtraField = serializeExtraField(options[OPTION_CENTRAL_EXTRA_FIELD]);
 		return {
 			comment,
 			resolvedOptions: {
@@ -6150,7 +6261,8 @@
 				dataDescriptor,
 				zip64,
 				rawExtraField,
-				rawLocalExtraField
+				rawLocalExtraField,
+				rawCentralExtraField
 			}
 		};
 	}
@@ -6292,7 +6404,6 @@
 			let { name } = entry;
 			const { size } = entry;
 			const options = Object.assign({}, entry.options);
-			name = name.trim();
 			if (getOptionValue(zipWriter, options, PROPERTY_NAME_DIRECTORY) && !name.endsWith(DIRECTORY_SIGNATURE)) {
 				name += DIRECTORY_SIGNATURE;
 			}
@@ -6548,6 +6659,7 @@
 			versionMadeBy,
 			rawComment,
 			rawExtraField,
+			rawCentralExtraField,
 			useWebWorkers,
 			transferStreams,
 			onstart,
@@ -6591,6 +6703,7 @@
 			rawExtraFieldUnix,
 			rawExtraFieldAES,
 			rawExtraField,
+			rawCentralExtraField,
 			extendedTimestamp,
 			msDosCompatible,
 			internalFileAttributes,
@@ -7091,6 +7204,7 @@
 				rawExtraFieldNTFS,
 				rawExtraFieldUnix,
 				rawExtraField,
+				rawCentralExtraField,
 				extendedTimestamp,
 				extraFieldExtendedTimestampFlag,
 				lastModDate,
@@ -7145,7 +7259,8 @@
 				rawExtraFieldNTFS,
 				rawExtraFieldUnix,
 				rawExtraFieldTimestamp,
-				rawExtraField);
+				rawExtraField,
+				rawCentralExtraField);
 			if (extraFieldLength > MAX_16_BITS) {
 				throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
 			}
@@ -7173,6 +7288,7 @@
 				rawExtraFieldNTFS,
 				rawExtraFieldUnix,
 				rawExtraField,
+				rawCentralExtraField,
 				rawComment,
 				versionMadeBy,
 				headerArray,
@@ -7187,7 +7303,7 @@
 				uncompressedSize,
 				compressedSize
 			} = fileEntry;
-			const extraFieldLength = getLength(rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawExtraFieldUnix, rawExtraField);
+			const extraFieldLength = getLength(rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawExtraFieldUnix, 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));
@@ -7225,6 +7341,7 @@
 			directoryRecord.writeBytes(rawExtraFieldNTFS);
 			directoryRecord.writeBytes(rawExtraFieldUnix);
 			directoryRecord.writeBytes(rawExtraField);
+			directoryRecord.writeBytes(rawCentralExtraField);
 			directoryRecord.writeBytes(rawComment);
 			arraySet(directoryArray, directoryRecord.array, offset);
 			offset += directoryRecordLength;