Skip to content

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

TypeScript

fix(control-ui): resolve r2-m1 retry transient live refetch failures

Josué34d7b37e2efb
diff --git a/control-ui/components/GfsBrowser.tsx b/control-ui/components/GfsBrowser.tsx
index 740b4f32a..5f56ca10c 100644
--- a/control-ui/components/GfsBrowser.tsx
+++ b/control-ui/components/GfsBrowser.tsx
@@ -250,6 +250,19 @@ function isEventFromNestedInteractive(
)
}
+function isTransientEntityChangeRefetchError(error: unknown): boolean {
+ const status =
+ error && typeof error === 'object' ? (error as { status?: unknown }).status : undefined
+ if (typeof status === 'number') {
+ return status === 408 || status === 425 || status === 429 || status >= 500
+ }
+ if (error instanceof TypeError) return true
+ return (
+ error instanceof Error &&
+ /network|fetch|timeout|timed out|socket|connection/i.test(error.message)
+ )
+}
+
export function GfsBrowser(): React.JSX.Element {
const { showToast } = useToast()
const [crumbs, setCrumbs] = useState<Crumb[]>([{ id: null, rid: null, name: '/' }])
@@ -297,6 +310,7 @@ export function GfsBrowser(): React.JSX.Element {
> | null>(null)
const [previewReloadVersion, setPreviewReloadVersion] = useState(0)
const previewRefreshGenerationRef = useRef(0)
+ const scheduleEntityChangeRecoveryRef = useRef<(() => void) | null>(null)
const openPreviewsRef = useRef<OpenPreviewState[]>([])
openPreviewsRef.current = [imagePreview, markdownPreview, videoPreview].filter(
(preview): preview is OpenPreviewState => preview !== null
@@ -400,6 +414,7 @@ export function GfsBrowser(): React.JSX.Element {
}
} catch (err) {
if (seq !== loadSeqRef.current) return
+ if (isTransientEntityChangeRefetchError(err)) scheduleEntityChangeRecoveryRef.current?.()
if (!isSilentApiError(err)) {
// Background revalidation keeps the (stale) rows visible but still
// surfaces the failure instead of silently ignoring it.
@@ -517,11 +532,29 @@ export function GfsBrowser(): React.JSX.Element {
useEffect(() => {
const controller = new AbortController()
let retryTimer: ReturnType<typeof setTimeout> | null = null
+ let recoveryTimer: ReturnType<typeof setTimeout> | null = null
let retryDelay = 500
+ let recoveryDelay = 500
let active = true
-
- const invalidateVisibleState = (cursor?: string) => {
- if (cursor) streamCursorRef.current = cursor
+ let invalidateVisibleState: (cursor?: string) => void = () => undefined
+ const scheduleRecovery = () => {
+ if (!active || recoveryTimer) return
+ const delay = recoveryDelay
+ recoveryDelay = Math.min(recoveryDelay * 2, 5000)
+ recoveryTimer = setTimeout(() => {
+ recoveryTimer = null
+ invalidateVisibleState()
+ }, delay)
+ }
+ scheduleEntityChangeRecoveryRef.current = scheduleRecovery
+
+ invalidateVisibleState = (cursor?: string) => {
+ if (cursor) {
+ streamCursorRef.current = cursor
+ if (recoveryTimer) clearTimeout(recoveryTimer)
+ recoveryTimer = null
+ recoveryDelay = 500
+ }
childCacheRef.current.clear()
revalidateNextLoadRef.current = false
setSelected(null)
@@ -571,7 +604,8 @@ export function GfsBrowser(): React.JSX.Element {
return isGfsMarkdownPreviewFile(resolved.name)
? { ...shared, kind: 'markdown' }
: null
- } catch {
+ } catch (error) {
+ if (isTransientEntityChangeRefetchError(error)) scheduleRecovery()
return null
}
})
@@ -602,6 +636,7 @@ export function GfsBrowser(): React.JSX.Element {
void (async () => {
const rootCrumb = { ...(crumbsRef.current[0] ?? { id: null, rid: null, name: '/' }) }
let refreshed: Crumb[] = [rootCrumb]
+ let retryHierarchy = false
try {
const resolved = (await apiGet('/api/v1/gfs/resolve', {
uri: `gfs://${DRIVE}/${visibleCrumb.rid ?? ridOfResourceId(visibleResourceId)}`,
@@ -624,10 +659,15 @@ export function GfsBrowser(): React.JSX.Element {
if (refreshed[refreshed.length - 1]?.id !== resolved.resourceId) {
throw new Error('GFS folder hierarchy changed during refresh')
}
- } catch {
+ } catch (error) {
// Do not keep presenting the stale hierarchy if the current folder
// was deleted, moved during resolution, or is no longer authorized.
- refreshed = [rootCrumb]
+ if (isTransientEntityChangeRefetchError(error)) {
+ retryHierarchy = true
+ scheduleRecovery()
+ } else {
+ refreshed = [rootCrumb]
+ }
}
if (
generation !== hierarchyRefreshGenerationRef.current ||
@@ -635,7 +675,7 @@ export function GfsBrowser(): React.JSX.Element {
) {
return
}
- setCrumbs(refreshed)
+ if (!retryHierarchy) setCrumbs(refreshed)
})()
}
@@ -706,6 +746,10 @@ export function GfsBrowser(): React.JSX.Element {
active = false
controller.abort()
if (retryTimer) clearTimeout(retryTimer)
+ if (recoveryTimer) clearTimeout(recoveryTimer)
+ if (scheduleEntityChangeRecoveryRef.current === scheduleRecovery) {
+ scheduleEntityChangeRecoveryRef.current = null
+ }
}
}, [load])
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 3e36f6fe6..d6f52cf37 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.611",
+ "version": "0.1.612",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.611",
+ "version": "0.1.612",
"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 10127ee47..554a7f1c1 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.611",
+ "version": "0.1.612",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",