@zip.js/zip.js 2.13.0 → 2.13.1

package/lib/core/codec-worker-web.js

@@ -125,7 +125,7 @@ async function runWebWorker(workerData, config) {
 		rejectResult = error => {
 			const { outputSize, workerOptions } = workerData;
 			workerOptions.outputSize = outputSize;
-			if (isErrorObject(error) && error.outputSize === UNDEFINED_VALUE) {
+			if (isErrorObject(error)) {
 				try {
 					error.outputSize = outputSize;
 				} catch {
@@ -139,12 +139,14 @@ async function runWebWorker(workerData, config) {
 		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({
@@ -187,7 +189,18 @@ async function runWebWorker(workerData, config) {
 		} 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() {
@@ -201,12 +214,27 @@ async function runWebWorker(workerData, config) {
 	}
 }
 
-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) {
@@ -404,9 +432,6 @@ async function onMessage({ data }, workerData) {
 	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) {
@@ -419,7 +444,6 @@ async function onMessage({ data }, workerData) {
 				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);
 				}

package/lib/core/version.js

@@ -26,6 +26,6 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const VERSION = "2.13.0";
+const VERSION = "2.13.1";
 
 export { VERSION };

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.13.0",
+  "version": "2.13.1",
   "type": "module",
   "keywords": [
     "zip",