Skip to content

A modern and elegant dashboard for network traffic visualization and analysis.

feat: Extend WebSocket summary with total proxies and rules, refine dashboard data fetching during WebSocket connection, and add a new logo.

luolei305c19a516d1
diff --git a/apps/collector/src/modules/websocket/websocket.server.ts b/apps/collector/src/modules/websocket/websocket.server.ts
index 0d93609..ffbdf4d 100644
--- a/apps/collector/src/modules/websocket/websocket.server.ts
+++ b/apps/collector/src/modules/websocket/websocket.server.ts
@@ -143,6 +143,8 @@ const ZERO_BASE_SUMMARY = {
totalDownload: 0,
uniqueDomains: 0,
uniqueIPs: 0,
+ totalProxies: 0,
+ totalRules: 0,
};
export class StatsWebSocketServer {
@@ -157,7 +159,15 @@ export class StatsWebSocketServer {
// Cache for expensive full-summary queries: avoids re-querying all 8 base tables
// when multiple broadcasts fire within a short window.
private baseSummaryCache = new Map<string, {
- summary?: { totalConnections: number; totalUpload: number; totalDownload: number; uniqueDomains: number; uniqueIPs: number };
+ summary?: {
+ totalConnections: number;
+ totalUpload: number;
+ totalDownload: number;
+ uniqueDomains: number;
+ uniqueIPs: number;
+ totalProxies: number;
+ totalRules: number;
+ };
topDomains?: DomainStats[];
topIPs?: IPStats[];
proxyStats?: ProxyStats[];
@@ -1000,7 +1010,15 @@ export class StatsWebSocketServer {
]);
const nextCached: {
- summary?: { totalConnections: number; totalUpload: number; totalDownload: number; uniqueDomains: number; uniqueIPs: number };
+ summary?: {
+ totalConnections: number;
+ totalUpload: number;
+ totalDownload: number;
+ uniqueDomains: number;
+ uniqueIPs: number;
+ totalProxies: number;
+ totalRules: number;
+ };
topDomains?: DomainStats[];
topIPs?: IPStats[];
proxyStats?: ProxyStats[];
@@ -1018,6 +1036,8 @@ export class StatsWebSocketServer {
totalDownload: summaryRes.totalDownload,
uniqueDomains: summaryRes.totalDomains,
uniqueIPs: summaryRes.totalIPs,
+ totalProxies: summaryRes.totalProxies,
+ totalRules: summaryRes.totalRules,
};
nextCached.topDomains = summaryRes.topDomains;
nextCached.topIPs = summaryRes.topIPs;
@@ -1100,8 +1120,8 @@ export class StatsWebSocketServer {
totalConnections: summary.totalConnections,
totalDomains: summary.uniqueDomains,
totalIPs: summary.uniqueIPs,
- totalProxies: proxyStats.length,
- totalRules: ruleStats?.length,
+ totalProxies: summary.totalProxies,
+ totalRules: summary.totalRules,
topDomains,
topIPs,
proxyStats,
diff --git a/apps/web/app/[locale]/dashboard/hooks/use-dashboard.ts b/apps/web/app/[locale]/dashboard/hooks/use-dashboard.ts
index 12db5be..b729aa3 100644
--- a/apps/web/app/[locale]/dashboard/hooks/use-dashboard.ts
+++ b/apps/web/app/[locale]/dashboard/hooks/use-dashboard.ts
@@ -246,7 +246,7 @@ export function useDashboard(): UseDashboardReturn {
const wsRealtimeActive = wsEnabled && wsConnected;
const shouldReducePolling = wsRealtimeActive;
const shouldUseHttpFallback =
- !wsEnabled || wsStatus === "disconnected" || wsStatus === "error";
+ !wsEnabled || wsStatus === "disconnected" || wsStatus === "error" || wsStatus === "connecting";
const fallbackRefetchInterval =
autoRefresh && isWsSummaryTab && shouldUseHttpFallback ? 5000 : false;
const hasWsCountries =
@@ -300,6 +300,10 @@ export function useDashboard(): UseDashboardReturn {
const effectiveCountriesError = hasWsCountries ? null : countriesError;
const queryError = effectiveSummaryError ?? effectiveCountriesError;
+ const isSummaryTransitioning =
+ needsSummaryData &&
+ shouldUseHttpFallback &&
+ (summaryQuery.isLoading || summaryQuery.isFetching);
// Backend Status
const backendStatus: BackendStatus = useMemo(() => {
@@ -459,7 +463,7 @@ export function useDashboard(): UseDashboardReturn {
wsConnected,
wsRealtimeActive,
isLoading: summaryQuery.isLoading || (backendsQuery.isLoading && !backends.length),
- isTransitioning: (summaryQuery.isLoading || summaryQuery.isPlaceholderData || isManualRefreshing) && !queryError,
+ isTransitioning: (isSummaryTransitioning || isManualRefreshing) && !queryError,
// Actions
setActiveTab,
diff --git a/apps/web/public/logo.ico b/apps/web/public/logo.ico
new file mode 100644
index 0000000..e9d4cc7
Binary files /dev/null and b/apps/web/public/logo.ico differ