@zip.js/zip.js 2.6.13 → 2.6.16

package/lib/core/zip-writer.js

@@ -88,6 +88,7 @@ const EXTRAFIELD_DATA_AES = new Uint8Array([0x07, 0x00, 0x02, 0x00, 0x41, 0x45,
 const EXTRAFIELD_LENGTH_ZIP64 = 24;
 
 let workers = 0;
+const pendingEntries = [];
 
 class ZipWriter {
 
@@ -100,7 +101,6 @@ class ZipWriter {
 			filenames: new Set(),
 			offset: writer.size || 0,
 			pendingCompressedSize: 0,
-			pendingEntries: [],
 			pendingAddFileCalls: new Set()
 		});
 	}
@@ -109,36 +109,34 @@ class ZipWriter {
 		const zipWriter = this;
 		const {
 			pendingAddFileCalls,
-			pendingEntries,
 			config
 		} = zipWriter;
 		if (workers < config.maxWorkers) {
 			workers++;
-			let promiseAddFile;
-			try {
-				name = name.trim();
-				if (zipWriter.filenames.has(name)) {
-					throw new Error(ERR_DUPLICATED_NAME);
-				}
-				zipWriter.filenames.add(name);
-				promiseAddFile = addFile(zipWriter, name, reader, options);
-				pendingAddFileCalls.add(promiseAddFile);
-				return await promiseAddFile;
-			} catch (error) {
-				zipWriter.filenames.delete(name);
-				throw error;
-			} finally {
-				pendingAddFileCalls.delete(promiseAddFile);
+		} else {
+			await new Promise(resolve => pendingEntries.push(resolve));
+		}
+		let promiseAddFile;
+		try {
+			name = name.trim();
+			if (zipWriter.filenames.has(name)) {
+				throw new Error(ERR_DUPLICATED_NAME);
+			}
+			zipWriter.filenames.add(name);
+			promiseAddFile = addFile(zipWriter, name, reader, options);
+			pendingAddFileCalls.add(promiseAddFile);
+			return await promiseAddFile;
+		} catch (error) {
+			zipWriter.filenames.delete(name);
+			throw error;
+		} finally {
+			pendingAddFileCalls.delete(promiseAddFile);
+			const pendingEntry = pendingEntries.shift();
+			if (pendingEntry) {
+				pendingEntry();
+			} else {
 				workers--;
-				const pendingEntry = pendingEntries.shift();
-				if (pendingEntry) {
-					zipWriter.add(pendingEntry.name, pendingEntry.reader, pendingEntry.options)
-						.then(pendingEntry.resolve)
-						.catch(pendingEntry.reject);
-				}
 			}
-		} else {
-			return new Promise((resolve, reject) => pendingEntries.push({ name, reader, options, resolve, reject }));
 		}
 	}
 
@@ -321,8 +319,9 @@ async function getFileEntry(zipWriter, name, reader, options) {
 	let bufferedWrite;
 	let releaseLockWriter;
 	let releaseLockCurrentFileEntry;
-	let bufferedDataWritten;
+	let writingBufferedData;
 	let fileWriter;
+	let fileWriterSize;
 	files.set(name, fileEntry);
 	try {
 		let lockPreviousFileEntry;
@@ -339,6 +338,7 @@ async function getFileEntry(zipWriter, name, reader, options) {
 			await initStream(writer);
 			fileWriter = writer;
 		}
+		fileWriterSize = fileWriter.size;
 		fileEntry = await createFileEntry(reader, fileEntry, fileWriter.writable, zipWriter.config, options);
 		files.set(name, fileEntry);
 		fileEntry.filename = name;
@@ -346,7 +346,7 @@ async function getFileEntry(zipWriter, name, reader, options) {
 			let blob = fileWriter.getData();
 			await lockPreviousFileEntry;
 			await requestLockWriter();
-			bufferedDataWritten = true;
+			writingBufferedData = true;
 			const { writable } = writer;
 			if (!dataDescriptor) {
 				const headerLength = 26;
@@ -366,7 +366,7 @@ async function getFileEntry(zipWriter, name, reader, options) {
 				blob = blob.slice(headerLength);
 			}
 			await blob.stream().pipeTo(writable, { preventClose: true, signal });
-			bufferedDataWritten = false;
+			writingBufferedData = false;
 		}
 		fileEntry.offset = zipWriter.offset;
 		if (fileEntry.zip64) {
@@ -378,9 +378,12 @@ async function getFileEntry(zipWriter, name, reader, options) {
 		zipWriter.offset += fileEntry.length;
 		return fileEntry;
 	} catch (error) {
-		if ((bufferedWrite && bufferedDataWritten) || (!bufferedWrite && fileEntry.dataWritten)) {
-			error.corruptedEntry = zipWriter.hasCorruptedEntries = true;
-			zipWriter.offset += fileWriter.size;
+		if ((bufferedWrite && writingBufferedData) || (!bufferedWrite && fileEntry.writingData)) {
+			zipWriter.hasCorruptedEntries = true;
+			if (error) {
+				error.corruptedEntry = true;
+			}
+			zipWriter.offset += fileWriter.size - fileWriterSize;
 		}
 		files.delete(name);
 		throw error;
@@ -557,10 +560,10 @@ async function createFileEntry(reader, pendingFileEntry, writable, config, optio
 	arraySet(localHeaderArray, rawExtraField, 30 + rawFilename.length + rawExtraFieldAES.length + rawExtraFieldExtendedTimestamp.length + rawExtraFieldNTFS.length);
 	let result;
 	let compressedSize = 0;
+	fileEntry.writingData = pendingFileEntry.writingData = true;
 	if (reader) {
 		reader.chunkSize = getChunkSize(config);
 		await writeData(writable, localHeaderArray);
-		fileEntry.dataWritten = pendingFileEntry.dataWritten = true;
 		const size = () => reader.size;
 		const readable = reader.readable;
 		readable.size = size;
@@ -587,7 +590,6 @@ async function createFileEntry(reader, pendingFileEntry, writable, config, optio
 		compressedSize = result.size;
 	} else {
 		await writeData(writable, localHeaderArray);
-		fileEntry.dataWritten = pendingFileEntry.dataWritten = true;
 	}
 	let dataDescriptorArray = new Uint8Array();
 	let dataDescriptorView, dataDescriptorOffset = 0;
@@ -640,7 +642,8 @@ async function createFileEntry(reader, pendingFileEntry, writable, config, optio
 		creationDate,
 		lastAccessDate,
 		encrypted,
-		length
+		length,
+		writingData: false
 	});
 	return fileEntry;
 }

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.6.13",
+    "version": "2.6.16",
     "type": "module",
     "keywords": [
         "zip",
@@ -53,7 +53,7 @@
         "@rollup/plugin-node-resolve": "^13.3.0",
         "@rollup/plugin-replace": "^4.0.0",
         "http-server": "^14.1.1",
-        "rollup": "^2.77.2",
+        "rollup": "^2.78.0",
         "rollup-plugin-terser": "^7.0.2",
         "typedoc": "^0.23.10"
     }