Skip to content

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

TypeScript

fix(control-ui): r6-h3 bypass stale stream reads

Josuée4c9cd1d5c51
diff --git a/control-ui/components/GfsBrowser.tsx b/control-ui/components/GfsBrowser.tsx
index d689022ce..1fbb9d376 100644
--- a/control-ui/components/GfsBrowser.tsx
+++ b/control-ui/components/GfsBrowser.tsx
@@ -330,6 +330,7 @@ export function GfsBrowser(): React.JSX.Element {
const [error, setError] = useState('')
const loadSeqRef = useRef(0)
const backgroundLoadSeqRef = useRef(0)
+ const entityChangeRefetchControllerRef = useRef<AbortController | null>(null)
const loadedPageCountRef = useRef(1)
const loadedLocationRef = useRef<string | null | undefined>(undefined)
// Operator selects a resource to delegate access on (grant panel).
@@ -456,19 +457,28 @@ export function GfsBrowser(): React.JSX.Element {
const currentLabel = current?.name === '/' ? DRIVE : current?.name || DRIVE
const load = useCallback(
- async (crumb: Crumb, cursor?: string, options?: { background?: boolean }): Promise<void> => {
+ async (
+ crumb: Crumb,
+ cursor?: string,
+ options?: { background?: boolean; signal?: AbortSignal }
+ ): 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
const backgroundSeqAtStart = backgroundLoadSeqRef.current
const backgroundSeq = background ? ++backgroundLoadSeqRef.current : undefined
const isCurrent = () =>
- background
+ !options?.signal?.aborted &&
+ (background
? backgroundLoadSeqRef.current === backgroundSeq && loadSeqRef.current === navigationSeq
: loadSeqRef.current === navigationSeq &&
- backgroundLoadSeqRef.current === backgroundSeqAtStart
+ backgroundLoadSeqRef.current === backgroundSeqAtStart)
if (!background && !cursor) loadedPageCountRef.current = 1
if (appending) {
setLoadingMore(true)
@@ -485,14 +495,18 @@ export function GfsBrowser(): React.JSX.Element {
: `/api/v1/gfs/resources/${encodeURIComponent(crumb.id)}/children`
const query: Record<string, string> = { drive: DRIVE }
if (cursor) query.cursor = cursor
- let page = (await apiGet(path, query)) as TreePage
+ const fetchPage = (pageQuery: Record<string, string>) =>
+ options?.signal
+ ? apiGet(path, pageQuery, { signal: options.signal })
+ : apiGet(path, pageQuery)
+ let page = (await fetchPage(query)) as TreePage
let allItems = [...page.items]
let finalCursor = page.nextCursor
let fetchedPageCount = 1
if (background) {
const targetPageCount = loadedPageCountRef.current
for (let index = 1; index < targetPageCount && finalCursor; index += 1) {
- page = (await apiGet(path, { drive: DRIVE, cursor: finalCursor })) as TreePage
+ page = (await fetchPage({ drive: DRIVE, cursor: finalCursor })) as TreePage
allItems.push(...page.items)
finalCursor = page.nextCursor
fetchedPageCount += 1
@@ -681,7 +695,7 @@ export function GfsBrowser(): React.JSX.Element {
}
scheduleEntityChangeRecoveryRef.current = scheduleRecovery
- const revalidateActionTargets = async () => {
+ const revalidateActionTargets = async (signal: AbortSignal) => {
const targets = new Map<string, GfsChild>()
for (const target of [selectedRef.current, renameTargetRef.current, moveTargetRef.current]) {
if (target) targets.set(target.resourceId, target)
@@ -689,9 +703,11 @@ export function GfsBrowser(): React.JSX.Element {
await Promise.all(
Array.from(targets.values(), async target => {
try {
- const resolved = (await apiGet('/api/v1/gfs/resolve', {
- uri: target.gfsUri,
- })) as {
+ const resolved = (await apiGet(
+ '/api/v1/gfs/resolve',
+ { uri: target.gfsUri },
+ { signal }
+ )) as {
resourceId: string
rid: string
gfsUri: string
@@ -700,6 +716,7 @@ export function GfsBrowser(): React.JSX.Element {
bytes: number
version: number
}
+ if (signal.aborted) return
const current: GfsChild = {
...target,
resourceId: resolved.resourceId,
@@ -714,6 +731,7 @@ export function GfsBrowser(): React.JSX.Element {
setRenameTarget(value => (value?.resourceId === target.resourceId ? current : value))
setMoveTarget(value => (value?.resourceId === target.resourceId ? current : value))
} catch (error) {
+ if (signal.aborted) return
const status = entityChangeErrorStatus(error)
if (status === 403 || status === 404) {
setSelected(value => (value?.resourceId === target.resourceId ? null : value))
@@ -741,10 +759,14 @@ 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
setError('')
- void revalidateActionTargets()
+ void revalidateActionTargets(signal)
const previews = openPreviewsRef.current
if (previews.length > 0) {
const generation = ++previewRefreshGenerationRef.current
@@ -768,9 +790,11 @@ export function GfsBrowser(): React.JSX.Element {
void Promise.all<ResolvedPreviewUpdate | null>(
previews.map(async preview => {
try {
- const resolved = (await apiGet('/api/v1/gfs/resolve', {
- uri: preview.gfsUri,
- })) as {
+ const resolved = (await apiGet(
+ '/api/v1/gfs/resolve',
+ { uri: preview.gfsUri },
+ { signal }
+ )) as {
kind: string
name: string
bytes: number
@@ -779,7 +803,7 @@ export function GfsBrowser(): React.JSX.Element {
resourceId: string
gfsUri: string
}
- if (generation !== previewRefreshGenerationRef.current) return null
+ if (signal.aborted || generation !== previewRefreshGenerationRef.current) return null
if (resolved.kind !== 'file') {
markUnavailable(preview)
return null
@@ -847,7 +871,7 @@ export function GfsBrowser(): React.JSX.Element {
candidateMimeType === currentMimeType
return unchanged ? null : candidate
} catch (error) {
- if (generation !== previewRefreshGenerationRef.current) return null
+ if (signal.aborted || generation !== previewRefreshGenerationRef.current) return null
const status = entityChangeErrorStatus(error)
if (status === 403 || status === 404) markUnavailable(preview)
if (isTransientEntityChangeRefetchError(error)) scheduleRecovery()
@@ -855,7 +879,7 @@ export function GfsBrowser(): React.JSX.Element {
}
})
).then(updates => {
- if (generation !== previewRefreshGenerationRef.current) return
+ if (signal.aborted || generation !== previewRefreshGenerationRef.current) return
for (const update of updates) {
if (!update) continue
if (update.kind === 'image') {
@@ -879,7 +903,7 @@ export function GfsBrowser(): React.JSX.Element {
// Keep loaded rows, pagination, selection, and action dialogs visible
// while the authoritative background read runs. `load` has a separate
// sequence for background work, so it cannot cancel user navigation.
- void load(visibleCrumb, undefined, { background: true })
+ void load(visibleCrumb, undefined, { background: true, signal })
if (visibleCrumb.id === null) return
const visibleResourceId = visibleCrumb.id
@@ -890,19 +914,22 @@ export function GfsBrowser(): React.JSX.Element {
let refreshed: Crumb[] = [rootCrumb]
let retryHierarchy = false
try {
- const resolved = (await apiGet('/api/v1/gfs/resolve', {
- uri: `gfs://${DRIVE}/${visibleCrumb.rid ?? ridOfResourceId(visibleResourceId)}`,
- })) as GfsResolvedLocation
+ const resolved = (await apiGet(
+ '/api/v1/gfs/resolve',
+ { uri: `gfs://${DRIVE}/${visibleCrumb.rid ?? ridOfResourceId(visibleResourceId)}` },
+ { signal }
+ )) as GfsResolvedLocation
if (resolved.kind !== 'directory' || !resolved.path?.startsWith('/')) {
throw new Error('Current GFS folder is no longer available')
}
let path = ''
for (const segment of resolved.path.split('/').filter(Boolean)) {
path += `/${segment}`
- const ancestor = (await apiGet('/api/v1/gfs/by-path', {
- drive: DRIVE,
- path,
- })) as GfsResolvedLocation
+ const ancestor = (await apiGet(
+ '/api/v1/gfs/by-path',
+ { drive: DRIVE, path },
+ { signal }
+ )) as GfsResolvedLocation
if (ancestor.kind !== 'directory') {
throw new Error('GFS folder hierarchy changed during refresh')
}
@@ -912,6 +939,7 @@ export function GfsBrowser(): React.JSX.Element {
throw new Error('GFS folder hierarchy changed during refresh')
}
} catch (error) {
+ if (signal.aborted) return
// Do not keep presenting the stale hierarchy if the current folder
// was deleted, moved during resolution, or is no longer authorized.
if (isTransientEntityChangeRefetchError(error)) {
@@ -923,6 +951,7 @@ export function GfsBrowser(): React.JSX.Element {
}
if (
generation !== hierarchyRefreshGenerationRef.current ||
+ signal.aborted ||
trailEpoch !== trailReconstructionEpochRef.current ||
currentCrumbRef.current?.id !== visibleResourceId
) {
@@ -1001,6 +1030,8 @@ export function GfsBrowser(): React.JSX.Element {
return () => {
active = false
controller.abort()
+ entityChangeRefetchControllerRef.current?.abort()
+ entityChangeRefetchControllerRef.current = null
if (retryTimer) clearTimeout(retryTimer)
if (recoveryTimer) clearTimeout(recoveryTimer)
if (scheduleEntityChangeRecoveryRef.current === scheduleRecovery) {
diff --git a/control-ui/components/__tests__/GfsBrowser.test.tsx b/control-ui/components/__tests__/GfsBrowser.test.tsx
index 7c52d927f..607017e88 100644
--- a/control-ui/components/__tests__/GfsBrowser.test.tsx
+++ b/control-ui/components/__tests__/GfsBrowser.test.tsx
@@ -774,7 +774,11 @@ describe('GfsBrowser', () => {
expect(mockGfsFetchFileBlob).toHaveBeenCalledTimes(1)
expect(treeFailureUsed).toBe(true)
expect(previewFailureUsed).toBe(true)
- expect(mockApiGet).toHaveBeenCalledWith('/api/v1/gfs/resolve', { uri: 'gfs://main/r12' })
+ expect(mockApiGet).toHaveBeenCalledWith(
+ '/api/v1/gfs/resolve',
+ { uri: 'gfs://main/r12' },
+ expect.objectContaining({ signal: expect.any(AbortSignal) })
+ )
})
it.each(['avatar.PNG', 'notes.md', 'demo.mp4'])(
@@ -850,7 +854,11 @@ describe('GfsBrowser', () => {
streamControllers[0]!.enqueue(new TextEncoder().encode(`${frame}\n`))
})
await waitFor(() =>
- expect(mockApiGet).toHaveBeenCalledWith('/api/v1/gfs/resolve', { uri: file.gfsUri })
+ expect(mockApiGet).toHaveBeenCalledWith(
+ '/api/v1/gfs/resolve',
+ { uri: file.gfsUri },
+ expect.objectContaining({ signal: expect.any(AbortSignal) })
+ )
)
expect(screen.getByRole('dialog', { name: fileName })).toBe(dialog)
expect(mockGfsFetchFileBlob).toHaveBeenCalledTimes(1)
@@ -992,10 +1000,11 @@ describe('GfsBrowser', () => {
await within(breadcrumb).findByRole('button', { name: 'new-parent' })
expect(within(breadcrumb).getByRole('button', { name: 'renamed-folder' })).toBeTruthy()
expect(within(breadcrumb).queryByRole('button', { name: 'old-parent' })).toBeNull()
- expect(mockApiGet).toHaveBeenCalledWith('/api/v1/gfs/by-path', {
- drive: 'main',
- path: '/new-parent/renamed-folder',
- })
+ expect(mockApiGet).toHaveBeenCalledWith(
+ '/api/v1/gfs/by-path',
+ { drive: 'main', path: '/new-parent/renamed-folder' },
+ expect.objectContaining({ signal: expect.any(AbortSignal) })
+ )
mockApiSend.mockResolvedValueOnce({
ok: true,
diff --git a/control-ui/lib/__tests__/apiGetDedup.test.ts b/control-ui/lib/__tests__/apiGetDedup.test.ts
new file mode 100644
index 000000000..b4b821016
--- /dev/null
+++ b/control-ui/lib/__tests__/apiGetDedup.test.ts
@@ -0,0 +1,70 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { apiGet } from '../api'
+
+type DeferredResponse = {
+ resolve: (response: Response) => void
+ reject: (error: Error) => void
+ signal: AbortSignal | undefined
+}
+
+function jsonResponse(value: unknown): Response {
+ return new Response(JSON.stringify(value), {
+ status: 200,
+ headers: { 'content-type': 'application/json' },
+ })
+}
+
+describe('apiGet stream revalidation and request deduplication', () => {
+ let requests: DeferredResponse[]
+ let fetchMock: ReturnType<typeof vi.fn>
+
+ beforeEach(() => {
+ requests = []
+ fetchMock = vi.fn((_input: RequestInfo | URL, init?: RequestInit) => {
+ return new Promise<Response>((resolve, reject) => {
+ requests.push({ resolve, reject, signal: init?.signal ?? undefined })
+ init?.signal?.addEventListener(
+ 'abort',
+ () => reject(new DOMException('The operation was aborted', 'AbortError')),
+ { once: true }
+ )
+ })
+ })
+ vi.stubGlobal('fetch', fetchMock)
+ })
+
+ afterEach(() => {
+ vi.unstubAllGlobals()
+ vi.restoreAllMocks()
+ })
+
+ it('bypasses a stale in-flight GET and returns the fresh authoritative response', async () => {
+ const path = '/api/v1/gfs/resources/current/children'
+ const query = { drive: 'main' }
+ const staleRead = apiGet(path, query)
+
+ await vi.waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(1))
+ const controller = new AbortController()
+ const streamTriggeredRead = apiGet(path, query, { signal: controller.signal })
+
+ await vi.waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(2))
+ expect(requests[1]?.signal).toBeInstanceOf(AbortSignal)
+ requests[1]!.resolve(jsonResponse({ revision: 'committed-current-state' }))
+
+ await expect(streamTriggeredRead).resolves.toEqual({
+ revision: 'committed-current-state',
+ })
+ requests[0]!.resolve(jsonResponse({ revision: 'stale-pre-commit-state' }))
+ await expect(staleRead).resolves.toEqual({ revision: 'stale-pre-commit-state' })
+ })
+
+ it('cancels an obsolete signal-based background read', async () => {
+ const controller = new AbortController()
+ const request = apiGet('/api/v1/gfs/tree', { drive: 'main' }, { signal: controller.signal })
+
+ await vi.waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(1))
+ controller.abort()
+
+ await expect(request).rejects.toMatchObject({ name: 'AbortError' })
+ })
+})
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 55d17d3ac..871fc5353 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.662",
+ "version": "0.1.663",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.662",
+ "version": "0.1.663",
"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 e75746e40..42dfc7727 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.662",
+ "version": "0.1.663",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",