feat(decoder): alarm banner and warning sound when the decoder drops or goes silent during a heat (1.89.25)
This commit is contained in:
1 parent
259945799d
commit
239cac8033
18 files changed
+225
-5
No files matched your search
+57
@@ -21,6 +21,7 @@ import { renderDaySchedulePanel, bindDaySchedulePanel, buildDaySchedulePrintHtml
|
||||
import { beginSession as beginSessionControl, finishSession as finishSessionControl, pauseSession as pauseSessionControl, resumeSession as resumeSessionControl } from "./session_control.js";
|
||||
import { normalizeSeries, buildSeriesStandings, getSeriesRoundStatus, getSeriesRoundNextStep, getSeriesDayResult } from "./series_logic.js";
|
||||
import { renderSeriesView } from "./series_view.js";
|
||||
import { decoderAlarm } from "./decoder_watch.js";
|
||||
import { RACE_AUDIO_EVENT_DEFINITIONS, createRaceAudioEngine, normalizeRaceAudioSettings, isSilencedDuringRace, formatSpokenLapTime, resolveDriverCallStyle, formatCarCall, formatHeatCallDrivers } from "./race_audio.js";
|
||||
|
||||
import { renderRaceFormatField, renderRaceFormatContextCard, getRaceSummaryItems, getRaceSummaryWarnings, renderManageStatusBadge, renderRaceWizardSteps, renderRaceWizardContent, renderRaceStandingsTable } from "./race_setup_ui.js";
|
||||
@@ -2978,6 +2979,13 @@ const TRANSLATIONS = {
|
||||
"audio.lap_time_calls_always": "Träning och race",
|
||||
"audio.lap_time_calls_off": "Av",
|
||||
"audio.lap_time_call_name": "Säg namnet före varvtiden",
|
||||
"audio.decoder_alarm": "Decoderlarm under heat",
|
||||
"audio.decoder_alarm_hint": "Röd banner och varningsljud om decodern tappar anslutningen eller blir tyst medan ett heat pågår.",
|
||||
"decoder_alarm.lost": "⚠ Decodern tappade anslutningen {time} – varv registreras inte",
|
||||
"decoder_alarm.silent": "⚠ Inga passeringar på {seconds} s – kolla decodern och slingan",
|
||||
"decoder_alarm.back": "✓ Decodern fungerar igen – {seconds} s utan tidtagning. Kontrollera varven i Domarvyn.",
|
||||
"decoder_alarm.reconnect": "Anslut igen",
|
||||
"decoder_alarm.silence": "Tysta",
|
||||
"audio.practice_hype": "Peppande träningsutrop",
|
||||
"audio.practice_hype_hint": "Bara i träning, aldrig i kval eller final: varvjubileum, nära bästa varvet, snittet går ner, snabbare varv i rad, snabbare än förra gången, placering i klassen och dueller. Varje utrop kan också stängas av i listan nedan.",
|
||||
"audio.race_leader_calls": "Ledare i kval och final",
|
||||
@@ -5284,6 +5292,13 @@ const TRANSLATIONS = {
|
||||
"audio.lap_time_calls_always": "Practice and races",
|
||||
"audio.lap_time_calls_off": "Off",
|
||||
"audio.lap_time_call_name": "Say the name before the lap time",
|
||||
"audio.decoder_alarm": "Decoder alarm during heats",
|
||||
"audio.decoder_alarm_hint": "Red banner and a warning sound when the decoder disconnects or goes silent while a heat is running.",
|
||||
"decoder_alarm.lost": "⚠ Decoder disconnected at {time} – laps are not being recorded",
|
||||
"decoder_alarm.silent": "⚠ No passings for {seconds} s – check the decoder and the loop",
|
||||
"decoder_alarm.back": "✓ Decoder working again – {seconds} s without timing. Check the laps in Judging.",
|
||||
"decoder_alarm.reconnect": "Reconnect",
|
||||
"decoder_alarm.silence": "Silence",
|
||||
"audio.practice_hype": "Practice hype calls",
|
||||
"audio.practice_hype_hint": "Practice only, never in qualifying or finals: lap milestones, close to best, average going down, faster laps in a row, faster than last time, class rank and duels. Each call can also be turned off in the list below.",
|
||||
"audio.race_leader_calls": "Leader in qualifying and finals",
|
||||
@@ -7717,6 +7732,48 @@ function updateConnectionBadge() {
|
||||
dom.connectionBadge.className = `badge ${isOnline ? "badge-online" : "badge-offline"}`;
|
||||
}
|
||||
|
||||
// Decoder alarm (decoder_watch.js): checked every second on the race master. Red banner, warning
|
||||
// sound repeated every 30 s until fixed or silenced, then 10 s of "working again, X s without timing".
|
||||
const decoderAlarmRuntime = { kind: "ok", since: 0, silenced: false, lastSoundAt: 0, backUntil: 0, backSeconds: 0 };
|
||||
function checkDecoderAlarm(now = Date.now()) {
|
||||
const el = document.getElementById("decoderAlarm");
|
||||
if (!el) return;
|
||||
const session = getActiveSession();
|
||||
const competitors = Object.values(state.resultsBySession?.[session?.id]?.competitors || {});
|
||||
const bestLapMs = Math.min(...competitors.map((item) => Number(item.bestLapMs) || Infinity));
|
||||
// Only the race master with a decoder configured (no decoder at all is a normal setup, not an alarm).
|
||||
const enabled = state.settings.raceAudio?.decoderAlarm !== false && Boolean(state.settings.wsUrl) && isRaceMaster();
|
||||
const alarm = enabled ? decoderAlarm(state.decoder, session, { startPending: Boolean(pendingStartSessionId), bestLapMs: Number.isFinite(bestLapMs) ? bestLapMs : 0, now }) : { kind: "ok", sinceMs: 0 };
|
||||
const run = decoderAlarmRuntime;
|
||||
if (alarm.kind !== run.kind) {
|
||||
if (run.kind !== "ok" && alarm.kind === "ok" && enabled) Object.assign(run, { backUntil: now + 10000, backSeconds: Math.round((now - run.since) / 1000) });
|
||||
Object.assign(run, { kind: alarm.kind, since: now - alarm.sinceMs, silenced: false, lastSoundAt: 0 });
|
||||
}
|
||||
if (run.kind !== "ok" && !run.silenced && now - run.lastSoundAt >= 30000) {
|
||||
run.lastSoundAt = now;
|
||||
const played = triggerRaceAudio("timing_disconnected", { interrupt: true, force: true });
|
||||
if (played?.skipped || !state.settings.raceAudio?.enabled || state.settings.raceAudio?.muted) playFinishSiren();
|
||||
}
|
||||
const html = run.kind === "lost" ? t("decoder_alarm.lost", { time: new Date(run.since).toLocaleTimeString() })
|
||||
: run.kind === "silent" ? t("decoder_alarm.silent", { seconds: Math.round((now - run.since) / 1000) })
|
||||
: now < run.backUntil ? t("decoder_alarm.back", { seconds: run.backSeconds }) : "";
|
||||
el.hidden = !html;
|
||||
el.classList.toggle("is-back", run.kind === "ok");
|
||||
const key = `${run.kind}|${html}|${run.silenced}`;
|
||||
if (el.dataset.key === key) return;
|
||||
el.dataset.key = key;
|
||||
el.dataset.kind = html ? run.kind : "";
|
||||
el.innerHTML = html ? `<strong>${escapeHtml(html)}</strong>${run.kind === "lost" ? `<button type="button" class="btn btn-small" data-decoder-alarm="reconnect">${escapeHtml(t("decoder_alarm.reconnect"))}</button>` : ""}${run.kind !== "ok" && !run.silenced ? `<button type="button" class="btn btn-small" data-decoder-alarm="silence">${escapeHtml(t("decoder_alarm.silence"))}</button>` : ""}` : "";
|
||||
}
|
||||
if (!overlayMode) {
|
||||
document.addEventListener("click", (event) => {
|
||||
const action = event.target instanceof Element ? event.target.closest("[data-decoder-alarm]")?.dataset.decoderAlarm : "";
|
||||
if (action === "silence") { decoderAlarmRuntime.silenced = true; checkDecoderAlarm(); }
|
||||
if (action === "reconnect") connectDecoder();
|
||||
});
|
||||
setInterval(() => checkDecoderAlarm(), 1000);
|
||||
}
|
||||
|
||||
function renderEvents() {
|
||||
renderEventWorkspace("track");
|
||||
}
|
||||
|
||||
@@ -253,6 +253,7 @@ function connectDecoderRole(role, deps) {
|
||||
decoderDiagnostics.socket(role, "connected", url);
|
||||
state.decoder[connectedKey] = true;
|
||||
state.decoder[lastErrorKey] = "";
|
||||
if (role === "main") state.decoder.disconnectedAt = null; // decoder alarm (decoder_watch.js)
|
||||
reconnectAttempts.delete(role);
|
||||
saveState({ skipBackend: true });
|
||||
updateConnectionBadge();
|
||||
@@ -285,6 +286,8 @@ function connectDecoderRole(role, deps) {
|
||||
wsClient.onclose = () => {
|
||||
decoderDiagnostics.socket(role, "disconnected", url);
|
||||
state.decoder[connectedKey] = false;
|
||||
// The first drop is kept while reconnect attempts fail, so the alarm counts from it.
|
||||
if (role === "main" && !state.decoder.disconnectedAt) state.decoder.disconnectedAt = Date.now();
|
||||
saveState({ skipBackend: true });
|
||||
updateConnectionBadge();
|
||||
|
||||
@@ -375,6 +378,7 @@ export function processDecoderMessageHelper(msg, deps, decoderRole = "main") {
|
||||
// check needs to see passings while the heat hasn't started yet. Main line only, the
|
||||
// same line that counts laps.
|
||||
if (decoderRole === "main") {
|
||||
if (state.decoder) state.decoder.lastPassingAt = Date.now(); // the decoder alarm's silence check (wall clock, not the decoder's RTC)
|
||||
const seenTransponder = String(msg.transponder ?? msg.tran_code ?? "").replace("ID:", "").trim();
|
||||
if (seenTransponder) onTransponderSeen(seenTransponder);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
// Decoder alarm: during a running heat (or its start count-down) the race controller must know at
|
||||
// once when timing stops - the decoder link dropped ("lost"), or the link is up but no passing has
|
||||
// come for far longer than a lap ("silent": AMMC runs, the decoder box or loop is dead).
|
||||
// Pure logic; the banner, sound and repeat live in app.js.
|
||||
|
||||
export const LOST_GRACE_MS = 3000; // a quick reconnect doesn't alarm
|
||||
export const SILENT_MIN_MS = 30000; // never "silent" sooner than this
|
||||
export const START_GRACE_MS = 30000; // cars are still on the grid / first lap
|
||||
const PRACTICE_TYPES = new Set(["open_practice", "free_practice", "practice"]);
|
||||
|
||||
// The silence limit: 30 s, or 3 laps of the fastest lap so far when that is longer.
|
||||
export function silentLimitMs(bestLapMs = 0) {
|
||||
const best = Number(bestLapMs) || 0;
|
||||
return Math.max(SILENT_MIN_MS, best > 0 ? best * 3 : 0);
|
||||
}
|
||||
|
||||
// decoder: { connected, disconnectedAt, lastPassingAt }; session: { status, startedAt };
|
||||
// options: { startPending, bestLapMs, now }. Returns { kind: "ok" | "lost" | "silent", sinceMs }.
|
||||
export function decoderAlarm(decoder = {}, session = null, { startPending = false, bestLapMs = 0, now = Date.now() } = {}) {
|
||||
const running = session?.status === "running";
|
||||
if (!running && !startPending) return { kind: "ok", sinceMs: 0 };
|
||||
if (!decoder.connected) {
|
||||
const since = Number(decoder.disconnectedAt) || 0;
|
||||
const sinceMs = since ? Math.max(0, now - since) : LOST_GRACE_MS;
|
||||
return sinceMs >= LOST_GRACE_MS ? { kind: "lost", sinceMs } : { kind: "ok", sinceMs: 0 };
|
||||
}
|
||||
if (!running) return { kind: "ok", sinceMs: 0 };
|
||||
// Practice can be quiet for long stretches (nobody driving): only a dropped link alarms there.
|
||||
if (PRACTICE_TYPES.has(String(session.type || ""))) return { kind: "ok", sinceMs: 0 };
|
||||
const startedAt = Number(session.startedAt) || 0;
|
||||
if (!startedAt || now - startedAt < START_GRACE_MS) return { kind: "ok", sinceMs: 0 };
|
||||
// Silence counts from the last passing, or from the start when none has come in this heat.
|
||||
const lastPassingAt = Math.max(Number(decoder.lastPassingAt) || 0, startedAt);
|
||||
const sinceMs = now - lastPassingAt;
|
||||
return sinceMs >= silentLimitMs(bestLapMs) ? { kind: "silent", sinceMs } : { kind: "ok", sinceMs: 0 };
|
||||
}
|
||||
@@ -103,6 +103,8 @@ export function normalizeRaceAudioSettings(value = {}) {
|
||||
raceCallouts: source.raceCallouts === "full" ? "full" : "passing",
|
||||
// Practice hype calls (practice_hype_logic.js); never in qualifying or finals.
|
||||
practiceHype: source.practiceHype !== false,
|
||||
// Banner + warning when the decoder drops or goes silent during a heat (decoder_watch.js).
|
||||
decoderAlarm: source.decoderAlarm !== false,
|
||||
// Short lap time per passing, "Anders, 17 six": "practice" (default), "always" or "off".
|
||||
lapTimeCalls: ["practice", "always", "off"].includes(source.lapTimeCalls) ? source.lapTimeCalls : "practice",
|
||||
lapTimeCallName: source.lapTimeCallName === true,
|
||||
|
||||
@@ -254,6 +254,7 @@ export function renderSettings(deps) {
|
||||
<label class="toggle"><input type="checkbox" name="raceAudioEnabled" form="settingsForm" ${raceAudio.enabled ? "checked" : ""} /><span>${t("audio.enabled")}</span></label>
|
||||
<label class="toggle"><input type="checkbox" name="raceAudioMuted" form="settingsForm" ${raceAudio.muted ? "checked" : ""} /><span>${t("audio.mute")}</span></label>
|
||||
<label><span>${t("audio.race_callouts")}</span><select name="raceAudioRaceCallouts" form="settingsForm"><option value="passing" ${raceAudio.raceCallouts === "passing" ? "selected" : ""}>${t("audio.race_callouts_passing")}</option><option value="full" ${raceAudio.raceCallouts === "full" ? "selected" : ""}>${t("audio.race_callouts_full")}</option></select></label>
|
||||
<label class="toggle" title="${t("audio.decoder_alarm_hint")}"><input type="checkbox" name="raceAudioDecoderAlarm" form="settingsForm" ${raceAudio.decoderAlarm ? "checked" : ""} /><span>${t("audio.decoder_alarm")}</span></label>
|
||||
<label class="toggle" title="${t("audio.practice_hype_hint")}"><input type="checkbox" name="raceAudioPracticeHype" form="settingsForm" ${raceAudio.practiceHype ? "checked" : ""} /><span>${t("audio.practice_hype")}</span></label>
|
||||
<label title="${t("audio.lap_time_calls_hint")}"><span>${t("audio.lap_time_calls")}</span><select name="raceAudioLapTimeCalls" form="settingsForm">${["practice", "always", "off"].map((value) => `<option value="${value}" ${raceAudio.lapTimeCalls === value ? "selected" : ""}>${t("audio.lap_time_calls_" + value)}</option>`).join("")}</select></label>
|
||||
<label class="toggle"><input type="checkbox" name="raceAudioLapTimeCallName" form="settingsForm" ${raceAudio.lapTimeCallName ? "checked" : ""} /><span>${t("audio.lap_time_call_name")}</span></label>
|
||||
@@ -677,6 +678,7 @@ Erik Eriksson;654321;4WD;Associated;;</code></pre>
|
||||
maxStartDelay: Number(form.get("raceAudioMaxDelay")), perCompetitorPassingTone: form.get("raceAudioPerCompetitor") === "on",
|
||||
raceCallouts: String(form.get("raceAudioRaceCallouts") || "passing"),
|
||||
practiceHype: form.get("raceAudioPracticeHype") === "on",
|
||||
decoderAlarm: form.get("raceAudioDecoderAlarm") === "on",
|
||||
lapTimeCalls: String(form.get("raceAudioLapTimeCalls") || "practice"),
|
||||
lapTimeCallName: form.get("raceAudioLapTimeCallName") === "on",
|
||||
raceLeaderCalls: String(form.get("raceAudioLeaderCalls") || "both"),
|
||||
|
||||
@@ -4953,6 +4953,13 @@ tr:has(> td > .medal-3) { background: linear-gradient(90deg, rgba(205, 127, 60,
|
||||
/* Race Controller Master: banner for the browsers that follow, badge for the master. */
|
||||
.controller-banner { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; margin: 0 0 10px; padding: 8px 12px; border: 1px solid var(--accent); border-radius: 8px; background: color-mix(in srgb, var(--accent) 12%, var(--panel)); color: var(--text); font-size: 0.85rem; }
|
||||
.controller-banner[hidden] { display: none; }
|
||||
/* Decoder alarm (decoder_watch.js): red and pulsing while timing is down, green when it is back. */
|
||||
.decoder-alarm { position: sticky; top: 0; z-index: 50; display: flex; flex-wrap: wrap; align-items: center; gap: 8px 12px; margin: 0 0 10px; padding: 10px 14px; border: 2px solid #ff4d4f; border-radius: 8px; background: color-mix(in srgb, #ff4d4f 22%, var(--panel)); color: var(--text); font-size: 1rem; box-shadow: 0 4px 18px rgb(0 0 0 / 35%); animation: decoder-alarm-pulse 1.2s ease-in-out infinite; }
|
||||
.decoder-alarm[hidden] { display: none; }
|
||||
.decoder-alarm strong { flex: 1 1 260px; }
|
||||
.decoder-alarm.is-back { border-color: #2fa84f; background: color-mix(in srgb, #2fa84f 18%, var(--panel)); animation: none; }
|
||||
@keyframes decoder-alarm-pulse { 50% { background: color-mix(in srgb, #ff4d4f 40%, var(--panel)); } }
|
||||
@media (prefers-reduced-motion: reduce) { .decoder-alarm { animation: none; } }
|
||||
.controller-banner.is-flash { animation: controller-flash 0.9s ease 2; }
|
||||
@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); }
|
||||
|
||||
Reference in new issue
Block a user