adam/Remote-Terminal-for-MeshCore
1
0
Fork 0
mirror of https://github.com/jkingsman/Remote-Terminal-for-MeshCore.git synced 2026-08-07 01:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix races and stale things

Browse Source
This commit is contained in:
Jack Kingsman
2026-04-10 15:54:03 -07:00
parent 59601bb98e
commit 4f19e1ec9a
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/hooks/useConversationMessages.ts
+9 -5
View File
@@ -372,6 +372,8 @@ export function useConversationMessages(
const olderAbortControllerRef = useRef<AbortController | null>(null);
const newerAbortControllerRef = useRef<AbortController | null>(null);
const fetchingConversationIdRef = useRef<string | null>(null);
const activeConversationRef = useRef(activeConversation);
activeConversationRef.current = activeConversation;
const latestReconcileRequestIdRef = useRef(0);
const pendingReconnectReconcileRef = useRef(false);
const messagesRef = useRef<Message[]>([]);
@@ -664,9 +666,11 @@ export function useConversationMessages(
}, [activeConversation]);
const reconcileOnReconnect = useCallback(() => {
if (!isMessageConversation(activeConversation)) {
return;
}
// Read the current conversation from the ref rather than closing over
// activeConversation, so that a conversation switch during WS reconnect
// targets the right conversation instead of a stale capture.
const current = activeConversationRef.current;
if (!isMessageConversation(current)) return;
if (hasNewerMessagesRef.current) {
pendingReconnectReconcileRef.current = true;
@@ -677,8 +681,8 @@ export function useConversationMessages(
const controller = new AbortController();
const requestId = latestReconcileRequestIdRef.current + 1;
latestReconcileRequestIdRef.current = requestId;
reconcileFromBackend(activeConversation, controller.signal, requestId);
}, [activeConversation, reconcileFromBackend]);
reconcileFromBackend(current, controller.signal, requestId);
}, [reconcileFromBackend]);
useEffect(() => {
if (abortControllerRef.current) {