Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(desktop-app): purge previews on R2-H1 session expiry
Josué33a13c7b4b81
diff --git a/desktop-app/src/__tests__/appService.entityChanges.test.ts b/desktop-app/src/__tests__/appService.entityChanges.test.tsindex e0209f3cf..721278247 100644--- a/desktop-app/src/__tests__/appService.entityChanges.test.ts+++ b/desktop-app/src/__tests__/appService.entityChanges.test.ts@@ -1,5 +1,6 @@import { describe, expect, it, vi } from 'vitest'import { AppService } from '../appService.js'+import { ApiError } from '../httpClient.js'import type { EntityChangeStreamEvent } from '../types.js'vi.mock('electron', () => ({@@ -110,3 +111,52 @@ describe('AppService entity-change fan-out', () => {service.stopEntityChangeStream('stream-a', 11)})})++describe('AppService.startEntityChangeStream session expiry', () => {+ it('turns an initial 401 into a terminal session-expired frame without reconnecting', async () => {+ const service = new AppService() as any+ service.sessionToken = 'session-token'+ service.authClient = {+ openEntityChangeStream: vi+ .fn()+ .mockRejectedValue(new ApiError('Entity change stream failed (401)', 401, '')),+ }+ const events: EntityChangeStreamEvent[] = []++ service.startEntityChangeStream('stream-1', 7, (event: EntityChangeStreamEvent) => {+ events.push(event)+ })+ await flushAsyncWork()++ expect(events.map(event => event.type)).toEqual(['stream.closing'])+ expect(events[0]).toMatchObject({ reason: 'session_expired' })+ expect(service.authClient.openEntityChangeStream).toHaveBeenCalledOnce()+ service.stopEntityChangeStream('stream-1', 7)+ })++ it('does not reconnect after the server announces session expiry', async () => {+ const service = new AppService() as any+ service.sessionToken = 'session-token'+ service.authClient = {+ openEntityChangeStream: vi.fn().mockImplementation(async (_token, _cursor, onEvent) => {+ onEvent({ type: 'open' })+ onEvent({+ type: 'stream.closing',+ schemaVersion: 1,+ cursor: '00000000-0000-0000-0000-000000000001',+ reason: 'session_expired',+ })+ }),+ }+ const events: EntityChangeStreamEvent[] = []++ service.startEntityChangeStream('stream-1', 7, (event: EntityChangeStreamEvent) => {+ events.push(event)+ })+ await flushAsyncWork()++ expect(events.map(event => event.type)).toEqual(['open', 'stream.closing'])+ expect(service.authClient.openEntityChangeStream).toHaveBeenCalledOnce()+ service.stopEntityChangeStream('stream-1', 7)+ })+})diff --git a/desktop-app/src/appService.ts b/desktop-app/src/appService.tsindex 4116b4b56..8f99bf79c 100644--- a/desktop-app/src/appService.ts+++ b/desktop-app/src/appService.ts@@ -2795,6 +2795,7 @@ export class AppService {if (this.entityChangeConnectionStop === stop) this.entityChangeConnectionStop = nullif (!opts?.silent) this.emitEntityChangeEvent({ type: 'closed' })}+ const stopForSessionExpiry = () => stop({ silent: true })this.entityChangeConnectionStop = stopconst connect = async () => {@@ -2808,15 +2809,28 @@ export class AppService {if (closed) returnif (event.type === 'open') backoffMs = 1000this.emitEntityChangeEvent(event)+ if (event.type === 'stream.closing' && event.reason === 'session_expired') {+ stopForSessionExpiry()+ }},abortController.signal)- } catch {+ } catch (error) {if (!closed) {- this.emitEntityChangeEvent({- type: 'error',- message: 'Live updates disconnected; reconnecting.',- })+ if (error instanceof ApiError && error.status === 401) {+ this.emitEntityChangeEvent({+ type: 'stream.closing',+ schemaVersion: 1,+ cursor: this.entityChangeCursor ?? '00000000-0000-0000-0000-000000000000',+ reason: 'session_expired',+ })+ stopForSessionExpiry()+ } else {+ this.emitEntityChangeEvent({+ type: 'error',+ message: 'Live updates disconnected; reconnecting.',+ })+ }}} finally {if (closed) returndiff --git a/desktop-app/ui/src/lib/__tests__/entityChangeRegistry.test.ts b/desktop-app/ui/src/lib/__tests__/entityChangeRegistry.test.tsindex 542c01a7c..1a10aa2d7 100644--- a/desktop-app/ui/src/lib/__tests__/entityChangeRegistry.test.ts+++ b/desktop-app/ui/src/lib/__tests__/entityChangeRegistry.test.ts@@ -34,4 +34,33 @@ describe('EntityChangeRegistry', () => {expect(adapter).toHaveBeenCalledOnce()})++ it('invalidates all sensitive renderer state when the authenticated session expires', () => {+ const registry = new EntityChangeRegistry()+ const adapter = vi.fn()+ registry.subscribe(['gfs', 'authorization'], adapter)++ registry.dispatch({+ type: 'stream.closing',+ schemaVersion: 1,+ cursor: '00000000-0000-0000-0000-000000000001',+ reason: 'session_expired',+ })++ expect(adapter).toHaveBeenCalledWith({+ type: 'resync_required',+ schemaVersion: 1,+ cursor: '00000000-0000-0000-0000-000000000001',+ scopes: ['gfs', 'authorization'],+ })++ adapter.mockClear()+ registry.dispatch({+ type: 'stream.closing',+ schemaVersion: 1,+ cursor: '00000000-0000-0000-0000-000000000002',+ reason: 'max_lifetime',+ })+ expect(adapter).not.toHaveBeenCalled()+ })})diff --git a/desktop-app/ui/src/lib/entityChangeRegistry.ts b/desktop-app/ui/src/lib/entityChangeRegistry.tsindex 4681fd934..68122c541 100644--- a/desktop-app/ui/src/lib/entityChangeRegistry.ts+++ b/desktop-app/ui/src/lib/entityChangeRegistry.ts@@ -28,11 +28,25 @@ export class EntityChangeRegistry {}dispatch(event: EntityChangeStreamEvent): void {- if (event.type !== 'scope.invalidated' && event.type !== 'resync_required') return+ let invalidation: EntityChangeInvalidation+ if (event.type === 'scope.invalidated' || event.type === 'resync_required') {+ invalidation = event+ } else if (event.type === 'stream.closing' && event.reason === 'session_expired') {+ // Session authority is gone. Purge all GFS and authorization-backed state;+ // other graceful closes still reconnect without changing renderer state.+ invalidation = {+ type: 'resync_required',+ schemaVersion: 1,+ cursor: event.cursor,+ scopes: ['gfs', 'authorization'],+ }+ } else {+ return+ }const uniqueHandlers = new Set<ScopeHandler>()- for (const scope of event.scopes) {+ for (const scope of invalidation.scopes) {for (const handler of this.handlers.get(scope) ?? []) uniqueHandlers.add(handler)}- for (const handler of uniqueHandlers) handler(event)+ for (const handler of uniqueHandlers) handler(invalidation)}}diff --git a/desktop-app/ui/src/pages/__tests__/FilePreviewPage.test.tsx b/desktop-app/ui/src/pages/__tests__/FilePreviewPage.test.tsxindex 2a5b438da..57dc7b83c 100644--- a/desktop-app/ui/src/pages/__tests__/FilePreviewPage.test.tsx+++ b/desktop-app/ui/src/pages/__tests__/FilePreviewPage.test.tsx@@ -1,6 +1,8 @@// @vitest-environment jsdom+import { useEffect, useState } from 'react'import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'-import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'+import { EntityChangeRegistry } from '@lib/entityChangeRegistry'import { resolveDeniedMessage } from '@/gfs/__fixtures__/gfsProducerFixtures'import { FilePreviewPage } from '../FilePreviewPage'@@ -149,6 +151,43 @@ describe('FilePreviewPage', () => {expect(downloadPreview).toHaveBeenCalledTimes(1)})+ it('purges image bytes and its object URL on session expiry through the entity registry', async () => {+ hookMock.useGfsBrowserController.mockReturnValue(controller())+ stubDownload(async () => ({ bytes: new Uint8Array([1, 2, 3]).buffer }))+ const registry = new EntityChangeRegistry()++ function SessionAwarePreview() {+ const [unavailable, setUnavailable] = useState(false)+ useEffect(() => registry.subscribe(['gfs', 'authorization'], () => setUnavailable(true)), [])+ return (+ <FilePreviewPage+ gfsUri="gfs://main/session-expired"+ fileName="session-secret.png"+ fileKind="image"+ mimeType="image/png"+ byteLength={3}+ unavailable={unavailable}+ />+ )+ }++ render(<SessionAwarePreview />)+ expect(await screen.findByAltText('Preview of session-secret.png')).toBeTruthy()++ act(() =>+ registry.dispatch({+ type: 'stream.closing',+ schemaVersion: 1,+ cursor: '00000000-0000-0000-0000-000000000001',+ reason: 'session_expired',+ })+ )++ expect(await screen.findByRole('heading', { name: 'File unavailable', level: 3 })).toBeTruthy()+ expect(screen.queryByAltText('Preview of session-secret.png')).toBeNull()+ expect(URL.revokeObjectURL).toHaveBeenCalledWith('blob:gfs-preview')+ })+// R1-H6: a persistent preview tab outlives the grant that opened it. A// per-RESOURCE unshare (gfs.read now 403s for THIS file, session still valid)// must drop the rendered bytes and the Copy affordance on window focus WITHOUT