@zip.js/zip.js 2.6.16 → 2.6.19

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) {
+		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");
-	await blobWriter.writeUint8Array(PREPENDED_DATA);
+	const blobWriter = new CustomBlobWriter("application/zip");
+	blobWriter.writeUint8Array(PREPENDED_DATA);
+	blobWriter.writable.size = PREPENDED_DATA.length;
 	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,22 +8,65 @@ 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) {
+		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");
+	blobWriter.writable.size = 0;
 	const array = new Uint8Array(64 * 1024 * 1024);
 	for (let index = 0; index < 64; index++) {
-		await blobWriter.writeUint8Array(array);
+		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 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);