fix(control): followers update live, phones use the page address, master is visible (1.77.2)

This commit is contained in:
larssand committed 2026-11-07 18:09:34 +01:00
1 parent 0589fe5f65
commit a4e734dd74
13 files changed
+119 -22

No files matched your search

+8
View File
@@ -8,6 +8,14 @@ The application version is maintained in `package.json` and displayed in the adm
No changes recorded yet.
## 1.77.2
### Fixed
- A phone or another computer that opened RaceCore on the laptop's IP address showed old data and never updated: it used the laptop's saved `localhost` server address, which on the phone points at the phone itself. A saved localhost address is now ignored on other devices; they use the address the page was opened on.
- Browsers that follow the race (not the master) now update Race Day, Timing, Judging and the Dashboard every second from the server, but not while you type in a field or have a dialog open. Before, they only refreshed every 15 seconds and did not redraw.
- Race Controller Master is visible on the master too: a green line "You are the Race Controller Master" with **Release master**, also on a phone where the sidebar is hidden.
- A phone no longer becomes master just by being the first one to open the page. Only the computer running the server (localhost) or a browser that pressed **Become Race Controller Master** takes a free role on its own.
## 1.77.1
### Fixed
+1 -1
View File
@@ -321,7 +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, resume, stop, false start, resetting a heat and the autopilot, also from the speaker panel). Judging corrections and the other calls work from any computer. 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.
- **Race Controller Master:** one computer at a time runs the race (the decoder, start, pause, resume, stop, false start, resetting a heat and the autopilot, also from the speaker panel). Judging corrections and the other calls work from any computer. The computer running the server (page opened on `localhost`) becomes master on its own and shows a green line "🎙 You are the Race Controller Master" with **Release master**. Phones and other computers follow the race live (updated every second), show "You are following the race …" and become master only when someone presses the button; that computer then remembers the role. They can also 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.
+1 -1
View File
@@ -334,7 +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, fortsätt, stopp, tjuvstart, nollställ heat och autopiloten, även från speakerpanelen). Domarvyns korrigeringar och övriga utrop fungerar från alla datorer. 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.
- **Race Controller Master:** bara en dator åt gången kör racet (decodern, start, paus, fortsätt, stopp, tjuvstart, nollställ heat och autopiloten, även från speakerpanelen). Domarvyns korrigeringar och övriga utrop fungerar från alla datorer. Datorn som kör servern (sidan öppnad på `localhost`) blir master av sig själv och visar en grön rad "🎙 Du är Race Controller Master" med **Släpp master**. Mobiler och andra datorer följer racet live (uppdateras varje sekund), visar "Du följer racet …" och blir master bara när någon trycker på knappen; den datorn minns sedan rollen. De kan också 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.
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "rc-racecore",
"version": "1.77.1",
"version": "1.77.2",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "rc-racecore",
"version": "1.77.1",
"version": "1.77.2",
"hasInstallScript": true,
"dependencies": {
"better-sqlite3": "^12.11.1",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "rc-racecore",
"version": "1.77.1",
"version": "1.77.2",
"private": true,
"description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence",
"engines": {
+57 -9
View File
@@ -31,6 +31,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 { resolveBackendUrl } from "./backend_url.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";
@@ -1305,6 +1306,9 @@ const TRANSLATIONS = {
"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.you_are_master_since": "Du är Race Controller Master ({name}, sedan {since}). Den här datorn kör decodern och racet.",
"controller.release": "Släpp master",
"controller.confirm_release": "Släppa Race Controller Master? Decodern kopplas från här tills någon trycker Bli 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",
@@ -3454,6 +3458,9 @@ const TRANSLATIONS = {
"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.you_are_master_since": "You are the Race Controller Master ({name}, since {since}). This computer runs the decoder and the race.",
"controller.release": "Release master",
"controller.confirm_release": "Release the Race Controller Master? The decoder is disconnected here until someone presses Become 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",
@@ -5485,10 +5492,16 @@ 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 ""; } };
// "Preferred": this browser chose to be master (button) - it takes a free lock again on load.
// Other devices (a phone, the speaker booth) only follow until someone presses the button.
const CONTROLLER_PREFERRED_KEY = "rc_controller_preferred";
const isServerComputer = () => ["localhost", "127.0.0.1", "::1", "[::1]"].includes(window.location.hostname);
const readControllerPreferred = () => { try { return localStorage.getItem(CONTROLLER_PREFERRED_KEY) === "1"; } catch { return false; } };
const writeControllerPreferred = (value) => { try { if (value) localStorage.setItem(CONTROLLER_PREFERRED_KEY, "1"); else localStorage.removeItem(CONTROLLER_PREFERRED_KEY); } catch { /* storage blocked */ } };
const raceController = overlayMode ? null : createRaceController({
getName: readControllerName,
onChange: () => renderControllerBanner(),
onLost: () => { disconnectDecoder({ silent: true }); renderView(); },
onLost: () => { writeControllerPreferred(false); disconnectDecoder({ silent: true }); renderView(); },
});
const isRaceMaster = () => Boolean(raceController?.isMaster());
const state = loadState();
@@ -5823,7 +5836,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 }), raceController?.start()]).finally(() => {
Promise.allSettled([hydrateFromBackend({ initial: true }), loadAmmcConfigFromBackend(), refreshServerBackups({ render: false }), refreshUpdateStatus({ render: false }), raceController?.start({ autoClaim: isServerComputer() || readControllerPreferred() })]).finally(() => {
initialLoadDone = true;
applyTheme();
renderNav();
@@ -5844,6 +5857,7 @@ async function init() {
if (link) openDriverTrainingStats(String(link.dataset.trainingDriver || ""));
});
startOverlaySync();
startFollowerSync();
startBackgroundHydration();
startOverlayRotation();
startOverlayLiveRefresh();
@@ -5862,15 +5876,25 @@ function renderControllerBanner() {
badge.hidden = !master || status.unreachable;
badge.textContent = `🎙 ${t("controller.you_are_master")}`;
}
banner.hidden = master;
if (master) return;
// Without the server's answer (one laptop, older server) there is nothing to show.
banner.hidden = master && status.unreachable;
banner.classList.toggle("is-master", master);
if (banner.hidden) 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");
const text = master
? `🎙 ${t("controller.you_are_master_since", { name: status.master?.name || "?", since })}`
: `👁 ${status.master ? t("controller.viewer", { name: status.master.name || "?", since }) : t("controller.none")}`;
const button = t(master ? "controller.release" : 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);
banner.innerHTML = `<span>${escapeHtml(text)}</span> <button class="btn btn-mini ${master ? "" : "btn-primary"}" type="button" id="${master ? "controllerRelease" : "controllerTakeOver"}">${escapeHtml(button)}</button>`;
banner.querySelector("#controllerTakeOver")?.addEventListener("click", takeOverRaceControl);
banner.querySelector("#controllerRelease")?.addEventListener("click", releaseRaceControl);
}
async function releaseRaceControl() {
if (!raceController || !window.confirm(t("controller.confirm_release"))) return;
await raceController.release();
}
async function takeOverRaceControl() {
@@ -5878,6 +5902,7 @@ async function takeOverRaceControl() {
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;
writeControllerPreferred(true);
if (state.settings.wsUrl && state.settings.autoReconnect && !state.decoder.connected) connectDecoder();
renderView();
}
@@ -5893,6 +5918,29 @@ function notifyNotMaster() {
return t("controller.not_master");
}
// A browser that follows the race (not the Race Controller Master) gets laps and starts from
// the server: every second on the live views, re-rendered when something changed - but never
// while someone is typing in a field or has a dialog open.
function startFollowerSync() {
clearInterval(startFollowerSync.timer);
if (overlayMode) return;
const liveViews = new Set(["race_day", "timing", "judging", "dashboard"]);
let busy = false;
startFollowerSync.timer = setInterval(async () => {
if (busy || isRaceMaster() || !liveViews.has(currentView) || localStateDirty) return;
busy = true;
try {
const before = backend.lastSyncAt;
await hydrateFromBackend();
const active = document.activeElement;
const typing = active && dom.view.contains(active) && ["INPUT", "TEXTAREA", "SELECT"].includes(active.tagName);
if (backend.lastSyncAt !== before && !typing && !document.querySelector(".modal-overlay")) renderView();
} finally {
busy = false;
}
}, 1000);
}
function updateSyncStatus() {
const container = document.getElementById("syncStatus");
if (!container) return;
@@ -6771,7 +6819,7 @@ function getDefaultBackendUrl() {
}
function getBackendUrl() {
return String(state.settings.backendUrl || getDefaultBackendUrl()).replace(/\/+$/, "");
return resolveBackendUrl(state.settings.backendUrl, window.location);
}
async function refreshServerBackups({ render = true } = {}) {
+14
View File
@@ -0,0 +1,14 @@
// The saved backend URL is shared by every browser. "localhost" saved on the race laptop
// means the laptop itself, so a phone or another computer (page opened on the laptop's IP)
// uses the address it opened the page on instead.
const LOOPBACK_HOST = /^(localhost|127\.\d+\.\d+\.\d+|\[::1\]|::1)$/i;
export function resolveBackendUrl(saved, { protocol = "", hostname = "", origin = "" } = {}) {
const pageUrl = protocol.startsWith("http") && hostname ? origin : "http://127.0.0.1:8081";
const value = String(saved || "").trim().replace(/\/+$/, "");
if (!value) return pageUrl;
let savedHost = "";
try { savedHost = new URL(value).hostname; } catch { return pageUrl; }
if (LOOPBACK_HOST.test(savedHost) && !LOOPBACK_HOST.test(hostname) && protocol.startsWith("http")) return pageUrl;
return value;
}
+7 -2
View File
@@ -59,13 +59,18 @@ export function createRaceController({ getName = () => "", onChange = () => {},
isMaster,
getStatus: () => status,
claim,
// On load: become master when nobody is, or when this tab already was (a reload).
// On load: keep the role after a reload of the master tab; take a free lock only when the
// caller allows it (the server's own computer, or a browser that was master before).
async start({ autoClaim = true } = {}) {
await refresh();
if (autoClaim && !status.unreachable && (!status.master || status.master.clientId === clientId)) await claim();
if (!status.unreachable && (status.master?.clientId === clientId || (autoClaim && !status.master))) await claim();
clearInterval(timer);
timer = setInterval(tick, intervalMs);
},
async release() {
const result = await request("/api/controller/release", { clientId });
if (result.data) apply({ master: result.data.master, unreachable: false });
},
stop() { clearInterval(timer); },
};
}
+1 -1
View File
@@ -99,7 +99,7 @@ export function renderSettings(deps) {
return true;
};
const pageOrigin = /^https?:$/.test(window.location.protocol) ? window.location.origin : "";
const configuredBackendUrl = String(state.settings.backendUrl || getDefaultBackendUrl()).replace(/\/+$/, "");
const configuredBackendUrl = getBackendUrl();
const backendUrlMismatch = Boolean(pageOrigin && configuredBackendUrl && pageOrigin !== configuredBackendUrl);
const ammcStatus = ammc.status || {};
const ammcOutput = Array.isArray(ammcStatus.lastOutput) ? ammcStatus.lastOutput : [];
+1
View File
@@ -4940,3 +4940,4 @@ tr:has(> td > .medal-3) { background: linear-gradient(90deg, rgba(205, 127, 60,
@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; }
.controller-banner.is-master { border-color: #2fa84f; background: color-mix(in srgb, #2fa84f 14%, var(--panel)); }
+15
View File
@@ -0,0 +1,15 @@
import test from "node:test";
import assert from "node:assert/strict";
import { resolveBackendUrl } from "../src/backend_url.js";
const phone = { protocol: "http:", hostname: "192.168.1.46", origin: "http://192.168.1.46:8081" };
const laptop = { protocol: "http:", hostname: "localhost", origin: "http://localhost:8081" };
test("a phone on the laptop's IP ignores the laptop's saved localhost address", () => {
assert.equal(resolveBackendUrl("http://localhost:8081", phone), "http://192.168.1.46:8081");
assert.equal(resolveBackendUrl("http://127.0.0.1:8081/", phone), "http://192.168.1.46:8081");
assert.equal(resolveBackendUrl("http://localhost:8081", laptop), "http://localhost:8081", "the laptop keeps it");
assert.equal(resolveBackendUrl("http://10.0.0.5:8081", phone), "http://10.0.0.5:8081", "a real address set on purpose is kept");
assert.equal(resolveBackendUrl("", phone), "http://192.168.1.46:8081");
assert.equal(resolveBackendUrl("", { protocol: "file:" }), "http://127.0.0.1:8081");
});
+10 -5
View File
@@ -21,12 +21,13 @@ export async function runRaceControllerSmoke({ evaluate, navigate, savedState, w
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");
await waitFor(async () => await evaluate('!document.getElementById("controllerBanner").hidden && document.getElementById("controllerBanner").classList.contains("is-master")'), "the master sees that it is the master");
assert.ok(await evaluate('Boolean(document.getElementById("controllerRelease"))'), "with a Release button");
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 second.waitFor(async () => Boolean(await second.evaluate('document.getElementById("controllerTakeOver")')), "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/);
@@ -36,11 +37,15 @@ export async function runRaceControllerSmoke({ evaluate, navigate, savedState, w
const heat = { id: "rc_ctrl_heat", eventId: before.events[0]?.id || "", name: "RC Ctrl Heat", type: "final", mode: "race", status: "paused", startMode: "position", durationMin: 5, startedAt: Date.now() - 60000, pausedAt: Date.now() - 30000, totalPausedMs: 0, driverIds: [] };
await patchState({ sessions: [...before.sessions, heat], activeSessionId: heat.id });
await second.evaluate(`location.href = ${JSON.stringify(base + "/?view=race_day")}; true`);
await second.waitFor(async () => Boolean(await second.evaluate('document.querySelector(\'#speakerPanel [data-race-audio-cue="race_resumed"]\')')) && (await second.evaluate('document.getElementById("controllerBanner").hidden')) === false, "follower on Race Day");
await second.waitFor(async () => Boolean(await second.evaluate('document.querySelector(\'#speakerPanel [data-race-audio-cue="race_resumed"]\')')) && Boolean(await second.evaluate('document.getElementById("controllerTakeOver")')), "follower on Race Day");
await second.evaluate('document.querySelector(\'#speakerPanel [data-race-audio-cue="race_resumed"]\').click(); true');
await pause(1500);
assert.equal((await savedState()).sessions.find((session) => session.id === heat.id).status, "paused", "the follower's Resume does nothing");
assert.equal(await second.evaluate('document.getElementById("controllerBanner").classList.contains("is-flash")'), true, "the banner points at Take over");
// The follower is updated live from the server, without a reload.
const renamed = await savedState();
await patchState({ sessions: renamed.sessions.map((session) => (session.id === heat.id ? { ...session, name: "RC Ctrl Heat Live" } : session)) });
await second.waitFor(async () => (await second.evaluate("document.querySelector('.content').innerText")).includes("RC Ctrl Heat Live"), "the follower shows the change within seconds", 5000);
const cleaned = await savedState();
await patchState({ sessions: cleaned.sessions.filter((session) => session.id !== heat.id), activeSessionId: before.activeSessionId || null });
@@ -48,9 +53,9 @@ export async function runRaceControllerSmoke({ evaluate, navigate, savedState, w
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);
await waitFor(async () => Boolean(await evaluate('document.getElementById("controllerTakeOver")')), "the old master sees the follow 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 or pause/resume, takes over, and the first one lets go");
console.log("PASS Race Controller Master: a second browser follows live without the decoder or pause/resume, 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');
+1
View File
@@ -1,4 +1,5 @@
import "./auth.test.js";
import "./backend_url.test.js";
import "./judging_penalties.test.js";
import "./practice_rank.test.js";
import "./team_race_logic.test.js";