denozord/router-lists-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(network-map): enhance node metadata handling and display for improved network issue identification
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 2m7s
Details

Browse Source
This commit is contained in:
denozord
2026-03-04 22:27:28 +07:00
parent d68b3aa104
commit d31c90b60e
1 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/NetworkMapUnifi.jsx
+48 -10
View File
@@ -167,6 +167,21 @@ export default function NetworkMapUnifi({
return { low, belowNorm, normal };
}, [alertSettings]);
const nodeMetaByIp = useMemo(() => {
const byIp = new Map();
servers.forEach((s) => {
const ip = String(s.ip || '');
if (!ip) return;
byIp.set(ip, {
ip,
dns: s.dns || '',
type: String(s.type || '').toLowerCase(),
nodeLabel: s.dns ? String(s.dns).split('.')[0] : ip,
});
});
return byIp;
}, [servers]);
useEffect(() => {
const el = containerRef.current;
if (!el) return;
@@ -501,7 +516,9 @@ export default function NetworkMapUnifi({
linkCount: 0,
staleCount: 0,
maxPingMs: null,
maxPingPeerLabel: null,
minSpeedMbps: null,
minSpeedPeerLabel: null,
});
});
@@ -516,15 +533,24 @@ export default function NetworkMapUnifi({
[e.from, e.to].forEach((nodeIp) => {
const node = byIp.get(String(nodeIp));
if (!node) return;
const peerIp = String(nodeIp) === String(e.from) ? String(e.to) : String(e.from);
const peerMeta = nodeMetaByIp.get(peerIp);
const peerLabel = peerMeta?.nodeLabel || peerIp;
if (e.stale) node.staleCount += 1;
if (typeof e.pingMs === 'number') {
node.maxPingMs = node.maxPingMs == null ? e.pingMs : Math.max(node.maxPingMs, e.pingMs);
if (node.maxPingMs == null || e.pingMs > node.maxPingMs) {
node.maxPingMs = e.pingMs;
node.maxPingPeerLabel = peerLabel;
}
}
const down = e.speed?.tcpDownloadBps != null ? e.speed.tcpDownloadBps / 1_000_000 : null;
const up = e.speed?.tcpUploadBps != null ? e.speed.tcpUploadBps / 1_000_000 : null;
const edgeMin = down != null && up != null ? Math.min(down, up) : (down ?? up);
if (edgeMin != null && Number.isFinite(edgeMin)) {
node.minSpeedMbps = node.minSpeedMbps == null ? edgeMin : Math.min(node.minSpeedMbps, edgeMin);
if (node.minSpeedMbps == null || edgeMin < node.minSpeedMbps) {
node.minSpeedMbps = edgeMin;
node.minSpeedPeerLabel = peerLabel;
}
}
});
});
@@ -536,23 +562,23 @@ export default function NetworkMapUnifi({
if (n.maxPingMs != null) {
if (n.maxPingMs >= 120) {
issues.push('Очень высокий ping');
issues.push(`Очень высокий ping${n.maxPingPeerLabel ? ` (с ${n.maxPingPeerLabel})` : ''}`);
riskScore += 3;
} else if (n.maxPingMs >= 80) {
issues.push('Повышенный ping');
issues.push(`Повышенный ping${n.maxPingPeerLabel ? ` (с ${n.maxPingPeerLabel})` : ''}`);
riskScore += 2;
}
}
if (n.minSpeedMbps != null) {
if (n.minSpeedMbps < mapSpeedThresholds.low) {
issues.push('Низкая скорость');
issues.push(`Низкая скорость${n.minSpeedPeerLabel ? ` (с ${n.minSpeedPeerLabel})` : ''}`);
riskScore += 3;
} else if (n.minSpeedMbps < mapSpeedThresholds.belowNorm) {
issues.push('Скорость ниже нормы');
issues.push(`Скорость ниже нормы${n.minSpeedPeerLabel ? ` (с ${n.minSpeedPeerLabel})` : ''}`);
riskScore += 2;
} else if (n.minSpeedMbps < mapSpeedThresholds.normal) {
issues.push('Норма скорости не достигнута');
issues.push(`Норма скорости не достигнута${n.minSpeedPeerLabel ? ` (с ${n.minSpeedPeerLabel})` : ''}`);
riskScore += 1;
}
}
@@ -572,6 +598,10 @@ export default function NetworkMapUnifi({
issues,
riskScore,
nodeLabel: n.dns ? String(n.dns).split('.')[0] : n.ip,
affectedLink:
(n.maxPingPeerLabel && `${n.dns ? String(n.dns).split('.')[0] : n.ip} ↔ ${n.maxPingPeerLabel}`) ||
(n.minSpeedPeerLabel && `${n.dns ? String(n.dns).split('.')[0] : n.ip} ↔ ${n.minSpeedPeerLabel}`) ||
'—',
};
})
.filter((n) => n.issues.length > 0)
@@ -580,7 +610,7 @@ export default function NetworkMapUnifi({
(b.maxPingMs ?? -1) - (a.maxPingMs ?? -1) ||
(a.minSpeedMbps ?? Infinity) - (b.minSpeedMbps ?? Infinity)
);
}, [servers, connections, routedEdges, mapSpeedThresholds]);
}, [servers, connections, routedEdges, mapSpeedThresholds, nodeMetaByIp]);
const criticalNodes = useMemo(
() => problematicNodes.filter((n) => n.riskScore >= 4).slice(0, 8),
@@ -1078,13 +1108,14 @@ export default function NetworkMapUnifi({
<th scope="col">Ping max</th>
<th scope="col">Speed min</th>
<th scope="col">Связи</th>
<th scope="col">Проблемная связь</th>
<th scope="col">Проблемы</th>
</tr>
</thead>
<tbody>
{criticalNodes.length === 0 ? (
<tr>
<td colSpan={6} className="text-muted">Критичных узлов не найдено</td>
<td colSpan={7} className="text-muted">Критичных узлов не найдено</td>
</tr>
) : (
criticalNodes.map((n) => (
@@ -1101,6 +1132,9 @@ export default function NetworkMapUnifi({
<td>{n.maxPingMs != null ? `${n.maxPingMs} ms` : '—'}</td>
<td>{n.minSpeedMbps != null ? `${n.minSpeedMbps.toFixed(1)} Мбит/с` : '—'}</td>
<td>{n.linkCount}</td>
<td>
<span className="text-muted">{n.affectedLink}</span>
</td>
<td>
<span className="badge bg-orange-lt text-orange">
{n.issues.slice(0, 2).join(', ')}
@@ -1130,13 +1164,14 @@ export default function NetworkMapUnifi({
<th scope="col">Ping max</th>
<th scope="col">Speed min</th>
<th scope="col">Stale</th>
<th scope="col">Проблемная связь</th>
<th scope="col">Проблемы</th>
</tr>
</thead>
<tbody>
{warningNodes.length === 0 ? (
<tr>
<td colSpan={5} className="text-muted">Узлов с предупреждениями не найдено</td>
<td colSpan={6} className="text-muted">Узлов с предупреждениями не найдено</td>
</tr>
) : (
warningNodes.map((n) => (
@@ -1152,6 +1187,9 @@ export default function NetworkMapUnifi({
{n.staleCount}
</span>
</td>
<td>
<span className="text-muted">{n.affectedLink}</span>
</td>
<td>
<span className="text-muted">{n.issues.slice(0, 2).join(', ')}</span>
</td>