@zip.js/zip.js 2.8.59 → 2.8.61

package/dist/zip-core.js

@@ -2082,6 +2082,10 @@
 		return registeredCodecs.get(compressionMethod);
 	}
 
+	function getRegisteredCodecs() {
+		return Array.from(registeredCodecs.values(), codec => Object.assign({}, codec, codecStreams.get(codec.format)));
+	}
+
 	function getCodecStreams(format) {
 		return codecStreams.get(format);
 	}
@@ -2145,7 +2149,7 @@
 
 		constructor(options, { chunkSize, CompressionStreamFallback, CompressionStream }) {
 			super({});
-			const { compressed, encrypted, useCompressionStream, zipCrypto, computeCrc32, level, deflate64, format, compressionMethod } = options;
+			const { compressed, encrypted, useCompressionStream, zipCrypto, computeCrc32, level, deflate64, format, compressionMethod, inputSize } = options;
 			const stream = this;
 			let crc32Stream, encryptionStream, gzipCrc32Stream;
 			let readable = super.readable;
@@ -2158,7 +2162,7 @@
 			}
 			if (compressed) {
 				if (codecStreams) {
-					readable = pipeThroughBackpressured(readable, createCodecStream(codecStreams.CompressionStream, format, { level, chunkSize, compressionMethod }));
+					readable = pipeThroughBackpressured(readable, createCodecStream(codecStreams.CompressionStream, format, { level, chunkSize, compressionMethod, uncompressedSize: inputSize }));
 				} else if (useGzipCrc32) {
 					gzipCrc32Stream = new GzipToRawDeflateStream();
 					readable = pipeThroughBackpressured(readable, new CompressionStream(FORMAT_GZIP));
@@ -6650,6 +6654,13 @@
 		const { comment } = metadataInfo;
 		const extraField = options[PROPERTY_NAME_EXTRA_FIELD];
 		zipWriter.fileEntries.set(name, UNDEFINED_VALUE);
+		const previousFileEntry = zipWriter.lastFileEntry;
+		const pendingFileEntry = {};
+		let releaseLockFileEntry;
+		if (metadataInfo.resolvedOptions.keepOrder) {
+			pendingFileEntry.lockFileEntry = new Promise(resolve => releaseLockFileEntry = resolve);
+		}
+		zipWriter.lastFileEntry = pendingFileEntry;
 		let fileEntry;
 		try {
 			const { resolvedOptions } = metadataInfo;
@@ -6671,10 +6682,21 @@
 			const headerInfo = getHeaderInfo(options);
 			const dataDescriptorInfo = getDataDescriptorInfo(options);
 			const metadataSize = getLength(headerInfo.localHeaderArray, dataDescriptorInfo.dataDescriptorArray);
-			fileEntry = await getFileEntry(zipWriter, name, reader, { headerInfo, dataDescriptorInfo, metadataSize }, options);
+			fileEntry = await getFileEntry(zipWriter, name, reader, {
+				headerInfo,
+				dataDescriptorInfo,
+				metadataSize,
+				fileEntry: pendingFileEntry,
+				previousFileEntry,
+				releaseLockFileEntry
+			}, options);
 		} catch (error) {
 			zipWriter.fileEntries.delete(name);
 			throw error;
+		} finally {
+			if (releaseLockFileEntry) {
+				releaseLockFileEntry(previousFileEntry && previousFileEntry.lockFileEntry);
+			}
 		}
 		Object.assign(fileEntry, {
 			name,
@@ -7060,27 +7082,23 @@
 			signal
 		} = options;
 		const {
-			headerInfo
+			headerInfo,
+			fileEntry: pendingFileEntry,
+			previousFileEntry,
+			releaseLockFileEntry
 		} = entryInfo;
 		const usdz = zipWriter.options[OPTION_USDZ];
-		const previousFileEntry = zipWriter.lastFileEntry;
-		let fileEntry = {};
+		let fileEntry = pendingFileEntry;
 		let bufferedWrite;
 		let releaseLockWriter;
-		let releaseLockCurrentFileEntry;
 		let writingBufferedEntryData;
 		let writingEntryData;
 		let writerSizeBeforeEntry;
 		let flushedBufferedSize = 0;
 		let fileWriter;
+		const lockPreviousFileEntry = keepOrder && previousFileEntry ? previousFileEntry.lockFileEntry : UNDEFINED_VALUE;
 		fileEntries.set(name, fileEntry);
-		zipWriter.lastFileEntry = fileEntry;
 		try {
-			let lockPreviousFileEntry;
-			if (keepOrder) {
-				lockPreviousFileEntry = previousFileEntry && previousFileEntry.lockFileEntry;
-				requestLockCurrentFileEntry();
-			}
 			if (options.bufferedWrite || !keepOrder || zipWriter.writerLocked || zipWriter.bufferedWrites || (!dataDescriptor && !emptyEntry)) {
 				bufferedWrite = true;
 				zipWriter.bufferedWrites++;
@@ -7093,6 +7111,7 @@
 				await initStream(writer);
 			} else {
 				fileWriter = writer;
+				await lockPreviousFileEntry;
 				await requestLockWriter();
 			}
 			await initStream(fileWriter);
@@ -7105,7 +7124,6 @@
 			}
 			const { localHeaderArray } = headerInfo;
 			if (!bufferedWrite) {
-				await lockPreviousFileEntry;
 				await skipDiskIfNeeded();
 			}
 			const diskNumberStart = getDiskNumber(writer);
@@ -7170,8 +7188,8 @@
 			if (bufferedWrite) {
 				zipWriter.bufferedWrites--;
 			}
-			if (releaseLockCurrentFileEntry) {
-				releaseLockCurrentFileEntry();
+			if (releaseLockFileEntry) {
+				releaseLockFileEntry(lockPreviousFileEntry);
 			}
 			if (releaseLockWriter) {
 				releaseLockWriter();
@@ -7185,10 +7203,6 @@
 			}
 		}
 
-		function requestLockCurrentFileEntry() {
-			fileEntry.lockFileEntry = new Promise(resolve => releaseLockCurrentFileEntry = resolve);
-		}
-
 		async function requestLockWriter() {
 			zipWriter.writerLocked = true;
 			const { lockWriter } = zipWriter;
@@ -7323,6 +7337,7 @@
 			const workerOptions = {
 				options: {
 					codecType: CODEC_DEFLATE,
+					inputSize: size,
 					level,
 					rawPassword,
 					password,
@@ -8433,6 +8448,111 @@
 	 */
 
 
+	function getSupportedCompressionMethods() {
+		const { CompressionStream, DecompressionStream, CompressionStreamFallback, DecompressionStreamFallback } = getConfiguration();
+		const supportedMethods = [{
+			compressionMethod: COMPRESSION_METHOD_STORE,
+			compression: true,
+			decompression: true,
+			registered: false
+		}, {
+			compressionMethod: COMPRESSION_METHOD_DEFLATE,
+			compression: formatSupported(CompressionStreamFallback, FORMAT_DEFLATE_RAW) ||
+				formatSupported(CompressionStream, FORMAT_DEFLATE_RAW) || formatSupported(CompressionStream, FORMAT_GZIP),
+			decompression: formatSupported(DecompressionStreamFallback, FORMAT_DEFLATE_RAW) ||
+				formatSupported(DecompressionStream, FORMAT_DEFLATE_RAW) || formatSupported(DecompressionStream, FORMAT_GZIP),
+			registered: false
+		}, {
+			compressionMethod: COMPRESSION_METHOD_DEFLATE_64,
+			compression: false,
+			decompression: formatSupported(DecompressionStreamFallback, FORMAT_DEFLATE64_RAW) ||
+				formatSupported(DecompressionStream, FORMAT_DEFLATE64_RAW),
+			registered: false
+		}];
+		for (const codec of getRegisteredCodecs()) {
+			const codecStreams = getCodecStreams(codec.format);
+			supportedMethods.push({
+				compressionMethod: codec.compressionMethod,
+				// deno-lint-ignore valid-typeof
+				compression: codecStreams ? typeof codecStreams.CompressionStream == FUNCTION_TYPE : UNDEFINED_VALUE,
+				// deno-lint-ignore valid-typeof
+				decompression: codecStreams ? typeof codecStreams.DecompressionStream == FUNCTION_TYPE : UNDEFINED_VALUE,
+				registered: true
+			});
+		}
+		return supportedMethods;
+	}
+
+	function formatSupported(StreamClass, format) {
+		if (!StreamClass) {
+			return false;
+		}
+		const { supportedFormats } = StreamClass;
+		if (supportedFormats) {
+			return supportedFormats.includes(format);
+		}
+		return supportsFormat(StreamClass, format);
+	}
+
+	/*
+	 Copyright (c) 2025 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 VERSION = "2.8.61";
+
+	/*
+	 Copyright (c) 2025 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 DEFAULT_THRESHOLD$2 = 1024 * 1024;
 	const DEFAULT_DIRECTORY_NAME$1 = ".zip.js-temp";
 
@@ -8933,6 +9053,7 @@
 	exports.TextWriter = TextWriter;
 	exports.Uint8ArrayReader = Uint8ArrayReader;
 	exports.Uint8ArrayWriter = Uint8ArrayWriter;
+	exports.VERSION = VERSION;
 	exports.WARNING_APPENDED_DATA = WARNING_APPENDED_DATA;
 	exports.WARNING_COMPRESSED_PATCHED_DATA = WARNING_COMPRESSED_PATCHED_DATA;
 	exports.WARNING_DUPLICATE_FILENAME = WARNING_DUPLICATE_FILENAME;
@@ -8957,6 +9078,8 @@
 	exports.createOPFSTempStream = createOPFSTempStream;
 	exports.createSyncAccessHandleTempStream = createSyncAccessHandleTempStream;
 	exports.getMimeType = getMimeType;
+	exports.getRegisteredCodecs = getRegisteredCodecs;
+	exports.getSupportedCompressionMethods = getSupportedCompressionMethods;
 	exports.isZipFile = isZipFile;
 	exports.registerCodec = registerCodec;
 	exports.resetConfiguration = resetConfiguration;