## Summary - **Timer bank broadcasts**: emit `timer-bank-updated` after every pick so all clients immediately see the updated bank instead of waiting for the next `timer-pick-started` - **Increment accuracy**: capture `pickMadeAt` at route entry (before auth/DB overhead) and use `Math.ceil` so credited seconds always match the client countdown display - **Race condition fix**: hold `schedulingInProgress` lock for the full timer callback to prevent the recovery interval from scheduling a duplicate timeout mid-pick - **force-autopick fix**: call `rescheduleTimer` so the next team's clock starts immediately instead of waiting for the old timeout to naturally expire - **adjust-time-bank fix**: for on-clock teams, shift `picksExpiresAt` by the adjustment and reschedule so the client countdown updates; block adjustments that would reduce the bank to zero - **New socket events**: `timer-pick-started`, `timer-overnight-paused`, `timer-bank-updated` with full type definitions; removed dead `timer-update` event - **Reconnect sync**: `draft-state-sync` now includes `expiresAt` for the active timer and `isOvernightPause` state so reconnecting clients see accurate countdown and pause banner immediately without a page reload - **Room closure countdown**: capture client-side timestamp when draft completes so the "Room closes in X" countdown actually ticks down before the loader revalidates with `draftCompletedAt` - **Countdown interval**: run at 500ms with `Math.ceil` to prevent skipped seconds under event loop pressure - **Overnight pause UX**: `canPick` only blocks on commissioner pause — overnight pause freezes the timer but the on-clock player can still pick early - **Overnight pause refactor**: extract `checkOvernightPause` to `server/overnight-pause-check.ts`, breaking the `timer↔socket` circular import and sharing the timezone cache across both callers with correct eviction - **PostgreSQL type fix**: cast `varchar` owner ID to `uuid` in `getTeamTimezone` join ## Test plan - [ ] Manual pick: all clients see bank increment immediately after pick - [ ] Timeout pick: all clients see bank update (0 → increment); next clock starts within ~1s - [ ] Force-autopick: next team's clock starts immediately; no "Pick already made" log - [ ] Force-manual-pick: all clients see bank increment - [ ] Pause while clock running: countdown freezes on all clients - [ ] Resume: clock continues from frozen value - [ ] adjust-time-bank on on-clock team: countdown shifts immediately - [ ] adjust-time-bank to zero: returns 400 error - [ ] Reconnect (socket disconnect/connect): countdown resumes for correct team - [ ] Hard refresh mid-draft: on-clock indicator and countdown correct immediately - [ ] Draft complete: "Room closes in X" counts down - [ ] Overnight pause: banner shows, pick buttons still enabled, timer frozen - [ ] `npm run test:run` — all 158 files / 2351 tests pass 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Chris Parsons <chrisparsons1127@gmail.com> Reviewed-on: #72
68 lines
2.4 KiB
TypeScript
68 lines
2.4 KiB
TypeScript
import * as schema from "~/database/schema";
|
|
import { eq, sql } from "drizzle-orm";
|
|
import type { InferSelectModel } from "drizzle-orm";
|
|
import { isInOvernightWindow, getOvernightResumeUTC } from "~/lib/overnight-pause";
|
|
import { logger } from "./logger";
|
|
import { db } from "./db";
|
|
|
|
// Cached per-season timezone map to avoid a redundant query on every overnight-pause check.
|
|
// timer.ts calls evictOvernightPauseCache() when a season leaves active drafting.
|
|
const teamTimezoneCache = new Map<string, Map<string, string | null>>();
|
|
|
|
async function getTeamTimezone(seasonId: string, teamId: string): Promise<string | null> {
|
|
let seasonMap = teamTimezoneCache.get(seasonId);
|
|
if (!seasonMap) {
|
|
try {
|
|
const rows = await db
|
|
.select({ teamId: schema.teams.id, timezone: schema.users.timezone })
|
|
.from(schema.teams)
|
|
.leftJoin(schema.users, sql`${schema.teams.ownerId}::uuid = ${schema.users.id}`)
|
|
.where(eq(schema.teams.seasonId, seasonId));
|
|
seasonMap = new Map(rows.map((r) => [r.teamId, r.timezone || null]));
|
|
} catch (err) {
|
|
logger.error("[OvernightPause] getTeamTimezone failed:", err);
|
|
seasonMap = new Map();
|
|
}
|
|
teamTimezoneCache.set(seasonId, seasonMap);
|
|
}
|
|
return seasonMap.get(teamId) ?? null;
|
|
}
|
|
|
|
export async function checkOvernightPause(
|
|
season: InferSelectModel<typeof schema.seasons>,
|
|
currentTeamId: string
|
|
): Promise<{ active: boolean; resumesAtUTC?: number }> {
|
|
const mode = season.overnightPauseMode;
|
|
const start = season.overnightPauseStart;
|
|
const end = season.overnightPauseEnd;
|
|
|
|
if (mode === "none" || !start || !end) return { active: false };
|
|
|
|
let tz: string | null = null;
|
|
if (mode === "league") {
|
|
tz = season.overnightPauseTimezone || null;
|
|
} else {
|
|
tz = await getTeamTimezone(season.id, currentTeamId);
|
|
if (!tz) tz = season.overnightPauseTimezone || null;
|
|
}
|
|
|
|
if (!tz) return { active: false };
|
|
|
|
if (isInOvernightWindow(tz, start, end)) {
|
|
const resumesAt = getOvernightResumeUTC(tz, end);
|
|
return { active: true, resumesAtUTC: resumesAt.getTime() };
|
|
}
|
|
return { active: false };
|
|
}
|
|
|
|
export function evictOvernightPauseCache(seasonId: string): void {
|
|
teamTimezoneCache.delete(seasonId);
|
|
}
|
|
|
|
export function overnightPauseCacheKeys(): IterableIterator<string> {
|
|
return teamTimezoneCache.keys();
|
|
}
|
|
|
|
export function clearAllOvernightPauseCaches(): void {
|
|
teamTimezoneCache.clear();
|
|
}
|