@zip.js/zip.js 2.13.0 → 2.13.1

package/dist/zip-fs-core.js

@@ -3047,7 +3047,7 @@
 			rejectResult = error => {
 				const { outputSize, workerOptions } = workerData;
 				workerOptions.outputSize = outputSize;
-				if (isErrorObject(error) && error.outputSize === UNDEFINED_VALUE) {
+				if (isErrorObject(error)) {
 					try {
 						error.outputSize = outputSize;
 					} catch {
@@ -3061,12 +3061,14 @@
 			reader: null,
 			writer: null,
 			outputSize: 0,
+			destinationFailed: false,
+			destinationError: null,
 			resolveResult,
 			rejectResult,
 			result
 		});
 		const { readable, options } = workerData;
-		const { writable, closed, abortPipe } = watchClosedStream(workerData.writable);
+		const { writable, closed, abortPipe } = watchClosedStream(workerData.writable, workerData);
 		let streamsTransferred;
 		try {
 			streamsTransferred = sendMessage({
@@ -3109,7 +3111,18 @@
 			} catch {
 				// ignored
 			}
-			throw error;
+			const { outputSize, workerOptions, destinationFailed, destinationError } = workerData;
+			workerOptions.outputSize = outputSize;
+			const workerFailed = isErrorObject(error) && (error.codecImportFailed || error.workerStartupFailed);
+			const reportedError = destinationFailed && !workerFailed ? destinationError : error;
+			if (isErrorObject(reportedError)) {
+				try {
+					reportedError.outputSize = outputSize;
+				} catch {
+					// ignored
+				}
+			}
+			throw reportedError;
 		}
 
 		async function closeWritable() {
@@ -3123,12 +3136,27 @@
 		}
 	}
 
-	function watchClosedStream(writableSource) {
+	function watchClosedStream(writableSource, workerData) {
 		const abortController = new AbortController();
-		const { writable, readable } = new TransformStream();
+		let aborting;
+		const { writable, readable } = new TransformStream({
+			transform(chunk, controller) {
+				workerData.outputSize += chunk.length;
+				controller.enqueue(chunk);
+			}
+		});
 		const closed = readable.pipeTo(writableSource, { preventClose: true, preventAbort: true, signal: abortController.signal });
-		closed.catch(() => { });
-		return { writable, closed, abortPipe: () => abortController.abort() };
+		closed.catch(error => {
+			if (!aborting) {
+				Object.assign(workerData, { destinationFailed: true, destinationError: error });
+			}
+		});
+		return {
+			writable, closed, abortPipe: () => {
+				aborting = true;
+				abortController.abort();
+			}
+		};
 	}
 
 	function releaseWorkerStreams(workerData) {
@@ -3326,9 +3354,6 @@
 		const stale = () => workerData.generation != generation;
 		try {
 			if (error) {
-				if (error.outputSize !== UNDEFINED_VALUE) {
-					workerData.outputSize = error.outputSize;
-				}
 				fail(getResponseError(error, errorValue));
 			} else {
 				if (type == MESSAGE_PULL) {
@@ -3341,7 +3366,6 @@
 					const chunk = new Uint8Array(value);
 					await writer.ready;
 					await writer.write(chunk);
-					workerData.outputSize += chunk.length;
 					if (!stale()) {
 						sendMessage({ type: MESSAGE_ACK_DATA, messageId }, workerData);
 					}
@@ -9078,7 +9102,7 @@
 	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	 */
 
-	const VERSION = "2.13.0";
+	const VERSION = "2.13.1";
 
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.