refactor: share e2e bounded response reader · openclaw/op...

Recent Commits to openclaw:main

vincentkoc · 2026-05-30 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,9 @@ export async function readBoundedResponseText(response, label, byteLimit, timeou`
`23`	`23`	`let text = "";`
`24`	`24`	`try {`
`25`	`25`	`while (true) {`
`26`		`-const { done, value } = await Promise.race([reader.read(), timeoutPromise]);`
	`26`	`+const { done, value } = await (timeoutPromise`
	`27`	`+ ? Promise.race([reader.read(), timeoutPromise])`
	`28`	`+ : reader.read());`
`27`	`29`	`if (done) {`
`28`	`30`	`return text + decoder.decode();`
`29`	`31`	`}`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import {`
`4`	`4`	`assertAgentReplyContainsMarker,`
`5`	`5`	`assertOpenAiRequestLogUsed,`
`6`	`6`	`} from "../agent-turn-output.mjs";`
	`7`	`+import { readBoundedResponseText as readBoundedResponseTextWithLimit } from "../bounded-response-text.mjs";`
`7`	`8`	`import { applyMockOpenAiModelConfig } from "../fixtures/mock-openai-config.mjs";`
`8`	`9`
`9`	`10`	`const command = process.argv[2];`
`@@ -46,49 +47,12 @@ async function withClickClackFixtureResponse(url, init, consume, options = {}) {`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`
`49`		`-function bodyTooLargeError(label, byteLimit) {`
`50`		-return Object.assign(new Error(`${label} response body exceeded ${byteLimit} bytes`), {
`51`		`-code: "ETOOBIG",`
`52`		`-});`
`53`		`-}`
`54`		`-`
`55`	`50`	`async function readBoundedResponseText(`
`56`	`51`	`response,`
`57`	`52`	`label,`
`58`	`53`	`byteLimit = CLICKCLACK_HTTP_BODY_MAX_BYTES,`
`59`	`54`	`) {`
`60`		`-const contentLength = response.headers.get("content-length");`
`61`		`-if (contentLength) {`
`62`		`-const parsedLength = Number(contentLength);`
`63`		`-if (Number.isSafeInteger(parsedLength) && parsedLength > byteLimit) {`
`64`		`-await response.body?.cancel().catch(() => {});`
`65`		`-throw bodyTooLargeError(label, byteLimit);`
`66`		`-}`
`67`		`-}`
`68`		`-if (!response.body) {`
`69`		`-return "";`
`70`		`-}`
`71`		`-`
`72`		`-const reader = response.body.getReader();`
`73`		`-const decoder = new TextDecoder();`
`74`		`-let byteCount = 0;`
`75`		`-let text = "";`
`76`		`-try {`
`77`		`-while (true) {`
`78`		`-const { done, value } = await reader.read();`
`79`		`-if (done) {`
`80`		`-return text + decoder.decode();`
`81`		`-}`
`82`		`-byteCount += value.byteLength;`
`83`		`-if (byteCount > byteLimit) {`
`84`		`-await reader.cancel().catch(() => {});`
`85`		`-throw bodyTooLargeError(label, byteLimit);`
`86`		`-}`
`87`		`-text += decoder.decode(value, { stream: true });`
`88`		`-}`
`89`		`-} finally {`
`90`		`-reader.releaseLock();`
`91`		`-}`
	`55`	`+return await readBoundedResponseTextWithLimit(response, label, byteLimit);`
`92`	`56`	`}`
`93`	`57`
`94`	`58`	`async function readBoundedResponseJson(response, label) {`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { Agent, setGlobalDispatcher } from "undici";`
	`2`	`+import { readBoundedResponseText as readBoundedResponseTextWithLimit } from "./lib/bounded-response-text.mjs";`
`2`	`3`
`3`	`4`	`const baseUrl = process.env.OPENWEBUI_BASE_URL ?? "";`
`4`	`5`	`const email = process.env.OPENWEBUI_ADMIN_EMAIL ?? "";`
`@@ -69,12 +70,6 @@ function createTimeoutError(label, timeoutMs) {`
`69`	`70`	`return error;`
`70`	`71`	`}`
`71`	`72`
`72`		`-function createBodyTooLargeError(label, byteLimit) {`
`73`		-const error = new Error(`${label} response body exceeded ${byteLimit} bytes`);
`74`		`-error.code = "ETOOBIG";`
`75`		`-return error;`
`76`		`-}`
`77`		`-`
`78`	`73`	`async function withRequestTimeout(label, timeoutMs, run) {`
`79`	`74`	`const controller = new AbortController();`
`80`	`75`	`const timeoutError = createTimeoutError(label, timeoutMs);`
`@@ -95,38 +90,7 @@ async function withRequestTimeout(label, timeoutMs, run) {`
`95`	`90`	`}`
`96`	`91`
`97`	`92`	`async function readBoundedResponseText(response, label, byteLimit = responseBodyMaxBytes) {`
`98`		`-const contentLength = response.headers.get("content-length");`
`99`		`-if (contentLength) {`
`100`		`-const parsedLength = Number(contentLength);`
`101`		`-if (Number.isSafeInteger(parsedLength) && parsedLength > byteLimit) {`
`102`		`-await response.body?.cancel().catch(() => {});`
`103`		`-throw createBodyTooLargeError(label, byteLimit);`
`104`		`-}`
`105`		`-}`
`106`		`-if (!response.body) {`
`107`		`-return "";`
`108`		`-}`
`109`		`-`
`110`		`-const reader = response.body.getReader();`
`111`		`-const decoder = new TextDecoder();`
`112`		`-let byteCount = 0;`
`113`		`-let text = "";`
`114`		`-try {`
`115`		`-while (true) {`
`116`		`-const { done, value } = await reader.read();`
`117`		`-if (done) {`
`118`		`-return text + decoder.decode();`
`119`		`-}`
`120`		`-byteCount += value.byteLength;`
`121`		`-if (byteCount > byteLimit) {`
`122`		`-await reader.cancel().catch(() => {});`
`123`		`-throw createBodyTooLargeError(label, byteLimit);`
`124`		`-}`
`125`		`-text += decoder.decode(value, { stream: true });`
`126`		`-}`
`127`		`-} finally {`
`128`		`-reader.releaseLock();`
`129`		`-}`
	`93`	`+return await readBoundedResponseTextWithLimit(response, label, byteLimit);`
`130`	`94`	`}`
`131`	`95`
`132`	`96`	`async function readBoundedResponseJson(response, label) {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main