refactor(providers): share bounded error body reader · op...

Recent Commits to openclaw:main

vincentkoc · 2026-06-23 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import { readResponseBodySnippet } from "../infra/http-error-body.js";`
`1`	`2`	`/**`
`2`	`3`	`* Adapts MiniMax VLM image-understanding requests for agent image inputs.`
`3`	`4`	`*/`
`@@ -15,58 +16,6 @@ const MINIMAX_VLM_ERROR_BODY_MAX_BYTES = 8 * 1024;`
`15`	`16`	`const MINIMAX_VLM_ERROR_BODY_MAX_CHARS = 400;`
`16`	`17`	`const DEFAULT_MINIMAX_VLM_TIMEOUT_MS = 60_000;`
`17`	`18`
`18`		`-async function readErrorBodySnippet(res: Response): Promise<string> {`
`19`		`-try {`
`20`		`-const body = res.body;`
`21`		`-if (!body \|\| typeof body.getReader !== "function") {`
`22`		`-return (await res.text()).slice(0, MINIMAX_VLM_ERROR_BODY_MAX_CHARS);`
`23`		`-}`
`24`		`-`
`25`		`-const reader = body.getReader();`
`26`		`-const chunks: Uint8Array[] = [];`
`27`		`-let total = 0;`
`28`		`-let truncated = false;`
`29`		`-try {`
`30`		`-while (true) {`
`31`		`-const { done, value } = await reader.read();`
`32`		`-if (done \|\| !value?.byteLength) {`
`33`		`-break;`
`34`		`-}`
`35`		`-const remaining = MINIMAX_VLM_ERROR_BODY_MAX_BYTES - total;`
`36`		`-if (remaining <= 0) {`
`37`		`-truncated = true;`
`38`		`-break;`
`39`		`-}`
`40`		`-if (value.byteLength > remaining) {`
`41`		`-chunks.push(value.subarray(0, remaining));`
`42`		`-total += remaining;`
`43`		`-truncated = true;`
`44`		`-break;`
`45`		`-}`
`46`		`-chunks.push(value);`
`47`		`-total += value.byteLength;`
`48`		`-if (total >= MINIMAX_VLM_ERROR_BODY_MAX_BYTES) {`
`49`		`-truncated = true;`
`50`		`-break;`
`51`		`-}`
`52`		`-}`
`53`		`-} finally {`
`54`		`-if (truncated) {`
`55`		`-await reader.cancel().catch(() => undefined);`
`56`		`-}`
`57`		`-try {`
`58`		`-reader.releaseLock();`
`59`		`-} catch {}`
`60`		`-}`
`61`		`-`
`62`		`-return new TextDecoder()`
`63`		`-.decode(Buffer.concat(chunks, total))`
`64`		`-.slice(0, MINIMAX_VLM_ERROR_BODY_MAX_CHARS);`
`65`		`-} catch {`
`66`		`-return "";`
`67`		`-}`
`68`		`-}`
`69`		`-`
`70`	`19`	`export function isMinimaxVlmProvider(provider: string): boolean {`
`71`	`20`	`const normalized = provider.trim().toLowerCase();`
`72`	`21`	`return (`
`@@ -160,10 +109,7 @@ export async function minimaxUnderstandImage(params: {`
`160`	`109`	`// Without this, HTTP_PROXY/HTTPS_PROXY env vars are silently ignored (#51619).`
`161`	`110`	`ensureGlobalUndiciEnvProxyDispatcher();`
`162`	`111`
`163`		`-const timeoutMs = resolvePositiveTimerTimeoutMs(`
`164`		`-params.timeoutMs,`
`165`		`-DEFAULT_MINIMAX_VLM_TIMEOUT_MS,`
`166`		`-);`
	`112`	`+const timeoutMs = resolvePositiveTimerTimeoutMs(params.timeoutMs, DEFAULT_MINIMAX_VLM_TIMEOUT_MS);`
`167`	`113`
`168`	`114`	`const res = await fetch(url, {`
`169`	`115`	`method: "POST",`
`@@ -181,7 +127,10 @@ export async function minimaxUnderstandImage(params: {`
`181`	`127`
`182`	`128`	`const traceId = res.headers.get("Trace-Id") ?? "";`
`183`	`129`	`if (!res.ok) {`
`184`		`-const body = await readErrorBodySnippet(res);`
	`130`	`+const body = await readResponseBodySnippet(res, {`
	`131`	`+maxBytes: MINIMAX_VLM_ERROR_BODY_MAX_BYTES,`
	`132`	`+maxChars: MINIMAX_VLM_ERROR_BODY_MAX_CHARS,`
	`133`	`+});`
`185`	`134`	const trace = traceId ? ` Trace-Id: ${traceId}` : "";
`186`	`135`	`throw new Error(`
`187`	`136`	`MiniMax VLM request failed (${res.status} ${res.statusText}).${trace}${

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`* This bypasses shared model runtime's content type system which does not have a "document" type.`
`4`	`4`	`*/`
`5`	`5`
	`6`	`+import { readResponseBodySnippet } from "../../infra/http-error-body.js";`
`6`	`7`	`import { normalizeProviderTransportWithPlugin } from "../../plugins/provider-runtime.js";`
`7`	`8`	`import { isRecord } from "../../utils.js";`
`8`	`9`	`import { normalizeSecretInput } from "../../utils/normalize-secret-input.js";`
`@@ -17,57 +18,6 @@ const NATIVE_PDF_PROVIDER_FETCH_TIMEOUT_MS = 120_000;`
`17`	`18`	`const NATIVE_PDF_ERROR_BODY_MAX_BYTES = 8 * 1024;`
`18`	`19`	`const NATIVE_PDF_ERROR_BODY_MAX_CHARS = 400;`
`19`	`20`
`20`		`-async function readErrorBodySnippet(res: Response): Promise<string> {`
`21`		`-try {`
`22`		`-const body = res.body;`
`23`		`-if (!body \|\| typeof body.getReader !== "function") {`
`24`		`-return (await res.text()).slice(0, NATIVE_PDF_ERROR_BODY_MAX_CHARS);`
`25`		`-}`
`26`		`-`
`27`		`-const reader = body.getReader();`
`28`		`-const chunks: Uint8Array[] = [];`
`29`		`-let total = 0;`
`30`		`-let truncated = false;`
`31`		`-try {`
`32`		`-while (true) {`
`33`		`-const { done, value } = await reader.read();`
`34`		`-if (done \|\| !value?.byteLength) {`
`35`		`-break;`
`36`		`-}`
`37`		`-const remaining = NATIVE_PDF_ERROR_BODY_MAX_BYTES - total;`
`38`		`-if (remaining <= 0) {`
`39`		`-truncated = true;`
`40`		`-break;`
`41`		`-}`
`42`		`-if (value.byteLength > remaining) {`
`43`		`-chunks.push(value.subarray(0, remaining));`
`44`		`-total += remaining;`
`45`		`-truncated = true;`
`46`		`-break;`
`47`		`-}`
`48`		`-chunks.push(value);`
`49`		`-total += value.byteLength;`
`50`		`-if (total >= NATIVE_PDF_ERROR_BODY_MAX_BYTES) {`
`51`		`-truncated = true;`
`52`		`-break;`
`53`		`-}`
`54`		`-}`
`55`		`-} finally {`
`56`		`-if (truncated) {`
`57`		`-await reader.cancel().catch(() => undefined);`
`58`		`-}`
`59`		`-try {`
`60`		`-reader.releaseLock();`
`61`		`-} catch {}`
`62`		`-}`
`63`		`-return new TextDecoder()`
`64`		`-.decode(Buffer.concat(chunks, total))`
`65`		`-.slice(0, NATIVE_PDF_ERROR_BODY_MAX_CHARS);`
`66`		`-} catch {`
`67`		`-return "";`
`68`		`-}`
`69`		`-}`
`70`		`-`
`71`	`21`	`// ---------------------------------------------------------------------------`
`72`	`22`	`// Anthropic – native PDF via Messages API`
`73`	`23`	`// ---------------------------------------------------------------------------`
`@@ -133,7 +83,10 @@ export async function anthropicAnalyzePdf(params: {`
`133`	`83`	`});`
`134`	`84`
`135`	`85`	`if (!res.ok) {`
`136`		`-const body = await readErrorBodySnippet(res);`
	`86`	`+const body = await readResponseBodySnippet(res, {`
	`87`	`+maxBytes: NATIVE_PDF_ERROR_BODY_MAX_BYTES,`
	`88`	`+maxChars: NATIVE_PDF_ERROR_BODY_MAX_CHARS,`
	`89`	`+});`
`137`	`90`	`throw new Error(`
`138`	`91`	`Anthropic PDF request failed (${res.status} ${res.statusText})${body ? `: ${body}` : ""}`,
`139`	`92`	`);`
`@@ -218,7 +171,10 @@ export async function geminiAnalyzePdf(params: {`
`218`	`171`	`});`
`219`	`172`
`220`	`173`	`if (!res.ok) {`
`221`		`-const body = await readErrorBodySnippet(res);`
	`174`	`+const body = await readResponseBodySnippet(res, {`
	`175`	`+maxBytes: NATIVE_PDF_ERROR_BODY_MAX_BYTES,`
	`176`	`+maxChars: NATIVE_PDF_ERROR_BODY_MAX_CHARS,`
	`177`	`+});`
`222`	`178`	`throw new Error(`
`223`	`179`	`Gemini PDF request failed (${res.status} ${res.statusText})${body ? `: ${body}` : ""}`,
`224`	`180`	`);`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,52 @@`
	`1`	`+export async function readResponseBodySnippet(`
	`2`	`+response: Response,`
	`3`	`+limits: { maxBytes: number; maxChars: number },`
	`4`	`+): Promise<string> {`
	`5`	`+try {`
	`6`	`+const body = response.body;`
	`7`	`+if (!body \|\| typeof body.getReader !== "function") {`
	`8`	`+return (await response.text()).slice(0, limits.maxChars);`
	`9`	`+}`
	`10`	`+`
	`11`	`+const reader = body.getReader();`
	`12`	`+const chunks: Uint8Array[] = [];`
	`13`	`+let total = 0;`
	`14`	`+let truncated = false;`
	`15`	`+try {`
	`16`	`+while (true) {`
	`17`	`+const { done, value } = await reader.read();`
	`18`	`+if (done \|\| !value?.byteLength) {`
	`19`	`+break;`
	`20`	`+}`
	`21`	`+const remaining = limits.maxBytes - total;`
	`22`	`+if (remaining <= 0) {`
	`23`	`+truncated = true;`
	`24`	`+break;`
	`25`	`+}`
	`26`	`+if (value.byteLength > remaining) {`
	`27`	`+chunks.push(value.subarray(0, remaining));`
	`28`	`+total += remaining;`
	`29`	`+truncated = true;`
	`30`	`+break;`
	`31`	`+}`
	`32`	`+chunks.push(value);`
	`33`	`+total += value.byteLength;`
	`34`	`+if (total >= limits.maxBytes) {`
	`35`	`+truncated = true;`
	`36`	`+break;`
	`37`	`+}`
	`38`	`+}`
	`39`	`+} finally {`
	`40`	`+if (truncated) {`
	`41`	`+await reader.cancel().catch(() => undefined);`
	`42`	`+}`
	`43`	`+try {`
	`44`	`+reader.releaseLock();`
	`45`	`+} catch {}`
	`46`	`+}`
	`47`	`+`
	`48`	`+return new TextDecoder().decode(Buffer.concat(chunks, total)).slice(0, limits.maxChars);`
	`49`	`+} catch {`
	`50`	`+return "";`
	`51`	`+}`
	`52`	`+}`

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

推荐订阅源

Recent Commits to openclaw:main