Umbau broekr auf client-id

This commit is contained in:
concierge committed 2026-11-01 21:59:11 +01:00
1 parent 268e150f2b
commit a95204b8d6
17 files changed
+649 -388

No files matched your search

+6 -3
View File
@@ -14,7 +14,7 @@ async function loadBrokerStatus() {
if (!data.connections || data.connections.length === 0) {
const row = document.createElement('tr');
const cell = document.createElement('td');
cell.colSpan = 4;
cell.colSpan = 5;
cell.textContent = 'Keine aktiven Verbindungen';
row.appendChild(cell);
body.appendChild(row);
@@ -22,6 +22,9 @@ async function loadBrokerStatus() {
}
for (const conn of data.connections) {
const row = document.createElement('tr');
const tdClient = document.createElement('td');
tdClient.textContent = conn.client_id || '-';
tdClient.title = conn.client_id || '';
const tdId = document.createElement('td');
tdId.textContent = conn.account_id;
const tdName = document.createElement('td');
@@ -36,13 +39,13 @@ async function loadBrokerStatus() {
} else {
tdGroup.textContent = '-';
}
row.append(tdId, tdName, tdRole, tdGroup);
row.append(tdClient, tdId, tdName, tdRole, tdGroup);
body.appendChild(row);
}
} catch (error) {
console.error(error);
const body = document.getElementById('brokerStatusBody');
body.innerHTML = '<tr><td colspan="4">Fehler beim Laden</td></tr>';
body.innerHTML = '<tr><td colspan="5">Fehler beim Laden</td></tr>';
}
}
+15 -4
View File
@@ -2704,7 +2704,9 @@ async function connectWebSocket() {
ws.send(JSON.stringify({
code: 0,
msg: token,
session_id: window.CMBNET_CLIENT_SESSION_ID || ''
client_id: window.CMBNET_CLIENT_ID
|| window.CMBNET_CLIENT_SESSION_ID
|| ''
}));
dispatcherState.authenticated = true;
setConnectionStatus('Verbunden', 'connected');
@@ -2928,7 +2930,10 @@ function handleStreetUpdate(message) {
if (!street && payload.name) {
street = dispatcherState.streets.find(item => item.name === payload.name);
}
if (!street) return;
if (!street) {
console.warn('[WS] Code 100: Straße nicht im lokalen Zustand', payload);
return;
}
if (STREET_STATES.includes(payload.state)) {
street.state = payload.state;
@@ -2951,7 +2956,10 @@ function handleGroupStateUpdate(message) {
const payload = parsePayload(message.msg) || {};
const groupId = Number(payload.group_id ?? message.receiver_id);
const group = dispatcherState.groupById.get(groupId);
if (!group) return;
if (!group) {
console.warn('[WS] Code 200: Gruppe nicht im lokalen Zustand', payload);
return;
}
if (GROUP_STATES.includes(payload.state)) {
group.state = payload.state;
@@ -2963,7 +2971,10 @@ function handleGroupPositionUpdate(message) {
const payload = parsePayload(message.msg) || {};
const groupId = Number(payload.group_id ?? message.receiver_id);
const group = dispatcherState.groupById.get(groupId);
if (!group) return;
if (!group) {
console.warn('[WS] Code 300: Gruppe nicht im lokalen Zustand', payload);
return;
}
const lat = Number(payload.lat);
const lon = Number(payload.lon);
+16 -5
View File
@@ -1154,7 +1154,9 @@ function connectWebSocket() {
ws.send(JSON.stringify({
code: 0,
msg: token,
session_id: window.CMBNET_CLIENT_SESSION_ID || ''
client_id: window.CMBNET_CLIENT_ID
|| window.CMBNET_CLIENT_SESSION_ID
|| ''
}));
// Fallback für ältere Server, die noch keine Code-0-Bestätigung
@@ -1326,7 +1328,9 @@ function parseFlexibleTimestamp(value) {
function handleWs(event) {
let message;
try { message = JSON.parse(event.data); } catch(e) { return; }
console.debug('[WS RX]', message);
if (message.code === 0) {
state.authenticated = true;
flushWsOutbox();
@@ -1356,6 +1360,8 @@ function handleWs(event) {
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) {}
@@ -1365,12 +1371,17 @@ function handleWs(event) {
const p = typeof message.msg === 'string' ? JSON.parse(message.msg) : message.msg;
const gid = Number(p.group_id || message.receiver_id);
const g = state.groupById.get(gid);
if (g && p.lat && p.lon) {
g.last_lat = p.lat;
g.last_lon = p.lon;
const lat = Number(p.lat);
const lon = Number(p.lon);
if (g && Number.isFinite(lat) && Number.isFinite(lon)
&& p.lat !== null && p.lon !== null) {
g.last_lat = lat;
g.last_lon = lon;
g.last_pos_ts = parseFlexibleTimestamp(p.ts) || Date.now();
g.last_pos_at = new Date(g.last_pos_ts).toISOString();
if (viewMode === 'mobile_dispatcher') showAllGroupPositions();
} else if (!g) {
console.warn('[WS] Code 300: Gruppe nicht im lokalen Zustand', p);
}
} catch(e) {}
} else if (message.code === 2000 || message.code === 1000 || message.code === 1100) {