iarv/Remote-Terminal-for-MeshCore
1
0
Fork 1
mirror of https://github.com/jkingsman/Remote-Terminal-for-MeshCore.git synced 2026-03-28 17:43:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deal with reconciliation conflict from colliding WS fetches

Browse Source
This commit is contained in:
Jack Kingsman
2026-03-11 20:52:48 -07:00
parent bc7506b0d9
commit d36c5e3e32
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/hooks/useConversationMessages.ts
View File

@@ -195,8 +195,12 @@ export function useConversationMessages(
}
const messagesWithPendingAck = data.map((msg) => applyPendingAck(msg));
setMessages(messagesWithPendingAck);
syncSeenContent(messagesWithPendingAck);
const merged = messageCache.reconcile(messagesRef.current, messagesWithPendingAck);
const nextMessages = merged ?? messagesRef.current;
if (merged) {
setMessages(merged);
}
syncSeenContent(nextMessages);
setHasOlderMessages(messagesWithPendingAck.length >= MESSAGE_PAGE_SIZE);
} catch (err) {
if (isAbortError(err)) {

34
frontend/src/test/useConversationMessages.race.test.ts
View File

@@ -101,6 +101,40 @@ describe('useConversationMessages ACK ordering', () => {
expect(result.current.messages[0].paths).toEqual(paths);
});
it('preserves a WebSocket-arrived message when latest fetch resolves afterward', async () => {
const deferred = createDeferred<Message[]>();
mockGetMessages.mockReturnValueOnce(deferred.promise);
const { result } = renderHook(() => useConversationMessages(createConversation()));
await waitFor(() => expect(mockGetMessages).toHaveBeenCalledTimes(1));
act(() => {
const added = result.current.addMessageIfNew(
createMessage({
id: 99,
text: 'ws-arrived',
sender_timestamp: 1700000099,
received_at: 1700000099,
})
);
expect(added).toBe(true);
});
deferred.resolve([
createMessage({
id: 42,
text: 'rest-fetched',
sender_timestamp: 1700000000,
received_at: 1700000001,
}),
]);
await waitFor(() => expect(result.current.messagesLoading).toBe(false));
expect(result.current.messages).toHaveLength(2);
expect(result.current.messages.some((msg) => msg.text === 'rest-fetched')).toBe(true);
expect(result.current.messages.some((msg) => msg.text === 'ws-arrived')).toBe(true);
});
it('keeps highest ACK state when out-of-order ACK updates arrive', async () => {
mockGetMessages.mockResolvedValueOnce([]);