@zip.js/zip.js 2.7.40 → 2.7.42

package/index.cjs

@@ -8629,35 +8629,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) {
@@ -8682,9 +8690,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);
@@ -8700,7 +8713,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 }) {
@@ -9395,9 +9408,10 @@ class ZipReader {
 				commentUTF8,
 				rawExtraField: directoryArray.subarray(extraFieldOffset, commentOffset)
 			});
+			const decode = getOptionValue$1(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,
@@ -10001,12 +10015,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);
 	}
@@ -10109,7 +10124,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/index.d.ts

@@ -4,7 +4,7 @@
  * @see {@link https://wicg.github.io/entries-api/#api-entry|specification}
  */
 // deno-lint-ignore no-empty-interface
-interface FileSystemEntryLike {}
+interface FileSystemEntryLike { }
 
 /**
  * Represents the `FileSystemHandle` class.
@@ -12,7 +12,7 @@ interface FileSystemEntryLike {}
  * @see {@link https://fs.spec.whatwg.org/#api-filesystemhandle}
  */
 // deno-lint-ignore no-empty-interface
-interface FileSystemHandleLike {}
+interface FileSystemHandleLike { }
 
 /**
  * Represents a generic `TransformStream` class.
@@ -268,7 +268,7 @@ declare class ZipInflate extends SyncCodec {
 /**
  * Represents a class implementing `CompressionStream` or `DecompressionStream` interfaces.
  */
-declare class CodecStream extends TransformStream {}
+declare class CodecStream extends TransformStream { }
 
 /**
  * Returns the MIME type corresponding to a filename extension.
@@ -361,41 +361,41 @@ export class Reader<Type> implements Initializable, ReadableReader {
 /**
  * Represents a {@link Reader} instance used to read data provided as a `string`.
  */
-export class TextReader extends Reader<string> {}
+export class TextReader extends Reader<string> { }
 
 /**
  * Represents a {@link Reader} instance used to read data provided as a `Blob` instance.
  */
-export class BlobReader extends Reader<Blob> {}
+export class BlobReader extends Reader<Blob> { }
 
 /**
  * Represents a {@link Reader} instance used to read data provided as a Data URI `string` encoded in Base64.
  */
-export class Data64URIReader extends Reader<string> {}
+export class Data64URIReader extends Reader<string> { }
 
 /**
  * Represents a {@link Reader} instance used to read data provided as a `Uint8Array` instance.
  */
-export class Uint8ArrayReader extends Reader<Uint8Array> {}
+export class Uint8ArrayReader extends Reader<Uint8Array> { }
 
 /**
  * Represents a {@link Reader} instance used to read data provided as an array of {@link ReadableReader} instances (e.g. split zip files).
  *
  * @deprecated Use {@link SplitDataReader} instead.
  */
-export class SplitZipReader extends SplitDataReader {}
+export class SplitZipReader extends SplitDataReader { }
 
 /**
  * Represents a {@link Reader} instance used to read data provided as an array of {@link ReadableReader} instances (e.g. split zip files).
  */
 export class SplitDataReader
-  extends Reader<Reader<unknown>[] | ReadableReader[] | ReadableStream[]> {}
+  extends Reader<Reader<unknown>[] | ReadableReader[] | ReadableStream[]> { }
 
 /**
  * Represents a URL stored into a `string`.
  */
 // deno-lint-ignore no-empty-interface
-interface URLString extends String {}
+interface URLString extends String { }
 
 /**
  * Represents a {@link Reader} instance used to fetch data from a URL.
@@ -441,10 +441,17 @@ export interface HttpOptions extends HttpRangeOptions {
   forceRangeRequests?: boolean;
   /**
    * `true` to prevent using `HEAD` HTTP request in order the get the size of the content.
+   * `false` to explicitly use `HEAD`, this is useful in case of CORS where `Access-Control-Expose-Headers: Content-Range` is not returned by the server.
    *
    * @defaultValue false
    */
   preventHeadRequest?: boolean;
+  /**
+   * `true` to use `Range: bytes=-22` on the first request and cache the EOCD, make sure beforehand that the server supports a suffix range request.
+   *
+   * @defaultValue false
+   */
+  combineSizeEocd?: boolean;
 }
 
 /**
@@ -584,7 +591,7 @@ export class Data64URIWriter extends Writer<string> {
  *
  * @deprecated Use {@link SplitDataWriter} instead.
  */
-export class SplitZipWriter extends SplitDataWriter {}
+export class SplitZipWriter extends SplitDataWriter { }
 
 /**
  * Represents a {@link Writer}  instance used to retrieve the written data from a generator of {@link WritableWriter}  instances  (i.e. split zip files).
@@ -616,7 +623,7 @@ export class SplitDataWriter implements Initializable, WritableWriter {
 /**
  * Represents a {@link Writer}  instance used to retrieve the written data as a `Uint8Array` instance.
  */
-export class Uint8ArrayWriter extends Writer<Uint8Array> {}
+export class Uint8ArrayWriter extends Writer<Uint8Array> { }
 
 /**
  * Represents an instance used to create an unzipped stream.
@@ -760,7 +767,7 @@ export interface ZipReaderConstructorOptions
  * Represents the options passed to {@link ZipReader#getEntries} and {@link ZipReader#getEntriesGenerator}.
  */
 export interface ZipReaderGetEntriesOptions
-  extends GetEntriesOptions, EntryOnprogressOptions {}
+  extends GetEntriesOptions, EntryOnprogressOptions { }
 
 /**
  * Represents options passed to the constructor of {@link ZipReader}, {@link ZipReader#getEntries} and {@link ZipReader#getEntriesGenerator}.
@@ -774,6 +781,14 @@ export interface GetEntriesOptions {
    * The encoding of the comment of the entry.
    */
   commentEncoding?: string;
+  /**
+   * Decodes the filename and the comment of the entry.
+   * 
+   * @param value The raw text value.
+   * @param encoding The encoding of the text.
+   * @returns The decoded text value.
+   */
+  decodeText?(value: Uint8Array, encoding: string): string
 }
 
 /**
@@ -977,13 +992,13 @@ export interface Entry extends EntryMetaData {
  * Represents the options passed to {@link Entry#getData} and `{@link ZipFileEntry}.get*`.
  */
 export interface EntryGetDataOptions
-  extends EntryDataOnprogressOptions, ZipReaderOptions, WorkerConfiguration {}
+  extends EntryDataOnprogressOptions, ZipReaderOptions, WorkerConfiguration { }
 
 /**
  * Represents the options passed to {@link Entry#getData} and `{@link ZipFileEntry}.get*`.
  */
 export interface EntryGetDataCheckPasswordOptions
-  extends EntryGetDataOptions, ZipReaderCheckPasswordOptions {}
+  extends EntryGetDataOptions, ZipReaderCheckPasswordOptions { }
 
 /**
  * Represents an instance used to create a zipped stream.
@@ -1146,9 +1161,9 @@ export class ZipWriter<Type> {
  */
 export interface ZipWriterAddDataOptions
   extends
-    ZipWriterConstructorOptions,
-    EntryDataOnprogressOptions,
-    WorkerConfiguration {
+  ZipWriterConstructorOptions,
+  EntryDataOnprogressOptions,
+  WorkerConfiguration {
   /**
    * `true` if the entry is a directory.
    *
@@ -1336,6 +1351,13 @@ export interface ZipWriterConstructorOptions {
    * @defaultValue false
    */
   usdz?: boolean;
+  /**
+   * Encode the filename and the comment of the entry.
+   * 
+   * @param text The text to encode.
+   * @returns The encoded text.
+   */
+  encodeText?(text: string): Uint8Array
 }
 
 /**
@@ -1828,7 +1850,7 @@ export class ZipDirectoryEntry extends ZipEntry {
  * Represents the options passed to {@link ZipDirectoryEntry#importHttpContent}.
  */
 export interface ZipDirectoryEntryImportHttpOptions
-  extends ZipReaderConstructorOptions, HttpOptions {}
+  extends ZipReaderConstructorOptions, HttpOptions { }
 
 /**
  * Represents the options passed to `{@link ZipDirectoryEntry}#export*()`.