fix(control): followers update live, phones use the page address, master is visible (1.77.2)
This commit is contained in:
1 parent
0589fe5f65
commit
a4e734dd74
13 files changed
+119
-22
No files matched your search
+57
-9
@@ -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 } = {}) {
|
||||
|
||||
Reference in new issue
Block a user