@zip.js/zip.js 2.5.2 → 2.5.5

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

@@ -29,16 +29,19 @@
 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 } from "./core/codecs/codec-pool.js";
+import { 
+	terminateWorkers, 
+	ERR_ABORT 
+} from "./core/codec-pool.js";
 
 configure({ Deflate, Inflate });
 
-export { ERR_ABORT } from "./core/engine.js";
 export * from "./core/io.js";
 export * from "./core/zip-reader.js";
 export * from "./core/zip-writer.js";
 export {
 	configure,
 	getMimeType,
-	terminateWorkers
+	terminateWorkers,
+	ERR_ABORT
 };

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

@@ -26,18 +26,21 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import Inflate from "./core/codecs/inflate.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 } from "./core/codecs/codec-pool.js";
+import { 
+	terminateWorkers, 
+	ERR_ABORT 
+} from "./core/codec-pool.js";
 
 configure({ Inflate });
 
-export { ERR_ABORT } from "./core/engine.js";
 export * from "./core/io.js";
 export * from "./core/zip-reader.js";
 export {
 	configure,
 	getMimeType,
-	terminateWorkers
+	terminateWorkers,
+	ERR_ABORT
 };

package/lib/zip-no-worker.js

@@ -26,20 +26,23 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import Deflate from "./core/codecs/deflate.js";
-import Inflate from "./core/codecs/inflate.js";
+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 } from "./core/codecs/codec-pool.js";
+import { 
+	terminateWorkers, 
+	ERR_ABORT 
+} from "./core/codec-pool.js";
 
 configure({ Deflate, Inflate });
 
-export { ERR_ABORT } from "./core/engine.js";
 export * from "./core/io.js";
 export * from "./core/zip-reader.js";
 export * from "./core/zip-writer.js";
 export {
 	configure,
 	getMimeType,
-	terminateWorkers
+	terminateWorkers,
+	ERR_ABORT
 };

package/lib/zip.js

@@ -30,7 +30,10 @@ 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 } from "./core/codecs/codec-pool.js";
+import { 
+	terminateWorkers, 
+	ERR_ABORT 
+} from "./core/codec-pool.js";
 
 let baseURL;
 try {
@@ -41,7 +44,6 @@ try {
 configure({ baseURL });
 configureWebWorker(configure);
 
-export { ERR_ABORT } from "./core/engine.js";
 export * from "./core/io.js";
 export * from "./core/zip-reader.js";
 export * from "./core/zip-writer.js";
@@ -49,5 +51,6 @@ export {
 	configure,
 	getMimeType,
 	initShimAsyncCodec,
-	terminateWorkers
+	terminateWorkers,
+	ERR_ABORT
 };

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.2",
+    "version": "2.5.5",
     "type": "module",
     "keywords": [
         "zip",
@@ -36,15 +36,9 @@
     },
     "homepage": "https://gildas-lormeau.github.io/zip.js",
     "devDependencies": {
-        "@babel/core": "^7.18.6",
-        "@babel/preset-env": "^7.18.6",
-        "@rollup/plugin-babel": "^5.3.1",
-        "@rollup/plugin-commonjs": "^22.0.1",
         "@rollup/plugin-node-resolve": "^13.3.0",
         "@rollup/plugin-replace": "^4.0.0",
-        "babel-plugin-transform-async-to-promises": "^0.8.18",
-        "core-js": "^3.23.3",
-        "rollup": "^2.75.7",
+        "rollup": "^2.76.0",
         "rollup-plugin-terser": "^7.0.2"
     }
 }

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

@@ -14,7 +14,7 @@ async function test() {
 	zip.configure({ chunkSize: 512, maxWorkers: 4, useWebWorkers: true });
 	const blobWriter = new zip.BlobWriter("application/zip");
 	const zipWriter = new zip.ZipWriter(blobWriter);
-	ENTRIES_DATA.map(entryData => zipWriter.add(entryData.name, new zip.BlobReader(entryData.blob))); // missing await when calling zipWriter.add
+	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 entries = await zipReader.getEntries();

package/tests/node/package.json

@@ -1,9 +1,5 @@
 {
     "name": "test-node-zipjs",
     "version": "1.0.0",
-    "type": "module",
-    "dependencies": {
-        "blob-polyfill": "^6.0.20211015",
-        "web-worker": "^1.2.0"
-    }
-}
+    "type": "module"
+}

package/tests/node/test-node.js

@@ -1,28 +1,24 @@
-/* global globalThis */
+/* global TextEncoder */
 /* eslint-disable no-console */
 
-import Worker from "web-worker";
-import { Blob } from "blob-polyfill";
-import { BlobWriter, BlobReader, TextWriter, ZipWriter, ZipReader, terminateWorkers } from "../../index.js";
+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 TEXT_PLAIN_MIMETYPE = "text/plain";
-const BLOB = new Blob([TEXT_CONTENT], { type: TEXT_PLAIN_MIMETYPE });
+const UINT8_ARRAY = (new TextEncoder()).encode(TEXT_CONTENT);
 
-globalThis.Blob = Blob;
-globalThis.Worker = Worker;
 test()
 	.then(result => result && console.log("ok"))
 	.catch(error => console.error(error));
 
 async function test() {
-	const blobWriter = new BlobWriter("application/zip");
+	configure({ useWebWorkers: false });
+	const blobWriter = new Uint8ArrayWriter(UINT8_ARRAY);
 	const zipWriter = new ZipWriter(blobWriter);
-	const entry = await zipWriter.add(FILENAME, new BlobReader(BLOB));
+	const entry = await zipWriter.add(FILENAME, new Uint8ArrayReader(UINT8_ARRAY));
 	if (entry.compressionMethod == 0x08) {
 		await zipWriter.close();
-		const zipReader = new ZipReader(new BlobReader(blobWriter.getData()));
+		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());

package/lib/core/codecs/codec.js

@@ -1,230 +0,0 @@
-/*
- Copyright (c) 2022 Gildas Lormeau. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright 
- notice, this list of conditions and the following disclaimer in 
- the documentation and/or other materials provided with the distribution.
-
- 3. The names of the authors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
- INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* global ReadableStream, DecompressionStream, CompressionStream */
-// deno-lint-ignore-file no-this-alias
-
-import Crc32Stream from "./crc32-stream.js";
-import { AESEncryptStream, AESDecryptStream, ERR_INVALID_PASSWORD } from "./aes-crypto-stream.js";
-import { ZipCryptoDecryptStream, ZipCryptoEncryptStream } from "./zip-crypto-stream.js";
-import CodecStream from "./codec-stream.js";
-
-const CODEC_DEFLATE = "deflate";
-const CODEC_INFLATE = "inflate";
-const ERR_INVALID_SIGNATURE = "Invalid signature";
-const MESSAGE_EVENT_TYPE = "message";
-const MESSAGE_START = "start";
-const MESSAGE_PULL = "pull";
-const MESSAGE_DATA = "data";
-const MESSAGE_ABORT = "abort";
-
-class Inflate {
-
-	constructor(codecConstructor, {
-		signature,
-		password,
-		signed,
-		compressed,
-		zipCrypto,
-		passwordVerification,
-		encryptionStrength,
-		useCompressionStream
-	}, { chunkSize }) {
-		const codec = this;
-		codec.start = async () => {
-			const encrypted = Boolean(password);
-			Object.assign(codec, {
-				signature,
-				encrypted,
-				signed,
-				compressed,
-				zipCrypto,
-				stream: new ReadableStream({
-					async pull(controller) {
-						const { value, done } = await codec.pull();
-						controller.enqueue(value);
-						if (done || codec.aborted) {
-							controller.close();
-						}
-					}
-				})
-			});
-			if (encrypted) {
-				if (zipCrypto) {
-					codec.stream = codec.stream.pipeThrough(new ZipCryptoDecryptStream(password, passwordVerification));
-				} else {
-					codec.decryptStream = new AESDecryptStream(password, signed, encryptionStrength);
-					codec.stream = codec.stream.pipeThrough(codec.decryptStream);
-				}
-			}
-			if (compressed) {
-				if ((useCompressionStream !== undefined && !useCompressionStream) || typeof DecompressionStream == "undefined") {
-					codec.stream = codec.stream.pipeThrough(new CodecStream(codecConstructor, { chunkSize }));
-				} else {
-					codec.stream = codec.stream.pipeThrough(new DecompressionStream("deflate-raw"));
-				}
-			}
-			if ((!encrypted || zipCrypto) && signed) {
-				const tee = codec.stream.tee();
-				codec.stream = tee[0];
-				codec.crc32Stream = tee[1].pipeThrough(new Crc32Stream());
-			}
-			codec.reader = codec.stream.getReader();
-			await codec.read();
-		};
-		codec.abort = () => codec.aborted = true;
-	}
-
-	async read() {
-		const codec = this;
-		const { value, done } = await codec.reader.read();
-		if (value && value.length) {
-			codec.ondata({ value: { data: new Uint8Array(value) } });
-		}
-		if (done) {
-			let signature;
-			if (codec.encrypted && !codec.zipCrypto) {
-				if (!codec.decryptStream.valid) {
-					throw new Error(ERR_INVALID_SIGNATURE);
-				}
-			}
-			if ((!codec.encrypted || codec.zipCrypto) && codec.signed) {
-				signature = await codec.crc32Stream.getReader().read();
-				const dataViewSignature = new DataView(signature.value.buffer);
-				if (codec.signature != dataViewSignature.getUint32(0, false)) {
-					throw new Error(ERR_INVALID_SIGNATURE);
-				}
-			}
-			codec.ondata({ value: { signature }, done });
-		} else {
-			await codec.read();
-		}
-	}
-}
-
-class Deflate {
-
-	constructor(codecConstructor, {
-		encrypted,
-		signed,
-		compressed,
-		level,
-		zipCrypto,
-		password,
-		passwordVerification,
-		encryptionStrength,
-		useCompressionStream
-	}, { chunkSize }) {
-		const codec = this;
-		codec.start = async () => {
-			Object.assign(this, {
-				encrypted,
-				signed,
-				compressed,
-				zipCrypto,
-				stream: new ReadableStream({
-					async pull(controller) {
-						const { value, done } = await codec.pull();
-						controller.enqueue(value);
-						if (done || codec.aborted) {
-							controller.close();
-						}
-					}
-				})
-			});
-			if ((!encrypted || zipCrypto) && signed) {
-				const tee = codec.stream.tee();
-				codec.stream = tee[0];
-				codec.crc32Stream = tee[1].pipeThrough(new Crc32Stream({ chunkSize }));
-			}
-			if (compressed) {
-				if ((useCompressionStream !== undefined && !useCompressionStream) || typeof CompressionStream == "undefined") {
-					codec.stream = codec.stream.pipeThrough(new CodecStream(codecConstructor, { chunkSize, level }));
-				} else {
-					codec.stream = codec.stream.pipeThrough(new CompressionStream("deflate-raw"));
-				}
-			}
-			if (encrypted) {
-				if (zipCrypto) {
-					codec.stream = codec.stream.pipeThrough(new ZipCryptoEncryptStream(password, passwordVerification));
-				} else {
-					codec.encryptStream = new AESEncryptStream(password, encryptionStrength);
-					codec.stream = codec.stream.pipeThrough(codec.encryptStream);
-				}
-			}
-			codec.reader = codec.stream.getReader();
-			await codec.read();
-		};
-		codec.abort = () => codec.aborted = true;
-	}
-
-	async read() {
-		const codec = this;
-		const { value, done } = await codec.reader.read();
-		if (value && value.length) {
-			codec.ondata({ value: { data: value } });
-		}
-		if (done) {
-			let signature;
-			if (codec.encrypted && !codec.zipCrypto) {
-				signature = codec.encryptStream.signature;
-			}
-			if ((!codec.encrypted || codec.zipCrypto) && codec.signed) {
-				signature = await codec.crc32Stream.getReader().read();
-				signature = new DataView(signature.value.buffer).getUint32(0);
-			}
-			codec.ondata({ value: { signature }, done });
-		} else {
-			await codec.read();
-		}
-	}
-
-}
-
-export {
-	Inflate,
-	Deflate,
-	createCodec,
-	CODEC_DEFLATE,
-	CODEC_INFLATE,
-	ERR_INVALID_SIGNATURE,
-	ERR_INVALID_PASSWORD,
-	MESSAGE_EVENT_TYPE,
-	MESSAGE_START,
-	MESSAGE_PULL,
-	MESSAGE_DATA,
-	MESSAGE_ABORT
-};
-
-function createCodec(codecConstructor, options, config) {
-	if (options.codecType.startsWith(CODEC_DEFLATE)) {
-		return new Deflate(codecConstructor, options, config);
-	} else if (options.codecType.startsWith(CODEC_INFLATE)) {
-		return new Inflate(codecConstructor, options, config);
-	}
-}

package/lib/core/engine.js

@@ -1,89 +0,0 @@
-/*
- Copyright (c) 2022 Gildas Lormeau. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright 
- notice, this list of conditions and the following disclaimer in 
- the documentation and/or other materials provided with the distribution.
-
- 3. The names of the authors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
- INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-const MINIMUM_CHUNK_SIZE = 64;
-const ERR_ABORT = "Abort error";
-
-export {
-	ERR_ABORT,
-	processData
-};
-
-async function processData(codec, reader, writer, offset, inputLengthGetter, config, options) {
-	const chunkSize = Math.max(config.chunkSize, MINIMUM_CHUNK_SIZE);
-	const signal = options.signal;
-	let length = 0;
-	let chunkOffset = 0;
-
-	const result = new Promise((resolve, reject) => {
-		codec.pull = async () => {
-			testAborted(signal, codec);
-			const inputLength = inputLengthGetter();
-			let currentChunkOffset = chunkOffset;
-			chunkOffset += chunkSize;
-			const value = await reader.readUint8Array(currentChunkOffset + offset, Math.min(chunkSize, inputLength - currentChunkOffset));
-			const done = chunkOffset > inputLength;
-			return { value, done };
-		};
-		codec.ondata = async ({ value, done }) => {
-			try {
-				testAborted(signal, codec);
-				const inputLength = inputLengthGetter();
-				const { data, signature } = value;
-				if (data && data.length) {
-					length += data.length;
-					await writer.writeUint8Array(data);
-				}
-				if (options.onprogress) {
-					try {
-						options.onprogress(chunkOffset, inputLength);
-					} catch (error) {
-						// ignored
-					}
-				}
-				if (done) {
-					resolve({ signature, length });
-				}
-			} catch (error) {
-				reject(error);
-			}
-		};
-		codec.onerror = (error) => {
-			reject(error);
-		};
-	});
-	await codec.start();
-	return result;
-}
-
-function testAborted(signal, codec) {
-	if (signal && signal.aborted) {
-		codec.abort();
-		throw new Error(ERR_ABORT);
-	}
-}