@zip.js/zip.js 2.6.14 → 2.6.17

package/tests/all/test-extra-field.js

@@ -16,7 +16,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB), { extraField });
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
 	await zipReader.close();
 	zip.terminateWorkers();

package/tests/all/test-fflate-no-worker.js

@@ -20,7 +20,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	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();

package/tests/all/test-fflate.js

@@ -19,7 +19,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	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();

package/tests/all/test-multiple-writers.js

@@ -0,0 +1,19 @@
+/* global Blob */
+
+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) });
+
+export { test };
+
+async function test() {
+	zip.configure({ chunkSize: 128, maxWorkers: 4 });
+	await Promise.all(Array.from({ length: 5 }, async () => {
+		const zipWriter = new zip.ZipWriter(new zip.BlobWriter());
+		await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
+		await zipWriter.close();
+	}));
+	zip.terminateWorkers();
+}

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

@@ -14,7 +14,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	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();

package/tests/all/test-pako-no-worker.js

@@ -20,7 +20,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	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();

package/tests/all/test-pako.js

@@ -19,7 +19,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	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();

package/tests/all/test-parallel-reads.js

@@ -18,7 +18,7 @@ async function test() {
 		await zipWriter.add(entryData.name, new zip.BlobReader(entryData.blob));
 	}
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
 	const results = await Promise.all(entries.map(async (entry, indexEntry) => {
 		const blob = await entry.getData(new zip.BlobWriter("application/octet-stream"));

package/tests/all/test-parallel-writes-auto-buffered.js

@@ -32,7 +32,7 @@ async function test() {
 		})
 	));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
 	const results = await Promise.all(entries.slice(0, ENTRIES_DATA.length).map(async (entry, indexEntry) => {
 		const blob = await entry.getData(new zip.BlobWriter("application/octet-stream"));

package/tests/all/test-parallel-writes-ordered.js

@@ -16,7 +16,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter, { keepOrder: true });
 	await Promise.all(ENTRIES_DATA.map(entryData => zipWriter.add(entryData.name, new zip.BlobReader(entryData.blob))));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
 	zip.terminateWorkers();
 	if (JSON.stringify(ENTRIES_DATA.map(entry => entry.name)) !=

package/tests/all/test-parallel-writes.js

@@ -16,7 +16,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await Promise.all(ENTRIES_DATA.map(entryData => zipWriter.add(entryData.name, new zip.BlobReader(entryData.blob), { keepOrder: false, bufferedWrite: true, level: Math.random() > .5 ? 5 : 0 })));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
 	const results = await Promise.all(entries.map(async (entry, indexEntry) => {
 		const blob = await entry.getData(new zip.BlobWriter("application/octet-stream"));

package/tests/all/test-readable-stream.js

@@ -15,7 +15,7 @@ async function test() {
 	const reader = { readable };
 	await zipWriter.add(FILENAME, reader);
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	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();

package/tests/all/test-safe-closing.js

@@ -16,7 +16,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	ENTRIES_DATA.map(entryData => zipWriter.add(entryData.name, new zip.BlobReader(entryData.blob))); // missing call to `await Promise.all`
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
 	const results = await Promise.all(entries.slice(0, ENTRIES_DATA.length).map(async (entry, indexEntry) => {
 		const blob = await entry.getData(new zip.BlobWriter("application/octet-stream"));

package/tests/all/test-store.js

@@ -15,7 +15,7 @@ async function test() {
 	const entry = await zipWriter.add(FILENAME, new zip.BlobReader(BLOB), { level: 0 });
 	if (entry.compressionMethod === 0x00) {
 		await zipWriter.close();
-		const compressedData = blobWriter.getData();
+		const compressedData = await blobWriter.getData();
 		if ((await compressedData.text()).includes(TEXT_CONTENT)) {
 			const zipReader = new zip.ZipReader(new zip.BlobReader(compressedData));
 			const entries = await zipReader.getEntries();

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

@@ -14,7 +14,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
 	await entries[0].getData(new zip.BlobWriter(zip.getMimeType(entries[0].filename)));
 	await zipReader.close();

package/tests/all/test-wrapped.js

@@ -10,14 +10,56 @@ const PREPENDED_DATA = new Uint8Array([60, 61, 62]);
 
 export { test };
 
+class CustomBlobWriter extends zip.Writer {
+
+	constructor(contentType) {
+		super();
+		const writer = this;
+		writer.contentType = contentType;
+		writer.arrayBuffersMaxlength = 8;
+		initArrayBuffers(writer);
+	}
+
+	writeUint8Array(array) {
+		super.writeUint8Array(array);
+		const writer = this;
+		if (writer.arrayBuffers.length == writer.arrayBuffersMaxlength) {
+			flushArrayBuffers(writer);
+		}
+		writer.arrayBuffers.push(array.buffer);
+	}
+
+	getData() {
+		const writer = this;
+		if (!writer.blob) {
+			if (writer.arrayBuffers.length) {
+				flushArrayBuffers(writer);
+			}
+			writer.blob = writer.pendingBlob;
+			initArrayBuffers(writer);
+		}
+		return writer.blob;
+	}
+}
+
+function initArrayBuffers(blobWriter) {
+	blobWriter.pendingBlob = new Blob([], { type: blobWriter.contentType });
+	blobWriter.arrayBuffers = [];
+}
+
+function flushArrayBuffers(blobWriter) {
+	blobWriter.pendingBlob = new Blob([blobWriter.pendingBlob, ...blobWriter.arrayBuffers], { type: blobWriter.contentType });
+	blobWriter.arrayBuffers = [];
+}
+
 async function test() {
 	zip.configure({ chunkSize: 128, useWebWorkers: true });
-	const blobWriter = new zip.BlobWriter("application/zip");
+	const blobWriter = new CustomBlobWriter("application/zip");
 	await blobWriter.writeUint8Array(PREPENDED_DATA);
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
 	await zipWriter.close(COMMENT);
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()), { extractPrependedData: true });
+	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()), { extractPrependedData: true });
 	const entries = await zipReader.getEntries();
 	await entries[0].getData(new zip.BlobWriter(zip.getMimeType(entries[0].filename)));
 	await zipReader.close();

package/tests/all/test-writable-stream.js

@@ -14,7 +14,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
 	const data = new Uint8Array(entries[0].uncompressedSize);
 	let dataOffset = 0;

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

@@ -8,9 +8,51 @@ const BLOB = new Blob([TEXT_CONTENT], { type: zip.getMimeType(FILENAME) });
 
 export { test };
 
+class CustomBlobWriter extends zip.Writer {
+
+	constructor(contentType) {
+		super();
+		const writer = this;
+		writer.contentType = contentType;
+		writer.arrayBuffersMaxlength = 8;
+		initArrayBuffers(writer);
+	}
+
+	writeUint8Array(array) {
+		super.writeUint8Array(array);
+		const writer = this;
+		if (writer.arrayBuffers.length == writer.arrayBuffersMaxlength) {
+			flushArrayBuffers(writer);
+		}
+		writer.arrayBuffers.push(array.buffer);
+	}
+
+	getData() {
+		const writer = this;
+		if (!writer.blob) {
+			if (writer.arrayBuffers.length) {
+				flushArrayBuffers(writer);
+			}
+			writer.blob = writer.pendingBlob;
+			initArrayBuffers(writer);
+		}
+		return writer.blob;
+	}
+}
+
+function initArrayBuffers(blobWriter) {
+	blobWriter.pendingBlob = new Blob([], { type: blobWriter.contentType });
+	blobWriter.arrayBuffers = [];
+}
+
+function flushArrayBuffers(blobWriter) {
+	blobWriter.pendingBlob = new Blob([blobWriter.pendingBlob, ...blobWriter.arrayBuffers], { type: blobWriter.contentType });
+	blobWriter.arrayBuffers = [];
+}
+
 async function test() {
 	zip.configure({ chunkSize: 128, useWebWorkers: true });
-	const blobWriter = new zip.BlobWriter("application/zip");
+	const blobWriter = new CustomBlobWriter("application/zip");
 	const array = new Uint8Array(64 * 1024 * 1024);
 	for (let index = 0; index < 64; index++) {
 		await blobWriter.writeUint8Array(array);
@@ -18,12 +60,12 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter, { keepOrder: true });
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	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()) {
+	if (TEXT_CONTENT != await data.text() && !entries[0].zip64) {
 		throw new Error();
 	}
 }

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

@@ -14,7 +14,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter, { zip64: true });
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB), { password: "password" });
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
 	let data;
 	try {

package/tests/all/test-zip64.js

@@ -14,7 +14,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter, { zip64: true });
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	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();

package/tests/all/test-zipcrypto.js

@@ -14,7 +14,7 @@ async function test() {
 	const zipWriter = new zip.ZipWriter(blobWriter);
 	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB), { password: "password", zipCrypto: true });
 	await zipWriter.close();
-	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
 	let data;
 	if (entries[0].encrypted) {

package/tests/tests-data.js

@@ -27,6 +27,7 @@ export default ([
 	{ title: "HTTP crypto", script: "./test-http-crypto.js", env: ["deno", "browser"] },
 	{ title: "HTTP zip64", script: "./test-http-zip64.js", env: ["deno", "browser"] },
 	{ title: "Invalid CRC", script: "./test-invalid-crc.js", env: ["deno", "browser"] },
+	{ title: "Multiple writers", script: "./test-multiple-writers.js" },
 	{ title: "No worker", script: "./test-no-worker.js" },
 	{ title: "Pako", script: "./test-pako.js", env: ["browser"] },
 	{ title: "Pako (no worker)", script: "./test-pako-no-worker.js", env: ["deno", "browser"] },

package/tests/web-runner.js

@@ -7,7 +7,7 @@ import tests from "./tests-data.js";
 const table = document.createElement("table");
 const MAX_TESTS = 16;
 let indexTest;
-for (indexTest = 0; indexTest < MAX_TESTS; indexTest++) {
+for (indexTest = 0; indexTest < Math.min(MAX_TESTS, tests.length); indexTest++) {
 	addTest(tests[indexTest]);
 }
 document.body.appendChild(table);