@zip.js/zip.js 2.6.8 → 2.6.11

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

@@ -1,4 +1,4 @@
-/* global Blob, FileReader */
+/* global Blob */
 
 import * as zip from "../../index.js";
 
@@ -26,32 +26,18 @@ async function test() {
 	return !results.includes(false);
 }
 
-function compareResult(result, value) {
-	return new Promise(resolve => {
-		const fileReaderInput = new FileReader();
-		const fileReaderOutput = new FileReader();
-		let loadCount = 0;
-		fileReaderInput.readAsArrayBuffer(value);
-		fileReaderOutput.readAsArrayBuffer(result);
-		fileReaderInput.onload = fileReaderOutput.onload = () => {
-			loadCount++;
-			if (loadCount == 2) {
-				const valueInput = new Float64Array(fileReaderInput.result);
-				const valueOutput = new Float64Array(fileReaderOutput.result);
-				if (valueInput.length != valueOutput.length) {
-					resolve(false);
-					return;
-				}
-				for (let indexValue = 0, n = valueInput.length; indexValue < n; indexValue++) {
-					if (valueInput[indexValue] != valueOutput[indexValue]) {
-						resolve(false);
-						return;
-					}
-				}
-				resolve(true);
-			}
-		};
-	});
+async function compareResult(result, value) {
+	const valueInput = new Float64Array(await result.arrayBuffer());
+	const valueOutput = new Float64Array(await value.arrayBuffer());
+	if (valueInput.length != valueOutput.length) {
+		return false;
+	}
+	for (let indexValue = 0, n = valueInput.length; indexValue < n; indexValue++) {
+		if (valueInput[indexValue] != valueOutput[indexValue]) {
+			return false;
+		}
+	}
+	return true;
 }
 
 function getBlob(size) {

package/tests/all/test-zipcrypto.js

@@ -16,14 +16,15 @@ async function test() {
 	await zipWriter.close();
 	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
 	const entries = await zipReader.getEntries();
-	const dataBlobWriter = new zip.BlobWriter(zip.getMimeType(entries[0].filename));
 	let data;
 	if (entries[0].encrypted) {
+		const dataBlobWriter = new zip.BlobWriter(zip.getMimeType(entries[0].filename));
 		try {
 			data = await entries[0].getData(dataBlobWriter, { password: "notagoodpassword" });
 			data = null;
 		} catch (error) {
 			if (error.message == zip.ERR_INVALID_PASSWORD) {
+				const dataBlobWriter = new zip.BlobWriter(zip.getMimeType(entries[0].filename));
 				data = await entries[0].getData(dataBlobWriter, { password: "password" });
 			} else {
 				throw error;

package/tests/deno-runner.js

@@ -5,10 +5,10 @@
 import tests from "./tests-data.js";
 
 for (const test of tests) {
-	if (test.env != "browser") {
+	if (!test.env || test.env.includes("deno")) {
 		Deno.test({
 			name: test.title,
-			fn: async () => (await import("./" + (test.env || "all") + "/" + test.script)).test(),
+			fn: async () => (await import("./all/" + test.script)).test(),
 			sanitizeResources: test.sanitizeResources === undefined || test.sanitizeResources === true
 		});
 	}

package/tests/node-runner.js

@@ -0,0 +1,32 @@
+/* global process */
+/* eslint-disable no-console */
+
+import data from "./tests-data.js";
+runTests();
+
+async function runTests() {
+	let passed = true;
+	let passedCount = 0;
+	const tests = data.filter(test => !test.env || test.env.includes("node"));
+	console.log("running", tests.length, "tests from ./node-runner.js");
+	for (const test of tests) {
+		const fn = async () => (await import("./all/" + test.script)).test();
+		try {
+			console.log(test.title + "...", await fn() && "ok");
+			passedCount++;
+		} catch (error) {
+			passed = false;
+			console.error(test.title + "...", "FAILED");
+			console.error(error);
+		}
+	}
+	console.log("");
+	if (passed) {
+		console.log("ok", "|", passedCount, "passed");
+		console.log("");
+	} else {
+		console.error("error: Test failed");
+		console.log("");
+		process.exit(-1);
+	}
+}

package/tests/tests-data.js

@@ -4,45 +4,46 @@ export default ([
 	{ title: "Uint8Array", script: "./test-array.js" },
 	{ title: "Base 64", script: "./test-base64.js" },
 	{ title: "Blob", script: "./test-blob.js" },
-	{ title: "Codecs interoperability", script: "./test-codecs-interoperability.js", env: "browser" },
+	{ title: "Codecs interoperability", script: "./test-codecs-interoperability.js", env: ["browser"] },
 	{ title: "Crypto", script: "./test-crypto.js" },
 	{ title: "Custom IO classes", script: "./test-custom-io.js" },
 	{ title: "Data descriptor signature", script: "./test-data-descriptor-signature.js" },
 	{ title: "Data descriptor", script: "./test-data-descriptor.js" },
+	{ title: "Duplicated Filename", script: "./test-duplicated-filename.js" },
 	{ title: "Empty zip file", script: "./test-empty.js" },
 	{ title: "Extended timestamp", script: "./test-extended-timestamp.js" },
 	{ title: "Extra field", script: "./test-extra-field.js" },
-	{ title: "Fflate", script: "./test-fflate.js", env: "browser" },
+	{ title: "Fflate", script: "./test-fflate.js", env: ["browser"] },
 	{ title: "Fflate (no worker)", script: "./test-fflate-no-worker.js", sanitizeResources: false },
 	{ title: "Filesystem base 64", script: "./test-fs-base64.js" },
-	{ title: "Filesystem export", script: "./test-fs-export-options.js" },
-	{ title: "Filesystem HTTP import", script: "./test-fs-http-import.js" },
-	{ title: "Filesystem HTTP reader", script: "./test-fs-http-reader.js" },
-	{ title: "Filesystem replace entry", script: "./test-fs-replace.js" },
+	{ title: "Filesystem export", script: "./test-fs-export-options.js", env: ["deno", "browser"] },
+	{ title: "Filesystem HTTP import", script: "./test-fs-http-import.js", env: ["deno", "browser"] },
+	{ title: "Filesystem HTTP reader", script: "./test-fs-http-reader.js", env: ["deno", "browser"] },
+	{ title: "Filesystem replace entry", script: "./test-fs-replace.js", env: ["deno", "browser"] },
 	{ title: "Filesystem streams", script: "./test-fs-streams.js" },
 	{ title: "Filesystem text", script: "./test-fs-text.js" },
-	{ title: "Filesystem unzip uncompressed file", script: "./test-fs-unzip-store.js" },
+	{ title: "Filesystem unzip uncompressed file", script: "./test-fs-unzip-store.js", env: ["deno", "browser"] },
 	{ title: "Filesystem test", script: "./test-fs.js" },
-	{ title: "HTTP crypto", script: "./test-http-crypto.js" },
-	{ title: "HTTP zip64", script: "./test-http-zip64.js" },
-	{ title: "Invalid CRC", script: "./test-invalid-crc.js" },
+	{ 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: "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" },
+	{ title: "Pako", script: "./test-pako.js", env: ["browser"] },
+	{ title: "Pako (no worker)", script: "./test-pako-no-worker.js", env: ["deno", "browser"] },
 	{ title: "Parallel reads", script: "./test-parallel-reads.js" },
 	{ title: "Parallel writes (auto buffered)", script: "./test-parallel-writes-auto-buffered.js" },
 	{ title: "Parallel writes (ordered)", script: "./test-parallel-writes-ordered.js" },
 	{ title: "Parallel writes", script: "./test-parallel-writes.js" },
-	{ title: "Readable Stream", script: "./test-readable-stream.js" },
-	{ title: "Readable Zip Stream", script: "./test-readable-zip-stream.js" },
+	{ title: "Readable Stream", script: "./test-readable-stream.js", env: ["deno", "browser"] },
+	{ title: "Readable Zip Stream", script: "./test-readable-zip-stream.js", env: ["deno", "browser"] },
 	{ title: "Safe closing", script: "./test-safe-closing.js" },
-	{ title: "Service worker", script: "./test-sw.js", env: "browser" },
+	{ title: "Service worker", script: "./test-sw.js", env: ["browser"] },
 	{ title: "Signature CRC32", script: "./test-crc.js" },
 	{ title: "Store", script: "./test-store.js" },
 	{ title: "Worker timeout", script: "./test-worker-timeout.js" },
 	{ title: "Wrapped zip file", script: "./test-wrapped.js" },
 	{ title: "Writable Stream", script: "./test-writable-stream.js" },
-	{ title: "Zip64 (auto)", script: "./test-zip64-auto.js" },
+	{ title: "Zip64 (auto)", script: "./test-zip64-auto.js", env: ["deno", "browser"] },
 	{ title: "Zip64 crypto", script: "./test-zip64-crypto.js" },
 	{ title: "Zip64", script: "./test-zip64.js" },
 	{ title: "Zipcrypto", script: "./test-zipcrypto.js" }

package/tests/web-runner.js

@@ -20,7 +20,9 @@ if (!location.search.startsWith("?keepTests")) {
 		const test = tests[indexTest];
 		indexTest++;
 		if (test) {
-			addTest(test);
+			if (!test.env || test.env.includes("browser")) {
+				addTest(test);
+			}
 		} else if (!document.querySelectorAll("tr").length) {
 			document.body.innerHTML = "ok";
 		}
@@ -36,7 +38,7 @@ function addTest(test) {
 	link.textContent = test.title;
 	link.target = test.script;
 	row.dataset.script = test.script;
-	link.href = iframe.src = (test.env || "all") + "/loader.html#" + encodeURIComponent(JSON.stringify({ script: test.script }));
+	link.href = iframe.src = "/tests/all/loader.html#" + encodeURIComponent(JSON.stringify({ script: test.script }));
 	cellTest.appendChild(iframe);
 	cellLink.appendChild(link);
 	row.appendChild(cellLink);

package/tests/browser/loader.html

@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset='utf-8'>
-    <style>
-        body {
-            margin: 0;
-        }
-    </style>
-</head>
-
-<body>
-    ...
-    <script>
-        const testData = JSON.parse(decodeURIComponent(location.hash.substring(1)));
-        const script = testData.script;
-        import(testData.script).then(async Module => {
-            try {
-                const result = await Module.test();
-                if (result) {
-                    document.body.innerHTML = "ok";
-                    parent.postMessage(JSON.stringify({ script }), "*");
-                }
-            } catch (error) {
-                parent.postMessage(JSON.stringify({ script, error: { message: error.message, stack: error.stack } }), "*");
-                throw error;
-            }
-        })
-    </script>
-</body>

package/tests/node/package.json

@@ -1,5 +0,0 @@
-{
-    "name": "test-node-zipjs",
-    "version": "1.0.0",
-    "type": "module"
-}

package/tests/node/test-node.js

@@ -1,30 +0,0 @@
-/* global TextEncoder */
-/* eslint-disable no-console */
-
-import { configure, Uint8ArrayWriter, Uint8ArrayReader, TextWriter, ZipWriter, ZipReader, terminateWorkers } 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 UINT8_ARRAY = (new TextEncoder()).encode(TEXT_CONTENT);
-
-test()
-	.then(result => result && console.log("ok"))
-	.catch(error => console.error(error));
-
-async function test() {
-	configure({ useWebWorkers: false });
-	const blobWriter = new Uint8ArrayWriter(UINT8_ARRAY);
-	const zipWriter = new ZipWriter(blobWriter);
-	const entry = await zipWriter.add(FILENAME, new Uint8ArrayReader(UINT8_ARRAY));
-	if (entry.compressionMethod == 0x08) {
-		await zipWriter.close();
-		const zipReader = new ZipReader(new Uint8ArrayReader(blobWriter.getData()));
-		const entries = await zipReader.getEntries();
-		if (entries[0].compressionMethod == 0x08) {
-			const data = await entries[0].getData(new TextWriter());
-			await zipReader.close();
-			terminateWorkers();
-			return TEXT_CONTENT == data && entries[0].filename == FILENAME && entries[0].uncompressedSize == TEXT_CONTENT.length;
-		}
-	}
-}