@zip.js/zip.js 2.6.55 → 2.6.57

package/dist/zip-fs-full.js

@@ -9091,7 +9091,8 @@
 				filenames: new Set(),
 				offset: writer.writable.size,
 				pendingEntriesSize: 0,
-				pendingAddFileCalls: new Set()
+				pendingAddFileCalls: new Set(),
+				bufferedWrites: 0
 			});
 		}
 
@@ -9309,14 +9310,15 @@
 				lockPreviousFileEntry = previousFileEntry && previousFileEntry.lock;
 				requestLockCurrentFileEntry();
 			}
-			if (options.bufferedWrite || zipWriter.lockWriter || !dataDescriptor) {
+			if (options.bufferedWrite || zipWriter.writerLocked || zipWriter.bufferedWrites || !dataDescriptor) {
 				fileWriter = new BlobWriter();
 				fileWriter.writable.size = 0;
 				bufferedWrite = true;
+				zipWriter.bufferedWrites++;
 				await initStream(writer);
 			} else {
 				fileWriter = writer;
-				initLockWriter();
+				requestLockWriter();
 			}
 			await initStream(fileWriter);
 			const { writable } = writer;
@@ -9379,6 +9381,9 @@
 			files.delete(name);
 			throw error;
 		} finally {
+			if (bufferedWrite) {
+				zipWriter.bufferedWrites--;
+			}
 			if (releaseLockCurrentFileEntry) {
 				releaseLockCurrentFileEntry();
 			}
@@ -9391,19 +9396,14 @@
 			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) {
-				await lockWriter.then(() => delete zipWriter.lockWriter);
-				return requestLockWriter();
-			} else {
-				zipWriter.lockWriter = new Promise(resolve => releaseLockWriter = resolve);
-			}
+			zipWriter.writerLocked = true;
+			let { lockWriter } = zipWriter; 
+			zipWriter.lockWriter = new Promise(resolve => releaseLockWriter = () => {
+				zipWriter.writerLocked = false;
+				resolve();
+			});
+			await lockWriter;
 		}
 
 		async function skipDiskIfNeeded(writable) {