@zip.js/zip.js 2.16.0 → 2.17.0

package/lib/core/codec-pool.js

@@ -37,6 +37,7 @@ import {
 	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_INVALID_PASSWORD,
 	ERR_INVALID_COMPRESSED_DATA,
+	ERR_CODEC_OUT_OF_MEMORY,
 	ERR_ABORT_CHECK_PASSWORD,
 	ERR_UNSUPPORTED_CRYPTO_API
 } from "./streams/codec-stream.js";
@@ -58,6 +59,7 @@ export {
 	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_INVALID_PASSWORD,
 	ERR_INVALID_COMPRESSED_DATA,
+	ERR_CODEC_OUT_OF_MEMORY,
 	ERR_ABORT_CHECK_PASSWORD,
 	ERR_UNSUPPORTED_CRYPTO_API,
 	ERR_WORKER_STARTUP_TIMEOUT

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

@@ -53,6 +53,7 @@ import {
 const MODULE_WORKER_OPTIONS = { type: "module" };
 const ERROR_EVENT_TYPE = "error";
 const MESSAGE_ERROR_EVENT_TYPE = "messageerror";
+const ABORT_EVENT_TYPE = "abort";
 
 let webWorkerSource, webWorkerURI, webWorkerOptions;
 let transferStreamsSupported = true;
@@ -229,6 +230,13 @@ function watchClosedStream(writableSource, workerData) {
 			Object.assign(workerData, { destinationFailed: true, destinationError: error });
 		}
 	});
+	const { signal } = workerData.workerOptions.streamOptions;
+	if (signal) {
+		const onAbort = () => abortController.abort(signal.reason);
+		const removeAbortListener = () => signal.removeEventListener(ABORT_EVENT_TYPE, onAbort);
+		signal.addEventListener(ABORT_EVENT_TYPE, onAbort);
+		closed.then(removeAbortListener, removeAbortListener);
+	}
 	return {
 		writable, closed, abortPipe: () => {
 			aborting = true;
@@ -491,9 +499,6 @@ function getResponseError(errorData, errorValue) {
 		responseError = errorValue.value;
 	} else {
 		responseError = Object.assign(new Error(message), { stack, code, name });
-		if (cause) {
-			responseError.cause = Object.assign(new Error(cause.message), { name: cause.name });
-		}
 	}
 	if (isErrorObject(responseError)) {
 		try {
@@ -503,6 +508,9 @@ function getResponseError(errorData, errorValue) {
 			if (codecImportFailed) {
 				responseError.codecImportFailed = true;
 			}
+			if (cause && !isErrorObject(responseError.cause)) {
+				responseError.cause = Object.assign(new Error(cause.message), { name: cause.name });
+			}
 			if (errorValue) {
 				if (responseError.name !== name) {
 					responseError.name = name;

package/lib/core/codec-worker.js

@@ -231,10 +231,11 @@ async function runWorker({ options, readable, writable, onTaskFinished, workerOp
 		}
 		codecStream = new CodecStream(options, config);
 		chunkStream = new ChunkStream(getChunkSize(config));
+		const { signal } = workerOptions.streamOptions;
 		await readable
 			.pipeThrough(codecStream)
 			.pipeThrough(chunkStream)
-			.pipeTo(writable, { preventClose: true, preventAbort: true });
+			.pipeTo(writable, { preventClose: true, preventAbort: true, signal });
 		const {
 			crc32,
 			inputSize,

package/lib/core/streams/aes-crypto-stream.js

@@ -26,8 +26,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global crypto, TransformStream */
-// deno-lint-ignore-file no-this-alias
+/* global crypto, TransformStream, ReadableStream */
 
 import { UNDEFINED_VALUE, UNDEFINED_TYPE, FUNCTION_TYPE, EMPTY_UINT8_ARRAY } from "../constants.js";
 import { encodeText } from "./../util/encode-text.js";
@@ -64,12 +63,12 @@ let createEngine = createDefaultEngine;
 class AESDecryptionStream extends TransformStream {
 
 	constructor({ password, rawPassword, encryptionStrength, checkPasswordOnly, checkAuthenticationCode = true }) {
+		const aesCrypto = {};
 		super({
 			start() {
-				initAesCrypto(this, password, rawPassword, encryptionStrength);
+				initAesCrypto(aesCrypto, password, rawPassword, encryptionStrength);
 			},
 			async transform(chunk, controller) {
-				const aesCrypto = this;
 				const {
 					password,
 					strength,
@@ -88,6 +87,9 @@ class AESDecryptionStream extends TransformStream {
 				} else {
 					await ready;
 				}
+				if (aesCrypto.discarded) {
+					return;
+				}
 				const output = new Uint8Array(chunk.length - AUTHENTICATION_CODE_LENGTH - ((chunk.length - AUTHENTICATION_CODE_LENGTH) % BLOCK_LENGTH));
 				controller.enqueue(append(aesCrypto, chunk, output, 0, AUTHENTICATION_CODE_LENGTH, true));
 			},
@@ -96,9 +98,12 @@ class AESDecryptionStream extends TransformStream {
 					engine,
 					pendingInput,
 					ready
-				} = this;
+				} = aesCrypto;
 				if (engine) {
 					await ready;
+					if (aesCrypto.discarded) {
+						return;
+					}
 					const originalAuthenticationCode = subarray(pendingInput, pendingInput.length - AUTHENTICATION_CODE_LENGTH);
 					const decryptedChunkArray = new Uint8Array(subarray(pendingInput, 0, pendingInput.length - AUTHENTICATION_CODE_LENGTH));
 					engine.process(decryptedChunkArray, true);
@@ -108,27 +113,26 @@ class AESDecryptionStream extends TransformStream {
 						invalidAuthenticationCode |= authenticationCode[indexByte] ^ originalAuthenticationCode[indexByte];
 					}
 					if (invalidAuthenticationCode && checkAuthenticationCode) {
-						throw new Error(ERR_INVALID_AUTHENTICATION_CODE);
+						controller.error(new Error(ERR_INVALID_AUTHENTICATION_CODE));
+						return;
 					}
 					controller.enqueue(decryptedChunkArray);
 				}
-			},
-			cancel() {
-				disposeEngine(this);
 			}
 		});
+		setDisposingReadable(this, aesCrypto);
 	}
 }
 
 class AESEncryptionStream extends TransformStream {
 
 	constructor({ password, rawPassword, encryptionStrength }) {
+		const aesCrypto = {};
 		super({
 			start() {
-				initAesCrypto(this, password, rawPassword, encryptionStrength);
+				initAesCrypto(aesCrypto, password, rawPassword, encryptionStrength);
 			},
 			async transform(chunk, controller) {
-				const aesCrypto = this;
 				const {
 					password,
 					strength,
@@ -142,6 +146,9 @@ class AESEncryptionStream extends TransformStream {
 				} else {
 					await ready;
 				}
+				if (aesCrypto.discarded) {
+					return;
+				}
 				const output = new Uint8Array(preamble.length + chunk.length - (chunk.length % BLOCK_LENGTH));
 				output.set(preamble, 0);
 				controller.enqueue(append(aesCrypto, chunk, output, preamble.length, 0, false));
@@ -151,19 +158,20 @@ class AESEncryptionStream extends TransformStream {
 					engine,
 					pendingInput,
 					ready
-				} = this;
+				} = aesCrypto;
 				if (engine) {
 					await ready;
+					if (aesCrypto.discarded) {
+						return;
+					}
 					const encryptedChunkArray = new Uint8Array(pendingInput);
 					engine.process(encryptedChunkArray, false);
 					const authenticationCode = subarray(engine.digest(), 0, AUTHENTICATION_CODE_LENGTH);
 					controller.enqueue(concat(encryptedChunkArray, authenticationCode));
 				}
-			},
-			cancel() {
-				disposeEngine(this);
 			}
 		});
+		setDisposingReadable(this, aesCrypto);
 	}
 }
 
@@ -182,7 +190,37 @@ function initAesCrypto(aesCrypto, password, rawPassword, encryptionStrength) {
 		ready: new Promise(resolve => aesCrypto.resolveReady = resolve),
 		password: encodePassword(password, rawPassword),
 		strength: encryptionStrength - 1,
-		pendingInput: EMPTY_UINT8_ARRAY
+		pendingInput: EMPTY_UINT8_ARRAY,
+		discarded: false
+	});
+}
+
+function setDisposingReadable(stream, aesCrypto) {
+	const reader = stream.readable.getReader();
+	const readable = new ReadableStream({
+		async pull(controller) {
+			try {
+				const { value, done } = await reader.read();
+				if (done) {
+					controller.close();
+				} else {
+					controller.enqueue(value);
+				}
+			} catch (error) {
+				disposeEngine(aesCrypto);
+				reader.cancel(error).catch(() => { });
+				throw error;
+			}
+		},
+		cancel(reason) {
+			disposeEngine(aesCrypto);
+			return reader.cancel(reason);
+		}
+	});
+	Object.defineProperty(stream, "readable", {
+		get() {
+			return readable;
+		}
 	});
 }
 
@@ -215,7 +253,9 @@ async function createDecryptionKeys(decrypt, strength, password, preamble) {
 	}
 }
 
-function disposeEngine({ engine }) {
+function disposeEngine(aesCrypto) {
+	const { engine } = aesCrypto;
+	aesCrypto.discarded = true;
 	if (engine && engine.dispose) {
 		engine.dispose();
 	}
@@ -232,6 +272,9 @@ async function createKeys(aesCrypto, strength, password, salt) {
 	const keyLength = KEY_LENGTH[strength];
 	const compositeKey = await deriveKey(password, salt, keyLength * 2 + PASSWORD_VERIFICATION_LENGTH);
 	aesCrypto.engine = createEngine(subarray(compositeKey, 0, keyLength), subarray(compositeKey, keyLength, keyLength * 2));
+	if (aesCrypto.discarded) {
+		disposeEngine(aesCrypto);
+	}
 	return subarray(compositeKey, keyLength * 2);
 }
 

package/lib/core/streams/codec-stream.js

@@ -43,6 +43,7 @@ import {
 	ERR_INVALID_AUTHENTICATION_CODE,
 	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_INVALID_COMPRESSED_DATA,
+	ERR_CODEC_OUT_OF_MEMORY,
 	ERR_ABORT_CHECK_PASSWORD,
 	ERR_UNSUPPORTED_CRYPTO_API,
 	InflateStream,
@@ -77,6 +78,7 @@ export {
 	ERR_INVALID_AUTHENTICATION_CODE,
 	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_INVALID_COMPRESSED_DATA,
+	ERR_CODEC_OUT_OF_MEMORY,
 	ERR_ABORT_CHECK_PASSWORD,
 	ERR_UNSUPPORTED_CRYPTO_API,
 	CodecStream,

package/lib/core/streams/zip-crypto-stream.js

@@ -127,11 +127,11 @@ function encrypt(target, input) {
 }
 
 function createKeys(target, password, rawPassword) {
-	const keys = [0x12345678, 0x23456789, 0x34567890];
+	const cryptoKeys = [0x12345678, 0x23456789, 0x34567890];
 	Object.assign(target, {
-		keys,
-		crcKey0: new Crc32(keys[0]),
-		crcKey2: new Crc32(keys[2])
+		cryptoKeys,
+		crcKey0: new Crc32(cryptoKeys[0]),
+		crcKey2: new Crc32(cryptoKeys[2])
 	});
 	if (rawPassword) {
 		for (let index = 0; index < rawPassword.length; index++) {
@@ -145,17 +145,17 @@ function createKeys(target, password, rawPassword) {
 }
 
 function updateKeys(target, byte) {
-	let [, key1] = target.keys;
+	let [, key1] = target.cryptoKeys;
 	target.crcKey0.append([byte]);
 	const key0 = ~target.crcKey0.get();
 	key1 = getInt32(Math.imul(getInt32(key1 + getInt8(key0)), 134775813) + 1);
 	target.crcKey2.append([key1 >>> 24]);
 	const key2 = ~target.crcKey2.get();
-	target.keys = [key0, key1, key2];
+	target.cryptoKeys = [key0, key1, key2];
 }
 
 function getByte(target) {
-	const temp = target.keys[2] | 2;
+	const temp = target.cryptoKeys[2] | 2;
 	return getInt8(Math.imul(temp, (temp ^ 1)) >>> 8);
 }
 

package/lib/core/streams/zip-entry-stream.js

@@ -26,7 +26,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global TransformStream, ReadableStream, MessageChannel */
+/* global TransformStream, ReadableStream */
 // deno-lint-ignore-file no-this-alias
 
 import { Crc32 } from "./codecs/crc32.js";
@@ -48,11 +48,14 @@ import {
 import { UNDEFINED_VALUE } from "../constants.js";
 import { concat, getDataView } from "../util/array.js";
 import { toCompatibleReadable } from "../util/compatible-streams.js";
+import { isErrorObject } from "../util/error.js";
 import { getCodecStreams, ERR_UNSUPPORTED_COMPRESSION } from "../codec-registry.js";
 
 const ERR_INVALID_UNCOMPRESSED_SIZE = "Invalid uncompressed size";
 const ERR_INVALID_COMPRESSED_DATA = "Invalid compressed data";
+const ERR_CODEC_OUT_OF_MEMORY = "Codec out of memory";
 const ERR_INVALID_CRC32 = "Invalid CRC32";
+const Z_MEM_ERROR_CODE = "Z_MEM_ERROR";
 const FORMAT_DEFLATE_RAW = "deflate-raw";
 const FORMAT_DEFLATE64_RAW = "deflate64-raw";
 const FORMAT_GZIP = "gzip";
@@ -87,13 +90,13 @@ class DeflateStream extends TransformStream {
 					readable = pipeThroughCompressionStream(readable, useCompressionStream, { level, chunkSize }, CompressionStream, CompressionStreamFallback);
 				} catch (error) {
 					if (!useCompressionStream && CompressionStreamFallback) {
-						throw error;
+						throw mapMemoryError(error);
 					}
 					let gzipStream;
 					try {
 						gzipStream = new CompressionStream(FORMAT_GZIP);
 					} catch {
-						throw error;
+						throw mapMemoryError(error);
 					}
 					readable = pipeThroughBackpressured(readable, gzipStream);
 					readable = pipeThrough(readable, new GzipToRawDeflateStream());
@@ -157,53 +160,30 @@ class GzipToRawDeflateStream extends TransformStream {
 	}
 }
 
-function pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, crc32) {
+function pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, crc32, sourceErrors) {
 	const writer = gzipStream.writable.getWriter();
 	const reader = gzipStream.readable.getReader();
 	const outputCrc32 = crc32 === UNDEFINED_VALUE ? new Crc32() : UNDEFINED_VALUE;
 	let outputLength = 0;
-	let inputDone = false;
 	let trailerWritten = false;
-	let idleCheckArmed = false;
-	let readCount = 0;
-	let readPending = false;
-	let resolveTrailerReady, rejectTrailerReady;
-	const trailerReady = new Promise((resolve, reject) => {
-		resolveTrailerReady = resolve;
-		rejectTrailerReady = reject;
-	});
-	trailerReady.catch(() => { });
-	pump();
-	return new ReadableStream({
-		async pull(controller) {
-			let result;
-			try {
-				result = await read();
-			} catch (error) {
-				throw trailerWritten ? getTrailerError(error) : error;
-			}
-			const { value, done } = result;
-			if (done) {
-				controller.close();
-			} else {
-				outputLength += value.length;
-				if (outputLength > outputSize) {
-					const error = new Error(ERR_INVALID_UNCOMPRESSED_SIZE);
-					rejectTrailerReady(error);
-					await cancel(reader, error);
-					throw error;
-				}
-				if (outputCrc32) {
-					outputCrc32.append(value);
-				}
-				controller.enqueue(value);
-			}
+	let settled = false;
+	let resolvePull, controller;
+	const output = new ReadableStream({
+		start(streamController) {
+			controller = streamController;
+		},
+		pull() {
+			resumePump();
 		},
 		cancel(reason) {
-			rejectTrailerReady(reason);
+			settled = true;
+			resumePump();
 			return reader.cancel(reason);
 		}
 	});
+	pump();
+	drain();
+	return output;
 
 	async function pump() {
 		const inputReader = readable.getReader();
@@ -212,19 +192,16 @@ function pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, cr
 			header.set(GZIP_HEADER_BYTES);
 			await writer.write(header);
 			for (; ;) {
+				await outputCapacity();
 				await writer.ready;
-				const { value, done } = await inputReader.read();
+				const { value, done } = await readSource(inputReader, sourceErrors);
 				if (done) {
 					break;
 				}
 				await writer.write(value);
 			}
-			inputDone = true;
 			if (outputCrc32) {
-				if (readPending) {
-					armIdleCheck();
-				}
-				await trailerReady;
+				await writer.write(new Uint8Array(0));
 			}
 			const trailer = new Uint8Array(GZIP_TRAILER_LENGTH);
 			const dataView = getDataView(trailer);
@@ -239,54 +216,68 @@ function pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, cr
 		}
 	}
 
-	function read() {
-		readCount++;
-		readPending = true;
-		const result = reader.read();
-		result.then(onReadSettled, onReadSettled);
-		if (inputDone && outputCrc32) {
-			armIdleCheck();
+	async function drain() {
+		try {
+			for (; ;) {
+				const { value, done } = await read();
+				if (done) {
+					break;
+				}
+				outputLength += value.length;
+				if (outputLength > outputSize) {
+					throw new Error(ERR_INVALID_UNCOMPRESSED_SIZE);
+				}
+				if (outputCrc32) {
+					outputCrc32.append(value);
+				}
+				controller.enqueue(value);
+			}
+			if (!settled) {
+				settled = true;
+				controller.close();
+			}
+		} catch (error) {
+			fail(error);
+			await cancel(reader, error);
 		}
-		return result;
 	}
 
-	function onReadSettled() {
-		readPending = false;
-	}
-
-	async function armIdleCheck() {
-		if (!idleCheckArmed) {
-			idleCheckArmed = true;
-			const count = readCount;
-			await nextTask();
-			idleCheckArmed = false;
-			if (readPending) {
-				if (readCount == count) {
-					resolveTrailerReady();
-				} else {
-					armIdleCheck();
+	function read() {
+		return reader.read().catch(error => {
+			if (trailerWritten) {
+				if (!outputCrc32) {
+					throw mapError(error, ERR_INVALID_CRC32);
+				}
+				if (outputLength != outputSize) {
+					throw mapError(error, ERR_INVALID_UNCOMPRESSED_SIZE);
 				}
+				return { done: true };
 			}
-		}
+			throw mapCodecError(error, sourceErrors);
+		});
 	}
 
-	function getTrailerError(error) {
-		const trailerError = new Error(outputLength == outputSize ? ERR_INVALID_CRC32 : ERR_INVALID_UNCOMPRESSED_SIZE);
-		trailerError.cause = error;
-		return trailerError;
+	function outputCapacity() {
+		if (!settled && controller.desiredSize <= 0) {
+			return new Promise(resolve => resolvePull = resolve);
+		}
 	}
-}
 
-function nextTask() {
-	return new Promise(resolve => {
-		const { port1, port2 } = new MessageChannel();
-		port2.onmessage = () => {
-			port1.close();
-			port2.close();
+	function resumePump() {
+		if (resolvePull) {
+			const resolve = resolvePull;
+			resolvePull = UNDEFINED_VALUE;
 			resolve();
-		};
-		port1.postMessage(UNDEFINED_VALUE);
-	});
+		}
+	}
+
+	function fail(error) {
+		if (!settled) {
+			settled = true;
+			controller.error(error);
+			resumePump();
+		}
+	}
 }
 
 class InflateStream extends TransformStream {
@@ -305,11 +296,12 @@ class InflateStream extends TransformStream {
 			}
 		}
 		if (compressed) {
+			const sourceErrors = new Set();
 			const codecStreams = format && getCodecStreams(format);
+			let gzipStream;
 			if (codecStreams) {
-				readable = pipeThroughBackpressured(readable, createCodecStream(codecStreams.DecompressionStream, format, { chunkSize, compressionMethod, rawBitFlag, uncompressedSize: outputSize }));
+				readable = pipeThroughBackpressured(readable, createCodecStream(codecStreams.DecompressionStream, format, { chunkSize, compressionMethod, rawBitFlag, uncompressedSize: outputSize }), sourceErrors);
 			} else {
-				let gzipStream;
 				const GzipDecompressionStream = getGzipCodecStream(useCompressionStream, DecompressionStream, DecompressionStreamFallback);
 				if (checkCrc32 && !deflate64 && crc32 !== UNDEFINED_VALUE && outputSize !== UNDEFINED_VALUE && GzipDecompressionStream) {
 					try {
@@ -320,24 +312,25 @@ class InflateStream extends TransformStream {
 				}
 				if (!gzipStream) {
 					try {
-						readable = pipeThroughCompressionStream(readable, useCompressionStream, { chunkSize, deflate64 }, DecompressionStream, DecompressionStreamFallback);
+						readable = pipeThroughCompressionStream(readable, useCompressionStream, { chunkSize, deflate64 }, DecompressionStream, DecompressionStreamFallback, sourceErrors);
 					} catch (error) {
 						if (deflate64 || outputSize === UNDEFINED_VALUE || (!useCompressionStream && DecompressionStreamFallback)) {
-							throw error;
+							throw mapMemoryError(error);
 						}
 						try {
 							gzipStream = new DecompressionStream(FORMAT_GZIP);
 						} catch {
-							throw error;
+							throw mapMemoryError(error);
 						}
 					}
 				}
-				if (gzipStream) {
-					gzipCrc32 = true;
-					readable = pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, crc32);
-				}
 			}
-			readable = mapInflateStreamError(readable);
+			if (gzipStream) {
+				gzipCrc32 = true;
+				readable = pipeThroughGzipDecompressionStream(readable, gzipStream, outputSize, crc32, sourceErrors);
+			} else {
+				readable = mapInflateStreamError(readable, sourceErrors);
+			}
 		}
 		if (checkCrc32 && !gzipCrc32) {
 			crc32Stream = new Crc32Stream();
@@ -400,6 +393,7 @@ export {
 	ERR_INVALID_AUTHENTICATION_CODE,
 	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_INVALID_COMPRESSED_DATA,
+	ERR_CODEC_OUT_OF_MEMORY,
 	ERR_ABORT_CHECK_PASSWORD,
 	ERR_UNSUPPORTED_CRYPTO_API
 };
@@ -428,7 +422,7 @@ function getGzipCodecStream(useCompressionStream, CodecStreamNative, CodecStream
 	}
 }
 
-function pipeThroughCompressionStream(readable, useCompressionStream, options, CompressionStreamNative, CompressionStreamFallback) {
+function pipeThroughCompressionStream(readable, useCompressionStream, options, CompressionStreamNative, CompressionStreamFallback, sourceErrors) {
 	const Stream = useCompressionStream && CompressionStreamNative ?
 		CompressionStreamNative :
 		CompressionStreamFallback || CompressionStreamNative;
@@ -443,14 +437,14 @@ function pipeThroughCompressionStream(readable, useCompressionStream, options, C
 			throw error;
 		}
 	}
-	return pipeThroughBackpressured(readable, codecStream);
+	return pipeThroughBackpressured(readable, codecStream, sourceErrors);
 }
 
 function pipeThrough(readable, transformStream) {
 	return toCompatibleReadable(readable).pipeThrough(transformStream);
 }
 
-function pipeThroughBackpressured(readable, transformStream) {
+function pipeThroughBackpressured(readable, transformStream, sourceErrors) {
 	const writer = transformStream.writable.getWriter();
 	const reader = readable.getReader();
 	pump();
@@ -460,7 +454,7 @@ function pipeThroughBackpressured(readable, transformStream) {
 		try {
 			for (; ;) {
 				await writer.ready;
-				const result = await reader.read();
+				const result = await readSource(reader, sourceErrors);
 				if (result.done) {
 					await writer.close();
 					break;
@@ -490,26 +484,49 @@ async function cancel(reader, error) {
 	}
 }
 
-function mapInflateStreamError(readable) {
+function readSource(reader, sourceErrors) {
+	const result = reader.read();
+	return sourceErrors ? result.catch(error => {
+		sourceErrors.add(error);
+		throw error;
+	}) : result;
+}
+
+function mapCodecError(error, sourceErrors) {
+	if (sourceErrors.has(error)) {
+		return error;
+	}
+	return mapError(error, isMemoryError(error) ? ERR_CODEC_OUT_OF_MEMORY : ERR_INVALID_COMPRESSED_DATA);
+}
+
+function mapMemoryError(error) {
+	return isMemoryError(error) ? mapError(error, ERR_CODEC_OUT_OF_MEMORY) : error;
+}
+
+function isMemoryError(error) {
+	return isErrorObject(error) && error.code == Z_MEM_ERROR_CODE;
+}
+
+function mapError(error, message) {
+	const mappedError = new Error(message);
+	mappedError.cause = error;
+	return mappedError;
+}
+
+function mapInflateStreamError(readable, sourceErrors) {
 	const reader = readable.getReader();
 	return new ReadableStream({
 		async pull(controller) {
-			let result;
 			try {
-				result = await reader.read();
-			} catch (error) {
-				if (error && error.message) {
-					throw error;
+				const { value, done } = await reader.read();
+				if (done) {
+					controller.close();
+				} else {
+					controller.enqueue(value);
 				}
-				const mappedError = new Error(ERR_INVALID_COMPRESSED_DATA);
-				mappedError.cause = error;
-				throw mappedError;
-			}
-			const { value, done } = result;
-			if (done) {
-				controller.close();
-			} else {
-				controller.enqueue(value);
+			} catch (error) {
+				await cancel(reader, error);
+				throw mapCodecError(error, sourceErrors);
 			}
 		},
 		cancel(reason) {