fix(decoder): reconnect attempts no longer save to the server, back off to 15 s (1.65.1)

This commit is contained in:
larssand committed 2026-11-05 18:53:49 +01:00
1 parent e4874fd558
commit e682a2056c
4 files changed
+25 -11

No files matched your search

+16 -8
View File
@@ -201,12 +201,13 @@ function resolveCompetitor(session, transponder, deps) {
}
export function connectDecoderHelper(deps) {
reconnectAttempts.clear();
deps.disconnectDecoder({ silent: true });
deps.state.decoder.lastError = "";
deps.state.decoder.splitLastError = "";
deps.state.decoder.pitEntryLastError = "";
deps.state.decoder.pitExitLastError = "";
deps.saveState();
deps.saveState({ skipBackend: true });
connectDecoderRole("main", deps);
if (deps.state.settings.splitDecoderEnabled && deps.state.settings.splitWsUrl) {
connectDecoderRole("split", deps);
@@ -219,6 +220,9 @@ export function connectDecoderHelper(deps) {
}
}
// Connection state is not saved to the server: a decoder that does not answer is retried every
// 2 s, and a server save per attempt made the save status flicker all the time.
const reconnectAttempts = new Map();
function connectDecoderRole(role, deps) {
const {
state, t, saveState, getWsClient, setWsClient, getReconnectTimer, setReconnectTimer,
@@ -231,13 +235,13 @@ function connectDecoderRole(role, deps) {
state.decoder[lastErrorKey] = "";
decoderDiagnostics.socket(role, "connecting", url);
saveState();
saveState({ skipBackend: true });
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();
saveState({ skipBackend: true });
renderView();
return;
}
@@ -247,7 +251,8 @@ function connectDecoderRole(role, deps) {
decoderDiagnostics.socket(role, "connected", url);
state.decoder[connectedKey] = true;
state.decoder[lastErrorKey] = "";
saveState();
reconnectAttempts.delete(role);
saveState({ skipBackend: true });
updateConnectionBadge();
if (["timing", "overlay", "race_day"].includes(getCurrentView())) {
renderView();
@@ -278,11 +283,14 @@ function connectDecoderRole(role, deps) {
wsClient.onclose = () => {
decoderDiagnostics.socket(role, "disconnected", url);
state.decoder[connectedKey] = false;
saveState();
saveState({ skipBackend: true });
updateConnectionBadge();
if (state.settings.autoReconnect) {
clearTimeout(getReconnectTimer(role));
// 2 s, 4 s, 8 s, then every 15 s while no decoder answers.
const attempt = (reconnectAttempts.get(role) || 0) + 1;
reconnectAttempts.set(role, attempt);
setReconnectTimer(role, setTimeout(() => {
const roleEnabled = role === "main"
|| (role === "split" && state.settings.splitDecoderEnabled)
@@ -290,7 +298,7 @@ function connectDecoderRole(role, deps) {
if (!state.decoder[connectedKey] && roleEnabled) {
connectDecoderRole(role, deps);
}
}, 2000));
}, Math.min(15000, 2000 * 2 ** (attempt - 1))));
}
if (["timing", "overlay", "race_day"].includes(getCurrentView())) {
@@ -301,7 +309,7 @@ function connectDecoderRole(role, deps) {
wsClient.onerror = () => {
decoderDiagnostics.socket(role, "error", url);
state.decoder[lastErrorKey] = t("error.decoder_connection");
saveState();
saveState({ skipBackend: true });
updateConnectionBadge();
if (["timing", "overlay", "race_day"].includes(getCurrentView())) {
renderView();
@@ -329,7 +337,7 @@ export function disconnectDecoderHelper(options = {}, deps) {
state.decoder.pitEntryConnected = false;
state.decoder.pitExitConnected = false;
if (!options.silent) {
saveState();
saveState({ skipBackend: true });
}
updateConnectionBadge();
}