@zip.js/zip.js 2.7.40 → 2.7.42

package/lib/core/io.js

@@ -31,7 +31,8 @@
 
 import {
 	UNDEFINED_VALUE,
-	FUNCTION_TYPE
+	FUNCTION_TYPE,
+	END_OF_CENTRAL_DIR_LENGTH
 } from "./constants.js";
 import { getConfiguration } from "./configuration.js";
 
@@ -296,35 +297,43 @@ function createHttpReader(httpReader, url, options) {
 	const {
 		preventHeadRequest,
 		useRangeHeader,
-		forceRangeRequests
+		forceRangeRequests,
+		combineSizeEocd
 	} = options;
 	options = Object.assign({}, options);
 	delete options.preventHeadRequest;
 	delete options.useRangeHeader;
 	delete options.forceRangeRequests;
+	delete options.combineSizeEocd;
 	delete options.useXHR;
 	Object.assign(httpReader, {
 		url,
 		options,
 		preventHeadRequest,
 		useRangeHeader,
-		forceRangeRequests
+		forceRangeRequests,
+		combineSizeEocd
 	});
 }
 
 async function initHttpReader(httpReader, sendRequest, getRequestData) {
 	const {
 		url,
+		preventHeadRequest,
 		useRangeHeader,
-		forceRangeRequests
+		forceRangeRequests,
+		combineSizeEocd
 	} = httpReader;
-	if (isHttpFamily(url) && (useRangeHeader || forceRangeRequests)) {
-		const { headers } = await sendRequest(HTTP_METHOD_GET, httpReader, getRangeHeaders(httpReader));
-		if (!forceRangeRequests && headers.get(HTTP_HEADER_ACCEPT_RANGES) != HTTP_RANGE_UNIT) {
+	if (isHttpFamily(url) && (useRangeHeader || forceRangeRequests) && (typeof preventHeadRequest == "undefined" || preventHeadRequest)) {
+		const response = await sendRequest(HTTP_METHOD_GET, httpReader, getRangeHeaders(httpReader, combineSizeEocd ? -END_OF_CENTRAL_DIR_LENGTH : undefined));
+		if (!forceRangeRequests && response.headers.get(HTTP_HEADER_ACCEPT_RANGES) != HTTP_RANGE_UNIT) {
 			throw new Error(ERR_HTTP_RANGE);
 		} else {
+			if (combineSizeEocd) {
+				httpReader.eocdCache = new Uint8Array(await response.arrayBuffer());
+			}
 			let contentSize;
-			const contentRangeHeader = headers.get(HTTP_HEADER_CONTENT_RANGE);
+			const contentRangeHeader = response.headers.get(HTTP_HEADER_CONTENT_RANGE);
 			if (contentRangeHeader) {
 				const splitHeader = contentRangeHeader.trim().split(/\s*\/\s*/);
 				if (splitHeader.length) {
@@ -349,9 +358,14 @@ async function readUint8ArrayHttpReader(httpReader, index, length, sendRequest,
 	const {
 		useRangeHeader,
 		forceRangeRequests,
+		eocdCache,
+		size,
 		options
 	} = httpReader;
 	if (useRangeHeader || forceRangeRequests) {
+		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);
@@ -367,7 +381,7 @@ async function readUint8ArrayHttpReader(httpReader, index, length, sendRequest,
 }
 
 function getRangeHeaders(httpReader, index = 0, length = 1) {
-	return Object.assign({}, getHeaders(httpReader), { [HTTP_HEADER_RANGE]: HTTP_RANGE_UNIT + "=" + index + "-" + (index + length - 1) });
+	return Object.assign({}, getHeaders(httpReader), { [HTTP_HEADER_RANGE]: HTTP_RANGE_UNIT + "=" + (index < 0 ? index : index + "-" + (index + length - 1)) });
 }
 
 function getHeaders({ options }) {

package/lib/core/zip-reader.js

@@ -277,9 +277,10 @@ class ZipReader {
 				commentUTF8,
 				rawExtraField: directoryArray.subarray(extraFieldOffset, commentOffset)
 			});
+			const decode = getOptionValue(zipReader, options, "decodeText") || decodeText;
 			const [filename, comment] = await Promise.all([
-				decodeText(rawFilename, filenameUTF8 ? CHARSET_UTF8 : filenameEncoding || CHARSET_CP437),
-				decodeText(rawComment, commentUTF8 ? CHARSET_UTF8 : commentEncoding || CHARSET_CP437)
+				decode(rawFilename, filenameUTF8 ? CHARSET_UTF8 : filenameEncoding || CHARSET_CP437),
+				decode(rawComment, commentUTF8 ? CHARSET_UTF8 : commentEncoding || CHARSET_CP437)
 			]);
 			Object.assign(fileEntry, {
 				rawComment,

package/lib/core/zip-writer.js

@@ -224,12 +224,13 @@ async function addFile(zipWriter, name, reader, options) {
 	} else {
 		options.directory = name.endsWith(DIRECTORY_SIGNATURE);
 	}
-	const rawFilename = encodeText(name);
+	const encode = getOptionValue(zipWriter, options, "encodeText", encodeText);
+	const rawFilename = encode(name);
 	if (getLength(rawFilename) > MAX_16_BITS) {
 		throw new Error(ERR_INVALID_ENTRY_NAME);
 	}
 	const comment = options.comment || "";
-	const rawComment = encodeText(comment);
+	const rawComment = encode(comment);
 	if (getLength(rawComment) > MAX_16_BITS) {
 		throw new Error(ERR_INVALID_ENTRY_COMMENT);
 	}
@@ -332,7 +333,7 @@ async function addFile(zipWriter, name, reader, options) {
 		zip64DiskNumberStart,
 		password,
 		rawPassword,
-		level,
+		level: !useCompressionStream && zipWriter.config.CompressionStream === UNDEFINED_VALUE ? 0 : level,
 		useWebWorkers,
 		encryptionStrength,
 		extendedTimestamp,

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.40",
+    "version": "2.7.42",
     "type": "module",
     "keywords": [
         "zip",