@zip.js/zip.js 2.7.50 → 2.7.52

package/dist/zip-fs.js

@@ -3347,16 +3347,19 @@
 	const PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE = "externalFileAttribute";
 	const PROPERTY_NAME_MS_DOS_COMPATIBLE = "msDosCompatible";
 	const PROPERTY_NAME_ZIP64 = "zip64";
+	const PROPERTY_NAME_ENCRYPTED = "encrypted";
+	const PROPERTY_NAME_VERSION = "version";
+	const PROPERTY_NAME_VERSION_MADE_BY = "versionMadeBy";
+	const PROPERTY_NAME_ZIPCRYPTO = "zipCrypto";
 
 	const PROPERTY_NAMES = [
 		PROPERTY_NAME_FILENAME, PROPERTY_NAME_RAW_FILENAME, PROPERTY_NAME_COMPPRESSED_SIZE, PROPERTY_NAME_UNCOMPPRESSED_SIZE,
 		PROPERTY_NAME_LAST_MODIFICATION_DATE, PROPERTY_NAME_RAW_LAST_MODIFICATION_DATE, PROPERTY_NAME_COMMENT, PROPERTY_NAME_RAW_COMMENT,
 		PROPERTY_NAME_LAST_ACCESS_DATE, PROPERTY_NAME_CREATION_DATE, PROPERTY_NAME_OFFSET, PROPERTY_NAME_DISK_NUMBER_START,
 		PROPERTY_NAME_DISK_NUMBER_START, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE,
-		PROPERTY_NAME_MS_DOS_COMPATIBLE, PROPERTY_NAME_ZIP64,
-		"directory", "bitFlag", "encrypted", "signature", "filenameUTF8", "commentUTF8", "compressionMethod", "version", "versionMadeBy",
-		"extraField", "rawExtraField", "extraFieldZip64", "extraFieldUnicodePath", "extraFieldUnicodeComment", "extraFieldAES", "extraFieldNTFS",
-		"extraFieldExtendedTimestamp", "zipCrypto"];
+		PROPERTY_NAME_MS_DOS_COMPATIBLE, PROPERTY_NAME_ZIP64, PROPERTY_NAME_ENCRYPTED, PROPERTY_NAME_VERSION, PROPERTY_NAME_VERSION_MADE_BY,
+		PROPERTY_NAME_ZIPCRYPTO, "directory", "bitFlag", "signature", "filenameUTF8", "commentUTF8", "compressionMethod", "extraField", "rawExtraField",
+		"extraFieldZip64", "extraFieldUnicodePath", "extraFieldUnicodeComment", "extraFieldAES", "extraFieldNTFS", "extraFieldExtendedTimestamp"];
 
 	class Entry {
 
@@ -3687,6 +3690,7 @@
 			const dataView = getDataView$1(dataArray);
 			let password = getOptionValue$1(zipEntry, options, "password");
 			let rawPassword = getOptionValue$1(zipEntry, options, "rawPassword");
+			const passThrough = getOptionValue$1(zipEntry, options, "passThrough");
 			password = password && password.length && password;
 			rawPassword = rawPassword && rawPassword.length && rawPassword;
 			if (extraFieldAES) {
@@ -3694,7 +3698,7 @@
 					throw new Error(ERR_UNSUPPORTED_COMPRESSION);
 				}
 			}
-			if (compressionMethod != COMPRESSION_METHOD_STORE && compressionMethod != COMPRESSION_METHOD_DEFLATE) {
+			if ((compressionMethod != COMPRESSION_METHOD_STORE && compressionMethod != COMPRESSION_METHOD_DEFLATE) && !passThrough) {
 				throw new Error(ERR_UNSUPPORTED_COMPRESSION);
 			}
 			if (getUint32(dataView, 0) != LOCAL_FILE_HEADER_SIGNATURE) {
@@ -3709,7 +3713,6 @@
 				lastAccessDate: localDirectory.lastAccessDate,
 				creationDate: localDirectory.creationDate
 			});
-			const passThrough = getOptionValue$1(zipEntry, options, "passThrough");
 			const encrypted = zipEntry.encrypted && localDirectory.encrypted && !passThrough;
 			const zipCrypto = encrypted && !extraFieldAES;
 			if (!passThrough) {
@@ -3736,7 +3739,7 @@
 				writer = new WritableStream();
 			}
 			writer = initWriter(writer);
-			await initStream(writer, uncompressedSize);
+			await initStream(writer, passThrough ? compressedSize : uncompressedSize);
 			const { writable } = writer;
 			const { onstart, onprogress, onend } = options;
 			const workerOptions = {
@@ -4208,11 +4211,11 @@
 		if (getLength(rawComment) > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_ENTRY_COMMENT);
 		}
-		const version = getOptionValue(zipWriter, options, "version", VERSION_DEFLATE);
+		const version = getOptionValue(zipWriter, options, PROPERTY_NAME_VERSION, VERSION_DEFLATE);
 		if (version > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_VERSION);
 		}
-		const versionMadeBy = getOptionValue(zipWriter, options, "versionMadeBy", 20);
+		const versionMadeBy = getOptionValue(zipWriter, options, PROPERTY_NAME_VERSION_MADE_BY, 20);
 		if (versionMadeBy > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_VERSION);
 		}
@@ -4229,7 +4232,7 @@
 			rawPassword = getOptionValue(zipWriter, options, "rawPassword");
 		}
 		const encryptionStrength = getOptionValue(zipWriter, options, "encryptionStrength", 3);
-		const zipCrypto = getOptionValue(zipWriter, options, "zipCrypto");
+		const zipCrypto = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIPCRYPTO);
 		const extendedTimestamp = getOptionValue(zipWriter, options, "extendedTimestamp", true);
 		const keepOrder = getOptionValue(zipWriter, options, "keepOrder", true);
 		const level = getOptionValue(zipWriter, options, "level");
@@ -4239,9 +4242,10 @@
 		const signal = getOptionValue(zipWriter, options, "signal");
 		const useUnicodeFileNames = getOptionValue(zipWriter, options, "useUnicodeFileNames", true);
 		const useCompressionStream = getOptionValue(zipWriter, options, "useCompressionStream");
+		const compressionMethod = getOptionValue(zipWriter, options, "compressionMethod");
 		let dataDescriptor = getOptionValue(zipWriter, options, "dataDescriptor", true);
 		let zip64 = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIP64);
-		if ((password !== UNDEFINED_VALUE || rawPassword !== UNDEFINED_VALUE) && encryptionStrength !== UNDEFINED_VALUE && (encryptionStrength < 1 || encryptionStrength > 3)) {
+		if (!zipCrypto && (password !== UNDEFINED_VALUE || rawPassword !== UNDEFINED_VALUE) && !(encryptionStrength >= 1 && encryptionStrength <= 3)) {
 			throw new Error(ERR_INVALID_ENCRYPTION_STRENGTH);
 		}
 		let rawExtraField = new Uint8Array();
@@ -4306,7 +4310,7 @@
 			}
 		}
 		zip64 = zip64 || false;
-		const encrypted = getOptionValue(zipWriter, options, "encrypted");
+		const encrypted = getOptionValue(zipWriter, options, PROPERTY_NAME_ENCRYPTED);
 		const { signature } = options;
 		options = Object.assign({}, options, {
 			rawFilename,
@@ -4341,7 +4345,8 @@
 			useCompressionStream,
 			passThrough,
 			encrypted: Boolean((password && getLength(password)) || (rawPassword && getLength(rawPassword))) || (passThrough && encrypted),
-			signature
+			signature,
+			compressionMethod
 		});
 		const headerInfo = getHeaderInfo(options);
 		const dataDescriptorInfo = getDataDescriptorInfo(options);
@@ -4689,7 +4694,7 @@
 			encrypted
 		} = options;
 		const compressed = level !== 0 && !directory;
-		let version = options.version;
+		let { version, compressionMethod } = options;
 		let rawExtraFieldAES;
 		if (encrypted && !zipCrypto) {
 			rawExtraFieldAES = new Uint8Array(getLength(EXTRAFIELD_DATA_AES) + 2);
@@ -4744,9 +4749,10 @@
 		if (dataDescriptor) {
 			bitFlag = bitFlag | BITFLAG_DATA_DESCRIPTOR;
 		}
-		let compressionMethod = COMPRESSION_METHOD_STORE;
+		if (compressionMethod === UNDEFINED_VALUE) {
+			compressionMethod = compressed ? COMPRESSION_METHOD_DEFLATE : COMPRESSION_METHOD_STORE;
+		}
 		if (compressed) {
-			compressionMethod = COMPRESSION_METHOD_DEFLATE;
 			if (level >= 1 && level < 3) {
 				bitFlag = bitFlag | 0b110;
 			}
@@ -4764,10 +4770,8 @@
 			bitFlag = bitFlag | BITFLAG_ENCRYPTED;
 			if (!zipCrypto) {
 				version = version > VERSION_AES ? version : VERSION_AES;
+				rawExtraFieldAES[9] = compressionMethod;
 				compressionMethod = COMPRESSION_METHOD_AES;
-				if (compressed) {
-					rawExtraFieldAES[9] = COMPRESSION_METHOD_DEFLATE;
-				}
 			}
 		}
 		const headerArray = new Uint8Array(26);
@@ -5082,7 +5086,7 @@
 		if (availableSize < END_OF_CENTRAL_DIR_LENGTH) {
 			lastDiskNumber++;
 		}
-		let zip64 = getOptionValue(zipWriter, options, "zip64");
+		let zip64 = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIP64);
 		if (directoryOffset > MAX_32_BITS || directoryDataLength > MAX_32_BITS || filesLength > MAX_16_BITS || lastDiskNumber > MAX_16_BITS) {
 			if (zip64 === false) {
 				throw new Error(ERR_UNSUPPORTED_FORMAT);
@@ -5907,12 +5911,9 @@
 						encrypted,
 						zipCrypto,
 						signature,
-						compressionMethod
+						compressionMethod,
+						extraFieldAES
 					} = child.data;
-					let level;
-					if (compressionMethod === 0) {
-						level = 0;
-					}
 					zipEntryOptions = {
 						externalFileAttribute,
 						versionMadeBy,
@@ -5922,13 +5923,22 @@
 						lastAccessDate
 					};
 					if (child.passThrough) {
+						let level, encryptionStrength;
+						if (compressionMethod === 0) {
+							level = 0;
+						}
+						if (extraFieldAES) {
+							encryptionStrength = extraFieldAES.strength;
+						}
 						zipEntryOptions = Object.assign(zipEntryOptions, {
 							passThrough: true,
 							encrypted,
 							zipCrypto,
 							signature,
 							uncompressedSize,
-							level
+							level,
+							encryptionStrength,
+							compressionMethod
 						});
 					}
 				}