@zip.js/zip.js 2.8.47 → 2.8.49

package/dist/zip-fs-core-external.js

@@ -1901,6 +1901,8 @@ function getInt32(number) {
  */
 
 
+const HTTP_HEADER_CONTENT_TYPE = "Content-Type";
+
 function toCompatibleReadable(readable) {
 	if (readable instanceof ReadableStream) {
 		return readable;
@@ -1921,6 +1923,29 @@ function toCompatibleReadable(readable) {
 	});
 }
 
+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;
@@ -2685,14 +2710,16 @@ function createWebWorkerInterface(workerData, config) {
 							} 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;
 					}
 				}
@@ -2829,6 +2856,15 @@ function watchClosedStream(writableSource) {
 	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) {
@@ -2896,7 +2932,7 @@ function getWebWorker(url, baseURI, workerData, isModuleType, useBlobURI = true)
 			try {
 				worker = new Worker(resolvedURI, resolvedOptions);
 			} catch (error) {
-				if (!isModuleType) {
+				if (isModuleType) {
 					return getWebWorker(url, baseURI, workerData, false, useBlobURI);
 				} else {
 					throw error;
@@ -3014,12 +3050,15 @@ async function onMessage({ data }, workerData) {
 	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) {
@@ -3058,7 +3097,9 @@ async function onMessage({ data }, workerData) {
 		if (writer) {
 			writer.releaseLock();
 		}
-		onTaskFinished();
+		if (!(error && error.codecImportFailed)) {
+			onTaskFinished();
+		}
 	}
 }
 
@@ -3108,7 +3149,7 @@ async function runWorker(stream, workerOptions) {
 		}
 		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));
@@ -3264,7 +3305,6 @@ const HTTP_HEADER_CONTENT_ENCODING = "Content-Encoding";
 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";
@@ -3469,10 +3509,6 @@ class BlobReader extends Reader {
 	}
 }
 
-function responseSupportsGlobalReadable() {
-	return typeof Blob.prototype.stream != FUNCTION_TYPE || new Blob([]).stream() instanceof ReadableStream;
-}
-
 class BlobWriter extends Stream {
 
 	constructor(contentType) {
@@ -3484,22 +3520,7 @@ class BlobWriter extends Stream {
 				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(() => { });
 	}
 
@@ -4573,7 +4594,7 @@ class ZipReader {
 		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) {
@@ -4842,7 +4863,7 @@ class ZipReader {
 			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;
 			};
@@ -7650,7 +7671,7 @@ function createOPFSTempStream(options = {}) {
 
 		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;
@@ -7731,6 +7752,13 @@ function createOPFSTempStream(options = {}) {
 	};
 }
 
+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.
 
@@ -7774,7 +7802,7 @@ function createBlobTempStream(options = {}) {
 
 		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) {
@@ -7914,7 +7942,7 @@ function createSyncAccessHandleTempStream(options = {}) {
 
 		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;
@@ -7994,6 +8022,13 @@ function createSyncAccessHandleTempStream(options = {}) {
 	};
 }
 
+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.
 
@@ -8544,7 +8579,7 @@ class ZipFileEntry extends ZipEntry {
 			await Promise.all([initStream(reader), initStream(writer, uncompressedSize)]);
 			const { readable } = reader;
 			zipEntry.uncompressedSize = reader.size;
-			await readable.pipeTo(writer.writable);
+			await toCompatibleReadable(readable).pipeTo(toCompatibleWritable(writer.writable));
 			return writer.getData ? writer.getData() : writer.writable;
 		}
 	}