fix(sync): a save from an older copy can no longer put a run heat back to ready (1.89.37)
This commit is contained in:
1 parent
93c590e5b8
commit
cea278518e
7 files changed
+104
-6
No files matched your search
@@ -6,6 +6,7 @@ const { spawn, execFile } = require("child_process");
|
||||
const express = require("express");
|
||||
const QRCode = require("qrcode");
|
||||
const Database = require("better-sqlite3");
|
||||
const { keepStartedSessions } = require("./server/session_guard.js");
|
||||
const publicTrainingProfile = require("./server/public_training_profile");
|
||||
const { createBackupService } = require("./server/backup_service");
|
||||
const { createAuth, COOKIE_NAME: AUTH_COOKIE_NAME, TOKEN_MAX_AGE_MS } = require("./server/auth");
|
||||
@@ -408,8 +409,7 @@ app.post("/api/sim/stop", async (_req, res) => {
|
||||
const RESULT_PROTECTION_WINDOW_MS = Number(process.env.RC_RESULT_PROTECTION_WINDOW_MS || 15000);
|
||||
const recentSessionResultWrites = new Map();
|
||||
|
||||
function protectRecentSessionResults(incomingState) {
|
||||
const stored = readStoredAppState();
|
||||
function protectRecentSessionResults(incomingState, stored = readStoredAppState()) {
|
||||
if (!stored?.state?.resultsBySession || typeof stored.state.resultsBySession !== "object") return incomingState;
|
||||
const now = Date.now();
|
||||
for (const [sessionId, writtenAt] of recentSessionResultWrites) {
|
||||
@@ -507,7 +507,10 @@ app.post("/api/state", (req, res) => {
|
||||
return;
|
||||
}
|
||||
|
||||
const stateJson = JSON.stringify(protectRecentSessionResults(req.body));
|
||||
const stored = readStoredAppState();
|
||||
const { state: guarded, kept } = keepStartedSessions(req.body, stored?.state);
|
||||
if (kept.length) console.log(`[state] Kept ${kept.length} run heat(s) a save from an older copy tried to put back to ready: ${kept.join(", ")}`);
|
||||
const stateJson = JSON.stringify(protectRecentSessionResults(guarded, stored));
|
||||
const nowIso = new Date().toISOString();
|
||||
|
||||
db.prepare(
|
||||
|
||||
Reference in new issue
Block a user