Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(desktop): r7-l18 honor stream Retry-After

Josué2b271d05a7c4
diff --git a/desktop-app/src/__tests__/appService.entityChanges.test.ts b/desktop-app/src/__tests__/appService.entityChanges.test.ts
index 2f0b91ec1..5f0894479 100644
--- a/desktop-app/src/__tests__/appService.entityChanges.test.ts
+++ b/desktop-app/src/__tests__/appService.entityChanges.test.ts
@@ -142,6 +142,37 @@ describe('AppService.startEntityChangeStream session expiry', () => {
service.stopEntityChangeStream('stream-1', 7)
})
+ it('honors Retry-After before reconnecting after a terminal stream response', async () => {
+ vi.useFakeTimers()
+ const service = new AppService() as any
+ setSyntheticSessionToken(service, 'session-token')
+ service.authClient = {
+ openEntityChangeStream: vi
+ .fn()
+ .mockRejectedValueOnce(new ApiError('Entity change stream failed (404)', 404, '', '30'))
+ .mockImplementation(
+ (_token, _cursor, _onEvent, signal) =>
+ new Promise<void>(resolve => {
+ signal.addEventListener('abort', () => resolve(), { once: true })
+ })
+ ),
+ }
+ try {
+ service.startEntityChangeStream('stream-1', 7, vi.fn())
+ await flushAsyncWork()
+ expect(service.authClient.openEntityChangeStream).toHaveBeenCalledTimes(1)
+
+ await vi.advanceTimersByTimeAsync(29_999)
+ expect(service.authClient.openEntityChangeStream).toHaveBeenCalledTimes(1)
+ await vi.advanceTimersByTimeAsync(1)
+ await flushAsyncWork()
+ expect(service.authClient.openEntityChangeStream).toHaveBeenCalledTimes(2)
+ } finally {
+ service.stopEntityChangeStream('stream-1', 7)
+ vi.useRealTimers()
+ }
+ })
+
it('removes dead subscribers after the server announces session expiry', async () => {
const service = new AppService() as any
setSyntheticSessionToken(service, 'session-token')
diff --git a/desktop-app/src/__tests__/authClient.entityChanges.test.ts b/desktop-app/src/__tests__/authClient.entityChanges.test.ts
index 0c29d5eb5..4b5410bd8 100644
--- a/desktop-app/src/__tests__/authClient.entityChanges.test.ts
+++ b/desktop-app/src/__tests__/authClient.entityChanges.test.ts
@@ -98,4 +98,25 @@ describe('AuthClient.openEntityChangeStream', () => {
)
).rejects.toThrow('invalid cursor')
})
+
+ it('preserves Retry-After on a rejected stream connection', async () => {
+ vi.stubGlobal(
+ 'fetch',
+ vi.fn().mockResolvedValue(
+ new Response('stream not available yet', {
+ status: 404,
+ headers: { 'retry-after': '30' },
+ })
+ )
+ )
+
+ await expect(
+ new AuthClient().openEntityChangeStream(
+ 'session-token',
+ null,
+ () => undefined,
+ new AbortController().signal
+ )
+ ).rejects.toMatchObject({ status: 404, retryAfter: '30' })
+ })
})
diff --git a/desktop-app/src/appService.ts b/desktop-app/src/appService.ts
index 0c60dd916..455a9bbb6 100644
--- a/desktop-app/src/appService.ts
+++ b/desktop-app/src/appService.ts
@@ -92,11 +92,27 @@ import {
// `diagnoseLoginBackend`. Kept short so a post-login-failure diagnosis never
// makes the failure feel slower than it already did.
const BACKEND_PROBE_TIMEOUT_MS = 1500
+const ENTITY_CHANGE_RETRY_AFTER_CAP_MS = 5 * 60 * 1000
const HOST_WAKE_SCOPE: RpcScope = 'host:wake:write'
const PROFILE_UI_BASE_URL_ORIGIN_ERROR =
'PROFILE_UI_BASE_URL must be an origin URL with a root pathname and no search parameters'
+function parseEntityChangeRetryAfterMs(
+ value: string | undefined,
+ nowMs = Date.now()
+): number | undefined {
+ const retryAfter = value?.trim()
+ if (!retryAfter) return undefined
+
+ const seconds = Number(retryAfter)
+ const retryAtMs =
+ Number.isFinite(seconds) && seconds >= 0 ? nowMs + seconds * 1_000 : Date.parse(retryAfter)
+ if (!Number.isFinite(retryAtMs)) return undefined
+
+ return Math.min(ENTITY_CHANGE_RETRY_AFTER_CAP_MS, Math.max(0, retryAtMs - nowMs))
+}
+
function normalizeExplicitProfileUiBaseUrl(rawValue: string): string | null {
const value = rawValue.trim()
if (!value) return null
@@ -2846,6 +2862,7 @@ export class AppService {
let abortController: AbortController | null = null
let retryTimer: NodeJS.Timeout | null = null
let backoffMs = 1000
+ let serverRetryAfterMs: number | undefined
const clearRetry = () => {
if (retryTimer) clearTimeout(retryTimer)
retryTimer = null
@@ -2886,6 +2903,10 @@ export class AppService {
if (error instanceof ApiError && error.status === 401) {
this.handleEntityChangeSessionExpiry(connectionGeneration)
} else {
+ serverRetryAfterMs =
+ error instanceof ApiError
+ ? parseEntityChangeRetryAfterMs(error.retryAfter)
+ : undefined
this.emitEntityChangeEvent({
type: 'error',
message: 'Live updates disconnected; reconnecting.',
@@ -2895,7 +2916,9 @@ export class AppService {
} finally {
if (closed) return
clearRetry()
- const delay = backoffMs + Math.floor(Math.random() * Math.max(1, backoffMs * 0.2))
+ const localBackoffMs = backoffMs + Math.floor(Math.random() * Math.max(1, backoffMs * 0.2))
+ const delay = Math.max(localBackoffMs, serverRetryAfterMs ?? 0)
+ serverRetryAfterMs = undefined
backoffMs = Math.min(backoffMs * 2, 15_000)
retryTimer = setTimeout(() => void connect(), delay)
}
diff --git a/desktop-app/src/authClient.ts b/desktop-app/src/authClient.ts
index 596e9c4f6..44e078c66 100644
--- a/desktop-app/src/authClient.ts
+++ b/desktop-app/src/authClient.ts
@@ -582,7 +582,8 @@ export class AuthClient {
throw new ApiError(
`Entity change stream failed (${response.status}): ${body || response.statusText}`,
response.status,
- body
+ body,
+ response.headers.get('retry-after')
)
}
if (!response.body) throw new Error('Entity change stream missing response body')