Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(control-ui): r7-l8 reconnect half-open entity streams
Josuéf2c782525ace
diff --git a/control-ui/components/GfsBrowser.tsx b/control-ui/components/GfsBrowser.tsxindex 1736d8883..310166655 100644--- a/control-ui/components/GfsBrowser.tsx+++ b/control-ui/components/GfsBrowser.tsx@@ -47,6 +47,7 @@ import {parseEntityChangeFrame,parseEntityChangeRetryAfterMs,} from '@lib/entityChangeStream'+import { watchEntityChangeStreamLiveness } from '@lib/entityChangeStreamLiveness'import { isGfsDocumentFile } from '@lib/gfsDocumentFile'import {GfsUploadCapabilityError,@@ -1049,6 +1050,9 @@ export function GfsBrowser(): React.JSX.Element {}retryDelay = 500const reader = response.body.getReader()+ const liveness = watchEntityChangeStreamLiveness(() => {+ void reader.cancel().catch(() => undefined)+ })const decoder = new TextDecoder()let pending = ''try {@@ -1063,6 +1067,7 @@ export function GfsBrowser(): React.JSX.Element {const line = pending.slice(0, newline).replace(/\r$/, '')pending = pending.slice(newline + 1)const frame = parseEntityChangeFrame(line)+ if (line.trim()) liveness.receivedFrame()if (!frame) {newline = pending.indexOf('\n')continue@@ -1083,6 +1088,7 @@ export function GfsBrowser(): React.JSX.Element {}}} finally {+ liveness.dispose()reader.releaseLock()}if (!controller.signal.aborted) throw new Error('Entity-change stream ended')diff --git a/control-ui/components/__tests__/GfsBrowser.revalidation.integration.test.tsx b/control-ui/components/__tests__/GfsBrowser.revalidation.integration.test.tsxindex 8fbac1cca..1c5de2bbe 100644--- a/control-ui/components/__tests__/GfsBrowser.revalidation.integration.test.tsx+++ b/control-ui/components/__tests__/GfsBrowser.revalidation.integration.test.tsx@@ -199,6 +199,62 @@ describe('GfsBrowser authoritative revalidation integration', () => {expect(screen.getByRole('button', { name: 'kept.txt' })).toBeVisible()})+ it('reconnects a half-open operator stream without clearing the visible list', async () => {+ const scheduledTimers = vi.spyOn(window, 'setTimeout')+ let streamAttempts = 0+ let streamCancellations = 0+ vi.stubGlobal(+ 'fetch',+ vi.fn(async (input: RequestInfo | URL) => {+ const url = new URL(String(input), 'http://control-ui.test')+ if (url.pathname.endsWith('/api/v1/gfs/entity-changes/stream')) {+ streamAttempts += 1+ return new Response(+ new ReadableStream<Uint8Array>({+ cancel() {+ streamCancellations += 1+ },+ }),+ { 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 === 130_000)).toBe(true)+ )+ expect(streamAttempts).toBe(1)+ expect(screen.getByRole('button', { name: 'kept.txt' })).toBeVisible()++ const livenessTimer = scheduledTimers.mock.calls.find(([, delay]) => delay === 130_000)?.[0]+ expect(livenessTimer).toBeDefined()+ await act(async () => {+ ;(livenessTimer as () => void)()+ await Promise.resolve()+ })++ await waitFor(() => expect(streamCancellations).toBe(1))+ await waitFor(() => expect(streamAttempts).toBe(2))+ 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__/entityChangeStreamLiveness.test.ts b/control-ui/lib/__tests__/entityChangeStreamLiveness.test.tsnew file mode 100644index 000000000..f3c13ef52--- /dev/null+++ b/control-ui/lib/__tests__/entityChangeStreamLiveness.test.ts@@ -0,0 +1,36 @@+import { afterEach, describe, expect, it, vi } from 'vitest'+import {+ ENTITY_CHANGE_STREAM_IDLE_TIMEOUT_MS,+ watchEntityChangeStreamLiveness,+} from '../entityChangeStreamLiveness'++describe('watchEntityChangeStreamLiveness', () => {+ afterEach(() => vi.useRealTimers())++ it('resets on each received frame and reconnects once when the stream goes idle', () => {+ vi.useFakeTimers()+ const onIdle = vi.fn()+ const liveness = watchEntityChangeStreamLiveness(onIdle)++ vi.advanceTimersByTime(ENTITY_CHANGE_STREAM_IDLE_TIMEOUT_MS - 1)+ liveness.receivedFrame()+ vi.advanceTimersByTime(ENTITY_CHANGE_STREAM_IDLE_TIMEOUT_MS - 1)+ expect(onIdle).not.toHaveBeenCalled()++ vi.advanceTimersByTime(1)+ expect(onIdle).toHaveBeenCalledOnce()+ liveness.receivedFrame()+ vi.advanceTimersByTime(ENTITY_CHANGE_STREAM_IDLE_TIMEOUT_MS)+ expect(onIdle).toHaveBeenCalledOnce()+ })++ it('clears the pending timeout when the consumer stops', () => {+ vi.useFakeTimers()+ const onIdle = vi.fn()+ const liveness = watchEntityChangeStreamLiveness(onIdle)+ liveness.dispose()++ vi.advanceTimersByTime(ENTITY_CHANGE_STREAM_IDLE_TIMEOUT_MS)+ expect(onIdle).not.toHaveBeenCalled()+ })+})diff --git a/control-ui/lib/entityChangeStreamLiveness.ts b/control-ui/lib/entityChangeStreamLiveness.tsnew file mode 100644index 000000000..379beb04b--- /dev/null+++ b/control-ui/lib/entityChangeStreamLiveness.ts@@ -0,0 +1,40 @@+// Allow two maximum heartbeat intervals plus the server's maximum poll delay.+export const ENTITY_CHANGE_STREAM_IDLE_TIMEOUT_MS = 2 * (60_000 + 5_000)++export interface EntityChangeStreamLiveness {+ receivedFrame(): void+ dispose(): void+}++/** Reconnect a half-open stream without changing visible entity state. */+export function watchEntityChangeStreamLiveness(+ onIdle: () => void,+ timeoutMs = ENTITY_CHANGE_STREAM_IDLE_TIMEOUT_MS+): EntityChangeStreamLiveness {+ let timer: ReturnType<typeof setTimeout> | null = null+ let disposed = false+ let idleTriggered = false++ const arm = () => {+ if (timer) clearTimeout(timer)+ timer = setTimeout(() => {+ timer = null+ if (!disposed && !idleTriggered) {+ idleTriggered = true+ onIdle()+ }+ }, timeoutMs)+ }++ arm()+ return {+ receivedFrame() {+ if (!disposed && !idleTriggered) arm()+ },+ dispose() {+ disposed = true+ if (timer) clearTimeout(timer)+ timer = null+ },+ }+}diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex 67fab5578..c5b6ded51 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.681",+ "version": "0.1.682","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.681",+ "version": "0.1.682","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.jsonindex 10fa99d43..0b0421541 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.681",+ "version": "0.1.682","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",