Jagd auf WS Abbrüche
This commit is contained in:
1 parent
a95204b8d6
commit
1e2a58e563
9 files changed
+462
-51
No files matched your search
@@ -50,6 +50,7 @@ const dispatcherState = {
|
||||
ws: null,
|
||||
authenticated: false,
|
||||
reconnectTimer: null,
|
||||
lastWsSeq: null,
|
||||
crosshairGroupId: null,
|
||||
currentStreetId: null,
|
||||
streetsDialogGroupId: null,
|
||||
@@ -2717,13 +2718,21 @@ async function connectWebSocket() {
|
||||
|
||||
ws.addEventListener('message', handleWsMessage);
|
||||
|
||||
ws.addEventListener('close', () => {
|
||||
ws.addEventListener('close', event => {
|
||||
if (dispatcherState.ws !== ws) return;
|
||||
console.warn('[WS] Verbindung geschlossen', {
|
||||
code: event.code,
|
||||
reason: event.reason,
|
||||
wasClean: event.wasClean
|
||||
});
|
||||
dispatcherState.authenticated = false;
|
||||
setConnectionStatus('Getrennt – neuer Versuch …', 'disconnected');
|
||||
scheduleReconnect();
|
||||
});
|
||||
|
||||
ws.addEventListener('error', () => {
|
||||
ws.addEventListener('error', event => {
|
||||
if (dispatcherState.ws !== ws) return;
|
||||
console.warn('[WS] Verbindungsfehler', event);
|
||||
setConnectionStatus('Verbindungsfehler', 'disconnected');
|
||||
});
|
||||
} catch (error) {
|
||||
@@ -2762,6 +2771,27 @@ function sendWs(message) {
|
||||
return true;
|
||||
}
|
||||
|
||||
function checkWsSequence(message) {
|
||||
if (!Object.prototype.hasOwnProperty.call(message, 'seq')) return;
|
||||
|
||||
const seq = Number(message.seq);
|
||||
if (!Number.isFinite(seq) || seq <= 0) return;
|
||||
|
||||
const lastSeq = dispatcherState.lastWsSeq;
|
||||
if (lastSeq !== null && seq !== lastSeq + 1) {
|
||||
const text = `Die WebSocket-Verbindung hat Nachrichten verloren `
|
||||
+ `(erwartet: ${lastSeq + 1}, empfangen: ${seq}). `
|
||||
+ 'Bitte lade die Seite neu, damit alle Änderungen sichtbar werden.';
|
||||
if (typeof window.showReloadNotice === 'function') {
|
||||
window.showReloadNotice(text);
|
||||
} else {
|
||||
alert(`${text}\n\nBitte die Webseite neu laden.`);
|
||||
}
|
||||
}
|
||||
|
||||
dispatcherState.lastWsSeq = lastSeq === null ? seq : Math.max(lastSeq, seq);
|
||||
}
|
||||
|
||||
function handleWsMessage(event) {
|
||||
let message;
|
||||
try {
|
||||
@@ -2771,6 +2801,7 @@ function handleWsMessage(event) {
|
||||
return;
|
||||
}
|
||||
|
||||
checkWsSequence(message);
|
||||
console.debug('[WS RX]', message);
|
||||
console.log('[WS RX]', JSON.stringify(message));
|
||||
|
||||
@@ -2946,8 +2977,18 @@ function handleStreetUpdate(message) {
|
||||
|
||||
recolorStreet(street);
|
||||
|
||||
// Ein offener Straßendialog muss den neuen Serverzustand anzeigen.
|
||||
const streetModal = document.getElementById('streetModal');
|
||||
if (streetModal && streetModal.open
|
||||
&& dispatcherState.currentStreetId === Number(street.id)) {
|
||||
const stateSelect = document.getElementById('streetStateSelect');
|
||||
if (stateSelect) stateSelect.value = street.state || 'unbearbeitet';
|
||||
fillStreetGroupOptions(street.group_id);
|
||||
updateStreetGroupVisibility();
|
||||
}
|
||||
|
||||
const streetsDialog = document.getElementById('groupStreetsModal');
|
||||
if (dispatcherState.streetsDialogGroupId && streetsDialog.open) {
|
||||
if (dispatcherState.streetsDialogGroupId && streetsDialog && streetsDialog.open) {
|
||||
renderGroupStreetsDialog(dispatcherState.streetsDialogGroupId);
|
||||
}
|
||||
}
|
||||
@@ -2964,6 +3005,7 @@ function handleGroupStateUpdate(message) {
|
||||
if (GROUP_STATES.includes(payload.state)) {
|
||||
group.state = payload.state;
|
||||
updateGroupSummary(group);
|
||||
refreshGroupControls();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user