@serve.zone/dcrouter 17.1.4 → 17.1.6

package/ts_web/appstate/network.ts

@@ -4,6 +4,9 @@ import { appState } from './shared.js';
 import { getActionContext } from './login.js';
 import { runBackgroundRefresh } from './shared.js';
 
+const IP_INTELLIGENCE_REFRESH_INTERVAL_MS = 60_000;
+let lastIpIntelligenceRefreshAt = 0;
+
 export interface INetworkState {
   connections: interfaces.data.IConnectionInfo[];
   connectionsByIP: { [ip: string]: number };
@@ -53,9 +56,17 @@ export const networkStatePart = await appState.getStatePart<INetworkState>(
 );
 
 export function refreshNetworkIpIntelligence(identity: interfaces.data.IIdentity, ipAddresses: string[]): void {
-  const ips = [...new Set(ipAddresses.filter(Boolean))].slice(0, 100);
+  const ips = [...new Set(ipAddresses.map((ip) => ip.trim()).filter(Boolean))]
+    .sort()
+    .slice(0, 100);
   if (ips.length === 0) return;
 
+  const now = Date.now();
+  if (now - lastIpIntelligenceRefreshAt < IP_INTELLIGENCE_REFRESH_INTERVAL_MS) {
+    return;
+  }
+  lastIpIntelligenceRefreshAt = now;
+
   runBackgroundRefresh('networkIpIntelligence', 'IP intelligence refresh failed:', async () => {
     const intelligenceRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
       interfaces.requests.IReq_ListIpIntelligence

package/ts_web/appstate/ui.ts

@@ -1,5 +1,4 @@
 import { appState } from './shared.js';
-import { networkStatePart, fetchNetworkStatsAction } from './network.js';
 import { certificateStatePart, fetchCertificateOverviewAction } from './certificates.js';
 
 export interface IUiState {
@@ -52,13 +51,6 @@ export const toggleAutoRefreshAction = uiStatePart.createAction(async (statePart
 export const setActiveViewAction = uiStatePart.createAction<string>(async (statePartArg, viewName): Promise<IUiState> => {
   const currentState = statePartArg.getState()!;
 
-  // If switching to network view, ensure we fetch network data
-  if (viewName === 'network' && currentState.activeView !== 'network') {
-    setTimeout(() => {
-      networkStatePart.dispatchAction(fetchNetworkStatsAction, null);
-    }, 100);
-  }
-
   // If switching to the Domains group, ensure we fetch certificate data
   // (Certificates is a subview of Domains).
   if (viewName === 'domains' && currentState.activeView !== 'domains') {
@@ -72,4 +64,3 @@ export const setActiveViewAction = uiStatePart.createAction<string>(async (state
     activeView: viewName,
   };
 });
-