@zip.js/zip.js 2.7.50 → 2.7.52

package/lib/core/zip-entry.js

@@ -44,16 +44,19 @@ const PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE = "internalFileAttribute";
 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 {
 
@@ -82,5 +85,9 @@ export {
 	PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE,
 	PROPERTY_NAME_MS_DOS_COMPATIBLE,
 	PROPERTY_NAME_ZIP64,
+	PROPERTY_NAME_ENCRYPTED,
+	PROPERTY_NAME_VERSION,
+	PROPERTY_NAME_VERSION_MADE_BY,
+	PROPERTY_NAME_ZIPCRYPTO,
 	Entry
 };

package/lib/core/zip-fs-core.js

@@ -739,12 +739,9 @@ async function exportZip(zipWriter, entry, totalSize, options) {
 					encrypted,
 					zipCrypto,
 					signature,
-					compressionMethod
+					compressionMethod,
+					extraFieldAES
 				} = child.data;
-				let level;
-				if (compressionMethod === 0) {
-					level = 0;
-				}
 				zipEntryOptions = {
 					externalFileAttribute,
 					versionMadeBy,
@@ -754,13 +751,22 @@ async function exportZip(zipWriter, entry, totalSize, options) {
 					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
 					});
 				}
 			}

package/lib/core/zip-reader.js

@@ -407,6 +407,7 @@ class ZipEntry {
 		const dataView = getDataView(dataArray);
 		let password = getOptionValue(zipEntry, options, "password");
 		let rawPassword = getOptionValue(zipEntry, options, "rawPassword");
+		const passThrough = getOptionValue(zipEntry, options, "passThrough");
 		password = password && password.length && password;
 		rawPassword = rawPassword && rawPassword.length && rawPassword;
 		if (extraFieldAES) {
@@ -414,7 +415,7 @@ class ZipEntry {
 				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) {
@@ -429,7 +430,6 @@ class ZipEntry {
 			lastAccessDate: localDirectory.lastAccessDate,
 			creationDate: localDirectory.creationDate
 		});
-		const passThrough = getOptionValue(zipEntry, options, "passThrough");
 		const encrypted = zipEntry.encrypted && localDirectory.encrypted && !passThrough;
 		const zipCrypto = encrypted && !extraFieldAES;
 		if (!passThrough) {
@@ -456,7 +456,7 @@ class ZipEntry {
 			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 = {

package/lib/core/zip-writer.js

@@ -86,6 +86,10 @@ import {
 	PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE,
 	PROPERTY_NAME_MS_DOS_COMPATIBLE,
 	PROPERTY_NAME_ZIP64,
+	PROPERTY_NAME_ENCRYPTED,
+	PROPERTY_NAME_VERSION,
+	PROPERTY_NAME_VERSION_MADE_BY,
+	PROPERTY_NAME_ZIPCRYPTO,
 	Entry
 } from "./zip-entry.js";
 
@@ -242,11 +246,11 @@ async function addFile(zipWriter, name, reader, options) {
 	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);
 	}
@@ -263,7 +267,7 @@ async function addFile(zipWriter, name, reader, options) {
 		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");
@@ -273,9 +277,10 @@ async function addFile(zipWriter, name, reader, options) {
 	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();
@@ -340,7 +345,7 @@ async function addFile(zipWriter, name, reader, options) {
 		}
 	}
 	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,
@@ -375,7 +380,8 @@ async function addFile(zipWriter, name, reader, options) {
 		useCompressionStream,
 		passThrough,
 		encrypted: Boolean((password && getLength(password)) || (rawPassword && getLength(rawPassword))) || (passThrough && encrypted),
-		signature
+		signature,
+		compressionMethod
 	});
 	const headerInfo = getHeaderInfo(options);
 	const dataDescriptorInfo = getDataDescriptorInfo(options);
@@ -723,7 +729,7 @@ function getHeaderInfo(options) {
 		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);
@@ -778,9 +784,10 @@ function getHeaderInfo(options) {
 	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;
 		}
@@ -798,10 +805,8 @@ function getHeaderInfo(options) {
 		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);
@@ -1116,7 +1121,7 @@ async function closeFile(zipWriter, comment, options) {
 	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);

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.7.50",
+    "version": "2.7.52",
     "type": "module",
     "keywords": [
         "zip",