fix(provider): cap operation timeouts · openclaw/openclaw@a7820b2

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";`
`2`	`2`	`import { VERSION } from "../version.js";`
`3`	`3`
	`4`	`+const MAX_TIMER_TIMEOUT_MS = 2_147_000_000;`
	`5`	`+`
`4`	`6`	`const { fetchWithSsrFGuardMock, shouldUseEnvHttpProxyForUrlMock } = vi.hoisted(() => ({`
`5`	`7`	`fetchWithSsrFGuardMock: vi.fn(),`
`6`	`8`	`shouldUseEnvHttpProxyForUrlMock: vi.fn(() => false),`
`@@ -70,6 +72,25 @@ describe("provider operation deadlines", () => {`
`70`	`72`	`expect(resolveProviderOperationTimeoutMs({ deadline, defaultTimeoutMs: 60_000 })).toBe(60_000);`
`71`	`73`	`});`
`72`	`74`
	`75`	`+it("caps oversized operation and per-call timeouts to timer-safe values", () => {`
	`76`	`+vi.useFakeTimers();`
	`77`	`+vi.setSystemTime(1_000);`
	`78`	`+`
	`79`	`+const deadline = createProviderOperationDeadline({`
	`80`	`+label: "video generation",`
	`81`	`+timeoutMs: MAX_TIMER_TIMEOUT_MS + 1_000_000,`
	`82`	`+});`
	`83`	`+`
	`84`	`+expect(deadline.timeoutMs).toBe(MAX_TIMER_TIMEOUT_MS);`
	`85`	`+expect(deadline.deadlineAtMs).toBe(1_000 + MAX_TIMER_TIMEOUT_MS);`
	`86`	`+expect(`
	`87`	`+resolveProviderOperationTimeoutMs({`
	`88`	`+deadline: createProviderOperationDeadline({ label: "no deadline" }),`
	`89`	`+defaultTimeoutMs: MAX_TIMER_TIMEOUT_MS + 1_000_000,`
	`90`	`+}),`
	`91`	`+).toBe(MAX_TIMER_TIMEOUT_MS);`
	`92`	`+});`
	`93`	`+`
`73`	`94`	`it("clamps per-call timeouts to the remaining operation deadline", () => {`
`74`	`95`	`vi.useFakeTimers();`
`75`	`96`	`vi.setSystemTime(1_000);`

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ import {`
`28`	`28`	`type ProviderOperationRetryStage,`
`29`	`29`	`type TransientProviderRetryConfig,`
`30`	`30`	`} from "../provider-runtime/operation-retry.js";`
	`31`	`+import { resolveTimerTimeoutMs } from "../shared/number-coercion.js";`
`31`	`32`	`import { fetchWithTimeout } from "../utils/fetch-timeout.js";`
`32`	`33`	`export { fetchWithTimeout };`
`33`	`34`	`export { normalizeBaseUrl } from "../agents/provider-request-config.js";`
`@@ -101,7 +102,7 @@ export function createProviderOperationDeadline(params: {`
`101`	`102`	`) {`
`102`	`103`	`return { label: params.label };`
`103`	`104`	`}`
`104`		`-const timeoutMs = Math.floor(params.timeoutMs);`
	`105`	`+const timeoutMs = resolveTimerTimeoutMs(params.timeoutMs, 1);`
`105`	`106`	`return {`
`106`	`107`	`deadlineAtMs: Date.now() + timeoutMs,`
`107`	`108`	`label: params.label,`
`@@ -113,15 +114,16 @@ export function resolveProviderOperationTimeoutMs(params: {`
`113`	`114`	`deadline: ProviderOperationDeadline;`
`114`	`115`	`defaultTimeoutMs: number;`
`115`	`116`	`}): number {`
	`117`	`+const defaultTimeoutMs = resolveTimerTimeoutMs(params.defaultTimeoutMs, 1);`
`116`	`118`	`const deadlineAtMs = params.deadline.deadlineAtMs;`
`117`	`119`	`if (typeof deadlineAtMs !== "number") {`
`118`		`-return params.defaultTimeoutMs;`
	`120`	`+return defaultTimeoutMs;`
`119`	`121`	`}`
`120`	`122`	`const remainingMs = deadlineAtMs - Date.now();`
`121`	`123`	`if (remainingMs <= 0) {`
`122`	`124`	throw new Error(`${params.deadline.label} timed out after ${params.deadline.timeoutMs}ms`);
`123`	`125`	`}`
`124`		`-return Math.max(1, Math.min(params.defaultTimeoutMs, remainingMs));`
	`126`	`+return Math.max(1, Math.min(defaultTimeoutMs, remainingMs));`
`125`	`127`	`}`
`126`	`128`
`127`	`129`	`export function createProviderOperationTimeoutResolver(params: {`

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

推荐订阅源

Recent Commits to openclaw:main