@zip.js/zip.js 2.5.24 → 2.6.0

package/lib/core/io.js

@@ -26,11 +26,10 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global Blob, atob, btoa, XMLHttpRequest, URL, fetch, ReadableStream, WritableStream */
+/* global Blob, atob, btoa, XMLHttpRequest, URL, fetch, ReadableStream, WritableStream, FileReader */
 
 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";
@@ -138,7 +137,16 @@ class TextWriter extends Writer {
 
 	getData() {
 		const writer = this;
-		return writer.blob.text();
+		if (writer.blob.text && (writer.encoding === undefined || (writer.encoding && writer.encoding.toLowerCase() == "utf-8"))) {
+			return writer.blob.text();
+		} else {
+			const reader = new FileReader();
+			return new Promise((resolve, reject) => {
+				reader.onload = event => resolve(event.target.result);
+				reader.onerror = () => reject(reader.error);
+				reader.readAsText(writer.blob, writer.encoding);
+			});
+		}
 	}
 }
 
@@ -258,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) {
@@ -550,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

@@ -217,7 +217,7 @@ class ZipReader {
 		const extractPrependedData = getOptionValue(zipReader, options, "extractPrependedData");
 		const extractAppendedData = getOptionValue(zipReader, options, "extractAppendedData");
 		if (extractPrependedData) {
-			zipReader.prependedData = await readUint8Array(reader, 0, startOffset);
+			zipReader.prependedData = startOffset > 0 ? await readUint8Array(reader, 0, startOffset) : new Uint8Array();
 		}
 		zipReader.comment = commentLength ? await readUint8Array(reader, commentOffset + END_OF_CENTRAL_DIR_LENGTH, commentLength) : new Uint8Array();
 		if (extractAppendedData) {

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.24",
+    "version": "2.6.0",
     "type": "module",
     "keywords": [
         "zip",
@@ -38,7 +38,7 @@
     "devDependencies": {
         "@rollup/plugin-node-resolve": "^13.3.0",
         "@rollup/plugin-replace": "^4.0.0",
-        "rollup": "^2.76.0",
+        "rollup": "^2.77.0",
         "rollup-plugin-terser": "^7.0.2"
     }
 }

package/rollup-fflate.config.dev.js

@@ -1,3 +1,5 @@
+// You must install fflate (e.g. npm i fflate) before running this script
+
 import { nodeResolve } from "@rollup/plugin-node-resolve";
 import replace from "@rollup/plugin-replace";
 import fs from "fs";
@@ -109,7 +111,7 @@ export default [{
 	}],
 	plugins: [nodeResolve()]
 }, {
-	input: "lib/z-worker.js",
+	input: "lib/z-worker-fflate.js",
 	output: [{
 		intro: GLOBALS_WORKER,
 		file: "dist/z-worker.js",

package/rollup-fflate.config.js

@@ -1,3 +1,5 @@
+// You must install fflate (e.g. npm i fflate) before running this script
+
 import { nodeResolve } from "@rollup/plugin-node-resolve";
 import replace from "@rollup/plugin-replace";
 import { terser } from "rollup-plugin-terser";
@@ -146,7 +148,7 @@ export default [{
 	}],
 	plugins: [nodeResolve()]
 }, {
-	input: "lib/z-worker.js",
+	input: "lib/z-worker-fflate.js",
 	output: [{
 		intro: GLOBALS_WORKER,
 		file: "dist/z-worker.js",

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 {