@zip.js/zip.js 2.19.0 → 2.20.0

package/lib/core/version.js

@@ -26,6 +26,6 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const VERSION = "2.19.0";
+const VERSION = "2.20.0";
 
 export { VERSION };

package/lib/core/zip-reader.js

@@ -212,6 +212,8 @@ const WARNING_APPENDED_DATA = "appended data";
 const WARNING_PREPENDED_DATA = "prepended data";
 const WARNING_PREPENDED_CENTRAL_DIRECTORY = "prepended central directory";
 const WARNING_TRAILING_CENTRAL_DIRECTORY_DATA = "trailing central directory data";
+const WARNING_MISMATCHED_CENTRAL_DIRECTORY_OFFSET = "mismatched central directory offset";
+const WARNING_MISSING_ZIP64_EXTRA_FIELD = "missing zip64 extra field";
 const WARNING_DUPLICATE_FILENAME = "duplicate filename";
 const WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY = "mismatched zip64 end of central directory record";
 const WARNING_MULTIPLE_END_OF_CENTRAL_DIRECTORY = "multiple end of central directory records";
@@ -374,6 +376,8 @@ class ZipReader {
 					reportAmbiguity(checkAmbiguity, warnings, WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY);
 				}
 				directoryDataOffset = getDiskOffset(reader, diskNumber) + getBigUint64(endOfDirectoryView, 48) + prependedDataLength;
+			} else if (directoryDataOffset == MAX_32_BITS || directoryDataLength == MAX_32_BITS || diskNumber == MAX_16_BITS) {
+				throw new Error(ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND);
 			}
 		}
 		let declaredDirectoryDataLength = directoryDataLength;
@@ -396,25 +400,44 @@ class ZipReader {
 			if (directoryArray.length < 4) {
 				throw new Error(ERR_BAD_FORMAT);
 			}
-			const expectedDirectoryDataOffset = centralDirectoryEndOffset - directoryDataLength;
+			let expectedDirectoryDataOffset = centralDirectoryEndOffset - directoryDataLength;
 			if (directoryDataOffset != expectedDirectoryDataOffset && diskNumber == lastDiskNumber) {
 				const storedPointsAtDirectory = getUint32(directoryView, offset) == CENTRAL_FILE_HEADER_SIGNATURE ||
 					Boolean(directoryEncryptionInfo && directoryEncryptionInfo.compressedSize) ||
 					detectEncryptedCentralDirectory(directoryView);
 				let reconcile = !storedPointsAtDirectory;
-				if (!reconcile && expectedDirectoryDataOffset >= 0 && expectedDirectoryDataOffset + 4 <= reader.size) {
-					const expectedSignatureArray = await readUint8Array(reader, expectedDirectoryDataOffset, 4);
-					reconcile = getUint32(getDataView(expectedSignatureArray), 0) == CENTRAL_FILE_HEADER_SIGNATURE;
+				if (expectedDirectoryDataOffset >= 0 && expectedDirectoryDataOffset + 4 <= reader.size) {
+					const expectedPointsAtDirectory = await pointsAtDirectory(reader, expectedDirectoryDataOffset);
+					if (storedPointsAtDirectory) {
+						reconcile = expectedPointsAtDirectory;
+					} else if (!expectedPointsAtDirectory) {
+						const signatureRecordOffset = await findDigitalSignatureRecordOffset(reader, centralDirectoryEndOffset);
+						const signedDirectoryDataOffset = signatureRecordOffset - directoryDataLength;
+						if (signatureRecordOffset !== UNDEFINED_VALUE && signedDirectoryDataOffset >= 0 &&
+							await pointsAtDirectory(reader, signedDirectoryDataOffset)) {
+							expectedDirectoryDataOffset = signedDirectoryDataOffset;
+						}
+					}
 				}
 				if (reconcile) {
 					const originalDirectoryDataOffset = directoryDataOffset;
 					directoryDataOffset = expectedDirectoryDataOffset;
+					directoryArray = await readUint8Array(reader, directoryDataOffset, directoryDataLength);
+					directoryView = getDataView(directoryArray);
 					if (directoryDataOffset > originalDirectoryDataOffset) {
 						prependedDataLength += directoryDataOffset - originalDirectoryDataOffset;
 						prependedCentralDirectory = storedPointsAtDirectory;
+					} else {
+						reportAmbiguity(checkAmbiguity, warnings, WARNING_MISMATCHED_CENTRAL_DIRECTORY_OFFSET);
+						const offsetDelta = directoryDataOffset - originalDirectoryDataOffset;
+						if (directoryArray.length >= CENTRAL_FILE_HEADER_LENGTH) {
+							const localHeaderOffset = getUint32(directoryView, 42);
+							if (!await startsWithSignature(reader, localHeaderOffset, LOCAL_FILE_HEADER_SIGNATURE) &&
+								await startsWithSignature(reader, localHeaderOffset + offsetDelta, LOCAL_FILE_HEADER_SIGNATURE)) {
+								prependedDataLength += offsetDelta;
+							}
+						}
 					}
-					directoryArray = await readUint8Array(reader, directoryDataOffset, directoryDataLength);
-					directoryView = getDataView(directoryArray);
 				}
 			}
 		}
@@ -525,7 +548,16 @@ class ZipReader {
 				filename,
 				comment
 			});
-			const malformedExtraField = readCommonFooter(fileEntry, fileEntry, directoryView, offset + 6);
+			let malformedExtraField;
+			try {
+				malformedExtraField = readCommonFooter(fileEntry, fileEntry, directoryView, offset + 6);
+			} catch (error) {
+				if (checkAmbiguity || error.message != ERR_EXTRAFIELD_ZIP64_NOT_FOUND) {
+					throw error;
+				}
+				fileEntry.zip64ExtraFieldMissing = true;
+				addWarning(warnings, WARNING_MISSING_ZIP64_EXTRA_FIELD, fileEntry.filename);
+			}
 			filename = fileEntry.filename;
 			if (normalizeFilename) {
 				const normalizedFilename = normalizeFilename(filename);
@@ -567,11 +599,12 @@ class ZipReader {
 			const sticky = Boolean(fileEntry.unixMode & FILE_ATTR_UNIX_STICKY_MASK);
 			const unixType = fileEntry.unixMode === UNDEFINED_VALUE ? unixExternalUpper : fileEntry.unixMode;
 			const symlink = (unixType & FILE_ATTR_UNIX_TYPE_MASK) == FILE_ATTR_UNIX_TYPE_SYMLINK;
-			const executable = !symlink && ((fileEntry.unixMode !== UNDEFINED_VALUE)
-				? ((fileEntry.unixMode & FILE_ATTR_UNIX_EXECUTABLE_MASK) != 0)
-				: (unixCompatible && ((unixExternalUpper & FILE_ATTR_UNIX_EXECUTABLE_MASK) != 0)));
 			const modeIsDir = fileEntry.unixMode !== UNDEFINED_VALUE && ((fileEntry.unixMode & FILE_ATTR_UNIX_TYPE_MASK) == FILE_ATTR_UNIX_TYPE_DIR);
 			const upperIsDir = ((unixExternalUpper & FILE_ATTR_UNIX_TYPE_MASK) == FILE_ATTR_UNIX_TYPE_DIR);
+			const directory = modeIsDir || upperIsDir || (msDosCompatible && msdosAttributes.directory) || fileEntry.filename.endsWith(DIRECTORY_SIGNATURE);
+			const executable = !symlink && !directory && ((fileEntry.unixMode !== UNDEFINED_VALUE)
+				? ((fileEntry.unixMode & FILE_ATTR_UNIX_EXECUTABLE_MASK) != 0)
+				: (unixCompatible && ((unixExternalUpper & FILE_ATTR_UNIX_EXECUTABLE_MASK) != 0)));
 			Object.assign(fileEntry, {
 				setuid,
 				setgid,
@@ -579,7 +612,7 @@ class ZipReader {
 				symlink,
 				unixExternalUpper,
 				executable,
-				directory: modeIsDir || upperIsDir || (msDosCompatible && msdosAttributes.directory) || fileEntry.filename.endsWith(DIRECTORY_SIGNATURE),
+				directory,
 				zipCrypto: fileEntry.encrypted && !fileEntry.extraFieldAES
 			});
 			const entry = new Entry(fileEntry);
@@ -635,10 +668,10 @@ class ZipReader {
 		const extractAppendedData = getOptionValue(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))) {
+		if (checkAmbiguity && (prependedDataLength > 0 || (filesLength && startOffset > splitZipSignatureLength))) {
 			throwAmbiguousArchive(WARNING_PREPENDED_DATA);
 		}
-		if (prependedDataLength || (filesLength && startOffset > SPLIT_ZIP_FILE_SIGNATURE_LENGTH)) {
+		if (prependedDataLength > 0 || (filesLength && startOffset > SPLIT_ZIP_FILE_SIGNATURE_LENGTH)) {
 			addWarning(warnings, WARNING_PREPENDED_DATA);
 		}
 		if (prependedCentralDirectory) {
@@ -827,6 +860,8 @@ export {
 	WARNING_PREPENDED_DATA,
 	WARNING_PREPENDED_CENTRAL_DIRECTORY,
 	WARNING_TRAILING_CENTRAL_DIRECTORY_DATA,
+	WARNING_MISMATCHED_CENTRAL_DIRECTORY_OFFSET,
+	WARNING_MISSING_ZIP64_EXTRA_FIELD,
 	WARNING_DUPLICATE_FILENAME,
 	WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY,
 	WARNING_MULTIPLE_END_OF_CENTRAL_DIRECTORY,
@@ -847,6 +882,9 @@ class ZipEntry {
 
 	async getData(writer, fileEntry, readRanges, options = {}) {
 		const zipEntry = this;
+		if (zipEntry.zip64ExtraFieldMissing) {
+			throw new Error(ERR_EXTRAFIELD_ZIP64_NOT_FOUND);
+		}
 		const config = getConfiguration();
 		const {
 			reader,
@@ -1084,6 +1122,30 @@ function getWrappedFilesLength(directoryView, directoryArray, offset) {
 	return wrappedFilesLength % (MAX_16_BITS + 1) ? 0 : wrappedFilesLength;
 }
 
+function pointsAtDirectory(reader, offset) {
+	return startsWithSignature(reader, offset, CENTRAL_FILE_HEADER_SIGNATURE);
+}
+
+async function startsWithSignature(reader, offset, signature) {
+	if (offset < 0 || offset + 4 > reader.size) {
+		return false;
+	}
+	const signatureArray = await readUint8Array(reader, offset, 4);
+	return getUint32(getDataView(signatureArray), 0) == signature;
+}
+
+async function findDigitalSignatureRecordOffset(reader, endOffset) {
+	const startOffset = Math.max(0, endOffset - (6 + MAX_16_BITS));
+	const tailArray = await readUint8Array(reader, startOffset, endOffset - startOffset);
+	const tailView = getDataView(tailArray);
+	for (let indexByte = tailArray.length - 6; indexByte >= 0; indexByte--) {
+		if (getUint32(tailView, indexByte) == DIGITAL_SIGNATURE_RECORD_SIGNATURE &&
+			indexByte + 6 + getUint16(tailView, indexByte + 4) == tailArray.length) {
+			return startOffset + indexByte;
+		}
+	}
+}
+
 function readDigitalSignature(signatureRecordArray) {
 	if (signatureRecordArray.length >= 6) {
 		const signatureRecordView = getDataView(signatureRecordArray);
@@ -1215,6 +1277,11 @@ function readCommonFooter(fileEntry, directory, dataView, offset, localDirectory
 		readExtraFieldUnixDates(extraFieldUnixType1, directory);
 		directory.extraFieldUnixType1 = extraFieldUnixType1;
 	}
+	const extraFieldExtendedTimestamp = extraField.get(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
+	if (extraFieldExtendedTimestamp) {
+		readExtraFieldExtendedTimestamp(extraFieldExtendedTimestamp, directory, localDirectory);
+		directory.extraFieldExtendedTimestamp = extraFieldExtendedTimestamp;
+	}
 	const extraFieldNTFS = extraField.get(EXTRAFIELD_TYPE_NTFS);
 	if (extraFieldNTFS) {
 		readExtraFieldNTFS(extraFieldNTFS, directory);
@@ -1231,11 +1298,6 @@ function readCommonFooter(fileEntry, directory, dataView, offset, localDirectory
 		readExtraFieldUnix(extraFieldUnix, unixIdsRead ? {} : directory, false);
 		directory.extraFieldUnix = extraFieldUnix;
 	}
-	const extraFieldExtendedTimestamp = extraField.get(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
-	if (extraFieldExtendedTimestamp) {
-		readExtraFieldExtendedTimestamp(extraFieldExtendedTimestamp, directory, localDirectory);
-		directory.extraFieldExtendedTimestamp = extraFieldExtendedTimestamp;
-	}
 	const extraFieldUSDZ = extraField.get(EXTRAFIELD_TYPE_USDZ);
 	if (extraFieldUSDZ) {
 		directory.extraFieldUSDZ = extraFieldUSDZ;

package/lib/core/zip-writer.js

@@ -342,13 +342,14 @@ class ZipWriter {
 		return watchPromiseError(this, prependZipEntries(this, reader));
 	}
 
-	appendZip(reader) {
-		return watchPromiseError(this, this.appendZipEntries(reader));
+	appendZip(reader, options = {}) {
+		return watchPromiseError(this, this.appendZipEntries(reader, options));
 	}
 
-	async appendZipEntries(reader) {
+	async appendZipEntries(reader, options = {}) {
 		const zipWriter = this;
 		const { pendingAddFileCalls, filenames, fileEntries } = zipWriter;
+		const filter = checkFunctionOption(options.filter);
 		while (pendingAddFileCalls.size) {
 			await Promise.allSettled(Array.from(pendingAddFileCalls));
 		}
@@ -367,10 +368,16 @@ class ZipWriter {
 			const { ZipReader } = await import("./zip-reader.js");
 			const zipReader = new ZipReader(reader);
 			const entries = await zipReader.getEntries();
+			const keptEntries = [];
+			for (const entry of entries) {
+				if (!filter || await filter(entry)) {
+					keptEntries.push(entry);
+				}
+			}
 			await zipReader.close();
 			await initStream(zipWriter.writer);
 			const { directoryOffset } = zipReader;
-			entries.forEach(({ filename }) => {
+			keptEntries.forEach(({ filename }) => {
 				if (filenames.has(filename)) {
 					throw new Error(ERR_DUPLICATED_NAME);
 				}
@@ -391,8 +398,8 @@ class ZipWriter {
 					zipWriter.offset += SPLIT_ZIP_FILE_SIGNATURE_LENGTH;
 				}
 			}
-			const entryPositions = await copyZipData(zipWriter, reader, entries, directoryOffset);
-			entries.forEach(entry => {
+			const entryPositions = await copyZipData(zipWriter, reader, entries, keptEntries, directoryOffset, Boolean(filter));
+			keptEntries.forEach(entry => {
 				const {
 					version,
 					rawLastModDate,
@@ -2449,26 +2456,42 @@ function removeExtraFieldZip64(rawExtraField) {
 	return rawExtraField;
 }
 
-async function copyZipData(zipWriter, reader, entries, directoryOffset) {
+async function copyZipData(zipWriter, reader, entries, keptEntries, directoryOffset, compact) {
 	const { writer } = zipWriter;
 	const entryPositions = new Map();
-	if (writer.closeDisk) {
+	if (writer.closeDisk || compact) {
 		const sortedEntries = Array.from(entries).sort((firstEntry, secondEntry) =>
 			getSourceOffset(reader, firstEntry) - getSourceOffset(reader, secondEntry));
-		let copiedLength = 0;
-		for (const entry of sortedEntries) {
-			const sourceOffset = getSourceOffset(reader, entry);
-			await copyData(zipWriter, reader, copiedLength, sourceOffset - copiedLength);
-			if (exceedsAvailableSize(writer, await getLocalHeaderLength(reader, sourceOffset))) {
-				await writer.closeDisk();
+		const regionEnds = getRegionEnds(reader, sortedEntries, directoryOffset);
+		const keptEntrySet = new Set(keptEntries);
+		let copiedOffset = 0;
+		let lastPosition;
+		for (let indexEntry = 0; indexEntry < sortedEntries.length; indexEntry++) {
+			const entry = sortedEntries[indexEntry];
+			if (keptEntrySet.has(entry)) {
+				const sourceOffset = getSourceOffset(reader, entry);
+				if (sourceOffset < copiedOffset) {
+					entryPositions.set(entry, lastPosition);
+				} else {
+					if (!compact) {
+						await copyData(zipWriter, reader, copiedOffset, sourceOffset - copiedOffset);
+					}
+					if (writer.closeDisk && exceedsAvailableSize(writer, await getLocalHeaderLength(reader, sourceOffset))) {
+						await writer.closeDisk();
+					}
+					lastPosition = {
+						offset: getSegmentOffset(zipWriter, writer),
+						diskNumberStart: getDiskNumber(writer)
+					};
+					entryPositions.set(entry, lastPosition);
+					await copyData(zipWriter, reader, sourceOffset, regionEnds[indexEntry] - sourceOffset);
+					copiedOffset = regionEnds[indexEntry];
+				}
 			}
-			entryPositions.set(entry, {
-				offset: getSegmentOffset(zipWriter, writer),
-				diskNumberStart: getDiskNumber(writer)
-			});
-			copiedLength = sourceOffset;
 		}
-		await copyData(zipWriter, reader, copiedLength, directoryOffset - copiedLength);
+		if (!compact) {
+			await copyData(zipWriter, reader, copiedOffset, directoryOffset - copiedOffset);
+		}
 	} else {
 		const baseOffset = zipWriter.offset;
 		await copyData(zipWriter, reader, 0, directoryOffset);
@@ -2480,6 +2503,20 @@ async function copyZipData(zipWriter, reader, entries, directoryOffset) {
 	return entryPositions;
 }
 
+function getRegionEnds(reader, sortedEntries, directoryOffset) {
+	const regionEnds = new Array(sortedEntries.length);
+	let regionEnd = directoryOffset;
+	for (let indexEntry = sortedEntries.length - 1; indexEntry >= 0; indexEntry--) {
+		const sourceOffset = getSourceOffset(reader, sortedEntries[indexEntry]);
+		const nextEntry = sortedEntries[indexEntry + 1];
+		if (nextEntry && getSourceOffset(reader, nextEntry) > sourceOffset) {
+			regionEnd = getSourceOffset(reader, nextEntry);
+		}
+		regionEnds[indexEntry] = regionEnd;
+	}
+	return regionEnds;
+}
+
 async function copyData(zipWriter, reader, offset, size) {
 	if (size > 0) {
 		const { writer } = zipWriter;

package/lib/zip-core-reader.js

@@ -68,6 +68,8 @@ export {
 	WARNING_PREPENDED_DATA,
 	WARNING_PREPENDED_CENTRAL_DIRECTORY,
 	WARNING_TRAILING_CENTRAL_DIRECTORY_DATA,
+	WARNING_MISMATCHED_CENTRAL_DIRECTORY_OFFSET,
+	WARNING_MISSING_ZIP64_EXTRA_FIELD,
 	WARNING_DUPLICATE_FILENAME,
 	WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY,
 	WARNING_MULTIPLE_END_OF_CENTRAL_DIRECTORY,

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.19.0",
+  "version": "2.20.0",
   "type": "module",
   "keywords": [
     "zip",