* refactor(schema): rename per-window tables to season_* prefix Renames participants, participant_expected_values, participant_qualifying_totals, participant_results, participant_surface_elos to season_* prefixed names. Renames event_results.participant_id to season_participant_id. Phase 1a of canonical tournament layer migration. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor: rename participant.ts model file to season-participant.ts Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(models): update model layer to use renamed schema exports Updated all model files to use the renamed schema exports from Task 1: - participants → seasonParticipants - participantExpectedValues → seasonParticipantExpectedValues - participantQualifyingTotals → seasonParticipantQualifyingTotals - participantResults → seasonParticipantResults - participantSurfaceElos → seasonParticipantSurfaceElos - eventResults.participantId → eventResults.seasonParticipantId - db.query relation accessors updated - Relation field .participant → .seasonParticipant where applicable - Import paths updated: ./participant → ./season-participant Files updated (14 model files + 3 test files): - draft-pick.ts - draft-utils.ts - event-result.ts - group-stage-match.ts - participant-result.ts - qualifying-points.ts - scoring-calculator.ts - scoring-event.ts - sports-season.ts - surface-elo.ts - team-score-events.ts - cs2-major-stage.ts - golf-skills.ts - participant-expected-value.ts - __tests__/sports-season.clone.test.ts - __tests__/auto-pick.test.ts - __tests__/executeAutoPick.timer.test.ts Typecheck errors decreased: 779 → 499 (280 fewer) All model file errors related to renamed schemas resolved. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(routes): update route layer to use renamed schema exports - Update model import from ~/models/participant to ~/models/season-participant - Rename schema.participants to schema.seasonParticipants - Rename schema.participantResults to schema.seasonParticipantResults - Rename db.query.participants to db.query.seasonParticipants - Update 9 route files and 1 test file Affected files: - admin.sports-seasons.$id.events.$eventId.bracket.server.ts - admin.sports-seasons.$id.participants.tsx - api/draft.force-manual-pick.ts - api/draft.make-pick.ts - api/draft.replace-pick.ts - api/seasons.$seasonId.draft.ts - leagues/$leagueId.draft-board.$seasonId.tsx - leagues/$leagueId.sports-seasons.$sportsSeasonId.server.ts - admin/__tests__/sports-seasons-participants.test.ts Error count reduced from 499 to 453 (46 errors fixed). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(routes): update route files for schema rename Update route imports from ~/models/participant to ~/models/season-participant and fix references to .participant/.participantId on event results to use .seasonParticipant/.seasonParticipantId after schema rename. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(services): update simulators and services for renamed schema Update all simulators, services, and server files to use renamed schema tables: - participants → seasonParticipants - participantExpectedValues → seasonParticipantExpectedValues - participantResults → seasonParticipantResults - eventResults.participantId → eventResults.seasonParticipantId Files updated: - 20 sport simulators (NBA, NHL, NFL, MLB, etc.) - probability-updater.ts - standings-sync/index.ts - sports-data-sync.server.ts - server/socket.ts Typecheck errors reduced from 365 to 0. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * migration: rename per-window tables to season_* prefix * fix(tests): update mock query keys after participants table rename Change mock db.query.participants to db.query.seasonParticipants in test files to match the schema rename from commit66145a9. This fixes "Cannot read properties of undefined (reading 'findFirst'/'findMany')" errors that occurred when production code queries db.query.seasonParticipants but test mocks only defined the old participants key. Files updated: - app/services/simulations/__tests__/world-cup-simulator.test.ts - app/routes/api/__tests__/draft.force-manual-pick.test.ts - app/routes/api/__tests__/draft.force-manual-pick.timer-mode.test.ts - app/routes/api/__tests__/draft.make-pick.timer-mode.test.ts - server/__tests__/timer-autodraft.test.ts - app/models/__tests__/team-score-events.test.ts Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(tests): update remaining mock paths and keys after schema rename * fix(tests): final two mock stragglers after schema rename - draft-pick.test.ts: assertion on db.query.participantQualifyingTotals - process-match-result.test.ts: mock key participants → seasonParticipants Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * chore: add post-phase1a baseline capture (temp, for diff verification) * chore: capture pre-migration baselines * chore: remove post-phase1a capture helper after verification * schema: add canonical tournament & participant tables Adds tournaments, participants (canonical), tournament_results, and participant_surface_elos (canonical). Adds nullable tournament_id to scoring_events and nullable participant_id to season_participants. Phase 1b of canonical tournament layer migration. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * feat(models): add canonical tournament, participant, result, surface-elo models Adds CRUD modules for the canonical tables created in commit775b905. Each module mirrors existing app/models conventions (database() from ~/database/context, schema from ~/database/schema, mock-based tests). Key implementation notes: - participant.ts exports use "Canonical" prefix (CanonicalParticipant, createCanonicalParticipant, etc.) to avoid collision with existing season-participant.ts exports - All four models include comprehensive unit tests following the audit-log.test.ts pattern - Tests use mocked db responses (no real database access) - Upsert functions use onConflictDoUpdate for appropriate unique constraints Part of Phase 1b of canonical tournament layer migration. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * migration: create canonical tables, add nullable FKs * scripts: add extractTournamentIdentity helper for backfill Pure function that derives canonical (name, year) identity from a scoring_events row, stripping trailing 4-digit years from the name or falling back to eventDate. Used by the Phase 2 backfill to group per-window events into canonical tournaments. * scripts: add backfill orchestrator for canonical layer Populates canonical tournaments, participants, tournament_results, and participant_surface_elos from per-window data for qualifying-points sports. Skips already-linked rows, is idempotent, and supports dry-run mode. Critical invariants enforced by the implementation: - qualifying_points_awarded is never copied to tournament_results - season_participant_qualifying_totals is never touched - conflicting surface-Elo values between windows raise a loud error (recorded in report.errors) rather than overwriting * scripts: add backfill CLI with dry-run default Wires backfill-canonical-layer.ts to a CLI entry point exposed as `npm run backfill:canonical`. Defaults to --dry-run; requires --apply to actually write. Supports --sport=<uuid> to limit to a single sport. Exits 2 if the backfill reports errors (e.g., surface-Elo conflicts). * fix(backfill-cli): wrap runBackfill in DatabaseContext.run The orchestrator uses database() from ~/database/context, which requires AsyncLocalStorage to be populated. Wrap the CLI invocation with DatabaseContext.run(db, ...) using server/db's cached connection pool. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(backfill-cli): exit 0 on success so pg pool doesn't block The cached postgres connection pool keeps the Node event loop open after main() returns. Explicit process.exit(0) on success mirrors the pattern in scripts/capture-baseline.ts. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> --------- Co-authored-by: Chris Parsons <chrisp@extrahop.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
389 lines
14 KiB
TypeScript
389 lines
14 KiB
TypeScript
import type { Socket } from "socket.io";
|
|
import { Server as SocketIOServer } from "socket.io";
|
|
import type { Server as HTTPServer } from "http";
|
|
import * as schema from "~/database/schema";
|
|
import { eq, and, asc } from "drizzle-orm";
|
|
import { logger } from "./logger";
|
|
import { db } from "./db";
|
|
|
|
// Socket event types
|
|
interface ServerToClientEvents {
|
|
"test-message": (data: {
|
|
originalMessage: unknown;
|
|
serverResponse: string;
|
|
serverTimestamp: string;
|
|
socketId: string;
|
|
}) => void;
|
|
"pick-made": (data: unknown) => void;
|
|
"draft-started": (data: { seasonId: string; currentPickNumber: number }) => void;
|
|
"draft-completed": () => void;
|
|
"draft-room-closed": () => void;
|
|
"timer-update": (data: {
|
|
seasonId: string;
|
|
teamId: string;
|
|
timeRemaining: number;
|
|
currentPickNumber: number;
|
|
}) => void;
|
|
"autodraft-updated": (data: {
|
|
teamId: string;
|
|
isEnabled: boolean;
|
|
mode: "next_pick" | "while_on";
|
|
queueOnly: boolean;
|
|
source?: "commissioner" | "user";
|
|
}) => void;
|
|
"team-connected": (data: { teamId: string }) => void;
|
|
"team-disconnected": (data: { teamId: string }) => void;
|
|
"connected-teams-list": (data: { teamIds: string[] }) => void;
|
|
"draft-paused": (data: { seasonId: string; paused: boolean }) => void;
|
|
"draft-resumed": (data: { seasonId: string; paused: boolean }) => void;
|
|
"participant-removed-from-queues": (data: { participantId: string }) => void;
|
|
"queue-updated": (data: { queue: Array<{ id: string; teamId: string; seasonId: string; participantId: string; queuePosition: number }> }) => void;
|
|
"watchlist-updated": (data: { participantIds: string[] }) => void;
|
|
"draft-state-sync": (data: {
|
|
currentPickNumber: number;
|
|
isPaused: boolean;
|
|
status: string;
|
|
picks: Array<{
|
|
id: string;
|
|
pickNumber: number;
|
|
round: number;
|
|
pickInRound: number;
|
|
timeUsed: number;
|
|
team: unknown;
|
|
participant: unknown;
|
|
sport: unknown;
|
|
}>;
|
|
timers: Array<{
|
|
teamId: string;
|
|
timeRemaining: number;
|
|
}>;
|
|
queue?: Array<{
|
|
id: string;
|
|
teamId: string;
|
|
seasonId: string;
|
|
participantId: string;
|
|
queuePosition: number;
|
|
}>;
|
|
watchlistParticipantIds?: string[];
|
|
}) => void;
|
|
}
|
|
|
|
interface ClientToServerEvents {
|
|
"join-draft": (seasonId: string, teamId?: string) => void;
|
|
"leave-draft": (seasonId: string) => void;
|
|
"test-event": (data: unknown) => void;
|
|
}
|
|
|
|
// Global type augmentation
|
|
declare global {
|
|
var __socketIO: SocketIOServer | undefined;
|
|
}
|
|
|
|
let io: SocketIOServer<ClientToServerEvents, ServerToClientEvents> | null = null;
|
|
|
|
function scheduleDraftRoomClosure(seasonId: string) {
|
|
if (draftRoomClosureTimers.has(seasonId)) return;
|
|
|
|
const timeout = setTimeout(() => {
|
|
logger.log(`[Socket] Draft room closure: emitting draft-room-closed for ${seasonId}`);
|
|
io?.to(`draft-${seasonId}`).emit("draft-room-closed");
|
|
draftRoomClosureTimers.delete(seasonId);
|
|
}, ROOM_CLOSURE_DELAY_MS);
|
|
|
|
draftRoomClosureTimers.set(seasonId, timeout);
|
|
}
|
|
|
|
export { scheduleDraftRoomClosure };
|
|
|
|
// Track connected teams per season (in-memory, single-instance only).
|
|
// If the server restarts or runs as multiple instances this map resets.
|
|
// For multi-instance deployments, replace with a Redis-backed Socket.IO adapter.
|
|
const connectedTeams = new Map<string, Set<string>>(); // seasonId -> Set<teamId>
|
|
|
|
const ROOM_CLOSURE_DELAY_MS = 5 * 60 * 1000; // 5 minutes
|
|
const draftRoomClosureTimers = new Map<string, NodeJS.Timeout>(); // seasonId -> timeout
|
|
|
|
/**
|
|
* Initialize Socket.IO server
|
|
*/
|
|
export function initializeSocketIO(httpServer: HTTPServer): SocketIOServer {
|
|
if (io) {
|
|
logger.log("Socket.IO already initialized");
|
|
return io;
|
|
}
|
|
|
|
// Create typed Socket.IO server
|
|
io = new SocketIOServer<ClientToServerEvents, ServerToClientEvents>(httpServer, {
|
|
// Faster dead-connection detection than the defaults (20s/25s).
|
|
// pingTimeout: how long to wait for a pong before declaring the connection dead.
|
|
// pingInterval: how often to send a ping.
|
|
// Together these detect a crashed server in ~15s instead of ~45s.
|
|
// Trade-off: more heartbeat traffic at scale; revisit if server load becomes a concern.
|
|
pingTimeout: 5000,
|
|
pingInterval: 10000,
|
|
cors: process.env.NODE_ENV === "production" && process.env.APP_URL
|
|
? {
|
|
origin: process.env.APP_URL,
|
|
credentials: true,
|
|
}
|
|
: undefined,
|
|
});
|
|
|
|
// Connection handling
|
|
io.on("connection", (socket: Socket<ClientToServerEvents, ServerToClientEvents>) => {
|
|
logger.log("Client connected:", socket.id);
|
|
|
|
// Store team ID for this socket
|
|
let currentTeamId: string | undefined;
|
|
let currentSeasonId: string | undefined;
|
|
|
|
socket.on("join-draft", async (seasonId: string, teamId?: string) => {
|
|
if (!seasonId) {
|
|
logger.error("No seasonId provided for join-draft");
|
|
return;
|
|
}
|
|
|
|
try {
|
|
const seasonData = await db.query.seasons.findFirst({
|
|
where: eq(schema.seasons.id, seasonId),
|
|
columns: { id: true, status: true, draftCompletedAt: true },
|
|
});
|
|
|
|
if (seasonData?.draftCompletedAt) {
|
|
const elapsed = Date.now() - seasonData.draftCompletedAt.getTime();
|
|
if (elapsed >= ROOM_CLOSURE_DELAY_MS) {
|
|
socket.emit("draft-room-closed");
|
|
logger.log(`[Socket] join-draft rejected for ${seasonId}: room closed (completed ${Math.round(elapsed / 60000)}m ago)`);
|
|
return;
|
|
}
|
|
|
|
if (!draftRoomClosureTimers.has(seasonId)) {
|
|
const remaining = ROOM_CLOSURE_DELAY_MS - elapsed;
|
|
const timeout = setTimeout(() => {
|
|
logger.log(`[Socket] Draft room closure: emitting draft-room-closed for ${seasonId}`);
|
|
io?.to(`draft-${seasonId}`).emit("draft-room-closed");
|
|
draftRoomClosureTimers.delete(seasonId);
|
|
}, remaining);
|
|
draftRoomClosureTimers.set(seasonId, timeout);
|
|
}
|
|
}
|
|
} catch (err) {
|
|
logger.error("[Socket] join-draft room-closure check failed:", err);
|
|
}
|
|
|
|
socket.join(`draft-${seasonId}`);
|
|
currentSeasonId = seasonId;
|
|
logger.log(`Socket ${socket.id} joined draft-${seasonId}`);
|
|
|
|
// If teamId provided, validate it belongs to this season before tracking
|
|
if (teamId) {
|
|
try {
|
|
const team = await db.query.teams.findFirst({
|
|
where: and(eq(schema.teams.id, teamId), eq(schema.teams.seasonId, seasonId)),
|
|
});
|
|
if (!team) {
|
|
logger.warn(`[Socket] join-draft rejected: team ${teamId} does not belong to season ${seasonId}`);
|
|
return;
|
|
}
|
|
} catch (err) {
|
|
logger.error("[Socket] join-draft team validation failed:", err);
|
|
return;
|
|
}
|
|
|
|
currentTeamId = teamId;
|
|
socket.join(`team-${teamId}`);
|
|
|
|
// Initialize the season's connected teams set if it doesn't exist
|
|
if (!connectedTeams.has(seasonId)) {
|
|
connectedTeams.set(seasonId, new Set());
|
|
}
|
|
|
|
// Get current connected teams for this season
|
|
const seasonConnectedTeams = connectedTeams.get(seasonId) ?? new Set<string>();
|
|
if (!connectedTeams.has(seasonId)) connectedTeams.set(seasonId, seasonConnectedTeams);
|
|
|
|
// Send the list of already-connected teams to this socket
|
|
socket.emit("connected-teams-list", { teamIds: Array.from(seasonConnectedTeams) });
|
|
|
|
// Add this team to the connected teams set
|
|
seasonConnectedTeams.add(teamId);
|
|
|
|
// Broadcast to everyone else that this team connected
|
|
io?.to(`draft-${seasonId}`).emit("team-connected", { teamId });
|
|
logger.log(`Team ${teamId} connected to draft-${seasonId}. Total connected: ${seasonConnectedTeams.size}`);
|
|
}
|
|
|
|
// Send full draft state to the joining client so it can sync immediately.
|
|
// This is critical for mobile reconnection: the client may have been in the
|
|
// background for minutes/hours and missed many picks. The revalidate() path
|
|
// (HTTP loader re-fetch) covers this too, but it can fail due to expired auth
|
|
// tokens or flaky mobile networks. This socket-based sync provides an
|
|
// additional, more reliable path since the socket is already connected.
|
|
try {
|
|
const [seasonData, picks, timerRows, queueItems, watchlistItems] = await Promise.all([
|
|
db.query.seasons.findFirst({
|
|
where: eq(schema.seasons.id, seasonId),
|
|
}),
|
|
db
|
|
.select({
|
|
id: schema.draftPicks.id,
|
|
pickNumber: schema.draftPicks.pickNumber,
|
|
round: schema.draftPicks.round,
|
|
pickInRound: schema.draftPicks.pickInRound,
|
|
timeUsed: schema.draftPicks.timeUsed,
|
|
team: schema.teams,
|
|
participant: schema.seasonParticipants,
|
|
sport: schema.sports,
|
|
})
|
|
.from(schema.draftPicks)
|
|
.innerJoin(schema.teams, eq(schema.draftPicks.teamId, schema.teams.id))
|
|
.innerJoin(
|
|
schema.seasonParticipants,
|
|
eq(schema.draftPicks.participantId, schema.seasonParticipants.id)
|
|
)
|
|
.innerJoin(
|
|
schema.sportsSeasons,
|
|
eq(schema.seasonParticipants.sportsSeasonId, schema.sportsSeasons.id)
|
|
)
|
|
.innerJoin(
|
|
schema.sports,
|
|
eq(schema.sportsSeasons.sportId, schema.sports.id)
|
|
)
|
|
.where(eq(schema.draftPicks.seasonId, seasonId))
|
|
.orderBy(asc(schema.draftPicks.pickNumber)),
|
|
db.query.draftTimers.findMany({
|
|
where: eq(schema.draftTimers.seasonId, seasonId),
|
|
}),
|
|
teamId
|
|
? db.query.draftQueue.findMany({
|
|
where: and(
|
|
eq(schema.draftQueue.teamId, teamId),
|
|
eq(schema.draftQueue.seasonId, seasonId)
|
|
),
|
|
orderBy: asc(schema.draftQueue.queuePosition),
|
|
})
|
|
: Promise.resolve([]),
|
|
teamId
|
|
? db.query.watchlist.findMany({
|
|
where: and(
|
|
eq(schema.watchlist.teamId, teamId),
|
|
eq(schema.watchlist.seasonId, seasonId)
|
|
),
|
|
})
|
|
: Promise.resolve([]),
|
|
]);
|
|
|
|
if (seasonData) {
|
|
socket.emit("draft-state-sync", {
|
|
currentPickNumber: seasonData.currentPickNumber || 1,
|
|
isPaused: seasonData.draftPaused || false,
|
|
status: seasonData.status,
|
|
picks,
|
|
timers: timerRows.map((t) => ({
|
|
teamId: t.teamId,
|
|
timeRemaining: t.timeRemaining,
|
|
})),
|
|
queue: teamId ? queueItems : undefined,
|
|
watchlistParticipantIds: teamId ? watchlistItems.map((w) => w.participantId) : undefined,
|
|
});
|
|
}
|
|
} catch (err) {
|
|
logger.error("[Socket] draft-state-sync query failed:", err);
|
|
// Non-fatal — the client will fall back to HTTP revalidation
|
|
}
|
|
});
|
|
|
|
socket.on("leave-draft", (seasonId: string) => {
|
|
if (!seasonId) return;
|
|
socket.leave(`draft-${seasonId}`);
|
|
logger.log(`Socket ${socket.id} left draft-${seasonId}`);
|
|
|
|
// Emit disconnection event if team was tracked
|
|
if (currentTeamId) {
|
|
socket.leave(`team-${currentTeamId}`);
|
|
|
|
// Remove team from connected teams tracking
|
|
const seasonConnectedTeams = connectedTeams.get(seasonId);
|
|
if (seasonConnectedTeams) {
|
|
seasonConnectedTeams.delete(currentTeamId);
|
|
logger.log(`Team ${currentTeamId} removed from tracking. Remaining: ${seasonConnectedTeams.size}`);
|
|
|
|
// Clean up empty sets
|
|
if (seasonConnectedTeams.size === 0) {
|
|
connectedTeams.delete(seasonId);
|
|
}
|
|
}
|
|
|
|
io?.to(`draft-${seasonId}`).emit("team-disconnected", { teamId: currentTeamId });
|
|
logger.log(`Team ${currentTeamId} disconnected from draft-${seasonId}`);
|
|
}
|
|
});
|
|
|
|
socket.on("test-event", (data: unknown) => {
|
|
logger.log("📨 Received test-event from client:", socket.id, data);
|
|
|
|
socket.emit("test-message", {
|
|
originalMessage: data,
|
|
serverResponse: "Hello from server!",
|
|
serverTimestamp: new Date().toISOString(),
|
|
socketId: socket.id,
|
|
});
|
|
|
|
logger.log("✅ Sent test-message response to client:", socket.id);
|
|
});
|
|
|
|
socket.on("disconnect", () => {
|
|
logger.log("Client disconnected:", socket.id);
|
|
|
|
// Emit disconnection event if team was tracked
|
|
if (currentTeamId && currentSeasonId) {
|
|
// Remove team from connected teams tracking
|
|
const seasonConnectedTeams = connectedTeams.get(currentSeasonId);
|
|
if (seasonConnectedTeams) {
|
|
seasonConnectedTeams.delete(currentTeamId);
|
|
logger.log(`Team ${currentTeamId} removed from tracking on disconnect. Remaining: ${seasonConnectedTeams.size}`);
|
|
|
|
// Clean up empty sets
|
|
if (seasonConnectedTeams.size === 0) {
|
|
connectedTeams.delete(currentSeasonId);
|
|
}
|
|
}
|
|
|
|
io?.to(`draft-${currentSeasonId}`).emit("team-disconnected", { teamId: currentTeamId });
|
|
logger.log(`Team ${currentTeamId} disconnected from draft-${currentSeasonId}`);
|
|
}
|
|
});
|
|
});
|
|
|
|
// Store globally for route handlers
|
|
global.__socketIO = io;
|
|
|
|
logger.log("Socket.IO initialized");
|
|
|
|
// Start the draft timer system (async import but don't await)
|
|
import("./timer").then(({ startDraftTimerSystem }) => {
|
|
startDraftTimerSystem();
|
|
}).catch((error) => {
|
|
logger.error("Failed to start timer system:", error);
|
|
});
|
|
|
|
// Start the daily snapshot system
|
|
import("./snapshots").then(({ startSnapshotSystem }) => {
|
|
startSnapshotSystem();
|
|
}).catch((error) => {
|
|
logger.error("Failed to start snapshot system:", error);
|
|
});
|
|
|
|
return io;
|
|
}
|
|
|
|
/**
|
|
* Get the Socket.IO server instance
|
|
*/
|
|
export function getSocketIO(): SocketIOServer {
|
|
const instance = io || global.__socketIO;
|
|
if (!instance) {
|
|
throw new Error("Socket.IO not initialized. Call initializeSocketIO first.");
|
|
}
|
|
return instance;
|
|
}
|