From 87461daa4229551ef4257137595f97131d6aba94 Mon Sep 17 00:00:00 2001
From: Denozordec
Date: Sun, 22 Nov 2026 10:11:20 +0700
Subject: [PATCH] =?UTF-8?q?fix(netflow):=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
=?UTF-8?q?=D0=B2=D0=B8=D1=82=D1=8C=20=D1=80=D0=B0=D1=81=D1=87=D1=91=D1=82?=
=?UTF-8?q?=20=D0=BE=D1=82=D0=B4=D0=B0=D1=87=D0=B8=20=D0=B8=20=D0=B7=D0=B0?=
=?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20=D0=BA=D0=B0=D1=80=D1=82?=
=?UTF-8?q?=D1=8B=20=D1=81=D0=B5=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/(main)/network-map/page.tsx | 8 +-
.../services/traffic-flow-analytics.test.ts | 19 +++-
.../src/services/traffic-flow-analytics.ts | 101 ++++++++++--------
.../src/services/traffic-flow-dest.test.ts | 7 +-
backend/src/services/traffic-flow-dest.ts | 25 +++++
.../traffic-flow-engine-owned.test.ts | 2 +-
backend/src/services/traffic-flow-engine.ts | 13 +--
.../traffic-flow-read-http.owned.test.ts | 13 ++-
components/traffic/flow-analytics-panel.tsx | 1 +
lib/network-map-response.test.ts | 6 ++
lib/network-map-response.ts | 8 +-
tests/e2e/network-map-flow.spec.ts | 5 +-
12 files changed, 147 insertions(+), 61 deletions(-)
diff --git a/app/(main)/network-map/page.tsx b/app/(main)/network-map/page.tsx
index 11e3e5c4..2f0d3f4e 100644
--- a/app/(main)/network-map/page.tsx
+++ b/app/(main)/network-map/page.tsx
@@ -617,7 +617,7 @@ function NetflowRateBadge({
onClick={(e) => { e.stopPropagation(); onOpen?.(e) }}
>
- Поток NetFlow между узлами (как в «Трафик»: 5 мин, без overlay/mesh). Скорость канала — отдельно.
+ Поток NetFlow между узлами за интервал карты, без overlay/mesh.
{inFlight=false;if(!cancelled&&request===epoch)setFlowLoading(false)})
}
queueMicrotask(()=>{if(!cancelled)tick()})
@@ -2224,7 +2224,7 @@ function NetworkMapContent() {
{useLiveData ? (readAt ? "Снимок API · ответ "+new Date(readAt).toLocaleTimeString("ru-RU")+" (время браузера)" : "Данные карты неизвестны") : "Демо · mock"}
- {useLiveData&&{showNetflow||showServices?(flowReadAt?"NetFlow · 5 мин · ответ "+new Date(flowReadAt).toLocaleTimeString("ru-RU")+" (время браузера) · "+(flowListener?"приёмник включён":"приёмник выключен"):"Данные NetFlow неизвестны"):"NetFlow: отображение и обновление выключены"}}
+ {useLiveData&&{showNetflow||showServices?(flowReadAt?`NetFlow · ${mapWindowSec / 60} мин${mapWindowSec < 300 ? " из 5 запрошенных" : ""} · ответ `+new Date(flowReadAt).toLocaleTimeString("ru-RU")+" (время браузера) · "+(flowListener?"приёмник включён":"приёмник выключен"):"Данные NetFlow неизвестны"):"NetFlow: отображение и обновление выключены"}}
{useLiveData&&flowLoading&&(showNetflow||showServices)&&Обновление NetFlow…}
{useLiveData&&flowError&&(showNetflow||showServices)&&NetFlow: {flowError}. {flowReadAt?"Сохранён предыдущий снимок NetFlow; актуальность не подтверждена.":"Первоначальная загрузка NetFlow не подтверждена."}}
{useLiveData&&dnsError&&DNS: {dnsError}. Связи по неизвестному адресу не подтверждены.}
@@ -2934,7 +2934,7 @@ function NetworkMapContent() {
? "Ping и/или TX/RX — с последнего прогона speed-пробы; проба сопоставляется с этим GRE по WAN и интерфейсам. "
: useLiveData?"Измерения GRE неизвестны: нет подходящей пробы. ":"Измерения демонстрационные. "}
{spGr?"Проба "+spGr.id+" · время Ping: "+(spGr.lastPingAt?new Date(spGr.lastPingAt).toLocaleString("ru-RU"):"неизвестно")+" · время TX/RX неизвестно. ":""}
- Поток — снимок NetFlow за 5 мин (как в «Трафик»: без overlay/mesh), не ёмкость канала.
+ Поток по данным NetFlow за {mapWindowSec / 60} мин, без overlay/mesh.
diff --git a/backend/src/services/traffic-flow-analytics.test.ts b/backend/src/services/traffic-flow-analytics.test.ts
index 3c7f6670..4143db97 100644
--- a/backend/src/services/traffic-flow-analytics.test.ts
+++ b/backend/src/services/traffic-flow-analytics.test.ts
@@ -2,6 +2,7 @@ import assert from "node:assert/strict"
import { rememberServerIfaces, resetIfaceCacheForTests } from "./traffic-flow-ifindex.js"
import {
ingestParsedFlowsForServerForTests,
+ getRingMbps,
resetFlowRingsForTests,
} from "./traffic-flow-ingest.js"
import { buildFlowAnalytics, formatLiveSseFromBuilder, getFlowMonthly, listFlowClients, listFlowExporters, resetFlowAnalyticsCacheForTests } from "./traffic-flow-analytics.js"
@@ -98,6 +99,9 @@ ingestParsedFlowsForServerForTests(serverId, [
])
try {
+ const ring = getRingMbps(serverId)
+ assert.equal(ring.rxNow,0)
+ assert.equal(ring.txNow,12800 * 8 / 2 / 1e6)
const all = await buildFlowAnalytics({ minutes: 5, serverId })
assert.equal(all.applications[0]?.label, "HTTPS")
assert.ok(all.protocols.some((p) => p.label === "TCP"))
@@ -119,6 +123,14 @@ try {
const other = await buildFlowAnalytics({ minutes: 5, serverId: 99 })
assert.equal(other.conversations, 0)
+
+ ingestParsedFlowsForServerForTests(serverId, [
+ { src:"10.1.1.9", dst:"9.9.9.9", proto:6, srcPort:50001, dstPort:443, inIface:"2", bytes:1200, packets:2 },
+ { src:"8.8.4.4", dst:"9.9.9.9", proto:6, srcPort:50002, dstPort:443, inIface:"2", bytes:3400, packets:4 },
+ ])
+ const mixed = await buildFlowAnalytics({ minutes:5, serverId })
+ assert.equal(mixed.bytes, 12800 + 1200 + 3400)
+ assert.equal(mixed.bpsNow, mixed.bytes * 8 / 300, "Unattributed transit remains in the total rate")
} finally {
resetFlowRingsForTests()
resetIfaceCacheForTests()
@@ -561,16 +573,21 @@ resetFlowRingsForTests()
await dbQuery("DELETE FROM flow_buckets WHERE server_id=$1", [serverId])
for (const minutesAgo of [2, 3, 4, 10]) {
await dbQuery(`INSERT INTO flow_buckets (server_id,bucket_at,src,dst,in_iface,bytes,packets)
- VALUES ($1,date_trunc('minute',now())-($2::int*interval '1 minute'),'10.1.1.8','8.8.8.8','2',60000,10)`, [serverId, minutesAgo])
+ VALUES ($1,date_trunc('minute',now())-($2::int*interval '1 minute'),'10.1.1.8','8.8.8.8','2',60000,10),
+ ($1,date_trunc('minute',now())-($2::int*interval '1 minute'),'8.8.8.8','10.1.1.8','11',240000,40)`, [serverId, minutesAgo])
}
for (const minutes of [5, 15]) for (const dedup of [true, false]) {
resetFlowAnalyticsCacheForTests()
const history = await buildFlowAnalytics({ minutes, serverId, dedup, excludeMesh:false, excludeOverlay:false })
assert.equal(history.rxSeries.length, minutes)
assert.equal(history.rxSeries.filter(v => v > 0).length, minutes === 5 ? 3 : 4)
+ assert.deepEqual(history.rxSeries,history.txSeries.map(v => v * 4))
const missing = await buildFlowAnalytics({ minutes, serverId, iface:"not-an-interface" })
assert(missing.rxSeries.every(v => v === 0), "Historical chart respects interface filter")
}
+const historicalCard = (await listFlowExporters(5)).exporters.find(s => s.id === String(serverId))!
+assert(historicalCard.txNow > 0)
+assert.equal(historicalCard.rxNow,historicalCard.txNow * 4)
} finally {
for (const table of ["flow_daily_dims", "flow_hour_facts", "flow_daily_facts", "flow_buckets", "traffic_samples", "user_interface_bindings", "server_snapshots"]) {
diff --git a/backend/src/services/traffic-flow-analytics.ts b/backend/src/services/traffic-flow-analytics.ts
index 08886eea..3f20f334 100644
--- a/backend/src/services/traffic-flow-analytics.ts
+++ b/backend/src/services/traffic-flow-analytics.ts
@@ -29,7 +29,7 @@ import { applicationName, flowRowMatchesFilter } from "./traffic-flow-apps.js"
import { dedupFlowRowsMaxBytes, flowTupleKey } from "./traffic-flow-dedup.js"
import { enqueueRipeMisses } from "./traffic-flow-ripe.js"
import { classifyFlowPlane, flowBps, shouldKeepPlane } from "./traffic-flow-planes.js"
-import { resolveInternetDest } from "./traffic-flow-dest.js"
+import { flowRateDirection, resolveInternetDest } from "./traffic-flow-dest.js"
import { refreshFlowCatalogInBackground } from "./traffic-flow-classify.js"
import {
enGreIfaceNames,
@@ -106,22 +106,29 @@ async function userIfaceAllow(userId: string): Promise