diff --git a/backend/dist/realtime/redis/pubsub.d.ts.map b/backend/dist/realtime/redis/pubsub.d.ts.map index d37cd54f..103fccb1 100644 --- a/backend/dist/realtime/redis/pubsub.d.ts.map +++ b/backend/dist/realtime/redis/pubsub.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/pubsub.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,iBAAiB,GACzB,eAAe,GACf,eAAe,GACf,eAAe,GACf,cAAc,GACd,cAAc,GACd,eAAe,GACf,cAAc,GACd,gBAAgB,CAAC;AAErB,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,iBAAiB,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAEjG;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAQpE;AAED,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;AAE3D,gEAAgE;AAChE,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAiB9B;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAiB9B"} \ No newline at end of file +{"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/pubsub.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,iBAAiB,GACzB,eAAe,GACf,eAAe,GACf,eAAe,GACf,cAAc,GACd,cAAc,GACd,eAAe,GACf,cAAc,GACd,gBAAgB,CAAC;AAErB,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,iBAAiB,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAEjG;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAkBpE;AAED,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;AAE3D,gEAAgE;AAChE,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAiB9B;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAiB9B"} \ No newline at end of file diff --git a/backend/dist/realtime/redis/pubsub.js b/backend/dist/realtime/redis/pubsub.js index 764502d9..13fd5279 100644 --- a/backend/dist/realtime/redis/pubsub.js +++ b/backend/dist/realtime/redis/pubsub.js @@ -14,9 +14,18 @@ function serializeRealtimeEvent(event) { function parseRealtimeEvent(raw) { try { const parsed = JSON.parse(raw); - if (!parsed?.type) + if (!parsed?.type || typeof parsed.type !== 'string') return null; - return parsed; + const payload = parsed.payload && typeof parsed.payload === 'object' && !Array.isArray(parsed.payload) + ? parsed.payload + : {}; + return { + type: parsed.type, + intervalMinutes: parsed.intervalMinutes, + payload, + version: parsed.version, + ts: typeof parsed.ts === 'number' ? parsed.ts : Date.now(), + }; } catch { return null; diff --git a/backend/dist/realtime/redis/pubsub.js.map b/backend/dist/realtime/redis/pubsub.js.map index e6f0fde2..8e77f8a4 100644 --- a/backend/dist/realtime/redis/pubsub.js.map +++ b/backend/dist/realtime/redis/pubsub.js.map @@ -1 +1 @@ -{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../../src/realtime/redis/pubsub.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../../src/realtime/redis/pubsub.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/dist/realtime/ws/hub.d.ts b/backend/dist/realtime/ws/hub.d.ts index e13facae..8607cd2f 100644 --- a/backend/dist/realtime/ws/hub.d.ts +++ b/backend/dist/realtime/ws/hub.d.ts @@ -7,6 +7,7 @@ export declare class GameWsHub { private trackClient; private untrackClient; start(): Promise; + private dispatchRedisMessage; register(socket: WebSocket, auth: WsAuthContext | null): void; private handleMessage; private send; diff --git a/backend/dist/realtime/ws/hub.d.ts.map b/backend/dist/realtime/ws/hub.d.ts.map index 021f742f..1cac2120 100644 --- a/backend/dist/realtime/ws/hub.d.ts.map +++ b/backend/dist/realtime/ws/hub.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"hub.d.ts","sourceRoot":"","sources":["../../../src/realtime/ws/hub.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,IAAI,CAAC;AAQhC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AA2C5C,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAA0B;IACzC,6DAA6D;IAC7D,OAAO,CAAC,iBAAiB,CAAuC;IAEhE,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,aAAa;IAaf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmG5B,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,GAAG,IAAI;YA0B/C,aAAa;IAsE3B,OAAO,CAAC,IAAI;CAIb;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"} \ No newline at end of file +{"version":3,"file":"hub.d.ts","sourceRoot":"","sources":["../../../src/realtime/ws/hub.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,IAAI,CAAC;AAQhC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AA2C5C,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAA0B;IACzC,6DAA6D;IAC7D,OAAO,CAAC,iBAAiB,CAAuC;IAEhE,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,aAAa;IAaf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B5B,OAAO,CAAC,oBAAoB;IAqF5B,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,GAAG,IAAI;YA0B/C,aAAa;IAsE3B,OAAO,CAAC,IAAI;CAIb;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"} \ No newline at end of file diff --git a/backend/dist/realtime/ws/hub.js b/backend/dist/realtime/ws/hub.js index 1415eee7..37b11fa3 100644 --- a/backend/dist/realtime/ws/hub.js +++ b/backend/dist/realtime/ws/hub.js @@ -76,95 +76,107 @@ class GameWsHub { if (!sub) return; sub.on('pmessage', (_pattern, channel, message) => { - const event = (0, pubsub_1.parseRealtimeEvent)(message); - if (!event) - return; - if (channel.startsWith(USER_CHANNEL_PREFIX)) { - const userId = channel.slice(USER_CHANNEL_PREFIX.length); - for (const client of this.clients) { - if (client.auth?.userId !== userId) - continue; - if (event.type === 'bet.accepted') { - const idempotencyKey = String(event.payload.idempotencyKey ?? '').trim(); - this.send(client, { - type: 'bet.accepted', - bet: event.payload.bet ?? {}, - ...(idempotencyKey ? { idempotencyKey } : {}), - versions: event.payload.versions, - }); - } - else if (event.type === 'bet.rejected') { - const idempotencyKey = String(event.payload.idempotencyKey ?? '').trim(); - this.send(client, { - type: 'bet.rejected', - idempotencyKey, - error: String(event.payload.error ?? 'Bet rejected'), - }); - } - else if (event.type === 'multi.updated') { - this.send(client, { - type: 'multi.updated', - intervalMinutes: Number(event.payload.intervalMinutes ?? 0), - userMultiBet: event.payload.userMultiBet ?? null, - versions: event.payload.versions, - }); - } - else if (event.type === 'auto.updated') { - this.send(client, { - type: 'auto.updated', - autoSettings: event.payload.autoSettings ?? {}, - versions: event.payload.versions, - }); - } - } - return; + try { + this.dispatchRedisMessage(channel, message); } - const intervalMatch = channel.match(/round:(\d+)m$/); - const intervalMinutes = intervalMatch ? Number(intervalMatch[1]) : event.intervalMinutes; - const pools = event.payload.pools; - const baseRound = event.payload.round ?? {}; - for (const client of this.clients) { - if (intervalMinutes != null && !client.intervals.has(intervalMinutes)) - continue; - const isAdmin = client.auth ? (0, roleAccess_1.hasAdminAccess)({ role: client.auth.role }) : false; - const round = enrichRoundPayload(baseRound, pools, isAdmin); - if (event.type === 'round.updated') { - this.send(client, { - type: 'round.updated', - intervalMinutes: intervalMinutes ?? 0, - round, - versions: event.payload.versions, - }); - } - else if (event.type === 'round.settled') { - this.send(client, { - type: 'round.settled', - intervalMinutes: intervalMinutes ?? 0, - round, - candle: event.payload.candle, - versions: event.payload.versions, - }); - } - else if (event.type === 'candle.append') { - this.send(client, { - type: 'candle.append', - intervalMinutes: intervalMinutes ?? 0, - candle: event.payload.candle ?? {}, - }); - } - else if (event.type === 'config.updated') { - this.send(client, { - type: 'config.updated', - intervalMinutes: intervalMinutes ?? 0, - versions: event.payload.versions, - }); - } + catch (e) { + // Never let a bad pub/sub payload crash the WS process (nginx 502 otherwise). + console.error('[ws] redis pmessage handler failed:', e instanceof Error ? e.message : e, { + channel, + }); } }); await sub.psubscribe('prediqo:pubsub:cp:round:*'); await sub.psubscribe(`${USER_CHANNEL_PREFIX}*`); console.log('[ws] Subscribed to Redis round + user channels'); } + dispatchRedisMessage(channel, message) { + const event = (0, pubsub_1.parseRealtimeEvent)(message); + if (!event) + return; + const payload = event.payload ?? {}; + if (channel.startsWith(USER_CHANNEL_PREFIX)) { + const userId = channel.slice(USER_CHANNEL_PREFIX.length); + for (const client of this.clients) { + if (client.auth?.userId !== userId) + continue; + if (event.type === 'bet.accepted') { + const idempotencyKey = String(payload.idempotencyKey ?? '').trim(); + this.send(client, { + type: 'bet.accepted', + bet: payload.bet ?? {}, + ...(idempotencyKey ? { idempotencyKey } : {}), + versions: payload.versions, + }); + } + else if (event.type === 'bet.rejected') { + const idempotencyKey = String(payload.idempotencyKey ?? '').trim(); + this.send(client, { + type: 'bet.rejected', + idempotencyKey, + error: String(payload.error ?? 'Bet rejected'), + }); + } + else if (event.type === 'multi.updated') { + this.send(client, { + type: 'multi.updated', + intervalMinutes: Number(payload.intervalMinutes ?? 0), + userMultiBet: payload.userMultiBet ?? null, + versions: payload.versions, + }); + } + else if (event.type === 'auto.updated') { + this.send(client, { + type: 'auto.updated', + autoSettings: payload.autoSettings ?? {}, + versions: payload.versions, + }); + } + } + return; + } + const intervalMatch = channel.match(/round:(\d+)m$/); + const intervalMinutes = intervalMatch ? Number(intervalMatch[1]) : event.intervalMinutes; + const pools = payload.pools; + const baseRound = payload.round ?? {}; + for (const client of this.clients) { + if (intervalMinutes != null && !client.intervals.has(intervalMinutes)) + continue; + const isAdmin = client.auth ? (0, roleAccess_1.hasAdminAccess)({ role: client.auth.role }) : false; + const round = enrichRoundPayload(baseRound, pools, isAdmin); + if (event.type === 'round.updated') { + this.send(client, { + type: 'round.updated', + intervalMinutes: intervalMinutes ?? 0, + round, + versions: payload.versions, + }); + } + else if (event.type === 'round.settled') { + this.send(client, { + type: 'round.settled', + intervalMinutes: intervalMinutes ?? 0, + round, + candle: payload.candle, + versions: payload.versions, + }); + } + else if (event.type === 'candle.append') { + this.send(client, { + type: 'candle.append', + intervalMinutes: intervalMinutes ?? 0, + candle: payload.candle ?? {}, + }); + } + else if (event.type === 'config.updated') { + this.send(client, { + type: 'config.updated', + intervalMinutes: intervalMinutes ?? 0, + versions: payload.versions, + }); + } + } + } register(socket, auth) { const state = { socket, auth, intervals: new Set() }; this.clients.add(state); diff --git a/backend/dist/realtime/ws/hub.js.map b/backend/dist/realtime/ws/hub.js.map index 13b71b8d..070bdc57 100644 --- a/backend/dist/realtime/ws/hub.js.map +++ b/backend/dist/realtime/ws/hub.js.map @@ -1 +1 @@ -{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../../src/realtime/ws/hub.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../../src/realtime/ws/hub.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/backend/src/realtime/redis/pubsub.ts b/backend/src/realtime/redis/pubsub.ts index 9fdcbb39..188f14c6 100644 --- a/backend/src/realtime/redis/pubsub.ts +++ b/backend/src/realtime/redis/pubsub.ts @@ -25,9 +25,19 @@ export function serializeRealtimeEvent(event: Omit & { ts?: export function parseRealtimeEvent(raw: string): RealtimeEvent | null { try { - const parsed = JSON.parse(raw) as RealtimeEvent; - if (!parsed?.type) return null; - return parsed; + const parsed = JSON.parse(raw) as Partial; + if (!parsed?.type || typeof parsed.type !== 'string') return null; + const payload = + parsed.payload && typeof parsed.payload === 'object' && !Array.isArray(parsed.payload) + ? (parsed.payload as Record) + : {}; + return { + type: parsed.type as RealtimeEventType, + intervalMinutes: parsed.intervalMinutes, + payload, + version: parsed.version, + ts: typeof parsed.ts === 'number' ? parsed.ts : Date.now(), + }; } catch { return null; } diff --git a/backend/src/realtime/ws/hub.ts b/backend/src/realtime/ws/hub.ts index 538abba5..d280bb2b 100644 --- a/backend/src/realtime/ws/hub.ts +++ b/backend/src/realtime/ws/hub.ts @@ -90,86 +90,13 @@ export class GameWsHub { if (!sub) return; sub.on('pmessage', (_pattern, channel, message) => { - const event = parseRealtimeEvent(message); - if (!event) return; - - if (channel.startsWith(USER_CHANNEL_PREFIX)) { - const userId = channel.slice(USER_CHANNEL_PREFIX.length); - for (const client of this.clients) { - if (client.auth?.userId !== userId) continue; - if (event.type === 'bet.accepted') { - const idempotencyKey = String(event.payload.idempotencyKey ?? '').trim(); - this.send(client, { - type: 'bet.accepted', - bet: (event.payload.bet as Record) ?? {}, - ...(idempotencyKey ? { idempotencyKey } : {}), - versions: event.payload.versions as { bet?: number; auto?: number } | undefined, - }); - } else if (event.type === 'bet.rejected') { - const idempotencyKey = String(event.payload.idempotencyKey ?? '').trim(); - this.send(client, { - type: 'bet.rejected', - idempotencyKey, - error: String(event.payload.error ?? 'Bet rejected'), - }); - } else if (event.type === 'multi.updated') { - this.send(client, { - type: 'multi.updated', - intervalMinutes: Number(event.payload.intervalMinutes ?? 0), - userMultiBet: - (event.payload.userMultiBet as Record | null | undefined) ?? null, - versions: event.payload.versions as { bet?: number } | undefined, - }); - } else if (event.type === 'auto.updated') { - this.send(client, { - type: 'auto.updated', - autoSettings: (event.payload.autoSettings as Record) ?? {}, - versions: event.payload.versions as { auto?: number } | undefined, - }); - } - } - return; - } - - const intervalMatch = channel.match(/round:(\d+)m$/); - const intervalMinutes = intervalMatch ? Number(intervalMatch[1]) : event.intervalMinutes; - - const pools = event.payload.pools as { short?: number; long?: number } | undefined; - const baseRound = (event.payload.round as Record) ?? {}; - - for (const client of this.clients) { - if (intervalMinutes != null && !client.intervals.has(intervalMinutes)) continue; - const isAdmin = client.auth ? hasAdminAccess({ role: client.auth.role }) : false; - const round = enrichRoundPayload(baseRound, pools, isAdmin); - - if (event.type === 'round.updated') { - this.send(client, { - type: 'round.updated', - intervalMinutes: intervalMinutes ?? 0, - round, - versions: event.payload.versions as { round?: number } | undefined, - }); - } else if (event.type === 'round.settled') { - this.send(client, { - type: 'round.settled', - intervalMinutes: intervalMinutes ?? 0, - round, - candle: event.payload.candle as Record | undefined, - versions: event.payload.versions as { round?: number } | undefined, - }); - } else if (event.type === 'candle.append') { - this.send(client, { - type: 'candle.append', - intervalMinutes: intervalMinutes ?? 0, - candle: (event.payload.candle as Record) ?? {}, - }); - } else if (event.type === 'config.updated') { - this.send(client, { - type: 'config.updated', - intervalMinutes: intervalMinutes ?? 0, - versions: event.payload.versions as { config?: number } | undefined, - }); - } + try { + this.dispatchRedisMessage(channel, message); + } catch (e) { + // Never let a bad pub/sub payload crash the WS process (nginx 502 otherwise). + console.error('[ws] redis pmessage handler failed:', e instanceof Error ? e.message : e, { + channel, + }); } }); @@ -179,6 +106,91 @@ export class GameWsHub { console.log('[ws] Subscribed to Redis round + user channels'); } + private dispatchRedisMessage(channel: string, message: string): void { + const event = parseRealtimeEvent(message); + if (!event) return; + const payload = event.payload ?? {}; + + if (channel.startsWith(USER_CHANNEL_PREFIX)) { + const userId = channel.slice(USER_CHANNEL_PREFIX.length); + for (const client of this.clients) { + if (client.auth?.userId !== userId) continue; + if (event.type === 'bet.accepted') { + const idempotencyKey = String(payload.idempotencyKey ?? '').trim(); + this.send(client, { + type: 'bet.accepted', + bet: (payload.bet as Record) ?? {}, + ...(idempotencyKey ? { idempotencyKey } : {}), + versions: payload.versions as { bet?: number; auto?: number } | undefined, + }); + } else if (event.type === 'bet.rejected') { + const idempotencyKey = String(payload.idempotencyKey ?? '').trim(); + this.send(client, { + type: 'bet.rejected', + idempotencyKey, + error: String(payload.error ?? 'Bet rejected'), + }); + } else if (event.type === 'multi.updated') { + this.send(client, { + type: 'multi.updated', + intervalMinutes: Number(payload.intervalMinutes ?? 0), + userMultiBet: + (payload.userMultiBet as Record | null | undefined) ?? null, + versions: payload.versions as { bet?: number } | undefined, + }); + } else if (event.type === 'auto.updated') { + this.send(client, { + type: 'auto.updated', + autoSettings: (payload.autoSettings as Record) ?? {}, + versions: payload.versions as { auto?: number } | undefined, + }); + } + } + return; + } + + const intervalMatch = channel.match(/round:(\d+)m$/); + const intervalMinutes = intervalMatch ? Number(intervalMatch[1]) : event.intervalMinutes; + + const pools = payload.pools as { short?: number; long?: number } | undefined; + const baseRound = (payload.round as Record) ?? {}; + + for (const client of this.clients) { + if (intervalMinutes != null && !client.intervals.has(intervalMinutes)) continue; + const isAdmin = client.auth ? hasAdminAccess({ role: client.auth.role }) : false; + const round = enrichRoundPayload(baseRound, pools, isAdmin); + + if (event.type === 'round.updated') { + this.send(client, { + type: 'round.updated', + intervalMinutes: intervalMinutes ?? 0, + round, + versions: payload.versions as { round?: number } | undefined, + }); + } else if (event.type === 'round.settled') { + this.send(client, { + type: 'round.settled', + intervalMinutes: intervalMinutes ?? 0, + round, + candle: payload.candle as Record | undefined, + versions: payload.versions as { round?: number } | undefined, + }); + } else if (event.type === 'candle.append') { + this.send(client, { + type: 'candle.append', + intervalMinutes: intervalMinutes ?? 0, + candle: (payload.candle as Record) ?? {}, + }); + } else if (event.type === 'config.updated') { + this.send(client, { + type: 'config.updated', + intervalMinutes: intervalMinutes ?? 0, + versions: payload.versions as { config?: number } | undefined, + }); + } + } + } + register(socket: WebSocket, auth: WsAuthContext | null): void { const state: ClientState = { socket, auth, intervals: new Set() }; this.clients.add(state); diff --git a/backend/src/tests/redisRealtime.test.ts b/backend/src/tests/redisRealtime.test.ts index 0fc9fb7d..0aefdafb 100644 --- a/backend/src/tests/redisRealtime.test.ts +++ b/backend/src/tests/redisRealtime.test.ts @@ -74,4 +74,13 @@ describe('pubsub serialization', () => { const parsed = parseRealtimeEvent(raw); assert.deepEqual(parsed, event); }); + + test('normalizes missing payload to empty object (avoids WS crash)', () => { + const parsed = parseRealtimeEvent( + JSON.stringify({ type: 'round.updated', intervalMinutes: 1, ts: 1 }) + ); + assert.ok(parsed); + assert.equal(parsed!.type, 'round.updated'); + assert.deepEqual(parsed!.payload, {}); + }); });