Compare commits

...

2 Commits

Author SHA1 Message Date
admin b0a66ed982 Merge branch 'main' of https://git.sases.pl/sases/als-alert-screen 2026-06-08 09:39:11 +02:00
admin 7171e5ea09 alarm clear on disconnect 2026-06-08 09:37:18 +02:00
+15 -10
View File
@@ -303,9 +303,9 @@
ws.onmessage = (ev) => { ws.onmessage = (ev) => {
try { try {
const msg = JSON.parse(ev.data); const msg = JSON.parse(ev.data);
if (msg.type === "machine_update" && msg.data) { if (msg.data) {
machineData[id] = { ...msg.data, _ts: msg.timestamp }; machineData[id] = { ...msg.data, _ts: msg.timestamp };
updateDisplay(); updateDisplay();
} }
} catch (e) { } catch (e) {
/* ignore malformed frames */ /* ignore malformed frames */
@@ -317,12 +317,17 @@
refreshStatus(); refreshStatus();
}; };
ws.onclose = () => { ws.onclose = () => {
wsStatus[id] = "disconnected"; wsStatus[id] = "disconnected";
refreshStatus(); // Usuwamy dane maszyny przy rozłączeniu nie możemy potwierdzić
setTimeout(() => connect(id), RECONNECT_MS); // aktualnego stanu, więc nie trzymamy przestarzałego alarmu w cache.
}; // Po ponownym połączeniu serwer wyśle aktualny stan.
} delete machineData[id];
updateDisplay();
refreshStatus();
setTimeout(() => connect(id), RECONNECT_MS);
};
}
// ── Display logic ───────────────────────────────────────────────────────── // ── Display logic ─────────────────────────────────────────────────────────
@@ -373,7 +378,7 @@
card.className = "machine-card"; card.className = "machine-card";
card.innerHTML = ` card.innerHTML = `
<div class="card-machine-id">${d.machine ?? id}</div> <div class="card-machine-id">${d.machine ?? id}</div>
<!--- <div class="card-status">${d.status ?? "ALARM"}</div> --> <!-- <div class="card-status">${d.status ?? "ALARM"}</div> -->
`; `;
grid.appendChild(card); grid.appendChild(card);
}); });