@zip.js/zip.js 2.11.1 → 2.11.2

package/index.cjs

@@ -3608,11 +3608,10 @@ class Reader extends Stream {
 				const data = await readUint8Array(reader, offset + chunkOffset, dataSize);
 				if (data.length) {
 					controller.enqueue(data);
+					chunkOffset += data.length;
 				}
-				if ((chunkOffset + chunkSize >= size) || (!data.length && dataSize)) {
+				if ((size !== UNDEFINED_VALUE && chunkOffset >= size) || (!data.length && dataSize)) {
 					controller.close();
-				} else {
-					chunkOffset += chunkSize;
 				}
 			}
 		});
@@ -6323,6 +6322,7 @@ class ZipWriter {
 			pendingAddFileCalls: new Set(),
 			pendingErrors: [],
 			bufferedWrites: 0,
+			directWrites: 0,
 			lastFileEntry: UNDEFINED_VALUE
 		});
 	}
@@ -7173,6 +7173,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 	const usdz = zipWriter.options[OPTION_USDZ];
 	let fileEntry = pendingFileEntry;
 	let bufferedWrite;
+	let directWrite;
 	let releaseLockWriter;
 	let writingBufferedEntryData;
 	let writingEntryData;
@@ -7182,7 +7183,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 	const lockPreviousFileEntry = keepOrder && previousFileEntry ? previousFileEntry.lockFileEntry : UNDEFINED_VALUE;
 	fileEntries.set(name, fileEntry);
 	try {
-		if (options.bufferedWrite || !keepOrder || zipWriter.writerLocked || zipWriter.bufferedWrites || (!dataDescriptor && !emptyEntry)) {
+		if (options.bufferedWrite || !keepOrder || zipWriter.writerLocked || zipWriter.bufferedWrites || zipWriter.directWrites || (!dataDescriptor && !emptyEntry)) {
 			bufferedWrite = true;
 			zipWriter.bufferedWrites++;
 			if (options.createTempStream) {
@@ -7193,6 +7194,8 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			fileWriter.size = 0;
 			await initStream(writer);
 		} else {
+			directWrite = true;
+			zipWriter.directWrites++;
 			fileWriter = writer;
 			await lockPreviousFileEntry;
 			await requestLockWriter();
@@ -7271,6 +7274,9 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		if (bufferedWrite) {
 			zipWriter.bufferedWrites--;
 		}
+		if (directWrite) {
+			zipWriter.directWrites--;
+		}
 		if (releaseLockFileEntry) {
 			releaseLockFileEntry(lockPreviousFileEntry);
 		}
@@ -7415,8 +7421,8 @@ async function createFileEntry(reader, writer, { diskNumberStart, lockFileEntry
 	}
 	const { writable } = writer;
 	if (reader) {
-		const readable = toCompatibleReadable(createReadable(reader));
 		const size = reader.size;
+		const readable = toCompatibleReadable(createReadable(reader, { size }));
 		const workerOptions = {
 			options: {
 				codecType: CODEC_DEFLATE,
@@ -8595,7 +8601,7 @@ function formatSupported(StreamClass, format) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const VERSION = "2.11.1";
+const VERSION = "2.11.2";
 
 /*
  Copyright (c) 2025 Gildas Lormeau. All rights reserved.

package/index.d.cts

@@ -3112,10 +3112,9 @@ export interface ZipWriterConstructorOptions extends WorkerConfiguration {
    * `true` to keep the order of the entry physically in the zip file.
    *
    * @remarks
-   * The entries are then written one after another, so concurrent calls to {@link ZipWriter#add} compress one
-   * entry at a time and use a single web worker. Set {@link ZipWriterConstructorOptions#bufferedWrite} to `true`
-   * to compress them concurrently while still keeping the order, at the cost of buffering each entry until the
-   * previous ones are written.
+   * The entries are then written one after another, but concurrent calls to {@link ZipWriter#add} still compress
+   * concurrently: one entry is written directly into the zip file while the others are buffered until it is their
+   * turn, i.e. {@link ZipWriterConstructorOptions#bufferedWrite} is set automatically for them.
    *
    * @defaultValue true
    */

package/index.d.ts

@@ -3112,10 +3112,9 @@ export interface ZipWriterConstructorOptions extends WorkerConfiguration {
    * `true` to keep the order of the entry physically in the zip file.
    *
    * @remarks
-   * The entries are then written one after another, so concurrent calls to {@link ZipWriter#add} compress one
-   * entry at a time and use a single web worker. Set {@link ZipWriterConstructorOptions#bufferedWrite} to `true`
-   * to compress them concurrently while still keeping the order, at the cost of buffering each entry until the
-   * previous ones are written.
+   * The entries are then written one after another, but concurrent calls to {@link ZipWriter#add} still compress
+   * concurrently: one entry is written directly into the zip file while the others are buffered until it is their
+   * turn, i.e. {@link ZipWriterConstructorOptions#bufferedWrite} is set automatically for them.
    *
    * @defaultValue true
    */