@zip.js/zip.js 2.8.45 → 2.8.47

package/README.md

@@ -3,8 +3,9 @@
 zip.js is a JavaScript open-source library (BSD-3-Clause license) for
 compressing and decompressing zip files. It has been designed to handle large amounts
 of data. It supports notably multi-core compression, native compression with
-compression streams, archives larger than 4GB with Zip64, split zip files, data
-encryption, incremental writing, and Deflate64 decompression.
+compression streams, pluggable compression engines, archives larger than 4GB
+with Zip64, split zip files, data encryption, incremental writing, and
+Deflate64 decompression.
 
 # Demo
 
@@ -171,6 +172,31 @@ function downloadFile(blob) {
 
 Run the code on Plunker: https://plnkr.co/edit/4sVljNIpqSUE9HCA?preview
 
+## Custom web workers and compression engines
+
+zip.js can create its web workers with the standard bundler pattern and
+delegate compression/decompression to a custom engine, e.g.
+[fflate](https://github.com/101arrowz/fflate):
+
+```js
+import { configure } from "@zip.js/zip.js/lib/zip-core-custom.js";
+
+configure({
+  createWorker: () => new Worker(new URL("./zip-worker.js", import.meta.url), { type: "module" })
+});
+```
+
+```js
+// zip-worker.js
+import { initWorker } from "@zip.js/zip.js/worker";
+import { CompressionStreamFallback, DecompressionStreamFallback } from "./fflate-streams.js";
+
+initWorker({ CompressionStreamFallback, DecompressionStreamFallback });
+```
+
+See https://gildas-lormeau.github.io/zip.js/#custom-workers for a complete
+guide.
+
 ## Tests
 
 See https://github.com/gildas-lormeau/zip.js/tree/master/tests/all

package/deno.json

@@ -1,12 +1,15 @@
 {
 	"name": "@zip-js/zip-js",
-	"version": "2.8.45",
+	"version": "2.8.47",
 	"exports": {
 		".": "./index.js",
 		"./external": "./lib/zip-fs-external.js",
 		"./mime-types": "./lib/zip-mime-types.js",
 		"./lib/zip-core-external.js": "./lib/zip-core-external.js",
-		"./lib/zip-fs-core-external.js": "./lib/zip-fs-core-external.js"
+		"./lib/zip-fs-core-external.js": "./lib/zip-fs-core-external.js",
+		"./lib/zip-core-custom.js": "./lib/zip-core-custom.js",
+		"./worker": "./lib/core/web-worker-base.js",
+		"./lib/core/web-worker-base.js": "./lib/core/web-worker-base.js"
 	},
 	"publish": {
 		"exclude": [
@@ -23,13 +26,20 @@
 			"package-lock.json",
 			".npmignore",
 			"eslint.config.mjs",
-			"worker-message-property-names.js"
+			"worker-message-property-names.js",
+			"lib/core/web-worker-inline-template.js",
+			"lib/core/web-worker-inline-template-native.js",
+			"lib/core/zlib-streams-inline-template.js",
+			"lib/core/web-worker-inline-base.js"
 		]
 	},
 	"lint": {
 		"exclude": [
 			"dist/*.js",
 			"*-inline.js",
+			"lib/core/web-worker-inline-wasm.js",
+			"lib/core/web-worker-inline-native.js",
+			"lib/core/zlib-streams-inline.js",
 			"tests/",
 			"benchmarks/",
 			"**/*.cjs",

package/dist/zip-core-external.js

@@ -38,6 +38,7 @@ const LOCAL_FILE_HEADER_SIGNATURE = 0x04034b50;
 const SPLIT_ZIP_FILE_SIGNATURE = 0x08074b50;
 const DATA_DESCRIPTOR_RECORD_SIGNATURE = SPLIT_ZIP_FILE_SIGNATURE;
 const ARCHIVE_EXTRA_DATA_SIGNATURE = 0x08064b50;
+const DIGITAL_SIGNATURE_RECORD_SIGNATURE = 0x05054b50;
 const CENTRAL_FILE_HEADER_SIGNATURE = 0x02014b50;
 const END_OF_CENTRAL_DIR_SIGNATURE = 0x06054b50;
 const ZIP64_END_OF_CENTRAL_DIR_SIGNATURE = 0x06064b50;
@@ -167,6 +168,7 @@ const CONFIGURABLE_PROPERTY_NAMES = [
 	"baseURI",
 	"wasmURI",
 	"workerURI",
+	"createWorker",
 	"chunkSize",
 	"maxWorkers",
 	"terminateWorkerTimeout",
@@ -177,8 +179,8 @@ const CONFIGURABLE_PROPERTY_NAMES = [
 	"transferStreams",
 	"CompressionStream",
 	"DecompressionStream",
-	"CompressionStreamZlib",
-	"DecompressionStreamZlib"
+	"CompressionStreamFallback",
+	"DecompressionStreamFallback"
 ];
 
 const config = { ...DEFAULT_CONFIGURATION };
@@ -192,6 +194,7 @@ function getChunkSize(config) {
 }
 
 function configure(configuration) {
+	configuration = normalizeConfiguration(configuration);
 	for (const propertyName of CONFIGURABLE_PROPERTY_NAMES) {
 		const propertyValue = configuration[propertyName];
 		if (propertyValue !== UNDEFINED_VALUE) {
@@ -200,7 +203,23 @@ function configure(configuration) {
 	}
 }
 
+function normalizeConfiguration(configuration) {
+	const { CompressionStreamZlib, DecompressionStreamZlib } = configuration;
+	if (CompressionStreamZlib === UNDEFINED_VALUE && DecompressionStreamZlib === UNDEFINED_VALUE) {
+		return configuration;
+	}
+	const normalizedConfiguration = Object.assign({}, configuration);
+	if (normalizedConfiguration.CompressionStreamFallback === UNDEFINED_VALUE) {
+		normalizedConfiguration.CompressionStreamFallback = CompressionStreamZlib;
+	}
+	if (normalizedConfiguration.DecompressionStreamFallback === UNDEFINED_VALUE) {
+		normalizedConfiguration.DecompressionStreamFallback = DecompressionStreamZlib;
+	}
+	return normalizedConfiguration;
+}
+
 function setDefaultConfiguration(configuration) {
+	configuration = normalizeConfiguration(configuration);
 	for (const propertyName of CONFIGURABLE_PROPERTY_NAMES) {
 		const propertyValue = configuration[propertyName];
 		if (propertyValue !== UNDEFINED_VALUE) {
@@ -1963,7 +1982,7 @@ const GZIP_OUTPUT_STALL_TIMEOUT = 5000;
 
 class DeflateStream extends TransformStream {
 
-	constructor(options, { chunkSize, CompressionStreamZlib, CompressionStream }) {
+	constructor(options, { chunkSize, CompressionStreamFallback, CompressionStream }) {
 		super({});
 		const { compressed, encrypted, useCompressionStream, zipCrypto, computeCrc32, level, deflate64, format, compressionMethod } = options;
 		const stream = this;
@@ -1985,7 +2004,7 @@ class DeflateStream extends TransformStream {
 				readable = pipeThrough(readable, gzipCrc32Stream);
 			} else {
 				try {
-					readable = pipeThroughCompressionStream(readable, useCompressionStream, { level, chunkSize }, CompressionStream, CompressionStreamZlib);
+					readable = pipeThroughCompressionStream(readable, useCompressionStream, { level, chunkSize }, CompressionStream, CompressionStreamFallback);
 				} catch (error) {
 					let gzipStream;
 					try {
@@ -2127,7 +2146,7 @@ function pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize) {
 
 class InflateStream extends TransformStream {
 
-	constructor(options, { chunkSize, DecompressionStreamZlib, DecompressionStream }) {
+	constructor(options, { chunkSize, DecompressionStreamFallback, DecompressionStream }) {
 		super({});
 		const { zipCrypto, encrypted, checkCrc32, crc32, compressed, useCompressionStream, deflate64, format, compressionMethod, rawBitFlag, outputSize } = options;
 		let crc32Stream, decryptionStream;
@@ -2146,7 +2165,7 @@ class InflateStream extends TransformStream {
 				readable = pipeThroughBackpressured(readable, createCodecStream(codecStreams.DecompressionStream, format, { chunkSize, compressionMethod, rawBitFlag, uncompressedSize: outputSize }));
 			} else {
 				try {
-					readable = pipeThroughCompressionStream(readable, useCompressionStream, { chunkSize, deflate64 }, DecompressionStream, DecompressionStreamZlib);
+					readable = pipeThroughCompressionStream(readable, useCompressionStream, { chunkSize, deflate64 }, DecompressionStream, DecompressionStreamFallback);
 				} catch (error) {
 					if (deflate64 || outputSize === UNDEFINED_VALUE) {
 						throw error;
@@ -2225,17 +2244,17 @@ function createCodecStream(CodecStreamClass, format, options) {
 	return new CodecStreamClass(format, options);
 }
 
-function pipeThroughCompressionStream(readable, useCompressionStream, options, CompressionStreamNative, CompressionStreamZlib) {
+function pipeThroughCompressionStream(readable, useCompressionStream, options, CompressionStreamNative, CompressionStreamFallback) {
 	const Stream = useCompressionStream && CompressionStreamNative ?
 		CompressionStreamNative :
-		CompressionStreamZlib || CompressionStreamNative;
+		CompressionStreamFallback || CompressionStreamNative;
 	const format = options.deflate64 ? FORMAT_DEFLATE64_RAW : FORMAT_DEFLATE_RAW;
 	let codecStream;
 	try {
 		codecStream = new Stream(format, options);
 	} catch (error) {
-		if (useCompressionStream && CompressionStreamZlib && Stream != CompressionStreamZlib) {
-			codecStream = new CompressionStreamZlib(format, options);
+		if (useCompressionStream && CompressionStreamFallback && Stream != CompressionStreamFallback) {
+			codecStream = new CompressionStreamFallback(format, options);
 		} else {
 			throw error;
 		}
@@ -2498,7 +2517,7 @@ const ERROR_EVENT_TYPE = "error";
 const MESSAGE_ERROR_EVENT_TYPE = "messageerror";
 const ERR_WORKER_STARTUP_TIMEOUT = "Worker startup timeout";
 
-let webWorkerSupported, webWorkerSource, webWorkerURI, webWorkerOptions;
+let webWorkerSupported, webWorkerSource, webWorkerURI, webWorkerOptions, createWorkerFailed;
 let transferStreamsSupported = true;
 try {
 	transferStreamsSupported = typeof structuredClone == FUNCTION_TYPE && structuredClone(new DOMException("", "AbortError")).code !== UNDEFINED_VALUE;
@@ -2512,14 +2531,14 @@ function configureWorker({ initModule: initModuleFunction }) {
 }
 
 async function supportsDeflate(config) {
-	const { CompressionStream: NativeStream, CompressionStreamZlib: ZlibStream } = config;
-	if (ZlibStream && !ZlibStream.requiresModule) {
+	const { CompressionStream: NativeStream, CompressionStreamFallback: FallbackStream } = config;
+	if (FallbackStream && !FallbackStream.requiresModule) {
 		return true;
 	}
 	if (supportsDeflateRaw(NativeStream) || supportsGzip(NativeStream)) {
 		return true;
 	}
-	if (ZlibStream) {
+	if (FallbackStream) {
 		try {
 			await initModule$1(config);
 			return true;
@@ -2532,12 +2551,16 @@ async function supportsDeflate(config) {
 
 function resetWebWorkerSupport() {
 	webWorkerSupported = UNDEFINED_VALUE;
+	createWorkerFailed = false;
 }
 
 class CodecWorker {
 
-	constructor(workerData, { readable, writable }, { options, config, streamOptions, useWebWorkers, transferStreams, workerURI }, onTaskFinished) {
+	constructor(workerData, { readable, writable }, { options, config, streamOptions, useWebWorkers, transferStreams, workerURI, createWorker }, onTaskFinished) {
 		const { signal } = streamOptions;
+		if (createWorkerFailed) {
+			createWorker = UNDEFINED_VALUE;
+		}
 		Object.assign(workerData, {
 			busy: true,
 			generation: (workerData.generation || 0) + 1,
@@ -2547,6 +2570,7 @@ class CodecWorker {
 			writable,
 			options: Object.assign({}, options),
 			workerURI,
+			createWorker,
 			transferStreams,
 			terminate() {
 				return new Promise(resolve => {
@@ -2582,7 +2606,7 @@ class CodecWorker {
 			// deno-lint-ignore valid-typeof
 			webWorkerSupported = typeof Worker != UNDEFINED_TYPE;
 		}
-		return (useWebWorkers && webWorkerSupported ? createWebWorkerInterface : createWorkerInterface)(workerData, config);
+		return (useWebWorkers && ((webWorkerSupported && workerURI) || createWorker) ? createWebWorkerInterface : createWorkerInterface)(workerData, config);
 	}
 }
 
@@ -2639,7 +2663,11 @@ function createWebWorkerInterface(workerData, config) {
 		try {
 			worker = getWebWorker(workerData.workerURI, baseURI, workerData);
 		} catch {
-			webWorkerSupported = false;
+			if (workerData.createWorker) {
+				createWorkerFailed = true;
+			} else {
+				webWorkerSupported = false;
+			}
 			return createWorkerInterface(workerData, config);
 		}
 		Object.assign(workerData, {
@@ -2652,7 +2680,11 @@ function createWebWorkerInterface(workerData, config) {
 						return await runWebWorker(workerData, { chunkSize, wasmURI, baseURI, workerStartupTimeout });
 					} catch (error) {
 						if (error && error.workerStartupFailed) {
-							webWorkerSupported = false;
+							if (workerData.createWorker) {
+								createWorkerFailed = true;
+							} else {
+								webWorkerSupported = false;
+							}
 							const { reader } = workerData;
 							if (reader) {
 								reader.releaseLock();
@@ -2675,17 +2707,17 @@ async function runWorker$1({ options, readable, writable, onTaskFinished }, conf
 	try {
 		if (options.compressed && !options.format) {
 			const deflate = options.codecType.startsWith(CODEC_DEFLATE);
-			const ZlibStream = deflate ? config.CompressionStreamZlib : config.DecompressionStreamZlib;
+			const FallbackStream = deflate ? config.CompressionStreamFallback : config.DecompressionStreamFallback;
 			const NativeStream = deflate ? config.CompressionStream : config.DecompressionStream;
 			if (!options.useCompressionStream) {
 				try {
 					await initModule$1(config);
 				} catch {
-					if (!ZlibStream || ZlibStream.requiresModule) {
+					if (!FallbackStream || FallbackStream.requiresModule) {
 						options.useCompressionStream = true;
 					}
 				}
-			} else if (ZlibStream && ZlibStream.requiresModule && !supportsDeflateRaw(NativeStream)) {
+			} else if (FallbackStream && FallbackStream.requiresModule && !supportsDeflateRaw(NativeStream)) {
 				try {
 					await initModule$1(config);
 				} catch {
@@ -2810,8 +2842,11 @@ function terminateWorker$1(workerData) {
 }
 
 function getWebWorker(url, baseURI, workerData, isModuleType, useBlobURI = true) {
+	const { createWorker } = workerData;
 	let worker, resolvedURI, resolvedOptions;
-	if (webWorkerURI === UNDEFINED_VALUE || webWorkerSource !== url) {
+	if (createWorker) {
+		worker = createWorker();
+	} else if (webWorkerURI === UNDEFINED_VALUE || webWorkerSource !== url) {
 		// deno-lint-ignore valid-typeof
 		const isFunctionURI = typeof url == FUNCTION_TYPE;
 		if (isFunctionURI) {
@@ -3066,7 +3101,7 @@ let indexWorker = 0;
 async function runWorker(stream, workerOptions) {
 	const { options, config } = workerOptions;
 	const { transferStreams, useWebWorkers, useCompressionStream, compressed, checkCrc32, computeCrc32, encrypted, format, codecURI } = options;
-	const { workerURI, maxWorkers } = config;
+	const { workerURI, createWorker, maxWorkers } = config;
 	if (format) {
 		if (codecURI) {
 			options.codecURI = resolveCodecURI(codecURI, config.baseURI);
@@ -3078,6 +3113,7 @@ async function runWorker(stream, workerOptions) {
 	const workerSupported = format === UNDEFINED_VALUE || Boolean(options.codecURI);
 	workerOptions.useWebWorkers = !streamCopy && workerSupported && (useWebWorkers || (useWebWorkers === UNDEFINED_VALUE && config.useWebWorkers));
 	workerOptions.workerURI = workerOptions.useWebWorkers && workerURI ? workerURI : UNDEFINED_VALUE;
+	workerOptions.createWorker = workerOptions.useWebWorkers && createWorker ? createWorker : UNDEFINED_VALUE;
 	options.useCompressionStream = useCompressionStream || (useCompressionStream === UNDEFINED_VALUE && config.useCompressionStream);
 	return (await getWorker()).run();
 
@@ -3141,7 +3177,7 @@ function onWorkerStarvation() {
 	starvationTimeout = null;
 	if (pendingRequests.length) {
 		const [{ resolve, stream, workerOptions }] = pendingRequests.splice(0, 1);
-		const inlineWorkerOptions = Object.assign({}, workerOptions, { useWebWorkers: false, workerURI: UNDEFINED_VALUE });
+		const inlineWorkerOptions = Object.assign({}, workerOptions, { useWebWorkers: false, workerURI: UNDEFINED_VALUE, createWorker: UNDEFINED_VALUE });
 		resolve(new CodecWorker({}, stream, inlineWorkerOptions, onInlineTaskFinished));
 		armStarvationTimeout();
 	}
@@ -4450,6 +4486,8 @@ const OPTION_UNIX_EXTRA_FIELD_TYPE = "unixExtraFieldType";
 const OPTION_LOCAL_EXTRA_FIELD = "localExtraField";
 const OPTION_STRICTNESS = "strictness";
 const OPTION_MAX_APPENDED_DATA_SIZE = "maxAppendedDataSize";
+const OPTION_DECRYPT_CENTRAL_DIRECTORY = "decryptCentralDirectory";
+const OPTION_SIGN_CENTRAL_DIRECTORY = "signCentralDirectory";
 const STRICTNESS_STRICT = "strict";
 const STRICTNESS_BALANCED = "balanced";
 const STRICTNESS_TOLERANT = "tolerant";
@@ -4575,6 +4613,7 @@ class ZipReader {
 		let startOffset;
 		let zip64EndOfDirectory;
 		let zip64EndOfDirectoryVersion2;
+		let directoryEncryptionInfo;
 		const requiresZip64 = directoryDataOffset == MAX_32_BITS || directoryDataLength == MAX_32_BITS || filesLength == MAX_16_BITS || diskNumber == MAX_16_BITS;
 		if (directoryDataOffset != MAX_32_BITS && diskNumber != MAX_16_BITS) {
 			directoryDataOffset += getDiskOffset$1(reader, diskNumber);
@@ -4605,6 +4644,15 @@ class ZipReader {
 				}
 				zip64EndOfDirectory = true;
 				zip64EndOfDirectoryVersion2 = getBigUint64(endOfDirectoryView, 4) > ZIP64_END_OF_CENTRAL_DIR_LENGTH - 12;
+				if (zip64EndOfDirectoryVersion2) {
+					const extensibleDataLength = Math.min(
+						Number(getBigUint64(endOfDirectoryView, 4)) - (ZIP64_END_OF_CENTRAL_DIR_LENGTH - 12),
+						reader.size - directoryDataOffset - ZIP64_END_OF_CENTRAL_DIR_LENGTH);
+					if (extensibleDataLength > 0) {
+						const rawExtensibleData = await readUint8Array(reader, directoryDataOffset + ZIP64_END_OF_CENTRAL_DIR_LENGTH, extensibleDataLength);
+						directoryEncryptionInfo = getDirectoryEncryptionInfo(rawExtensibleData);
+					}
+				}
 				if (lastDiskNumber == MAX_16_BITS) {
 					lastDiskNumber = getUint32(endOfDirectoryView, 16);
 				} else if (checkAmbiguity && lastDiskNumber != getUint32(endOfDirectoryView, 16)) {
@@ -4628,7 +4676,7 @@ class ZipReader {
 				directoryDataOffset = getDiskOffset$1(reader, diskNumber) + getBigUint64(endOfDirectoryView, 48) + prependedDataLength;
 			}
 		}
-		const declaredDirectoryDataLength = directoryDataLength;
+		let declaredDirectoryDataLength = directoryDataLength;
 		const centralDirectoryEndOffset = endOfDirectoryInfo.offset -
 			(zip64EndOfDirectory ? ZIP64_END_OF_CENTRAL_DIR_LENGTH + ZIP64_END_OF_CENTRAL_DIR_LOCATOR_LENGTH : 0);
 		if (directoryDataOffset >= reader.size) {
@@ -4676,6 +4724,18 @@ class ZipReader {
 		if (directoryDataOffset < 0 || directoryDataOffset >= reader.size) {
 			throw new Error(ERR_BAD_FORMAT);
 		}
+		zipReader.directoryOffset = directoryDataOffset;
+		zipReader.directoryLength = declaredDirectoryDataLength;
+		const decryptCentralDirectory = getOptionValue$1(zipReader, options, OPTION_DECRYPT_CENTRAL_DIRECTORY);
+		let decryptedDirectory;
+		if (decryptCentralDirectory && filesLength && directoryArray.length >= 4 &&
+			getUint32(directoryView, 0) != CENTRAL_FILE_HEADER_SIGNATURE &&
+			(zip64EndOfDirectoryVersion2 || detectEncryptedCentralDirectory(directoryView))) {
+			directoryArray = await decryptCentralDirectory(directoryArray, directoryEncryptionInfo);
+			directoryView = getDataView(directoryArray);
+			declaredDirectoryDataLength = directoryArray.length;
+			decryptedDirectory = true;
+		}
 		startOffset = directoryDataOffset;
 		const filenameEncoding = getOptionValue$1(zipReader, options, OPTION_FILENAME_ENCODING);
 		const commentEncoding = getOptionValue$1(zipReader, options, OPTION_COMMENT_ENCODING);
@@ -4684,7 +4744,7 @@ class ZipReader {
 		for (let indexFile = 0; indexFile < filesLength; indexFile++) {
 			const fileEntry = new ZipEntry(reader, config, zipReader.options);
 			if (offset + CENTRAL_FILE_HEADER_LENGTH > directoryArray.length || getUint32(directoryView, offset) != CENTRAL_FILE_HEADER_SIGNATURE) {
-				if (indexFile == 0 && (zip64EndOfDirectoryVersion2 || detectEncryptedCentralDirectory(directoryView))) {
+				if (indexFile == 0 && !decryptedDirectory && (zip64EndOfDirectoryVersion2 || detectEncryptedCentralDirectory(directoryView))) {
 					throw new Error(ERR_ENCRYPTED_CENTRAL_DIRECTORY);
 				}
 				throw new Error(ERR_CENTRAL_DIRECTORY_NOT_FOUND);
@@ -4797,7 +4857,15 @@ class ZipReader {
 			}
 			yield entry;
 		}
-		if (checkAmbiguity && offset != declaredDirectoryDataLength) {
+		let offsetAfterSignature = offset;
+		if (offset + 6 <= directoryArray.length && getUint32(directoryView, offset) == DIGITAL_SIGNATURE_RECORD_SIGNATURE) {
+			const signatureDataLength = getUint16(directoryView, offset + 4);
+			if (offset + 6 + signatureDataLength <= directoryArray.length) {
+				zipReader.digitalSignature = directoryArray.subarray(offset + 6, offset + 6 + signatureDataLength);
+				offsetAfterSignature = offset + 6 + signatureDataLength;
+			}
+		}
+		if (checkAmbiguity && offset != declaredDirectoryDataLength && offsetAfterSignature != declaredDirectoryDataLength) {
 			throwAmbiguousArchive("trailing central directory data");
 		}
 		if (duplicateFilename) {
@@ -5069,6 +5137,25 @@ function detectEncryptedCentralDirectory(directoryView) {
 	return false;
 }
 
+function getDirectoryEncryptionInfo(rawExtensibleData) {
+	const directoryEncryptionInfo = { rawExtensibleData };
+	if (rawExtensibleData.length >= 28) {
+		const extensibleDataView = getDataView(rawExtensibleData);
+		const hashDataLength = getUint16(extensibleDataView, 26);
+		Object.assign(directoryEncryptionInfo, {
+			compressionMethod: getUint16(extensibleDataView, 0),
+			compressedSize: Number(getBigUint64(extensibleDataView, 2)),
+			uncompressedSize: Number(getBigUint64(extensibleDataView, 10)),
+			encryptionAlgorithm: getUint16(extensibleDataView, 18),
+			bitLength: getUint16(extensibleDataView, 20),
+			flags: getUint16(extensibleDataView, 22),
+			hashAlgorithm: getUint16(extensibleDataView, 24),
+			hashData: rawExtensibleData.subarray(28, 28 + hashDataLength)
+		});
+	}
+	return directoryEncryptionInfo;
+}
+
 function readCommonHeader(directory, dataView, offset) {
 	const rawBitFlag = directory.rawBitFlag = getUint16(dataView, offset + 2);
 	const encrypted = (rawBitFlag & BITFLAG_ENCRYPTED) == BITFLAG_ENCRYPTED;
@@ -5620,6 +5707,7 @@ var zipReader = /*#__PURE__*/Object.freeze({
 	ERR_SPLIT_ZIP_FILE: ERR_SPLIT_ZIP_FILE,
 	ERR_UNSUPPORTED_COMPRESSION: ERR_UNSUPPORTED_COMPRESSION$1,
 	ERR_UNSUPPORTED_ENCRYPTION: ERR_UNSUPPORTED_ENCRYPTION,
+	ERR_WORKER_STARTUP_TIMEOUT: ERR_WORKER_STARTUP_TIMEOUT,
 	ZipReader: ZipReader,
 	ZipReaderStream: ZipReaderStream
 });
@@ -5678,6 +5766,7 @@ const ERR_INVALID_UNIX_EXTRA_FIELD_TYPE = "Invalid unixExtraFieldType (must be '
 const ERR_INVALID_UNIX_ID_SIZE = "uid/gid must be 0..65535 for unixExtraFieldType 'unix' (use 'infozip' for larger ids)";
 const ERR_INVALID_MSDOS_ATTRIBUTES = "Invalid msdosAttributesRaw (must be integer 0..255)";
 const ERR_INVALID_MSDOS_DATA = "Invalid msdosAttributes (must be an object with boolean flags)";
+const ERR_INVALID_SIGNATURE_DATA = "Signature data exceeds 64KB";
 
 const EXTRAFIELD_DATA_AES = new Uint8Array([0x07, 0x00, 0x02, 0x00, 0x41, 0x45, 0x03, 0x00, 0x00]);
 const EXTRAFIELD_OFFSET_AES_VENDOR_VERSION = 4;
@@ -7037,8 +7126,9 @@ function updateLocalHeader({
 
 async function closeFile(zipWriter, comment, options) {
 	const directoryDataLength = createDirectoryRecords(zipWriter.files);
-	const directoryStart = await writeDirectoryRecords(zipWriter, directoryDataLength, options);
-	await writeEndOfDirectoryRecord(zipWriter, comment, options, { directoryStart, directoryDataLength });
+	const { directoryStart, directoryArray } = await writeDirectoryRecords(zipWriter, directoryDataLength, options);
+	const signatureLength = await writeDigitalSignatureRecord(zipWriter, directoryArray, options);
+	await writeEndOfDirectoryRecord(zipWriter, comment, options, { directoryStart, directoryDataLength, signatureLength });
 }
 
 function createDirectoryRecords(files) {
@@ -7195,12 +7285,33 @@ async function writeDirectoryRecords(zipWriter, directoryDataLength, options) {
 		}
 	}
 	await writeData(writer, directoryDiskOffset ? directoryArray.slice(directoryDiskOffset) : directoryArray);
-	return { diskNumber: directoryStartDiskNumber, diskOffset: directoryStartDiskOffset };
+	return {
+		directoryStart: { diskNumber: directoryStartDiskNumber, diskOffset: directoryStartDiskOffset },
+		directoryArray
+	};
+}
+
+async function writeDigitalSignatureRecord(zipWriter, directoryArray, options) {
+	const signCentralDirectory = getOptionValue(zipWriter, options, OPTION_SIGN_CENTRAL_DIRECTORY);
+	if (signCentralDirectory) {
+		const signatureData = await signCentralDirectory(directoryArray);
+		const signatureDataLength = getLength(signatureData);
+		if (signatureDataLength > MAX_16_BITS) {
+			throw new Error(ERR_INVALID_SIGNATURE_DATA);
+		}
+		const signatureRecord = createRecordWriter(6 + signatureDataLength);
+		signatureRecord.uint32(DIGITAL_SIGNATURE_RECORD_SIGNATURE);
+		signatureRecord.uint16(signatureDataLength);
+		signatureRecord.bytes(signatureData);
+		await writeData(zipWriter.writer, signatureRecord.array);
+		return 6 + signatureDataLength;
+	}
+	return 0;
 }
 
 async function writeEndOfDirectoryRecord(zipWriter, comment, options, cdInfo) {
 	const { writer } = zipWriter;
-	const { directoryStart } = cdInfo;
+	const { directoryStart, signatureLength } = cdInfo;
 	let { directoryDataLength } = cdInfo;
 	let filesLength = zipWriter.files.size;
 	let diskNumber = directoryStart.diskNumber;
@@ -7239,7 +7350,7 @@ async function writeEndOfDirectoryRecord(zipWriter, comment, options, cdInfo) {
 		endOfdirectoryRecord.uint64(directoryOffset);
 		endOfdirectoryRecord.uint32(ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIGNATURE);
 		endOfdirectoryRecord.uint32(lastDiskNumber);
-		endOfdirectoryRecord.uint64(BigInt(getSegmentOffset(zipWriter, writer)) + BigInt(directoryDataLength));
+		endOfdirectoryRecord.uint64(BigInt(getSegmentOffset(zipWriter, writer)) + BigInt(directoryDataLength) + BigInt(signatureLength));
 		endOfdirectoryRecord.uint32(lastDiskNumber + 1);
 		const supportZip64SplitFile = getOptionValue(zipWriter, options, OPTION_SUPPORT_ZIP64_SPLIT_FILE, true);
 		if (supportZip64SplitFile) {
@@ -8278,8 +8389,8 @@ configureWorker({
 	}
 });
 setDefaultConfiguration({
-	CompressionStreamZlib,
-	DecompressionStreamZlib
+	CompressionStreamFallback: CompressionStreamZlib,
+	DecompressionStreamFallback: DecompressionStreamZlib
 });
 
 function terminateWorkersAndModule() {
@@ -8293,4 +8404,4 @@ function terminateWorkersAndModule() {
 
 configureExternalAssets();
 
-export { BlobReader, BlobWriter, Data64URIReader, Data64URIWriter, ERR_AMBIGUOUS_ARCHIVE, ERR_BAD_FORMAT, ERR_CENTRAL_DIRECTORY_NOT_FOUND, ERR_DUPLICATED_NAME, ERR_ENCRYPTED, ERR_ENCRYPTED_CENTRAL_DIRECTORY, ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND, ERR_EOCDR_NOT_FOUND, ERR_EXTRAFIELD_ZIP64_NOT_FOUND, ERR_HTTP_RANGE, ERR_HTTP_RESOURCE_CHANGED, ERR_INVALID_AUTHENTICATION_CODE, ERR_INVALID_CODEC_DEFINITION, ERR_INVALID_CODEC_MODULE, ERR_INVALID_COMMENT, ERR_INVALID_COMPRESSED_DATA, ERR_INVALID_CRC32, ERR_INVALID_ENCRYPTION_STRENGTH, ERR_INVALID_ENTRY_COMMENT, ERR_INVALID_ENTRY_NAME, ERR_INVALID_EXTRAFIELD_DATA, ERR_INVALID_EXTRAFIELD_TYPE, ERR_INVALID_PASSWORD, ERR_INVALID_SIGNATURE, ERR_INVALID_UNCOMPRESSED_SIZE, ERR_INVALID_VERSION, ERR_ITERATOR_COMPLETED_TOO_SOON, ERR_LOCAL_FILE_HEADER_NOT_FOUND, ERR_OVERLAPPING_ENTRY, ERR_RESERVED_COMPRESSION_METHOD, ERR_SPLIT_ZIP_FILE, ERR_UNDEFINED_READER, ERR_UNDEFINED_UNCOMPRESSED_SIZE, ERR_UNSUPPORTED_COMPRESSION$1 as ERR_UNSUPPORTED_COMPRESSION, ERR_UNSUPPORTED_ENCRYPTION, ERR_UNSUPPORTED_ENCRYPTION_USDZ, ERR_UNSUPPORTED_FORMAT, ERR_WRITER_NOT_INITIALIZED, ERR_ZIP_NOT_EMPTY, HttpRangeReader, HttpReader, Reader, SplitDataReader, SplitDataWriter, TextReader, TextWriter, Uint8ArrayReader, Uint8ArrayWriter, Writer, ZipReader, ZipReaderStream, ZipWriter, ZipWriterStream, configure, createBlobTempStream, createOPFSTempStream, createSyncAccessHandleTempStream, getMimeType, registerCodec, resetConfiguration, terminateWorkersAndModule as terminateWorkers, unregisterCodec };
+export { BlobReader, BlobWriter, Data64URIReader, Data64URIWriter, ERR_AMBIGUOUS_ARCHIVE, ERR_BAD_FORMAT, ERR_CENTRAL_DIRECTORY_NOT_FOUND, ERR_DUPLICATED_NAME, ERR_ENCRYPTED, ERR_ENCRYPTED_CENTRAL_DIRECTORY, ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND, ERR_EOCDR_NOT_FOUND, ERR_EXTRAFIELD_ZIP64_NOT_FOUND, ERR_HTTP_RANGE, ERR_HTTP_RESOURCE_CHANGED, ERR_INVALID_AUTHENTICATION_CODE, ERR_INVALID_CODEC_DEFINITION, ERR_INVALID_CODEC_MODULE, ERR_INVALID_COMMENT, ERR_INVALID_COMPRESSED_DATA, ERR_INVALID_CRC32, ERR_INVALID_ENCRYPTION_STRENGTH, ERR_INVALID_ENTRY_COMMENT, ERR_INVALID_ENTRY_NAME, ERR_INVALID_EXTRAFIELD_DATA, ERR_INVALID_EXTRAFIELD_TYPE, ERR_INVALID_GID, ERR_INVALID_MSDOS_ATTRIBUTES, ERR_INVALID_MSDOS_DATA, ERR_INVALID_PASSWORD, ERR_INVALID_SIGNATURE, ERR_INVALID_SIGNATURE_DATA, ERR_INVALID_UID, ERR_INVALID_UNCOMPRESSED_SIZE, ERR_INVALID_UNIX_EXTRA_FIELD_TYPE, ERR_INVALID_UNIX_ID_SIZE, ERR_INVALID_UNIX_MODE, ERR_INVALID_VERSION, ERR_ITERATOR_COMPLETED_TOO_SOON, ERR_LOCAL_FILE_HEADER_NOT_FOUND, ERR_OVERLAPPING_ENTRY, ERR_RESERVED_COMPRESSION_METHOD, ERR_SPLIT_ZIP_FILE, ERR_UNDEFINED_READER, ERR_UNDEFINED_UNCOMPRESSED_SIZE, ERR_UNSUPPORTED_COMPRESSION$1 as ERR_UNSUPPORTED_COMPRESSION, ERR_UNSUPPORTED_CONTEXT, ERR_UNSUPPORTED_CRYPTO_API, ERR_UNSUPPORTED_ENCRYPTION, ERR_UNSUPPORTED_ENCRYPTION_USDZ, ERR_UNSUPPORTED_FORMAT, ERR_WORKER_STARTUP_TIMEOUT, ERR_WRITER_NOT_INITIALIZED, ERR_ZIP_NOT_EMPTY, HttpRangeReader, HttpReader, Reader, SplitDataReader, SplitDataWriter, TextReader, TextWriter, Uint8ArrayReader, Uint8ArrayWriter, Writer, ZipReader, ZipReaderStream, ZipWriter, ZipWriterStream, configure, createBlobTempStream, createOPFSTempStream, createSyncAccessHandleTempStream, getMimeType, registerCodec, resetConfiguration, terminateWorkersAndModule as terminateWorkers, unregisterCodec };