@zip.js/zip.js 2.6.21 → 2.6.22

package/lib/core/io.js

@@ -226,7 +226,7 @@ class BlobWriter extends Stream {
 		const writer = this;
 		writer.contentType = contentType;
 		writer.transformStream = new TransformStream();
-		Object.defineProperty(this, "writable", {
+		Object.defineProperty(writer, "writable", {
 			get() {
 				return writer.transformStream.writable;
 			}
@@ -240,7 +240,7 @@ class BlobWriter extends Stream {
 			transformStream,
 			contentType
 		} = writer;
-		writer.blob = new Response(transformStream.readable).blob({ type: contentType });
+		writer.blob = new Response(transformStream.readable, { headers: [["content-type", contentType]] }).blob();
 	}
 
 	getData() {

package/lib/core/zip-writer.js

@@ -298,11 +298,11 @@ async function addFile(zipWriter, name, reader, options) {
 		externalFileAttribute,
 		useCompressionStream
 	});
-	const localHeaderInfo = getLocalHeaderInfo(options);
+	const headerInfo = getHeaderInfo(options);
 	const dataDescriptorInfo = getDataDescriptorInfo(options);
-	maximumEntrySize = localHeaderInfo.localHeaderArray.length + maximumCompressedSize + dataDescriptorInfo.dataDescriptorArray.length;
+	maximumEntrySize = headerInfo.localHeaderArray.length + maximumCompressedSize + dataDescriptorInfo.dataDescriptorArray.length;
 	zipWriter.pendingEntriesSize += maximumEntrySize;
-	const fileEntry = await getFileEntry(zipWriter, name, reader, { localHeaderInfo, dataDescriptorInfo }, options);
+	const fileEntry = await getFileEntry(zipWriter, name, reader, { headerInfo, dataDescriptorInfo }, options);
 	if (maximumEntrySize) {
 		zipWriter.pendingEntriesSize -= maximumEntrySize;
 	}
@@ -428,7 +428,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 
 async function createFileEntry(reader, writer, pendingFileEntry, entryInfo, config, options) {
 	const {
-		localHeaderInfo,
+		headerInfo,
 		dataDescriptorInfo
 	} = entryInfo;
 	const {
@@ -443,7 +443,7 @@ async function createFileEntry(reader, writer, pendingFileEntry, entryInfo, conf
 		rawExtraFieldExtendedTimestamp,
 		rawExtraFieldNTFS,
 		rawExtraFieldAES
-	} = localHeaderInfo;
+	} = headerInfo;
 	const { dataDescriptorArray } = dataDescriptorInfo;
 	const {
 		rawFilename,
@@ -530,7 +530,7 @@ async function createFileEntry(reader, writer, pendingFileEntry, entryInfo, conf
 			rawExtraFieldZip64,
 			compressedSize,
 			uncompressedSize,
-			localHeaderInfo,
+			headerInfo,
 			dataDescriptorInfo
 		}, options);
 	}
@@ -554,7 +554,7 @@ async function createFileEntry(reader, writer, pendingFileEntry, entryInfo, conf
 	return fileEntry;
 }
 
-function getLocalHeaderInfo(options) {
+function getHeaderInfo(options) {
 	const {
 		rawFilename,
 		lastAccessDate,
@@ -712,13 +712,13 @@ function setEntryInfo(entryInfo, options) {
 		rawExtraFieldZip64,
 		compressedSize,
 		uncompressedSize,
-		localHeaderInfo,
+		headerInfo,
 		dataDescriptorInfo
 	} = entryInfo;
 	const {
 		headerView,
 		encrypted
-	} = localHeaderInfo;
+	} = headerInfo;
 	const {
 		dataDescriptorView,
 		dataDescriptorOffset

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.21",
+    "version": "2.6.22",
     "type": "module",
     "keywords": [
         "zip",

package/tests/all/test-zip64-auto.js

@@ -53,20 +53,26 @@ async function test() {
 	zip.configure({ chunkSize: 128, useWebWorkers: true });
 	const blobWriter = new CustomBlobWriter("application/zip");
 	blobWriter.writable.size = 0;
-	const array = new Uint8Array(64 * 1024 * 1024);
-	for (let index = 0; index < 64; index++) {
+	let array = new Uint8Array(64 * 1024 * 1024);
+	for (let index = 0; index < 63; index++) {
 		blobWriter.writeUint8Array(array);
 		blobWriter.writable.size += array.length;
 	}
+	array = new Uint8Array((64 * 1024 * 1024) - 1265);
+	blobWriter.writeUint8Array(array);
+	blobWriter.writable.size += array.length;
 	const zipWriter = new zip.ZipWriter(blobWriter, { keepOrder: true });
-	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
+	await Promise.all([
+		zipWriter.add(FILENAME, new zip.BlobReader(BLOB)),
+		zipWriter.add(FILENAME + "1", new zip.BlobReader(BLOB)),
+		zipWriter.add(FILENAME + "2", new zip.BlobReader(BLOB))
+	]);
 	await zipWriter.close();
 	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
-	const data = await entries[0].getData(new zip.BlobWriter(zip.getMimeType(entries[0].filename)));
 	await zipReader.close();
 	zip.terminateWorkers();
-	if (TEXT_CONTENT != await data.text() && !entries[0].zip64) {
+	if (entries[0].zip64 || entries[1].zip64 || !entries[2].zip64) {
 		throw new Error();
 	}
 }