@zip.js/zip.js 2.7.66 → 2.7.68

package/index.cjs

@@ -4247,6 +4247,7 @@ function ZipInflate(options) {
 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;
 
@@ -8745,11 +8746,18 @@ async function readUint8ArrayHttpReader(httpReader, index, length, sendRequest,
 		if (eocdCache && index == size - END_OF_CENTRAL_DIR_LENGTH && length == END_OF_CENTRAL_DIR_LENGTH) {
 			return eocdCache;
 		}
-		const response = await sendRequest(HTTP_METHOD_GET, httpReader, getRangeHeaders(httpReader, index, length));
-		if (response.status != 206) {
-			throw new Error(ERR_HTTP_RANGE);
+		if (index >= size) {
+			return new Uint8Array();
+		} else {
+			if (index + length > size) {
+				length = size - index;
+			}
+			const response = await sendRequest(HTTP_METHOD_GET, httpReader, getRangeHeaders(httpReader, index, length));
+			if (response.status != 206) {
+				throw new Error(ERR_HTTP_RANGE);
+			}
+			return new Uint8Array(await response.arrayBuffer());
 		}
-		return new Uint8Array(await response.arrayBuffer());
 	} else {
 		const { data } = httpReader;
 		if (!data) {
@@ -10037,27 +10045,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 => {
@@ -10097,7 +10089,7 @@ class ZipWriter {
 				headerView
 			} = getHeaderArrayData({
 				version,
-				bitFlag: getBitFlag(level, languageEncodingFlag, dataDescriptor, encrypted),
+				bitFlag: getBitFlag(level, languageEncodingFlag, dataDescriptor, encrypted, compressionMethod),
 				compressionMethod,
 				uncompressedSize,
 				compressedSize,
@@ -10883,7 +10875,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,
@@ -11371,8 +11363,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;
@@ -11380,14 +11371,16 @@ function getBitFlag(level, useUnicodeFileNames, dataDescriptor, encrypted) {
 	if (dataDescriptor) {
 		bitFlag = bitFlag | BITFLAG_DATA_DESCRIPTOR;
 	}
-	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 (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;