Dashboard
diff --git a/package-lock.json b/package-lock.json index 45a8b71..46806cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.76.1", + "version": "1.77.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.76.1", + "version": "1.77.0", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 4d8ec66..4c1a28f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.76.1", + "version": "1.77.0", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/server.js b/server.js index 7aa366b..fd91738 100644 --- a/server.js +++ b/server.js @@ -439,6 +439,36 @@ app.get("/api/state", (_req, res) => { } }); +// Race Controller Master: one browser tab runs the race (decoder, start, pause, finish). +// Kept in memory; the master renews it every 5 s and it lapses after 15 s of silence. +// Claiming is a POST, so with the admin PIN on only a logged-in browser can take over. +const CONTROLLER_LEASE_MS = 15000; +let raceController = null; +const liveController = () => (raceController && Date.now() - raceController.seenAt < CONTROLLER_LEASE_MS ? raceController : null); +const controllerView = () => { + const live = liveController(); + return { master: live ? { clientId: live.clientId, name: live.name || live.ip, since: live.since } : null }; +}; +app.get("/api/controller", (_req, res) => res.json(controllerView())); +app.post("/api/controller/claim", (req, res) => { + const clientId = String(req.body?.clientId || "").trim().slice(0, 64); + if (!clientId) return res.status(400).json({ error: "clientId required" }); + const live = liveController(); + const renewing = live?.clientId === clientId; + if (!renewing && !auth.isIpAllowed(req.ip)) return res.status(403).json({ error: "ip_not_allowed" }); + // Taking over always needs the PIN (when one is set): the client shows the PIN dialog on + // auth_required. A quiet claim on page load gets login_needed and the tab just follows. + if (!renewing && auth.isEnabled() && !auth.isAuthenticated(req)) return res.status(401).json({ error: req.body?.force === true ? "auth_required" : "login_needed", ...controllerView() }); + if (live && !renewing && req.body?.force !== true) return res.status(409).json(controllerView()); + const since = renewing ? live.since : Date.now(); + raceController = { clientId, name: String(req.body?.name || "").trim().slice(0, 60), ip: String(req.ip || "").replace(/^::ffff:/, ""), since, seenAt: Date.now() }; + return res.json(controllerView()); +}); +app.post("/api/controller/release", (req, res) => { + if (liveController()?.clientId === String(req.body?.clientId || "")) raceController = null; + res.json(controllerView()); +}); + app.post("/api/state", (req, res) => { if (!req.body || typeof req.body !== "object") { res.status(400).json({ error: "Expected JSON body" }); diff --git a/server/auth.js b/server/auth.js index d38452f..908ab17 100644 --- a/server/auth.js +++ b/server/auth.js @@ -139,6 +139,8 @@ function createAuth({ dataDir, allowedCidrs = "", now = () => Date.now() }) { function isProtectedRoute(req) { const route = String(req.path || ""); if (!route.startsWith("/api/") || route === "/api/auth/login" || route === "/api/auth/status") return false; + // The Race Controller Master lock checks the PIN itself (only for claiming, not renewing). + if (route.startsWith("/api/controller/")) return false; if (!["GET", "HEAD", "OPTIONS"].includes(req.method)) return true; return route === "/api/ammc/config"; } diff --git a/src/app.js b/src/app.js index a8fccee..b767e42 100644 --- a/src/app.js +++ b/src/app.js @@ -30,6 +30,7 @@ import { renderDashboardView, renderClassesView, renderDriversView, renderCarsVi import { renderGuideView, renderOverlayPageView } from "./misc_views.js"; import { installAuthFetchGuard, showPinDialog, mountAuthSettings } from "./auth_view.js"; +import { createRaceController } from "./race_controller.js"; import { getSessionsForEventHelper, getModeLabelHelper, normalizeStartModeHelper, getStartModeLabelHelper, getClassNameHelper, getEventNameHelper, renderAssignmentListView, renderSessionsTableView } from "./event_common.js"; import { renderEventWorkspaceView } from "./event_workspace_controller.js"; import { renderEventManagerMarkup } from "./event_manager_view.js"; @@ -282,7 +283,7 @@ const tickClock = () => { if (overlayMode && overlayViewMode === "schedule") renderView(); }; const buildTeamRaceResultsHtml = (event) => buildTeamRaceResultsHtmlHelper(event, { t, escapeHtml, resolveEventBranding, getClassName, buildPrintBrandBlock, buildTeamRaceStandings, renderTable, formatLap, renderTeamStintLog, renderSessionChannelAnalysis }); -const connectDecoder = () => connectDecoderHelper({ +const connectDecoder = () => (!isRaceMaster() ? notifyNotMaster() : connectDecoderHelper({ state, t, saveState, @@ -296,7 +297,7 @@ const connectDecoder = () => connectDecoderHelper({ getActiveSession, processDecoderMessage, disconnectDecoder, -}); +})); const disconnectDecoder = (options = {}) => disconnectDecoderHelper(options, { state, saveState, @@ -456,7 +457,7 @@ function describeAutopilot(action) { return t(`day.auto_${action.reason}`, { name }); } function tickAutopilot() { - if (!autopilotDate || overlayMode) return; + if (!autopilotDate || overlayMode || !isRaceMaster()) return; const day = getDayPlan(autopilotDate); const rows = buildDayRows(autopilotDate); const busy = Boolean(getPrologueSession() || pendingStartSessionId || startsInProgress > 0 || autopilotLaunchingId @@ -517,7 +518,7 @@ function getDueCallFor(date) { return getDueCall(buildDayRows(date), { day: getDayPlan(date), snoozedUntil: (id) => callSnoozes.get(id) || 0 }); } function tickDayCalls() { - if (overlayMode) return; + if (overlayMode || !isRaceMaster()) return; if (autopilotDate) { const due = getDueCallFor(autopilotDate); if (due) callHeat(due.session.id); @@ -1300,6 +1301,17 @@ const TRANSLATIONS = { "timing.show_live": "Visa den", "overlay.obs_show_position_change": "Placering sedan start (▲/▼) i race", "overlay.obs_show_start": "Startplats bredvid placeringen (TV-grafik)", + "controller.you_are_master": "Race Controller Master", + "controller.viewer": "Du följer racet. Race Controller Master är {name} (sedan {since}).", + "controller.none": "Ingen Race Controller Master just nu.", + "controller.take_over": "Ta över som master", + "controller.become": "Bli Race Controller Master", + "controller.confirm_take_over": "Ta över som Race Controller Master? {name} tappar decodern och kan inte längre starta, pausa eller stoppa heat.", + "controller.not_master": "Bara Race Controller Master kan köra racet och decodern. Ta över i rutan högst upp.", + "controller.title": "Race Controller Master", + "controller.hint": "Bara en dator åt gången kör racet: decodern, start, paus, stopp och autopiloten. De andra följer och kan förbereda förare och race. Den som jobbar som race controller tar över med en knapp, och med admin-PIN krävs inloggning.", + "controller.name": "Den här datorns namn", + "controller.name_hint": "Visas för de andra, t.ex. Speakerbåset. Tomt = IP-adressen. Sparas bara i den här webbläsaren.", "overlay.col_start": "Start", "overlay.position_change_title": "Placeringar vunna (▲) eller förlorade (▼) sedan starten", "settings.public_address_title": "Publik adress (domän / DynDNS)", @@ -3438,6 +3450,17 @@ const TRANSLATIONS = { "timing.show_live": "Show it", "overlay.obs_show_position_change": "Places since the start (▲/▼) in races", "overlay.obs_show_start": "Start position next to the place (TV graphics)", + "controller.you_are_master": "Race Controller Master", + "controller.viewer": "You are following the race. Race Controller Master is {name} (since {since}).", + "controller.none": "No Race Controller Master right now.", + "controller.take_over": "Take over as master", + "controller.become": "Become Race Controller Master", + "controller.confirm_take_over": "Take over as Race Controller Master? {name} loses the decoder and can no longer start, pause or stop heats.", + "controller.not_master": "Only the Race Controller Master can run the race and the decoder. Take over in the box at the top.", + "controller.title": "Race Controller Master", + "controller.hint": "One computer at a time runs the race: the decoder, start, pause, stop and the autopilot. The others follow and can prepare drivers and races. Whoever works as race controller takes over with one button; with the admin PIN on, a login is needed.", + "controller.name": "This computer's name", + "controller.name_hint": "Shown to the others, e.g. Speaker booth. Empty = the IP address. Saved in this browser only.", "overlay.col_start": "Start", "overlay.position_change_title": "Places gained (▲) or lost (▼) since the start", "settings.public_address_title": "Public address (domain / DynDNS)", @@ -5456,6 +5479,15 @@ const overlayViewMode = allowedOverlayModes.includes(routeOverlayMode) ? queryOverlayMode : "leaderboard"; const publicOverlayMode = Boolean(publicOverlayMatch); +// Race Controller Master (see race_controller.js). Overlay windows never run the race. +const CONTROLLER_NAME_KEY = "rc_controller_name"; +const readControllerName = () => { try { return localStorage.getItem(CONTROLLER_NAME_KEY) || ""; } catch { return ""; } }; +const raceController = overlayMode ? null : createRaceController({ + getName: readControllerName, + onChange: () => renderControllerBanner(), + onLost: () => { disconnectDecoder({ silent: true }); renderView(); }, +}); +const isRaceMaster = () => Boolean(raceController?.isMaster()); const state = loadState(); const sessionReplay = createSessionReplayRuntime(); const requestedView = String(urlParams.get("view") || "").toLowerCase(); @@ -5788,7 +5820,7 @@ async function init() { document.getElementById("appUpdateAvailable")?.addEventListener("click", navigateToSettings); setInterval(() => refreshUpdateStatus({ render: currentView === "settings" }), 20 * 60 * 1000); - Promise.allSettled([hydrateFromBackend({ initial: true }), loadAmmcConfigFromBackend(), refreshServerBackups({ render: false }), refreshUpdateStatus({ render: false })]).finally(() => { + Promise.allSettled([hydrateFromBackend({ initial: true }), loadAmmcConfigFromBackend(), refreshServerBackups({ render: false }), refreshUpdateStatus({ render: false }), raceController?.start()]).finally(() => { initialLoadDone = true; applyTheme(); renderNav(); @@ -5815,6 +5847,49 @@ async function init() { } +// Banner for a browser that is not the Race Controller Master (and a sidebar badge for the +// one that is). The take-over asks first and needs the admin PIN when one is set. +function renderControllerBanner() { + const banner = document.getElementById("controllerBanner"); + const badge = document.getElementById("controllerBadge"); + if (!banner || !raceController) return; + const status = raceController.getStatus(); + const master = raceController.isMaster(); + if (badge) { + badge.hidden = !master || status.unreachable; + badge.textContent = `🎙 ${t("controller.you_are_master")}`; + } + banner.hidden = master; + if (master) return; + const since = status.master ? new Date(status.master.since).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) : ""; + const text = status.master ? t("controller.viewer", { name: status.master.name || "?", since }) : t("controller.none"); + const button = t(status.master ? "controller.take_over" : "controller.become"); + if (banner.dataset.text === text + button) return; + banner.dataset.text = text + button; + banner.innerHTML = `👁 ${escapeHtml(text)} `; + banner.querySelector("#controllerTakeOver").addEventListener("click", takeOverRaceControl); +} + +async function takeOverRaceControl() { + const status = raceController?.getStatus(); + if (!raceController || (status?.master && !window.confirm(t("controller.confirm_take_over", { name: status.master.name || "?" })))) return; + const result = await raceController.claim(Boolean(status?.master)); + if (!result.ok) return; + if (state.settings.wsUrl && state.settings.autoReconnect && !state.decoder.connected) connectDecoder(); + renderView(); +} + +// Returns the message, for callers that show it themselves (Race Day's start). +function notifyNotMaster() { + const banner = document.getElementById("controllerBanner"); + if (banner) { + banner.classList.remove("is-flash"); + void banner.offsetWidth; + banner.classList.add("is-flash"); + } + return t("controller.not_master"); +} + function updateSyncStatus() { const container = document.getElementById("syncStatus"); if (!container) return; @@ -6129,6 +6204,7 @@ function saveState(options = {}) { async function startOperationalSession(session, callbacks = {}) { session = currentSession(session); if (!session) return { ok: false, message: t("race_day.start_failed") }; + if (!isRaceMaster()) return { ok: false, message: notifyNotMaster() }; const { requirePreflight = false, onTone, ...sequenceCallbacks } = callbacks; if (session.mode === "track") { const validation = validateTrackSessionForStart(session); @@ -6213,6 +6289,7 @@ function saveOperationalLapWindow(session, minLapSec, maxLapSec) { function finishOperationalSession(session) { session = currentSession(session); if (!session) return false; + if (!isRaceMaster()) { notifyNotMaster(); return false; } cancelRaceStart(); state.activeSessionId = session.id; finishSessionControl(session); @@ -6226,6 +6303,7 @@ function finishOperationalSession(session) { function pauseOperationalSession(session) { session = currentSession(session); + if (!isRaceMaster()) { notifyNotMaster(); return false; } if (!pauseSessionControl(session)) return false; triggerRaceAudio("race_paused", { interrupt: true, force: true, logData: { raceId: session.eventId, sessionId: session.id } }); saveState(); @@ -6235,6 +6313,7 @@ function pauseOperationalSession(session) { function resumeOperationalSession(session) { session = currentSession(session); + if (!isRaceMaster()) { notifyNotMaster(); return false; } if (!resumeSessionControl(session)) return false; triggerRaceAudio("race_resumed", { interrupt: true, force: true, logData: { raceId: session.eventId, sessionId: session.id } }); saveState(); diff --git a/src/race_controller.js b/src/race_controller.js new file mode 100644 index 0000000..74b5c75 --- /dev/null +++ b/src/race_controller.js @@ -0,0 +1,71 @@ +// Race Controller Master: only one browser tab at a time runs the race - the decoder +// connection, start, pause, finish and the autopilot. Other admin browsers follow and can +// prepare (drivers, races) and take over with one click. The lock lives on the server +// (/api/controller); the master renews it every 5 s. +const HEARTBEAT_MS = 5000; +const CLIENT_KEY = "rc_controller_client_id"; + +function readClientId() { + const fresh = `tab_${Math.random().toString(36).slice(2, 12)}`; + try { + // sessionStorage: a reload keeps the tab's id (and so its master role), a new tab gets its own. + const stored = sessionStorage.getItem(CLIENT_KEY); + if (stored) return stored; + sessionStorage.setItem(CLIENT_KEY, fresh); + } catch { /* private mode: one id for this page load */ } + return fresh; +} + +export function createRaceController({ getName = () => "", onChange = () => {}, onLost = () => {}, intervalMs = HEARTBEAT_MS } = {}) { + const clientId = readClientId(); + // unreachable: without the server's answer the tab keeps working as before (one laptop, no lock). + let status = { master: null, unreachable: true }; + let timer = null; + + const isMaster = () => status.unreachable || status.master?.clientId === clientId; + const apply = (next) => { + const wasMaster = isMaster(); + status = next; + if (wasMaster && !isMaster()) onLost(status.master); + onChange(status); + }; + const request = async (path, body) => { + try { + const response = await fetch(path, body ? { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(body) } : {}); + if (response.status === 401 || response.status === 403) return { denied: true }; + const data = await response.json(); + return response.ok || response.status === 409 ? { data } : { failed: true }; + } catch { + return { failed: true }; + } + }; + const refresh = async () => { + const result = await request("/api/controller"); + if (result.data) apply({ master: result.data.master, unreachable: false }); + }; + const claim = async (force = false) => { + const result = await request("/api/controller/claim", { clientId, name: getName(), force }); + if (result.data) apply({ master: result.data.master, unreachable: false }); + return { ok: isMaster(), denied: Boolean(result.denied) }; + }; + const tick = async () => { + // The master renews; a viewer only follows (it never grabs a lapsed lock on its own). + if (!status.unreachable && status.master?.clientId === clientId) await claim(); + else await refresh(); + }; + + return { + clientId, + isMaster, + getStatus: () => status, + claim, + // On load: become master when nobody is, or when this tab already was (a reload). + async start({ autoClaim = true } = {}) { + await refresh(); + if (autoClaim && !status.unreachable && (!status.master || status.master.clientId === clientId)) await claim(); + clearInterval(timer); + timer = setInterval(tick, intervalMs); + }, + stop() { clearInterval(timer); }, + }; +} diff --git a/src/settings.js b/src/settings.js index 28a3bb3..08a0ac1 100644 --- a/src/settings.js +++ b/src/settings.js @@ -464,6 +464,17 @@ export function renderSettings(deps) { +🎙 ${t("controller.title")}
${t("controller.hint")}
+ +${t("settings.public_address_title")}
${t("settings.public_address_hint")}