Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions packages/opencode/src/session/retry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,28 @@ function cap(ms: number) {
return Math.min(ms, RETRY_MAX_DELAY)
}

function backoff(attempt: number) {
return cap(Math.min(RETRY_INITIAL_DELAY * Math.pow(RETRY_BACKOFF_FACTOR, attempt - 1), RETRY_MAX_DELAY_NO_HEADERS))
}

function isDelayHint(value: number) {
return Number.isFinite(value) && value >= 0
}

export function delay(attempt: number, error?: MessageV2.APIError) {
if (error) {
const headers = error.data.responseHeaders
if (headers) {
const retryAfterMs = headers["retry-after-ms"]
if (retryAfterMs) {
const parsedMs = Number.parseFloat(retryAfterMs)
if (!Number.isNaN(parsedMs)) {
return cap(parsedMs)
}
if (isDelayHint(parsedMs)) return cap(parsedMs)
}

const retryAfter = headers["retry-after"]
if (retryAfter) {
const parsedSeconds = Number.parseFloat(retryAfter)
if (!Number.isNaN(parsedSeconds)) {
if (isDelayHint(parsedSeconds)) {
// convert seconds to milliseconds
return cap(Math.ceil(parsedSeconds * 1000))
}
Expand All @@ -57,11 +63,11 @@ export function delay(attempt: number, error?: MessageV2.APIError) {
}
}

return cap(RETRY_INITIAL_DELAY * Math.pow(RETRY_BACKOFF_FACTOR, attempt - 1))
return backoff(attempt)
}
}

return cap(Math.min(RETRY_INITIAL_DELAY * Math.pow(RETRY_BACKOFF_FACTOR, attempt - 1), RETRY_MAX_DELAY_NO_HEADERS))
return backoff(attempt)
}

export function retryable(error: Err, provider: string) {
Expand Down
11 changes: 11 additions & 0 deletions packages/opencode/test/session/retry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ describe("session.retry.delay", () => {
expect(delays).toStrictEqual([2000, 4000, 8000, 16000, 30000, 30000, 30000, 30000, 30000, 30000])
})

test("caps delay at 30 seconds when headers omit retry hints", () => {
const error = apiError({ date: new Date().toUTCString() })
const delays = Array.from({ length: 10 }, (_, index) => SessionRetry.delay(index + 1, error))
expect(delays).toStrictEqual([2000, 4000, 8000, 16000, 30000, 30000, 30000, 30000, 30000, 30000])
})

test("prefers retry-after-ms when shorter than exponential", () => {
const error = apiError({ "retry-after-ms": "1500" })
expect(SessionRetry.delay(4, error)).toBe(1500)
Expand All @@ -60,6 +66,11 @@ describe("session.retry.delay", () => {
expect(SessionRetry.delay(1, error)).toBe(2000)
})

test("ignores negative retry hints", () => {
expect(SessionRetry.delay(1, apiError({ "retry-after-ms": "-1" }))).toBe(2000)
expect(SessionRetry.delay(2, apiError({ "retry-after": "-1" }))).toBe(4000)
})

test("ignores malformed date retry hints", () => {
const error = apiError({ "retry-after": "Invalid Date String" })
expect(SessionRetry.delay(1, error)).toBe(2000)
Expand Down
Loading