@zip.js/zip.js 2.5.26 → 2.6.2

package/lib/core/codec-pool.js

@@ -32,8 +32,7 @@ import {
 	CODEC_INFLATE,
 	CODEC_DEFLATE,
 	ERR_INVALID_SIGNATURE,
-	ERR_INVALID_PASSWORD,
-	ERR_ABORT
+	ERR_INVALID_PASSWORD
 } from "./codec-interface.js";
 import { CodecWorker } from "./codec-pool-worker.js";
 
@@ -46,14 +45,13 @@ export {
 	CODEC_DEFLATE,
 	CODEC_INFLATE,
 	ERR_INVALID_SIGNATURE,
-	ERR_INVALID_PASSWORD,
-	ERR_ABORT
+	ERR_INVALID_PASSWORD
 };
 
 let indexWorker = 0;
 
 async function runWorker(stream, workerOptions) {
-	const { options, config, streamOptions } = workerOptions;
+	const { options, config } = workerOptions;
 	const streamCopy = !options.compressed && !options.signed && !options.encrypted;
 	const { useWebWorkers, useCompressionStream, codecType } = options;
 	const { workerScripts } = config;
@@ -75,16 +73,7 @@ async function runWorker(stream, workerOptions) {
 			worker = await new Promise(resolve => pendingRequests.push({ resolve, stream, workerOptions }));
 		}
 	}
-	try {
-		return await worker.run();
-	} catch (error) {
-		const { signal } = streamOptions;
-		if (signal && signal.aborted && (signal.reason == error || error.name == ERR_ABORT)) {
-			throw new Error(ERR_ABORT);
-		} else {
-			throw error;
-		}
-	}
+	return worker.run();
 
 	function onTaskFinished(workerData) {
 		if (pendingRequests.length) {

package/lib/core/io.js

@@ -30,7 +30,6 @@
 
 const ERR_HTTP_STATUS = "HTTP error ";
 const ERR_HTTP_RANGE = "HTTP Range not supported";
-const ERR_NOT_SEEKABLE_READER = "Reader is not seekable";
 
 const CONTENT_TYPE_TEXT_PLAIN = "text/plain";
 const HTTP_HEADER_CONTENT_LENGTH = "Content-Length";
@@ -267,32 +266,6 @@ function flushArrayBuffers(blobWriter) {
 	blobWriter.arrayBuffers = [];
 }
 
-class ReadableStreamReader extends Stream {
-
-	constructor(readable) {
-		super();
-		if (!readable) {
-			this.readable = new ReadableStream({});
-		}
-	}
-}
-
-class WritableStreamWriter extends Writer {
-
-	constructor(writable, { preventClose } = {}) {
-		super();
-		this.preventClose = preventClose;
-		if (!writable) {
-			writable = new WritableStream({});
-		}
-		Object.defineProperty(this, "writable", {
-			get() {
-				return writable;
-			}
-		});
-	}
-}
-
 class FetchReader extends Reader {
 
 	constructor(url, options) {
@@ -559,8 +532,5 @@ export {
 	Uint8ArrayWriter,
 	HttpReader,
 	HttpRangeReader,
-	ReadableStreamReader,
-	WritableStreamWriter,
-	ERR_HTTP_RANGE,
-	ERR_NOT_SEEKABLE_READER
+	ERR_HTTP_RANGE
 };

package/lib/core/zip-fs-core.js

@@ -418,7 +418,6 @@ class FS {
 }
 
 const fs = { FS, ZipDirectoryEntry, ZipFileEntry };
-export { ERR_ABORT } from "./codec-pool.js";
 export { fs };
 
 function getTotalSize(entries, propertyName) {

package/lib/core/zip-reader.js

@@ -26,7 +26,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global BigInt */
+/* global BigInt, Response */
 
 import {
 	MAX_32_BITS,
@@ -66,6 +66,7 @@ import {
 	ERR_INVALID_SIGNATURE,
 	ERR_INVALID_PASSWORD
 } from "./codec-pool.js";
+import { BlobReader } from "./io.js";
 import decodeText from "./util/decode-text.js";
 import Crc32 from "./streams/codecs/crc32.js";
 import Entry from "./zip-entry.js";
@@ -96,14 +97,19 @@ class ZipReader {
 
 	async* getEntriesGenerator(options = {}) {
 		const zipReader = this;
-		const { reader, config } = zipReader;
-		if (!reader.initialized) {
+		let { reader } = zipReader;
+		const { config } = zipReader;
+		if (!reader.initialized && reader.init) {
 			await reader.init();
 		}
-		reader.chunkSize = getChunkSize(config);
+		if (reader.size === undefined || !reader.readUint8Array) {
+			const blob = await new Response(reader.readable).blob();
+			reader = new BlobReader(blob);
+		}
 		if (reader.size < END_OF_CENTRAL_DIR_LENGTH) {
 			throw new Error(ERR_BAD_FORMAT);
 		}
+		reader.chunkSize = getChunkSize(config);
 		const endOfDirectoryInfo = await seekSignature(reader, END_OF_CENTRAL_DIR_SIGNATURE, reader.size, END_OF_CENTRAL_DIR_LENGTH, MAX_16_BITS * 16);
 		if (!endOfDirectoryInfo) {
 			throw new Error(ERR_EOCDR_NOT_FOUND);

package/lib/zip-fs.js

@@ -30,10 +30,7 @@ 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,
-	ERR_ABORT
-} from "./core/codec-pool.js";
+import { terminateWorkers } from "./core/codec-pool.js";
 
 let baseURL;
 try {
@@ -52,6 +49,5 @@ export {
 	configure,
 	getMimeType,
 	initShimAsyncCodec,
-	terminateWorkers,
-	ERR_ABORT
+	terminateWorkers
 };

package/lib/zip-full-fflate.js

@@ -31,10 +31,7 @@ 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,
-	ERR_ABORT
-} from "./core/codec-pool.js";
+import { terminateWorkers } from "./core/codec-pool.js";
 
 let baseURL;
 try {
@@ -52,6 +49,5 @@ export {
 	configure,
 	getMimeType,
 	initShimAsyncCodec,
-	terminateWorkers,
-	ERR_ABORT
+	terminateWorkers
 };

package/lib/zip-full.js

@@ -32,10 +32,7 @@ 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,
-	ERR_ABORT
-} from "./core/codec-pool.js";
+import { terminateWorkers } from "./core/codec-pool.js";
 
 let baseURL;
 try {
@@ -53,6 +50,5 @@ export {
 	configure,
 	getMimeType,
 	initShimAsyncCodec,
-	terminateWorkers,
-	ERR_ABORT
+	terminateWorkers
 };

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

@@ -29,10 +29,7 @@
 import Deflate from "./core/streams/codecs/deflate.js";
 import { configure } from "./core/configuration.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
-import {
-	terminateWorkers,
-	ERR_ABORT
-} from "./core/codec-pool.js";
+import { terminateWorkers } from "./core/codec-pool.js";
 
 configure({ Deflate });
 
@@ -41,6 +38,5 @@ export * from "./core/zip-writer.js";
 export {
 	configure,
 	getMimeType,
-	terminateWorkers,
-	ERR_ABORT
+	terminateWorkers
 };

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

@@ -29,10 +29,7 @@
 import { Deflate } from "./zip-fflate-shim.js";
 import { configure } from "./core/configuration.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
-import {
-	terminateWorkers,
-	ERR_ABORT
-} from "./core/codec-pool.js";
+import { terminateWorkers } from "./core/codec-pool.js";
 
 configure({ Deflate });
 
@@ -41,6 +38,5 @@ export * from "./core/zip-writer.js";
 export {
 	configure,
 	getMimeType,
-	terminateWorkers,
-	ERR_ABORT
+	terminateWorkers
 };

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

@@ -29,10 +29,7 @@
 import { Inflate } from "./zip-fflate-shim.js";
 import { configure } from "./core/configuration.js";
 import { getMimeType } from "./core/util/default-mime-type.js";
-import {
-	terminateWorkers,
-	ERR_ABORT
-} from "./core/codec-pool.js";
+import { terminateWorkers } from "./core/codec-pool.js";
 
 configure({ Inflate });
 
@@ -41,6 +38,5 @@ export * from "./core/zip-reader.js";
 export {
 	configure,
 	getMimeType,
-	terminateWorkers,
-	ERR_ABORT
+	terminateWorkers
 };

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

@@ -29,10 +29,7 @@
 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,
-	ERR_ABORT
-} from "./core/codec-pool.js";
+import { terminateWorkers } from "./core/codec-pool.js";
 
 configure({ Deflate, Inflate });
 
@@ -42,6 +39,5 @@ export * from "./core/zip-writer.js";
 export {
 	configure,
 	getMimeType,
-	terminateWorkers,
-	ERR_ABORT
+	terminateWorkers
 };

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

@@ -29,10 +29,7 @@
 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,
-	ERR_ABORT
-} from "./core/codec-pool.js";
+import { terminateWorkers } from "./core/codec-pool.js";
 
 configure({ Inflate });
 
@@ -41,6 +38,5 @@ export * from "./core/zip-reader.js";
 export {
 	configure,
 	getMimeType,
-	terminateWorkers,
-	ERR_ABORT
+	terminateWorkers
 };

package/lib/zip-no-worker.js

@@ -30,10 +30,7 @@ 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,
-	ERR_ABORT
-} from "./core/codec-pool.js";
+import { terminateWorkers } from "./core/codec-pool.js";
 
 configure({ Deflate, Inflate });
 
@@ -43,6 +40,5 @@ export * from "./core/zip-writer.js";
 export {
 	configure,
 	getMimeType,
-	terminateWorkers,
-	ERR_ABORT
+	terminateWorkers
 };

package/lib/zip.js

@@ -30,10 +30,7 @@ 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,
-	ERR_ABORT
-} from "./core/codec-pool.js";
+import { terminateWorkers } from "./core/codec-pool.js";
 
 let baseURL;
 try {
@@ -51,6 +48,5 @@ export {
 	configure,
 	getMimeType,
 	initShimAsyncCodec,
-	terminateWorkers,
-	ERR_ABORT
+	terminateWorkers
 };

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

package/tests/all/test-abort-signal-read.js

@@ -25,7 +25,7 @@ async function test() {
 		});
 		await zipReader.close();
 	} catch (error) {
-		if (error.message == zip.ERR_ABORT) {
+		if (signal.reason == error) {
 			zip.terminateWorkers();
 			return true;
 		} else {

package/tests/all/test-abort-signal-write.js

@@ -21,7 +21,7 @@ async function test() {
 		});
 		await zipWriter.close();
 	} catch (error) {
-		if (error.message == zip.ERR_ABORT) {
+		if (signal.reason == error) {
 			zip.terminateWorkers();
 			return true;
 		} else {

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

@@ -0,0 +1,19 @@
+/* global fetch, URL */
+
+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";
+
+export { test };
+
+async function test() {
+	zip.configure({ chunkSize: 128, useWebWorkers: true });
+	const readable = (await fetch(new URL("../data/lorem.zip", import.meta.url))).body;
+	const zipReader = new zip.ZipReader({ readable });
+	const entries = await zipReader.getEntries();
+	const data = await entries[0].getData(new zip.BlobWriter(zip.getMimeType(entries[0].filename)));
+	await zipReader.close();
+	zip.terminateWorkers();
+	return TEXT_CONTENT == (await data.text()) && entries[0].uncompressedSize == TEXT_CONTENT.length && entries[0].filename == FILENAME;
+}

package/tests/tests-data.js

@@ -33,6 +33,7 @@ export default ([
 	{ 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: "Safe closing", script: "./test-safe-closing.js" },
 	{ title: "Service worker", script: "./test-sw.js", env: "browser" },
 	{ title: "Store", script: "./test-store.js" },