@zip.js/zip.js 2.8.17 → 2.8.18

package/index-native.cjs

@@ -1958,6 +1958,8 @@ class ChunkStream extends TransformStream {
  */
 
 
+const MODULE_WORKER_OPTIONS = { type: "module" };
+
 let webWorkerSupported, webWorkerURI, webWorkerOptions;
 let transferStreamsSupported = true;
 let initModule = () => { };
@@ -2166,11 +2168,8 @@ function watchClosedStream(writableSource) {
 	return { writable, closed };
 }
 
-function getWebWorker(url, baseURI, workerData, isModuleType = false, useBlobURI = true) {
+function getWebWorker(url, baseURI, workerData, isModuleType, useBlobURI = true) {
 	let worker, resolvedURI, resolvedOptions;
-	if (isModuleType) {
-		resolvedOptions = { type: "module" };
-	}
 	if (webWorkerURI === UNDEFINED_VALUE) {
 		// deno-lint-ignore valid-typeof
 		const isFunctionURI = typeof url == FUNCTION_TYPE;
@@ -2182,6 +2181,12 @@ function getWebWorker(url, baseURI, workerData, isModuleType = false, useBlobURI
 		const isDataURI = resolvedURI.startsWith("data:");
 		const isBlobURI = resolvedURI.startsWith("blob:");
 		if (isDataURI || isBlobURI) {
+			if (isModuleType === UNDEFINED_VALUE) {
+				isModuleType = false;
+			}
+			if (isModuleType) {
+				resolvedOptions = MODULE_WORKER_OPTIONS;
+			}
 			try {
 				worker = new Worker(resolvedURI, resolvedOptions);
 			} catch (error) {
@@ -2201,6 +2206,12 @@ function getWebWorker(url, baseURI, workerData, isModuleType = false, useBlobURI
 				}
 			}
 		} else {
+			if (isModuleType === UNDEFINED_VALUE) {
+				isModuleType = true;
+			}
+			if (isModuleType) {
+				resolvedOptions = MODULE_WORKER_OPTIONS;
+			}
 			try {
 				resolvedURI = new URL(resolvedURI, baseURI);
 			} catch {
@@ -2210,7 +2221,7 @@ function getWebWorker(url, baseURI, workerData, isModuleType = false, useBlobURI
 				worker = new Worker(resolvedURI, resolvedOptions);
 			} catch (error) {
 				if (!isModuleType) {
-					return getWebWorker(url, baseURI, workerData, true, useBlobURI);
+					return getWebWorker(url, baseURI, workerData, false, useBlobURI);
 				} else {
 					throw error;
 				}
@@ -4884,7 +4895,6 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 	let writingBufferedEntryData;
 	let writingEntryData;
 	let fileWriter;
-	let blobPromise;
 	files.set(name, fileEntry);
 	try {
 		let lockPreviousFileEntry;
@@ -4893,7 +4903,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			requestLockCurrentFileEntry();
 		}
 		if ((options.bufferedWrite || zipWriter.writerLocked || (zipWriter.bufferedWrites && keepOrder) || !dataDescriptor) && !usdz) {
-			fileWriter = new TransformStream();
+			fileWriter = new TransformStream(undefined, undefined, { highWaterMark: Infinity });
 			fileWriter.size = 0;
 			bufferedWrite = true;
 			zipWriter.bufferedWrites++;
@@ -4924,20 +4934,20 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			await skipDiskIfNeeded(writable);
 		}
 		const { diskNumber } = writer;
-		writingEntryData = true;
 		fileEntry.diskNumberStart = diskNumber;
-		if (bufferedWrite) {
-			blobPromise = new Response(fileWriter.readable).blob();
-		} else {
+		if (!bufferedWrite) {
+			writingEntryData = true;
 			await writeData(fileWriter, localHeaderArray);
 		}
 		fileEntry = await createFileEntry(reader, fileWriter, fileEntry, entryInfo, zipWriter.config, options);
 		const { zip64 } = fileEntry;
-		writingEntryData = false;
+		if (!bufferedWrite) {
+			writingEntryData = false;
+		}
 		files.set(name, fileEntry);
 		fileEntry.filename = name;
 		if (bufferedWrite) {
-			const [blob] = await Promise.all([blobPromise, fileWriter.writable.getWriter().close(), lockPreviousFileEntry]);
+			await Promise.all([fileWriter.writable.getWriter().close(), lockPreviousFileEntry]);
 			await requestLockWriter();
 			writingBufferedEntryData = true;
 			fileEntry.diskNumberStart = writer.diskNumber;
@@ -4948,7 +4958,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			updateLocalHeader(fileEntry, localHeaderView, options);
 			await skipDiskIfNeeded(writable);
 			await writeData(writer, localHeaderArray);
-			await blob.stream().pipeTo(writable, { preventClose: true, preventAbort: true, signal });
+			await fileWriter.readable.pipeTo(writable, { preventClose: true, preventAbort: true, signal });
 			writer.size += fileWriter.size;
 			writingBufferedEntryData = false;
 		} else {
@@ -4963,7 +4973,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		zipWriter.offset += fileEntry.size;
 		return fileEntry;
 	} catch (error) {
-		if ((bufferedWrite && writingBufferedEntryData) || (!bufferedWrite && writingEntryData)) {
+		if (writingBufferedEntryData || writingEntryData) {
 			zipWriter.hasCorruptedEntries = true;
 			if (error) {
 				try {