@zip.js/zip.js 2.11.1 → 2.11.2

package/lib/core/io.js

@@ -91,11 +91,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;
 				}
 			}
 		});

package/lib/core/version.js

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

package/lib/core/zip-writer.js

@@ -63,6 +63,10 @@
  *   failing before they reach getFileEntry().
  * - `zipWriter.lockWriter`/`writerLocked` is the mutex over the writer; only the holder may write
  *   into it or read the position variables above.
+ * - At most one entry is written directly into the writer at a time, every other one is buffered.
+ *   `bufferedWrites`/`directWrites` record the choice in the same synchronous block that makes it,
+ *   because `writerLocked` is only raised an await later: concurrent add() calls all decide before
+ *   that, and would all pick the direct path and then serialize on the previous entry's lock.
  * - Both write paths await the lock of the previous entry before requesting the writer lock.
  *   Requesting it first would deadlock an entry written directly into the writer (i.e. without
  *   being buffered) against a buffered predecessor, which needs that same lock to be flushed.
@@ -306,6 +310,7 @@ class ZipWriter {
 			pendingAddFileCalls: new Set(),
 			pendingErrors: [],
 			bufferedWrites: 0,
+			directWrites: 0,
 			lastFileEntry: UNDEFINED_VALUE
 		});
 	}
@@ -1194,6 +1199,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;
@@ -1203,7 +1209,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) {
@@ -1214,6 +1220,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();
@@ -1292,6 +1300,9 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		if (bufferedWrite) {
 			zipWriter.bufferedWrites--;
 		}
+		if (directWrite) {
+			zipWriter.directWrites--;
+		}
 		if (releaseLockFileEntry) {
 			releaseLockFileEntry(lockPreviousFileEntry);
 		}
@@ -1436,8 +1447,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,

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