refactor(provider): share operation timeout resolvers · openclaw/openclaw@9f46e9c

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runt`
`4`	`4`	`import {`
`5`	`5`	`assertOkOrThrowHttpError,`
`6`	`6`	`createProviderOperationDeadline,`
	`7`	`+createProviderOperationTimeoutResolver,`
`7`	`8`	`fetchProviderDownloadResponse,`
`8`	`9`	`fetchProviderOperationResponse,`
`9`	`10`	`postJsonRequest,`
`@@ -91,11 +92,10 @@ async function pollBytePlusTask(params: {`
`91`	`92`	`method: "GET",`
`92`	`93`	`headers: params.headers,`
`93`	`94`	`},`
`94`		`-timeoutMs: () =>`
`95`		`-resolveProviderOperationTimeoutMs({`
`96`		`- deadline,`
`97`		`-defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
`98`		`-}),`
	`95`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`96`	`+ deadline,`
	`97`	`+defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
	`98`	`+}),`
`99`	`99`	`fetchFn: params.fetchFn,`
`100`	`100`	`provider: "byteplus",`
`101`	`101`	`requestFailedMessage: "BytePlus video status request failed",`
`@@ -313,11 +313,10 @@ export function buildBytePlusVideoGenerationProvider(): VideoGenerationProvider`
`313`	`313`	`}`
`314`	`314`	`const video = await downloadBytePlusVideo({`
`315`	`315`	`url: videoUrl,`
`316`		`-timeoutMs: () =>`
`317`		`-resolveProviderOperationTimeoutMs({`
`318`		`- deadline,`
`319`		`-defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
`320`		`-}),`
	`316`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`317`	`+ deadline,`
	`318`	`+defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
	`319`	`+}),`
`321`	`320`	`fetchFn,`
`322`	`321`	`});`
`323`	`322`	`return {`

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,10 @@ vi.mock("openclaw/plugin-sdk/provider-http", () => ({`
`103`	`103`	`label,`
`104`	`104`	`timeoutMs,`
`105`	`105`	`}),`
	`106`	`+createProviderOperationTimeoutResolver:`
	`107`	`+({ defaultTimeoutMs }: { defaultTimeoutMs: number }) =>`
	`108`	`+() =>`
	`109`	`+defaultTimeoutMs,`
`106`	`110`	`fetchProviderDownloadResponse: minimaxProviderHttpMocks.fetchProviderDownloadResponseMock,`
`107`	`111`	`fetchProviderOperationResponse: minimaxProviderHttpMocks.fetchProviderOperationResponseMock,`
`108`	`112`	`fetchWithTimeout: minimaxProviderHttpMocks.fetchWithTimeoutMock,`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runt`
`4`	`4`	`import {`
`5`	`5`	`assertOkOrThrowHttpError,`
`6`	`6`	`createProviderOperationDeadline,`
	`7`	`+createProviderOperationTimeoutResolver,`
`7`	`8`	`fetchProviderDownloadResponse,`
`8`	`9`	`fetchProviderOperationResponse,`
`9`	`10`	`postJsonRequest,`
`@@ -180,11 +181,10 @@ async function pollMinimaxVideo(params: {`
`180`	`181`	`method: "GET",`
`181`	`182`	`headers: params.headers,`
`182`	`183`	`},`
`183`		`-timeoutMs: () =>`
`184`		`-resolveProviderOperationTimeoutMs({`
`185`		`- deadline,`
`186`		`-defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
`187`		`-}),`
	`184`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`185`	`+ deadline,`
	`186`	`+defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
	`187`	`+}),`
`188`	`188`	`fetchFn: params.fetchFn,`
`189`	`189`	`provider: "minimax",`
`190`	`190`	`requestFailedMessage: "MiniMax video status request failed",`
`@@ -408,22 +408,20 @@ function buildMinimaxVideoProvider(providerId: string): VideoGenerationProvider`
`408`	`408`	`const video = videoUrl`
`409`	`409`	`? await downloadVideoFromUrl({`
`410`	`410`	`url: videoUrl,`
`411`		`-timeoutMs: () =>`
`412`		`-resolveProviderOperationTimeoutMs({`
`413`		`- deadline,`
`414`		`-defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
`415`		`-}),`
	`411`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`412`	`+ deadline,`
	`413`	`+defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
	`414`	`+}),`
`416`	`415`	`fetchFn,`
`417`	`416`	`})`
`418`	`417`	`: fileId`
`419`	`418`	`? await downloadVideoFromFileId({`
`420`	`419`	`fileId,`
`421`	`420`	`headers,`
`422`		`-timeoutMs: () =>`
`423`		`-resolveProviderOperationTimeoutMs({`
`424`		`- deadline,`
`425`		`-defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
`426`		`-}),`
	`421`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`422`	`+ deadline,`
	`423`	`+defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
	`424`	`+}),`
`427`	`425`	`baseUrl,`
`428`	`426`	`fetchFn,`
`429`	`427`	`})`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runt`
`4`	`4`	`import {`
`5`	`5`	`assertOkOrThrowHttpError,`
`6`	`6`	`createProviderOperationDeadline,`
	`7`	`+createProviderOperationTimeoutResolver,`
`7`	`8`	`fetchProviderDownloadResponse,`
`8`	`9`	`fetchWithTimeout,`
`9`	`10`	`pollProviderOperationJson,`
`@@ -356,11 +357,10 @@ export function buildOpenAIVideoGenerationProvider(): VideoGenerationProvider {`
`356`	`357`	`const video = await downloadOpenAIVideo({`
`357`	`358`	`videoId,`
`358`	`359`	`headers,`
`359`		`-timeoutMs: () =>`
`360`		`-resolveProviderOperationTimeoutMs({`
`361`		`- deadline,`
`362`		`-defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
`363`		`-}),`
	`360`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`361`	`+ deadline,`
	`362`	`+defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
	`363`	`+}),`
`364`	`364`	`baseUrl,`
`365`	`365`	`fetchFn,`
`366`	`366`	`});`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runt`
`4`	`4`	`import {`
`5`	`5`	`assertOkOrThrowHttpError,`
`6`	`6`	`createProviderOperationDeadline,`
	`7`	`+createProviderOperationTimeoutResolver,`
`7`	`8`	`fetchProviderDownloadResponse,`
`8`	`9`	`fetchProviderOperationResponse,`
`9`	`10`	`postJsonRequest,`
`@@ -217,11 +218,10 @@ async function pollRunwayTask(params: {`
`217`	`218`	`method: "GET",`
`218`	`219`	`headers: params.headers,`
`219`	`220`	`},`
`220`		`-timeoutMs: () =>`
`221`		`-resolveProviderOperationTimeoutMs({`
`222`		`- deadline,`
`223`		`-defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
`224`		`-}),`
	`221`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`222`	`+ deadline,`
	`223`	`+defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
	`224`	`+}),`
`225`	`225`	`fetchFn: params.fetchFn,`
`226`	`226`	`provider: "runway",`
`227`	`227`	`requestFailedMessage: "Runway video status request failed",`
`@@ -377,11 +377,10 @@ export function buildRunwayVideoGenerationProvider(): VideoGenerationProvider {`
`377`	`377`	`}`
`378`	`378`	`const videos = await downloadRunwayVideos({`
`379`	`379`	`urls: outputUrls,`
`380`		`-timeoutMs: () =>`
`381`		`-resolveProviderOperationTimeoutMs({`
`382`		`- deadline,`
`383`		`-defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
`384`		`-}),`
	`380`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`381`	`+ deadline,`
	`382`	`+defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
	`383`	`+}),`
`385`	`384`	`fetchFn,`
`386`	`385`	`});`
`387`	`386`	`return {`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runt`
`4`	`4`	`import {`
`5`	`5`	`assertOkOrThrowHttpError,`
`6`	`6`	`createProviderOperationDeadline,`
	`7`	`+createProviderOperationTimeoutResolver,`
`7`	`8`	`fetchProviderDownloadResponse,`
`8`	`9`	`pollProviderOperationJson,`
`9`	`10`	`postJsonRequest,`
`@@ -247,11 +248,10 @@ export function buildTogetherVideoGenerationProvider(): VideoGenerationProvider`
`247`	`248`	`}`
`248`	`249`	`const video = await downloadTogetherVideo({`
`249`	`250`	`url: videoUrl,`
`250`		`-timeoutMs: () =>`
`251`		`-resolveProviderOperationTimeoutMs({`
`252`		`- deadline,`
`253`		`-defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
`254`		`-}),`
	`251`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`252`	`+ deadline,`
	`253`	`+defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
	`254`	`+}),`
`255`	`255`	`fetchFn,`
`256`	`256`	`});`
`257`	`257`	`return {`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runt`
`4`	`4`	`import {`
`5`	`5`	`assertOkOrThrowHttpError,`
`6`	`6`	`createProviderOperationDeadline,`
	`7`	`+createProviderOperationTimeoutResolver,`
`7`	`8`	`fetchProviderDownloadResponse,`
`8`	`9`	`fetchProviderOperationResponse,`
`9`	`10`	`postJsonRequest,`
`@@ -270,11 +271,10 @@ async function pollXaiVideo(params: {`
`270`	`271`	`method: "GET",`
`271`	`272`	`headers: params.headers,`
`272`	`273`	`},`
`273`		`-timeoutMs: () =>`
`274`		`-resolveProviderOperationTimeoutMs({`
`275`		`- deadline,`
`276`		`-defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
`277`		`-}),`
	`274`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`275`	`+ deadline,`
	`276`	`+defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
	`277`	`+}),`
`278`	`278`	`fetchFn: params.fetchFn,`
`279`	`279`	`provider: "xai",`
`280`	`280`	`requestFailedMessage: "xAI video status request failed",`
`@@ -427,11 +427,10 @@ export function buildXaiVideoGenerationProvider(): VideoGenerationProvider {`
`427`	`427`	`}`
`428`	`428`	`const video = await downloadXaiVideo({`
`429`	`429`	`url: videoUrl,`
`430`		`-timeoutMs: () =>`
`431`		`-resolveProviderOperationTimeoutMs({`
`432`		`- deadline,`
`433`		`-defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
`434`		`-}),`
	`430`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`431`	`+ deadline,`
	`432`	`+defaultTimeoutMs: DEFAULT_TIMEOUT_MS,`
	`433`	`+}),`
`435`	`434`	`fetchFn,`
`436`	`435`	`});`
`437`	`436`	`return {`

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ vi.mock("../infra/net/proxy-env.js", async () => {`
`28`	`28`
`29`	`29`	`import {`
`30`	`30`	`createProviderOperationDeadline,`
	`31`	`+createProviderOperationTimeoutResolver,`
`31`	`32`	`fetchProviderDownloadResponse,`
`32`	`33`	`fetchWithTimeoutGuarded,`
`33`	`34`	`pollProviderOperationJson,`
`@@ -285,7 +286,7 @@ describe("provider operation deadlines", () => {`
`285`	`286`	`fetchProviderDownloadResponse({`
`286`	`287`	`url: "https://cdn.example.com/video.mp4",`
`287`	`288`	`init: { method: "GET" },`
`288`		`-timeoutMs: () => resolveProviderOperationTimeoutMs({ deadline, defaultTimeoutMs: 5_000 }),`
	`289`	`+timeoutMs: createProviderOperationTimeoutResolver({ deadline, defaultTimeoutMs: 5_000 }),`
`289`	`290`	`fetchFn,`
`290`	`291`	`provider: "test-video",`
`291`	`292`	`requestFailedMessage: "download failed",`

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,13 @@ export function resolveProviderOperationTimeoutMs(params: {`
`110`	`110`	`return Math.max(1, Math.min(params.defaultTimeoutMs, remainingMs));`
`111`	`111`	`}`
`112`	`112`
	`113`	`+export function createProviderOperationTimeoutResolver(params: {`
	`114`	`+deadline: ProviderOperationDeadline;`
	`115`	`+defaultTimeoutMs: number;`
	`116`	`+}): () => number {`
	`117`	`+return () => resolveProviderOperationTimeoutMs(params);`
	`118`	`+}`
	`119`	`+`
`113`	`120`	`export async function waitProviderOperationPollInterval(params: {`
`114`	`121`	`deadline: ProviderOperationDeadline;`
`115`	`122`	`pollIntervalMs: number;`
`@@ -147,11 +154,10 @@ export async function pollProviderOperationJson<TPayload>(params: {`
`147`	`154`	`method: "GET",`
`148`	`155`	`headers: params.headers,`
`149`	`156`	`},`
`150`		`-timeoutMs: () =>`
`151`		`-resolveProviderOperationTimeoutMs({`
`152`		`-deadline: params.deadline,`
`153`		`-defaultTimeoutMs: params.defaultTimeoutMs,`
`154`		`-}),`
	`157`	`+timeoutMs: createProviderOperationTimeoutResolver({`
	`158`	`+deadline: params.deadline,`
	`159`	`+defaultTimeoutMs: params.defaultTimeoutMs,`
	`160`	`+}),`
`155`	`161`	`fetchFn: params.fetchFn,`
`156`	`162`	`requestFailedMessage: params.requestFailedMessage,`
`157`	`163`	`});`

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ export {`
`15`	`15`	`export {`
`16`	`16`	`buildAudioTranscriptionFormData,`
`17`	`17`	`createProviderOperationDeadline,`
	`18`	`+createProviderOperationTimeoutResolver,`
`18`	`19`	`fetchProviderDownloadResponse,`
`19`	`20`	`fetchProviderOperationResponse,`
`20`	`21`	`fetchWithTimeout,`

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

推荐订阅源

Recent Commits to openclaw:main