@zip.js/zip.js 2.11.3 → 2.11.4

package/lib/core/io.js

@@ -237,11 +237,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);
 	}

package/lib/core/options.js

@@ -26,6 +26,8 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* global DOMException */
+
 import {
 	BOOLEAN_TYPE,
 	FUNCTION_TYPE,
@@ -86,6 +88,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";
 
 export {
 	OPTION_FILENAME_ENCODING,
@@ -140,8 +144,11 @@ export {
 	ERR_INVALID_FUNCTION_OPTION,
 	ERR_INVALID_SIGNAL,
 	ERR_INVALID_PASSWORD_TYPE,
+	ERR_ABORTED,
+	ABORT_ERROR_NAME,
 	checkFunctionOption,
 	checkSignalOption,
+	throwIfAborted,
 	checkPasswordOption,
 	checkInteger,
 	checkIntegerOption,
@@ -162,6 +169,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);

package/lib/core/version.js

@@ -26,6 +26,6 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const VERSION = "2.11.3";
+const VERSION = "2.11.4";
 
 export { VERSION };

package/lib/core/zip-fs.js

@@ -55,7 +55,7 @@ import {
 import {
 	Entry
 } from "./zip-entry.js";
-import { checkSignalOption } from "./options.js";
+import { checkSignalOption, ERR_ABORTED, ABORT_ERROR_NAME } from "./options.js";
 import { ProgressWatcherStream, callHandler } from "./codec-worker.js";
 import {
 	UNDEFINED_VALUE,
@@ -92,8 +92,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/lib/core/zip-reader.js

@@ -173,6 +173,7 @@ import {
 	OPTION_PREVENT_CLOSE,
 	checkFunctionOption,
 	checkSignalOption,
+	throwIfAborted,
 	checkPasswordOption,
 	toNumber
 } from "./options.js";
@@ -668,27 +669,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);
@@ -880,6 +882,7 @@ class ZipEntry {
 		const size = compressedSize;
 		const readable = toCompatibleReadable(reader.createReadable({ offset: dataOffset, size }));
 		const signal = checkSignalOption(getOptionValue(zipEntry, options, OPTION_SIGNAL));
+		throwIfAborted(signal);
 		const checkPasswordOnly = getOptionValue(zipEntry, options, OPTION_CHECK_PASSWORD_ONLY);
 		let checkOverlappingEntry = getOptionValue(zipEntry, options, OPTION_CHECK_OVERLAPPING_ENTRY);
 		const checkOverlappingEntryOnly = getOptionValue(zipEntry, options, OPTION_CHECK_OVERLAPPING_ENTRY_ONLY);

package/lib/core/zip-writer.js

@@ -238,6 +238,7 @@ import {
 	ERR_INVALID_PASSWORD_TYPE,
 	checkFunctionOption,
 	checkSignalOption,
+	throwIfAborted,
 	checkPasswordOption,
 	checkInteger,
 	checkIntegerOption,
@@ -918,6 +919,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);

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