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-m6 serialize stream revalidation

Josué70edb939b2af
diff --git a/control-ui/components/GfsBrowser.tsx b/control-ui/components/GfsBrowser.tsx
index 617e052a5..8d777bda6 100644
--- a/control-ui/components/GfsBrowser.tsx
+++ b/control-ui/components/GfsBrowser.tsx
@@ -41,6 +41,7 @@ import {
handleControlUIUnauthorized,
isSilentApiError,
} from '@lib/api'
+import { createCoalescedRevalidation } from '@lib/coalescedRevalidation'
import { parseEntityChangeFrame } from '@lib/entityChangeStream'
import { isGfsDocumentFile } from '@lib/gfsDocumentFile'
import {
@@ -471,10 +472,6 @@ export function GfsBrowser(): React.JSX.Element {
): Promise<void> => {
const appending = Boolean(cursor)
const background = Boolean(options?.background)
- if (!background) {
- entityChangeRefetchControllerRef.current?.abort()
- entityChangeRefetchControllerRef.current = null
- }
// Background revalidation has its own sequence: it can be superseded by
// user navigation, but never invalidates that navigation's request.
const navigationSeq = background ? loadSeqRef.current : ++loadSeqRef.current
@@ -694,7 +691,12 @@ export function GfsBrowser(): React.JSX.Element {
let retryDelay = 500
let recoveryDelay = 500
let active = true
- let invalidateVisibleState: (cursor?: string) => void = () => undefined
+ let performVisibleStateRevalidation: (cursor?: string) => Promise<void> = async () => undefined
+ const revalidationScheduler = createCoalescedRevalidation<string>(
+ cursor => performVisibleStateRevalidation(cursor),
+ 100
+ )
+ const invalidateVisibleState = (cursor?: string) => revalidationScheduler.request(cursor)
const scheduleRecovery = () => {
if (!active || recoveryTimer) return
const delay = recoveryDelay
@@ -805,7 +807,7 @@ export function GfsBrowser(): React.JSX.Element {
}
}
- invalidateVisibleState = (cursor?: string) => {
+ performVisibleStateRevalidation = async (cursor?: string) => {
// A committed remote change supersedes any local move/retry ancestry
// reconstruction still in flight. Its older response must not replace
// the hierarchy we are about to refetch from the authoritative API.
@@ -816,13 +818,12 @@ export function GfsBrowser(): React.JSX.Element {
recoveryTimer = null
recoveryDelay = 500
}
- entityChangeRefetchControllerRef.current?.abort()
const revalidationController = new AbortController()
entityChangeRefetchControllerRef.current = revalidationController
const signal = revalidationController.signal
childCacheRef.current.clear()
revalidateNextLoadRef.current = false
- void revalidateActionTargets(signal)
+ const revalidationTasks: Promise<void>[] = [revalidateActionTargets(signal)]
const previews = openPreviewsRef.current
if (previews.length > 0) {
const generation = ++previewRefreshGenerationRef.current
@@ -843,128 +844,140 @@ export function GfsBrowser(): React.JSX.Element {
: current
)
}
- void Promise.all<ResolvedPreviewUpdate | null>(
- previews.map(async preview => {
- try {
- const resolved = (await apiGet(
- '/api/v1/gfs/resolve',
- { uri: preview.gfsUri },
- { signal }
- )) as {
- kind: string
- name: string
- bytes: number
- version: number
- rid: string
- resourceId: string
- gfsUri: string
- }
- if (signal.aborted || generation !== previewRefreshGenerationRef.current) return null
- if (resolved.kind !== 'file') {
- markUnavailable(preview)
+ revalidationTasks.push(
+ Promise.all<ResolvedPreviewUpdate | null>(
+ previews.map(async preview => {
+ try {
+ const resolved = (await apiGet(
+ '/api/v1/gfs/resolve',
+ { uri: preview.gfsUri },
+ { signal }
+ )) as {
+ kind: string
+ name: string
+ bytes: number
+ version: number
+ rid: string
+ resourceId: string
+ gfsUri: string
+ }
+ if (signal.aborted || generation !== previewRefreshGenerationRef.current)
+ return null
+ if (resolved.kind !== 'file') {
+ markUnavailable(preview)
+ return null
+ }
+ const imageMimeType = gfsImagePreviewMimeType(resolved.name)
+ const videoMimeType = gfsVideoPreviewMimeType(resolved.name)
+ let candidate: ResolvedPreviewUpdate | null = null
+ if (preview.kind === 'image') {
+ candidate = imageMimeType
+ ? {
+ kind: 'image',
+ gfsUri: resolved.gfsUri,
+ byteLength: resolved.bytes,
+ fileName: resolved.name,
+ rid: resolved.rid,
+ version: resolved.version,
+ mimeType: imageMimeType,
+ reloadVersion: preview.reloadVersion + 1,
+ unavailable: false,
+ }
+ : null
+ } else if (preview.kind === 'video') {
+ candidate = videoMimeType
+ ? {
+ kind: 'video',
+ gfsUri: resolved.gfsUri,
+ byteLength: resolved.bytes,
+ fileName: resolved.name,
+ rid: resolved.rid,
+ version: resolved.version,
+ mimeType: videoMimeType,
+ reloadVersion: preview.reloadVersion + 1,
+ unavailable: false,
+ }
+ : null
+ } else {
+ candidate = isGfsMarkdownPreviewFile(resolved.name)
+ ? {
+ kind: 'markdown',
+ gfsUri: resolved.gfsUri,
+ byteLength: resolved.bytes,
+ fileName: resolved.name,
+ rid: resolved.rid,
+ version: resolved.version,
+ reloadVersion: preview.reloadVersion + 1,
+ unavailable: false,
+ }
+ : null
+ }
+ if (!candidate) {
+ markUnavailable(preview)
+ return null
+ }
+ if (candidate.version < preview.version) return null
+ const candidateMimeType = 'mimeType' in candidate ? candidate.mimeType : undefined
+ const currentMimeType = 'mimeType' in preview ? preview.mimeType : undefined
+ const unchanged =
+ !preview.unavailable &&
+ candidate.kind === preview.kind &&
+ candidate.gfsUri === preview.gfsUri &&
+ candidate.rid === preview.rid &&
+ candidate.fileName === preview.fileName &&
+ candidate.byteLength === preview.byteLength &&
+ candidate.version === preview.version &&
+ candidateMimeType === currentMimeType
+ return unchanged ? null : candidate
+ } catch (error) {
+ if (signal.aborted || generation !== previewRefreshGenerationRef.current)
+ return null
+ const status = entityChangeErrorStatus(error)
+ if (status === 403 || status === 404) markUnavailable(preview)
+ if (isTransientEntityChangeRefetchError(error)) scheduleRecovery()
return null
}
- const imageMimeType = gfsImagePreviewMimeType(resolved.name)
- const videoMimeType = gfsVideoPreviewMimeType(resolved.name)
- let candidate: ResolvedPreviewUpdate | null = null
- if (preview.kind === 'image') {
- candidate = imageMimeType
- ? {
- kind: 'image',
- gfsUri: resolved.gfsUri,
- byteLength: resolved.bytes,
- fileName: resolved.name,
- rid: resolved.rid,
- version: resolved.version,
- mimeType: imageMimeType,
- reloadVersion: preview.reloadVersion + 1,
- unavailable: false,
- }
- : null
- } else if (preview.kind === 'video') {
- candidate = videoMimeType
- ? {
- kind: 'video',
- gfsUri: resolved.gfsUri,
- byteLength: resolved.bytes,
- fileName: resolved.name,
- rid: resolved.rid,
- version: resolved.version,
- mimeType: videoMimeType,
- reloadVersion: preview.reloadVersion + 1,
- unavailable: false,
- }
- : null
+ })
+ ).then(updates => {
+ if (signal.aborted || generation !== previewRefreshGenerationRef.current) return
+ for (const update of updates) {
+ if (!update) continue
+ if (update.kind === 'image') {
+ setImagePreview(current => (current?.gfsUri === update.gfsUri ? update : current))
+ setMarkdownPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
+ setVideoPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
+ } else if (update.kind === 'video') {
+ setVideoPreview(current => (current?.gfsUri === update.gfsUri ? update : current))
+ setImagePreview(current => (current?.gfsUri === update.gfsUri ? null : current))
+ setMarkdownPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
} else {
- candidate = isGfsMarkdownPreviewFile(resolved.name)
- ? {
- kind: 'markdown',
- gfsUri: resolved.gfsUri,
- byteLength: resolved.bytes,
- fileName: resolved.name,
- rid: resolved.rid,
- version: resolved.version,
- reloadVersion: preview.reloadVersion + 1,
- unavailable: false,
- }
- : null
- }
- if (!candidate) {
- markUnavailable(preview)
- return null
+ setMarkdownPreview(current =>
+ current?.gfsUri === update.gfsUri ? update : current
+ )
+ setImagePreview(current => (current?.gfsUri === update.gfsUri ? null : current))
+ setVideoPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
}
- if (candidate.version < preview.version) return null
- const candidateMimeType = 'mimeType' in candidate ? candidate.mimeType : undefined
- const currentMimeType = 'mimeType' in preview ? preview.mimeType : undefined
- const unchanged =
- !preview.unavailable &&
- candidate.kind === preview.kind &&
- candidate.gfsUri === preview.gfsUri &&
- candidate.rid === preview.rid &&
- candidate.fileName === preview.fileName &&
- candidate.byteLength === preview.byteLength &&
- candidate.version === preview.version &&
- candidateMimeType === currentMimeType
- return unchanged ? null : candidate
- } catch (error) {
- if (signal.aborted || generation !== previewRefreshGenerationRef.current) return null
- const status = entityChangeErrorStatus(error)
- if (status === 403 || status === 404) markUnavailable(preview)
- if (isTransientEntityChangeRefetchError(error)) scheduleRecovery()
- return null
}
})
- ).then(updates => {
- if (signal.aborted || generation !== previewRefreshGenerationRef.current) return
- for (const update of updates) {
- if (!update) continue
- if (update.kind === 'image') {
- setImagePreview(current => (current?.gfsUri === update.gfsUri ? update : current))
- setMarkdownPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
- setVideoPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
- } else if (update.kind === 'video') {
- setVideoPreview(current => (current?.gfsUri === update.gfsUri ? update : current))
- setImagePreview(current => (current?.gfsUri === update.gfsUri ? null : current))
- setMarkdownPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
- } else {
- setMarkdownPreview(current => (current?.gfsUri === update.gfsUri ? update : current))
- setImagePreview(current => (current?.gfsUri === update.gfsUri ? null : current))
- setVideoPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
- }
- }
- })
+ )
}
const visibleCrumb = currentCrumbRef.current
- if (!visibleCrumb) return
+ if (!visibleCrumb) {
+ await Promise.all(revalidationTasks)
+ return
+ }
// Stream-triggered reads have their own non-destructive path. They never
// enter the navigation/paging loader or clear its rows, dialogs, or error.
- void refreshVisibleDirectory(visibleCrumb, signal)
- if (visibleCrumb.id === null) return
+ revalidationTasks.push(refreshVisibleDirectory(visibleCrumb, signal))
+ if (visibleCrumb.id === null) {
+ await Promise.all(revalidationTasks)
+ return
+ }
const visibleResourceId = visibleCrumb.id
const generation = ++hierarchyRefreshGenerationRef.current
const trailEpoch = trailReconstructionEpochRef.current
- void (async () => {
+ const hierarchyRefresh = (async () => {
const rootCrumb = { ...(crumbsRef.current[0] ?? { id: null, rid: null, name: '/' }) }
let refreshed: Crumb[] = [rootCrumb]
let retryHierarchy = false
@@ -1017,6 +1030,8 @@ export function GfsBrowser(): React.JSX.Element {
setTrailRecovery(null)
}
})()
+ revalidationTasks.push(hierarchyRefresh)
+ await Promise.all(revalidationTasks)
}
async function consume(): Promise<void> {
@@ -1095,6 +1110,7 @@ export function GfsBrowser(): React.JSX.Element {
return () => {
active = false
controller.abort()
+ revalidationScheduler.dispose()
entityChangeRefetchControllerRef.current?.abort()
entityChangeRefetchControllerRef.current = null
if (retryTimer) clearTimeout(retryTimer)
diff --git a/control-ui/components/__tests__/GfsBrowser.test.tsx b/control-ui/components/__tests__/GfsBrowser.test.tsx
index 1a5e1018a..9107dece3 100644
--- a/control-ui/components/__tests__/GfsBrowser.test.tsx
+++ b/control-ui/components/__tests__/GfsBrowser.test.tsx
@@ -1023,6 +1023,73 @@ describe('GfsBrowser', () => {
expect(screen.queryByRole('alert')).toBeNull()
})
+ it('coalesces a stream burst without aborting the active refresh and applies the trailing state', async () => {
+ const streamControllers: ReadableStreamDefaultController<Uint8Array>[] = []
+ const report = child('report.md', 'file', 1, 2)
+ const remote = child('remote.txt', 'file', 2, 3)
+ let treeReads = 0
+ let refreshSignal: AbortSignal | undefined
+ let finishFirstRefresh!: (page: { items: (typeof report)[]; nextCursor: null }) => void
+ mockApiGet.mockImplementation(
+ async (
+ path: string,
+ _query?: Record<string, string>,
+ options?: {
+ signal?: AbortSignal
+ }
+ ) => {
+ if (path === '/api/v1/gfs/tree') {
+ treeReads += 1
+ if (treeReads === 1) return { items: [report], nextCursor: null }
+ if (treeReads === 2) {
+ refreshSignal = options?.signal
+ return new Promise(resolve => {
+ finishFirstRefresh = resolve
+ })
+ }
+ return { items: [report, remote], nextCursor: null }
+ }
+ return { items: [], nextCursor: null }
+ }
+ )
+ vi.stubGlobal(
+ 'fetch',
+ vi.fn(async (_input: RequestInfo | URL, init?: RequestInit) => {
+ const body = new ReadableStream<Uint8Array>({
+ start(controller) {
+ streamControllers.push(controller)
+ init?.signal?.addEventListener('abort', () => controller.close(), { once: true })
+ },
+ })
+ return new Response(body, {
+ status: 200,
+ headers: { 'content-type': 'application/x-ndjson' },
+ })
+ })
+ )
+
+ renderBrowser()
+ await waitFor(() => expect(streamControllers).toHaveLength(1))
+ await screen.findByRole('button', { name: 'report.md' })
+ const firstFrame = await controlApiProducerFrame()
+ await act(async () => {
+ streamControllers[0]!.enqueue(new TextEncoder().encode(`${firstFrame}\n`))
+ })
+ await waitFor(() => expect(treeReads).toBe(2))
+ const secondFrame = await controlApiProducerFrame()
+ await act(async () => {
+ streamControllers[0]!.enqueue(new TextEncoder().encode(`${secondFrame}\n`))
+ })
+
+ await new Promise(resolve => setTimeout(resolve, 150))
+ expect(treeReads).toBe(2)
+ expect(refreshSignal?.aborted).toBe(false)
+
+ await act(async () => finishFirstRefresh({ items: [report], nextCursor: null }))
+ await waitFor(() => expect(treeReads).toBe(3), { timeout: 1500 })
+ expect(await screen.findByRole('button', { name: 'remote.txt' })).toBeVisible()
+ })
+
it.each(['avatar.PNG', 'notes.md', 'demo.mp4'])(
'does not reload an unchanged open %s preview after a scope invalidation',
async fileName => {
diff --git a/control-ui/lib/coalescedRevalidation.ts b/control-ui/lib/coalescedRevalidation.ts
new file mode 100644
index 000000000..474a5d2d8
--- /dev/null
+++ b/control-ui/lib/coalescedRevalidation.ts
@@ -0,0 +1,52 @@
+export interface CoalescedRevalidation<T> {
+ request(value?: T): void
+ dispose(): void
+}
+
+/** Serialize latest-state refreshes, coalescing bursts and preserving one trailing pass. */
+export function createCoalescedRevalidation<T>(
+ run: (latest: T | undefined) => Promise<void>,
+ delayMs = 100
+): CoalescedRevalidation<T> {
+ let timer: ReturnType<typeof setTimeout> | null = null
+ let running = false
+ let pending = false
+ let disposed = false
+ let latest: T | undefined
+
+ const schedule = () => {
+ if (disposed || timer || running || !pending) return
+ timer = setTimeout(() => {
+ timer = null
+ if (disposed || running || !pending) return
+ const value = latest
+ pending = false
+ latest = undefined
+ running = true
+ void run(value)
+ .catch(() => undefined)
+ .finally(() => {
+ running = false
+ schedule()
+ })
+ }, delayMs)
+ }
+
+ return {
+ request(value) {
+ if (disposed) return
+ pending = true
+ if (value !== undefined) latest = value
+ if (timer) clearTimeout(timer)
+ timer = null
+ schedule()
+ },
+ dispose() {
+ disposed = true
+ pending = false
+ latest = undefined
+ if (timer) clearTimeout(timer)
+ timer = null
+ },
+ }
+}
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index bda43d88c..28650c087 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.670",
+ "version": "0.1.671",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.670",
+ "version": "0.1.671",
"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 11f6fd1e3..1feab1ab3 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.670",
+ "version": "0.1.671",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",