@zip.js/zip.js 2.5.20 → 2.5.23

package/lib/core/zip-writer.js

@@ -132,7 +132,7 @@ class ZipWriter {
 			await Promise.all(Array.from(pendingAddFileCalls));
 		}
 		await closeFile(this, comment, options);
-		if (!writer.preventClose) {
+		if (!writer.preventClose && !options.preventClose) {
 			await writable.getWriter().close();
 		}
 		return writer.getData ? writer.getData() : writable;
@@ -298,36 +298,36 @@ async function getFileEntry(zipWriter, name, reader, options) {
 	const previousFileEntry = Array.from(files.values()).pop();
 	let fileEntry = {};
 	let bufferedWrite;
-	let resolveLockUnbufferedWrite;
+	let releaseLockWriter;
 	let resolveLockCurrentFileEntry;
+	let writingBufferedData;
+	let fileWriter;
 	files.set(name, fileEntry);
 	try {
 		let lockPreviousFileEntry;
-		let fileWriter;
 		if (options.keepOrder) {
 			lockPreviousFileEntry = previousFileEntry && previousFileEntry.lock;
 		}
 		fileEntry.lock = new Promise(resolve => resolveLockCurrentFileEntry = resolve);
-		if (options.bufferedWrite || zipWriter.lockWrite || !options.dataDescriptor) {
+		if (options.bufferedWrite || zipWriter.lockWriter || !options.dataDescriptor) {
 			fileWriter = new BlobWriter();
 			fileWriter.init();
 			bufferedWrite = true;
 		} else {
-			zipWriter.lockWrite = Promise.resolve();
+			zipWriter.lockWriter = Promise.resolve();
 			if (writer.init && !writer.initialized) {
 				await writer.init();
 			}
 			fileWriter = writer;
 		}
-		fileEntry = await createFileEntry(reader, fileWriter.writable, zipWriter.config, options);
+		fileEntry = await createFileEntry(reader, fileEntry, fileWriter.writable, zipWriter.config, options);
 		files.set(name, fileEntry);
 		fileEntry.filename = name;
 		if (bufferedWrite) {
-			let indexWrittenData = 0;
-			const blob = fileWriter.getData();
+			let blob = fileWriter.getData();
 			await lockPreviousFileEntry;
-			await lockWriterAccess();
-			fileEntry.writingBufferedData = true;
+			await lockWriter();
+			writingBufferedData = true;
 			const { writable } = writer;
 			if (!options.dataDescriptor) {
 				const headerLength = 26;
@@ -344,10 +344,10 @@ async function getFileEntry(zipWriter, name, reader, options) {
 					setUint32(arrayBufferView, 22, fileEntry.uncompressedSize);
 				}
 				await writeUint8Array(writable, new Uint8Array(arrayBuffer));
-				indexWrittenData = headerLength;
+				blob = blob.slice(headerLength);
 			}
-			await writeBlob(writable, blob, indexWrittenData);
-			delete fileEntry.writingBufferedData;
+			await blob.stream().pipeTo(writable, { preventClose: true });
+			writingBufferedData = false;
 		}
 		fileEntry.offset = zipWriter.offset;
 		if (fileEntry.zip64) {
@@ -359,32 +359,30 @@ async function getFileEntry(zipWriter, name, reader, options) {
 		zipWriter.offset += fileEntry.length;
 		return fileEntry;
 	} catch (error) {
-		if ((bufferedWrite && fileEntry.writingBufferedData) || (!bufferedWrite && fileEntry.dataWritten)) {
+		if ((bufferedWrite && writingBufferedData) || (!bufferedWrite && fileEntry.dataWritten)) {
 			error.corruptedEntry = zipWriter.hasCorruptedEntries = true;
-			if (fileEntry.uncompressedSize) {
-				zipWriter.offset += fileEntry.uncompressedSize;
-			}
+			zipWriter.offset += fileWriter.size;
 		}
 		files.delete(name);
 		throw error;
 	} finally {
 		resolveLockCurrentFileEntry();
-		if (resolveLockUnbufferedWrite) {
-			resolveLockUnbufferedWrite();
+		if (releaseLockWriter) {
+			releaseLockWriter();
 		}
 	}
 
-	async function lockWriterAccess() {
-		if (zipWriter.lockWrite) {
-			await zipWriter.lockWrite.then(() => delete zipWriter.lockWrite);
-			await lockWriterAccess();
+	async function lockWriter() {
+		if (zipWriter.lockWriter) {
+			await zipWriter.lockWriter.then(() => delete zipWriter.lockWriter);
+			await lockWriter();
 		} else {
-			zipWriter.lockWrite = new Promise(resolve => resolveLockUnbufferedWrite = resolve);
+			zipWriter.lockWriter = new Promise(resolve => releaseLockWriter = resolve);
 		}
 	}
 }
 
-async function createFileEntry(reader, writable, config, options) {
+async function createFileEntry(reader, pendingFileEntry, writable, config, options) {
 	const {
 		rawFilename,
 		lastAccessDate,
@@ -534,7 +532,7 @@ async function createFileEntry(reader, writable, config, options) {
 	let compressedSize = 0;
 	if (reader) {
 		await writeUint8Array(writable, localHeaderArray);
-		fileEntry.dataWritten = true;
+		fileEntry.dataWritten = pendingFileEntry.dataWritten = true;
 		const size = () => reader.size;
 		const readable = reader.readable;
 		readable.size = size;
@@ -562,7 +560,7 @@ async function createFileEntry(reader, writable, config, options) {
 		compressedSize = result.length;
 	} else {
 		await writeUint8Array(writable, localHeaderArray);
-		fileEntry.dataWritten = true;
+		fileEntry.dataWritten = pendingFileEntry.dataWritten = true;
 	}
 	let dataDescriptorArray = new Uint8Array();
 	let dataDescriptorView, dataDescriptorOffset = 0;
@@ -638,13 +636,6 @@ async function closeFile(zipWriter, comment, options) {
 	}
 	const directoryArray = new Uint8Array(directoryDataLength + (zip64 ? ZIP64_END_OF_CENTRAL_DIR_TOTAL_LENGTH : END_OF_CENTRAL_DIR_LENGTH));
 	const directoryView = getDataView(directoryArray);
-	if (comment && comment.length) {
-		if (comment.length <= MAX_16_BITS) {
-			setUint16(directoryView, offset + 20, comment.length);
-		} else {
-			throw new Error(ERR_INVALID_COMMENT);
-		}
-	}
 	for (const [indexFileEntry, fileEntry] of Array.from(files.values()).entries()) {
 		const {
 			rawFilename,
@@ -728,6 +719,13 @@ async function closeFile(zipWriter, comment, options) {
 	setUint16(directoryView, offset + 10, filesLength);
 	setUint32(directoryView, offset + 12, directoryDataLength);
 	setUint32(directoryView, offset + 16, directoryOffset);
+	if (comment && comment.length) {
+		if (comment.length <= MAX_16_BITS) {
+			setUint16(directoryView, offset + 20, comment.length);
+		} else {
+			throw new Error(ERR_INVALID_COMMENT);
+		}
+	}
 	const { writable } = zipWriter.writer;
 	await writeUint8Array(writable, directoryArray);
 	if (comment && comment.length) {
@@ -743,20 +741,6 @@ function sliceAsArrayBuffer(blob, start, end) {
 	}
 }
 
-async function writeBlob(writable, blob, start = 0) {
-	const blockSize = 512 * 1024 * 1024;
-	await writeSlice();
-
-	async function writeSlice() {
-		if (start < blob.size) {
-			const arrayBuffer = await sliceAsArrayBuffer(blob, start, start + blockSize);
-			await writeUint8Array(writable, new Uint8Array(arrayBuffer));
-			start += blockSize;
-			await writeSlice();
-		}
-	}
-}
-
 async function writeUint8Array(writable, array) {
 	const streamWriter = writable.getWriter();
 	await streamWriter.ready;

package/lib/zip-fs.js

@@ -30,9 +30,9 @@ import { configure } from "./core/configuration.js";
 import configureWebWorker from "./z-worker-inline.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
 import initShimAsyncCodec from "./core/util/stream-codec-shim.js";
-import { 
-	terminateWorkers, 
-	ERR_ABORT 
+import {
+	terminateWorkers,
+	ERR_ABORT
 } from "./core/codec-pool.js";
 
 let baseURL;

package/lib/zip-full-fflate.js

@@ -31,9 +31,9 @@ import { configure } from "./core/configuration.js";
 import configureWebWorker from "./z-worker-inline.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
 import initShimAsyncCodec from "./core/util/stream-codec-shim.js";
-import { 
-	terminateWorkers, 
-	ERR_ABORT 
+import {
+	terminateWorkers,
+	ERR_ABORT
 } from "./core/codec-pool.js";
 
 let baseURL;

package/lib/zip-full.js

@@ -32,9 +32,9 @@ import { configure } from "./core/configuration.js";
 import configureWebWorker from "./z-worker-inline.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
 import initShimAsyncCodec from "./core/util/stream-codec-shim.js";
-import { 
-	terminateWorkers, 
-	ERR_ABORT 
+import {
+	terminateWorkers,
+	ERR_ABORT
 } from "./core/codec-pool.js";
 
 let baseURL;

package/lib/zip-no-worker-deflate.js

@@ -29,9 +29,9 @@
 import Deflate from "./core/streams/codecs/deflate.js";
 import { configure } from "./core/configuration.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
-import { 
-	terminateWorkers, 
-	ERR_ABORT 
+import {
+	terminateWorkers,
+	ERR_ABORT
 } from "./core/codec-pool.js";
 
 configure({ Deflate });

package/lib/zip-no-worker-fflate-deflate.js

@@ -29,9 +29,9 @@
 import { Deflate } from "./zip-fflate-shim.js";
 import { configure } from "./core/configuration.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
-import { 
-	terminateWorkers, 
-	ERR_ABORT 
+import {
+	terminateWorkers,
+	ERR_ABORT
 } from "./core/codec-pool.js";
 
 configure({ Deflate });

package/lib/zip-no-worker-fflate-inflate.js

@@ -29,9 +29,9 @@
 import { Inflate } from "./zip-fflate-shim.js";
 import { configure } from "./core/configuration.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
-import { 
-	terminateWorkers, 
-	ERR_ABORT 
+import {
+	terminateWorkers,
+	ERR_ABORT
 } from "./core/codec-pool.js";
 
 configure({ Inflate });

package/lib/zip-no-worker-fflate.js

@@ -29,9 +29,9 @@
 import { Deflate, Inflate } from "./zip-fflate-shim.js";
 import { configure } from "./core/configuration.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
-import { 
-	terminateWorkers, 
-	ERR_ABORT 
+import {
+	terminateWorkers,
+	ERR_ABORT
 } from "./core/codec-pool.js";
 
 configure({ Deflate, Inflate });

package/lib/zip-no-worker-inflate.js

@@ -29,9 +29,9 @@
 import Inflate from "./core/streams/codecs/inflate.js";
 import { configure } from "./core/configuration.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
-import { 
-	terminateWorkers, 
-	ERR_ABORT 
+import {
+	terminateWorkers,
+	ERR_ABORT
 } from "./core/codec-pool.js";
 
 configure({ Inflate });

package/lib/zip-no-worker.js

@@ -30,9 +30,9 @@ import Deflate from "./core/streams/codecs/deflate.js";
 import Inflate from "./core/streams/codecs/inflate.js";
 import { configure } from "./core/configuration.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
-import { 
-	terminateWorkers, 
-	ERR_ABORT 
+import {
+	terminateWorkers,
+	ERR_ABORT
 } from "./core/codec-pool.js";
 
 configure({ Deflate, Inflate });

package/lib/zip.js

@@ -30,9 +30,9 @@ import { configure } from "./core/configuration.js";
 import configureWebWorker from "./z-worker-inline.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
 import initShimAsyncCodec from "./core/util/stream-codec-shim.js";
-import { 
-	terminateWorkers, 
-	ERR_ABORT 
+import {
+	terminateWorkers,
+	ERR_ABORT
 } from "./core/codec-pool.js";
 
 let baseURL;

package/package.json

@@ -3,7 +3,7 @@
     "description": "A JavaScript library to zip and unzip files in the browser and Deno",
     "author": "Gildas Lormeau",
     "license": "BSD-3-Clause",
-    "version": "2.5.20",
+    "version": "2.5.23",
     "type": "module",
     "keywords": [
         "zip",

package/rollup-fflate.config.js

@@ -3,9 +3,6 @@ import replace from "@rollup/plugin-replace";
 import { terser } from "rollup-plugin-terser";
 import fs from "fs";
 
-const GLOBALS = "const { Array, Object, String, BigInt, Math, Date, Map, URL, Error, Uint8Array, Uint16Array, Uint32Array, DataView, Blob, Promise, TextEncoder, TextDecoder, document, crypto, btoa, TransformStream, ReadableStream, WritableStream, CompressionStream, DecompressionStream, navigator } = globalThis;";
-const GLOBALS_WORKER = "const { Array, Object, Math, Error, Uint8Array, Uint16Array, Uint32Array, Int32Array, DataView, Promise, TextEncoder, crypto, postMessage, TransformStream, ReadableStream, WritableStream, CompressionStream, DecompressionStream } = globalThis;";
-
 const bundledTerserOptions = {
 	compress: {
 		unsafe: true,
@@ -33,6 +30,9 @@ const inlineTerserOptions = {
 	}
 };
 
+const GLOBALS = "const { Array, Object, String, BigInt, Math, Date, Map, URL, Error, Uint8Array, Uint16Array, Uint32Array, DataView, Blob, Promise, TextEncoder, TextDecoder, document, crypto, btoa, TransformStream, ReadableStream, WritableStream, CompressionStream, DecompressionStream, navigator } = globalThis;";
+const GLOBALS_WORKER = "const { Array, Object, Math, Error, Uint8Array, Uint16Array, Uint32Array, Int32Array, DataView, Promise, TextEncoder, crypto, postMessage, TransformStream, ReadableStream, WritableStream, CompressionStream, DecompressionStream } = globalThis;";
+
 export default [{
 	input: "lib/z-worker-fflate.js",
 	output: [{

package/tests/all/test-wrapped.js

@@ -5,20 +5,24 @@ import * as zip from "../../index.js";
 const TEXT_CONTENT = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius. Claritas est etiam processus dynamicus, qui sequitur mutationem consuetudium lectorum. Mirum est notare quam littera gothica, quam nunc putamus parum claram, anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima. Eodem modo typi, qui nunc nobis videntur parum clari, fiant sollemnes in futurum.";
 const FILENAME = "lorem.txt";
 const BLOB = new Blob([TEXT_CONTENT], { type: zip.getMimeType(FILENAME) });
+const COMMENT = new Uint8Array([60, 61, 62]);
+const PREPENDED_DATA = new Uint8Array([60, 61, 62]);
 
 export { test };
 
 async function test() {
 	zip.configure({ chunkSize: 128, useWebWorkers: true });
 	const blobWriter = new zip.BlobWriter("application/zip");
-	await blobWriter.writeUint8Array(new Uint8Array([60, 61, 62]));
+	await blobWriter.writeUint8Array(PREPENDED_DATA);
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
-	await zipWriter.close(new Uint8Array([60, 61, 62]));
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	await zipWriter.close(COMMENT);
+	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()), { extractPrependedData: true });
 	const entries = await zipReader.getEntries();
 	const data = await entries[0].getData(new zip.BlobWriter(zip.getMimeType(entries[0].filename)));
 	await zipReader.close();
+	const comment = Array.from(zipReader.comment).toString();
+	const prependedData = Array.from(zipReader.prependedData).toString();
 	zip.terminateWorkers();
-	return TEXT_CONTENT == (await data.text()) && entries[0].filename == FILENAME && entries[0].uncompressedSize == TEXT_CONTENT.length;
+	return TEXT_CONTENT == (await data.text()) && prependedData == Array.from(PREPENDED_DATA) && comment == Array.from(COMMENT);
 }