@zip.js/zip.js 2.7.22 → 2.7.23

package/lib/core/util/mime-type.js

@@ -38,10 +38,6 @@ const table = {
 		"atomcat+xml": "atomcat",
 		"atomserv+xml": "atomsrv",
 		"bbolin": "lin",
-		"cap": [
-			"cap",
-			"pcap"
-		],
 		"cu-seeme": "cu",
 		"davmount+xml": "davmount",
 		"dsptype": "tsp",
@@ -90,10 +86,6 @@ const table = {
 		"rdf+xml": "rdf",
 		"rss+xml": "rss",
 		"rtf": "rtf",
-		"smil": [
-			"smi",
-			"smil"
-		],
 		"xhtml+xml": [
 			"xhtml",
 			"xht"
@@ -218,10 +210,6 @@ const table = {
 		"x-chess-pgn": "pgn",
 		"x-cpio": "cpio",
 		"x-csh": "csh",
-		"x-debian-package": [
-			"deb",
-			"udeb"
-		],
 		"x-director": [
 			"dir",
 			"dxr",
@@ -267,46 +255,23 @@ const table = {
 		"x-java-jnlp-file": "jnlp",
 		"x-jmol": "jmz",
 		"x-killustrator": "kil",
-		"x-koan": [
-			"skp",
-			"skd",
-			"skt",
-			"skm"
-		],
-		"x-kpresenter": [
-			"kpr",
-			"kpt"
-		],
-		"x-kword": [
-			"kwd",
-			"kwt"
-		],
 		"x-latex": "latex",
-		"x-lha": "lha",
 		"x-lyx": "lyx",
-		"x-lzh": "lzh",
 		"x-lzx": "lzx",
 		"x-maker": [
 			"frm",
-			"maker",
-			"frame",
-			"fm",
 			"fb",
-			"book",
 			"fbdoc"
 		],
 		"x-ms-wmd": "wmd",
-		"x-ms-wmz": "wmz",
 		"x-msdos-program": [
 			"com",
 			"exe",
 			"bat",
 			"dll"
 		],
-		"x-msi": "msi",
 		"x-netcdf": [
-			"nc",
-			"cdf"
+			"nc"
 		],
 		"x-ns-proxy-autoconfig": [
 			"pac",
@@ -342,7 +307,6 @@ const table = {
 		"x-sv4cpio": "sv4cpio",
 		"x-sv4crc": "sv4crc",
 		"x-tar": "tar",
-		"x-tcl": "tcl",
 		"x-tex-gf": "gf",
 		"x-tex-pk": "pk",
 		"x-texinfo": [
@@ -356,14 +320,6 @@ const table = {
 			"old",
 			"sik"
 		],
-		"x-troff": [
-			"t",
-			"tr",
-			"roff"
-		],
-		"x-troff-man": "man",
-		"x-troff-me": "me",
-		"x-troff-ms": "ms",
 		"x-ustar": "ustar",
 		"x-wais-source": "src",
 		"x-wingz": "wz",
@@ -955,13 +911,7 @@ const table = {
 		"x-msbinder": "obd",
 		"x-mscardfile": "crd",
 		"x-msclip": "clp",
-		"x-msdownload": [
-			"exe",
-			"dll",
-			"com",
-			"bat",
-			"msi"
-		],
+		"application/x-ms-installer": "msi",
 		"x-msmediaview": [
 			"mvb",
 			"m13",
@@ -993,8 +943,6 @@ const table = {
 		"x-stuffitx": "sitx",
 		"x-subrip": "srt",
 		"x-t3vm-image": "t3",
-		"x-tads": "gam",
-		"x-tex": "tex",
 		"x-tex-tfm": "tfm",
 		"x-tgif": "obj",
 		"x-xliff+xml": "xlf",
@@ -1031,22 +979,12 @@ const table = {
 		"vnd.ms-outlook": "msg",
 		"vnd.ms-pkicertstore": "sst",
 		"x-compress": "z",
-		"x-compressed": "tgz",
-		"x-gzip": [
-			"gz",
-			"tgz"
-		],
 		"x-perfmon": [
 			"pma",
 			"pmc",
-			"pml",
 			"pmr",
 			"pmw"
 		],
-		"x-pkcs7-mime": [
-			"p7c",
-			"p7m"
-		],
 		"ynd.ms-pkipko": "pko",
 		"gzip": [
 			"gz",
@@ -1080,15 +1018,6 @@ const table = {
 			"pm",
 			"pl"
 		],
-		"x-sqlite3": [
-			"db",
-			"sqlite",
-			"sqlite3",
-			"db-wal",
-			"sqlite-wal",
-			"db-shm",
-			"sqlite-shm"
-		],
 		"yaml": [
 			"yaml",
 			"yml"
@@ -1112,7 +1041,6 @@ const table = {
 		"mpeg": [
 			"mpga",
 			"mpega",
-			"mp2",
 			"mp3",
 			"m4a",
 			"mp2a",
@@ -1126,11 +1054,7 @@ const table = {
 			"spx"
 		],
 		"prs.sid": "sid",
-		"x-aiff": [
-			"aif",
-			"aiff",
-			"aifc"
-		],
+		"x-aiff": "aifc",
 		"x-gsm": "gsm",
 		"x-ms-wma": "wma",
 		"x-ms-wax": "wax",
@@ -1156,20 +1080,11 @@ const table = {
 		"vnd.nuera.ecelp9600": "ecelp9600",
 		"vnd.rip": "rip",
 		"webm": "weba",
-		"x-aac": "aac",
 		"x-caf": "caf",
 		"x-matroska": "mka",
 		"x-pn-realaudio-plugin": "rmp",
 		"xm": "xm",
-		"mid": [
-			"mid",
-			"rmi"
-		],
-		"aac": [
-			"aac",
-			"mp4",
-			"m4a"
-		],
+		"aac": "aac",
 		"aiff": [
 			"aiff",
 			"aif",
@@ -1239,17 +1154,11 @@ const table = {
 		],
 		"x-kinemage": "kin",
 		"x-macmolecule": "mcm",
-		"x-macromodel-input": [
-			"mmd",
-			"mmod"
-		],
+		"x-macromodel-input": "mmod",
 		"x-mdl-molfile": "mol",
 		"x-mdl-rdfile": "rd",
 		"x-mdl-rxnfile": "rxn",
-		"x-mdl-sdfile": [
-			"sd",
-			"sdf"
-		],
+		"x-mdl-sdfile": "sd",
 		"x-mdl-tgf": "tgf",
 		"x-mmcif": "mcif",
 		"x-mol2": "mol2",
@@ -1258,7 +1167,6 @@ const table = {
 		"x-mopac-input": [
 			"mop",
 			"mopcrt",
-			"mpc",
 			"zmt"
 		],
 		"x-mopac-out": "moo",
@@ -1267,14 +1175,7 @@ const table = {
 			"prt",
 			"ent"
 		],
-		"x-ncbi-asn1-binary": [
-			"val",
-			"aso"
-		],
-		"x-pdb": [
-			"pdb",
-			"ent"
-		],
+		"x-ncbi-asn1-binary": "val",
 		"x-rosdal": "ros",
 		"x-swissprot": "sw",
 		"x-vamas-iso14976": "vms",
@@ -1294,7 +1195,6 @@ const table = {
 			"jpeg",
 			"jpg",
 			"jpe",
-			"pjpg",
 			"jfif",
 			"jfif-tbnl",
 			"jif"
@@ -1380,13 +1280,7 @@ const table = {
 			"heic"
 		],
 		"pjpeg": [
-			"jpe",
-			"jpeg",
-			"jpg",
-			"pjpg",
-			"jfi",
-			"jfif-tbnl",
-			"jif"
+			"pjpg"
 		],
 		"vnd.adobe.photoshop": "psd",
 		"x-adobe-dng": "dng",
@@ -1437,10 +1331,7 @@ const table = {
 			"x3dv",
 			"x3dvz"
 		],
-		"x3d+xml": [
-			"x3d",
-			"x3dz"
-		],
+		"x3d+xml": "x3dz",
 		"x3d+binary": [
 			"x3db",
 			"x3dbz"
@@ -1483,8 +1374,7 @@ const table = {
 			"in",
 			"bas",
 			"diff",
-			"ksh",
-			"pl"
+			"ksh"
 		],
 		"richtext": "rtx",
 		"scriptlet": [
@@ -1512,10 +1402,7 @@ const table = {
 		],
 		"x-component": "htc",
 		"x-dsrc": "d",
-		"x-diff": [
-			"diff",
-			"patch"
-		],
+		"x-diff": "patch",
 		"x-haskell": "hs",
 		"x-java": "java",
 		"x-literate-haskell": "lhs",
@@ -1527,10 +1414,6 @@ const table = {
 			"inc"
 		],
 		"x-pcs-gcd": "gcd",
-		"x-perl": [
-			"pl",
-			"pm"
-		],
 		"x-python": "py",
 		"x-scala": "scala",
 		"x-setext": "etx",
@@ -1583,11 +1466,7 @@ const table = {
 		],
 		"x-c": [
 			"c",
-			"cc",
-			"cxx",
-			"cpp",
 			"h",
-			"hh",
 			"dic"
 		],
 		"x-fortran": [
@@ -1610,13 +1489,7 @@ const table = {
 			"markdn"
 		],
 		"vnd.wap.si": "si",
-		"vnd.wap.sl": "sl",
-		"x-markdown": [
-			"md",
-			"markdown",
-			"mdown",
-			"markdn"
-		]
+		"vnd.wap.sl": "sl"
 	},
 	"video": {
 		"avif": "avif",
@@ -1730,8 +1603,6 @@ const table = {
 	"x-world": {
 		"x-vrml": [
 			"vrm",
-			"vrml",
-			"wrl",
 			"flr",
 			"wrz",
 			"xaf",

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