Starting to resolve the issue on prediction7

This commit is contained in:
Your Name 2026-10-26 17:24:38 +02:00
parent dacf35f8e2
commit 6822786da5
10 changed files with 224 additions and 171 deletions

View File

@ -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"}
{"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"}

View File

@ -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;

View File

@ -1 +1 @@
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../../src/realtime/redis/pubsub.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../../src/realtime/redis/pubsub.ts"],"names":[],"mappings":"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"}

View File

@ -7,6 +7,7 @@ export declare class GameWsHub {
private trackClient;
private untrackClient;
start(): Promise<void>;
private dispatchRedisMessage;
register(socket: WebSocket, auth: WsAuthContext | null): void;
private handleMessage;
private send;

View File

@ -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"}
{"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"}

View File

@ -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);

File diff suppressed because one or more lines are too long

View File

@ -25,9 +25,19 @@ export function serializeRealtimeEvent(event: Omit<RealtimeEvent, 'ts'> & { 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<RealtimeEvent>;
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<string, unknown>)
: {};
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;
}

View File

@ -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<string, unknown>) ?? {},
...(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<string, unknown> | 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<string, unknown>) ?? {},
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<string, unknown>) ?? {};
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<string, unknown> | 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<string, unknown>) ?? {},
});
} 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<string, unknown>) ?? {},
...(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<string, unknown> | 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<string, unknown>) ?? {},
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<string, unknown>) ?? {};
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<string, unknown> | 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<string, unknown>) ?? {},
});
} 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);

View File

@ -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, {});
});
});