@zip.js/zip.js 2.8.44 → 2.8.45

package/lib/core/zip-writer.js

@@ -208,7 +208,8 @@ import {
 	OPTION_ENCODE_TEXT,
 	OPTION_OFFSET,
 	OPTION_USDZ,
-	OPTION_UNIX_EXTRA_FIELD_TYPE
+	OPTION_UNIX_EXTRA_FIELD_TYPE,
+	OPTION_LOCAL_EXTRA_FIELD
 } from "./options.js";
 
 const ERR_DUPLICATED_NAME = "File already exists";
@@ -238,6 +239,8 @@ const ERR_INVALID_MSDOS_ATTRIBUTES = "Invalid msdosAttributesRaw (must be intege
 const ERR_INVALID_MSDOS_DATA = "Invalid msdosAttributes (must be an object with boolean flags)";
 
 const EXTRAFIELD_DATA_AES = new Uint8Array([0x07, 0x00, 0x02, 0x00, 0x41, 0x45, 0x03, 0x00, 0x00]);
+const EXTRAFIELD_OFFSET_AES_VENDOR_VERSION = 4;
+const VENDOR_VERSION_AE_1 = 1;
 const INFOZIP_EXTRA_FIELD_TYPE = "infozip";
 const UNIX_EXTRA_FIELD_TYPE = "unix";
 
@@ -332,9 +335,9 @@ class ZipWriter {
 				zip64UncompressedSize,
 				extraFieldLength
 			});
-			const { signature } = entry;
-			if (signature !== UNDEFINED_VALUE) {
-				setUint32(headerView, HEADER_OFFSET_SIGNATURE, signature);
+			const { crc32 } = entry;
+			if (crc32 !== UNDEFINED_VALUE) {
+				setUint32(headerView, HEADER_OFFSET_SIGNATURE, crc32);
 			}
 			Object.assign(entry, {
 				zip64UncompressedSize,
@@ -537,6 +540,7 @@ async function addFile(zipWriter, name, reader, options) {
 			internalFileAttribute: metadataInfo.resolvedOptions.internalFileAttributes,
 			externalFileAttribute: attributesInfo.resolvedOptions.externalFileAttributes,
 			signature: options[PROPERTY_NAME_SIGNATURE],
+			crc32: options.crc32 === UNDEFINED_VALUE ? options[PROPERTY_NAME_SIGNATURE] : options.crc32,
 			offset: zipWriter.offset - diskOffset,
 			diskNumberStart: diskNumber
 		});
@@ -753,27 +757,8 @@ function resolveMetadata(zipWriter, name, options) {
 	if (!zipCrypto && (password !== UNDEFINED_VALUE || rawPassword !== UNDEFINED_VALUE) && !(encryptionStrength >= 1 && encryptionStrength <= 3)) {
 		throw new Error(ERR_INVALID_ENCRYPTION_STRENGTH);
 	}
-	let rawExtraField = EMPTY_UINT8_ARRAY;
-	const extraField = options[PROPERTY_NAME_EXTRA_FIELD];
-	if (extraField) {
-		let extraFieldSize = 0;
-		let offset = 0;
-		extraField.forEach(data => extraFieldSize += 4 + getLength(data));
-		rawExtraField = new Uint8Array(extraFieldSize);
-		const rawExtraFieldView = getDataView(rawExtraField);
-		extraField.forEach((data, type) => {
-			if (type > MAX_16_BITS) {
-				throw new Error(ERR_INVALID_EXTRAFIELD_TYPE);
-			}
-			if (getLength(data) > MAX_16_BITS) {
-				throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
-			}
-			setUint16(rawExtraFieldView, offset, type);
-			setUint16(rawExtraFieldView, offset + 2, getLength(data));
-			arraySet(rawExtraField, data, offset + 4);
-			offset += 4 + getLength(data);
-		});
-	}
+	const rawExtraField = serializeExtraField(options[PROPERTY_NAME_EXTRA_FIELD]);
+	const rawLocalExtraField = serializeExtraField(options[OPTION_LOCAL_EXTRA_FIELD]);
 	return {
 		comment,
 		resolvedOptions: {
@@ -807,11 +792,36 @@ function resolveMetadata(zipWriter, name, options) {
 			useCompressionStream,
 			dataDescriptor,
 			zip64,
-			rawExtraField
+			rawExtraField,
+			rawLocalExtraField
 		}
 	};
 }
 
+function serializeExtraField(extraField) {
+	if (!extraField) {
+		return EMPTY_UINT8_ARRAY;
+	}
+	let extraFieldSize = 0;
+	let offset = 0;
+	extraField.forEach(data => extraFieldSize += 4 + getLength(data));
+	const rawExtraField = new Uint8Array(extraFieldSize);
+	const rawExtraFieldView = getDataView(rawExtraField);
+	extraField.forEach((data, type) => {
+		if (type > MAX_16_BITS) {
+			throw new Error(ERR_INVALID_EXTRAFIELD_TYPE);
+		}
+		if (getLength(data) > MAX_16_BITS) {
+			throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
+		}
+		setUint16(rawExtraFieldView, offset, type);
+		setUint16(rawExtraFieldView, offset + 2, getLength(data));
+		arraySet(rawExtraField, data, offset + 4);
+		offset += 4 + getLength(data);
+	});
+	return rawExtraField;
+}
+
 async function resolveSizes(zipWriter, reader, { resolvedOptions: metadata }, options) {
 	const { passThrough, zipCrypto, password, rawPassword, encryptionStrength } = metadata;
 	let { dataDescriptor, zip64, level, compressionMethod } = metadata;
@@ -1136,12 +1146,9 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		msdosAttributes
 	};
 	let {
-		crc32: signature,
+		crc32,
 		uncompressedSize
 	} = options;
-	if (signature === UNDEFINED_VALUE) {
-		({ signature } = options);
-	}
 	let compressedSize = 0;
 	if (!passThrough) {
 		uncompressedSize = 0;
@@ -1179,7 +1186,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 			if (!passThrough) {
 				uncompressedSize = result.inputSize;
 				if (!encrypted || zipCrypto) {
-					signature = result.signature;
+					crc32 = result.crc32;
 				}
 			}
 			if ((!zip64CompressedSize && compressedSize >= MAX_32_BITS) ||
@@ -1195,7 +1202,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 
 	}
 	setEntryInfo({
-		signature,
+		crc32,
 		compressedSize,
 		uncompressedSize,
 		headerInfo,
@@ -1218,8 +1225,8 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		version,
 		headerArray,
 		headerView,
-		signature,
-		crc32: encrypted && !zipCrypto ? UNDEFINED_VALUE : signature,
+		signature: crc32,
+		crc32: encrypted && !zipCrypto && !passThrough ? UNDEFINED_VALUE : crc32,
 		extraFieldExtendedTimestampFlag,
 		zip64UncompressedSize,
 		zip64CompressedSize
@@ -1240,6 +1247,7 @@ function getHeaderInfo(options) {
 		dataDescriptor,
 		directory,
 		rawExtraField,
+		rawLocalExtraField,
 		encryptionStrength,
 		extendedTimestamp,
 		ntfsTimestamp,
@@ -1247,7 +1255,8 @@ function getHeaderInfo(options) {
 		encrypted,
 		zip64UncompressedSize,
 		zip64CompressedSize,
-		uncompressedSize
+		uncompressedSize,
+		crc32
 	} = options;
 	let { version, compressionMethod } = options;
 	const compressed = !directory && (compressionMethod === UNDEFINED_VALUE
@@ -1373,11 +1382,14 @@ function getHeaderInfo(options) {
 	}
 	if (encrypted && !zipCrypto) {
 		version = version > VERSION_AES ? version : VERSION_AES;
+		if (passThrough && crc32 !== UNDEFINED_VALUE) {
+			rawExtraFieldAES[EXTRAFIELD_OFFSET_AES_VENDOR_VERSION] = VENDOR_VERSION_AE_1;
+		}
 		rawExtraFieldAES[9] = compressionMethod;
 		compressionMethod = COMPRESSION_METHOD_AES;
 	}
 	const localExtraFieldZip64Length = writeLocalExtraFieldZip64 ? getLength(rawLocalExtraFieldZip64) : 0;
-	const extraFieldLength = localExtraFieldZip64Length + getLength(rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawExtraFieldUnix, rawExtraField);
+	const extraFieldLength = localExtraFieldZip64Length + getLength(rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawExtraFieldUnix, rawExtraField, rawLocalExtraField);
 	if (extraFieldLength > MAX_16_BITS) {
 		throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
 	}
@@ -1411,6 +1423,7 @@ function getHeaderInfo(options) {
 	localHeader.bytes(rawExtraFieldNTFS);
 	localHeader.bytes(rawExtraFieldUnix);
 	localHeader.bytes(rawExtraField);
+	localHeader.bytes(rawLocalExtraField);
 	if (dataDescriptor) {
 		if (!zip64CompressedSize) {
 			setUint32(localHeaderView, HEADER_OFFSET_COMPRESSED_SIZE + LOCAL_HEADER_COMMON_OFFSET, 0);
@@ -1529,7 +1542,7 @@ function getDataDescriptorInfo({
 }
 
 function setEntryInfo({
-	signature,
+	crc32,
 	compressedSize,
 	uncompressedSize,
 	headerInfo,
@@ -1537,6 +1550,7 @@ function setEntryInfo({
 }, {
 	zip64,
 	zipCrypto,
+	passThrough,
 	dataDescriptor
 }) {
 	const {
@@ -1547,10 +1561,10 @@ function setEntryInfo({
 		dataDescriptorView,
 		dataDescriptorOffset
 	} = dataDescriptorInfo;
-	if ((!encrypted || zipCrypto) && signature !== UNDEFINED_VALUE) {
-		setUint32(headerView, HEADER_OFFSET_SIGNATURE, signature);
+	if ((!encrypted || zipCrypto || passThrough) && crc32 !== UNDEFINED_VALUE) {
+		setUint32(headerView, HEADER_OFFSET_SIGNATURE, crc32);
 		if (dataDescriptor) {
-			setUint32(dataDescriptorView, dataDescriptorOffset, signature);
+			setUint32(dataDescriptorView, dataDescriptorOffset, crc32);
 		}
 	}
 	if (zip64) {
@@ -1573,15 +1587,15 @@ function updateLocalHeader({
 	encrypted,
 	zip64,
 	localExtraFieldZip64Length,
-	signature,
+	crc32,
 	compressedSize,
 	uncompressedSize,
 	zip64UncompressedSize,
 	zip64CompressedSize
-}, localHeaderView, { dataDescriptor }) {
+}, localHeaderView, { dataDescriptor, passThrough }) {
 	if (!dataDescriptor) {
-		if (!encrypted) {
-			setUint32(localHeaderView, HEADER_OFFSET_SIGNATURE + LOCAL_HEADER_COMMON_OFFSET, signature);
+		if (!encrypted || (passThrough && crc32 !== UNDEFINED_VALUE)) {
+			setUint32(localHeaderView, HEADER_OFFSET_SIGNATURE + LOCAL_HEADER_COMMON_OFFSET, crc32);
 		}
 		if (!zip64CompressedSize) {
 			setUint32(localHeaderView, HEADER_OFFSET_COMPRESSED_SIZE + LOCAL_HEADER_COMMON_OFFSET, compressedSize);

package/lib/zip-core-external.js

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

package/lib/zip-fs-core-external.js

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

package/lib/zip-fs-external.js

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

package/lib/zip-mime-types.js

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

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.8.44",
+  "version": "2.8.45",
   "type": "module",
   "keywords": [
     "zip",
@@ -34,6 +34,10 @@
     "bun": ">=0.7.0"
   },
   "scripts": {
+    "lint": "npx eslint . && deno lint",
+    "test": "npm run test-node && npm run test-deno && npm run test-bun && npm run test-node-dist && npm run test-deno-dist && npm run test-bun-dist && npm run test-web-streams-polyfill && npm run test-types",
+    "test-browsers": "npm run test-chrome && npm run test-firefox && npm run test-webkit",
+    "test-all": "npm run lint && npm run test && npm run test-browsers",
     "build": "npx rollup -c",
     "build-dev": "npx rollup -c rollup.config.dev.js",
     "build-doc-api": "npx typedoc",
@@ -46,8 +50,9 @@
     "test-node-dist": "./tests/dist-runner.sh node",
     "test-bun-dist": "./tests/dist-runner.sh bun",
     "test-types": "tsc -p ./tests/types/tsconfig.json",
-    "test-firefox": "firefox http://localhost:8081/tests/ & npx http-server -p=8081 & wait $!",
-    "test-chrome": "google-chrome http://localhost:8081/tests/ & npx http-server -p=8081 & wait $!"
+    "test-firefox": "node ./tests/browser-runner.js firefox",
+    "test-chrome": "node ./tests/browser-runner.js chrome",
+    "test-webkit": "node ./tests/browser-runner.js webkit"
   },
   "main": "./index.cjs",
   "module": "./index.js",
@@ -236,6 +241,7 @@
     "@rollup/plugin-terser": "^1.0.0",
     "eslint": "^10.8.1",
     "http-server": "^14.1.1",
+    "playwright": "^1.62.1",
     "rollup": "^4.62.4",
     "typedoc": "^0.28.20",
     "typedoc-plugin-markdown": "^4.12.0",

package/worker-message-property-names.js

@@ -1,3 +1,3 @@
-const WORKER_MESSAGE_PROPERTY_NAMES = ["baseURI", "cause", "checkAuthenticationCode", "checkCrc32", "checkPasswordOnly", "chunkSize", "code", "codecType", "codecURI", "compressed", "compressionMethod", "computeCrc32", "config", "deflate64", "done", "encrypted", "encryptionStrength", "error", "format", "inputSize", "level", "message", "messageId", "name", "options", "outputSize", "password", "passwordVerification", "rawBitFlag", "rawPassword", "readable", "result", "signature", "stack", "transferStreams", "type", "useCompressionStream", "useWebWorkers", "value", "wasmURI", "workerStartupTimeout", "writable", "zipCrypto"];
+const WORKER_MESSAGE_PROPERTY_NAMES = ["baseURI", "cause", "checkAuthenticationCode", "checkCrc32", "checkPasswordOnly", "chunkSize", "code", "codecType", "codecURI", "compressed", "compressionMethod", "computeCrc32", "config", "crc32", "deflate64", "done", "encrypted", "encryptionStrength", "error", "format", "inputSize", "level", "message", "messageId", "name", "options", "outputSize", "password", "passwordVerification", "rawBitFlag", "rawPassword", "readable", "result", "stack", "transferStreams", "type", "useCompressionStream", "useWebWorkers", "value", "wasmURI", "workerStartupTimeout", "writable", "zipCrypto"];
 
 export { WORKER_MESSAGE_PROPERTY_NAMES };