@zip.js/zip.js 2.6.42 → 2.6.44

package/index.cjs

@@ -8103,7 +8103,7 @@ class Uint8ArrayWriter extends Writer {
 	}
 }
 
-class SplitZipReader extends Reader {
+class SplitDataReader extends Reader {
 
 	constructor(readers) {
 		super();
@@ -8149,7 +8149,7 @@ class SplitZipReader extends Reader {
 	}
 }
 
-class SplitZipWriter extends Stream {
+class SplitDataWriter extends Stream {
 
 	constructor(writerGenerator, maxSize = 4294967296) {
 		super();
@@ -8170,6 +8170,7 @@ class SplitZipWriter extends Stream {
 					} else {
 						diskSourceWriter = value;
 						diskSourceWriter.size = 0;
+						await initStream(diskSourceWriter);
 						diskWritable = value.writable;
 						diskWriter = diskWritable.getWriter();
 					}
@@ -8230,6 +8231,9 @@ function readUint8Array(reader, offset, size, diskNumber) {
 	return reader.readUint8Array(offset, size, diskNumber);
 }
 
+const SplitZipReader = SplitDataReader;
+const SplitZipWriter = SplitDataWriter;
+
 /*
  Copyright (c) 2022 Gildas Lormeau. All rights reserved.
 
@@ -8456,7 +8460,7 @@ class ZipReader {
 		await initStream(reader);
 		if (reader.size === UNDEFINED_VALUE || !reader.readUint8Array) {
 			if (Array.isArray(reader)) {
-				reader = new SplitZipReader(reader);
+				reader = new SplitDataReader(reader);
 			} else {
 				reader = new BlobReader(await new Response(reader.readable).blob());
 			}
@@ -9034,7 +9038,7 @@ class ZipWriter {
 
 	constructor(writer, options = {}) {
 		if (writer.writable === UNDEFINED_VALUE && typeof writer.next == FUNCTION_TYPE$1) {
-			writer = new SplitZipWriter(writer);
+			writer = new SplitDataWriter(writer);
 		}
 		if (writer instanceof WritableStream) {
 			writer = { writable: writer };
@@ -9042,7 +9046,7 @@ class ZipWriter {
 		if (writer.writable.size === UNDEFINED_VALUE) {
 			writer.writable.size = 0;
 		}
-		const splitZipFile = writer instanceof SplitZipWriter;
+		const splitZipFile = writer instanceof SplitDataWriter;
 		if (!splitZipFile) {
 			Object.assign(writer, {
 				diskNumber: 0,
@@ -9099,13 +9103,15 @@ class ZipWriter {
 	}
 
 	async close(comment = new Uint8Array(), options = {}) {
+		const zipWriter = this;
 		const { pendingAddFileCalls, writer } = this;
 		const { writable } = writer;
 		while (pendingAddFileCalls.size) {
 			await Promise.all(Array.from(pendingAddFileCalls));
 		}
 		await closeFile(this, comment, options);
-		if (!writer.preventClose && !options.preventClose) {
+		const preventClose = getOptionValue(zipWriter, options, "preventClose");
+		if (!preventClose) {
 			await writable.close();
 		}
 		return writer.getData ? writer.getData() : writable;
@@ -9128,20 +9134,33 @@ async function addFile(zipWriter, name, reader, options) {
 	if (getLength(rawComment) > MAX_16_BITS) {
 		throw new Error(ERR_INVALID_ENTRY_COMMENT);
 	}
-	const version = zipWriter.options.version || options.version || 0;
+	const version = getOptionValue(zipWriter, options, "version", VERSION_DEFLATE);
 	if (version > MAX_16_BITS) {
 		throw new Error(ERR_INVALID_VERSION);
 	}
-	const versionMadeBy = zipWriter.options.versionMadeBy || options.versionMadeBy || 20;
+	const versionMadeBy = getOptionValue(zipWriter, options, "versionMadeBy", 20);
 	if (versionMadeBy > MAX_16_BITS) {
 		throw new Error(ERR_INVALID_VERSION);
 	}
-	const lastModDate = getOptionValue(zipWriter, options, PROPERTY_NAME_LAST_MODIFICATION_DATE) || new Date();
+	const lastModDate = getOptionValue(zipWriter, options, PROPERTY_NAME_LAST_MODIFICATION_DATE, new Date());
 	const lastAccessDate = getOptionValue(zipWriter, options, PROPERTY_NAME_LAST_ACCESS_DATE);
 	const creationDate = getOptionValue(zipWriter, options, PROPERTY_NAME_CREATION_DATE);
+	const msDosCompatible = getOptionValue(zipWriter, options, PROPERTY_NAME_MS_DOS_COMPATIBLE, true);
+	const internalFileAttribute = getOptionValue(zipWriter, options, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE, 0);
+	const externalFileAttribute = getOptionValue(zipWriter, options, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE, 0);
 	const password = getOptionValue(zipWriter, options, "password");
-	const encryptionStrength = getOptionValue(zipWriter, options, "encryptionStrength") || 3;
+	const encryptionStrength = getOptionValue(zipWriter, options, "encryptionStrength", 3);
 	const zipCrypto = getOptionValue(zipWriter, options, "zipCrypto");
+	const extendedTimestamp = getOptionValue(zipWriter, options, "extendedTimestamp", true);
+	const keepOrder = getOptionValue(zipWriter, options, "keepOrder", true);
+	const level = getOptionValue(zipWriter, options, "level");
+	const useWebWorkers = getOptionValue(zipWriter, options, "useWebWorkers");
+	const bufferedWrite = getOptionValue(zipWriter, options, "bufferedWrite");
+	const dataDescriptorSignature = getOptionValue(zipWriter, options, "dataDescriptorSignature", false);
+	const signal = getOptionValue(zipWriter, options, "signal");
+	const useCompressionStream = getOptionValue(zipWriter, options, "useCompressionStream");
+	let dataDescriptor = getOptionValue(zipWriter, options, "dataDescriptor", true);
+	let zip64 = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIP64);
 	if (password !== UNDEFINED_VALUE && encryptionStrength !== UNDEFINED_VALUE && (encryptionStrength < 1 || encryptionStrength > 3)) {
 		throw new Error(ERR_INVALID_ENCRYPTION_STRENGTH);
 	}
@@ -9165,24 +9184,9 @@ async function addFile(zipWriter, name, reader, options) {
 			offset += 4 + getLength(data);
 		});
 	}
-	let extendedTimestamp = getOptionValue(zipWriter, options, "extendedTimestamp");
-	if (extendedTimestamp === UNDEFINED_VALUE) {
-		extendedTimestamp = true;
-	}
 	let maximumCompressedSize = 0;
 	let maximumEntrySize = 0;
-	let keepOrder = getOptionValue(zipWriter, options, "keepOrder");
-	if (keepOrder === UNDEFINED_VALUE) {
-		keepOrder = true;
-	}
 	let uncompressedSize = 0;
-	let msDosCompatible = getOptionValue(zipWriter, options, PROPERTY_NAME_MS_DOS_COMPATIBLE);
-	if (msDosCompatible === UNDEFINED_VALUE) {
-		msDosCompatible = true;
-	}
-	const internalFileAttribute = getOptionValue(zipWriter, options, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE) || 0;
-	const externalFileAttribute = getOptionValue(zipWriter, options, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE) || 0;
-	let zip64 = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIP64);
 	if (reader) {
 		if (reader instanceof ReadableStream) {
 			reader = {
@@ -9191,7 +9195,7 @@ async function addFile(zipWriter, name, reader, options) {
 		}
 		await initStream(reader);
 		if (reader.size === UNDEFINED_VALUE) {
-			options.dataDescriptor = true;
+			dataDescriptor = true;
 			if (zip64 || zip64 === UNDEFINED_VALUE) {
 				zip64 = true;
 				maximumCompressedSize = MAX_32_BITS;
@@ -9201,10 +9205,11 @@ async function addFile(zipWriter, name, reader, options) {
 			maximumCompressedSize = getMaximumCompressedSize(uncompressedSize);
 		}
 	}
-	const { diskOffset } = zipWriter.writer;
+	const { diskOffset, diskNumber } = zipWriter.writer;
 	if (zipWriter.offset + zipWriter.pendingEntriesSize - diskOffset >= MAX_32_BITS ||
 		uncompressedSize >= MAX_32_BITS ||
-		maximumCompressedSize >= MAX_32_BITS) {
+		maximumCompressedSize >= MAX_32_BITS ||
+		diskNumber >= MAX_16_BITS) {
 		if (zip64 === false || !keepOrder) {
 			throw new Error(ERR_UNSUPPORTED_FORMAT);
 		} else {
@@ -9212,19 +9217,6 @@ async function addFile(zipWriter, name, reader, options) {
 		}
 	}
 	zip64 = zip64 || false;
-	const level = getOptionValue(zipWriter, options, "level");
-	const useWebWorkers = getOptionValue(zipWriter, options, "useWebWorkers");
-	const bufferedWrite = getOptionValue(zipWriter, options, "bufferedWrite");
-	let dataDescriptor = getOptionValue(zipWriter, options, "dataDescriptor");
-	let dataDescriptorSignature = getOptionValue(zipWriter, options, "dataDescriptorSignature");
-	const signal = getOptionValue(zipWriter, options, "signal");
-	const useCompressionStream = getOptionValue(zipWriter, options, "useCompressionStream");
-	if (dataDescriptor === UNDEFINED_VALUE) {
-		dataDescriptor = true;
-	}
-	if (dataDescriptor && dataDescriptorSignature === UNDEFINED_VALUE) {
-		dataDescriptorSignature = false;
-	}
 	options = Object.assign({}, options, {
 		rawFilename,
 		rawComment,
@@ -9258,12 +9250,8 @@ async function addFile(zipWriter, name, reader, options) {
 	let fileEntry;
 	try {
 		fileEntry = await getFileEntry(zipWriter, name, reader, { headerInfo, dataDescriptorInfo }, options);
+	} finally {
 		zipWriter.pendingEntriesSize -= maximumEntrySize;
-	} catch (error) {
-		if (!error.corruptedEntry) {
-			zipWriter.pendingEntriesSize -= maximumEntrySize;
-		}
-		throw error;
 	}
 	Object.assign(fileEntry, { name, comment, extraField });
 	return new Entry(fileEntry);
@@ -9301,8 +9289,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			await initStream(writer);
 		} else {
 			fileWriter = writer;
-			zipWriter.lockWriter = Promise.resolve();
-			releaseLockWriter = () => delete zipWriter.lockWriter;
+			initLockWriter();
 		}
 		await initStream(fileWriter);
 		const { writable, diskNumber } = writer;
@@ -9331,7 +9318,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			await requestLockWriter();
 			writingBufferedEntryData = true;
 			if (!dataDescriptor) {
-				blob = await setMissingInfo(fileEntry, blob, writable, options);
+				blob = await writeMissingHeaderInfo(fileEntry, blob, writable, options);
 			}
 			fileEntry.diskNumberStart = writer.diskNumber;
 			diskOffset = writer.diskOffset;
@@ -9341,7 +9328,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		}
 		fileEntry.offset = zipWriter.offset - diskOffset;
 		if (fileEntry.zip64) {
-			setZip64Info(fileEntry);
+			setZip64OffsetInfo(fileEntry);
 		} else if (fileEntry.offset >= MAX_32_BITS) {
 			throw new Error(ERR_UNSUPPORTED_FORMAT);
 		}
@@ -9374,6 +9361,11 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		fileEntry.lock = new Promise(resolve => releaseLockCurrentFileEntry = resolve);
 	}
 
+	function initLockWriter() {
+		zipWriter.lockWriter = Promise.resolve();
+		releaseLockWriter = () => delete zipWriter.lockWriter;
+	}
+
 	async function requestLockWriter() {
 		const { lockWriter } = zipWriter;
 		if (lockWriter) {
@@ -9532,6 +9524,7 @@ function getHeaderInfo(options) {
 	} = options;
 	const compressed = level !== 0 && !directory;
 	const encrypted = Boolean(password && getLength(password));
+	let version = options.version;
 	let rawExtraFieldAES;
 	if (encrypted && !zipCrypto) {
 		rawExtraFieldAES = new Uint8Array(getLength(EXTRAFIELD_DATA_AES) + 2);
@@ -9583,7 +9576,6 @@ function getHeaderInfo(options) {
 	if (compressed) {
 		compressionMethod = COMPRESSION_METHOD_DEFLATE;
 	}
-	let version = options.version || VERSION_DEFLATE;
 	if (zip64) {
 		version = version > VERSION_ZIP64 ? version : VERSION_ZIP64;
 	}
@@ -9717,7 +9709,7 @@ function setEntryInfo(entryInfo, options) {
 	}
 }
 
-async function setMissingInfo(fileEntry, entryData, writable, { zipCrypto }) {
+async function writeMissingHeaderInfo(fileEntry, entryData, writable, { zipCrypto }) {
 	const arrayBuffer = await sliceAsArrayBuffer(entryData, 0, 26);
 	const arrayBufferView = new DataView(arrayBuffer);
 	if (!fileEntry.encrypted || zipCrypto) {
@@ -9734,7 +9726,7 @@ async function setMissingInfo(fileEntry, entryData, writable, { zipCrypto }) {
 	return entryData.slice(arrayBuffer.byteLength);
 }
 
-function setZip64Info(fileEntry) {
+function setZip64OffsetInfo(fileEntry) {
 	const { rawExtraFieldZip64, offset, diskNumberStart } = fileEntry;
 	const rawExtraFieldZip64View = getDataView(rawExtraFieldZip64);
 	setBigUint64(rawExtraFieldZip64View, 20, BigInt(offset));
@@ -9743,10 +9735,10 @@ function setZip64Info(fileEntry) {
 
 async function closeFile(zipWriter, comment, options) {
 	const { files, writer } = zipWriter;
-	let offset = 0;
-	let directoryDataLength = 0;
 	const { diskOffset, writable } = writer;
 	let { diskNumber } = writer;
+	let offset = 0;
+	let directoryDataLength = 0;
 	let directoryOffset = zipWriter.offset - diskOffset;
 	let filesLength = files.size;
 	for (const [, {
@@ -9768,14 +9760,6 @@ async function closeFile(zipWriter, comment, options) {
 				rawExtraFieldNTFS,
 				rawExtraField);
 	}
-	let zip64 = options.zip64 || zipWriter.options.zip64 || false;
-	if (directoryOffset >= MAX_32_BITS || directoryDataLength >= MAX_32_BITS || filesLength >= MAX_16_BITS) {
-		if (options.zip64 === false || zipWriter.options.zip64 === false) {
-			throw new Error(ERR_UNSUPPORTED_FORMAT);
-		} else {
-			zip64 = true;
-		}
-	}
 	const directoryArray = new Uint8Array(directoryDataLength);
 	const directoryView = getDataView(directoryArray);
 	for (const [indexFileEntry, fileEntry] of Array.from(files.values()).entries()) {
@@ -9841,13 +9825,21 @@ async function closeFile(zipWriter, comment, options) {
 	}
 	await initStream(writer);
 	await writeData(writable, directoryArray);
-	const endOfdirectoryArray = new Uint8Array(zip64 ? ZIP64_END_OF_CENTRAL_DIR_TOTAL_LENGTH : END_OF_CENTRAL_DIR_LENGTH);
-	const endOfdirectoryView = getDataView(endOfdirectoryArray);
 	let lastDiskNumber = writer.diskNumber;
 	const { availableSize } = writer;
-	if (availableSize < getLength(endOfdirectoryArray)) {
+	if (availableSize < END_OF_CENTRAL_DIR_LENGTH) {
 		lastDiskNumber++;
 	}
+	let zip64 = getOptionValue(zipWriter, options, "zip64");
+	if (directoryOffset >= MAX_32_BITS || directoryDataLength >= MAX_32_BITS || filesLength >= MAX_16_BITS || lastDiskNumber >= MAX_16_BITS) {
+		if (zip64 === false) {
+			throw new Error(ERR_UNSUPPORTED_FORMAT);
+		} else {
+			zip64 = true;
+		}
+	}
+	const endOfdirectoryArray = new Uint8Array(zip64 ? ZIP64_END_OF_CENTRAL_DIR_TOTAL_LENGTH : END_OF_CENTRAL_DIR_LENGTH);
+	const endOfdirectoryView = getDataView(endOfdirectoryArray);
 	offset = 0;
 	if (zip64) {
 		setUint32(endOfdirectoryView, 0, ZIP64_END_OF_CENTRAL_DIR_SIGNATURE);
@@ -9912,8 +9904,9 @@ function getTimeNTFS(date) {
 	}
 }
 
-function getOptionValue(zipWriter, options, name) {
-	return options[name] === UNDEFINED_VALUE ? zipWriter.options[name] : options[name];
+function getOptionValue(zipWriter, options, name, defaultValue) {
+	const result = options[name] === UNDEFINED_VALUE ? zipWriter.options[name] : options[name];
+	return result === UNDEFINED_VALUE ? defaultValue : result;
 }
 
 function getMaximumCompressedSize(uncompressedSize) {
@@ -10599,7 +10592,7 @@ try {
 configure({ baseURL });
 e(configure);
 
-/// <reference types="./index" />
+/// <reference types="./index.d.ts" />
 
 configure({ Deflate: ZipDeflate, Inflate: ZipInflate });
 
@@ -10634,6 +10627,8 @@ exports.ERR_UNSUPPORTED_FORMAT = ERR_UNSUPPORTED_FORMAT;
 exports.HttpRangeReader = HttpRangeReader;
 exports.HttpReader = HttpReader;
 exports.Reader = Reader;
+exports.SplitDataReader = SplitDataReader;
+exports.SplitDataWriter = SplitDataWriter;
 exports.SplitZipReader = SplitZipReader;
 exports.SplitZipWriter = SplitZipWriter;
 exports.TextReader = TextReader;

package/index.d.ts

@@ -365,10 +365,17 @@ export class Data64URIReader extends Reader<string> { }
  */
 export class Uint8ArrayReader extends Reader<Uint8Array> { }
 
+/**
+ * Represents a `Reader` instance used to read data provided as an array of `Reader` instances (i.e. split zip files).
+ * 
+ * @deprecated Use {@link SplitDataReader} instead.
+ */
+export class SplitZipReader extends SplitDataReader
+
 /**
  * Represents a `Reader` instance used to read data provided as an array of `Reader` instances (i.e. split zip files).
  */
-export class SplitZipReader extends Reader<Reader<unknown>[] | ReadableReader[] | ReadableStream[]> { }
+export class SplitDataReader extends Reader<Reader<unknown>[] | ReadableReader[] | ReadableStream[]> { }
 
 /** 
  * Represents a URL stored into a `string`.
@@ -554,10 +561,17 @@ export class Data64URIWriter extends Writer<string> {
     constructor(mimeString?: string)
 }
 
+/**
+ * Represents a `Writer` instance used to retrieve the written data from a generator of `Writer` instances  (i.e. split zip files).
+ * 
+ * @deprecated Use {@link SplitDataWriter} instead.
+ */
+export class SplitZipWriter extends SplitDataWriter
+
 /**
  * Represents a `Writer` instance used to retrieve the written data from a generator of `Writer` instances  (i.e. split zip files).
  */
-export class SplitZipWriter implements Initializable, WritableWriter {
+export class SplitDataWriter implements Initializable, WritableWriter {
     /**
     * The `WritableStream` instance.
     */
@@ -567,7 +581,7 @@ export class SplitZipWriter implements Initializable, WritableWriter {
      */
     init(): Promise<void>
     /**
-     * Creates the `SplitZipWriter` instance
+     * Creates the `SplitDataWriter` instance
      * 
      * @param writerGenerator The MIME type of the content.
      * @param maxSize The maximum size of the data written into `Writer` instances (default: 4GB).
@@ -875,7 +889,7 @@ export class ZipWriter<Type> {
      * @param writer The `Writer` instance where the zip content will be written.
      * @param options The options.
      */
-    constructor(writer: Writer<Type> | WritableWriter | WritableStream | SplitZipWriter | AsyncGenerator<Writer<unknown> | WritableWriter | WritableStream, boolean>, options?: ZipWriterConstructorOptions)
+    constructor(writer: Writer<Type> | WritableWriter | WritableStream | AsyncGenerator<Writer<unknown> | WritableWriter | WritableStream, boolean>, options?: ZipWriterConstructorOptions)
     /**
      * `true` if the zip contains at least one entry that has been partially written.
      */
@@ -949,6 +963,12 @@ interface ZipWriterConstructorOptions {
      * @defaultValue false
      */
     zip64?: boolean
+    /**
+     * `true` to prevent closing of `Writer#writable`.
+     * 
+     * @defaultValue false
+     */
+    preventClose?: boolean
     /**
      * The level of compression. 
      * 

package/index.js

@@ -1,4 +1,4 @@
-/// <reference types="./index" />
+/// <reference types="./index.d.ts" />
 
 /*
  Copyright (c) 2022 Gildas Lormeau. All rights reserved.
@@ -56,6 +56,8 @@ export {
 	Uint8ArrayReader,
 	SplitZipReader,
 	SplitZipWriter,
+	SplitDataReader,
+	SplitDataWriter,
 	ERR_HTTP_RANGE,
 	ERR_BAD_FORMAT,
 	ERR_EOCDR_NOT_FOUND,

package/lib/core/io.js

@@ -521,7 +521,7 @@ class Uint8ArrayWriter extends Writer {
 	}
 }
 
-class SplitZipReader extends Reader {
+class SplitDataReader extends Reader {
 
 	constructor(readers) {
 		super();
@@ -567,7 +567,7 @@ class SplitZipReader extends Reader {
 	}
 }
 
-class SplitZipWriter extends Stream {
+class SplitDataWriter extends Stream {
 
 	constructor(writerGenerator, maxSize = 4294967296) {
 		super();
@@ -588,6 +588,7 @@ class SplitZipWriter extends Stream {
 					} else {
 						diskSourceWriter = value;
 						diskSourceWriter.size = 0;
+						await initStream(diskSourceWriter);
 						diskWritable = value.writable;
 						diskWriter = diskWritable.getWriter();
 					}
@@ -648,6 +649,9 @@ function readUint8Array(reader, offset, size, diskNumber) {
 	return reader.readUint8Array(offset, size, diskNumber);
 }
 
+const SplitZipReader = SplitDataReader;
+const SplitZipWriter = SplitDataWriter;
+
 export {
 	initStream,
 	readUint8Array,
@@ -665,6 +669,8 @@ export {
 	HttpRangeReader,
 	SplitZipReader,
 	SplitZipWriter,
+	SplitDataReader,
+	SplitDataWriter,
 	ERR_HTTP_RANGE,
 	ERR_ITERATOR_COMPLETED_TOO_SOON
 };

package/lib/core/zip-reader.js

@@ -73,7 +73,7 @@ import {
 	initStream,
 	readUint8Array,
 	BlobReader,
-	SplitZipReader
+	SplitDataReader
 } from "./io.js";
 import { decodeText } from "./util/decode-text.js";
 import { Crc32 } from "./streams/codecs/crc32.js";
@@ -147,7 +147,7 @@ class ZipReader {
 		await initStream(reader);
 		if (reader.size === UNDEFINED_VALUE || !reader.readUint8Array) {
 			if (Array.isArray(reader)) {
-				reader = new SplitZipReader(reader);
+				reader = new SplitDataReader(reader);
 			} else {
 				reader = new BlobReader(await new Response(reader.readable).blob());
 			}