@zip.js/zip.js 2.8.18 → 2.8.20

package/index.cjs

@@ -99,6 +99,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";
@@ -2152,23 +2153,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 };
 }
 
@@ -3166,8 +3152,8 @@ class GenericWriter {
 			Object.assign(writer, {
 				diskNumber: 0,
 				diskOffset: 0,
-				availableSize: Infinity,
-				maxSize: Infinity
+				availableSize: INFINITY_VALUE,
+				maxSize: INFINITY_VALUE
 			});
 		}
 		return writer;
@@ -3457,6 +3443,7 @@ const OPTION_EXTENDED_TIMESTAMP = "extendedTimestamp";
 const OPTION_KEEP_ORDER = "keepOrder";
 const OPTION_LEVEL = "level";
 const OPTION_BUFFERED_WRITE = "bufferedWrite";
+const OPTION_CREATE_TEMP_STREAM = "createTempStream";
 const OPTION_DATA_DESCRIPTOR_SIGNATURE = "dataDescriptorSignature";
 const OPTION_USE_UNICODE_FILE_NAMES = "useUnicodeFileNames";
 const OPTION_DATA_DESCRIPTOR = "dataDescriptor";
@@ -4402,8 +4389,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,
@@ -4721,7 +4708,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);
@@ -4827,10 +4816,12 @@ async function addFile(zipWriter, name, reader, options) {
 		rawPassword,
 		level,
 		useWebWorkers,
+		transferStreams,
 		encryptionStrength,
 		extendedTimestamp,
 		zipCrypto,
 		bufferedWrite,
+		createTempStream,
 		keepOrder,
 		useUnicodeFileNames,
 		dataDescriptor,
@@ -4907,7 +4898,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++;
@@ -5072,6 +5067,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		rawComment,
 		rawExtraField,
 		useWebWorkers,
+		transferStreams,
 		onstart,
 		onprogress,
 		onend,
@@ -5152,7 +5148,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/index.d.ts

@@ -293,6 +293,12 @@ export interface WorkerConfiguration {
    * @defaultValue true
    */
   useCompressionStream?: boolean;
+  /**
+   * `true` to transfer stream ownership to web workers.
+   *
+   * @defaultValue true
+   */
+  transferStreams?: boolean;
 }
 
 /**
@@ -885,12 +891,6 @@ export interface ZipReaderOptions {
    * @defaultValue false
    */
   preventClose?: boolean;
-  /**
-   * `true` to transfer streams to web workers when decompressing data.
-   *
-   * @defaultValue true
-   */
-  transferStreams?: boolean;
 }
 
 /**