@zip.js/zip.js 2.11.3 → 2.11.4

package/index.cjs

@@ -211,6 +211,8 @@ const STRICTNESS_TOLERANT = "tolerant";
 const ERR_INVALID_FUNCTION_OPTION = "Invalid option (must be a function)";
 const ERR_INVALID_SIGNAL = "Invalid signal (must be an AbortSignal instance)";
 const ERR_INVALID_PASSWORD_TYPE = "Invalid password (password must be a string, rawPassword must be a Uint8Array)";
+const ERR_ABORTED = "The operation was aborted";
+const ABORT_ERROR_NAME = "AbortError";
 
 function checkFunctionOption(value) {
 	if (value && typeof value != FUNCTION_TYPE) {
@@ -226,6 +228,12 @@ function checkSignalOption(signal) {
 	return signal || UNDEFINED_VALUE;
 }
 
+function throwIfAborted(signal) {
+	if (signal && signal.aborted) {
+		throw signal.reason === UNDEFINED_VALUE ? new DOMException(ERR_ABORTED, ABORT_ERROR_NAME) : signal.reason;
+	}
+}
+
 function checkPasswordOption(password, rawPassword) {
 	if ((password && typeof password != STRING_TYPE) || (rawPassword && !(rawPassword instanceof Uint8Array))) {
 		throw new Error(ERR_INVALID_PASSWORD_TYPE);
@@ -3754,11 +3762,13 @@ class BlobReader extends Reader {
 		const reader = this;
 		const { sourceBlob, size } = reader;
 		const { offset = 0, size: readSize = size - offset } = options || {};
-		if (!offset && readSize >= size) {
-			return toCompatibleReadable(sourceBlob.stream());
-		}
-		if (blobSliceReliable) {
-			return toCompatibleReadable(sourceBlob.slice(offset, offset + readSize).stream());
+		if (typeof sourceBlob.stream == FUNCTION_TYPE) {
+			if (!offset && readSize >= size) {
+				return toCompatibleReadable(sourceBlob.stream());
+			}
+			if (blobSliceReliable) {
+				return toCompatibleReadable(sourceBlob.slice(offset, offset + readSize).stream());
+			}
 		}
 		return super.createReadable(options);
 	}
@@ -5194,27 +5204,28 @@ class ZipReaderStream {
 				const { done, value } = await gen.next();
 				if (done)
 					return controller.close();
-				const chunk = {
-					...value,
-					readable: (function () {
-						const { readable, writable } = new TransformStream();
-						if (value.getData) {
-							getData();
-							return readable;
-						}
+				const entryReadable = (function () {
+					const { readable, writable } = new TransformStream();
+					if (value.getData) {
+						getData();
+						return readable;
+					}
 
-						async function getData() {
+					async function getData() {
+						try {
+							await value.getData(writable);
+						} catch (error) {
 							try {
-								await value.getData(writable);
-							} catch (error) {
-								try {
-									await writable.abort(error);
-								} catch {
-									// ignored
-								}
+								await writable.abort(error);
+							} catch {
+								// ignored
 							}
 						}
-					})()
+					}
+				})();
+				const chunk = {
+					...value,
+					readable: entryReadable
 				};
 				delete chunk.getData;
 				controller.enqueue(chunk);
@@ -5360,6 +5371,7 @@ let ZipEntry$1 = class ZipEntry {
 		const size = compressedSize;
 		const readable = toCompatibleReadable(reader.createReadable({ offset: dataOffset, size }));
 		const signal = checkSignalOption(getOptionValue$1(zipEntry, options, OPTION_SIGNAL));
+		throwIfAborted(signal);
 		const checkPasswordOnly = getOptionValue$1(zipEntry, options, OPTION_CHECK_PASSWORD_ONLY);
 		let checkOverlappingEntry = getOptionValue$1(zipEntry, options, OPTION_CHECK_OVERLAPPING_ENTRY);
 		const checkOverlappingEntryOnly = getOptionValue$1(zipEntry, options, OPTION_CHECK_OVERLAPPING_ENTRY_ONLY);
@@ -6890,6 +6902,7 @@ function resolveMetadata(zipWriter, name, options) {
 	const createTempStream = getFunctionOptionValue(zipWriter, options, OPTION_CREATE_TEMP_STREAM);
 	const dataDescriptorSignature = getOptionValue(zipWriter, options, OPTION_DATA_DESCRIPTOR_SIGNATURE, true);
 	const signal = checkSignalOption(getOptionValue(zipWriter, options, OPTION_SIGNAL));
+	throwIfAborted(signal);
 	const useUnicodeFileNames = getOptionValue(zipWriter, options, OPTION_USE_UNICODE_FILE_NAMES, true);
 	const compressionMethod = getOptionValue(zipWriter, options, PROPERTY_NAME_COMPRESSION_METHOD);
 	const registeredCodec = passThrough || compressionMethod === UNDEFINED_VALUE ? UNDEFINED_VALUE : getRegisteredCodec(compressionMethod);
@@ -8634,7 +8647,7 @@ function formatSupported(StreamClass, format) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const VERSION = "2.11.3";
+const VERSION = "2.11.4";
 
 /*
  Copyright (c) 2025 Gildas Lormeau. All rights reserved.
@@ -9535,8 +9548,6 @@ const ERR_INVALID_PASS_THROUGH = "Invalid passThrough option (use readerOptions.
 const ERR_INVALID_READER_OPTIONS = "Invalid readerOptions (must be an object)";
 const ERR_ZIP_CRYPTO_LAST_MOD_DATE = "The last modification date of an entry encrypted with ZipCrypto cannot be changed when passThrough is set";
 const ERR_ABORT_EXPORT = "zipjs-abort-export";
-const ERR_ABORTED = "The operation was aborted";
-const ABORT_ERROR_NAME = "AbortError";
 const INFOZIP_EXTRA_FIELD_TYPE = "infozip";
 const INTERPRETED_EXTRA_FIELD_TYPES = new Set([
 	EXTRAFIELD_TYPE_ZIP64,

package/index.d.cts

@@ -1344,6 +1344,10 @@ export class ZipReaderStream<T> {
 
   /**
    * The readable stream.
+   *
+   * @remarks The properties deposited on an entry while its data is read, i.e.
+   * {@link EntryMetaData#warnings} and {@link EntryMetaData#localDirectory}, are shared with the
+   * chunk, so they are readable on it once its `readable` property has been consumed.
    */
   readable: ReadableStream<
     Omit<Entry, "getData"> & { readable?: ReadableStream<Uint8Array> }
@@ -1880,6 +1884,10 @@ export interface ZipReaderOptions {
   rawPassword?: Uint8Array;
   /**
    * The `AbortSignal` instance used to cancel the decompression.
+   *
+   * A signal already aborted when the operation starts rejects it with {@link ERR_ABORTED} as the
+   * reason of the `AbortError`, or with `signal.reason` when it is set, without relying on the
+   * `signal` option of `pipeTo` that the oldest supported engines ignore.
    */
   signal?: AbortSignal;
   /**
@@ -3155,6 +3163,10 @@ export interface ZipWriterConstructorOptions extends WorkerConfiguration {
   encryptionStrength?: 1 | 2 | 3;
   /**
    * The `AbortSignal` instance used to cancel the compression.
+   *
+   * A signal already aborted when the operation starts rejects it with {@link ERR_ABORTED} as the
+   * reason of the `AbortError`, or with `signal.reason` when it is set, without relying on the
+   * `signal` option of `pipeTo` that the oldest supported engines ignore.
    */
   signal?: AbortSignal;
   /**

package/index.d.ts

@@ -1344,6 +1344,10 @@ export class ZipReaderStream<T> {
 
   /**
    * The readable stream.
+   *
+   * @remarks The properties deposited on an entry while its data is read, i.e.
+   * {@link EntryMetaData#warnings} and {@link EntryMetaData#localDirectory}, are shared with the
+   * chunk, so they are readable on it once its `readable` property has been consumed.
    */
   readable: ReadableStream<
     Omit<Entry, "getData"> & { readable?: ReadableStream<Uint8Array> }
@@ -1880,6 +1884,10 @@ export interface ZipReaderOptions {
   rawPassword?: Uint8Array;
   /**
    * The `AbortSignal` instance used to cancel the decompression.
+   *
+   * A signal already aborted when the operation starts rejects it with {@link ERR_ABORTED} as the
+   * reason of the `AbortError`, or with `signal.reason` when it is set, without relying on the
+   * `signal` option of `pipeTo` that the oldest supported engines ignore.
    */
   signal?: AbortSignal;
   /**
@@ -3155,6 +3163,10 @@ export interface ZipWriterConstructorOptions extends WorkerConfiguration {
   encryptionStrength?: 1 | 2 | 3;
   /**
    * The `AbortSignal` instance used to cancel the compression.
+   *
+   * A signal already aborted when the operation starts rejects it with {@link ERR_ABORTED} as the
+   * reason of the `AbortError`, or with `signal.reason` when it is set, without relying on the
+   * `signal` option of `pipeTo` that the oldest supported engines ignore.
    */
   signal?: AbortSignal;
   /**