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);
|
||||
|
||||
Reference in new issue
Block a user