@zip.js/zip.js 2.6.40 → 2.6.42

package/dist/zip-full.js

@@ -7342,14 +7342,34 @@
 	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	 */
 
+	const PROPERTY_NAME_FILENAME = "filename";
+	const PROPERTY_NAME_RAW_FILENAME = "rawFilename";
+	const PROPERTY_NAME_COMMENT = "comment";
+	const PROPERTY_NAME_RAW_COMMENT = "rawComment";
+	const PROPERTY_NAME_UNCOMPPRESSED_SIZE = "uncompressedSize";
+	const PROPERTY_NAME_COMPPRESSED_SIZE = "compressedSize";
+	const PROPERTY_NAME_OFFSET = "offset";
+	const PROPERTY_NAME_DISK_NUMBER_START = "diskNumberStart";
+	const PROPERTY_NAME_LAST_MODIFICATION_DATE = "lastModDate";
+	const PROPERTY_NAME_RAW_LAST_MODIFICATION_DATE = "rawLastModDate";
+	const PROPERTY_NAME_LAST_ACCESS_DATE = "lastAccessDate";
+	const PROPERTY_NAME_RAW_LAST_ACCESS_DATE = "rawLastAccessDate";
+	const PROPERTY_NAME_CREATION_DATE = "creationDate";
+	const PROPERTY_NAME_RAW_CREATION_DATE = "rawCreationDate";
+	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_NAMES = [
-		"filename", "rawFilename", "directory", "encrypted", "compressedSize", "uncompressedSize",
-		"lastModDate", "rawLastModDate", "comment", "rawComment", "signature", "extraField",
-		"rawExtraField", "bitFlag", "extraFieldZip64", "extraFieldUnicodePath", "extraFieldUnicodeComment",
-		"extraFieldAES", "filenameUTF8", "commentUTF8", "offset", "zip64", "compressionMethod",
-		"extraFieldNTFS", "lastAccessDate", "creationDate", "extraFieldExtendedTimestamp",
-		"version", "versionMadeBy", "msDosCompatible", "internalFileAttribute", "externalFileAttribute",
-		"diskNumberStart"];
+		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"];
 
 	class Entry {
 
@@ -7401,10 +7421,10 @@
 	const CHARSET_UTF8 = "utf-8";
 	const CHARSET_CP437 = "cp437";
 	const ZIP64_PROPERTIES = [
-		["uncompressedSize", MAX_32_BITS],
-		["compressedSize", MAX_32_BITS],
-		["offset", MAX_32_BITS],
-		["diskNumberStart", MAX_16_BITS]
+		[PROPERTY_NAME_UNCOMPPRESSED_SIZE, MAX_32_BITS],
+		[PROPERTY_NAME_COMPPRESSED_SIZE, MAX_32_BITS],
+		[PROPERTY_NAME_OFFSET, MAX_32_BITS],
+		[PROPERTY_NAME_DISK_NUMBER_START, MAX_16_BITS]
 	];
 	const ZIP64_EXTRACTION = {
 		[MAX_16_BITS]: {
@@ -7764,12 +7784,12 @@
 		}
 		const extraFieldUnicodePath = extraField.get(EXTRAFIELD_TYPE_UNICODE_PATH);
 		if (extraFieldUnicodePath) {
-			await readExtraFieldUnicode(extraFieldUnicodePath, "filename", "rawFilename", directory, fileEntry);
+			await readExtraFieldUnicode(extraFieldUnicodePath, PROPERTY_NAME_FILENAME, PROPERTY_NAME_RAW_FILENAME, directory, fileEntry);
 			directory.extraFieldUnicodePath = extraFieldUnicodePath;
 		}
 		const extraFieldUnicodeComment = extraField.get(EXTRAFIELD_TYPE_UNICODE_COMMENT);
 		if (extraFieldUnicodeComment) {
-			await readExtraFieldUnicode(extraFieldUnicodeComment, "comment", "rawComment", directory, fileEntry);
+			await readExtraFieldUnicode(extraFieldUnicodeComment, PROPERTY_NAME_COMMENT, PROPERTY_NAME_RAW_COMMENT, directory, fileEntry);
 			directory.extraFieldUnicodeComment = extraFieldUnicodeComment;
 		}
 		const extraFieldAES = extraField.get(EXTRAFIELD_TYPE_AES);
@@ -7883,16 +7903,16 @@
 		const timeProperties = [];
 		const timeRawProperties = [];
 		if ((flags & 0x1) == 0x1) {
-			timeProperties.push("lastModDate");
-			timeRawProperties.push("rawLastModDate");
+			timeProperties.push(PROPERTY_NAME_LAST_MODIFICATION_DATE);
+			timeRawProperties.push(PROPERTY_NAME_RAW_LAST_MODIFICATION_DATE);
 		}
 		if ((flags & 0x2) == 0x2) {
-			timeProperties.push("lastAccessDate");
-			timeRawProperties.push("rawLastAccessDate");
+			timeProperties.push(PROPERTY_NAME_LAST_ACCESS_DATE);
+			timeRawProperties.push(PROPERTY_NAME_RAW_LAST_ACCESS_DATE);
 		}
 		if ((flags & 0x4) == 0x4) {
-			timeProperties.push("creationDate");
-			timeRawProperties.push("rawCreationDate");
+			timeProperties.push(PROPERTY_NAME_CREATION_DATE);
+			timeRawProperties.push(PROPERTY_NAME_RAW_CREATION_DATE);
 		}
 		let offset = 1;
 		timeProperties.forEach((propertyName, indexProperty) => {
@@ -8119,9 +8139,9 @@
 		if (versionMadeBy > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_VERSION);
 		}
-		const lastModDate = getOptionValue(zipWriter, options, "lastModDate") || new Date();
-		const lastAccessDate = getOptionValue(zipWriter, options, "lastAccessDate");
-		const creationDate = getOptionValue(zipWriter, options, "creationDate");
+		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 password = getOptionValue(zipWriter, options, "password");
 		const encryptionStrength = getOptionValue(zipWriter, options, "encryptionStrength") || 3;
 		const zipCrypto = getOptionValue(zipWriter, options, "zipCrypto");
@@ -8159,13 +8179,13 @@
 			keepOrder = true;
 		}
 		let uncompressedSize = 0;
-		let msDosCompatible = getOptionValue(zipWriter, options, "msDosCompatible");
+		let msDosCompatible = getOptionValue(zipWriter, options, PROPERTY_NAME_MS_DOS_COMPATIBLE);
 		if (msDosCompatible === UNDEFINED_VALUE) {
 			msDosCompatible = true;
 		}
-		const internalFileAttribute = getOptionValue(zipWriter, options, "internalFileAttribute") || 0;
-		const externalFileAttribute = getOptionValue(zipWriter, options, "externalFileAttribute") || 0;
-		let zip64 = getOptionValue(zipWriter, options, "zip64");
+		const internalFileAttribute = getOptionValue(zipWriter, options, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE) || 0;
+		const externalFileAttribute = getOptionValue(zipWriter, options, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE) || 0;
+		let zip64 = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIP64);
 		if (reader) {
 			if (reader instanceof ReadableStream) {
 				reader = {
@@ -8184,7 +8204,8 @@
 				maximumCompressedSize = getMaximumCompressedSize(uncompressedSize);
 			}
 		}
-		if (zipWriter.offset + zipWriter.pendingEntriesSize >= MAX_32_BITS ||
+		const { diskOffset } = zipWriter.writer;
+		if (zipWriter.offset + zipWriter.pendingEntriesSize - diskOffset >= MAX_32_BITS ||
 			uncompressedSize >= MAX_32_BITS ||
 			maximumCompressedSize >= MAX_32_BITS) {
 			if (zip64 === false || !keepOrder) {
@@ -8240,8 +8261,9 @@
 		let fileEntry;
 		try {
 			fileEntry = await getFileEntry(zipWriter, name, reader, { headerInfo, dataDescriptorInfo }, options);
+			zipWriter.pendingEntriesSize -= maximumEntrySize;
 		} catch (error) {
-			if (!error.corruptedEntry && maximumEntrySize) {
+			if (!error.corruptedEntry) {
 				zipWriter.pendingEntriesSize -= maximumEntrySize;
 			}
 			throw error;
@@ -8291,7 +8313,7 @@
 			if (zipWriter.addSplitZipSignature) {
 				delete zipWriter.addSplitZipSignature;
 				const signatureArray = new Uint8Array(4);
-				const signatureArrayView = new DataView(signatureArray.buffer);
+				const signatureArrayView = getDataView(signatureArray);
 				setUint32(signatureArrayView, 0, SPLIT_ZIP_FILE_SIGNATURE);
 				await writeData(writable, signatureArray);
 				zipWriter.offset += 4;
@@ -8429,9 +8451,9 @@
 			externalFileAttribute,
 			diskNumberStart
 		};
+		let compressedSize = 0;
 		let uncompressedSize = 0;
 		let signature;
-		let compressedSize = 0;
 		const { writable } = writer;
 		if (reader) {
 			reader.chunkSize = getChunkSize(config);
@@ -8826,7 +8848,7 @@
 		const endOfdirectoryView = getDataView(endOfdirectoryArray);
 		let lastDiskNumber = writer.diskNumber;
 		const { availableSize } = writer;
-		if (availableSize < endOfdirectoryArray.length) {
+		if (availableSize < getLength(endOfdirectoryArray)) {
 			lastDiskNumber++;
 		}
 		offset = 0;