@zip.js/zip.js 2.8.47 → 2.8.48

package/lib/core/io.js

@@ -26,7 +26,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global Blob, atob, btoa, XMLHttpRequest, URL, fetch, ReadableStream, WritableStream, FileReader, TransformStream, Response */
+/* global Blob, atob, btoa, XMLHttpRequest, URL, fetch, ReadableStream, WritableStream, FileReader, TransformStream */
 // deno-lint-ignore-file no-this-alias
 
 import {
@@ -37,7 +37,7 @@ import {
 } from "./constants.js";
 import { getConfiguration, getChunkSize } from "./configuration.js";
 import { concat, toExactUint8Array } from "./util/array.js";
-import { toCompatibleReadable, toCompatibleWritable } from "./util/compatible-streams.js";
+import { toCompatibleReadable, toCompatibleWritable, streamToBlob } from "./util/compatible-streams.js";
 
 const ERR_HTTP_STATUS = "HTTP error ";
 const ERR_HTTP_RANGE = "HTTP Range not supported";
@@ -51,7 +51,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";
@@ -256,10 +255,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) {
@@ -271,22 +266,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(() => { });
 	}
 

package/lib/core/util/blob-temp-stream.js

@@ -26,7 +26,9 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global Response, ReadableStream, WritableStream, TransformStream */
+/* global ReadableStream, WritableStream, TransformStream */
+
+import { streamToBlob } from "./compatible-streams.js";
 
 export {
 	createBlobTempStream
@@ -46,7 +48,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) {

package/lib/core/util/compatible-streams.js

@@ -26,13 +26,18 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global ReadableStream, WritableStream */
+/* global Blob, Response, ReadableStream, WritableStream */
+
+import { FUNCTION_TYPE } from "../constants.js";
 
 export {
 	toCompatibleReadable,
-	toCompatibleWritable
+	toCompatibleWritable,
+	streamToBlob
 };
 
+const HTTP_HEADER_CONTENT_TYPE = "Content-Type";
+
 function toCompatibleReadable(readable) {
 	if (readable instanceof ReadableStream) {
 		return readable;
@@ -53,6 +58,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;

package/lib/core/util/opfs-temp-stream.js

@@ -57,7 +57,7 @@ function createOPFSTempStream(options = {}) {
 
 		async function spillToFile() {
 			const directoryHandle = await getTempDirectory();
-			fileName = crypto.randomUUID();
+			fileName = getRandomFileName();
 			fileHandle = await directoryHandle.getFileHandle(fileName, { create: true });
 			fileWriter = (await fileHandle.createWritable()).getWriter();
 			spilled = true;
@@ -137,3 +137,10 @@ function createOPFSTempStream(options = {}) {
 		return { writable, readable, dispose };
 	};
 }
+
+function getRandomFileName() {
+	if (crypto.randomUUID) {
+		return crypto.randomUUID();
+	}
+	return Array.from(crypto.getRandomValues(new Uint8Array(16)), byteValue => byteValue.toString(16).padStart(2, "0")).join("");
+}

package/lib/core/util/sync-access-handle-temp-stream.js

@@ -67,7 +67,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;
@@ -146,3 +146,10 @@ function createSyncAccessHandleTempStream(options = {}) {
 		return { writable, readable, dispose };
 	};
 }
+
+function getRandomFileName() {
+	if (crypto.randomUUID) {
+		return crypto.randomUUID();
+	}
+	return Array.from(crypto.getRandomValues(new Uint8Array(16)), byteValue => byteValue.toString(16).padStart(2, "0")).join("");
+}

package/lib/core/zip-fs.js

@@ -67,6 +67,7 @@ import {
 	EXTRAFIELD_TYPE_PKWARE_UNIX
 } from "./constants.js";
 import { toExactUint8Array } from "./util/array.js";
+import { toCompatibleReadable, toCompatibleWritable } from "./util/compatible-streams.js";
 
 const ERR_ENTRY_EXISTS = "Entry filename already exists";
 const ERR_READABLE_CONSUMED = "Readable stream already consumed";
@@ -179,7 +180,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;
 		}
 	}

package/lib/core/zip-reader.js

@@ -26,7 +26,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global Response, WritableStream, ReadableStream, TransformStream */
+/* global WritableStream, ReadableStream, TransformStream */
 // deno-lint-ignore-file no-this-alias
 
 import {
@@ -113,7 +113,7 @@ import {
 } from "./io.js";
 import { decodeText } from "./util/decode-text.js";
 import { getDataView } from "./util/array.js";
-import { toCompatibleReadable } from "./util/compatible-streams.js";
+import { toCompatibleReadable, streamToBlob } from "./util/compatible-streams.js";
 import { Crc32 } from "./streams/codecs/crc32.js";
 import {
 	PROPERTY_NAME_RAW_FILENAME,
@@ -213,7 +213,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) {
@@ -482,7 +482,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;
 			};

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.8.47",
+  "version": "2.8.48",
   "type": "module",
   "keywords": [
     "zip",
@@ -37,6 +37,7 @@
     "lint": "npx eslint . && deno lint",
     "test": "npm run test-node && npm run test-deno && npm run test-bun && npm run test-node-dist && npm run test-deno-dist && npm run test-bun-dist && npm run test-web-streams-polyfill && npm run test-types",
     "test-browsers": "npm run test-chrome && npm run test-firefox && npm run test-webkit",
+    "serve-tests": "http-server -p 8888 -c-1 .",
     "test-all": "npm run lint && npm run test && npm run test-browsers",
     "build": "npx rollup -c",
     "build-dev": "npx rollup -c --environment DEV",