@zip.js/zip.js 2.7.21 → 2.7.23

package/lib/core/zip-reader.js

@@ -383,7 +383,7 @@ class ZipEntry {
 		localDirectory.rawExtraField = localDirectory.extraFieldLength ?
 			await readUint8Array(reader, offset + 30 + localDirectory.filenameLength, localDirectory.extraFieldLength, diskNumberStart) :
 			new Uint8Array();
-		await readCommonFooter(zipEntry, localDirectory, dataView, 4);
+		await readCommonFooter(zipEntry, localDirectory, dataView, 4, true);
 		Object.assign(fileEntry, {
 			lastAccessDate: localDirectory.lastAccessDate,
 			creationDate: localDirectory.creationDate
@@ -470,7 +470,7 @@ function readCommonHeader(directory, dataView, offset) {
 	});
 }
 
-async function readCommonFooter(fileEntry, directory, dataView, offset) {
+async function readCommonFooter(fileEntry, directory, dataView, offset, localDirectory) {
 	const { rawExtraField } = directory;
 	const extraField = directory.extraField = new Map();
 	const rawExtraFieldView = getDataView(new Uint8Array(rawExtraField));
@@ -523,7 +523,7 @@ async function readCommonFooter(fileEntry, directory, dataView, offset) {
 	}
 	const extraFieldExtendedTimestamp = extraField.get(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
 	if (extraFieldExtendedTimestamp) {
-		readExtraFieldExtendedTimestamp(extraFieldExtendedTimestamp, directory);
+		readExtraFieldExtendedTimestamp(extraFieldExtendedTimestamp, directory, localDirectory);
 		directory.extraFieldExtendedTimestamp = extraFieldExtendedTimestamp;
 	}
 }
@@ -614,23 +614,28 @@ function readExtraFieldNTFS(extraFieldNTFS, directory) {
 	}
 }
 
-function readExtraFieldExtendedTimestamp(extraFieldExtendedTimestamp, directory) {
+function readExtraFieldExtendedTimestamp(extraFieldExtendedTimestamp, directory, localDirectory) {
 	const extraFieldView = getDataView(extraFieldExtendedTimestamp.data);
 	const flags = getUint8(extraFieldView, 0);
 	const timeProperties = [];
 	const timeRawProperties = [];
-	if ((flags & 0x1) == 0x1) {
+	if (localDirectory)	{
+		if ((flags & 0x1) == 0x1) {
+			timeProperties.push(PROPERTY_NAME_LAST_MODIFICATION_DATE);
+			timeRawProperties.push(PROPERTY_NAME_RAW_LAST_MODIFICATION_DATE);
+		}
+		if ((flags & 0x2) == 0x2) {
+			timeProperties.push(PROPERTY_NAME_LAST_ACCESS_DATE);
+			timeRawProperties.push(PROPERTY_NAME_RAW_LAST_ACCESS_DATE);
+		}
+		if ((flags & 0x4) == 0x4) {
+			timeProperties.push(PROPERTY_NAME_CREATION_DATE);
+			timeRawProperties.push(PROPERTY_NAME_RAW_CREATION_DATE);
+		}
+	} else if (extraFieldExtendedTimestamp.data.length >= 5) {
 		timeProperties.push(PROPERTY_NAME_LAST_MODIFICATION_DATE);
 		timeRawProperties.push(PROPERTY_NAME_RAW_LAST_MODIFICATION_DATE);
 	}
-	if ((flags & 0x2) == 0x2) {
-		timeProperties.push(PROPERTY_NAME_LAST_ACCESS_DATE);
-		timeRawProperties.push(PROPERTY_NAME_RAW_LAST_ACCESS_DATE);
-	}
-	if ((flags & 0x4) == 0x4) {
-		timeProperties.push(PROPERTY_NAME_CREATION_DATE);
-		timeRawProperties.push(PROPERTY_NAME_RAW_CREATION_DATE);
-	}
 	let offset = 1;
 	timeProperties.forEach((propertyName, indexProperty) => {
 		if (extraFieldExtendedTimestamp.data.length >= offset + 4) {

package/lib/core/zip-writer.js

@@ -482,6 +482,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		version,
 		compressionMethod,
 		rawExtraFieldExtendedTimestamp,
+		extraFieldExtendedTimestampFlag,
 		rawExtraFieldNTFS,
 		rawExtraFieldAES
 	} = headerInfo;
@@ -613,6 +614,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		headerArray,
 		signature,
 		rawExtraFieldZip64,
+		extraFieldExtendedTimestampFlag,
 		zip64UncompressedSize,
 		zip64CompressedSize,
 		zip64Offset,
@@ -635,7 +637,7 @@ function getHeaderInfo(options) {
 		directory,
 		rawExtraField,
 		encryptionStrength,
-		extendedTimestamp,
+		extendedTimestamp
 	} = options;
 	const compressed = level !== 0 && !directory;
 	const encrypted = Boolean(password && getLength(password));
@@ -652,19 +654,23 @@ function getHeaderInfo(options) {
 	}
 	let rawExtraFieldNTFS;
 	let rawExtraFieldExtendedTimestamp;
+	let extraFieldExtendedTimestampFlag;
 	if (extendedTimestamp) {
 		rawExtraFieldExtendedTimestamp = new Uint8Array(9 + (lastAccessDate ? 4 : 0) + (creationDate ? 4 : 0));
 		const extraFieldExtendedTimestampView = getDataView(rawExtraFieldExtendedTimestamp);
 		setUint16(extraFieldExtendedTimestampView, 0, EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
 		setUint16(extraFieldExtendedTimestampView, 2, getLength(rawExtraFieldExtendedTimestamp) - 4);
-		const extraFieldExtendedTimestampFlag = 0x1 + (lastAccessDate ? 0x2 : 0) + (creationDate ? 0x4 : 0);
+		extraFieldExtendedTimestampFlag = 0x1 + (lastAccessDate ? 0x2 : 0) + (creationDate ? 0x4 : 0);
 		setUint8(extraFieldExtendedTimestampView, 4, extraFieldExtendedTimestampFlag);
-		setUint32(extraFieldExtendedTimestampView, 5, Math.floor(lastModDate.getTime() / 1000));
+		let offset = 5;
+		setUint32(extraFieldExtendedTimestampView, offset, Math.floor(lastModDate.getTime() / 1000));
+		offset += 4;
 		if (lastAccessDate) {
-			setUint32(extraFieldExtendedTimestampView, 9, Math.floor(lastAccessDate.getTime() / 1000));
+			setUint32(extraFieldExtendedTimestampView, offset, Math.floor(lastAccessDate.getTime() / 1000));
+			offset += 4;
 		}
 		if (creationDate) {
-			setUint32(extraFieldExtendedTimestampView, 13, Math.floor(creationDate.getTime() / 1000));
+			setUint32(extraFieldExtendedTimestampView, offset, Math.floor(creationDate.getTime() / 1000));
 		}
 		try {
 			rawExtraFieldNTFS = new Uint8Array(36);
@@ -745,6 +751,7 @@ function getHeaderInfo(options) {
 		compressed,
 		version,
 		compressionMethod,
+		extraFieldExtendedTimestampFlag,
 		rawExtraFieldExtendedTimestamp,
 		rawExtraFieldNTFS,
 		rawExtraFieldAES
@@ -881,23 +888,38 @@ async function closeFile(zipWriter, comment, options) {
 	let directoryDataLength = 0;
 	let directoryOffset = zipWriter.offset - diskOffset;
 	let filesLength = files.size;
-	for (const [, {
-		rawFilename,
-		rawExtraFieldZip64,
-		rawExtraFieldAES,
-		rawExtraField,
-		rawComment,
-		rawExtraFieldExtendedTimestamp,
-		rawExtraFieldNTFS
-	}] of files) {
+	for (const [, fileEntry] of files) {
+		const {
+			rawFilename,
+			rawExtraFieldZip64,
+			rawExtraFieldAES,
+			rawComment,
+			rawExtraFieldNTFS,
+			rawExtraField,
+			extendedTimestamp,
+			extraFieldExtendedTimestampFlag,
+			lastModDate
+		} = fileEntry;
+		let rawExtraFieldTimestamp;
+		if (extendedTimestamp) {
+			rawExtraFieldTimestamp = new Uint8Array(9);
+			const extraFieldExtendedTimestampView = getDataView(rawExtraFieldTimestamp);
+			setUint16(extraFieldExtendedTimestampView, 0, EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
+			setUint16(extraFieldExtendedTimestampView, 2, 5);
+			setUint8(extraFieldExtendedTimestampView, 4, extraFieldExtendedTimestampFlag);
+			setUint32(extraFieldExtendedTimestampView, 5, Math.floor(lastModDate.getTime() / 1000));
+		} else {
+			rawExtraFieldTimestamp = new Uint8Array();
+		}
+		fileEntry.rawExtraFieldCDExtendedTimestamp = rawExtraFieldTimestamp;
 		directoryDataLength += 46 +
 			getLength(
 				rawFilename,
 				rawComment,
 				rawExtraFieldZip64,
 				rawExtraFieldAES,
-				rawExtraFieldExtendedTimestamp,
 				rawExtraFieldNTFS,
+				rawExtraFieldTimestamp,
 				rawExtraField);
 	}
 	const directoryArray = new Uint8Array(directoryDataLength);
@@ -910,6 +932,7 @@ async function closeFile(zipWriter, comment, options) {
 			rawFilename,
 			rawExtraFieldZip64,
 			rawExtraFieldAES,
+			rawExtraFieldCDExtendedTimestamp,
 			rawExtraFieldNTFS,
 			rawExtraField,
 			rawComment,
@@ -924,24 +947,11 @@ async function closeFile(zipWriter, comment, options) {
 			msDosCompatible,
 			internalFileAttribute,
 			externalFileAttribute,
-			extendedTimestamp,
-			lastModDate,
 			diskNumberStart,
 			uncompressedSize,
 			compressedSize
 		} = fileEntry;
-		let rawExtraFieldExtendedTimestamp;
-		if (extendedTimestamp) {
-			rawExtraFieldExtendedTimestamp = new Uint8Array(9);
-			const extraFieldExtendedTimestampView = getDataView(rawExtraFieldExtendedTimestamp);
-			setUint16(extraFieldExtendedTimestampView, 0, EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
-			setUint16(extraFieldExtendedTimestampView, 2, getLength(rawExtraFieldExtendedTimestamp) - 4);
-			setUint8(extraFieldExtendedTimestampView, 4, 0x1);
-			setUint32(extraFieldExtendedTimestampView, 5, Math.floor(lastModDate.getTime() / 1000));
-		} else {
-			rawExtraFieldExtendedTimestamp = new Uint8Array();
-		}
-		const extraFieldLength = getLength(rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawExtraField);
+		const extraFieldLength = getLength(rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldCDExtendedTimestamp, rawExtraFieldNTFS, rawExtraField);
 		setUint32(directoryView, offset, CENTRAL_FILE_HEADER_SIGNATURE);
 		setUint16(directoryView, offset + 4, versionMadeBy);
 		const headerView = getDataView(headerArray);
@@ -965,9 +975,9 @@ async function closeFile(zipWriter, comment, options) {
 		arraySet(directoryArray, rawFilename, offset + 46);
 		arraySet(directoryArray, rawExtraFieldZip64, offset + 46 + getLength(rawFilename));
 		arraySet(directoryArray, rawExtraFieldAES, offset + 46 + getLength(rawFilename, rawExtraFieldZip64));
-		arraySet(directoryArray, rawExtraFieldExtendedTimestamp, offset + 46 + getLength(rawFilename, rawExtraFieldZip64, rawExtraFieldAES));
-		arraySet(directoryArray, rawExtraFieldNTFS, offset + 46 + getLength(rawFilename, rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldExtendedTimestamp));
-		arraySet(directoryArray, rawExtraField, offset + 46 + getLength(rawFilename, rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS));
+		arraySet(directoryArray, rawExtraFieldCDExtendedTimestamp, offset + 46 + getLength(rawFilename, rawExtraFieldZip64, rawExtraFieldAES));
+		arraySet(directoryArray, rawExtraFieldNTFS, offset + 46 + getLength(rawFilename, rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldCDExtendedTimestamp));
+		arraySet(directoryArray, rawExtraField, offset + 46 + getLength(rawFilename, rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldCDExtendedTimestamp, rawExtraFieldNTFS));
 		arraySet(directoryArray, rawComment, offset + 46 + getLength(rawFilename) + extraFieldLength);
 		const directoryEntryLength = 46 + getLength(rawFilename, rawComment) + extraFieldLength;
 		if (offset - directoryDiskOffset > writer.availableSize) {

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.21",
+    "version": "2.7.23",
     "type": "module",
     "keywords": [
         "zip",
@@ -27,7 +27,8 @@
     ],
     "engines": {
         "deno": ">=1.0.0",
-        "node": ">=16.5.0"
+        "node": ">=16.5.0",
+        "bun": ">=0.7.0"
     },
     "scripts": {
         "build": "npx rollup -c",
@@ -46,6 +47,7 @@
     "types": "./index.d.ts",
     "exports": {
         "./package.json": "./package.json",
+        "./index.min.js": "./index.min.js",
         ".": {
             "import": {
                 "types": "./index.d.ts",