## 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
139 lines
4.6 KiB
TypeScript
139 lines
4.6 KiB
TypeScript
import { auth } from "~/lib/auth.server";
|
|
import { eq, and } from "drizzle-orm";
|
|
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { isCommissioner } from "~/models/commissioner";
|
|
import { logCommissionerAction } from "~/models/audit-log";
|
|
import { getSocketIO } from "../../../server/socket";
|
|
import { rescheduleTimer } from "../../../server/timer";
|
|
import { logger } from "~/lib/logger";
|
|
|
|
import type { ActionFunctionArgs } from "react-router";
|
|
export async function action(args: ActionFunctionArgs) {
|
|
const { request } = args;
|
|
const session = await auth.api.getSession({ headers: args.request.headers });
|
|
const userId = session?.user.id ?? null;
|
|
|
|
if (!userId) {
|
|
return Response.json({ error: "Unauthorized" }, { status: 401 });
|
|
}
|
|
|
|
const formData = await request.formData();
|
|
const seasonId = formData.get("seasonId") as string;
|
|
const teamId = formData.get("teamId") as string;
|
|
const adjustmentRaw = formData.get("adjustment");
|
|
const adjustment = adjustmentRaw !== null ? parseInt(adjustmentRaw as string, 10) : NaN;
|
|
|
|
if (!seasonId || !teamId || isNaN(adjustment)) {
|
|
return Response.json({ error: "seasonId, teamId, and adjustment are required" }, { status: 400 });
|
|
}
|
|
|
|
const db = database();
|
|
|
|
const season = await db.query.seasons.findFirst({
|
|
where: eq(schema.seasons.id, seasonId),
|
|
});
|
|
|
|
if (!season) {
|
|
return Response.json({ error: "Season not found" }, { status: 404 });
|
|
}
|
|
|
|
if (season.status !== "draft") {
|
|
return Response.json({ error: "Draft is not currently active" }, { status: 409 });
|
|
}
|
|
|
|
if (!(await isCommissioner(season.leagueId, userId))) {
|
|
return Response.json(
|
|
{ error: "Only commissioners can adjust time banks" },
|
|
{ status: 403 }
|
|
);
|
|
}
|
|
|
|
const [currentTimer] = await db
|
|
.select()
|
|
.from(schema.draftTimers)
|
|
.where(
|
|
and(
|
|
eq(schema.draftTimers.seasonId, seasonId),
|
|
eq(schema.draftTimers.teamId, teamId)
|
|
)
|
|
);
|
|
|
|
let newTime: number;
|
|
let isOnClock = false;
|
|
|
|
if (!currentTimer) {
|
|
if (adjustment <= 0) {
|
|
return Response.json({ error: "Timer not found for this team" }, { status: 404 });
|
|
}
|
|
newTime = adjustment;
|
|
await db.insert(schema.draftTimers).values({
|
|
seasonId,
|
|
teamId,
|
|
timeRemaining: newTime,
|
|
});
|
|
} else {
|
|
const now = Date.now();
|
|
if (currentTimer.picksExpiresAt && currentTimer.picksExpiresAt.getTime() > now) {
|
|
// Team is on the clock — base the adjustment on the live expiry, not the stale timeRemaining.
|
|
isOnClock = true;
|
|
const msRemaining = currentTimer.picksExpiresAt.getTime() - now;
|
|
const currentRemaining = Math.max(0, Math.ceil(msRemaining / 1000));
|
|
newTime = currentRemaining + adjustment;
|
|
if (newTime <= 0) {
|
|
return Response.json({ error: "Adjustment would reduce the time bank to zero or below" }, { status: 400 });
|
|
}
|
|
const newExpiresAt = new Date(now + newTime * 1000);
|
|
await db
|
|
.update(schema.draftTimers)
|
|
.set({ timeRemaining: newTime, picksExpiresAt: newExpiresAt, updatedAt: new Date() })
|
|
.where(eq(schema.draftTimers.id, currentTimer.id));
|
|
} else {
|
|
newTime = currentTimer.timeRemaining + adjustment;
|
|
if (newTime <= 0) {
|
|
return Response.json({ error: "Adjustment would reduce the time bank to zero or below" }, { status: 400 });
|
|
}
|
|
await db
|
|
.update(schema.draftTimers)
|
|
.set({ timeRemaining: newTime, updatedAt: new Date() })
|
|
.where(eq(schema.draftTimers.id, currentTimer.id));
|
|
}
|
|
}
|
|
|
|
const team = await db.query.teams.findFirst({
|
|
where: eq(schema.teams.id, teamId),
|
|
});
|
|
|
|
await logCommissionerAction({
|
|
seasonId,
|
|
leagueId: season.leagueId,
|
|
actorUserId: userId,
|
|
action: "time_bank_edited",
|
|
affectedTeamIds: [teamId],
|
|
details: {
|
|
teamId,
|
|
teamName: team?.name ?? teamId,
|
|
adjustment,
|
|
newTimeRemaining: newTime,
|
|
},
|
|
});
|
|
|
|
if (isOnClock) {
|
|
// Reschedule cancels the old setTimeout and re-reads picksExpiresAt from the DB,
|
|
// then emits timer-pick-started with the new expiresAt so all clients update their countdown.
|
|
try {
|
|
await rescheduleTimer(seasonId);
|
|
} catch (err) {
|
|
logger.error("[AdjustTimeBank] rescheduleTimer failed:", err);
|
|
}
|
|
} else {
|
|
// Off-clock team: just push the updated bank to all clients.
|
|
try {
|
|
getSocketIO().to(`draft-${seasonId}`).emit("timer-bank-updated", { teamId, timeRemaining: newTime });
|
|
} catch (error) {
|
|
logger.error("Socket.IO error:", error);
|
|
}
|
|
}
|
|
|
|
return Response.json({ success: true, timeRemaining: newTime });
|
|
}
|