fix(sync): retry failed saves every 5 s; restart the decoder simulator with the server (1.65.5)

This commit is contained in:
larssand committed 2026-11-05 19:48:32 +01:00
1 parent fed83ddf67
commit 54f4c3b923
7 files changed
+44 -6

No files matched your search

+9 -1
View File
@@ -166,7 +166,15 @@ const hydrateFromBackend = ({ initial = false } = {}) => hydrateFromBackendHelpe
const isRunningRaceHere = () => !overlayMode && 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 syncStateToBackendOnce = () => syncStateToBackendHelper({ backend, t, getBackendUrl, buildPersistableState, getLocalStateVersion: () => localStateVersion, getSyncedStateVersion: () => syncedStateVersion, setSyncedStateVersion: (value) => { syncedStateVersion = value; }, getLocalStateDirty: () => localStateDirty, setLocalStateDirty: (value) => { localStateDirty = value; } });
// A save that fails (server restarting, network gone) is tried again every 5 s until it gets
// through, so "Changes waiting to save" never hangs when nothing else changes.
let syncRetryTimer = null;
const syncStateToBackend = async () => {
await syncStateToBackendOnce();
clearTimeout(syncRetryTimer);
syncRetryTimer = backend.writeError && localStateDirty ? setTimeout(() => { if (!backend.pendingWrites) void syncStateToBackend(); }, 5000) : null;
};
const pingBackend = () => pingBackendHelper({ backend, t, getBackendUrl });
const checkAppVersion = () => checkAppVersionHelper({ onContact: (online) => {
backend.available = online;
+8 -2
View File
@@ -37,10 +37,16 @@ export function mountDecoderSimSettings(root, { state, t, escapeHtml, getBackend
if (running) {
await call("stop", {});
// Back to the real decoder address.
state.settings.wsUrl = state.settings.simPreviousWsUrl || state.settings.wsUrl;
const fallback = state.settings.wsUrl === simUrl() ? "ws://127.0.0.1:9000" : state.settings.wsUrl;
state.settings.wsUrl = state.settings.simPreviousWsUrl || fallback;
delete state.settings.simPreviousWsUrl;
} else {
await call("start", { lapSec: Number(root.querySelector("#simLapSec").value), spreadSec: Number(root.querySelector("#simSpreadSec").value) });
const lapSec = Number(root.querySelector("#simLapSec").value);
const spreadSec = Number(root.querySelector("#simSpreadSec").value);
await call("start", { lapSec, spreadSec });
// Kept with the settings so the server starts it again after a restart.
state.settings.simLapSec = lapSec;
state.settings.simSpreadSec = spreadSec;
if (state.settings.wsUrl !== simUrl()) state.settings.simPreviousWsUrl = state.settings.wsUrl;
state.settings.wsUrl = simUrl();
}
+1
View File
@@ -134,6 +134,7 @@ export function applyPersistedStateHelper(persisted, deps) {
wsUrl: persisted.settings?.wsUrl || state.settings.wsUrl || "ws://127.0.0.1:9000",
// The real decoder address while the decoder simulator is on (decoder_sim_view.js).
...(persisted.settings?.simPreviousWsUrl ? { simPreviousWsUrl: String(persisted.settings.simPreviousWsUrl) } : {}),
...(persisted.settings?.simLapSec ? { simLapSec: Number(persisted.settings.simLapSec), simSpreadSec: Number(persisted.settings.simSpreadSec ?? 1.5) } : {}),
splitDecoderEnabled: persisted.settings?.splitDecoderEnabled === true,
splitWsUrl: String(persisted.settings?.splitWsUrl || state.settings.splitWsUrl || "ws://127.0.0.1:9001"),
pitDecoderEnabled: persisted.settings?.pitDecoderEnabled === true,