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

fix: three root causes for federated DM call failures

Browse Source 
1. Accept/reject/end from remote instance now resolves federatedId
   to local dmChannelId via DB lookup, so the host can find its
   VoiceRoom when the event arrives with only a federatedCallId.
   Previously silently failed with "No active call" error.

2. Batch all dm_call_incoming state updates into a single
   useVoiceStore.setState() call. Prevents SoundController from
   starting multiple ringtone instances (async playSound guard
   race when 4 separate set() calls each triggered the subscription).

3. Always overwrite callOrigin/federatedCallId (with null if absent)
   on dm_call_incoming. Prevents stale values from a previous
   federated call routing local accepts to the wrong instance.
This commit is contained in:
Jannis Braun
2026-04-08 12:53:58 +02:00
parent 9ad240495f
commit 5265117d29
2 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/ws/events.ts
+35 -3
View File
@@ -1442,7 +1442,7 @@ function handleDmCallStart(event: Record<string, unknown>, userId: string, usern
}
function handleDmCallAccept(event: Record<string, unknown>, userId: string, ws: WebSocket): void {
const dmChannelId = (event.dmChannelId as string) || null;
let dmChannelId = (event.dmChannelId as string) || null;
const federatedCallId = (event.federatedCallId as string) || null;
if (!dmChannelId && !federatedCallId) {
@@ -1450,6 +1450,18 @@ function handleDmCallAccept(event: Record<string, unknown>, userId: string, ws:
return;
}
// Resolve federatedCallId → dmChannelId when only federatedCallId is provided.
// This happens when a remote instance accepts via callOrigin and the DM doesn't
// exist there (Path B), but the HOST has the VoiceRoom keyed by dmChannelId.
if (!dmChannelId && federatedCallId) {
const db = getDb();
const ch = db.select({ id: schema.dmChannels.id })
.from(schema.dmChannels)
.where(eq(schema.dmChannels.federatedId, federatedCallId))
.get();
if (ch) dmChannelId = ch.id;
}
// Path 1: Local room (we're the host) — only possible with dmChannelId
if (dmChannelId) {
if (!isDmMember(dmChannelId, userId)) {
@@ -1530,11 +1542,21 @@ function handleDmCallAccept(event: Record<string, unknown>, userId: string, ws:
}
function handleDmCallReject(event: Record<string, unknown>, userId: string): void {
const dmChannelId = (event.dmChannelId as string) || null;
let dmChannelId = (event.dmChannelId as string) || null;
const federatedCallId = (event.federatedCallId as string) || null;
if (!dmChannelId && !federatedCallId) return;
// Resolve federatedCallId → dmChannelId for host VoiceRoom lookup
if (!dmChannelId && federatedCallId) {
const db = getDb();
const ch = db.select({ id: schema.dmChannels.id })
.from(schema.dmChannels)
.where(eq(schema.dmChannels.federatedId, federatedCallId))
.get();
if (ch) dmChannelId = ch.id;
}
// Path 1: Local room (we're the host)
if (dmChannelId) {
if (!isDmMember(dmChannelId, userId)) return;
@@ -1587,11 +1609,21 @@ function handleDmCallReject(event: Record<string, unknown>, userId: string): voi
}
function handleDmCallEnd(event: Record<string, unknown>, userId: string): void {
const dmChannelId = (event.dmChannelId as string) || null;
let dmChannelId = (event.dmChannelId as string) || null;
const federatedCallId = (event.federatedCallId as string) || null;
if (!dmChannelId && !federatedCallId) return;
// Resolve federatedCallId → dmChannelId for host VoiceRoom lookup
if (!dmChannelId && federatedCallId) {
const db = getDb();
const ch = db.select({ id: schema.dmChannels.id })
.from(schema.dmChannels)
.where(eq(schema.dmChannels.federatedId, federatedCallId))
.get();
if (ch) dmChannelId = ch.id;
}
// Path 1: Local room (we're the host)
if (dmChannelId) {
if (!isDmMember(dmChannelId, userId)) return;