@zip.js/zip.js 2.8.11 → 2.8.14

package/index.cjs

@@ -5189,15 +5189,19 @@ function getHeaderInfo(options) {
 	let { version, compressionMethod } = options;
 	const compressed = !directory && (level > 0 || (level === UNDEFINED_VALUE && compressionMethod !== 0));
 	let rawExtraFieldZip64;
+	let rawLocalExtraFieldZip64;
 	const uncompressedFile = passThrough || !compressed;
 	const zip64ExtraFieldComplete = zip64 && (options.bufferedWrite || ((!zip64UncompressedSize && !zip64CompressedSize) || uncompressedFile));
 	if (zip64) {
 		let rawExtraFieldZip64Length = 4;
+		let rawLocalExtraFieldZip64Length = 4;
 		if (zip64UncompressedSize) {
 			rawExtraFieldZip64Length += 8;
+			rawLocalExtraFieldZip64Length += 8;
 		}
 		if (zip64CompressedSize) {
 			rawExtraFieldZip64Length += 8;
+			rawLocalExtraFieldZip64Length += 8;
 		}
 		if (zip64Offset) {
 			rawExtraFieldZip64Length += 8;
@@ -5207,18 +5211,28 @@ function getHeaderInfo(options) {
 		}
 		rawExtraFieldZip64 = new Uint8Array(rawExtraFieldZip64Length);
 		const rawExtraFieldZip64View = getDataView(rawExtraFieldZip64);
+		rawLocalExtraFieldZip64 = new Uint8Array(rawLocalExtraFieldZip64Length);
+		const rawLocalExtraFieldZip64View = getDataView(rawLocalExtraFieldZip64);
 		setUint16(rawExtraFieldZip64View, 0, EXTRAFIELD_TYPE_ZIP64);
 		setUint16(rawExtraFieldZip64View, 2, getLength(rawExtraFieldZip64) - 4);
+		setUint16(rawLocalExtraFieldZip64View, 0, EXTRAFIELD_TYPE_ZIP64);
+		setUint16(rawLocalExtraFieldZip64View, 2, getLength(rawLocalExtraFieldZip64) - 4);
 		if (zip64ExtraFieldComplete) {
 			const rawExtraFieldZip64View = getDataView(rawExtraFieldZip64);
+			const rawLocalExtraFieldZip64View = getDataView(rawLocalExtraFieldZip64);
 			let rawExtraFieldZip64Offset = 4;
+			let rawLocalExtraFieldZip64Offset = 4;
 			if (zip64UncompressedSize) {
 				setBigUint64(rawExtraFieldZip64View, rawExtraFieldZip64Offset, BigInt(uncompressedSize));
 				rawExtraFieldZip64Offset += 8;
+				setBigUint64(rawLocalExtraFieldZip64View, rawLocalExtraFieldZip64Offset, BigInt(uncompressedSize));
+				rawLocalExtraFieldZip64Offset += 8;
 			}
 			if (zip64CompressedSize && uncompressedFile) {
 				setBigUint64(rawExtraFieldZip64View, rawExtraFieldZip64Offset, BigInt(uncompressedSize));
 				rawExtraFieldZip64Offset += 8;
+				setBigUint64(rawLocalExtraFieldZip64View, rawLocalExtraFieldZip64Offset, BigInt(uncompressedSize));
+				rawLocalExtraFieldZip64Offset += 8;
 			}
 			if (zip64Offset) {
 				setBigUint64(rawExtraFieldZip64View, rawExtraFieldZip64Offset, BigInt(offset));
@@ -5228,9 +5242,13 @@ function getHeaderInfo(options) {
 				setUint32(rawExtraFieldZip64View, rawExtraFieldZip64Offset, diskNumberStart);
 				rawExtraFieldZip64Offset += 4;
 			}
+			if (rawLocalExtraFieldZip64Offset == 4) {
+				rawLocalExtraFieldZip64 = new Uint8Array();
+			}
 		}
 	} else {
 		rawExtraFieldZip64 = new Uint8Array();
+		rawLocalExtraFieldZip64 = new Uint8Array();
 	}
 	let rawExtraFieldAES;
 	if (encrypted && !zipCrypto) {
@@ -5333,7 +5351,7 @@ function getHeaderInfo(options) {
 		rawExtraFieldAES[9] = compressionMethod;
 		compressionMethod = COMPRESSION_METHOD_AES;
 	}
-	const localExtraFieldZip64Length = zip64ExtraFieldComplete ? getLength(rawExtraFieldZip64) : 0;
+	const localExtraFieldZip64Length = zip64ExtraFieldComplete ? getLength(rawLocalExtraFieldZip64) : 0;
 	const extraFieldLength = localExtraFieldZip64Length + getLength(rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawExtraFieldUnix, rawExtraField);
 	const {
 		headerArray,
@@ -5358,7 +5376,7 @@ function getHeaderInfo(options) {
 	arraySet(localHeaderArray, rawFilename, localHeaderOffset);
 	localHeaderOffset += getLength(rawFilename);
 	if (zip64ExtraFieldComplete) {
-		arraySet(localHeaderArray, rawExtraFieldZip64, localHeaderOffset);
+		arraySet(localHeaderArray, rawLocalExtraFieldZip64, localHeaderOffset);
 	}
 	localHeaderOffset += localExtraFieldZip64Length;
 	arraySet(localHeaderArray, rawExtraFieldAES, localHeaderOffset);
@@ -5531,40 +5549,29 @@ function updateLocalHeader({
 	signature,
 	compressedSize,
 	uncompressedSize,
-	offset,
-	diskNumberStart,
 	zip64UncompressedSize,
-	zip64CompressedSize,
-	zip64Offset,
-	zip64DiskNumberStart
+	zip64CompressedSize
 }, localHeaderView, { dataDescriptor }) {
 	if (!dataDescriptor) {
 		if (!encrypted) {
 			setUint32(localHeaderView, HEADER_OFFSET_SIGNATURE + 4, signature);
 		}
-		if (!zip64) {
+		if (!zip64CompressedSize) {
 			setUint32(localHeaderView, HEADER_OFFSET_COMPRESSED_SIZE + 4, compressedSize);
+		}
+		if (!zip64UncompressedSize) {
 			setUint32(localHeaderView, HEADER_OFFSET_UNCOMPRESSED_SIZE + 4, uncompressedSize);
 		}
 	}
-	if (zip64) {
-		if (localExtraFieldZip64Length) {
-			let localHeaderOffset = HEADER_SIZE + getLength(rawFilename) + 4;
-			if (zip64UncompressedSize) {
-				setBigUint64(localHeaderView, localHeaderOffset, BigInt(uncompressedSize));
-				localHeaderOffset += 8;
-			}
-			if (zip64CompressedSize) {
-				setBigUint64(localHeaderView, localHeaderOffset, BigInt(compressedSize));
-				localHeaderOffset += 8;
-			}
-			if (zip64Offset) {
-				setBigUint64(localHeaderView, localHeaderOffset, BigInt(offset));
-				localHeaderOffset += 8;
-			}
-			if (zip64DiskNumberStart) {
-				setUint32(localHeaderView, localHeaderOffset, diskNumberStart);
-			}
+	if (zip64 && localExtraFieldZip64Length) {
+		let localHeaderOffset = HEADER_SIZE + getLength(rawFilename) + 4;
+		if (zip64UncompressedSize) {
+			setBigUint64(localHeaderView, localHeaderOffset, BigInt(uncompressedSize));
+			localHeaderOffset += 8;
+		}
+		if (zip64CompressedSize) {
+			setBigUint64(localHeaderView, localHeaderOffset, BigInt(compressedSize));
+			localHeaderOffset += 8;
 		}
 	}
 }

package/index.d.ts

@@ -218,10 +218,12 @@ export interface Configuration extends WorkerConfiguration {
    *
    * It allows using alternative deflate implementations or specifying a URL to the worker script if the CSP of the page blocks scripts imported from a Data URI.
    *
-   * Here is an example:
+   * Here is an example to import the worker module as a URL (see `?url`) and avoid CSP issues:
    * ```
+   * import workerURI from "@zip.js/zip.js/dist/zip-web-worker.js?url";
+   *
    * configure({
-   *   workerURI: "./custom-deflate.js"
+   *   workerURI
    * });
    * ```
    *
@@ -231,6 +233,15 @@ export interface Configuration extends WorkerConfiguration {
   /**
    * The URI of the WebAssembly module used by default implementations to compress/decompress data. It is ignored if `useCompressionStream` is set to `true` and `CompressionStream`/`DecompressionStream` are supported by the environment.
    *
+   * Here is an example to import the WASM module as a URL (see `?url`) and avoid CSP issues:
+   * ```
+   * import wasmURI from "@zip.js/zip.js/dist/zip-module.wasm?url";
+   *
+   * configure({
+   *   wasmURI
+   * });
+   * ```
+   *
    * @defaultValue "./core/streams/zlib-wasm/zlib-streams.wasm"
    */
   wasmURI?: string;