Fix race condition where streamed events could be lost

Events stream in via model_write listener while also being fetched
from the database. If the DB fetch completed before all events were
persisted, replaceModelsInStore would wipe out events that came in
via model_write.

Added mergeModelsInStore that adds fetched events without removing
existing ones. Applied to HTTP, gRPC, and WebSocket event hooks.
This commit is contained in:
Gregory Schier
2026-01-11 07:42:04 -08:00
parent 2a5587c128
commit bbcae34575
6 changed files with 45 additions and 9 deletions

View File

@@ -1,6 +1,7 @@
import { invoke } from '@tauri-apps/api/core';
import type { WebsocketConnection, WebsocketEvent } from '@yaakapp-internal/models';
import {
mergeModelsInStore,
replaceModelsInStore,
websocketConnectionsAtom,
websocketEventsAtom,
@@ -54,8 +55,10 @@ export function useWebsocketEvents(connectionId: string | null) {
return;
}
// Use merge instead of replace to preserve events that came in via model_write
// while we were fetching from the database
invoke<WebsocketEvent[]>('models_websocket_events', { connectionId }).then(
(events) => replaceModelsInStore('websocket_event', events),
(events) => mergeModelsInStore('websocket_event', events),
);
}, [connectionId]);