A modern and elegant dashboard for network traffic visualization and analysis.
feat: Implement granular summary data fetching and caching, and enable summary totals for the dashboard rules tab.
luoleiaf210a8feb23
diff --git a/apps/collector/src/modules/websocket/websocket.server.ts b/apps/collector/src/modules/websocket/websocket.server.tsindex 1f7e528..0d93609 100644--- a/apps/collector/src/modules/websocket/websocket.server.ts+++ b/apps/collector/src/modules/websocket/websocket.server.ts@@ -573,6 +573,8 @@ export class StatsWebSocketServer {}private needsCoreSummary(fields: SummaryFieldMask): boolean {+ // Note: countryStats and deviceStats are intentionally omitted here+ // because they are fetched via independent DB queries/routes.return (fields.totals ||fields.topDomains ||@@ -943,9 +945,6 @@ export class StatsWebSocketServer {const includeSummaryData = wantsFullSummary && this.hasAnySummaryFields(summaryFields);const needsCoreSummary = includeSummaryData && this.needsCoreSummary(summaryFields);- const summaryFieldsKey = includeSummaryData- ? this.buildSummaryFieldsKey(summaryFields)- : 'none';if (needsCoreSummary) {this.wsMetrics.fullSummaryCalls += 1;@@ -959,7 +958,7 @@ export class StatsWebSocketServer {}const cacheTTL = this.getBaseSummaryCacheTTL(range);- const baseCacheKey = `${resolvedBackendId}|${range.start || ''}|${range.end || ''}|${summaryFieldsKey}`;+ const baseCacheKey = `${resolvedBackendId}|${range.start || ''}|${range.end || ''}`;let baseCached = this.baseSummaryCache.get(baseCacheKey);const baseCacheValid = baseCached && Date.now() - baseCached.ts < cacheTTL;@@ -982,38 +981,37 @@ export class StatsWebSocketServer {active: true};- if (includeSummaryData && !baseCacheValid) {- const needsCountryStats = summaryFields.countryStats;- const needsDeviceStats = summaryFields.deviceStats;-- const [summaryRes, countryStatsRes, deviceStatsRes] = await Promise.all([- needsCoreSummary- ? this.statsService.getSummaryWithRouting(resolvedBackendId, timeRange)- : Promise.resolve(null),- needsCountryStats- ? this.statsService.getCountryStatsWithRouting(resolvedBackendId, timeRange, 50)- : Promise.resolve(undefined),- needsDeviceStats- ? this.statsService.getDeviceStatsWithRouting(resolvedBackendId, timeRange, 50)- : Promise.resolve(undefined),- ]);-- const nextCached: {- summary?: { totalConnections: number; totalUpload: number; totalDownload: number; uniqueDomains: number; uniqueIPs: number };- topDomains?: DomainStats[];- topIPs?: IPStats[];- proxyStats?: ProxyStats[];- countryStats?: CountryStats[];- deviceStats?: DeviceStats[];- ruleStats?: RuleStats[];- hourlyStats?: HourlyStats[];- ts: number;- } = {- ts: Date.now(),- };-- if (summaryRes) {- if (summaryFields.totals) {+ if (includeSummaryData) {+ const fetchCore = needsCoreSummary && (!baseCacheValid || baseCached?.summary === undefined);+ const fetchCountry = summaryFields.countryStats && (!baseCacheValid || baseCached?.countryStats === undefined);+ const fetchDevice = summaryFields.deviceStats && (!baseCacheValid || baseCached?.deviceStats === undefined);++ if (fetchCore || fetchCountry || fetchDevice) {+ const [summaryRes, countryStatsRes, deviceStatsRes] = await Promise.all([+ fetchCore+ ? this.statsService.getSummaryWithRouting(resolvedBackendId, timeRange)+ : Promise.resolve(null),+ fetchCountry+ ? this.statsService.getCountryStatsWithRouting(resolvedBackendId, timeRange, 50)+ : Promise.resolve(undefined),+ fetchDevice+ ? this.statsService.getDeviceStatsWithRouting(resolvedBackendId, timeRange, 50)+ : Promise.resolve(undefined),+ ]);++ const nextCached: {+ summary?: { totalConnections: number; totalUpload: number; totalDownload: number; uniqueDomains: number; uniqueIPs: number };+ topDomains?: DomainStats[];+ topIPs?: IPStats[];+ proxyStats?: ProxyStats[];+ countryStats?: CountryStats[];+ deviceStats?: DeviceStats[];+ ruleStats?: RuleStats[];+ hourlyStats?: HourlyStats[];+ ts: number;+ } = (baseCacheValid && baseCached) ? { ...baseCached, ts: Date.now() } : { ts: Date.now() };++ if (fetchCore && summaryRes) {nextCached.summary = {totalConnections: summaryRes.totalConnections,totalUpload: summaryRes.totalUpload,@@ -1021,49 +1019,43 @@ export class StatsWebSocketServer {uniqueDomains: summaryRes.totalDomains,uniqueIPs: summaryRes.totalIPs,};- }- if (summaryFields.topDomains) {nextCached.topDomains = summaryRes.topDomains;- }- if (summaryFields.topIPs) {nextCached.topIPs = summaryRes.topIPs;- }- if (summaryFields.proxyStats) {nextCached.proxyStats = summaryRes.proxyStats;- }- if (summaryFields.ruleStats) {nextCached.ruleStats = summaryRes.ruleStats || [];- }- if (summaryFields.hourlyStats) {nextCached.hourlyStats = summaryRes.hourlyStats;}- }- if (needsCountryStats) {- nextCached.countryStats = countryStatsRes;- }+ if (fetchCountry) {+ nextCached.countryStats = countryStatsRes;+ }- if (needsDeviceStats) {- nextCached.deviceStats = deviceStatsRes;- }+ if (fetchDevice) {+ nextCached.deviceStats = deviceStatsRes;+ }- baseCached = nextCached;- this.baseSummaryCache.set(baseCacheKey, nextCached);- for (const [key, val] of this.baseSummaryCache) {- if (Date.now() - val.ts > cacheTTL * 2) {- this.baseSummaryCache.delete(key);+ baseCached = nextCached;+ this.baseSummaryCache.set(baseCacheKey, nextCached);++ // Only run cache cleanup occasionally, e.g. when creating a new cache entry+ if (!baseCacheValid) {+ for (const [key, val] of this.baseSummaryCache) {+ if (Date.now() - val.ts > cacheTTL * 2) {+ this.baseSummaryCache.delete(key);+ }+ }}}}- const summary = includeSummaryData ? (baseCached?.summary || ZERO_BASE_SUMMARY) : ZERO_BASE_SUMMARY;- const topDomains = includeSummaryData ? (baseCached?.topDomains || []) : [];- const topIPs = includeSummaryData ? (baseCached?.topIPs || []) : [];- const proxyStats = includeSummaryData ? (baseCached?.proxyStats || []) : [];- const countryStats = includeSummaryData ? baseCached?.countryStats : undefined;- const deviceStats = includeSummaryData ? baseCached?.deviceStats : undefined;- const ruleStats = includeSummaryData ? baseCached?.ruleStats : undefined;- const hourlyStats = includeSummaryData ? (baseCached?.hourlyStats || []) : [];+ const summary = includeSummaryData && summaryFields.totals ? (baseCached?.summary || ZERO_BASE_SUMMARY) : ZERO_BASE_SUMMARY;+ const topDomains = includeSummaryData && summaryFields.topDomains ? (baseCached?.topDomains || []) : [];+ const topIPs = includeSummaryData && summaryFields.topIPs ? (baseCached?.topIPs || []) : [];+ const proxyStats = includeSummaryData && summaryFields.proxyStats ? (baseCached?.proxyStats || []) : [];+ const countryStats = includeSummaryData && summaryFields.countryStats ? baseCached?.countryStats : undefined;+ const deviceStats = includeSummaryData && summaryFields.deviceStats ? baseCached?.deviceStats : undefined;+ const ruleStats = includeSummaryData && summaryFields.ruleStats ? baseCached?.ruleStats : undefined;+ const hourlyStats = includeSummaryData && summaryFields.hourlyStats ? (baseCached?.hourlyStats || []) : [];const fetches: Promise<void>[] = [];diff --git a/apps/web/app/[locale]/dashboard/components/header/index.tsx b/apps/web/app/[locale]/dashboard/components/header/index.tsxindex cb7dcda..f19b08c 100644--- a/apps/web/app/[locale]/dashboard/components/header/index.tsx+++ b/apps/web/app/[locale]/dashboard/components/header/index.tsx@@ -1,5 +1,6 @@"use client";+import React, { useEffect, useState } from "react";import {Server,Radio,@@ -142,6 +143,22 @@ export function Header({const themeT = useTranslations("theme");const aboutT = useTranslations("about");+ const [showProgress, setShowProgress] = React.useState(false);++ React.useEffect(() => {+ let timeout: ReturnType<typeof setTimeout>;+ if (isTransitioning) {+ setShowProgress(true);+ } else {+ // Add a small delay before hiding to let the animation play out a bit+ // and prevent it from flashing too quickly+ timeout = setTimeout(() => {+ setShowProgress(false);+ }, 800);+ }+ return () => clearTimeout(timeout);+ }, [isTransitioning]);+return (<header className="sticky top-0 z-40 border-b border-border/40 bg-background/80 backdrop-blur-md"><div className="flex items-center justify-between h-14 px-4 lg:px-6">@@ -585,7 +602,7 @@ export function Header({</div></div>{/* Transition progress bar - sits at the bottom edge of the header */}- {isTransitioning && (+ {showProgress && (<div className="absolute bottom-0 left-0 right-0 h-0.5 overflow-hidden"><div className="h-full w-1/3 bg-primary/60 rounded-full animate-progress-indeterminate" /></div>diff --git a/apps/web/app/[locale]/dashboard/hooks/use-dashboard.ts b/apps/web/app/[locale]/dashboard/hooks/use-dashboard.tsindex a9149f8..12db5be 100644--- a/apps/web/app/[locale]/dashboard/hooks/use-dashboard.ts+++ b/apps/web/app/[locale]/dashboard/hooks/use-dashboard.ts@@ -124,6 +124,7 @@ export function useDashboard(): UseDashboardReturn {activeTab === "overview" ||activeTab === "countries" ||activeTab === "proxies" ||+ activeTab === "rules" ||activeTab === "devices";const wsSummaryFields = useMemo<SummaryField[] | undefined>(() => {@@ -134,6 +135,8 @@ export function useDashboard(): UseDashboardReturn {return ["countryStats"];case "proxies":return ["proxyStats"];+ case "rules":+ return ["totals"];case "devices":return ["deviceStats"];default:@@ -252,7 +255,7 @@ export function useDashboard(): UseDashboardReturn {(activeTab === "overview" || activeTab === "countries");const needsSummaryData =- activeTab === "overview" || activeTab === "proxies" || activeTab === "devices";+ activeTab === "overview" || activeTab === "proxies" || activeTab === "rules" || activeTab === "devices";const needsCountries = activeTab === "overview" || activeTab === "countries";// Stats Queries@@ -456,7 +459,7 @@ export function useDashboard(): UseDashboardReturn {wsConnected,wsRealtimeActive,isLoading: summaryQuery.isLoading || (backendsQuery.isLoading && !backends.length),- isTransitioning: summaryQuery.isPlaceholderData === true || summaryQuery.isLoading,+ isTransitioning: (summaryQuery.isLoading || summaryQuery.isPlaceholderData || isManualRefreshing) && !queryError,// ActionssetActiveTab,diff --git a/apps/web/components/ui/sonner.tsx b/apps/web/components/ui/sonner.tsxindex ffd43e5..8aa6dc3 100644--- a/apps/web/components/ui/sonner.tsx+++ b/apps/web/components/ui/sonner.tsx@@ -22,8 +22,8 @@ const Toaster = ({ ...props }: ToasterProps) => {toastOptions={{classNames: {toast:- "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg",- description: "group-[.toast]:text-muted-foreground",+ "group toast max-w-[calc(100vw-32px)] sm:max-w-none group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg",+ description: "group-[.toast]:text-muted-foreground break-words whitespace-pre-wrap",actionButton:"group-[.toast]:bg-primary group-[.toast]:text-primary-foreground",cancelButton:diff --git a/apps/web/lib/websocket.ts b/apps/web/lib/websocket.tsindex 138fd41..b81f6e0 100644--- a/apps/web/lib/websocket.ts+++ b/apps/web/lib/websocket.ts@@ -151,7 +151,6 @@ function getWsUrlCandidates(): string[] {const hostForPath = runtime?.WS_HOST || window.location.host;const pathUrl = `${wsProtocol}://${hostForPath}/_cm_ws`;- // Local development usually has no reverse proxy for /_cm_ws.const preferDirect = process.env.NODE_ENV === 'development';if (preferDirect) {pushCandidate(directUrl);@@ -380,7 +379,10 @@ export function useStatsWebSocket(options: UseStatsWebSocketOptions = {}) {};ws.onerror = (error) => {- console.error('[WebSocket] Connection error. URL:', wsUrl);+ // Only log error if we've exhausted all candidate URLs or if the connection was already established+ if (opened || wsUrlIndexRef.current >= wsUrls.length - 1) {+ console.error('[WebSocket] Connection error. URL:', wsUrl);+ }setStatus('error');onErrorRef.current?.(error);};