Skip to content

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

TypeScript

fix(control-ui): r7-l20 honor stream Retry-After

Josué0ba87aafcb3c
diff --git a/control-ui/components/GfsBrowser.tsx b/control-ui/components/GfsBrowser.tsx
index 31b947ffb..1736d8883 100644
--- a/control-ui/components/GfsBrowser.tsx
+++ b/control-ui/components/GfsBrowser.tsx
@@ -42,7 +42,11 @@ import {
isSilentApiError,
} from '@lib/api'
import { createCoalescedRevalidation } from '@lib/coalescedRevalidation'
-import { entityChangeStreamUrl, parseEntityChangeFrame } from '@lib/entityChangeStream'
+import {
+ entityChangeStreamUrl,
+ parseEntityChangeFrame,
+ parseEntityChangeRetryAfterMs,
+} from '@lib/entityChangeStream'
import { isGfsDocumentFile } from '@lib/gfsDocumentFile'
import {
GfsUploadCapabilityError,
@@ -1037,7 +1041,11 @@ export function GfsBrowser(): React.JSX.Element {
return
}
if (!response.ok || !response.body) {
- throw new Error(`Entity-change stream returned ${response.status}`)
+ const error = new Error(`Entity-change stream returned ${response.status}`) as Error & {
+ retryAfterMs?: number
+ }
+ error.retryAfterMs = parseEntityChangeRetryAfterMs(response.headers.get('retry-after'))
+ throw error
}
retryDelay = 500
const reader = response.body.getReader()
@@ -1078,13 +1086,22 @@ export function GfsBrowser(): React.JSX.Element {
reader.releaseLock()
}
if (!controller.signal.aborted) throw new Error('Entity-change stream ended')
- } catch {
+ } catch (error) {
if (!active || controller.signal.aborted) return
// A transport failure is not evidence that authorization or resource
// state changed. The feed cursor remains authoritative for recovery;
// preserve visible state and reconnect with bounded backoff.
+ const retryAfterMs =
+ error &&
+ typeof error === 'object' &&
+ typeof (error as { retryAfterMs?: unknown }).retryAfterMs === 'number'
+ ? (error as { retryAfterMs: number }).retryAfterMs
+ : undefined
await new Promise<void>(resolve => {
- retryTimer = setTimeout(resolve, retryDelay + Math.random() * retryDelay)
+ retryTimer = setTimeout(
+ resolve,
+ Math.max(retryDelay + Math.random() * retryDelay, retryAfterMs ?? 0)
+ )
})
retryTimer = null
retryDelay = Math.min(retryDelay * 2, 15_000)
diff --git a/control-ui/components/__tests__/GfsBrowser.revalidation.integration.test.tsx b/control-ui/components/__tests__/GfsBrowser.revalidation.integration.test.tsx
index 7dc3d92d6..8fbac1cca 100644
--- a/control-ui/components/__tests__/GfsBrowser.revalidation.integration.test.tsx
+++ b/control-ui/components/__tests__/GfsBrowser.revalidation.integration.test.tsx
@@ -68,12 +68,16 @@ class ProducerResponse extends EventEmitter {
destroyed = false
writableEnded = false
writableLength = 0
+ headers: Record<string, string> = {}
+ jsonBody: unknown
frames: string[] = []
status(code: number): this {
this.statusCode = code
return this
}
- setHeader(): void {}
+ setHeader(name: string, value: string): void {
+ this.headers[name.toLowerCase()] = value
+ }
flushHeaders(): void {
this.headersSent = true
}
@@ -85,11 +89,30 @@ class ProducerResponse extends EventEmitter {
this.writableEnded = true
this.emit('close')
}
- json(): this {
+ json(value: unknown): this {
+ this.jsonBody = value
+ this.headersSent = true
return this
}
}
+async function controlApiCapacityResponse(): Promise<Response> {
+ const previousLimit = controlApiProducerConfig.entityChangeStreamMaxConnections
+ controlApiProducerConfig.entityChangeStreamMaxConnections = 0
+ const req = new ProducerRequest()
+ const res = new ProducerResponse()
+ try {
+ streamEntityChanges(req as never, res as never, null, async () => true, 'operator')
+ await vi.waitFor(() => expect(res.statusCode).toBe(429))
+ } finally {
+ controlApiProducerConfig.entityChangeStreamMaxConnections = previousLimit
+ }
+ return new Response(JSON.stringify(res.jsonBody), {
+ status: res.statusCode,
+ headers: res.headers,
+ })
+}
+
async function controlApiProducerFrame(): Promise<string> {
const cursor = 'd119f895-1ef8-4e73-8f08-f9754919682a'
controlApiProducer.isEntityChangeCursor.mockImplementation((value: string) =>
@@ -129,6 +152,53 @@ describe('GfsBrowser authoritative revalidation integration', () => {
vi.restoreAllMocks()
})
+ it('honors the Control API Retry-After when an operator stream is rate limited', async () => {
+ const rateLimitedResponse = await controlApiCapacityResponse()
+ const scheduledTimers = vi.spyOn(window, 'setTimeout')
+ vi.spyOn(Math, 'random').mockReturnValue(0)
+ let streamAttempts = 0
+ vi.stubGlobal(
+ 'fetch',
+ vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+ const url = new URL(String(input), 'http://control-ui.test')
+ if (url.pathname.endsWith('/api/v1/gfs/entity-changes/stream')) {
+ streamAttempts += 1
+ if (streamAttempts === 1) return rateLimitedResponse
+ return new Response(
+ new ReadableStream<Uint8Array>({
+ start(controller) {
+ init?.signal?.addEventListener('abort', () => controller.close(), { once: true })
+ },
+ }),
+ { status: 200, headers: { 'content-type': 'application/x-ndjson' } }
+ )
+ }
+ if (url.pathname.endsWith('/api/v1/gfs/tree')) {
+ return jsonResponse({ rootResourceId: 'root-1', items: [], nextCursor: null })
+ }
+ if (url.pathname.endsWith('/api/v1/gfs/resources/root-1/children')) {
+ return jsonResponse({
+ items: [child('file-1', 'rid-file-1', 'kept.txt', 'file')],
+ nextCursor: null,
+ })
+ }
+ return jsonResponse({ items: [], nextCursor: null })
+ })
+ )
+
+ render(
+ <ToastProvider>
+ <GfsBrowser />
+ </ToastProvider>
+ )
+ await screen.findByRole('button', { name: 'kept.txt' })
+ await waitFor(() =>
+ expect(scheduledTimers.mock.calls.some(([, delay]) => delay === 5000)).toBe(true)
+ )
+ expect(streamAttempts).toBe(1)
+ expect(screen.getByRole('button', { name: 'kept.txt' })).toBeVisible()
+ })
+
it.each(['scope.invalidated', 'resync_required'] as const)(
'does not publish a stale background page after %s',
async frameType => {
diff --git a/control-ui/lib/__tests__/entityChangeStream.test.ts b/control-ui/lib/__tests__/entityChangeStream.test.ts
index 008cc330e..6c7466c54 100644
--- a/control-ui/lib/__tests__/entityChangeStream.test.ts
+++ b/control-ui/lib/__tests__/entityChangeStream.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, it } from 'vitest'
-import { parseEntityChangeFrame } from '../entityChangeStream'
+import { parseEntityChangeFrame, parseEntityChangeRetryAfterMs } from '../entityChangeStream'
const CURSOR = 'a20c37c5-d996-48b0-8f49-a8e2f5f41234'
@@ -67,3 +67,13 @@ describe('parseEntityChangeFrame', () => {
).toThrow('Invalid entity-change cursor')
})
})
+
+describe('parseEntityChangeRetryAfterMs', () => {
+ it('supports seconds and HTTP dates while bounding untrusted delays', () => {
+ const now = Date.parse('2026-09-29T12:00:00.000Z')
+ expect(parseEntityChangeRetryAfterMs('5', now)).toBe(5_000)
+ expect(parseEntityChangeRetryAfterMs('Tue, 29 Sep 2026 12:00:10 GMT', now)).toBe(10_000)
+ expect(parseEntityChangeRetryAfterMs('3600', now)).toBe(5 * 60 * 1000)
+ expect(parseEntityChangeRetryAfterMs('not-a-date', now)).toBeUndefined()
+ })
+})
diff --git a/control-ui/lib/entityChangeStream.ts b/control-ui/lib/entityChangeStream.ts
index b0593e35a..46ce4e076 100644
--- a/control-ui/lib/entityChangeStream.ts
+++ b/control-ui/lib/entityChangeStream.ts
@@ -17,6 +17,24 @@ export function entityChangeStreamUrl(cursor?: string): string {
return controlApiUrl(`/api/v1/gfs/entity-changes/stream${query}`)
}
+const ENTITY_CHANGE_RETRY_AFTER_CAP_MS = 5 * 60 * 1000
+
+/** Parse and bound a server Retry-After hint before it reaches a browser timer. */
+export function parseEntityChangeRetryAfterMs(
+ value: string | null,
+ 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 * 1000 : Date.parse(retryAfter)
+ if (!Number.isFinite(retryAtMs)) return undefined
+
+ return Math.min(ENTITY_CHANGE_RETRY_AFTER_CAP_MS, Math.max(0, retryAtMs - nowMs))
+}
+
/** Parse one NDJSON frame. Safe v1 extensions are skipped; unsupported schemas are rejected. */
export function parseEntityChangeFrame(line: string): EntityChangeFrame | null {
if (!line.trim()) return null
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 493cd0aeb..67fab5578 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.680",
+ "version": "0.1.681",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.680",
+ "version": "0.1.681",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/frontend-components": "file:../packages/frontend-components",
diff --git a/control-ui/package.json b/control-ui/package.json
index 9e8d224fc..10fa99d43 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.680",
+ "version": "0.1.681",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",