@zip.js/zip.js 2.11.0 → 2.11.2

package/dist/zip-fs-external.js

@@ -3639,11 +3639,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;
 				}
 			}
 		});
@@ -6354,6 +6353,7 @@ class ZipWriter {
 			pendingAddFileCalls: new Set(),
 			pendingErrors: [],
 			bufferedWrites: 0,
+			directWrites: 0,
 			lastFileEntry: UNDEFINED_VALUE
 		});
 	}
@@ -7204,6 +7204,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;
@@ -7213,7 +7214,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) {
@@ -7224,6 +7225,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();
@@ -7302,6 +7305,9 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		if (bufferedWrite) {
 			zipWriter.bufferedWrites--;
 		}
+		if (directWrite) {
+			zipWriter.directWrites--;
+		}
 		if (releaseLockFileEntry) {
 			releaseLockFileEntry(lockPreviousFileEntry);
 		}
@@ -7446,8 +7452,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,
@@ -8626,7 +8632,7 @@ function formatSupported(StreamClass, format) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const VERSION = "2.11.0";
+const VERSION = "2.11.2";
 
 /*
  Copyright (c) 2025 Gildas Lormeau. All rights reserved.
@@ -9215,18 +9221,17 @@ function _make(isCompress, type, options = {}) {
 					}
 					heap.set(buffer.subarray(offset, offset + toRead), this.in);
 					const result = process(this.streamHandle, this.in, toRead, out, outBufferSize, 0);
+					// checked before the byte count is used, so a status code can never be read as one
+					const code = (result >> 24) & 0xff;
+					const signedCode = (code & 0x80) ? code - 256 : code;
+					if (signedCode < 0) {
+						throw new Error("process error:" + signedCode);
+					}
 					const prod = result & 0x00ffffff;
 					if (prod) {
 						scratch.set(heap.subarray(out, out + prod), 0);
 						controller.enqueue(scratch.slice(0, prod));
 					}
-					if (!isCompress) {
-						const code = (result >> 24) & 0xff;
-						const signedCode = (code & 0x80) ? code - 256 : code;
-						if (signedCode < 0) {
-							throw new Error("process error:" + signedCode);
-						}
-					}
 					const consumed = last_consumed(this.streamHandle);
 					if (consumed === 0 && prod === 0) {
 						break;
@@ -9246,14 +9251,12 @@ function _make(isCompress, type, options = {}) {
 				const scratch = this._scratch;
 				while (true) {
 					const result = process(this.streamHandle, 0, 0, out, outBufferSize, 4);
-					const produced = result & 0x00ffffff;
 					const code = (result >> 24) & 0xff;
-					if (!isCompress) {
-						const signedCode = (code & 0x80) ? code - 256 : code;
-						if (signedCode < 0) {
-							throw new Error("process error:" + signedCode);
-						}
+					const signedCode = (code & 0x80) ? code - 256 : code;
+					if (signedCode < 0) {
+						throw new Error("process error:" + signedCode);
 					}
+					const produced = result & 0x00ffffff;
 					if (produced) {
 						scratch.set(heap.subarray(out, out + produced), 0);
 						controller.enqueue(scratch.slice(0, produced));