@zip.js/zip.js 2.8.22 → 2.8.23

package/lib/core/zip-writer.js

@@ -169,7 +169,7 @@ const ERR_INVALID_VERSION = "Version exceeds 65535";
 const ERR_INVALID_ENCRYPTION_STRENGTH = "The strength must equal 1, 2, or 3";
 const ERR_INVALID_EXTRAFIELD_TYPE = "Extra field type exceeds 65535";
 const ERR_INVALID_EXTRAFIELD_DATA = "Extra field data exceeds 64KB";
-const ERR_UNSUPPORTED_FORMAT = "Zip64 is not supported (make sure 'keepOrder' is set to 'true')";
+const ERR_UNSUPPORTED_FORMAT = "Zip64 is not supported (set the 'zip64' option to 'true')";
 const ERR_UNDEFINED_UNCOMPRESSED_SIZE = "Undefined uncompressed size";
 const ERR_ZIP_NOT_EMPTY = "Zip file not empty";
 const ERR_INVALID_UID = "Invalid uid (must be integer 0..2^32-1)";
@@ -601,14 +601,11 @@ async function addFile(zipWriter, name, reader, options) {
 			maximumCompressedSize = getMaximumCompressedSize(uncompressedSize);
 		}
 	}
-	const { diskOffset, diskNumber, maxSize } = zipWriter.writer;
+	const { diskOffset, diskNumber } = zipWriter.writer;
 	const zip64UncompressedSize = zip64Enabled || uncompressedSize > MAX_32_BITS;
 	const zip64CompressedSize = zip64Enabled || maximumCompressedSize > MAX_32_BITS;
-	const zip64Offset = zip64Enabled || zipWriter.offset + zipWriter.pendingEntriesSize - diskOffset > MAX_32_BITS;
-	const supportZip64SplitFile = getOptionValue(zipWriter, options, OPTION_SUPPORT_ZIP64_SPLIT_FILE, true);
-	const zip64DiskNumberStart = (supportZip64SplitFile && zip64Enabled) || diskNumber + Math.ceil(zipWriter.pendingEntriesSize / maxSize) > MAX_16_BITS;
-	if (zip64Offset || zip64UncompressedSize || zip64CompressedSize || zip64DiskNumberStart) {
-		if (zip64 === false || !keepOrder) {
+	if (zip64UncompressedSize || zip64CompressedSize) {
+		if (zip64 === false) {
 			throw new Error(ERR_UNSUPPORTED_FORMAT);
 		} else {
 			zip64 = true;
@@ -628,8 +625,6 @@ async function addFile(zipWriter, name, reader, options) {
 		zip64,
 		zip64UncompressedSize,
 		zip64CompressedSize,
-		zip64Offset,
-		zip64DiskNumberStart,
 		password,
 		rawPassword,
 		level,
@@ -757,7 +752,6 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			await writeData(fileWriter, localHeaderArray);
 		}
 		fileEntry = await createFileEntry(reader, fileWriter, fileEntry, entryInfo, zipWriter.config, options);
-		const { zip64 } = fileEntry;
 		if (!bufferedWrite) {
 			writingEntryData = false;
 		}
@@ -769,9 +763,6 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			writingBufferedEntryData = true;
 			fileEntry.diskNumberStart = writer.diskNumber;
 			fileEntry.offset = zipWriter.offset - writer.diskOffset;
-			if (zip64) {
-				updateZip64ExtraField(fileEntry);
-			}
 			updateLocalHeader(fileEntry, localHeaderView, options);
 			await skipDiskIfNeeded(writable);
 			await writeData(writer, localHeaderArray);
@@ -780,12 +771,6 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			writingBufferedEntryData = false;
 		} else {
 			fileEntry.offset = zipWriter.offset - diskOffset;
-			if (zip64) {
-				updateZip64ExtraField(fileEntry);
-			}
-		}
-		if (fileEntry.offset > MAX_32_BITS && !zip64) {
-			throw new Error(ERR_UNSUPPORTED_FORMAT);
 		}
 		zipWriter.offset += fileEntry.size;
 		return fileEntry;
@@ -875,8 +860,6 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		zip64,
 		zip64UncompressedSize,
 		zip64CompressedSize,
-		zip64Offset,
-		zip64DiskNumberStart,
 		zipCrypto,
 		dataDescriptor,
 		directory,
@@ -1014,9 +997,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		signature,
 		extraFieldExtendedTimestampFlag,
 		zip64UncompressedSize,
-		zip64CompressedSize,
-		zip64Offset,
-		zip64DiskNumberStart
+		zip64CompressedSize
 	});
 	return fileEntry;
 }
@@ -1040,74 +1021,41 @@ function getHeaderInfo(options) {
 		encrypted,
 		zip64UncompressedSize,
 		zip64CompressedSize,
-		zip64Offset,
-		zip64DiskNumberStart,
-		uncompressedSize,
-		offset,
-		diskNumberStart
+		uncompressedSize
 	} = options;
 	let { version, compressionMethod } = options;
 	const compressed = !directory && (level > 0 || (level === UNDEFINED_VALUE && compressionMethod !== 0));
-	let rawExtraFieldZip64;
 	let rawLocalExtraFieldZip64;
 	const uncompressedFile = passThrough || !compressed;
 	const zip64ExtraFieldComplete = zip64 && (options.bufferedWrite || ((!zip64UncompressedSize && !zip64CompressedSize) || uncompressedFile));
 	if (zip64) {
-		let rawExtraFieldZip64Length = 4;
 		let rawLocalExtraFieldZip64Length = 4;
 		if (zip64UncompressedSize) {
-			rawExtraFieldZip64Length += 8;
 			rawLocalExtraFieldZip64Length += 8;
 		}
 		if (zip64CompressedSize) {
-			rawExtraFieldZip64Length += 8;
 			rawLocalExtraFieldZip64Length += 8;
 		}
-		if (zip64Offset) {
-			rawExtraFieldZip64Length += 8;
-		}
-		if (zip64DiskNumberStart) {
-			rawExtraFieldZip64Length += 4;
-		}
-		rawExtraFieldZip64 = new Uint8Array(rawExtraFieldZip64Length);
-		const rawExtraFieldZip64View = getDataView(rawExtraFieldZip64);
 		rawLocalExtraFieldZip64 = new Uint8Array(rawLocalExtraFieldZip64Length);
 		const rawLocalExtraFieldZip64View = getDataView(rawLocalExtraFieldZip64);
-		setUint16(rawExtraFieldZip64View, 0, EXTRAFIELD_TYPE_ZIP64);
-		setUint16(rawExtraFieldZip64View, 2, getLength(rawExtraFieldZip64) - 4);
 		setUint16(rawLocalExtraFieldZip64View, 0, EXTRAFIELD_TYPE_ZIP64);
 		setUint16(rawLocalExtraFieldZip64View, 2, getLength(rawLocalExtraFieldZip64) - 4);
 		if (zip64ExtraFieldComplete) {
-			const rawExtraFieldZip64View = getDataView(rawExtraFieldZip64);
 			const rawLocalExtraFieldZip64View = getDataView(rawLocalExtraFieldZip64);
-			let rawExtraFieldZip64Offset = 4;
 			let rawLocalExtraFieldZip64Offset = 4;
 			if (zip64UncompressedSize) {
-				setBigUint64(rawExtraFieldZip64View, rawExtraFieldZip64Offset, BigInt(uncompressedSize));
-				rawExtraFieldZip64Offset += 8;
 				setBigUint64(rawLocalExtraFieldZip64View, rawLocalExtraFieldZip64Offset, BigInt(uncompressedSize));
 				rawLocalExtraFieldZip64Offset += 8;
 			}
 			if (zip64CompressedSize && uncompressedFile) {
-				setBigUint64(rawExtraFieldZip64View, rawExtraFieldZip64Offset, BigInt(uncompressedSize));
-				rawExtraFieldZip64Offset += 8;
 				setBigUint64(rawLocalExtraFieldZip64View, rawLocalExtraFieldZip64Offset, BigInt(uncompressedSize));
 				rawLocalExtraFieldZip64Offset += 8;
 			}
-			if (zip64Offset) {
-				setBigUint64(rawExtraFieldZip64View, rawExtraFieldZip64Offset, BigInt(offset));
-				rawExtraFieldZip64Offset += 8;
-			}
-			if (zip64DiskNumberStart) {
-				setUint32(rawExtraFieldZip64View, rawExtraFieldZip64Offset, diskNumberStart);
-				rawExtraFieldZip64Offset += 4;
-			}
 			if (rawLocalExtraFieldZip64Offset == 4) {
 				rawLocalExtraFieldZip64 = new Uint8Array();
 			}
 		}
 	} else {
-		rawExtraFieldZip64 = new Uint8Array();
 		rawLocalExtraFieldZip64 = new Uint8Array();
 	}
 	let rawExtraFieldAES;
@@ -1264,7 +1212,7 @@ function getHeaderInfo(options) {
 		version,
 		compressionMethod,
 		extraFieldExtendedTimestampFlag,
-		rawExtraFieldZip64,
+		rawExtraFieldZip64: new Uint8Array(),
 		localExtraFieldZip64Length,
 		rawExtraFieldExtendedTimestamp,
 		rawExtraFieldNTFS,
@@ -1436,35 +1384,6 @@ function updateLocalHeader({
 	}
 }
 
-function updateZip64ExtraField({
-	compressedSize,
-	uncompressedSize,
-	offset,
-	diskNumberStart,
-	zip64UncompressedSize,
-	zip64CompressedSize,
-	zip64Offset,
-	zip64DiskNumberStart,
-	rawExtraFieldZip64
-}) {
-	const rawExtraFieldZip64View = getDataView(rawExtraFieldZip64);
-	let rawExtraFieldZip64Offset = 4;
-	if (zip64UncompressedSize) {
-		setBigUint64(rawExtraFieldZip64View, rawExtraFieldZip64Offset, BigInt(uncompressedSize));
-		rawExtraFieldZip64Offset += 8;
-	}
-	if (zip64CompressedSize) {
-		setBigUint64(rawExtraFieldZip64View, rawExtraFieldZip64Offset, BigInt(compressedSize));
-		rawExtraFieldZip64Offset += 8;
-	}
-	if (zip64Offset) {
-		setBigUint64(rawExtraFieldZip64View, rawExtraFieldZip64Offset, BigInt(offset));
-		rawExtraFieldZip64Offset += 8;
-	}
-	if (zip64DiskNumberStart) {
-		setUint32(rawExtraFieldZip64View, rawExtraFieldZip64Offset, diskNumberStart);
-	}
-}
 
 async function closeFile(zipWriter, comment, options) {
 	const { files, writer } = zipWriter;
@@ -1477,7 +1396,6 @@ async function closeFile(zipWriter, comment, options) {
 	for (const [, fileEntry] of files) {
 		const {
 			rawFilename,
-			rawExtraFieldZip64,
 			rawExtraFieldAES,
 			rawComment,
 			rawExtraFieldNTFS,
@@ -1485,8 +1403,36 @@ async function closeFile(zipWriter, comment, options) {
 			rawExtraField,
 			extendedTimestamp,
 			extraFieldExtendedTimestampFlag,
-			lastModDate
+			lastModDate,
+			zip64UncompressedSize,
+			zip64CompressedSize,
+			uncompressedSize,
+			compressedSize
 		} = fileEntry;
+		const zip64Offset = fileEntry.offset > MAX_32_BITS;
+		const zip64DiskNumberStart = fileEntry.diskNumberStart > MAX_16_BITS;
+		let rawExtraFieldZip64;
+		if (zip64Offset || zip64DiskNumberStart || zip64UncompressedSize || zip64CompressedSize) {
+			let length = 4;
+			if (zip64UncompressedSize) length += 8;
+			if (zip64CompressedSize) length += 8;
+			if (zip64Offset) length += 8;
+			if (zip64DiskNumberStart) length += 4;
+			rawExtraFieldZip64 = new Uint8Array(length);
+			const zip64View = getDataView(rawExtraFieldZip64);
+			setUint16(zip64View, 0, EXTRAFIELD_TYPE_ZIP64);
+			setUint16(zip64View, 2, length - 4);
+			let zip64FieldOffset = 4;
+			if (zip64UncompressedSize) { setBigUint64(zip64View, zip64FieldOffset, BigInt(uncompressedSize)); zip64FieldOffset += 8; }
+			if (zip64CompressedSize) { setBigUint64(zip64View, zip64FieldOffset, BigInt(compressedSize)); zip64FieldOffset += 8; }
+			if (zip64Offset) { setBigUint64(zip64View, zip64FieldOffset, BigInt(fileEntry.offset)); zip64FieldOffset += 8; }
+			if (zip64DiskNumberStart) { setUint32(zip64View, zip64FieldOffset, fileEntry.diskNumberStart); }
+		} else {
+			rawExtraFieldZip64 = new Uint8Array();
+		}
+		fileEntry.rawExtraFieldZip64 = rawExtraFieldZip64;
+		fileEntry.zip64Offset = zip64Offset;
+		fileEntry.zip64DiskNumberStart = zip64DiskNumberStart;
 		let rawExtraFieldTimestamp;
 		if (extendedTimestamp) {
 			rawExtraFieldTimestamp = new Uint8Array(9);
@@ -1528,7 +1474,6 @@ async function closeFile(zipWriter, comment, options) {
 			versionMadeBy,
 			headerArray,
 			headerView,
-			zip64,
 			zip64UncompressedSize,
 			zip64CompressedSize,
 			zip64DiskNumberStart,
@@ -1554,7 +1499,7 @@ async function closeFile(zipWriter, comment, options) {
 		directoryOffset += 2;
 		setUint16(directoryView, directoryOffset, getLength(rawComment));
 		directoryOffset += 2;
-		setUint16(directoryView, directoryOffset, zip64 && zip64DiskNumberStart ? MAX_16_BITS : diskNumberStart);
+		setUint16(directoryView, directoryOffset, zip64DiskNumberStart ? MAX_16_BITS : diskNumberStart);
 		directoryOffset += 2;
 		setUint16(directoryView, directoryOffset, internalFileAttributes);
 		directoryOffset += 2;
@@ -1562,7 +1507,7 @@ async function closeFile(zipWriter, comment, options) {
 			setUint32(directoryView, directoryOffset, externalFileAttributes);
 		}
 		directoryOffset += 4;
-		setUint32(directoryView, directoryOffset, zip64 && zip64Offset ? MAX_32_BITS : fileEntryOffset);
+		setUint32(directoryView, directoryOffset, zip64Offset ? MAX_32_BITS : fileEntryOffset);
 		directoryOffset += 4;
 		arraySet(directoryArray, rawFilename, directoryOffset);
 		directoryOffset += getLength(rawFilename);

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.8.22",
+  "version": "2.8.23",
   "type": "module",
   "keywords": [
     "zip",
@@ -155,7 +155,7 @@
   "homepage": "https://gildas-lormeau.github.io/zip.js",
   "devDependencies": {
     "@rollup/plugin-replace": "^6.0.3",
-    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-terser": "^1.0.0",
     "eslint": "^10.0.2",
     "http-server": "^14.1.1",
     "rollup": "^4.59.0",