@zip.js/zip.js 2.11.2 → 2.11.4

package/lib/core/io.js

@@ -237,11 +237,13 @@ class BlobReader extends Reader {
 		const reader = this;
 		const { sourceBlob, size } = reader;
 		const { offset = 0, size: readSize = size - offset } = options || {};
-		if (!offset && readSize >= size) {
-			return toCompatibleReadable(sourceBlob.stream());
-		}
-		if (blobSliceReliable) {
-			return toCompatibleReadable(sourceBlob.slice(offset, offset + readSize).stream());
+		if (typeof sourceBlob.stream == FUNCTION_TYPE) {
+			if (!offset && readSize >= size) {
+				return toCompatibleReadable(sourceBlob.stream());
+			}
+			if (blobSliceReliable) {
+				return toCompatibleReadable(sourceBlob.slice(offset, offset + readSize).stream());
+			}
 		}
 		return super.createReadable(options);
 	}

package/lib/core/options.js

@@ -26,6 +26,8 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* global DOMException */
+
 import {
 	BOOLEAN_TYPE,
 	FUNCTION_TYPE,
@@ -86,6 +88,8 @@ const STRICTNESS_TOLERANT = "tolerant";
 const ERR_INVALID_FUNCTION_OPTION = "Invalid option (must be a function)";
 const ERR_INVALID_SIGNAL = "Invalid signal (must be an AbortSignal instance)";
 const ERR_INVALID_PASSWORD_TYPE = "Invalid password (password must be a string, rawPassword must be a Uint8Array)";
+const ERR_ABORTED = "The operation was aborted";
+const ABORT_ERROR_NAME = "AbortError";
 
 export {
 	OPTION_FILENAME_ENCODING,
@@ -140,8 +144,11 @@ export {
 	ERR_INVALID_FUNCTION_OPTION,
 	ERR_INVALID_SIGNAL,
 	ERR_INVALID_PASSWORD_TYPE,
+	ERR_ABORTED,
+	ABORT_ERROR_NAME,
 	checkFunctionOption,
 	checkSignalOption,
+	throwIfAborted,
 	checkPasswordOption,
 	checkInteger,
 	checkIntegerOption,
@@ -162,6 +169,12 @@ function checkSignalOption(signal) {
 	return signal || UNDEFINED_VALUE;
 }
 
+function throwIfAborted(signal) {
+	if (signal && signal.aborted) {
+		throw signal.reason === UNDEFINED_VALUE ? new DOMException(ERR_ABORTED, ABORT_ERROR_NAME) : signal.reason;
+	}
+}
+
 function checkPasswordOption(password, rawPassword) {
 	if ((password && typeof password != STRING_TYPE) || (rawPassword && !(rawPassword instanceof Uint8Array))) {
 		throw new Error(ERR_INVALID_PASSWORD_TYPE);

package/lib/core/version.js

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

package/lib/core/zip-fs.js

@@ -55,7 +55,7 @@ import {
 import {
 	Entry
 } from "./zip-entry.js";
-import { checkSignalOption } from "./options.js";
+import { checkSignalOption, ERR_ABORTED, ABORT_ERROR_NAME } from "./options.js";
 import { ProgressWatcherStream, callHandler } from "./codec-worker.js";
 import {
 	UNDEFINED_VALUE,
@@ -92,8 +92,6 @@ const ERR_INVALID_PASS_THROUGH = "Invalid passThrough option (use readerOptions.
 const ERR_INVALID_READER_OPTIONS = "Invalid readerOptions (must be an object)";
 const ERR_ZIP_CRYPTO_LAST_MOD_DATE = "The last modification date of an entry encrypted with ZipCrypto cannot be changed when passThrough is set";
 const ERR_ABORT_EXPORT = "zipjs-abort-export";
-const ERR_ABORTED = "The operation was aborted";
-const ABORT_ERROR_NAME = "AbortError";
 const INFOZIP_EXTRA_FIELD_TYPE = "infozip";
 const INTERPRETED_EXTRA_FIELD_TYPES = new Set([
 	EXTRAFIELD_TYPE_ZIP64,
@@ -587,12 +585,14 @@ class ZipDirectoryEntry extends ZipEntry {
 		if (options.bufferedWrite === UNDEFINED_VALUE) {
 			options.bufferedWrite = true;
 		}
-		const entries = zipEntry.getChildren({ recursive: true }).filter(child => !isImplicitDirectory(child)).map(child => {
+		const children = zipEntry.getChildren({ recursive: true });
+		const entries = children.filter(child => !isImplicitDirectory(child)).map(child => {
 			const { name, entryOptions } = getChildEntryOptions(child, zipEntry, options);
 			return { name, size: child.directory ? 0 : getDeterminedSize(child, isPassThrough(child, options)), options: entryOptions };
 		});
 		const writeOrderGuaranteed = !options.bufferedWrite ||
-			(entries.every(entry => entry.options.keepOrder !== false) && zipEntry.children.every(child => !child.children.length));
+			(entries.every(entry => entry.options.keepOrder !== false) &&
+				children.every(child => isImplicitDirectory(child) || !child.children.length));
 		return getEntriesSize(options, entries, writeOrderGuaranteed, options.globalComment);
 	}
 

package/lib/core/zip-reader.js

@@ -173,6 +173,7 @@ import {
 	OPTION_PREVENT_CLOSE,
 	checkFunctionOption,
 	checkSignalOption,
+	throwIfAborted,
 	checkPasswordOption,
 	toNumber
 } from "./options.js";
@@ -668,27 +669,28 @@ class ZipReaderStream {
 				const { done, value } = await gen.next();
 				if (done)
 					return controller.close();
-				const chunk = {
-					...value,
-					readable: (function () {
-						const { readable, writable } = new TransformStream();
-						if (value.getData) {
-							getData();
-							return readable;
-						}
+				const entryReadable = (function () {
+					const { readable, writable } = new TransformStream();
+					if (value.getData) {
+						getData();
+						return readable;
+					}
 
-						async function getData() {
+					async function getData() {
+						try {
+							await value.getData(writable);
+						} catch (error) {
 							try {
-								await value.getData(writable);
-							} catch (error) {
-								try {
-									await writable.abort(error);
-								} catch {
-									// ignored
-								}
+								await writable.abort(error);
+							} catch {
+								// ignored
 							}
 						}
-					})()
+					}
+				})();
+				const chunk = {
+					...value,
+					readable: entryReadable
 				};
 				delete chunk.getData;
 				controller.enqueue(chunk);
@@ -880,6 +882,7 @@ class ZipEntry {
 		const size = compressedSize;
 		const readable = toCompatibleReadable(reader.createReadable({ offset: dataOffset, size }));
 		const signal = checkSignalOption(getOptionValue(zipEntry, options, OPTION_SIGNAL));
+		throwIfAborted(signal);
 		const checkPasswordOnly = getOptionValue(zipEntry, options, OPTION_CHECK_PASSWORD_ONLY);
 		let checkOverlappingEntry = getOptionValue(zipEntry, options, OPTION_CHECK_OVERLAPPING_ENTRY);
 		const checkOverlappingEntryOnly = getOptionValue(zipEntry, options, OPTION_CHECK_OVERLAPPING_ENTRY_ONLY);

package/lib/core/zip-writer.js

@@ -238,6 +238,7 @@ import {
 	ERR_INVALID_PASSWORD_TYPE,
 	checkFunctionOption,
 	checkSignalOption,
+	throwIfAborted,
 	checkPasswordOption,
 	checkInteger,
 	checkIntegerOption,
@@ -254,6 +255,7 @@ const ERR_INVALID_ENTRY_NAME = "File entry name exceeds 64KB";
 const ERR_INVALID_VERSION = "Version exceeds 65535";
 const ERR_INVALID_ENCRYPTION_STRENGTH = "The strength must equal 1, 2, or 3";
 const ERR_UNSUPPORTED_ENCRYPTION_USDZ = "Encryption is not supported in USDZ files";
+const ERR_UNSUPPORTED_SPLIT_USDZ = "Split zip files are not supported in USDZ files";
 const ERR_UNSUPPORTED_ENCRYPTION_PASS_THROUGH = "Encryption is not supported when the 'passThrough' option is set";
 const ERR_INVALID_EXTRAFIELD = "Invalid extra field (must be a Map)";
 const ERR_INVALID_EXTRAFIELD_TYPE = "Invalid extra field type (must be integer 0..65535)";
@@ -268,6 +270,7 @@ const ERR_UNDEFINED_UNCOMPRESSED_SIZE = "Undefined uncompressed size";
 const ERR_UNDEFINED_COMPRESSION_METHOD = "Undefined compression method";
 const ERR_UNDETERMINED_SIZE = "Undetermined size";
 const ERR_UNDEFINED_READER = "Undefined reader";
+const ERR_INVALID_READER = "Invalid reader (must be a Reader instance, a ReadableStream instance, or an object with a 'readable' property)";
 const ERR_ZIP_NOT_EMPTY = "Zip file not empty";
 const ERR_INVALID_UID = "Invalid uid (must be integer 0..2^32-1)";
 const ERR_INVALID_GID = "Invalid gid (must be integer 0..2^32-1)";
@@ -299,6 +302,9 @@ class ZipWriter {
 		const addSplitZipSignature =
 			availableSize > 0 && availableSize !== INFINITY_VALUE &&
 			maxSize > 0 && maxSize !== INFINITY_VALUE;
+		if (addSplitZipSignature && options[OPTION_USDZ]) {
+			throw new Error(ERR_UNSUPPORTED_SPLIT_USDZ);
+		}
 		Object.assign(this, {
 			writer,
 			addSplitZipSignature,
@@ -414,6 +420,7 @@ class ZipWriter {
 				}
 				const { offset, diskNumberStart } = entryPositions.get(entry);
 				Object.assign(entry, {
+					zip64Enabled: true,
 					zip64UncompressedSize,
 					zip64CompressedSize,
 					offset,
@@ -663,12 +670,14 @@ export {
 	ERR_INVALID_EXTRAFIELD_DATA,
 	ERR_INVALID_ENCRYPTION_STRENGTH,
 	ERR_UNSUPPORTED_ENCRYPTION_USDZ,
+	ERR_UNSUPPORTED_SPLIT_USDZ,
 	ERR_UNSUPPORTED_ENCRYPTION_PASS_THROUGH,
 	ERR_UNSUPPORTED_FORMAT,
 	ERR_UNDEFINED_UNCOMPRESSED_SIZE,
 	ERR_UNDEFINED_COMPRESSION_METHOD,
 	ERR_UNDETERMINED_SIZE,
 	ERR_UNDEFINED_READER,
+	ERR_INVALID_READER,
 	ERR_ZIP_NOT_EMPTY,
 	ERR_INVALID_SIGNATURE_DATA,
 	ERR_INVALID_UID,
@@ -910,6 +919,7 @@ function resolveMetadata(zipWriter, name, options) {
 	const createTempStream = getFunctionOptionValue(zipWriter, options, OPTION_CREATE_TEMP_STREAM);
 	const dataDescriptorSignature = getOptionValue(zipWriter, options, OPTION_DATA_DESCRIPTOR_SIGNATURE, true);
 	const signal = checkSignalOption(getOptionValue(zipWriter, options, OPTION_SIGNAL));
+	throwIfAborted(signal);
 	const useUnicodeFileNames = getOptionValue(zipWriter, options, OPTION_USE_UNICODE_FILE_NAMES, true);
 	const compressionMethod = getOptionValue(zipWriter, options, PROPERTY_NAME_COMPRESSION_METHOD);
 	const registeredCodec = passThrough || compressionMethod === UNDEFINED_VALUE ? UNDEFINED_VALUE : getRegisteredCodec(compressionMethod);
@@ -1027,6 +1037,9 @@ async function resolveSizes(zipWriter, reader, { resolvedOptions: metadata }, op
 	if (reader) {
 		reader = new GenericReader(reader);
 		await initStream(reader);
+		if (!reader.readable && !reader.readUint8Array) {
+			throw new Error(ERR_INVALID_READER);
+		}
 		({ size: contentSize } = reader);
 	}
 	return Object.assign({ reader }, resolveEntrySizes(zipWriter, Boolean(reader), contentSize, metadata, options));
@@ -1037,6 +1050,7 @@ function resolveEntrySizes(zipWriter, hasContent, contentSize, metadata, options
 	let { dataDescriptor, zip64, level, compressionMethod } = metadata;
 	let maximumCompressedSize = 0;
 	let uncompressedSize = 0;
+	let unknownSize = false;
 	if (passThrough && hasContent) {
 		uncompressedSize = options[PROPERTY_NAME_UNCOMPRESSED_SIZE];
 		if (uncompressedSize === UNDEFINED_VALUE) {
@@ -1062,8 +1076,8 @@ function resolveEntrySizes(zipWriter, hasContent, contentSize, metadata, options
 			if (contentSize === UNDEFINED_VALUE) {
 				dataDescriptor = true;
 				if (zip64 || zip64 === UNDEFINED_VALUE) {
-					zip64 = true;
-					uncompressedSize = maximumCompressedSize = MAX_32_BITS + 1;
+					zip64 = unknownSize = true;
+					maximumCompressedSize = MAX_32_BITS + 1;
 				}
 			} else {
 				options.uncompressedSize = uncompressedSize = contentSize;
@@ -1078,7 +1092,7 @@ function resolveEntrySizes(zipWriter, hasContent, contentSize, metadata, options
 	if (emptyEntry && !zipCrypto && getOptionValue(zipWriter, options, OPTION_DATA_DESCRIPTOR) === UNDEFINED_VALUE) {
 		dataDescriptor = false;
 	}
-	const zip64UncompressedSize = zip64Enabled || uncompressedSize >= MAX_32_BITS;
+	const zip64UncompressedSize = zip64Enabled || unknownSize || uncompressedSize >= MAX_32_BITS;
 	const zip64CompressedSize = zip64Enabled || maximumCompressedSize >= MAX_32_BITS;
 	if (zip64UncompressedSize || zip64CompressedSize) {
 		if (zip64 === false) {
@@ -1094,6 +1108,8 @@ function resolveEntrySizes(zipWriter, hasContent, contentSize, metadata, options
 			dataDescriptor,
 			emptyEntry,
 			zip64,
+			zip64Enabled,
+			unknownSize,
 			zip64UncompressedSize,
 			zip64CompressedSize,
 			uncompressedSize,
@@ -1167,7 +1183,7 @@ async function getEntriesSize(writerOptions, entries, writeOrderGuaranteed, comm
 	if (layoutDependsOnWriteOrder && !writeOrderGuaranteed) {
 		throw new Error(ERR_UNDETERMINED_SIZE);
 	}
-	const directoryDataLength = createDirectoryRecords(files);
+	const { directoryDataLength, zip64Entries } = createDirectoryRecords(files);
 	let zip64 = getOptionValue(zipWriter, writerOptions, PROPERTY_NAME_ZIP64);
 	if (offset >= MAX_32_BITS || directoryDataLength >= MAX_32_BITS || files.size >= MAX_16_BITS) {
 		if (zip64 === false) {
@@ -1175,6 +1191,8 @@ async function getEntriesSize(writerOptions, entries, writeOrderGuaranteed, comm
 		} else {
 			zip64 = true;
 		}
+	} else if (zip64 === UNDEFINED_VALUE && zip64Entries) {
+		zip64 = true;
 	}
 	return offset - initialOffset + directoryDataLength + commentLength + (zip64 ? ZIP64_END_OF_CENTRAL_DIR_TOTAL_LENGTH : END_OF_CENTRAL_DIR_LENGTH);
 }
@@ -1367,6 +1385,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lockFileEntry
 		rawPassword,
 		level,
 		zip64,
+		zip64Enabled,
 		zip64UncompressedSize,
 		zip64CompressedSize,
 		zipCrypto,
@@ -1407,6 +1426,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lockFileEntry
 		lockFileEntry,
 		versionMadeBy,
 		zip64,
+		zip64Enabled,
 		directory: Boolean(directory),
 		executable: Boolean(executable),
 		filenameUTF8: true,
@@ -1550,13 +1570,14 @@ function getHeaderInfo(options) {
 		zip64UncompressedSize,
 		zip64CompressedSize,
 		uncompressedSize,
+		unknownSize,
 		crc32
 	} = options;
 	let { version, compressionMethod } = options;
 	const compressed = !directory && isCompressed(compressionMethod, level);
 	let rawLocalExtraFieldZip64;
 	const uncompressedFile = passThrough || !compressed;
-	const zip64ExtraFieldComplete = zip64 && (options.bufferedWrite || !dataDescriptor || ((!zip64UncompressedSize && !zip64CompressedSize) || uncompressedFile));
+	const zip64ExtraFieldComplete = zip64 && (options.bufferedWrite || !dataDescriptor || ((!zip64UncompressedSize && !zip64CompressedSize) || (uncompressedFile && !unknownSize)));
 	const writeLocalExtraFieldZip64 = zip64ExtraFieldComplete || (zip64 && dataDescriptor && (zip64UncompressedSize || zip64CompressedSize));
 	if (zip64 && (zip64UncompressedSize || zip64CompressedSize)) {
 		const length = 4 + 16;
@@ -1690,6 +1711,10 @@ function getHeaderInfo(options) {
 		throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
 	}
 	const dosLastModDate = new Date(Math.ceil(Math.floor(lastModDate.getTime() / 1000) / 2) * 2000);
+	const clampedLastModDate = dosLastModDate < MIN_DATE ? MIN_DATE : dosLastModDate > MAX_DATE ? MAX_DATE : dosLastModDate;
+	const storedLastModDate = getLength(rawExtraFieldExtendedTimestamp) ?
+		new Date(getTimeUnix(lastModDate) * 1000) :
+		getLength(rawExtraFieldNTFS) ? lastModDate : clampedLastModDate;
 	const {
 		headerArray,
 		headerView,
@@ -1699,7 +1724,7 @@ function getHeaderInfo(options) {
 		bitFlag: getBitFlag(level, useUnicodeFileNames, dataDescriptor, encrypted, compressionMethod),
 		compressionMethod,
 		uncompressedSize,
-		lastModDate: dosLastModDate < MIN_DATE ? MIN_DATE : dosLastModDate > MAX_DATE ? MAX_DATE : dosLastModDate,
+		lastModDate: clampedLastModDate,
 		rawLastModDate: rawLastModDateOption,
 		rawFilename,
 		zip64CompressedSize,
@@ -1734,7 +1759,7 @@ function getHeaderInfo(options) {
 		localHeaderView,
 		headerArray,
 		headerView,
-		lastModDate,
+		lastModDate: storedLastModDate,
 		rawLastModDate,
 		encrypted,
 		compressed,
@@ -1906,14 +1931,15 @@ function updateLocalHeader({
 
 
 async function closeFile(zipWriter, comment, options) {
-	const directoryDataLength = createDirectoryRecords(zipWriter.fileEntries);
+	const { directoryDataLength, zip64Entries } = createDirectoryRecords(zipWriter.fileEntries);
 	const { directoryStart, directoryEnd, directoryArray } = await writeDirectoryRecords(zipWriter, directoryDataLength, options);
 	const signatureLength = await writeDigitalSignatureRecord(zipWriter, directoryArray, options);
-	await writeEndOfDirectoryRecord(zipWriter, comment, options, { directoryStart, directoryEnd, directoryDataLength, signatureLength });
+	await writeEndOfDirectoryRecord(zipWriter, comment, options, { directoryStart, directoryEnd, directoryDataLength, signatureLength, zip64Entries });
 }
 
 function createDirectoryRecords(files) {
 	let directoryDataLength = 0;
+	let zip64Entries = false;
 	for (const [, fileEntry] of files) {
 		const {
 			rawFilename,
@@ -1926,11 +1952,20 @@ function createDirectoryRecords(files) {
 			extendedTimestamp,
 			extraFieldExtendedTimestampFlag,
 			lastModDate,
-			zip64UncompressedSize,
-			zip64CompressedSize,
+			zip64Enabled,
 			uncompressedSize,
 			compressedSize
 		} = fileEntry;
+		let { zip64UncompressedSize, zip64CompressedSize } = fileEntry;
+		if (!zip64Enabled) {
+			if (zip64UncompressedSize && uncompressedSize < MAX_32_BITS) {
+				zip64UncompressedSize = fileEntry.zip64UncompressedSize = false;
+			}
+			if (zip64CompressedSize && compressedSize < MAX_32_BITS) {
+				zip64CompressedSize = fileEntry.zip64CompressedSize = false;
+			}
+		}
+		zip64Entries = zip64Entries || zip64UncompressedSize || zip64CompressedSize;
 		const zip64Offset = fileEntry.offset >= MAX_32_BITS;
 		const zip64DiskNumberStart = fileEntry.diskNumberStart >= MAX_16_BITS;
 		let rawExtraFieldZip64;
@@ -1984,7 +2019,7 @@ function createDirectoryRecords(files) {
 		}
 		directoryDataLength += CENTRAL_FILE_HEADER_LENGTH + getLength(rawFilename, rawComment) + extraFieldLength;
 	}
-	return directoryDataLength;
+	return { directoryDataLength, zip64Entries };
 }
 
 async function writeDirectoryRecords(zipWriter, directoryDataLength, options) {
@@ -2104,7 +2139,7 @@ async function writeDigitalSignatureRecord(zipWriter, directoryArray, options) {
 
 async function writeEndOfDirectoryRecord(zipWriter, comment, options, cdInfo) {
 	const { writer } = zipWriter;
-	const { directoryStart, directoryEnd, signatureLength } = cdInfo;
+	const { directoryStart, directoryEnd, signatureLength, zip64Entries } = cdInfo;
 	let { directoryDataLength } = cdInfo;
 	let fileEntriesLength = zipWriter.fileEntries.size;
 	let diskNumber = directoryStart.diskNumber;
@@ -2124,6 +2159,8 @@ async function writeEndOfDirectoryRecord(zipWriter, comment, options, cdInfo) {
 		} else {
 			zip64 = true;
 		}
+	} else if (zip64 === UNDEFINED_VALUE && zip64Entries) {
+		zip64 = true;
 	}
 	const endOfdirectoryRecord = createRecordWriter(zip64 ? ZIP64_END_OF_CENTRAL_DIR_TOTAL_LENGTH : END_OF_CENTRAL_DIR_LENGTH);
 	if (exceedsAvailableSize(writer, getLength(endOfdirectoryRecord.array) + commentLength)) {

package/lib/zip-core-writer.js

@@ -45,12 +45,14 @@ export {
 	ERR_INVALID_EXTRAFIELD_DATA,
 	ERR_INVALID_ENCRYPTION_STRENGTH,
 	ERR_UNSUPPORTED_ENCRYPTION_USDZ,
+	ERR_UNSUPPORTED_SPLIT_USDZ,
 	ERR_UNSUPPORTED_ENCRYPTION_PASS_THROUGH,
 	ERR_UNSUPPORTED_FORMAT,
 	ERR_UNDEFINED_UNCOMPRESSED_SIZE,
 	ERR_UNDEFINED_COMPRESSION_METHOD,
 	ERR_UNDETERMINED_SIZE,
 	ERR_UNDEFINED_READER,
+	ERR_INVALID_READER,
 	ERR_ZIP_NOT_EMPTY,
 	ERR_INVALID_SIGNATURE_DATA,
 	ERR_INVALID_UID,

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