devsyncwrld/backspace
1
0
Fork 0
Code Issues Pull Requests Actions 34 Packages Projects Releases Wiki Activity

feat(web): chatStore dedups WS echo against pendingMessageStore (FIFO)

Browse Source
This commit is contained in:
Jannis Braun
2026-05-02 16:37:22 +02:00
parent e534644e57
commit 48d199515a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/web/src/stores/chatStore.ts
+9
View File
@@ -5,6 +5,7 @@ import { isDmChannel, getChannelOrigin, getApiForOrigin, useSpaceStore } from '.
import { useAuthStore } from './authStore'; import { useAuthStore } from './authStore';
import { normalizeMessageAssets } from '../utils/assetUrls'; import { normalizeMessageAssets } from '../utils/assetUrls';
import { sortDmChannels } from '../utils/dmSorting'; import { sortDmChannels } from '../utils/dmSorting';
import { usePendingMessageStore } from './pendingMessageStore';
const MAX_MESSAGES_PER_CHANNEL = 200; const MAX_MESSAGES_PER_CHANNEL = 200;
const MAX_CACHED_CHANNELS = 20; const MAX_CACHED_CHANNELS = 20;
@@ -364,6 +365,10 @@ export const useChatStore = create<ChatState>((set, get) => ({
const current = newMessages.get(channelId) ?? []; const current = newMessages.get(channelId) ?? [];
// Avoid duplicates // Avoid duplicates
if (current.find(m => m.id === normalizedMessage.id)) return state; if (current.find(m => m.id === normalizedMessage.id)) return state;
// Dedup against pendingMessageStore by (content, sortedAttachmentIds).
// No userId check — federation relays arrive with replicated user IDs.
const sortedAttIds = (normalizedMessage.attachments ?? []).map((a) => a.id).sort();
usePendingMessageStore.getState().matchAndRemove(channelId, normalizedMessage.content ?? '', sortedAttIds);
// Remove any optimistic temp message with same content. // Remove any optimistic temp message with same content.
// Don't require userId match — for federated messages the home user ID // Don't require userId match — for federated messages the home user ID
// differs from the replicated user ID, but content match is sufficient // differs from the replicated user ID, but content match is sufficient
@@ -397,6 +402,10 @@ export const useChatStore = create<ChatState>((set, get) => ({
if ('sourceMessageId' in normalizedMessage && normalizedMessage.sourceMessageId if ('sourceMessageId' in normalizedMessage && normalizedMessage.sourceMessageId
&& current.find(m => m.id === normalizedMessage.sourceMessageId)) return state; && current.find(m => m.id === normalizedMessage.sourceMessageId)) return state;
if (current.find(m => 'sourceMessageId' in m && m.sourceMessageId === normalizedMessage.id)) return state; if (current.find(m => 'sourceMessageId' in m && m.sourceMessageId === normalizedMessage.id)) return state;
// Dedup against pendingMessageStore by (content, sortedAttachmentIds).
// No userId check — federation relays arrive with replicated user IDs.
const sortedAttIds = (normalizedMessage.attachments ?? []).map((a) => a.id).sort();
usePendingMessageStore.getState().matchAndRemove(channelId, normalizedMessage.content ?? '', sortedAttIds);
// Remove any optimistic temp message with same content (no userId check — // Remove any optimistic temp message with same content (no userId check —
// federated messages arrive with a different replicated user ID). // federated messages arrive with a different replicated user ID).
// Normalize both sides: empty string and null are equivalent (server stores null for empty content). // Normalize both sides: empty string and null are equivalent (server stores null for empty content).