fix(e2e): cancel timed out response reads

This commit is contained in:
Vincent Koc
2026-06-07 12:32:46 +02:00
parent a1af47e5da
commit f5935bbca1
2 changed files with 108 additions and 4 deletions
+23 -4
View File
@@ -5,6 +5,12 @@ function bodyTooLargeError(label, byteLimit) {
});
}
function cancelReaderSoon(reader) {
void Promise.resolve()
.then(() => reader.cancel())
.catch(() => {});
}
export async function readBoundedResponseText(response, label, byteLimit, timeoutPromise) {
const contentLength = response.headers.get("content-length");
if (contentLength) {
@@ -22,22 +28,35 @@ export async function readBoundedResponseText(response, label, byteLimit, timeou
const decoder = new TextDecoder();
let byteCount = 0;
let text = "";
let canceled = false;
try {
while (true) {
const { done, value } = await (timeoutPromise
? Promise.race([reader.read(), timeoutPromise])
: reader.read());
const read = reader.read();
const readWithTimeout = timeoutPromise
? Promise.race([
read,
timeoutPromise.catch((error) => {
canceled = true;
cancelReaderSoon(reader);
throw error;
}),
])
: read;
const { done, value } = await readWithTimeout;
if (done) {
return text + decoder.decode();
}
byteCount += value.byteLength;
if (byteCount > byteLimit) {
canceled = true;
await reader.cancel().catch(() => {});
throw bodyTooLargeError(label, byteLimit);
}
text += decoder.decode(value, { stream: true });
}
} finally {
reader.releaseLock();
if (!canceled) {
reader.releaseLock();
}
}
}