@zip.js/zip.js 2.6.40 → 2.6.42

package/index.cjs

@@ -8339,14 +8339,34 @@ function decodeText(value, encoding) {
  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 {
 
@@ -8398,10 +8418,10 @@ const ERR_SPLIT_ZIP_FILE = "Split zip file";
 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]: {
@@ -8761,12 +8781,12 @@ async function readCommonFooter(fileEntry, directory, dataView, offset) {
 	}
 	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);
@@ -8880,16 +8900,16 @@ function readExtraFieldExtendedTimestamp(extraFieldExtendedTimestamp, directory)
 	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) => {
@@ -9116,9 +9136,9 @@ async function addFile(zipWriter, name, reader, options) {
 	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");
@@ -9156,13 +9176,13 @@ async function addFile(zipWriter, name, reader, options) {
 		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 = {
@@ -9181,7 +9201,8 @@ async function addFile(zipWriter, name, reader, options) {
 			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) {
@@ -9237,8 +9258,9 @@ async function addFile(zipWriter, name, reader, options) {
 	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;
@@ -9288,7 +9310,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		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;
@@ -9426,9 +9448,9 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		externalFileAttribute,
 		diskNumberStart
 	};
+	let compressedSize = 0;
 	let uncompressedSize = 0;
 	let signature;
-	let compressedSize = 0;
 	const { writable } = writer;
 	if (reader) {
 		reader.chunkSize = getChunkSize(config);
@@ -9823,7 +9845,7 @@ async function closeFile(zipWriter, comment, options) {
 	const endOfdirectoryView = getDataView(endOfdirectoryArray);
 	let lastDiskNumber = writer.diskNumber;
 	const { availableSize } = writer;
-	if (availableSize < endOfdirectoryArray.length) {
+	if (availableSize < getLength(endOfdirectoryArray)) {
 		lastDiskNumber++;
 	}
 	offset = 0;
@@ -10577,7 +10599,7 @@ try {
 configure({ baseURL });
 e(configure);
 
-/// <reference types="./index.d.ts" />
+/// <reference types="./index" />
 
 configure({ Deflate: ZipDeflate, Inflate: ZipInflate });
 

package/index.d.ts

@@ -944,11 +944,15 @@ interface ZipWriterConstructorOptions {
     /**
      * `true` to use Zip64 to store the entry.
      * 
+     * `zip64` is automatically set to `true` when necessary (e.g. compressed data larger than 4GB or with unknown size).
+     * 
      * @defaultValue false
      */
     zip64?: boolean
     /**
-     * The level of compression.
+     * The level of compression. 
+     * 
+     * The minimum value is 0 and means that no compression is applied. The maximum value is 9.
      * 
      * @defaultValue 5
      */
@@ -956,19 +960,20 @@ interface ZipWriterConstructorOptions {
     /**
      * `true` to write entry data in a buffer before appending it to the zip file.
      * 
+     * `bufferedWrite` is automatically set to `true` when compressing more than one entry in parallel.
+     * 
      * @defaultValue false
      */
     bufferedWrite?: boolean
     /**
-     * `true` to keep the order of the entry physically in the zip file.
+     * `true` to keep the order of the entry physically in the zip file. 
+     * 
+     * When set to `true`, the use of web workers will be improved. However, it also prevents files larger than 4GB from being created without setting the `zip54` option to `true` explicitly.
+     * Another solution to improve the use of web workers is to add entries from smallest to largest in uncompressed size.
      * 
      * @defaultValue true
      */
     keepOrder?: boolean
-    /**
-     * The "Version" field.
-     */
-    version?: number
     /**
      * The password used to encrypt the content of the entry.
      */
@@ -979,24 +984,6 @@ interface ZipWriterConstructorOptions {
      * @defaultValue 3
      */
     encryptionStrength?: 1 | 2 | 3
-    /**
-     * `true` to use the ZipCrypto algorithm to encrypt the content of the entry.
-     * 
-     * @defaultValue false
-     */
-    zipCrypto?: boolean
-    /**
-     * `true` to to add a data descriptor.
-     * 
-     * @defaultValue true
-     */
-    dataDescriptor?: boolean
-    /**
-     * `true` to add the signature of the data descriptor.
-     * 
-     * @defaultValue false
-     */
-    dataDescriptorSignature?: boolean
     /**
      * The `AbortSignal` instance used to cancel the compression.
      */
@@ -1010,39 +997,77 @@ interface ZipWriterConstructorOptions {
     /**
      * The last access date.
      * 
+     * This option is ignored if the `extendedTimestamp` option is set to `false`.
+     * 
      * @defaultValue The current date.
      */
     lastAccessDate?: Date
     /**
      * The creation date.
      * 
+     * This option is ignored if the `extendedTimestamp` option is set to `false`.
+     * 
      * @defaultValue The current date.
      */
     creationDate?: Date
     /**
      * `true` to store extended timestamp extra fields.
      * 
+     * When set to `false`, the maximum last modification date cannot exceed November 31, 2107 and the maximum accuracy is 2 seconds.
+     * 
      * @defaultValue true
      */
     extendedTimestamp?: boolean
     /**
-     * `true` to write `internalFileAttribute` and `externalFileAttribute` in MS-DOS format.
+     * `true` to use the ZipCrypto algorithm to encrypt the content of the entry.
+     * 
+     * It is not recommended to set `zipCrypto` to `true` because the ZipCrypto encryption can be easily broken.
+     * 
+     * @defaultValue false
+     */
+    zipCrypto?: boolean
+    /**
+     * The "Version" field.
+     */
+    version?: number
+    /**
+     * The "Version made by" field.
+     * 
+     * @defaultValue 20
+     */
+    versionMadeBy?: number
+    /**
+     * `true` to to add a data descriptor.
+     * 
+     * When set to `false`, the `bufferedWrite` option  will automatically be set to `true`.
      * 
      * @defaultValue true
      */
-    msDosCompatible?: boolean
+    dataDescriptor?: boolean
     /**
-     * The internal file attribute.
+     * `true` to add the signature of the data descriptor.
      * 
-     * @defaultValue 0
+     * @defaultValue false
      */
-    internalFileAttribute?: number
+    dataDescriptorSignature?: boolean
+    /**
+     * `true` to write `externalFileAttribute` in MS-DOS format for folder entries.
+     * 
+     * @defaultValue true
+     */
+    msDosCompatible?: boolean
     /**
      * The external file attribute.
      * 
      * @defaultValue 0
      */
     externalFileAttribute?: number
+    /**
+     * The internal file attribute.
+     * 
+     * @defaultValue 0
+     */
+    internalFileAttribute?: number
 }
 
 /**

package/index.js

@@ -1,4 +1,4 @@
-/// <reference types="./index.d.ts" />
+/// <reference types="./index" />
 
 /*
  Copyright (c) 2022 Gildas Lormeau. All rights reserved.

package/lib/core/zip-entry.js

@@ -26,14 +26,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 {
 
@@ -44,5 +64,23 @@ class Entry {
 }
 
 export {
+	PROPERTY_NAME_FILENAME,
+	PROPERTY_NAME_RAW_FILENAME,
+	PROPERTY_NAME_COMMENT,
+	PROPERTY_NAME_RAW_COMMENT,
+	PROPERTY_NAME_UNCOMPPRESSED_SIZE,
+	PROPERTY_NAME_COMPPRESSED_SIZE,
+	PROPERTY_NAME_OFFSET,
+	PROPERTY_NAME_DISK_NUMBER_START,
+	PROPERTY_NAME_LAST_MODIFICATION_DATE,
+	PROPERTY_NAME_RAW_LAST_MODIFICATION_DATE,
+	PROPERTY_NAME_LAST_ACCESS_DATE,
+	PROPERTY_NAME_RAW_LAST_ACCESS_DATE,
+	PROPERTY_NAME_CREATION_DATE,
+	PROPERTY_NAME_RAW_CREATION_DATE,
+	PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE,
+	PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE,
+	PROPERTY_NAME_MS_DOS_COMPATIBLE,
+	PROPERTY_NAME_ZIP64,
 	Entry
 };

package/lib/core/zip-reader.js

@@ -77,7 +77,23 @@ import {
 } from "./io.js";
 import { decodeText } from "./util/decode-text.js";
 import { Crc32 } from "./streams/codecs/crc32.js";
-import { Entry } from "./zip-entry.js";
+import {
+	PROPERTY_NAME_RAW_FILENAME,
+	PROPERTY_NAME_FILENAME,
+	PROPERTY_NAME_RAW_COMMENT,
+	PROPERTY_NAME_COMMENT,
+	PROPERTY_NAME_UNCOMPPRESSED_SIZE,
+	PROPERTY_NAME_COMPPRESSED_SIZE,
+	PROPERTY_NAME_OFFSET,
+	PROPERTY_NAME_DISK_NUMBER_START,
+	PROPERTY_NAME_LAST_MODIFICATION_DATE,
+	PROPERTY_NAME_RAW_LAST_MODIFICATION_DATE,
+	PROPERTY_NAME_LAST_ACCESS_DATE,
+	PROPERTY_NAME_RAW_LAST_ACCESS_DATE,
+	PROPERTY_NAME_CREATION_DATE,
+	PROPERTY_NAME_RAW_CREATION_DATE,
+	Entry
+} from "./zip-entry.js";
 
 const ERR_BAD_FORMAT = "File format is not recognized";
 const ERR_EOCDR_NOT_FOUND = "End of central directory not found";
@@ -93,10 +109,10 @@ const ERR_SPLIT_ZIP_FILE = "Split zip file";
 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]: {
@@ -473,12 +489,12 @@ async function readCommonFooter(fileEntry, directory, dataView, offset) {
 	}
 	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);
@@ -592,16 +608,16 @@ function readExtraFieldExtendedTimestamp(extraFieldExtendedTimestamp, directory)
 	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) => {

package/lib/core/zip-writer.js

@@ -78,7 +78,16 @@ import {
 	SplitZipWriter
 } from "./io.js";
 import { encodeText } from "./util/encode-text.js";
-import { Entry } from "./zip-entry.js";
+import {
+	PROPERTY_NAME_LAST_MODIFICATION_DATE,
+	PROPERTY_NAME_LAST_ACCESS_DATE,
+	PROPERTY_NAME_CREATION_DATE,
+	PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE,
+	PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE,
+	PROPERTY_NAME_MS_DOS_COMPATIBLE,
+	PROPERTY_NAME_ZIP64,
+	Entry
+} from "./zip-entry.js";
 
 const ERR_DUPLICATED_NAME = "File already exists";
 const ERR_INVALID_COMMENT = "Zip file comment exceeds 64KB";
@@ -215,9 +224,9 @@ async function addFile(zipWriter, name, reader, options) {
 	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");
@@ -255,13 +264,13 @@ async function addFile(zipWriter, name, reader, options) {
 		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 = {
@@ -280,7 +289,8 @@ async function addFile(zipWriter, name, reader, options) {
 			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) {
@@ -336,8 +346,9 @@ async function addFile(zipWriter, name, reader, options) {
 	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;
@@ -387,7 +398,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		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;
@@ -525,9 +536,9 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		externalFileAttribute,
 		diskNumberStart
 	};
+	let compressedSize = 0;
 	let uncompressedSize = 0;
 	let signature;
-	let compressedSize = 0;
 	const { writable } = writer;
 	if (reader) {
 		reader.chunkSize = getChunkSize(config);
@@ -922,7 +933,7 @@ async function closeFile(zipWriter, comment, options) {
 	const endOfdirectoryView = getDataView(endOfdirectoryArray);
 	let lastDiskNumber = writer.diskNumber;
 	const { availableSize } = writer;
-	if (availableSize < endOfdirectoryArray.length) {
+	if (availableSize < getLength(endOfdirectoryArray)) {
 		lastDiskNumber++;
 	}
 	offset = 0;

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.6.40",
+    "version": "2.6.42",
     "type": "module",
     "keywords": [
         "zip",
@@ -22,7 +22,8 @@
         "web-workers",
         "deno",
         "node.js",
-        "multi-core"
+        "multi-core",
+        "split-zip"
     ],
     "engines": {
         "deno": ">=1.0.0",