@zip.js/zip.js 2.8.18 → 2.8.20

package/lib/core/codec-worker.js

@@ -243,23 +243,8 @@ async function runWebWorker(workerData, config) {
 }
 
 function watchClosedStream(writableSource) {
-	let resolveStreamClosed;
-	const closed = new Promise(resolve => resolveStreamClosed = resolve);
-	const writable = new WritableStream({
-		async write(chunk) {
-			const writer = writableSource.getWriter();
-			await writer.ready;
-			await writer.write(chunk);
-			writer.releaseLock();
-		},
-		close() {
-			resolveStreamClosed();
-		},
-		abort(reason) {
-			const writer = writableSource.getWriter();
-			return writer.abort(reason);
-		}
-	});
+	const { writable, readable } = new TransformStream();
+	const closed = readable.pipeTo(writableSource, { preventClose: true });
 	return { writable, closed };
 }
 

package/lib/core/constants.js

@@ -96,6 +96,7 @@ const MAX_DATE = new Date(2107, 11, 31);
 const MIN_DATE = new Date(1980, 0, 1);
 
 const UNDEFINED_VALUE = undefined;
+const INFINITY_VALUE = Infinity;
 const UNDEFINED_TYPE = "undefined";
 const FUNCTION_TYPE = "function";
 const OBJECT_TYPE = "object";
@@ -162,6 +163,7 @@ export {
 	MIN_DATE,
 	MAX_DATE,
 	UNDEFINED_VALUE,
+	INFINITY_VALUE,
 	UNDEFINED_TYPE,
 	FUNCTION_TYPE,
 	OBJECT_TYPE

package/lib/core/io.js

@@ -31,6 +31,7 @@
 
 import {
 	UNDEFINED_VALUE,
+	INFINITY_VALUE,
 	FUNCTION_TYPE,
 	END_OF_CENTRAL_DIR_LENGTH
 } from "./constants.js";
@@ -745,8 +746,8 @@ class GenericWriter {
 			Object.assign(writer, {
 				diskNumber: 0,
 				diskOffset: 0,
-				availableSize: Infinity,
-				maxSize: Infinity
+				availableSize: INFINITY_VALUE,
+				maxSize: INFINITY_VALUE
 			});
 		}
 		return writer;

package/lib/core/zip-writer.js

@@ -87,6 +87,7 @@ import {
 	MIN_DATE,
 	MAX_DATE,
 	UNDEFINED_VALUE,
+	INFINITY_VALUE,
 	OBJECT_TYPE
 } from "./constants.js";
 import {
@@ -139,12 +140,14 @@ import {
 	OPTION_SIGNAL,
 	OPTION_USE_WEB_WORKERS,
 	OPTION_USE_COMPRESSION_STREAM,
+	OPTION_TRANSFER_STREAMS,
 	OPTION_PREVENT_CLOSE,
 	OPTION_ENCRYPTION_STRENGTH,
 	OPTION_EXTENDED_TIMESTAMP,
 	OPTION_KEEP_ORDER,
 	OPTION_LEVEL,
 	OPTION_BUFFERED_WRITE,
+	OPTION_CREATE_TEMP_STREAM,
 	OPTION_DATA_DESCRIPTOR_SIGNATURE,
 	OPTION_USE_UNICODE_FILE_NAMES,
 	OPTION_DATA_DESCRIPTOR,
@@ -188,8 +191,8 @@ class ZipWriter {
 	constructor(writer, options = {}) {
 		writer = new GenericWriter(writer);
 		const addSplitZipSignature =
-			writer.availableSize !== UNDEFINED_VALUE && writer.availableSize > 0 && writer.availableSize !== Infinity &&
-			writer.maxSize !== UNDEFINED_VALUE && writer.maxSize > 0 && writer.maxSize !== Infinity;
+			writer.availableSize !== UNDEFINED_VALUE && writer.availableSize > 0 && writer.availableSize !== INFINITY_VALUE &&
+			writer.maxSize !== UNDEFINED_VALUE && writer.maxSize > 0 && writer.maxSize !== INFINITY_VALUE;
 		Object.assign(this, {
 			writer,
 			addSplitZipSignature,
@@ -523,7 +526,9 @@ async function addFile(zipWriter, name, reader, options) {
 	const extendedTimestamp = getOptionValue(zipWriter, options, OPTION_EXTENDED_TIMESTAMP, true);
 	const keepOrder = getOptionValue(zipWriter, options, OPTION_KEEP_ORDER, true);
 	const useWebWorkers = getOptionValue(zipWriter, options, OPTION_USE_WEB_WORKERS);
+	const transferStreams = getOptionValue(zipWriter, options, OPTION_TRANSFER_STREAMS, true);
 	const bufferedWrite = getOptionValue(zipWriter, options, OPTION_BUFFERED_WRITE);
+	const createTempStream = getOptionValue(zipWriter, options, OPTION_CREATE_TEMP_STREAM);
 	const dataDescriptorSignature = getOptionValue(zipWriter, options, OPTION_DATA_DESCRIPTOR_SIGNATURE, false);
 	const signal = getOptionValue(zipWriter, options, OPTION_SIGNAL);
 	const useUnicodeFileNames = getOptionValue(zipWriter, options, OPTION_USE_UNICODE_FILE_NAMES, true);
@@ -629,10 +634,12 @@ async function addFile(zipWriter, name, reader, options) {
 		rawPassword,
 		level,
 		useWebWorkers,
+		transferStreams,
 		encryptionStrength,
 		extendedTimestamp,
 		zipCrypto,
 		bufferedWrite,
+		createTempStream,
 		keepOrder,
 		useUnicodeFileNames,
 		dataDescriptor,
@@ -709,7 +716,11 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			requestLockCurrentFileEntry();
 		}
 		if ((options.bufferedWrite || zipWriter.writerLocked || (zipWriter.bufferedWrites && keepOrder) || !dataDescriptor) && !usdz) {
-			fileWriter = new TransformStream(undefined, undefined, { highWaterMark: Infinity });
+			if (options.createTempStream) {
+				fileWriter = await options.createTempStream();
+			} else {
+				fileWriter = new TransformStream(UNDEFINED_VALUE, UNDEFINED_VALUE, { highWaterMark: INFINITY_VALUE });
+			}
 			fileWriter.size = 0;
 			bufferedWrite = true;
 			zipWriter.bufferedWrites++;
@@ -874,6 +885,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		rawComment,
 		rawExtraField,
 		useWebWorkers,
+		transferStreams,
 		onstart,
 		onprogress,
 		onend,
@@ -954,7 +966,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 				encrypted: encrypted && !passThrough,
 				useWebWorkers,
 				useCompressionStream,
-				transferStreams: false
+				transferStreams
 			},
 			config,
 			streamOptions: { signal, size, onstart, onprogress, onend }

package/package.json

@@ -3,7 +3,7 @@
   "description": "A JavaScript library to zip and unzip files in the browser, Deno and Node.js",
   "author": "Gildas Lormeau",
   "license": "BSD-3-Clause",
-  "version": "2.8.18",
+  "version": "2.8.20",
   "type": "module",
   "keywords": [
     "zip",
@@ -161,8 +161,5 @@
     "rollup": "^4.57.1",
     "typedoc": "^0.28.16",
     "typedoc-plugin-markdown": "^4.10.0"
-  },
-  "dependencies": {
-    "web-worker": "^1.5.0"
   }
 }