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
@@ -14,6 +14,7 @@
|
||||
let adminSocket = null;
|
||||
let adminRetryTimer = null;
|
||||
let adminStopped = false;
|
||||
let lastAdminWsSeq = null;
|
||||
|
||||
function ensureDialog() {
|
||||
if (dialog) return dialog;
|
||||
@@ -89,6 +90,25 @@
|
||||
}
|
||||
}
|
||||
|
||||
function checkAdminWsSequence(message) {
|
||||
if (!Object.prototype.hasOwnProperty.call(message, 'seq')) return;
|
||||
|
||||
const seq = Number(message.seq);
|
||||
if (!Number.isFinite(seq) || seq <= 0) return;
|
||||
|
||||
if (lastAdminWsSeq !== null && seq !== lastAdminWsSeq + 1) {
|
||||
showReloadNotice(
|
||||
`Die WebSocket-Verbindung hat Nachrichten verloren `
|
||||
+ `(erwartet: ${lastAdminWsSeq + 1}, empfangen: ${seq}). `
|
||||
+ 'Bitte lade die Seite neu, damit alle Änderungen sichtbar werden.'
|
||||
);
|
||||
}
|
||||
|
||||
lastAdminWsSeq = lastAdminWsSeq === null
|
||||
? seq
|
||||
: Math.max(lastAdminWsSeq, seq);
|
||||
}
|
||||
|
||||
function appUrl(path) {
|
||||
if (typeof window.CMBNET_APP_URL === 'function') {
|
||||
return window.CMBNET_APP_URL(path);
|
||||
@@ -141,6 +161,9 @@
|
||||
} catch (error) {
|
||||
return;
|
||||
}
|
||||
|
||||
checkAdminWsSequence(message);
|
||||
|
||||
if (Number(message.code) === 1) {
|
||||
if (ws.readyState === WebSocket.OPEN) {
|
||||
ws.send(JSON.stringify({code: 2, msg: 'pong'}));
|
||||
@@ -154,13 +177,21 @@
|
||||
showReloadNotice(text);
|
||||
});
|
||||
|
||||
ws.addEventListener('close', () => {
|
||||
if (adminSocket === ws) adminSocket = null;
|
||||
ws.addEventListener('close', event => {
|
||||
if (adminSocket !== ws) return;
|
||||
console.warn('[WS] Admin-Watcher geschlossen', {
|
||||
code: event.code,
|
||||
reason: event.reason,
|
||||
wasClean: event.wasClean
|
||||
});
|
||||
adminSocket = null;
|
||||
scheduleAdminReconnect();
|
||||
});
|
||||
|
||||
ws.addEventListener('error', () => {
|
||||
if (adminSocket === ws) adminSocket = null;
|
||||
ws.addEventListener('error', event => {
|
||||
if (adminSocket !== ws) return;
|
||||
console.warn('[WS] Admin-Watcher-Fehler', event);
|
||||
adminSocket = null;
|
||||
scheduleAdminReconnect();
|
||||
});
|
||||
} catch (error) {
|
||||
|
||||
Reference in new issue
Block a user