@serve.zone/dcrouter 5.4.3 → 5.4.5

package/dist_ts_web/elements/ops-view-network.js

@@ -98,7 +98,7 @@ let OpsViewNetwork = (() => {
         requestCountHistory = new Map(); // Track requests per time bucket
         trafficUpdateTimer = null;
         requestsPerSecHistory = []; // Track requests/sec over time for trend
-        // Removed byte tracking - now using real-time data from SmartProxy
+        historyLoaded = false; // Whether server-side throughput history has been loaded
         constructor() {
             super();
             this.subscribeToStateParts();
@@ -145,6 +145,48 @@ let OpsViewNetwork = (() => {
             this.trafficDataOut = emptyData.map(point => ({ ...point }));
             this.lastTrafficUpdateTime = now;
         }
+        /**
+         * Load server-side throughput history into the chart.
+         * Called once when history data first arrives from the Rust engine.
+         * This pre-populates the chart so users see historical data immediately
+         * instead of starting from all zeros.
+         */
+        loadThroughputHistory() {
+            const history = this.networkState.throughputHistory;
+            if (!history || history.length === 0)
+                return;
+            this.historyLoaded = true;
+            // Convert history points to chart data format (bytes/sec → Mbit/s)
+            const historyIn = history.map(p => ({
+                x: new Date(p.timestamp).toISOString(),
+                y: Math.round((p.in * 8) / 1000000 * 10) / 10,
+            }));
+            const historyOut = history.map(p => ({
+                x: new Date(p.timestamp).toISOString(),
+                y: Math.round((p.out * 8) / 1000000 * 10) / 10,
+            }));
+            // Use history as the chart data, keeping the most recent 60 points (5 min window)
+            const sliceStart = Math.max(0, historyIn.length - 60);
+            this.trafficDataIn = historyIn.slice(sliceStart);
+            this.trafficDataOut = historyOut.slice(sliceStart);
+            // If fewer than 60 points, pad the front with zeros
+            if (this.trafficDataIn.length < 60) {
+                const now = Date.now();
+                const range = 5 * 60 * 1000;
+                const bucketSize = range / 60;
+                const padCount = 60 - this.trafficDataIn.length;
+                const firstTimestamp = this.trafficDataIn.length > 0
+                    ? new Date(this.trafficDataIn[0].x).getTime()
+                    : now;
+                const padIn = Array.from({ length: padCount }, (_, i) => ({
+                    x: new Date(firstTimestamp - ((padCount - i) * bucketSize)).toISOString(),
+                    y: 0,
+                }));
+                const padOut = padIn.map(p => ({ ...p }));
+                this.trafficDataIn = [...padIn, ...this.trafficDataIn];
+                this.trafficDataOut = [...padOut, ...this.trafficDataOut];
+            }
+        }
         static styles = [
             cssManager.defaultStyles,
             viewHostCss,
@@ -371,18 +413,6 @@ let OpsViewNetwork = (() => {
             }
             return `${size.toFixed(1)} ${units[unitIndex]}`;
         }
-        calculateRequestsPerSecond() {
-            // Calculate from actual request data in the last minute
-            const oneMinuteAgo = Date.now() - 60000;
-            const recentRequests = this.networkRequests.filter(req => req.timestamp >= oneMinuteAgo);
-            const reqPerSec = Math.round(recentRequests.length / 60);
-            // Track history for trend (keep last 20 values)
-            this.requestsPerSecHistory.push(reqPerSec);
-            if (this.requestsPerSecHistory.length > 20) {
-                this.requestsPerSecHistory.shift();
-            }
-            return reqPerSec;
-        }
         calculateThroughput() {
             // Use real throughput data from network state
             return {
@@ -391,13 +421,16 @@ let OpsViewNetwork = (() => {
             };
         }
         renderNetworkStats() {
-            const reqPerSec = this.calculateRequestsPerSecond();
+            // Use server-side requests/sec from SmartProxy's Rust engine
+            const reqPerSec = this.networkState.requestsPerSecond || 0;
             const throughput = this.calculateThroughput();
             const activeConnections = this.statsState.serverStats?.activeConnections || 0;
-            // Throughput data is now available in the stats tiles
-            // Use request count history for the requests/sec trend
+            // Track requests/sec history for the trend sparkline
+            this.requestsPerSecHistory.push(reqPerSec);
+            if (this.requestsPerSecHistory.length > 20) {
+                this.requestsPerSecHistory.shift();
+            }
             const trendData = [...this.requestsPerSecHistory];
-            // If we don't have enough data, pad with zeros
             while (trendData.length < 20) {
                 trendData.unshift(0);
             }
@@ -409,7 +442,7 @@ let OpsViewNetwork = (() => {
                     type: 'number',
                     icon: 'plug',
                     color: activeConnections > 100 ? '#f59e0b' : '#22c55e',
-                    description: `Total: ${this.statsState.serverStats?.totalConnections || 0}`,
+                    description: `Total: ${this.networkState.requestsTotal || this.statsState.serverStats?.totalConnections || 0}`,
                     actions: [
                         {
                             name: 'View Details',
@@ -427,7 +460,7 @@ let OpsViewNetwork = (() => {
                     icon: 'chartLine',
                     color: '#3b82f6',
                     trendData: trendData,
-                    description: `Average over last minute`,
+                    description: `Total: ${this.formatNumber(this.networkState.requestsTotal || 0)} requests`,
                 },
                 {
                     id: 'throughputIn',
@@ -470,18 +503,30 @@ let OpsViewNetwork = (() => {
             if (this.networkState.topIPs.length === 0) {
                 return html ``;
             }
+            // Build per-IP bandwidth lookup
+            const bandwidthByIP = new Map();
+            if (this.networkState.throughputByIP) {
+                for (const entry of this.networkState.throughputByIP) {
+                    bandwidthByIP.set(entry.ip, { in: entry.in, out: entry.out });
+                }
+            }
             // Calculate total connections across all top IPs
             const totalConnections = this.networkState.topIPs.reduce((sum, ipData) => sum + ipData.count, 0);
             return html `
       <dees-table
         .data=${this.networkState.topIPs}
-        .displayFunction=${(ipData) => ({
-                'IP Address': ipData.ip,
-                'Connections': ipData.count,
-                'Percentage': totalConnections > 0 ? ((ipData.count / totalConnections) * 100).toFixed(1) + '%' : '0%',
-            })}
+        .displayFunction=${(ipData) => {
+                const bw = bandwidthByIP.get(ipData.ip);
+                return {
+                    'IP Address': ipData.ip,
+                    'Connections': ipData.count,
+                    'Bandwidth In': bw ? this.formatBitsPerSecond(bw.in) : '0 bit/s',
+                    'Bandwidth Out': bw ? this.formatBitsPerSecond(bw.out) : '0 bit/s',
+                    'Share': totalConnections > 0 ? ((ipData.count / totalConnections) * 100).toFixed(1) + '%' : '0%',
+                };
+            }}
         heading1="Top Connected IPs"
-        heading2="IPs with most active connections"
+        heading2="IPs with most active connections and bandwidth"
         .pagination=${false}
         dataName="ip"
       ></dees-table>
@@ -518,12 +563,10 @@ let OpsViewNetwork = (() => {
                     this.networkRequests = [];
                 }
             }
-            // Generate traffic data based on request history
-            this.updateTrafficData();
-        }
-        updateTrafficData() {
-            // This method is called when network data updates
-            // The actual chart updates are handled by the timer calling addTrafficDataPoint()
+            // Load server-side throughput history into chart (once)
+            if (!this.historyLoaded && this.networkState.throughputHistory && this.networkState.throughputHistory.length > 0) {
+                this.loadThroughputHistory();
+            }
         }
         startTrafficUpdateTimer() {
             this.stopTrafficUpdateTimer(); // Clear any existing timer
@@ -578,4 +621,4 @@ let OpsViewNetwork = (() => {
     return OpsViewNetwork = _classThis;
 })();
 export { OpsViewNetwork };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-network.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-network.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-network.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-network.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@serve.zone/dcrouter",
   "private": false,
-  "version": "5.4.3",
+  "version": "5.4.5",
   "description": "A multifaceted routing service handling mail and SMS delivery functions.",
   "type": "module",
   "exports": {
@@ -49,7 +49,7 @@
     "@push.rocks/smartnetwork": "^4.4.0",
     "@push.rocks/smartpath": "^6.0.0",
     "@push.rocks/smartpromise": "^4.2.3",
-    "@push.rocks/smartproxy": "^25.1.0",
+    "@push.rocks/smartproxy": "^25.2.0",
     "@push.rocks/smartradius": "^1.1.1",
     "@push.rocks/smartrequest": "^5.0.1",
     "@push.rocks/smartrx": "^3.0.10",

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/dcrouter',
-  version: '5.4.3',
+  version: '5.4.5',
   description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 }

package/ts/monitoring/classes.metricsmanager.ts

@@ -484,40 +484,58 @@ export class MetricsManager {
     // Use shorter cache TTL for network stats to ensure real-time updates
     return this.metricsCache.get('networkStats', () => {
       const proxyMetrics = this.dcRouter.smartProxy ? this.dcRouter.smartProxy.getMetrics() : null;
-      
+
       if (!proxyMetrics) {
         return {
           connectionsByIP: new Map<string, number>(),
           throughputRate: { bytesInPerSecond: 0, bytesOutPerSecond: 0 },
-          topIPs: [],
+          topIPs: [] as Array<{ ip: string; count: number }>,
           totalDataTransferred: { bytesIn: 0, bytesOut: 0 },
+          throughputHistory: [] as Array<{ timestamp: number; in: number; out: number }>,
+          throughputByIP: new Map<string, { in: number; out: number }>(),
+          requestsPerSecond: 0,
+          requestsTotal: 0,
         };
       }
-      
+
       // Get metrics using the new API
       const connectionsByIP = proxyMetrics.connections.byIP();
       const instantThroughput = proxyMetrics.throughput.instant();
-      
+
       // Get throughput rate
       const throughputRate = {
         bytesInPerSecond: instantThroughput.in,
         bytesOutPerSecond: instantThroughput.out
       };
-      
+
       // Get top IPs
       const topIPs = proxyMetrics.connections.topIPs(10);
-      
+
       // Get total data transferred
       const totalDataTransferred = {
         bytesIn: proxyMetrics.totals.bytesIn(),
         bytesOut: proxyMetrics.totals.bytesOut()
       };
-      
+
+      // Get throughput history from Rust engine (up to 300 seconds)
+      const throughputHistory = proxyMetrics.throughput.history(300);
+
+      // Get per-IP throughput
+      const throughputByIP = proxyMetrics.throughput.byIP();
+
+      // Get HTTP request rates
+      const requestsPerSecond = proxyMetrics.requests.perSecond();
+      const requestsTotal = proxyMetrics.requests.total();
+
       return {
         connectionsByIP,
         throughputRate,
         topIPs,
         totalDataTransferred,
+        throughputHistory,
+        throughputByIP,
+        requestsPerSecond,
+        requestsTotal,
       };
     }, 200); // Use 200ms cache for more frequent updates
   }

package/ts/opsserver/handlers/security.handler.ts

@@ -84,21 +84,37 @@ export class SecurityHandler {
           // Get network stats from MetricsManager if available
           if (this.opsServerRef.dcRouterRef.metricsManager) {
             const networkStats = await this.opsServerRef.dcRouterRef.metricsManager.getNetworkStats();
-            
+
+            // Convert per-IP throughput Map to serializable array
+            const throughputByIP: Array<{ ip: string; in: number; out: number }> = [];
+            if (networkStats.throughputByIP) {
+              for (const [ip, tp] of networkStats.throughputByIP) {
+                throughputByIP.push({ ip, in: tp.in, out: tp.out });
+              }
+            }
+
             return {
               connectionsByIP: Array.from(networkStats.connectionsByIP.entries()).map(([ip, count]) => ({ ip, count })),
               throughputRate: networkStats.throughputRate,
               topIPs: networkStats.topIPs,
               totalDataTransferred: networkStats.totalDataTransferred,
+              throughputHistory: networkStats.throughputHistory || [],
+              throughputByIP,
+              requestsPerSecond: networkStats.requestsPerSecond || 0,
+              requestsTotal: networkStats.requestsTotal || 0,
             };
           }
-          
+
           // Fallback if MetricsManager not available
           return {
             connectionsByIP: [],
             throughputRate: { bytesInPerSecond: 0, bytesOutPerSecond: 0 },
             topIPs: [],
             totalDataTransferred: { bytesIn: 0, bytesOut: 0 },
+            throughputHistory: [],
+            throughputByIP: [],
+            requestsPerSecond: 0,
+            requestsTotal: 0,
           };
         }
       )

package/ts/opsserver/handlers/stats.handler.ts

@@ -255,6 +255,14 @@ export class StatsHandler {
                 const stats = await this.opsServerRef.dcRouterRef.metricsManager.getNetworkStats();
                 const serverStats = await this.collectServerStats();
 
+                // Build per-IP bandwidth lookup from throughputByIP
+                const ipBandwidth = new Map<string, { in: number; out: number }>();
+                if (stats.throughputByIP) {
+                  for (const [ip, tp] of stats.throughputByIP) {
+                    ipBandwidth.set(ip, { in: tp.in, out: tp.out });
+                  }
+                }
+
                 metrics.network = {
                   totalBandwidth: {
                     in: stats.throughputRate.bytesInPerSecond,
@@ -269,11 +277,11 @@ export class StatsHandler {
                   topEndpoints: stats.topIPs.map(ip => ({
                     endpoint: ip.ip,
                     requests: ip.count,
-                    bandwidth: {
-                      in: 0,
-                      out: 0,
-                    },
+                    bandwidth: ipBandwidth.get(ip.ip) || { in: 0, out: 0 },
                   })),
+                  throughputHistory: stats.throughputHistory || [],
+                  requestsPerSecond: stats.requestsPerSecond || 0,
+                  requestsTotal: stats.requestsTotal || 0,
                 };
               })()
             );

package/ts_web/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/dcrouter',
-  version: '5.4.3',
+  version: '5.4.5',
   description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 }

package/ts_web/appstate.ts

@@ -49,6 +49,10 @@ export interface INetworkState {
   throughputRate: { bytesInPerSecond: number; bytesOutPerSecond: number };
   totalBytes: { in: number; out: number };
   topIPs: Array<{ ip: string; count: number }>;
+  throughputByIP: Array<{ ip: string; in: number; out: number }>;
+  throughputHistory: Array<{ timestamp: number; in: number; out: number }>;
+  requestsPerSecond: number;
+  requestsTotal: number;
   lastUpdated: number;
   isLoading: boolean;
   error: string | null;
@@ -147,6 +151,10 @@ export const networkStatePart = await appState.getStatePart<INetworkState>(
     throughputRate: { bytesInPerSecond: 0, bytesOutPerSecond: 0 },
     totalBytes: { in: 0, out: 0 },
     topIPs: [],
+    throughputByIP: [],
+    throughputHistory: [],
+    requestsPerSecond: 0,
+    requestsTotal: 0,
     lastUpdated: 0,
     isLoading: false,
     error: null,
@@ -427,6 +435,10 @@ export const fetchNetworkStatsAction = networkStatePart.createAction(async (stat
         ? { in: networkStatsResponse.totalDataTransferred.bytesIn, out: networkStatsResponse.totalDataTransferred.bytesOut }
         : { in: 0, out: 0 },
       topIPs: networkStatsResponse.topIPs || [],
+      throughputByIP: networkStatsResponse.throughputByIP || [],
+      throughputHistory: networkStatsResponse.throughputHistory || [],
+      requestsPerSecond: networkStatsResponse.requestsPerSecond || 0,
+      requestsTotal: networkStatsResponse.requestsTotal || 0,
       lastUpdated: Date.now(),
       isLoading: false,
       error: null,
@@ -797,6 +809,10 @@ async function dispatchCombinedRefreshAction() {
           },
           totalBytes: network.totalBytes || { in: 0, out: 0 },
           topIPs: network.topEndpoints.map(e => ({ ip: e.endpoint, count: e.requests })),
+          throughputByIP: network.topEndpoints.map(e => ({ ip: e.endpoint, in: e.bandwidth?.in || 0, out: e.bandwidth?.out || 0 })),
+          throughputHistory: network.throughputHistory || [],
+          requestsPerSecond: network.requestsPerSecond || 0,
+          requestsTotal: network.requestsTotal || 0,
           lastUpdated: Date.now(),
           isLoading: false,
           error: null,
@@ -813,6 +829,10 @@ async function dispatchCombinedRefreshAction() {
           },
           totalBytes: network.totalBytes || { in: 0, out: 0 },
           topIPs: network.topEndpoints.map(e => ({ ip: e.endpoint, count: e.requests })),
+          throughputByIP: network.topEndpoints.map(e => ({ ip: e.endpoint, in: e.bandwidth?.in || 0, out: e.bandwidth?.out || 0 })),
+          throughputHistory: network.throughputHistory || [],
+          requestsPerSecond: network.requestsPerSecond || 0,
+          requestsTotal: network.requestsTotal || 0,
           lastUpdated: Date.now(),
           isLoading: false,
           error: null,