diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e4e97e..23c5863 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.89.3 + +- Fix: overlays could freeze after a while when the Race Day tab was in the background. Chrome runs background timers about once a minute, and each passing reset the save timer, so laps stopped reaching the server. A waiting save is no longer pushed back, and a hidden tab saves straight away, one write at a time. + ## 1.89.2 - Announcements say a lap time as a speaker does: seconds and hundredths as two numbers, "18 sixty-three" / "18 sextiotre" (was "18 six three"), and "18 flat" / "18 jämnt" on .00. Gaps keep the decimal mark ("0,30"). diff --git a/package-lock.json b/package-lock.json index 063b467..b2d6975 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.89.2", + "version": "1.89.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.89.2", + "version": "1.89.3", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index b97394e..f63d807 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.89.2", + "version": "1.89.3", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/src/app.js b/src/app.js index 7a1053c..aad2301 100644 --- a/src/app.js +++ b/src/app.js @@ -39,7 +39,7 @@ import { getSessionsForEventHelper, getModeLabelHelper, normalizeStartModeHelper import { renderEventWorkspaceView } from "./event_workspace_controller.js"; import { renderEventManagerMarkup } from "./event_manager_view.js"; import { renderEventManagerView } from "./event_manager_controller.js"; -import { createDefaultAmmcConfigHelper, getManagedWsUrlHelper, loadAmmcConfigFromBackendHelper, saveAmmcConfigToBackendHelper, refreshAmmcStatusHelper, startManagedAmmcHelper, stopManagedAmmcHelper, applyPersistedStateHelper, hydrateFromBackendHelper, scheduleBackendSyncHelper, syncStateToBackendHelper, pingBackendHelper, checkAppVersionHelper, startAppVersionPollingHelper, startOverlaySyncHelper, startBackgroundHydrationHelper, startOverlayRotationHelper, startOverlayLiveRefreshHelper, ensureAudioContextHelper, playPassingBeepHelper, playFinishSirenHelper, playLeaderCueHelper, playStartCueHelper, playBestLapCueHelper, pushOverlayEventHelper, getSpeechVoicesHelper, speakTextHelper, prefetchSpeechHelper, announceRaceStartedHelper, announceRaceFinishedHelper, handleSessionTimerTickHelper, tickClockHelper } from "./runtime_services.js"; +import { createDefaultAmmcConfigHelper, getManagedWsUrlHelper, loadAmmcConfigFromBackendHelper, saveAmmcConfigToBackendHelper, refreshAmmcStatusHelper, startManagedAmmcHelper, stopManagedAmmcHelper, applyPersistedStateHelper, hydrateFromBackendHelper, createBackendSyncScheduler, syncStateToBackendHelper, pingBackendHelper, checkAppVersionHelper, startAppVersionPollingHelper, startOverlaySyncHelper, startBackgroundHydrationHelper, startOverlayRotationHelper, startOverlayLiveRefreshHelper, ensureAudioContextHelper, playPassingBeepHelper, playFinishSirenHelper, playLeaderCueHelper, playStartCueHelper, playBestLapCueHelper, pushOverlayEventHelper, getSpeechVoicesHelper, speakTextHelper, prefetchSpeechHelper, announceRaceStartedHelper, announceRaceFinishedHelper, handleSessionTimerTickHelper, tickClockHelper } from "./runtime_services.js"; import { connectDecoderHelper, disconnectDecoderHelper, processDecoderMessageHelper } from "./decoder_runtime.js"; import { listPendingSuspectLaps, releaseSettledSuspectLaps } from "./suspect_laps_logic.js"; import { writeLocalCache } from "./local_cache.js"; @@ -196,7 +196,7 @@ const hydrateFromBackend = ({ initial = false } = {}) => hydrateFromBackendHelpe // overlay window only shows the race, so it always follows the server. const isRunningRaceHere = () => !overlayMode && Boolean(getPrologueSession() || pendingStartSessionId || startsInProgress > 0 || (state.decoder?.connected && state.sessions.some((session) => ["running", "paused"].includes(session.status)))); -const scheduleBackendSync = () => scheduleBackendSyncHelper({ getBackendSyncTimer: () => backendSyncTimer, setBackendSyncTimer: (value) => { backendSyncTimer = value; }, syncStateToBackend }); +const scheduleBackendSync = createBackendSyncScheduler({ sync: () => syncStateToBackend(), isHidden: () => document.hidden }); const syncStateToBackendOnce = () => syncStateToBackendHelper({ backend, t, getBackendUrl, buildPersistableState, getLocalStateVersion: () => localStateVersion, getSyncedStateVersion: () => syncedStateVersion, setSyncedStateVersion: (value) => { syncedStateVersion = value; }, getLocalStateDirty: () => localStateDirty, setLocalStateDirty: (value) => { localStateDirty = value; } }); // A save that fails (server restarting, network gone) is tried again every 5 s until it gets // through, so "Changes waiting to save" never hangs when nothing else changes. @@ -5759,7 +5759,6 @@ const requestedView = String(urlParams.get("view") || "").toLowerCase(); let currentView = overlayMode ? "overlay" : NAV_ITEMS.some((item) => item.id === requestedView) ? requestedView : "dashboard"; let wsClients = { main: null, split: null, pit_entry: null, pit_exit: null }; let reconnectTimers = { main: null, split: null, pit_entry: null, pit_exit: null }; -let backendSyncTimer = null; let appVersionPollTimer = null; let baselineAppVersion = ""; let pendingAppVersion = ""; diff --git a/src/runtime_services.js b/src/runtime_services.js index 6a90032..3293e74 100644 --- a/src/runtime_services.js +++ b/src/runtime_services.js @@ -200,9 +200,29 @@ export async function hydrateFromBackendHelper({ backend, t, getBackendUrl, appl } } -export function scheduleBackendSyncHelper({ getBackendSyncTimer, setBackendSyncTimer, syncStateToBackend }) { - clearTimeout(getBackendSyncTimer()); - setBackendSyncTimer(setTimeout(() => { syncStateToBackend(); }, 350)); +// Saves from Race Day to the server. A save waits a moment so a burst of changes goes in one +// write, but a new change never pushes a waiting save further back: in a background tab Chrome +// runs timers about once a minute, and with a passing every few seconds a reset timer would +// never fire - the overlays would freeze. A hidden tab saves straight away instead, one write +// at a time, so an older copy can never land after a newer one. +export function createBackendSyncScheduler({ sync, isHidden = () => false, delayMs = 350, setTimer = setTimeout, clearTimer = clearTimeout }) { + let timer = null; + let inFlight = false; + let again = false; + function run() { + if (timer) { clearTimer(timer); timer = null; } + if (inFlight) { again = true; return; } + inFlight = true; + Promise.resolve().then(sync).catch(() => {}).finally(() => { + inFlight = false; + if (again) { again = false; run(); } + }); + } + return function schedule() { + if (isHidden()) { run(); return; } + if (timer) return; + timer = setTimer(() => { timer = null; run(); }, delayMs); + }; } export async function syncStateToBackendHelper({ backend, t, getBackendUrl, buildPersistableState, getLocalStateVersion, getSyncedStateVersion, setSyncedStateVersion, setLocalStateDirty }) { diff --git a/tests/backend_sync_scheduler.test.js b/tests/backend_sync_scheduler.test.js new file mode 100644 index 0000000..66125ce --- /dev/null +++ b/tests/backend_sync_scheduler.test.js @@ -0,0 +1,36 @@ +import test from "node:test"; +import assert from "node:assert/strict"; +import { createBackendSyncScheduler } from "../src/runtime_services.js"; + +const tick = () => new Promise((resolve) => setImmediate(resolve)); + +test("a new change never pushes a waiting save back (a throttled background timer still fires)", async () => { + const timers = []; + let saves = 0; + const schedule = createBackendSyncScheduler({ sync: () => { saves += 1; }, setTimer: (fn) => { timers.push(fn); return timers.length; }, clearTimer: () => {} }); + for (let i = 0; i < 20; i += 1) schedule(); // passings faster than the timer can run + assert.equal(timers.length, 1, "one waiting save, not reset by each passing"); + timers[0](); + await tick(); + assert.equal(saves, 1); +}); + +test("a hidden tab saves at once, one write at a time, and catches up with the latest change", async () => { + let release; + const order = []; + let version = 0; + const schedule = createBackendSyncScheduler({ + isHidden: () => true, + setTimer: () => { throw new Error("no timer in a hidden tab"); }, + sync: () => { order.push(version); return new Promise((resolve) => { release = resolve; }); }, + }); + version = 1; schedule(); + await tick(); + version = 2; schedule(); + version = 3; schedule(); + assert.deepEqual(order, [1], "no second write while the first is on its way"); + release(); await tick(); await tick(); + assert.deepEqual(order, [1, 3], "one follow-up write with the newest state"); + release(); await tick(); await tick(); + assert.deepEqual(order, [1, 3]); +}); diff --git a/tests/run.js b/tests/run.js index 772fb27..7eaf9e3 100644 --- a/tests/run.js +++ b/tests/run.js @@ -1,4 +1,5 @@ import "./auth.test.js"; +import "./backend_sync_scheduler.test.js"; import "./frontend_syntax.test.js"; import "./backend_url.test.js"; import "./houseofrc_logic.test.js";