@zip.js/zip.js 2.7.65 → 2.7.67

package/lib/core/constants.js

@@ -29,6 +29,7 @@
 const MAX_32_BITS = 0xffffffff;
 const MAX_16_BITS = 0xffff;
 const COMPRESSION_METHOD_DEFLATE = 0x08;
+const COMPRESSION_METHOD_DEFLATE_64 = 0x09;
 const COMPRESSION_METHOD_STORE = 0x00;
 const COMPRESSION_METHOD_AES = 0x63;
 
@@ -88,6 +89,7 @@ export {
 	MAX_32_BITS,
 	MAX_16_BITS,
 	COMPRESSION_METHOD_DEFLATE,
+	COMPRESSION_METHOD_DEFLATE_64,
 	COMPRESSION_METHOD_STORE,
 	COMPRESSION_METHOD_AES,
 	SPLIT_ZIP_FILE_SIGNATURE,

package/lib/core/zip-writer.js

@@ -26,13 +26,14 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global TransformStream, Response, ReadableStream */
+/* global TransformStream, Response */
 // deno-lint-ignore-file no-this-alias
 
 import {
 	MAX_32_BITS,
 	MAX_16_BITS,
 	COMPRESSION_METHOD_DEFLATE,
+	COMPRESSION_METHOD_DEFLATE_64,
 	COMPRESSION_METHOD_STORE,
 	COMPRESSION_METHOD_AES,
 	SPLIT_ZIP_FILE_SIGNATURE,
@@ -152,27 +153,11 @@ class ZipWriter {
 		if (this.filenames.size) {
 			throw new Error(ERR_ZIP_NOT_EMPTY);
 		}
-		({ reader } = new GenericReader(reader));
-		const [zipEntriesReader, zipDataReader] = reader.readable.tee();
-		const zipReader = new ZipReader(new ReadableStream({
-			async start(controller) {
-				const reader = zipEntriesReader.getReader();
-				await readChunk();
-
-				async function readChunk() {
-					const { done, value } = await reader.read();
-					if (done) {
-						controller.close();
-					} else {
-						controller.enqueue(value);
-						await readChunk();
-					}
-				}
-			}
-		}));
+		reader = new GenericReader(reader);
+		const zipReader = new ZipReader(reader.readable);
 		const entries = await zipReader.getEntries();
 		await zipReader.close();
-		await zipDataReader.pipeTo(this.writer.writable, { preventClose: true, preventAbort: true });
+		await reader.readable.pipeTo(this.writer.writable, { preventClose: true, preventAbort: true });
 		this.writer.size = this.offset = reader.size;
 		this.filenames = new Set(entries.map(entry => entry.filename));
 		this.files = new Map(entries.map(entry => {
@@ -212,7 +197,7 @@ class ZipWriter {
 				headerView
 			} = getHeaderArrayData({
 				version,
-				bitflag: getBitflag(level, languageEncodingFlag, dataDescriptor, encrypted),
+				bitFlag: getBitFlag(level, languageEncodingFlag, dataDescriptor, encrypted, compressionMethod),
 				compressionMethod,
 				uncompressedSize,
 				compressedSize,
@@ -1014,7 +999,7 @@ function getHeaderInfo(options) {
 		rawLastModDate
 	} = getHeaderArrayData({
 		version,
-		bitflag: getBitflag(level, useUnicodeFileNames, dataDescriptor, encrypted),
+		bitFlag: getBitFlag(level, useUnicodeFileNames, dataDescriptor, encrypted, compressionMethod),
 		compressionMethod,
 		uncompressedSize,
 		lastModDate: lastModDate < MIN_DATE ? MIN_DATE : lastModDate > MAX_DATE ? MAX_DATE : lastModDate,
@@ -1466,7 +1451,7 @@ function getLength(...arrayLikes) {
 
 function getHeaderArrayData({
 	version,
-	bitflag,
+	bitFlag,
 	compressionMethod,
 	uncompressedSize,
 	compressedSize,
@@ -1479,7 +1464,7 @@ function getHeaderArrayData({
 	const headerArray = new Uint8Array(HEADER_SIZE);
 	const headerView = getDataView(headerArray);
 	setUint16(headerView, 0, version);
-	setUint16(headerView, 2, bitflag);
+	setUint16(headerView, 2, bitFlag);
 	setUint16(headerView, 4, compressionMethod);
 	const dateArray = new Uint32Array(1);
 	const dateView = getDataView(dateArray);
@@ -1502,8 +1487,7 @@ function getHeaderArrayData({
 	};
 }
 
-
-function getBitflag(level, useUnicodeFileNames, dataDescriptor, encrypted) {
+function getBitFlag(level, useUnicodeFileNames, dataDescriptor, encrypted, compressionMethod) {
 	let bitFlag = 0;
 	if (useUnicodeFileNames) {
 		bitFlag = bitFlag | BITFLAG_LANG_ENCODING_FLAG;
@@ -1511,14 +1495,16 @@ function getBitflag(level, useUnicodeFileNames, dataDescriptor, encrypted) {
 	if (dataDescriptor) {
 		bitFlag = bitFlag | BITFLAG_DATA_DESCRIPTOR;
 	}
-	if (level >= 0 && level < 2) {
-		bitFlag = bitFlag | BITFLAG_LEVEL_SUPER_FAST_MASK;
-	}
-	if (level >= 3 && level < 6) {
-		bitFlag = bitFlag | BITFLAG_LEVEL_FAST_MASK;
-	}
-	if (level == 9) {
-		bitFlag = bitFlag | BITFLAG_LEVEL_MAX_MASK;
+	if (compressionMethod == COMPRESSION_METHOD_DEFLATE || compressionMethod == COMPRESSION_METHOD_DEFLATE_64) {
+		if (level >= 0 && level <= 3) {
+			bitFlag = bitFlag | BITFLAG_LEVEL_SUPER_FAST_MASK;
+		}
+		if (level > 3 && level <= 5) {
+			bitFlag = bitFlag | BITFLAG_LEVEL_FAST_MASK;
+		}
+		if (level == 9) {
+			bitFlag = bitFlag | BITFLAG_LEVEL_MAX_MASK;
+		}
 	}
 	if (encrypted) {
 		bitFlag = bitFlag | BITFLAG_ENCRYPTED;

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.65",
+  "version": "2.7.67",
   "type": "module",
   "keywords": [
     "zip",
@@ -124,6 +124,6 @@
     "http-server": "^14.1.1",
     "rollup": "^4.45.1",
     "typedoc": "^0.28.7",
-    "typedoc-plugin-markdown": "^4.7.0"
+    "typedoc-plugin-markdown": "^4.7.1"
   }
 }