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
@@ -48,6 +48,7 @@ const state = {
|
||||
authenticated: false,
|
||||
outbox: [],
|
||||
reconnectTimer: null,
|
||||
lastWsSeq: null,
|
||||
chatMessages: [],
|
||||
chatKeys: new Set(),
|
||||
userMarker: null,
|
||||
@@ -694,7 +695,7 @@ function buildGroupSelect() {
|
||||
state.groups.forEach(g => {
|
||||
const opt = document.createElement('option');
|
||||
opt.value = g.id;
|
||||
opt.textContent = g.aliasname || g.id;
|
||||
opt.textContent = `${g.aliasname || g.id} (${g.state || 'offen'})`;
|
||||
sel.appendChild(opt);
|
||||
});
|
||||
}
|
||||
@@ -1141,8 +1142,51 @@ function openGroupNavigation() {
|
||||
window.location.href = buildNavigationUrl(coordinates.lat, coordinates.lon);
|
||||
}
|
||||
|
||||
function setMobileWsStatus(label, status) {
|
||||
const element = document.getElementById('mobileWsStatus');
|
||||
if (!element) return;
|
||||
|
||||
element.textContent = `WS: ${label}`;
|
||||
element.title = `WebSocket: ${label}`;
|
||||
element.classList.remove('is-connected', 'is-connecting', 'is-disconnected', 'is-error');
|
||||
element.classList.add(`is-${status}`);
|
||||
}
|
||||
|
||||
function scheduleMobileReconnect() {
|
||||
if (state.reconnectTimer) return;
|
||||
state.reconnectTimer = setTimeout(() => {
|
||||
state.reconnectTimer = null;
|
||||
connectWebSocket();
|
||||
}, 3000);
|
||||
}
|
||||
|
||||
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 = state.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.`);
|
||||
}
|
||||
}
|
||||
|
||||
// Bei einer Dublette nicht rückwärts zählen; so löst nicht jede folgende
|
||||
// Nachricht erneut einen vermeintlichen Sprung aus.
|
||||
state.lastWsSeq = lastSeq === null ? seq : Math.max(lastSeq, seq);
|
||||
}
|
||||
|
||||
function connectWebSocket() {
|
||||
if (state.ws && (state.ws.readyState === WebSocket.OPEN || state.ws.readyState === WebSocket.CONNECTING)) return;
|
||||
|
||||
setMobileWsStatus('verbinde …', 'connecting');
|
||||
fetchJson(`${apiBase}/auth/ws-token`).then(res => {
|
||||
const token = res.token;
|
||||
const ws = new WebSocket(wsUrl);
|
||||
@@ -1151,6 +1195,7 @@ function connectWebSocket() {
|
||||
// Der Server bestätigt den Handshake mit Code 0. Bis dahin werden
|
||||
// fachliche Nachrichten im Outbox-Puffer gesammelt.
|
||||
state.authenticated = false;
|
||||
setMobileWsStatus('Anmeldung …', 'connecting');
|
||||
ws.send(JSON.stringify({
|
||||
code: 0,
|
||||
msg: token,
|
||||
@@ -1167,17 +1212,31 @@ function connectWebSocket() {
|
||||
&& ws.readyState === WebSocket.OPEN
|
||||
&& !state.authenticated) {
|
||||
state.authenticated = true;
|
||||
setMobileWsStatus('verbunden', 'connected');
|
||||
flushWsOutbox();
|
||||
}
|
||||
}, 1500);
|
||||
});
|
||||
ws.addEventListener('message', handleWs);
|
||||
ws.addEventListener('close', () => {
|
||||
ws.addEventListener('close', event => {
|
||||
if (state.ws !== ws) return;
|
||||
console.warn('[WS] Verbindung geschlossen', {
|
||||
code: event.code,
|
||||
reason: event.reason,
|
||||
wasClean: event.wasClean
|
||||
});
|
||||
state.authenticated = false;
|
||||
setTimeout(connectWebSocket, 3000);
|
||||
setMobileWsStatus('getrennt', 'disconnected');
|
||||
scheduleMobileReconnect();
|
||||
});
|
||||
ws.addEventListener('error', event => {
|
||||
if (state.ws !== ws) return;
|
||||
console.warn('[WS] Verbindungsfehler', event);
|
||||
setMobileWsStatus('Fehler', 'error');
|
||||
});
|
||||
}).catch(() => {
|
||||
setTimeout(connectWebSocket, 3000);
|
||||
setMobileWsStatus('Token-Fehler', 'error');
|
||||
scheduleMobileReconnect();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1325,16 +1384,127 @@ function parseFlexibleTimestamp(value) {
|
||||
return Number.isNaN(parsed) ? null : parsed;
|
||||
}
|
||||
|
||||
function applyMobileStreetUpdate(payload) {
|
||||
if (!payload) return;
|
||||
|
||||
const streetId = Number(payload.street_id);
|
||||
const hasGroup = Object.prototype.hasOwnProperty.call(payload, 'group_id');
|
||||
const newGroupId = hasGroup && payload.group_id !== null && payload.group_id !== ''
|
||||
? Number(payload.group_id)
|
||||
: null;
|
||||
const ownGroupId = Number(state.currentGroupId) || null;
|
||||
|
||||
let street = Number.isFinite(streetId) ? state.streetById.get(streetId) : null;
|
||||
if (!street && payload.name) {
|
||||
street = state.streets.find(item => item.name === payload.name) || null;
|
||||
}
|
||||
|
||||
if (!street) {
|
||||
// Eine Straße kann durch eine Zuweisung neu in der Gruppe auftauchen.
|
||||
// Der Broker liefert Name, ID, Status und Zielgruppe im Payload mit.
|
||||
if (ownGroupId && newGroupId === ownGroupId
|
||||
&& Number.isFinite(streetId) && payload.name) {
|
||||
street = {
|
||||
id: streetId,
|
||||
name: payload.name,
|
||||
state: payload.state || 'zugewiesen',
|
||||
group_id: ownGroupId
|
||||
};
|
||||
state.streets.push(street);
|
||||
state.streetById.set(street.id, street);
|
||||
} else {
|
||||
console.warn('[WS] Code 100: Straße nicht im lokalen Zustand', payload);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (payload.state) street.state = payload.state;
|
||||
if (hasGroup) street.group_id = newGroupId;
|
||||
|
||||
const index = state.streets.indexOf(street);
|
||||
if (ownGroupId && hasGroup && newGroupId !== ownGroupId && index >= 0) {
|
||||
// Die Straße wurde einer anderen Gruppe zugewiesen und gehört
|
||||
// nicht mehr zur ToDo-Liste dieser Webview.
|
||||
state.streets.splice(index, 1);
|
||||
state.streetById.delete(street.id);
|
||||
} else if (ownGroupId && newGroupId === ownGroupId && index < 0) {
|
||||
state.streets.push(street);
|
||||
state.streetById.set(street.id, street);
|
||||
}
|
||||
}
|
||||
|
||||
const isCurrent = state.currentStreetId == street.id;
|
||||
if (isCurrent && state.streetById.has(street.id)) {
|
||||
if (state.currentPolyline) {
|
||||
state.currentPolyline.setStyle({
|
||||
color: STREET_COLORS[street.state] || STREET_COLORS.unbearbeitet
|
||||
});
|
||||
}
|
||||
|
||||
const dialog = document.getElementById('mobileStreetStateDialog');
|
||||
if (dialog && dialog.open) {
|
||||
document.getElementById('mobileStreetStateTitle').textContent =
|
||||
`Straße: ${street.name}`;
|
||||
document.getElementById('mobileStreetStateSelect').value =
|
||||
street.state || 'unbearbeitet';
|
||||
fillMobileStreetGroupSelect(street.group_id);
|
||||
updateMobileStreetGroupVisibility();
|
||||
}
|
||||
} else if (isCurrent && !state.streetById.has(street.id)) {
|
||||
if (state.currentPolyline) {
|
||||
map.removeLayer(state.currentPolyline);
|
||||
state.currentPolyline = null;
|
||||
}
|
||||
state.currentStreetId = null;
|
||||
closeMobileStreetState();
|
||||
if (state.streets.length) {
|
||||
selectStreet(state.streets[0]);
|
||||
}
|
||||
}
|
||||
|
||||
buildStreetList();
|
||||
updateWorkButton();
|
||||
}
|
||||
|
||||
function applyMobileGroupStateUpdate(message) {
|
||||
const payload = typeof message.msg === 'string'
|
||||
? JSON.parse(message.msg)
|
||||
: message.msg;
|
||||
if (!payload) return;
|
||||
|
||||
const groupId = Number(payload.group_id ?? message.receiver_id);
|
||||
const group = state.groupById.get(groupId);
|
||||
if (!group) {
|
||||
console.warn('[WS] Code 200: Gruppe nicht im lokalen Zustand', payload);
|
||||
return;
|
||||
}
|
||||
|
||||
if (payload.state) group.state = payload.state;
|
||||
|
||||
if (viewMode === 'mobile_dispatcher') {
|
||||
const select = document.getElementById('mobileGroupSelect');
|
||||
const option = select
|
||||
? select.querySelector(`option[value="${group.id}"]`)
|
||||
: null;
|
||||
if (option) {
|
||||
option.textContent = `${group.aliasname || group.id} (${group.state || 'offen'})`;
|
||||
}
|
||||
updateNavigationButton();
|
||||
}
|
||||
}
|
||||
|
||||
function handleWs(event) {
|
||||
let message;
|
||||
try { message = JSON.parse(event.data); } catch(e) { return; }
|
||||
|
||||
checkWsSequence(message);
|
||||
console.debug('[WS RX]', message);
|
||||
|
||||
if (message.code === 0) {
|
||||
state.authenticated = true;
|
||||
setMobileWsStatus('verbunden', 'connected');
|
||||
flushWsOutbox();
|
||||
} else if (message.code === 1) {
|
||||
setMobileWsStatus('verbunden', 'connected');
|
||||
if (state.ws && state.ws.readyState === WebSocket.OPEN) {
|
||||
state.ws.send(JSON.stringify({code: 2, msg: 'pong'}));
|
||||
}
|
||||
@@ -1351,20 +1521,17 @@ function handleWs(event) {
|
||||
// Street update
|
||||
try {
|
||||
const p = typeof message.msg === 'string' ? JSON.parse(message.msg) : message.msg;
|
||||
if (p && p.street_id) {
|
||||
const street = state.streetById.get(Number(p.street_id));
|
||||
if (street) {
|
||||
if (p.state) street.state = p.state;
|
||||
if (p.group_id !== undefined) street.group_id = p.group_id;
|
||||
if (state.currentStreetId == street.id && state.currentPolyline) {
|
||||
state.currentPolyline.setStyle({color: STREET_COLORS[street.state] || STREET_COLORS.unbearbeitet});
|
||||
}
|
||||
buildStreetList();
|
||||
} else {
|
||||
console.warn('[WS] Code 100: Straße nicht im lokalen Zustand', p);
|
||||
}
|
||||
}
|
||||
} catch(e) {}
|
||||
applyMobileStreetUpdate(p);
|
||||
} catch(e) {
|
||||
console.warn('[WS] Code 100 konnte nicht verarbeitet werden', e, message.msg);
|
||||
}
|
||||
} else if (message.code === 200) {
|
||||
// Group state update
|
||||
try {
|
||||
applyMobileGroupStateUpdate(message);
|
||||
} catch(e) {
|
||||
console.warn('[WS] Code 200 konnte nicht verarbeitet werden', e, message.msg);
|
||||
}
|
||||
} else if (message.code === 300) {
|
||||
// Group position
|
||||
try {
|
||||
@@ -1410,10 +1577,6 @@ function handleWs(event) {
|
||||
if (Number(message.sender_id) !== currentAccountId) {
|
||||
playSound();
|
||||
showChatPopup(text, getSenderName(message, payload));
|
||||
// Switch to chat tab
|
||||
document.querySelectorAll('.mobile-tab').forEach(b => {
|
||||
if (b.dataset.tab === 'chat') b.click();
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user