@zip.js/zip.js 2.7.55 → 2.7.57

package/dist/zip-fs.js

@@ -67,6 +67,9 @@
 	const BITFLAG_DATA_DESCRIPTOR = 0x0008;
 	const BITFLAG_LANG_ENCODING_FLAG = 0x0800;
 	const FILE_ATTR_MSDOS_DIR_MASK = 0x10;
+	const FILE_ATTR_UNIX_DIR_MASK =  0x4000;
+	const FILE_ATTR_UNIX_EXECUTABLE_MASK = 0o111;
+	const FILE_ATTR_UNIX_DEFAULT_MASK = 0o644;
 
 	const VERSION_DEFLATE = 0x14;
 	const VERSION_ZIP64 = 0x2D;
@@ -167,7 +170,8 @@
 		if (typeof navigator != UNDEFINED_TYPE && navigator.hardwareConcurrency) {
 			maxWorkers = navigator.hardwareConcurrency;
 		}
-	} catch (_error) {
+		// eslint-disable-next-line no-unused-vars
+	} catch (_) {
 		// ignored
 	}
 	const DEFAULT_CONFIGURATION = {
@@ -1605,7 +1609,8 @@
 		if (IMPORT_KEY_SUPPORTED) {
 			try {
 				return await subtle.importKey(format, password, algorithm, extractable, keyUsages);
-			} catch (_error) {
+				// eslint-disable-next-line no-unused-vars
+			} catch (_) {
 				IMPORT_KEY_SUPPORTED = false;
 				return misc.importKey(password);
 			}
@@ -1618,7 +1623,8 @@
 		if (DERIVE_BITS_SUPPORTED) {
 			try {
 				return await subtle.deriveBits(algorithm, baseKey, length);
-			} catch (_error) {
+				// eslint-disable-next-line no-unused-vars
+			} catch (_) {
 				DERIVE_BITS_SUPPORTED = false;
 				return misc.pbkdf2(baseKey, algorithm.salt, DERIVED_BITS_ALGORITHM.iterations, length);
 			}
@@ -1936,11 +1942,13 @@
 		try {
 			const CompressionStream = useCompressionStream && CodecStreamNative ? CodecStreamNative : CodecStream;
 			readable = pipeThrough(readable, new CompressionStream(COMPRESSION_FORMAT, options));
-		} catch (_error) {
+			// eslint-disable-next-line no-unused-vars
+		} catch (_) {
 			if (useCompressionStream) {
 				try {
 					readable = pipeThrough(readable, new CodecStream(COMPRESSION_FORMAT, options));
-				} catch (_error) {
+					// eslint-disable-next-line no-unused-vars
+				} catch (_) {
 					return readable;
 				}
 			} else {
@@ -2183,7 +2191,8 @@
 	async function callHandler(handler, ...parameters) {
 		try {
 			await handler(...parameters);
-		} catch (_error) {
+			// eslint-disable-next-line no-unused-vars
+		} catch (_) {
 			// ignored
 		}
 	}
@@ -2200,7 +2209,8 @@
 			let worker;
 			try {
 				worker = getWebWorker(workerData.scripts[0], baseURL, workerData);
-			} catch (_error) {
+				// eslint-disable-next-line no-unused-vars
+			} catch (_) {
 				WEB_WORKERS_SUPPORTED = false;
 				return createWorkerInterface(workerData, config);
 			}
@@ -2303,13 +2313,15 @@
 		}
 		try {
 			scriptUrl = new URL(url, baseURL);
-		} catch (_error) {
+			// eslint-disable-next-line no-unused-vars
+		} catch (_) {
 			scriptUrl = url;
 		}
 		if (classicWorkersSupported) {
 			try {
 				worker = new Worker(scriptUrl);
-			} catch (_error) {
+				// eslint-disable-next-line no-unused-vars
+			} catch (_) {
 				classicWorkersSupported = false;
 				worker = new Worker(scriptUrl, workerOptions);
 			}
@@ -2347,7 +2359,8 @@
 				try {
 					worker.postMessage(message, transferables);
 					return true;
-				} catch (_error) {
+					// eslint-disable-next-line no-unused-vars
+				} catch (_) {
 					transferStreamsSupported = false;
 					message.readable = message.writable = null;
 					worker.postMessage(message);
@@ -2490,7 +2503,8 @@
 					pool = pool.filter(data => data != workerData);
 					try {
 						await workerData.terminate();
-					} catch (_error) {
+						// eslint-disable-next-line no-unused-vars
+					} catch (_) {
 						// ignored
 					}
 				}, terminateWorkerTimeout);
@@ -2831,7 +2845,7 @@
 			combineSizeEocd
 		} = httpReader;
 		if (isHttpFamily(url) && (useRangeHeader || forceRangeRequests) && (typeof preventHeadRequest == "undefined" || preventHeadRequest)) {
-			const response = await sendRequest(HTTP_METHOD_GET, httpReader, getRangeHeaders(httpReader, combineSizeEocd ? -END_OF_CENTRAL_DIR_LENGTH : undefined));
+			const response = await sendRequest(HTTP_METHOD_GET, httpReader, getRangeHeaders(httpReader, combineSizeEocd ? -22 : undefined));
 			if (!forceRangeRequests && response.headers.get(HTTP_HEADER_ACCEPT_RANGES) != HTTP_RANGE_UNIT) {
 				throw new Error(ERR_HTTP_RANGE);
 			} else {
@@ -3354,22 +3368,23 @@
 	const PROPERTY_NAME_CREATION_DATE = "creationDate";
 	const PROPERTY_NAME_RAW_CREATION_DATE = "rawCreationDate";
 	const PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE = "internalFileAttribute";
+	const PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTES = "internalFileAttributes";
 	const PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE = "externalFileAttribute";
+	const PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTES = "externalFileAttributes";
 	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_NAME_DIRECTORY = "directory";
+	const PROPERTY_NAME_EXECUTABLE = "executable";
 
 	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, 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"];
+		PROPERTY_NAME_DISK_NUMBER_START, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTES, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTES, PROPERTY_NAME_MS_DOS_COMPATIBLE, PROPERTY_NAME_ZIP64, PROPERTY_NAME_ENCRYPTED, PROPERTY_NAME_VERSION, PROPERTY_NAME_VERSION_MADE_BY, PROPERTY_NAME_ZIPCRYPTO, PROPERTY_NAME_DIRECTORY, PROPERTY_NAME_EXECUTABLE, "bitFlag", "signature", "filenameUTF8", "commentUTF8", "compressionMethod", "extraField", "rawExtraField", "extraFieldZip64", "extraFieldUnicodePath", "extraFieldUnicodeComment", "extraFieldAES", "extraFieldNTFS", "extraFieldExtendedTimestamp"];
 
 	class Entry {
 
@@ -3560,14 +3575,20 @@
 				const extraFieldOffset = filenameOffset + fileEntry.filenameLength;
 				const commentOffset = extraFieldOffset + fileEntry.extraFieldLength;
 				const versionMadeBy = getUint16(directoryView, offset + 4);
-				const msDosCompatible = (versionMadeBy & 0) == 0;
+				const msDosCompatible = versionMadeBy >> 8 == 0;
+				const unixCompatible = versionMadeBy >> 8 == 3;
 				const rawFilename = directoryArray.subarray(filenameOffset, extraFieldOffset);
 				const commentLength = getUint16(directoryView, offset + 32);
 				const endOffset = commentOffset + commentLength;
 				const rawComment = directoryArray.subarray(commentOffset, endOffset);
 				const filenameUTF8 = languageEncodingFlag;
 				const commentUTF8 = languageEncodingFlag;
-				const directory = msDosCompatible && ((getUint8(directoryView, offset + 38) & FILE_ATTR_MSDOS_DIR_MASK) == FILE_ATTR_MSDOS_DIR_MASK);
+				const externalFileAttributes = getUint32(directoryView, offset + 38);
+				const directory =
+					(msDosCompatible && ((getUint8(directoryView, offset + 38) & FILE_ATTR_MSDOS_DIR_MASK) == FILE_ATTR_MSDOS_DIR_MASK)) ||
+					(unixCompatible && (((externalFileAttributes >> 16) & FILE_ATTR_UNIX_DIR_MASK) == FILE_ATTR_UNIX_DIR_MASK)) ||
+					(rawFilename.length && rawFilename[rawFilename.length - 1] == DIRECTORY_SIGNATURE.charCodeAt(0));
+				const executable = (unixCompatible && (((externalFileAttributes >> 16) & FILE_ATTR_UNIX_EXECUTABLE_MASK) == FILE_ATTR_UNIX_EXECUTABLE_MASK));
 				const offsetFileEntry = getUint32(directoryView, offset + 42) + prependedDataLength;
 				Object.assign(fileEntry, {
 					versionMadeBy,
@@ -3578,13 +3599,16 @@
 					directory,
 					offset: offsetFileEntry,
 					diskNumberStart: getUint16(directoryView, offset + 34),
-					internalFileAttribute: getUint16(directoryView, offset + 36),
-					externalFileAttribute: getUint32(directoryView, offset + 38),
+					internalFileAttributes: getUint16(directoryView, offset + 36),
+					externalFileAttributes,
 					rawFilename,
 					filenameUTF8,
 					commentUTF8,
-					rawExtraField: directoryArray.subarray(extraFieldOffset, commentOffset)
+					rawExtraField: directoryArray.subarray(extraFieldOffset, commentOffset),
+					executable
 				});
+				fileEntry.internalFileAttribute = fileEntry.internalFileAttributes;
+				fileEntry.externalFileAttribute = fileEntry.externalFileAttributes;
 				const decode = getOptionValue$1(zipReader, options, "decodeText") || decodeText;
 				const rawFilenameEncoding = filenameUTF8 ? CHARSET_UTF8 : filenameEncoding || CHARSET_CP437;
 				const rawCommentEncoding = commentUTF8 ? CHARSET_UTF8 : commentEncoding || CHARSET_CP437;
@@ -3612,7 +3636,8 @@
 				if (onprogress) {
 					try {
 						await onprogress(indexFile + 1, filesLength, new Entry(fileEntry));
-					} catch (_error) {
+						// eslint-disable-next-line no-unused-vars
+					} catch (_) {
 						// ignored
 					}
 				}
@@ -3824,7 +3849,8 @@
 				});
 				offsetExtraField += 4 + size;
 			}
-		} catch (_error) {
+			// eslint-disable-next-line no-unused-vars
+		} catch (_) {
 			// ignored
 		}
 		const compressionMethod = getUint16(dataView, offset + 4);
@@ -3931,7 +3957,8 @@
 				}
 				offsetExtraField += 4 + attributeSize;
 			}
-		} catch (_error) {
+			// eslint-disable-next-line no-unused-vars
+		} catch (_) {
 			// ignored
 		}
 		try {
@@ -3952,7 +3979,8 @@
 				Object.assign(extraFieldNTFS, extraFieldData);
 				Object.assign(directory, extraFieldData);
 			}
-		} catch (_error) {
+			// eslint-disable-next-line no-unused-vars
+		} catch (_) {
 			// ignored
 		}
 	}
@@ -4021,7 +4049,8 @@
 		const date = (timeRaw & 0xffff0000) >> 16, time = timeRaw & 0x0000ffff;
 		try {
 			return new Date(1980 + ((date & 0xFE00) >> 9), ((date & 0x01E0) >> 5) - 1, date & 0x001F, (time & 0xF800) >> 11, (time & 0x07E0) >> 5, (time & 0x001F) * 2, 0);
-		} catch (_error) {
+			// eslint-disable-next-line no-unused-vars
+		} catch (_) {
 			// ignored
 		}
 	}
@@ -4200,10 +4229,37 @@
 
 	async function addFile(zipWriter, name, reader, options) {
 		name = name.trim();
-		if (options.directory && (!name.endsWith(DIRECTORY_SIGNATURE))) {
-			name += DIRECTORY_SIGNATURE;
-		} else {
-			options.directory = name.endsWith(DIRECTORY_SIGNATURE);
+		const msDosCompatible = getOptionValue(zipWriter, options, PROPERTY_NAME_MS_DOS_COMPATIBLE);
+		const versionMadeBy = getOptionValue(zipWriter, options, PROPERTY_NAME_VERSION_MADE_BY, msDosCompatible ? 20 : 768);
+		const executable = getOptionValue(zipWriter, options, PROPERTY_NAME_EXECUTABLE);
+		if (versionMadeBy > MAX_16_BITS) {
+			throw new Error(ERR_INVALID_VERSION);
+		}
+		let externalFileAttributes = getOptionValue(zipWriter, options, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTES, 0);
+		if (externalFileAttributes === 0) {
+			externalFileAttributes = getOptionValue(zipWriter, options, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE, 0);
+		}
+		if (!options.directory && name.endsWith(DIRECTORY_SIGNATURE)) {
+			options.directory = true;
+		}
+		const directory = getOptionValue(zipWriter, options, PROPERTY_NAME_DIRECTORY);
+		if (directory) {
+			if (!name.endsWith(DIRECTORY_SIGNATURE)) {
+				name += DIRECTORY_SIGNATURE;
+			}
+			if (externalFileAttributes === 0) {
+				if (msDosCompatible) {
+					externalFileAttributes = FILE_ATTR_MSDOS_DIR_MASK;
+				} else {
+					externalFileAttributes = FILE_ATTR_UNIX_DIR_MASK << 16;
+				}
+			}
+		} else if (!msDosCompatible && externalFileAttributes === 0) {
+			if (executable) {
+				externalFileAttributes = (FILE_ATTR_UNIX_EXECUTABLE_MASK | FILE_ATTR_UNIX_DEFAULT_MASK) << 16;
+			} else {
+				externalFileAttributes = FILE_ATTR_UNIX_DEFAULT_MASK << 16;
+			}
 		}
 		const encode = getOptionValue(zipWriter, options, "encodeText", encodeText);
 		let rawFilename = encode(name);
@@ -4225,16 +4281,13 @@
 		if (version > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_VERSION);
 		}
-		const versionMadeBy = getOptionValue(zipWriter, options, PROPERTY_NAME_VERSION_MADE_BY, 20);
-		if (versionMadeBy > MAX_16_BITS) {
-			throw new Error(ERR_INVALID_VERSION);
-		}
 		const lastModDate = getOptionValue(zipWriter, options, PROPERTY_NAME_LAST_MODIFICATION_DATE, new Date());
 		const lastAccessDate = getOptionValue(zipWriter, options, PROPERTY_NAME_LAST_ACCESS_DATE);
 		const creationDate = getOptionValue(zipWriter, options, PROPERTY_NAME_CREATION_DATE);
-		const msDosCompatible = getOptionValue(zipWriter, options, PROPERTY_NAME_MS_DOS_COMPATIBLE, true);
-		const internalFileAttribute = getOptionValue(zipWriter, options, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE, 0);
-		const externalFileAttribute = getOptionValue(zipWriter, options, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE, 0);
+		let internalFileAttributes = getOptionValue(zipWriter, options, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTES, 0);
+		if (internalFileAttributes === 0) {
+			internalFileAttributes = getOptionValue(zipWriter, options, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE, 0);
+		}
 		const passThrough = getOptionValue(zipWriter, options, "passThrough");
 		let password, rawPassword;
 		if (!passThrough) {
@@ -4350,8 +4403,10 @@
 			dataDescriptorSignature,
 			signal,
 			msDosCompatible,
-			internalFileAttribute,
-			externalFileAttribute,
+			internalFileAttribute: internalFileAttributes,
+			internalFileAttributes,
+			externalFileAttribute: externalFileAttributes,
+			externalFileAttributes,
 			useCompressionStream,
 			passThrough,
 			encrypted: Boolean((password && getLength(password)) || (rawPassword && getLength(rawPassword))) || (passThrough && encrypted),
@@ -4472,7 +4527,8 @@
 				if (error) {
 					try {
 						error.corruptedEntry = true;
-					} catch (_error) {
+						// eslint-disable-next-line no-unused-vars
+					} catch (_) {
 						// ignored
 					}
 				}
@@ -4554,6 +4610,7 @@
 			zipCrypto,
 			dataDescriptor,
 			directory,
+			executable,
 			versionMadeBy,
 			rawComment,
 			rawExtraField,
@@ -4565,8 +4622,8 @@
 			encryptionStrength,
 			extendedTimestamp,
 			msDosCompatible,
-			internalFileAttribute,
-			externalFileAttribute,
+			internalFileAttributes,
+			externalFileAttributes,
 			useCompressionStream,
 			passThrough
 		} = options;
@@ -4575,6 +4632,7 @@
 			versionMadeBy,
 			zip64,
 			directory: Boolean(directory),
+			executable: Boolean(executable),
 			filenameUTF8: true,
 			rawFilename,
 			commentUTF8: true,
@@ -4585,8 +4643,8 @@
 			rawExtraField,
 			extendedTimestamp,
 			msDosCompatible,
-			internalFileAttribute,
-			externalFileAttribute,
+			internalFileAttributes,
+			externalFileAttributes,
 			diskNumberStart
 		};
 		let {
@@ -4746,7 +4804,8 @@
 				setBigUint64(extraFieldNTFSView, 12, lastModTimeNTFS);
 				setBigUint64(extraFieldNTFSView, 20, getTimeNTFS(lastAccessDate) || lastModTimeNTFS);
 				setBigUint64(extraFieldNTFSView, 28, getTimeNTFS(creationDate) || lastModTimeNTFS);
-			} catch (_error) {
+				// eslint-disable-next-line no-unused-vars
+			} catch (_) {
 				rawExtraFieldNTFS = new Uint8Array();
 			}
 		} else {
@@ -5034,15 +5093,13 @@
 				rawComment,
 				versionMadeBy,
 				headerArray,
-				directory,
 				zip64,
 				zip64UncompressedSize,
 				zip64CompressedSize,
 				zip64DiskNumberStart,
 				zip64Offset,
-				msDosCompatible,
-				internalFileAttribute,
-				externalFileAttribute,
+				internalFileAttributes,
+				externalFileAttributes,
 				diskNumberStart,
 				uncompressedSize,
 				compressedSize
@@ -5061,11 +5118,9 @@
 			setUint16(directoryView, offset + 30, extraFieldLength);
 			setUint16(directoryView, offset + 32, getLength(rawComment));
 			setUint16(directoryView, offset + 34, zip64 && zip64DiskNumberStart ? MAX_16_BITS : diskNumberStart);
-			setUint16(directoryView, offset + 36, internalFileAttribute);
-			if (externalFileAttribute) {
-				setUint32(directoryView, offset + 38, externalFileAttribute);
-			} else if (directory && msDosCompatible) {
-				setUint8(directoryView, offset + 38, FILE_ATTR_MSDOS_DIR_MASK);
+			setUint16(directoryView, offset + 36, internalFileAttributes);
+			if (externalFileAttributes) {
+				setUint32(directoryView, offset + 38, externalFileAttributes);
 			}
 			setUint32(directoryView, offset + 42, zip64 && zip64Offset ? MAX_32_BITS : fileEntryOffset);
 			arraySet(directoryArray, rawFilename, offset + 46);
@@ -5085,7 +5140,8 @@
 			if (options.onprogress) {
 				try {
 					await options.onprogress(indexFileEntry + 1, files.size, new Entry(fileEntry));
-				} catch (_error) {
+					// eslint-disable-next-line no-unused-vars
+				} catch (_) {
 					// ignored
 				}
 			}
@@ -5608,7 +5664,8 @@
 						error.cause = {
 							entry
 						};
-					} catch (_error) {
+						// eslint-disable-next-line no-unused-vars
+					} catch (_) {
 						// ignored
 					}
 					throw error;
@@ -5865,7 +5922,8 @@
 							error.cause = {
 								entry: child
 							};
-						} catch (_error) {
+							// eslint-disable-next-line no-unused-vars
+						} catch (_) {
 							// ignored
 						}
 						throw error;
@@ -5911,7 +5969,7 @@
 				let zipEntryOptions = {};
 				if (child.data instanceof Entry) {
 					const {
-						externalFileAttribute,
+						externalFileAttributes,
 						versionMadeBy,
 						comment,
 						lastModDate,
@@ -5925,7 +5983,7 @@
 						extraFieldAES
 					} = child.data;
 					zipEntryOptions = {
-						externalFileAttribute,
+						externalFileAttributes,
 						versionMadeBy,
 						comment,
 						lastModDate,
@@ -5960,7 +6018,8 @@
 							entryOffsets.set(name, indexProgress);
 							try {
 								await options.onprogress(Array.from(entryOffsets.values()).reduce((previousValue, currentValue) => previousValue + currentValue), totalSize);
-							} catch (_error) {
+								// eslint-disable-next-line no-unused-vars
+							} catch (_) {
 								// ignored
 							}
 						}
@@ -6105,7 +6164,8 @@
 	let baseURL;
 	try {
 		baseURL = (typeof document === 'undefined' && typeof location === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : typeof document === 'undefined' ? location.href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('zip-fs.js', document.baseURI).href));
-	} catch (_error) {
+		// eslint-disable-next-line no-unused-vars
+	} catch (_) {
 		// ignored
 	}
 	configure({ baseURL });