@zip.js/zip.js 2.6.12 → 2.6.15

package/lib/core/zip-fs-core.js

@@ -121,7 +121,7 @@ class ZipFileEntry extends ZipEntry {
 			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;

package/lib/core/zip-reader.js

@@ -282,6 +282,7 @@ class ZipEntry {
 			bitFlag,
 			signature,
 			rawLastModDate,
+			uncompressedSize,
 			compressedSize
 		} = zipEntry;
 		const localDirectory = zipEntry.localDirectory = {};
@@ -322,7 +323,7 @@ class ZipEntry {
 		readable.size = size;
 		const { writable } = writer;
 		const signal = getOptionValue(zipEntry, options, "signal");
-		await initStream(writer);
+		await initStream(writer, uncompressedSize);
 		const { onstart, onprogress, onend } = options;
 		const workerOptions = {
 			options: {

package/lib/core/zip-writer.js

@@ -321,8 +321,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 +340,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 +348,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 +368,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 +380,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 +562,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 +592,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 +644,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.12",
+    "version": "2.6.15",
     "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"
     }

package/tests/all/test-sw-worker.js

@@ -3,7 +3,6 @@
 "use strict";
 
 importScripts("./../../dist/zip-full.js");
-zip.configure({ useWebWorkers: false });
 self.addEventListener("fetch", event => {
 	const matchZipEntry = event.request.url.match(/.zip#(.+)$/i);
 	if (matchZipEntry) {