@zip.js/zip.js 2.6.13 → 2.6.16

package/dist/zip-fs.js

@@ -2716,18 +2716,19 @@
 
 	class Uint8ArrayWriter extends Writer {
 
-		constructor() {
-			super();
-			this.array = new Uint8Array();
+		init(initSize = 0) {
+			this.array = new Uint8Array(initSize);
 		}
 
 		writeUint8Array(array) {
-			super.writeUint8Array(array);
 			const writer = this;
-			const previousArray = writer.array;
-			writer.array = new Uint8Array(previousArray.length + array.length);
-			writer.array.set(previousArray);
-			writer.array.set(array, previousArray.length);
+			if (writer.size + array.length > writer.array.length) {
+				const previousArray = writer.array;
+				writer.array = new Uint8Array(previousArray.length + array.length);
+				writer.array.set(previousArray);
+			}
+			writer.array.set(array, writer.size);
+			super.writeUint8Array(array);
 		}
 
 		getData() {
@@ -2741,9 +2742,9 @@
 		return protocol == "http:" || protocol == "https:";
 	}
 
-	async function initStream(stream) {
+	async function initStream(stream, initSize) {
 		if (stream.init && !stream.initialized) {
-			await stream.init();
+			await stream.init(initSize);
 		}
 	}
 
@@ -3162,6 +3163,7 @@
 				bitFlag,
 				signature,
 				rawLastModDate,
+				uncompressedSize,
 				compressedSize
 			} = zipEntry;
 			const localDirectory = zipEntry.localDirectory = {};
@@ -3202,7 +3204,7 @@
 			readable.size = size;
 			const { writable } = writer;
 			const signal = getOptionValue$1(zipEntry, options, "signal");
-			await initStream(writer);
+			await initStream(writer, uncompressedSize);
 			const { onstart, onprogress, onend } = options;
 			const workerOptions = {
 				options: {
@@ -3530,6 +3532,7 @@
 	const EXTRAFIELD_LENGTH_ZIP64 = 24;
 
 	let workers = 0;
+	const pendingEntries = [];
 
 	class ZipWriter {
 
@@ -3542,7 +3545,6 @@
 				filenames: new Set(),
 				offset: writer.size || 0,
 				pendingCompressedSize: 0,
-				pendingEntries: [],
 				pendingAddFileCalls: new Set()
 			});
 		}
@@ -3551,36 +3553,34 @@
 			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 }));
 			}
 		}
 
@@ -3750,8 +3750,9 @@
 		let bufferedWrite;
 		let releaseLockWriter;
 		let releaseLockCurrentFileEntry;
-		let bufferedDataWritten;
+		let writingBufferedData;
 		let fileWriter;
+		let fileWriterSize;
 		files.set(name, fileEntry);
 		try {
 			let lockPreviousFileEntry;
@@ -3768,6 +3769,7 @@
 				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;
@@ -3775,7 +3777,7 @@
 				let blob = fileWriter.getData();
 				await lockPreviousFileEntry;
 				await requestLockWriter();
-				bufferedDataWritten = true;
+				writingBufferedData = true;
 				const { writable } = writer;
 				if (!dataDescriptor) {
 					const headerLength = 26;
@@ -3795,7 +3797,7 @@
 					blob = blob.slice(headerLength);
 				}
 				await blob.stream().pipeTo(writable, { preventClose: true, signal });
-				bufferedDataWritten = false;
+				writingBufferedData = false;
 			}
 			fileEntry.offset = zipWriter.offset;
 			if (fileEntry.zip64) {
@@ -3807,9 +3809,12 @@
 			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;
@@ -3986,10 +3991,10 @@
 		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;
@@ -4016,7 +4021,6 @@
 			compressedSize = result.size;
 		} else {
 			await writeData(writable, localHeaderArray);
-			fileEntry.dataWritten = pendingFileEntry.dataWritten = true;
 		}
 		let dataDescriptorArray = new Uint8Array();
 		let dataDescriptorView, dataDescriptorOffset = 0;
@@ -4069,7 +4073,8 @@
 			creationDate,
 			lastAccessDate,
 			encrypted,
-			length
+			length,
+			writingData: false
 		});
 		return fileEntry;
 	}
@@ -4351,7 +4356,7 @@
 				return zipEntry.data;
 			} else {
 				const reader = zipEntry.reader = new zipEntry.Reader(zipEntry.data, options);
-				await Promise.all([initStream(reader), initStream(writer)]);
+				await Promise.all([initStream(reader), initStream(writer, zipEntry.data.uncompressedSize)]);
 				zipEntry.uncompressedSize = reader.size;
 				const readable = reader.readable;
 				readable.size = () => reader.size;