@zip.js/zip.js 2.8.47 → 2.8.49

package/dist/zip-core.js

@@ -1874,6 +1874,8 @@
 	 */
 
 
+	const HTTP_HEADER_CONTENT_TYPE = "Content-Type";
+
 	function toCompatibleReadable(readable) {
 		if (readable instanceof ReadableStream) {
 			return readable;
@@ -1894,6 +1896,29 @@
 		});
 	}
 
+	function streamToBlob(readable, contentType) {
+		readable = toCompatibleReadable(readable);
+		if (responseSupportsGlobalReadable()) {
+			const options = {};
+			if (contentType) {
+				options.headers = [[HTTP_HEADER_CONTENT_TYPE, contentType]];
+			}
+			return new Response(readable, options).blob();
+		}
+		const chunks = [];
+		return readable
+			.pipeTo(new WritableStream({
+				write(chunk) {
+					chunks.push(chunk);
+				}
+			}))
+			.then(() => new Blob(chunks, contentType ? { type: contentType } : {}));
+	}
+
+	function responseSupportsGlobalReadable() {
+		return typeof Blob.prototype.stream != FUNCTION_TYPE || new Blob([]).stream() instanceof ReadableStream;
+	}
+
 	function toCompatibleWritable(writable) {
 		if (writable instanceof WritableStream) {
 			return writable;
@@ -2654,14 +2679,16 @@
 								} else {
 									webWorkerSupported = false;
 								}
-								const { reader } = workerData;
-								if (reader) {
-									reader.releaseLock();
-								}
-								workerData.reader = null;
-								workerData.writer = null;
+								releaseWorkerStreams(workerData);
 								return runWorker$1(workerData, config);
 							}
+							if (error && error.codecImportFailed) {
+								if (workerData.reader) {
+									releaseWorkerStreams(workerData);
+									return runWorker$1(workerData, config);
+								}
+								workerData.onTaskFinished();
+							}
 							throw error;
 						}
 					}
@@ -2798,6 +2825,15 @@
 		return { writable, closed, abortPipe: () => abortController.abort() };
 	}
 
+	function releaseWorkerStreams(workerData) {
+		const { reader } = workerData;
+		if (reader) {
+			reader.releaseLock();
+		}
+		workerData.reader = null;
+		workerData.writer = null;
+	}
+
 	function terminateWorker$1(workerData) {
 		const { worker } = workerData;
 		if (worker) {
@@ -2865,7 +2901,7 @@
 				try {
 					worker = new Worker(resolvedURI, resolvedOptions);
 				} catch (error) {
-					if (!isModuleType) {
+					if (isModuleType) {
 						return getWebWorker(url, baseURI, workerData, false, useBlobURI);
 					} else {
 						throw error;
@@ -2983,12 +3019,15 @@
 		const stale = () => workerData.generation != generation;
 		try {
 			if (error) {
-				const { message, stack, code, name, outputSize, cause } = error;
+				const { message, stack, code, name, outputSize, cause, codecImportFailed } = error;
 				const responseError = new Error(message);
 				Object.assign(responseError, { stack, code, name, outputSize });
 				if (cause) {
 					responseError.cause = Object.assign(new Error(cause.message), { name: cause.name });
 				}
+				if (codecImportFailed) {
+					responseError.codecImportFailed = true;
+				}
 				close(responseError);
 			} else {
 				if (type == MESSAGE_PULL) {
@@ -3027,7 +3066,9 @@
 			if (writer) {
 				writer.releaseLock();
 			}
-			onTaskFinished();
+			if (!(error && error.codecImportFailed)) {
+				onTaskFinished();
+			}
 		}
 	}
 
@@ -3077,7 +3118,7 @@
 			}
 			await ensureCodecStreams(format, options.codecURI);
 		}
-		workerOptions.transferStreams = transferStreams || (transferStreams === UNDEFINED_VALUE && config.transferStreams);
+		workerOptions.transferStreams = !format && (transferStreams || (transferStreams === UNDEFINED_VALUE && config.transferStreams));
 		const streamCopy = !compressed && !checkCrc32 && !computeCrc32 && !encrypted;
 		const workerSupported = format === UNDEFINED_VALUE || Boolean(options.codecURI);
 		workerOptions.useWebWorkers = !streamCopy && workerSupported && (useWebWorkers || (useWebWorkers === UNDEFINED_VALUE && config.useWebWorkers));
@@ -3233,7 +3274,6 @@
 	const HTTP_HEADER_CONTENT_RANGE = "Content-Range";
 	const HTTP_HEADER_ACCEPT_RANGES = "Accept-Ranges";
 	const HTTP_HEADER_RANGE = "Range";
-	const HTTP_HEADER_CONTENT_TYPE = "Content-Type";
 	const HTTP_HEADER_ETAG = "Etag";
 	const HTTP_HEADER_LAST_MODIFIED = "Last-Modified";
 	const HTTP_METHOD_HEAD = "HEAD";
@@ -3438,10 +3478,6 @@
 		}
 	}
 
-	function responseSupportsGlobalReadable() {
-		return typeof Blob.prototype.stream != FUNCTION_TYPE || new Blob([]).stream() instanceof ReadableStream;
-	}
-
 	class BlobWriter extends Stream {
 
 		constructor(contentType) {
@@ -3453,22 +3489,7 @@
 					return transformStream.writable;
 				}
 			});
-			if (responseSupportsGlobalReadable()) {
-				const headers = [];
-				if (contentType) {
-					headers.push([HTTP_HEADER_CONTENT_TYPE, contentType]);
-				}
-				writer.blob = new Response(transformStream.readable, { headers }).blob();
-			} else {
-				const chunks = [];
-				writer.blob = transformStream.readable
-					.pipeTo(new WritableStream({
-						write(chunk) {
-							chunks.push(chunk);
-						}
-					}))
-					.then(() => new Blob(chunks, { type: contentType }));
-			}
+			writer.blob = streamToBlob(transformStream.readable, contentType);
 			writer.blob.catch(() => { });
 		}
 
@@ -4542,7 +4563,7 @@
 			const { config } = zipReader;
 			await initStream(reader);
 			if (reader.size === UNDEFINED_VALUE || !reader.readUint8Array) {
-				reader = new BlobReader(await new Response(reader.readable).blob());
+				reader = new BlobReader(await streamToBlob(reader.readable));
 				await initStream(reader);
 			}
 			if (reader.size < END_OF_CENTRAL_DIR_LENGTH) {
@@ -4811,7 +4832,7 @@
 				entry.arrayBuffer = async options => {
 					const writer = new TransformStream();
 					const [arrayBuffer] = await Promise.all([
-						new Response(writer.readable).arrayBuffer(),
+						streamToBlob(writer.readable).then(blob => blob.arrayBuffer()),
 						fileEntry.getData(writer, entry, zipReader.readRanges, options)]);
 					return arrayBuffer;
 				};
@@ -7619,7 +7640,7 @@
 
 			async function spillToFile() {
 				const directoryHandle = await getTempDirectory();
-				fileName = crypto.randomUUID();
+				fileName = getRandomFileName$1();
 				fileHandle = await directoryHandle.getFileHandle(fileName, { create: true });
 				fileWriter = (await fileHandle.createWritable()).getWriter();
 				spilled = true;
@@ -7700,6 +7721,13 @@
 		};
 	}
 
+	function getRandomFileName$1() {
+		if (crypto.randomUUID) {
+			return crypto.randomUUID();
+		}
+		return Array.from(crypto.getRandomValues(new Uint8Array(16)), byteValue => byteValue.toString(16).padStart(2, "0")).join("");
+	}
+
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.
 
@@ -7743,7 +7771,7 @@
 
 			async function spillToBlob() {
 				const transformStream = new TransformStream();
-				blobPromise = new Response(transformStream.readable).blob();
+				blobPromise = streamToBlob(transformStream.readable);
 				blobWriter = transformStream.writable.getWriter();
 				spilled = true;
 				for (const chunk of memoryChunks) {
@@ -7883,7 +7911,7 @@
 
 			async function spillToFile() {
 				const directoryHandle = await getTempDirectory();
-				fileName = crypto.randomUUID();
+				fileName = getRandomFileName();
 				const fileHandle = await directoryHandle.getFileHandle(fileName, { create: true });
 				accessHandle = await fileHandle.createSyncAccessHandle();
 				spilled = true;
@@ -7963,6 +7991,13 @@
 		};
 	}
 
+	function getRandomFileName() {
+		if (crypto.randomUUID) {
+			return crypto.randomUUID();
+		}
+		return Array.from(crypto.getRandomValues(new Uint8Array(16)), byteValue => byteValue.toString(16).padStart(2, "0")).join("");
+	}
+
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.