@zip.js/zip.js 2.8.47 → 2.8.48

package/dist/zip-fs.js

@@ -1876,6 +1876,8 @@
 	 */
 
 
+	const HTTP_HEADER_CONTENT_TYPE = "Content-Type";
+
 	function toCompatibleReadable(readable) {
 		if (readable instanceof ReadableStream) {
 			return readable;
@@ -1896,6 +1898,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;
@@ -3239,7 +3264,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";
@@ -3444,10 +3468,6 @@
 		}
 	}
 
-	function responseSupportsGlobalReadable() {
-		return typeof Blob.prototype.stream != FUNCTION_TYPE || new Blob([]).stream() instanceof ReadableStream;
-	}
-
 	class BlobWriter extends Stream {
 
 		constructor(contentType) {
@@ -3459,22 +3479,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(() => { });
 		}
 
@@ -4548,7 +4553,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) {
@@ -4817,7 +4822,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;
 				};
@@ -7625,7 +7630,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;
@@ -7706,6 +7711,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.
 
@@ -7749,7 +7761,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) {
@@ -7889,7 +7901,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;
@@ -7969,6 +7981,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.
 
@@ -8547,7 +8566,7 @@
 				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;
 			}
 		}