Myx
de2d3300d4
stale server sockets, passive non-initiators, and race conditions during peer connection setup. Fix users unable to see or hear each other in voice channels due to stale server sockets, passive non-initiators, and race conditions during peer connection setup. Server: - Close stale WebSocket connections sharing the same oderId in handleIdentify instead of letting them linger up to 45s - Make user_joined/user_left broadcasts identity-aware so duplicate sockets don't produce phantom join/leave events - Include serverIds in user_left payload for multi-room presence - Simplify findUserByOderId now that stale sockets are cleaned up Client - signaling: - Add fallback offer system with 1s timer for missed user_joined races - Add non-initiator takeover after 5s when the initiator fails to send an offer (NON_INITIATOR_GIVE_UP_MS) - Scope peerServerMap per signaling URL to prevent cross-server collisions - Add socket identity guards on all signaling event handlers - Replace canReusePeerConnection with hasActivePeerConnection and isPeerConnectionNegotiating with extended grace periods Client - peer connections: - Extract replaceUnusablePeer helper to deduplicate stale peer replacement in offer and ICE handlers - Add stale connectionstatechange guard to ignore events from replaced RTCPeerConnection instances - Use deterministic initiator election in peer recovery reconnects - Track createdAt on PeerData for staleness detection Client - presence: - Add multi-room presence tracking via presenceServerIds on User - Replace clearUsers + individual userJoined with syncServerPresence for atomic server roster updates - Make userLeft handle partial server removal instead of full eviction Documentation: - Add server-side connection hygiene, non-initiator takeover, and stale peer replacement sections to the realtime README
108 lines
2.9 KiB
TypeScript
108 lines
2.9 KiB
TypeScript
import {
|
|
IncomingMessage,
|
|
Server,
|
|
ServerResponse
|
|
} from 'http';
|
|
import { WebSocketServer, WebSocket } from 'ws';
|
|
import { v4 as uuidv4 } from 'uuid';
|
|
import { connectedUsers } from './state';
|
|
import {
|
|
broadcastToServer,
|
|
getServerIdsForOderId,
|
|
isOderIdConnectedToServer
|
|
} from './broadcast';
|
|
import { handleWebSocketMessage } from './handler';
|
|
|
|
/** How often to ping all connected clients (ms). */
|
|
const PING_INTERVAL_MS = 30_000;
|
|
/** Maximum time a client can go without a pong before we consider it dead (ms). */
|
|
const PONG_TIMEOUT_MS = 45_000;
|
|
|
|
function removeDeadConnection(connectionId: string): void {
|
|
const user = connectedUsers.get(connectionId);
|
|
|
|
if (user) {
|
|
console.log(`Removing dead connection: ${user.displayName ?? 'Unknown'} (${user.oderId})`);
|
|
|
|
const remainingServerIds = getServerIdsForOderId(user.oderId, connectionId);
|
|
|
|
user.serverIds.forEach((sid) => {
|
|
if (isOderIdConnectedToServer(user.oderId, sid, connectionId)) {
|
|
return;
|
|
}
|
|
|
|
broadcastToServer(sid, {
|
|
type: 'user_left',
|
|
oderId: user.oderId,
|
|
displayName: user.displayName,
|
|
serverId: sid,
|
|
serverIds: remainingServerIds
|
|
}, user.oderId);
|
|
});
|
|
|
|
try {
|
|
user.ws.terminate();
|
|
} catch {
|
|
console.warn(`Failed to terminate WebSocket for ${user.displayName ?? 'Unknown'} (${user.oderId})`);
|
|
}
|
|
}
|
|
|
|
connectedUsers.delete(connectionId);
|
|
}
|
|
|
|
export function setupWebSocket(server: Server<typeof IncomingMessage, typeof ServerResponse>): void {
|
|
const wss = new WebSocketServer({ server });
|
|
// Periodically ping all clients and reap dead connections
|
|
const pingInterval = setInterval(() => {
|
|
const now = Date.now();
|
|
|
|
connectedUsers.forEach((user, connectionId) => {
|
|
if (now - user.lastPong > PONG_TIMEOUT_MS) {
|
|
removeDeadConnection(connectionId);
|
|
return;
|
|
}
|
|
|
|
if (user.ws.readyState === WebSocket.OPEN) {
|
|
try {
|
|
user.ws.ping();
|
|
} catch {
|
|
console.warn(`Failed to ping client ${user.displayName ?? 'Unknown'} (${user.oderId})`);
|
|
}
|
|
}
|
|
});
|
|
}, PING_INTERVAL_MS);
|
|
|
|
wss.on('close', () => clearInterval(pingInterval));
|
|
|
|
wss.on('connection', (ws: WebSocket) => {
|
|
const connectionId = uuidv4();
|
|
const now = Date.now();
|
|
|
|
connectedUsers.set(connectionId, { oderId: connectionId, ws, serverIds: new Set(), lastPong: now });
|
|
|
|
ws.on('pong', () => {
|
|
const user = connectedUsers.get(connectionId);
|
|
|
|
if (user) {
|
|
user.lastPong = Date.now();
|
|
}
|
|
});
|
|
|
|
ws.on('message', async (data) => {
|
|
try {
|
|
const message = JSON.parse(data.toString());
|
|
|
|
await handleWebSocketMessage(connectionId, message);
|
|
} catch (err) {
|
|
console.error('Invalid WebSocket message:', err);
|
|
}
|
|
});
|
|
|
|
ws.on('close', () => {
|
|
removeDeadConnection(connectionId);
|
|
});
|
|
|
|
ws.send(JSON.stringify({ type: 'connected', connectionId, serverTime: Date.now() }));
|
|
});
|
|
}
|