feat(control): Race Controller Master, one browser runs the race and others follow or take over (1.77.0)
This commit is contained in:
1 parent
54989d8597
commit
cf3a4c5fdb
16 files changed
+316
-9
No files matched your search
@@ -8,6 +8,12 @@ The application version is maintained in `package.json` and displayed in the adm
|
||||
|
||||
No changes recorded yet.
|
||||
|
||||
## 1.77.0
|
||||
|
||||
### Added
|
||||
- **Race Controller Master:** only one browser at a time runs the race: the decoder connection, start, pause, stop, the autopilot and heat calls. The first admin browser becomes master. Others show a banner ("You are following the race. Race Controller Master is …") and can still prepare drivers and races. **Take over as master** moves the role; the previous master drops the decoder within about 5 seconds. With the admin PIN on, taking over needs a login, while renewing the role never prompts.
|
||||
- Settings → System: **This computer's name**, shown to the others (saved per browser; empty shows the IP address).
|
||||
|
||||
## 1.76.1
|
||||
|
||||
### Fixed
|
||||
|
||||
@@ -321,6 +321,7 @@ Erik Eriksson;654321;4WD;Associated;;
|
||||
|
||||
RaceCore is meant for a trusted race network:
|
||||
- **Admin PIN** (Settings → System & backup, off by default) protects every change through the API. The login lasts 30 days and is throttled against guessing.
|
||||
- **Race Controller Master:** one computer at a time runs the race (the decoder, start, pause, stop and the autopilot). The first admin browser opened becomes master; other computers show "You are following the race …" and can prepare drivers and races. Whoever works as race controller presses **Take over as master**, and the previous master lets go of the decoder within seconds. With the admin PIN on, taking over needs a login. Name the computer under Settings → System, e.g. "Speaker booth". Overlays and OBS are always view-only.
|
||||
- **`RC_ADMIN_ALLOWED_CIDRS`** restricts admin changes to certain addresses or networks, e.g. `192.168.1.0/24`.
|
||||
- **`RC_ALLOWED_ORIGINS`** is for a UI deliberately served from another address.
|
||||
- **Don't expose port 8081 to the internet.** Reads are not PIN protected. Publish only the public overlay and mobile profile paths through a reverse proxy or VPN.
|
||||
|
||||
@@ -334,6 +334,7 @@ Erik Eriksson;654321;4WD;Associated;;
|
||||
|
||||
RaceCore är tänkt för ett betrott racenätverk:
|
||||
- **Admin-PIN** (Inställningar → System & backup, av som standard) skyddar alla ändringar via API:t. Inloggningen gäller i 30 dagar och är skyddad mot gissning.
|
||||
- **Race Controller Master:** bara en dator åt gången kör racet (decodern, start, paus, stopp och autopiloten). Den första admin-webbläsaren som öppnas blir master; andra datorer visar "Du följer racet …" och kan förbereda förare och race. Den som jobbar som race controller trycker **Ta över som master**, och den förra mastern släpper decodern inom några sekunder. Med admin-PIN krävs inloggning för att ta över. Ge datorn ett namn under Inställningar → System, t.ex. "Speakerbåset". Overlays och OBS är alltid bara visning.
|
||||
- **`RC_ADMIN_ALLOWED_CIDRS`** begränsar adminändringar till vissa adresser eller nät, till exempel `192.168.1.0/24`.
|
||||
- **`RC_ALLOWED_ORIGINS`** används för ett gränssnitt som medvetet körs från en annan adress.
|
||||
- **Exponera inte port 8081 mot internet.** Läsningar skyddas inte av PIN. Publicera bara sökvägarna för publik overlay och mobilprofil via reverse proxy eller VPN.
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
<button id="syncStatusRetry" class="btn btn-mini" type="button" hidden></button>
|
||||
</div>
|
||||
<p id="connectionBadge" class="badge badge-offline">Decoder Offline</p>
|
||||
<p id="controllerBadge" class="badge controller-badge" hidden></p>
|
||||
<small id="clock"></small>
|
||||
<small id="appVersionLabel" class="app-version" hidden></small>
|
||||
<button id="appUpdateAvailable" class="app-update-link" type="button" hidden></button>
|
||||
@@ -38,6 +39,7 @@
|
||||
|
||||
<main class="content">
|
||||
<p id="syncWarning" class="sync-warning" role="status" hidden></p>
|
||||
<p id="controllerBanner" class="controller-banner" role="status" hidden></p>
|
||||
<header class="topbar">
|
||||
<div>
|
||||
<h2 id="pageTitle">Dashboard</h2>
|
||||
|
||||
Generated
+2
-2
@@ -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",
|
||||
|
||||
+1
-1
@@ -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": {
|
||||
|
||||
@@ -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" });
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
+84
-5
@@ -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 = `<span>👁 ${escapeHtml(text)}</span> <button class="btn btn-mini btn-primary" type="button" id="controllerTakeOver">${escapeHtml(button)}</button>`;
|
||||
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();
|
||||
|
||||
@@ -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); },
|
||||
};
|
||||
}
|
||||
@@ -464,6 +464,17 @@ export function renderSettings(deps) {
|
||||
<div class="panel-body" id="authSettings"></div>
|
||||
</section>
|
||||
|
||||
<section class="panel mt-16" id="settingsController">
|
||||
<div class="panel-header"><h3>🎙 ${t("controller.title")}</h3></div>
|
||||
<div class="panel-body">
|
||||
<p class="hint">${t("controller.hint")}</p>
|
||||
<label>${t("controller.name")}
|
||||
<input id="controllerName" maxlength="60" value="${escapeHtml((() => { try { return localStorage.getItem("rc_controller_name") || ""; } catch { return ""; } })())}" />
|
||||
<small>${t("controller.name_hint")}</small>
|
||||
</label>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="panel mt-16" id="settingsPublicAddress">
|
||||
<div class="panel-header"><div><h3>${t("settings.public_address_title")}</h3><p class="hint">${t("settings.public_address_hint")}</p></div></div>
|
||||
<div class="panel-body">
|
||||
@@ -621,6 +632,10 @@ Erik Eriksson;654321;4WD;Associated;;</code></pre>
|
||||
pendingSettingsFocusId = "";
|
||||
}
|
||||
mountAuthSettings(document.getElementById("authSettings"), { t, escapeHtml });
|
||||
// Per computer, not in the shared settings: sent with the next heartbeat of the master lock.
|
||||
document.getElementById("controllerName")?.addEventListener("change", (event) => {
|
||||
try { localStorage.setItem("rc_controller_name", event.target.value.trim()); } catch { /* storage blocked */ }
|
||||
});
|
||||
mountTtsSettings(document.getElementById("ttsSettings"), { state, t, escapeHtml, saveState, speakText });
|
||||
mountDecoderSimSettings(document.getElementById("decoderSimSettings"), { state, t, escapeHtml, getBackendUrl, saveState, connectDecoder, renderView });
|
||||
|
||||
|
||||
@@ -4932,3 +4932,11 @@ tr:has(> td > .medal-3) { background: linear-gradient(90deg, rgba(205, 127, 60,
|
||||
.obs-tv-foot { padding: 0.15em 0.5em; background: rgb(10 12 18 / 92%); font-size: 0.7em; font-weight: 600; letter-spacing: 0.04em; }
|
||||
.obs-tv-foot strong { color: #d39bff; }
|
||||
.obs-tv-empty { margin: 0; padding: 0.4em 0.6em; background: rgb(17 21 30 / 88%); }
|
||||
|
||||
/* Race Controller Master: banner for the browsers that follow, badge for the master. */
|
||||
.controller-banner { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; margin: 0 0 10px; padding: 8px 12px; border: 1px solid var(--accent); border-radius: 8px; background: color-mix(in srgb, var(--accent) 12%, var(--panel)); color: var(--text); font-size: 0.85rem; }
|
||||
.controller-banner[hidden] { display: none; }
|
||||
.controller-banner.is-flash { animation: controller-flash 0.9s ease 2; }
|
||||
@keyframes controller-flash { 50% { background: color-mix(in srgb, var(--accent) 45%, var(--panel)); } }
|
||||
.controller-badge { background: color-mix(in srgb, var(--accent) 22%, var(--panel)); color: var(--text); }
|
||||
.controller-badge[hidden] { display: none; }
|
||||
@@ -6,7 +6,7 @@ const localPause = ms => new Promise(resolve => setTimeout(resolve, ms));
|
||||
// Attaches an independent CDP connection to one browser page target. Needed because the
|
||||
// popup opened by window.open() is a second, separate page target with its own JS/DOM,
|
||||
// distinct from the admin page the harness is already attached to.
|
||||
async function attach(target) {
|
||||
export async function attach(target) {
|
||||
const socket = new WebSocket(target.webSocketDebuggerUrl);
|
||||
await new Promise((resolve, reject) => { socket.addEventListener("open", resolve, { once: true }); socket.addEventListener("error", reject, { once: true }); });
|
||||
let nextId = 0;
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { startFakeDecoder } from "./browser_fake_decoder.js";
|
||||
import { attach } from "./browser_obs_popup.js";
|
||||
|
||||
// Race Controller Master: a second admin browser follows (no decoder, no start) until it
|
||||
// takes over; the first one then lets go of the decoder.
|
||||
export async function runRaceControllerSmoke({ evaluate, navigate, savedState, waitFor, pause, base, debugPort }) {
|
||||
const controller = async () => (await (await fetch(base + "/api/controller")).json()).master;
|
||||
const patchState = async (patch) => {
|
||||
const current = await savedState();
|
||||
Object.assign(current, patch);
|
||||
assert.equal((await fetch(base + "/api/state", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(current) })).ok, true);
|
||||
};
|
||||
const decoder = await startFakeDecoder();
|
||||
let second = null;
|
||||
let target = null;
|
||||
try {
|
||||
const seeded = await savedState();
|
||||
await patchState({ settings: { ...seeded.settings, autoReconnect: true, wsUrl: `ws://127.0.0.1:${decoder.port}` } });
|
||||
await navigate("settings", "settingsForm");
|
||||
const firstId = await evaluate('sessionStorage.getItem("rc_controller_client_id")');
|
||||
await waitFor(async () => (await controller())?.clientId === firstId, "the first admin browser is the master");
|
||||
await waitFor(async () => await evaluate('document.getElementById("connectionBadge")?.classList.contains("badge-online")'), "master connects to the decoder");
|
||||
assert.equal(await evaluate('document.getElementById("controllerBanner").hidden'), true, "no banner on the master");
|
||||
const connectsBefore = decoder.totalConnections();
|
||||
|
||||
target = await (await fetch(`http://127.0.0.1:${debugPort}/json/new?${encodeURIComponent(base + "/?view=settings")}`, { method: "PUT" })).json();
|
||||
second = await attach(target);
|
||||
await second.waitFor(async () => (await second.evaluate('document.getElementById("controllerBanner")?.hidden')) === false, "second browser shows the follow banner");
|
||||
await pause(1500);
|
||||
assert.equal(decoder.totalConnections(), connectsBefore, "the second browser does not connect to the decoder");
|
||||
assert.match(await second.evaluate('document.getElementById("controllerBanner").textContent'), /Race Controller Master/);
|
||||
|
||||
await second.evaluate('window.confirm = () => true; document.getElementById("controllerTakeOver").click(); true');
|
||||
const secondId = await second.evaluate('sessionStorage.getItem("rc_controller_client_id")');
|
||||
await waitFor(async () => (await controller())?.clientId === secondId, "take over moves the master");
|
||||
await waitFor(async () => decoder.totalConnections() > connectsBefore, "the new master connects to the decoder");
|
||||
await waitFor(async () => (await evaluate('document.getElementById("controllerBanner").hidden')) === false, "the old master sees the banner", 12000);
|
||||
assert.equal(await evaluate("document.getElementById('connectionBadge').classList.contains('badge-online')"), false, "the old master lets go of the decoder");
|
||||
console.log("PASS Race Controller Master: a second browser follows without the decoder, takes over, and the first one lets go");
|
||||
|
||||
// Back to the first browser for the rest of the suite.
|
||||
await evaluate('window.confirm = () => true; document.getElementById("controllerTakeOver").click(); true');
|
||||
await waitFor(async () => (await controller())?.clientId === firstId, "first browser takes back the master");
|
||||
} finally {
|
||||
second?.close();
|
||||
if (target) await fetch(`http://127.0.0.1:${debugPort}/json/close/${target.id}`).catch(() => {});
|
||||
const cleanup = await savedState();
|
||||
await patchState({ settings: { ...cleanup.settings, autoReconnect: false } });
|
||||
await decoder.close();
|
||||
}
|
||||
}
|
||||
@@ -30,6 +30,7 @@ import { runRaceDayQuickSmoke } from "./browser_race_day_quick.js";
|
||||
import { runDayScheduleSmoke } from "./browser_day_schedule.js";
|
||||
import { runObsPopupSmoke } from "./browser_obs_popup.js";
|
||||
import { runDecoderReconnectSmoke } from "./browser_decoder_reconnect.js";
|
||||
import { runRaceControllerSmoke } from "./browser_race_controller.js";
|
||||
import assert from "node:assert/strict";
|
||||
import { spawn } from "node:child_process";
|
||||
import { existsSync, mkdtempSync, rmSync } from "node:fs";
|
||||
@@ -190,6 +191,7 @@ try {
|
||||
await runRaceDayStartSequencesSmoke({ evaluate, navigate, waitFor, pause, base, dialogs });
|
||||
await runObsPopupSmoke({ evaluate, navigate, fill, savedState, waitFor, pause, base, debugPort, dialogs, realClick });
|
||||
await runDecoderReconnectSmoke({ evaluate, navigate, savedState, waitFor, pause, base });
|
||||
await runRaceControllerSmoke({ evaluate, navigate, savedState, waitFor, pause, base, debugPort });
|
||||
await navigate("classes", "classForm");
|
||||
await send("Network.emulateNetworkConditions", { offline: true, latency: 0, downloadThroughput: -1, uploadThroughput: -1 });
|
||||
await fill("classForm", { name: "Offline Draft" });
|
||||
|
||||
@@ -688,3 +688,41 @@ test("compressed request bodies are refused before anything is decompressed (CVE
|
||||
rmSync(dataDir, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("Race Controller Master: one browser holds the lock, take-over needs force and the admin PIN", { timeout: 20000 }, async () => {
|
||||
const dataDir = mkdtempSync(join(tmpdir(), "live-rc-test-controller-"));
|
||||
const port = await reservePort();
|
||||
const baseUrl = `http://127.0.0.1:${port}`;
|
||||
const child = spawn(process.execPath, [join(projectRoot, "server.js")], {
|
||||
cwd: projectRoot,
|
||||
env: { ...process.env, HOST: "127.0.0.1", PORT: String(port), RC_TIMING_DATA_DIR: dataDir, RC_TIMING_PID_FILE: "" },
|
||||
stdio: ["ignore", "pipe", "pipe"],
|
||||
});
|
||||
const post = (path, body, cookie = "") => fetch(`${baseUrl}${path}`, { method: "POST", headers: { "Content-Type": "application/json", ...(cookie ? { Cookie: cookie } : {}) }, body: JSON.stringify(body) });
|
||||
const master = async () => (await (await fetch(`${baseUrl}/api/controller`)).json()).master;
|
||||
|
||||
try {
|
||||
await waitForServer(child);
|
||||
assert.equal(await master(), null, "nobody is master at start");
|
||||
assert.equal((await post("/api/controller/claim", { clientId: "a", name: "Klubb-laptop" })).status, 200);
|
||||
assert.equal((await master()).name, "Klubb-laptop");
|
||||
assert.equal((await post("/api/controller/claim", { clientId: "b" })).status, 409, "a second browser cannot just claim it");
|
||||
assert.equal((await master()).clientId, "a");
|
||||
assert.equal((await post("/api/controller/claim", { clientId: "b", force: true })).status, 200, "take over with force");
|
||||
assert.equal((await master()).clientId, "b");
|
||||
assert.equal((await post("/api/controller/claim", { clientId: "a" })).status, 409, "the old master's heartbeat does not win it back");
|
||||
|
||||
const cookie = (await post("/api/auth/pin", { newPin: "4711" })).headers.get("set-cookie").split(";")[0];
|
||||
assert.equal((await post("/api/controller/claim", { clientId: "b" })).status, 200, "the master renews without logging in");
|
||||
const quiet = await post("/api/controller/claim", { clientId: "c" });
|
||||
assert.equal(quiet.status, 401);
|
||||
assert.equal((await quiet.json()).error, "login_needed", "a quiet claim on page load does not open the PIN dialog");
|
||||
assert.equal((await (await post("/api/controller/claim", { clientId: "c", force: true })).json()).error, "auth_required", "take over asks for the PIN");
|
||||
assert.equal((await post("/api/controller/claim", { clientId: "c", force: true }, cookie)).status, 200, "logged in, take over works");
|
||||
assert.equal((await post("/api/controller/release", { clientId: "c" })).status, 200);
|
||||
assert.equal(await master(), null, "release frees the lock");
|
||||
} finally {
|
||||
await stopServer(child);
|
||||
rmSync(dataDir, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
Reference in new issue
Block a user