Separat status och mottagningsräknare för varje kanal.
Senaste råmeddelande, fel och ignoreringsorsaker. Pausa visning, rensa och kopiera logg. Uppdateras utan att störa inställningsfält eller tidtagning.
This commit is contained in:
1 parent
8aedf83826
commit
a0c3d3039e
15 files changed
+265
-14
No files matched your search
+25
-4
@@ -1,3 +1,4 @@
|
||||
import { decoderDiagnostics } from "./decoder_diagnostics.js";
|
||||
import { getControlledLapStreak } from "./training_logic.js";
|
||||
|
||||
const PRACTICE_SESSION_TYPES = new Set(["open_practice", "free_practice", "practice"]);
|
||||
@@ -164,10 +165,12 @@ function connectDecoderRole(role, deps) {
|
||||
if (!url) return;
|
||||
|
||||
state.decoder[lastErrorKey] = "";
|
||||
decoderDiagnostics.socket(role, "connecting", url);
|
||||
saveState();
|
||||
try {
|
||||
setWsClient(role, new WebSocket(url));
|
||||
} catch (error) {
|
||||
decoderDiagnostics.socket(role, "error", url);
|
||||
state.decoder[lastErrorKey] = t("error.ws_invalid", { msg: error instanceof Error ? error.message : String(error) });
|
||||
saveState();
|
||||
renderView();
|
||||
@@ -176,6 +179,7 @@ function connectDecoderRole(role, deps) {
|
||||
|
||||
const wsClient = getWsClient(role);
|
||||
wsClient.onopen = () => {
|
||||
decoderDiagnostics.socket(role, "connected", url);
|
||||
state.decoder[connectedKey] = true;
|
||||
state.decoder[lastErrorKey] = "";
|
||||
saveState();
|
||||
@@ -187,11 +191,13 @@ function connectDecoderRole(role, deps) {
|
||||
|
||||
wsClient.onmessage = (event) => {
|
||||
state.decoder[lastMessageKey] = Date.now();
|
||||
decoderDiagnostics.frame(role, event.data);
|
||||
|
||||
let parsed;
|
||||
try {
|
||||
parsed = JSON.parse(String(event.data));
|
||||
} catch {
|
||||
decoderDiagnostics.parseError(role);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -205,6 +211,7 @@ function connectDecoderRole(role, deps) {
|
||||
};
|
||||
|
||||
wsClient.onclose = () => {
|
||||
decoderDiagnostics.socket(role, "disconnected", url);
|
||||
state.decoder[connectedKey] = false;
|
||||
saveState();
|
||||
updateConnectionBadge();
|
||||
@@ -227,6 +234,7 @@ function connectDecoderRole(role, deps) {
|
||||
};
|
||||
|
||||
wsClient.onerror = () => {
|
||||
decoderDiagnostics.socket(role, "error", url);
|
||||
state.decoder[lastErrorKey] = t("error.decoder_connection");
|
||||
saveState();
|
||||
updateConnectionBadge();
|
||||
@@ -239,6 +247,7 @@ function connectDecoderRole(role, deps) {
|
||||
export function disconnectDecoderHelper(options = {}, deps) {
|
||||
const { state, saveState, getWsClient, setWsClient, getReconnectTimer, updateConnectionBadge } = deps;
|
||||
Object.keys(DECODER_ROLES).forEach((role) => {
|
||||
decoderDiagnostics.socket(role, "disconnected");
|
||||
clearTimeout(getReconnectTimer(role));
|
||||
const wsClient = getWsClient(role);
|
||||
if (wsClient) {
|
||||
@@ -268,29 +277,35 @@ export function processDecoderMessageHelper(msg, deps, decoderRole = "main") {
|
||||
lastOverlayTop3BySession, lastOverlayBestLapByKey, triggerRaceAudio = () => {}, getTrackRecordMs = () => null,
|
||||
} = deps;
|
||||
|
||||
const report = (reason, outcome) => decoderDiagnostics.message(decoderRole, msg, reason, outcome);
|
||||
if (!msg || typeof msg !== "object") {
|
||||
report("invalid_message");
|
||||
return;
|
||||
}
|
||||
|
||||
const type = String(msg.msg || msg.type || "").toUpperCase();
|
||||
if (type !== "PASSING") {
|
||||
report("not_passing");
|
||||
return;
|
||||
}
|
||||
|
||||
const session = getActiveSession();
|
||||
if (!session || session.status !== "running") {
|
||||
report("no_running_session");
|
||||
return;
|
||||
}
|
||||
|
||||
const timestamp = parseRtcTime(msg.rtc_time) || Date.now();
|
||||
const transponder = String(msg.transponder ?? msg.tran_code ?? "").replace("ID:", "").trim();
|
||||
if (!transponder) {
|
||||
report("missing_transponder");
|
||||
return;
|
||||
}
|
||||
|
||||
const result = ensureSessionResult(session.id);
|
||||
const competitor = resolveCompetitor(session, transponder, { state, t, findEventTeamForPassing });
|
||||
if (competitor.ignore) {
|
||||
report("not_registered");
|
||||
triggerRaceAudio("unknown_transponder", { variables: { transponder }, scope: transponder, logData: { raceId: session.eventId, sessionId: session.id } });
|
||||
return;
|
||||
}
|
||||
@@ -331,7 +346,7 @@ export function processDecoderMessageHelper(msg, deps, decoderRole = "main") {
|
||||
const startMode = normalizeStartMode(session.startMode);
|
||||
|
||||
if (decoderRole === "pit_entry") {
|
||||
if (entry.pitActive) return;
|
||||
if (entry.pitActive) { report("already_in_pit"); return; }
|
||||
entry.pitEnteredAt = timestamp;
|
||||
entry.pitActive = true;
|
||||
entry.pitEntryDriverId = entry.driverId || null;
|
||||
@@ -344,12 +359,13 @@ export function processDecoderMessageHelper(msg, deps, decoderRole = "main") {
|
||||
pushOverlayEvent("pit", `${entry.displayName || entry.driverName} • PIT IN`);
|
||||
triggerRaceAudio("entering_pits", { variant: entry.carId || entry.driverId || transponder, driverId: entry.driverId, logData: { raceId: session.eventId, driverId: entry.driverId } });
|
||||
saveState();
|
||||
report("pit_entry", "handled");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (decoderRole === "pit_exit") {
|
||||
const enteredAt = Number(entry.pitEnteredAt || 0);
|
||||
if (!enteredAt || timestamp <= enteredAt) return;
|
||||
if (!enteredAt || timestamp <= enteredAt) { report("pit_exit_without_entry"); return; }
|
||||
const pitStopMs = timestamp - enteredAt;
|
||||
const pitDriverId = entry.pitEntryDriverId ?? entry.driverId ?? null;
|
||||
const pitDriverName = entry.pitEntryDriverName || entry.driverName || "";
|
||||
@@ -374,13 +390,14 @@ export function processDecoderMessageHelper(msg, deps, decoderRole = "main") {
|
||||
pushOverlayEvent("pit", `${entry.displayName || entry.driverName} • PIT ${formatLap(pitStopMs)}`);
|
||||
triggerRaceAudio("leaving_pits", { variant: entry.carId || entry.driverId || transponder, driverId: entry.driverId, logData: { raceId: session.eventId, driverId: entry.driverId } });
|
||||
saveState();
|
||||
report("pit_exit", "handled");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (decoderRole === "split") {
|
||||
const baseTimestamp = Number(entry.lastTimestamp || (startMode === "mass" ? session.startedAt : 0) || 0);
|
||||
if (!baseTimestamp || timestamp <= baseTimestamp) return;
|
||||
if (entry.lastSplitTimestamp && timestamp - Number(entry.lastSplitTimestamp) < 1000) return;
|
||||
if (!baseTimestamp || timestamp <= baseTimestamp) { report("split_without_reference"); return; }
|
||||
if (entry.lastSplitTimestamp && timestamp - Number(entry.lastSplitTimestamp) < 1000) { report("split_locktime"); return; }
|
||||
const splitMs = timestamp - baseTimestamp;
|
||||
const previousSplitMs = Number(entry.lastSplitMs || 0) || 0;
|
||||
entry.previousSplitMs = previousSplitMs || null;
|
||||
@@ -406,6 +423,7 @@ export function processDecoderMessageHelper(msg, deps, decoderRole = "main") {
|
||||
});
|
||||
pushOverlayEvent("split", `${entry.displayName || entry.driverName} • ${formatLap(splitMs)}`);
|
||||
saveState();
|
||||
report("split", "handled");
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -414,6 +432,7 @@ export function processDecoderMessageHelper(msg, deps, decoderRole = "main") {
|
||||
entry.lastTimestamp = timestamp;
|
||||
announcePassing(entry);
|
||||
saveState();
|
||||
report("start_reference", "handled");
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -463,6 +482,7 @@ export function processDecoderMessageHelper(msg, deps, decoderRole = "main") {
|
||||
result.passings.push(passing);
|
||||
persistPassingToBackend(session.id, passing);
|
||||
saveState();
|
||||
report("below_min", "invalid");
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -529,5 +549,6 @@ export function processDecoderMessageHelper(msg, deps, decoderRole = "main") {
|
||||
}
|
||||
announcePassing(entry);
|
||||
saveState();
|
||||
report(validationWarning || "lap_counted", "handled");
|
||||
return true;
|
||||
}
|
||||
Reference in new issue
Block a user