fix(race-day): keep local state while starting or timing a heat, keep count-down voice on time (1.46.1)
This commit is contained in:
1 parent
8d27072567
commit
c4163441fc
8 files changed
+119
-10
No files matched your search
+24
-3
@@ -154,7 +154,14 @@ const refreshAmmcStatus = () => refreshAmmcStatusHelper({ ammc, t, getBackendUrl
|
||||
const startManagedAmmc = () => startManagedAmmcHelper({ ammc, t, getBackendUrl });
|
||||
const stopManagedAmmc = () => stopManagedAmmcHelper({ ammc, t, getBackendUrl });
|
||||
const applyPersistedState = (persisted) => applyPersistedStateHelper(persisted, { state, backend, t, getDefaultBackendUrl, DEFAULT_LANGUAGE, DEFAULT_THEME, AVAILABLE_THEMES, normalizeDriver, normalizeCar, normalizeEvent, normalizeSession, normalizeStoredRacePreset, normalizeObsOverlaySettings, normalizeTrainingState, normalizeRaceAudioSettings, normalizeTrackLayouts: (value) => normalizeTrackLayouts(value, { uid }), applyTheme });
|
||||
const hydrateFromBackend = () => hydrateFromBackendHelper({ backend, t, getBackendUrl, applyPersistedState, saveState });
|
||||
const hydrateFromBackend = ({ initial = false } = {}) => hydrateFromBackendHelper({
|
||||
backend, t, getBackendUrl, applyPersistedState, saveState,
|
||||
// The first load at page start always takes the server's state.
|
||||
...(initial ? {} : { getLocalStateVersion: () => localStateVersion, getLocalStateDirty: () => localStateDirty, keepLocal: isRunningRaceHere }),
|
||||
});
|
||||
// This browser is starting or timing a heat: its own state is the newest.
|
||||
const isRunningRaceHere = () => 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 syncStateToBackend = () => syncStateToBackendHelper({ backend, t, getBackendUrl, buildPersistableState, getLocalStateVersion: () => localStateVersion, getSyncedStateVersion: () => syncedStateVersion, setSyncedStateVersion: (value) => { syncedStateVersion = value; }, getLocalStateDirty: () => localStateDirty, setLocalStateDirty: (value) => { localStateDirty = value; } });
|
||||
const pingBackend = () => pingBackendHelper({ backend, t, getBackendUrl });
|
||||
@@ -284,8 +291,10 @@ function getDefaultPrologueSec(session) {
|
||||
const config = state.events.find((item) => item.id === session?.eventId)?.raceConfig || {};
|
||||
return normalizePrologueSec(session?.type === "qualification" ? config.qualPrologueSec : config.finalPrologueSec);
|
||||
}
|
||||
// Count-down calls replace each other (group) and are dropped when late: a second-by-second
|
||||
// call more than 1.2 s late, any other call after 4 s.
|
||||
function speakPrologue(eventKey, session, variables = {}) {
|
||||
triggerRaceAudio(eventKey, { interrupt: true, force: true, variables, logData: { raceId: session.eventId, sessionId: session.id } });
|
||||
triggerRaceAudio(eventKey, { interrupt: true, force: true, variables, group: "prologue", maxDelayMs: eventKey === "prologue_count" ? 1200 : 4000, logData: { raceId: session.eventId, sessionId: session.id } });
|
||||
}
|
||||
function setRacePrologue(next) {
|
||||
racePrologue = next;
|
||||
@@ -317,6 +326,7 @@ function tickRacePrologue() {
|
||||
// calls ("drivers, stand by"); a count-down that ran out has already called 10..3.
|
||||
let pendingStartSessionId = null;
|
||||
async function launchFromPrologue(session, { countedDown }) {
|
||||
raceAudioEngine.dropVoiceGroup("prologue");
|
||||
pendingStartSessionId = session.id;
|
||||
renderView();
|
||||
const result = await startOperationalSession(session, {
|
||||
@@ -4926,7 +4936,7 @@ async function init() {
|
||||
document.getElementById("appUpdateAvailable")?.addEventListener("click", navigateToSettings);
|
||||
setInterval(() => refreshUpdateStatus({ render: currentView === "settings" }), 20 * 60 * 1000);
|
||||
|
||||
Promise.allSettled([hydrateFromBackend(), loadAmmcConfigFromBackend(), refreshServerBackups({ render: false }), refreshUpdateStatus({ render: false })]).finally(() => {
|
||||
Promise.allSettled([hydrateFromBackend({ initial: true }), loadAmmcConfigFromBackend(), refreshServerBackups({ render: false }), refreshUpdateStatus({ render: false })]).finally(() => {
|
||||
initialLoadDone = true;
|
||||
applyTheme();
|
||||
renderNav();
|
||||
@@ -5272,6 +5282,15 @@ async function startOperationalSession(session, callbacks = {}) {
|
||||
}
|
||||
|
||||
ensureAudioContext();
|
||||
startsInProgress += 1;
|
||||
try {
|
||||
return await runOperationalStart(session, sequenceCallbacks, onTone);
|
||||
} finally {
|
||||
startsInProgress -= 1;
|
||||
}
|
||||
}
|
||||
let startsInProgress = 0;
|
||||
async function runOperationalStart(session, sequenceCallbacks, onTone) {
|
||||
let backup = null;
|
||||
try {
|
||||
backup = await createServerBackup("pre_start", session);
|
||||
@@ -5286,6 +5305,8 @@ async function startOperationalSession(session, callbacks = {}) {
|
||||
const commitStart = () => {
|
||||
if (committed) return;
|
||||
committed = true;
|
||||
// The state may have been reloaded during the start sequence: start the heat that is in it.
|
||||
session = state.sessions.find((item) => item.id === session.id) || session;
|
||||
state.activeSessionId = session.id;
|
||||
beginSessionControl(session);
|
||||
session.trackLayoutId = getTrackLayoutIdAt(state.trackLayouts);
|
||||
|
||||
+23
-2
@@ -212,6 +212,8 @@ export function createRaceAudioEngine(options = {}) {
|
||||
if (currentVoice || !voiceQueue.length) return;
|
||||
voiceQueue.sort((a, b) => b.priority - a.priority || a.sequence - b.sequence);
|
||||
const task = voiceQueue.shift();
|
||||
// A count-down call that could not be said on time is skipped: "8" after the start is wrong.
|
||||
if (task.expiresAt && now() > task.expiresAt) { task.resolve(false); pumpVoiceQueue(); return; }
|
||||
currentVoice = task;
|
||||
Promise.resolve(speak(task.text, { language: task.language, volume: task.volume, interrupt: task.interrupt }))
|
||||
.catch(() => false).finally(() => {
|
||||
@@ -225,7 +227,18 @@ export function createRaceAudioEngine(options = {}) {
|
||||
const voice = await resolveVoice(key, eventOptions);
|
||||
if (!voice) return false;
|
||||
return new Promise((resolve) => {
|
||||
const task = { ...voice, sequence: voiceSequence += 1, resolve };
|
||||
const group = String(eventOptions.group || "");
|
||||
const task = { ...voice, group, sequence: voiceSequence += 1, resolve, expiresAt: eventOptions.maxDelayMs ? Number(eventOptions.queuedAt ?? now()) + Number(eventOptions.maxDelayMs) : 0 };
|
||||
// A newer call in the same group (the count-down) replaces the older one instead of
|
||||
// queueing behind it, so the voice never falls behind the clock.
|
||||
if (group) {
|
||||
dropQueuedGroup(group);
|
||||
if (currentVoice?.group === group) {
|
||||
currentVoice.resolve(false);
|
||||
currentVoice = null;
|
||||
task.interrupt = true;
|
||||
}
|
||||
}
|
||||
if (task.interrupt && currentVoice && task.priority > currentVoice.priority) {
|
||||
currentVoice.resolve(false);
|
||||
currentVoice = null;
|
||||
@@ -235,6 +248,12 @@ export function createRaceAudioEngine(options = {}) {
|
||||
});
|
||||
}
|
||||
|
||||
function dropQueuedGroup(group) {
|
||||
for (let index = voiceQueue.length - 1; index >= 0; index -= 1) {
|
||||
if (voiceQueue[index].group === group) voiceQueue.splice(index, 1)[0].resolve(false);
|
||||
}
|
||||
}
|
||||
|
||||
function isCoolingDown(key, eventOptions, definition) {
|
||||
if (eventOptions.force) return false;
|
||||
const cooldownMs = Number(eventOptions.cooldownMs ?? definition?.cooldownMs ?? 0);
|
||||
@@ -251,7 +270,8 @@ export function createRaceAudioEngine(options = {}) {
|
||||
const definition = EVENT_BY_KEY.get(key);
|
||||
if (!definition || isCoolingDown(key, eventOptions, definition)) return { effectDone: Promise.resolve(false), voiceDone: Promise.resolve(false) };
|
||||
const effectDone = playEffect(key, eventOptions);
|
||||
const voiceDone = effectDone.catch(() => false).then(() => enqueueVoice(key, eventOptions));
|
||||
const queuedAt = now();
|
||||
const voiceDone = effectDone.catch(() => false).then(() => enqueueVoice(key, { ...eventOptions, queuedAt }));
|
||||
try { log({ timestamp: now(), event: key, audioFile: safeEffectPath(eventOptions.effectPath || definition.effect), priority: definition.priority, language: normalizeRaceAudioSettings(getSettings()).language, ...eventOptions.logData }); } catch { /* non-critical */ }
|
||||
return { effectDone, voiceDone };
|
||||
}
|
||||
@@ -336,6 +356,7 @@ export function createRaceAudioEngine(options = {}) {
|
||||
loadManifest, playEffect, trigger, runStartSequence,
|
||||
subscribeStartLights(listener) { lightSubscribers.add(listener); listener(lightState, {}); return () => lightSubscribers.delete(listener); },
|
||||
cancelStartSequence() { startSequenceGeneration += 1; emitLightState("IDLE"); },
|
||||
dropVoiceGroup(group) { dropQueuedGroup(String(group || "")); },
|
||||
resetStartLights() { emitLightState("IDLE"); },
|
||||
getStartLightState: () => lightState,
|
||||
getStatus: () => ({ loaded: Boolean(manifest), missingEffects: [...missingEffects], queuedVoices: voiceQueue.length, currentVoice: currentVoice?.key || "", lightState }),
|
||||
|
||||
@@ -156,12 +156,19 @@ export function applyPersistedStateHelper(persisted, deps) {
|
||||
applyTheme();
|
||||
}
|
||||
|
||||
export async function hydrateFromBackendHelper({ backend, t, getBackendUrl, applyPersistedState, saveState }) {
|
||||
// keepLocal: true while this browser is running the race (count-down, start sequence, a
|
||||
// live heat on its decoder). Then this browser's copy is the newest, and replacing it would
|
||||
// turn a heat that just started back to "ready" or drop laps that came in meanwhile.
|
||||
export async function hydrateFromBackendHelper({ backend, t, getBackendUrl, applyPersistedState, saveState, getLocalStateVersion = () => 0, getLocalStateDirty = () => false, keepLocal = () => false }) {
|
||||
if (keepLocal()) return;
|
||||
const versionAtFetch = getLocalStateVersion();
|
||||
try {
|
||||
const res = await fetch(`${getBackendUrl()}/api/state`);
|
||||
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||
const payload = await res.json();
|
||||
if (payload && payload.state && typeof payload.state === "object") {
|
||||
// Something changed here while the request was out (a lap, a start): this copy is older.
|
||||
const staleCopy = getLocalStateVersion() !== versionAtFetch || getLocalStateDirty() || keepLocal();
|
||||
if (!staleCopy && payload && payload.state && typeof payload.state === "object") {
|
||||
applyPersistedState(payload.state);
|
||||
saveState({ skipBackend: true });
|
||||
backend.lastSyncAt = payload.updatedAt || new Date().toISOString();
|
||||
|
||||
Reference in new issue
Block a user