@push.rocks/smartproxy 19.6.11 → 19.6.12

package/dist_ts/proxies/smart-proxy/metrics-collector.d.ts

@@ -6,6 +6,8 @@ import type { IMetrics, IThroughputData, IThroughputHistoryPoint } from './model
 export declare class MetricsCollector implements IMetrics {
     private smartProxy;
     private throughputTracker;
+    private routeThroughputTrackers;
+    private ipThroughputTrackers;
     private requestTimestamps;
     private totalRequests;
     private connectionByteTrackers;

package/dist_ts/proxies/smart-proxy/metrics-collector.js

@@ -7,6 +7,8 @@ import { logger } from '../../core/utils/logger.js';
 export class MetricsCollector {
     constructor(smartProxy, config) {
         this.smartProxy = smartProxy;
+        this.routeThroughputTrackers = new Map();
+        this.ipThroughputTrackers = new Map();
         // Request tracking
         this.requestTimestamps = [];
         this.totalRequests = 0;
@@ -71,98 +73,26 @@ export class MetricsCollector {
             history: (seconds) => {
                 return this.throughputTracker.getHistory(seconds);
             },
-            byRoute: (windowSeconds = 60) => {
+            byRoute: (windowSeconds = 1) => {
                 const routeThroughput = new Map();
-                const now = Date.now();
-                const windowStart = now - (windowSeconds * 1000);
-                // Aggregate bytes by route - calculate actual bytes transferred in window
-                const routeData = new Map();
-                for (const [_, tracker] of this.connectionByteTrackers) {
-                    // Only include connections that were active within the window
-                    if (tracker.lastUpdate > windowStart) {
-                        let windowBytesIn = 0;
-                        let windowBytesOut = 0;
-                        if (tracker.windowSnapshots && tracker.windowSnapshots.length > 0) {
-                            // Find the earliest snapshot within or just before the window
-                            let startSnapshot = { timestamp: tracker.startTime, bytesIn: 0, bytesOut: 0 };
-                            for (const snapshot of tracker.windowSnapshots) {
-                                if (snapshot.timestamp <= windowStart) {
-                                    startSnapshot = snapshot;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            // Calculate bytes transferred since window start
-                            windowBytesIn = tracker.bytesIn - startSnapshot.bytesIn;
-                            windowBytesOut = tracker.bytesOut - startSnapshot.bytesOut;
-                        }
-                        else if (tracker.startTime > windowStart) {
-                            // Connection started within window, use all its bytes
-                            windowBytesIn = tracker.bytesIn;
-                            windowBytesOut = tracker.bytesOut;
-                        }
-                        // Add to route totals
-                        const current = routeData.get(tracker.routeName) || { bytesIn: 0, bytesOut: 0 };
-                        current.bytesIn += windowBytesIn;
-                        current.bytesOut += windowBytesOut;
-                        routeData.set(tracker.routeName, current);
+                // Get throughput from each route's dedicated tracker
+                for (const [route, tracker] of this.routeThroughputTrackers) {
+                    const rate = tracker.getRate(windowSeconds);
+                    if (rate.in > 0 || rate.out > 0) {
+                        routeThroughput.set(route, rate);
                     }
                 }
-                // Convert to rates (bytes per second)
-                for (const [route, data] of routeData) {
-                    routeThroughput.set(route, {
-                        in: Math.round(data.bytesIn / windowSeconds),
-                        out: Math.round(data.bytesOut / windowSeconds)
-                    });
-                }
                 return routeThroughput;
             },
-            byIP: (windowSeconds = 60) => {
+            byIP: (windowSeconds = 1) => {
                 const ipThroughput = new Map();
-                const now = Date.now();
-                const windowStart = now - (windowSeconds * 1000);
-                // Aggregate bytes by IP - calculate actual bytes transferred in window
-                const ipData = new Map();
-                for (const [_, tracker] of this.connectionByteTrackers) {
-                    // Only include connections that were active within the window
-                    if (tracker.lastUpdate > windowStart) {
-                        let windowBytesIn = 0;
-                        let windowBytesOut = 0;
-                        if (tracker.windowSnapshots && tracker.windowSnapshots.length > 0) {
-                            // Find the earliest snapshot within or just before the window
-                            let startSnapshot = { timestamp: tracker.startTime, bytesIn: 0, bytesOut: 0 };
-                            for (const snapshot of tracker.windowSnapshots) {
-                                if (snapshot.timestamp <= windowStart) {
-                                    startSnapshot = snapshot;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            // Calculate bytes transferred since window start
-                            windowBytesIn = tracker.bytesIn - startSnapshot.bytesIn;
-                            windowBytesOut = tracker.bytesOut - startSnapshot.bytesOut;
-                        }
-                        else if (tracker.startTime > windowStart) {
-                            // Connection started within window, use all its bytes
-                            windowBytesIn = tracker.bytesIn;
-                            windowBytesOut = tracker.bytesOut;
-                        }
-                        // Add to IP totals
-                        const current = ipData.get(tracker.remoteIP) || { bytesIn: 0, bytesOut: 0 };
-                        current.bytesIn += windowBytesIn;
-                        current.bytesOut += windowBytesOut;
-                        ipData.set(tracker.remoteIP, current);
+                // Get throughput from each IP's dedicated tracker
+                for (const [ip, tracker] of this.ipThroughputTrackers) {
+                    const rate = tracker.getRate(windowSeconds);
+                    if (rate.in > 0 || rate.out > 0) {
+                        ipThroughput.set(ip, rate);
                     }
                 }
-                // Convert to rates (bytes per second)
-                for (const [ip, data] of ipData) {
-                    ipThroughput.set(ip, {
-                        in: Math.round(data.bytesIn / windowSeconds),
-                        out: Math.round(data.bytesOut / windowSeconds)
-                    });
-                }
                 return ipThroughput;
             }
         };
@@ -245,8 +175,7 @@ export class MetricsCollector {
             bytesIn: 0,
             bytesOut: 0,
             startTime: now,
-            lastUpdate: now,
-            windowSnapshots: [] // Initialize empty snapshots array
+            lastUpdate: now
         });
         // Cleanup old request timestamps
         if (this.requestTimestamps.length > 5000) {
@@ -271,19 +200,20 @@ export class MetricsCollector {
             tracker.bytesIn += bytesIn;
             tracker.bytesOut += bytesOut;
             tracker.lastUpdate = Date.now();
-            // Initialize snapshots array if not present
-            if (!tracker.windowSnapshots) {
-                tracker.windowSnapshots = [];
+            // Update per-route throughput tracker
+            let routeTracker = this.routeThroughputTrackers.get(tracker.routeName);
+            if (!routeTracker) {
+                routeTracker = new ThroughputTracker(this.retentionSeconds);
+                this.routeThroughputTrackers.set(tracker.routeName, routeTracker);
+            }
+            routeTracker.recordBytes(bytesIn, bytesOut);
+            // Update per-IP throughput tracker
+            let ipTracker = this.ipThroughputTrackers.get(tracker.remoteIP);
+            if (!ipTracker) {
+                ipTracker = new ThroughputTracker(this.retentionSeconds);
+                this.ipThroughputTrackers.set(tracker.remoteIP, ipTracker);
             }
-            // Add current snapshot - we'll use these for accurate windowed calculations
-            tracker.windowSnapshots.push({
-                timestamp: Date.now(),
-                bytesIn: tracker.bytesIn,
-                bytesOut: tracker.bytesOut
-            });
-            // Keep only snapshots from last 5 minutes to prevent memory growth
-            const fiveMinutesAgo = Date.now() - 300000;
-            tracker.windowSnapshots = tracker.windowSnapshots.filter(s => s.timestamp > fiveMinutesAgo);
+            ipTracker.recordBytes(bytesIn, bytesOut);
         }
     }
     /**
@@ -301,7 +231,16 @@ export class MetricsCollector {
         }
         // Start periodic sampling
         this.samplingInterval = setInterval(() => {
+            // Sample global throughput
             this.throughputTracker.takeSample();
+            // Sample per-route throughput
+            for (const [_, tracker] of this.routeThroughputTrackers) {
+                tracker.takeSample();
+            }
+            // Sample per-IP throughput
+            for (const [_, tracker] of this.ipThroughputTrackers) {
+                tracker.takeSample();
+            }
             // Clean up old connection trackers (connections closed more than 5 minutes ago)
             const cutoff = Date.now() - 300000;
             for (const [id, tracker] of this.connectionByteTrackers) {
@@ -309,6 +248,20 @@ export class MetricsCollector {
                     this.connectionByteTrackers.delete(id);
                 }
             }
+            // Clean up unused route trackers
+            const activeRoutes = new Set(Array.from(this.connectionByteTrackers.values()).map(t => t.routeName));
+            for (const [route, _] of this.routeThroughputTrackers) {
+                if (!activeRoutes.has(route)) {
+                    this.routeThroughputTrackers.delete(route);
+                }
+            }
+            // Clean up unused IP trackers
+            const activeIPs = new Set(Array.from(this.connectionByteTrackers.values()).map(t => t.remoteIP));
+            for (const [ip, _] of this.ipThroughputTrackers) {
+                if (!activeIPs.has(ip)) {
+                    this.ipThroughputTrackers.delete(ip);
+                }
+            }
         }, this.sampleIntervalMs);
         // Subscribe to new connections
         this.connectionSubscription = this.smartProxy.routeConnectionHandler.newConnectionSubject.subscribe({
@@ -354,4 +307,4 @@ export class MetricsCollector {
         this.stop();
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"metrics-collector.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/metrics-collector.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"metrics-collector.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/metrics-collector.ts"],"names":[],"mappings":"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"}

package/dist_ts/proxies/smart-proxy/models/metrics-types.d.ts

@@ -104,9 +104,4 @@ export interface IByteTracker {
     bytesOut: number;
     startTime: number;
     lastUpdate: number;
-    windowSnapshots?: Array<{
-        timestamp: number;
-        bytesIn: number;
-        bytesOut: number;
-    }>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartproxy",
-  "version": "19.6.11",
+  "version": "19.6.12",
   "private": false,
   "description": "A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.",
   "main": "dist_ts/index.js",

package/readme.hints.md

@@ -11,10 +11,11 @@
 - Hour 2: 2GB total / 60s = 34 MB/s ✗ (appears doubled!)
 - Hour 3: 3GB total / 60s = 50 MB/s ✗ (keeps rising!)
 
-**Solution**: Implemented snapshot-based byte tracking that calculates actual bytes transferred within each time window:
-- Store periodic snapshots of byte counts with timestamps
-- Calculate delta between window start and end snapshots
-- Divide delta by window duration for accurate throughput
+**Solution**: Implemented dedicated ThroughputTracker instances for each route and IP address:
+- Each route and IP gets its own throughput tracker with per-second sampling
+- Samples are taken every second and stored in a circular buffer
+- Rate calculations use actual samples within the requested window
+- Default window is now 1 second for real-time accuracy
 
 ### What Gets Counted (Network Interface Throughput)
 
@@ -53,15 +54,19 @@ The byte tracking is designed to match network interface throughput (what Unifi/
 
 ### Metrics Architecture
 
-The metrics system has three layers:
+The metrics system has multiple layers:
 1. **Connection Records** (`record.bytesReceived/bytesSent`): Track total bytes per connection
-2. **ThroughputTracker**: Accumulates bytes between samples for global rate calculations (resets each second)
-3. **connectionByteTrackers**: Track bytes per connection with snapshots for accurate windowed per-route/IP metrics
+2. **Global ThroughputTracker**: Accumulates bytes between samples for overall rate calculations
+3. **Per-Route ThroughputTrackers**: Dedicated tracker for each route with per-second sampling
+4. **Per-IP ThroughputTrackers**: Dedicated tracker for each IP with per-second sampling
+5. **connectionByteTrackers**: Track cumulative bytes and metadata for active connections
 
 Key features:
-- Global throughput uses sampling with accumulator reset (accurate)
-- Per-route/IP throughput uses snapshots to calculate window-specific deltas (accurate)
+- All throughput trackers sample every second (1Hz)
+- Each tracker maintains a circular buffer of samples (default: 1 hour retention)
+- Rate calculations are accurate for any requested window (default: 1 second)
 - All byte counting happens exactly once at the data flow point
+- Unused route/IP trackers are automatically cleaned up when connections close
 
 ### Understanding "High" Byte Counts
 

package/ts/proxies/smart-proxy/metrics-collector.ts

@@ -15,6 +15,8 @@ import { logger } from '../../core/utils/logger.js';
 export class MetricsCollector implements IMetrics {
   // Throughput tracking
   private throughputTracker: ThroughputTracker;
+  private routeThroughputTrackers = new Map<string, ThroughputTracker>();
+  private ipThroughputTrackers = new Map<string, ThroughputTracker>();
   
   // Request tracking
   private requestTimestamps: number[] = [];
@@ -119,109 +121,31 @@ export class MetricsCollector implements IMetrics {
       return this.throughputTracker.getHistory(seconds);
     },
     
-    byRoute: (windowSeconds: number = 60): Map<string, IThroughputData> => {
+    byRoute: (windowSeconds: number = 1): Map<string, IThroughputData> => {
       const routeThroughput = new Map<string, IThroughputData>();
-      const now = Date.now();
-      const windowStart = now - (windowSeconds * 1000);
-      
-      // Aggregate bytes by route - calculate actual bytes transferred in window
-      const routeData = new Map<string, { bytesIn: number; bytesOut: number }>();
       
-      for (const [_, tracker] of this.connectionByteTrackers) {
-        // Only include connections that were active within the window
-        if (tracker.lastUpdate > windowStart) {
-          let windowBytesIn = 0;
-          let windowBytesOut = 0;
-          
-          if (tracker.windowSnapshots && tracker.windowSnapshots.length > 0) {
-            // Find the earliest snapshot within or just before the window
-            let startSnapshot = { timestamp: tracker.startTime, bytesIn: 0, bytesOut: 0 };
-            for (const snapshot of tracker.windowSnapshots) {
-              if (snapshot.timestamp <= windowStart) {
-                startSnapshot = snapshot;
-              } else {
-                break;
-              }
-            }
-            
-            // Calculate bytes transferred since window start
-            windowBytesIn = tracker.bytesIn - startSnapshot.bytesIn;
-            windowBytesOut = tracker.bytesOut - startSnapshot.bytesOut;
-          } else if (tracker.startTime > windowStart) {
-            // Connection started within window, use all its bytes
-            windowBytesIn = tracker.bytesIn;
-            windowBytesOut = tracker.bytesOut;
-          }
-          
-          // Add to route totals
-          const current = routeData.get(tracker.routeName) || { bytesIn: 0, bytesOut: 0 };
-          current.bytesIn += windowBytesIn;
-          current.bytesOut += windowBytesOut;
-          routeData.set(tracker.routeName, current);
+      // Get throughput from each route's dedicated tracker
+      for (const [route, tracker] of this.routeThroughputTrackers) {
+        const rate = tracker.getRate(windowSeconds);
+        if (rate.in > 0 || rate.out > 0) {
+          routeThroughput.set(route, rate);
         }
       }
       
-      // Convert to rates (bytes per second)
-      for (const [route, data] of routeData) {
-        routeThroughput.set(route, {
-          in: Math.round(data.bytesIn / windowSeconds),
-          out: Math.round(data.bytesOut / windowSeconds)
-        });
-      }
-      
       return routeThroughput;
     },
     
-    byIP: (windowSeconds: number = 60): Map<string, IThroughputData> => {
+    byIP: (windowSeconds: number = 1): Map<string, IThroughputData> => {
       const ipThroughput = new Map<string, IThroughputData>();
-      const now = Date.now();
-      const windowStart = now - (windowSeconds * 1000);
       
-      // Aggregate bytes by IP - calculate actual bytes transferred in window
-      const ipData = new Map<string, { bytesIn: number; bytesOut: number }>();
-      
-      for (const [_, tracker] of this.connectionByteTrackers) {
-        // Only include connections that were active within the window
-        if (tracker.lastUpdate > windowStart) {
-          let windowBytesIn = 0;
-          let windowBytesOut = 0;
-          
-          if (tracker.windowSnapshots && tracker.windowSnapshots.length > 0) {
-            // Find the earliest snapshot within or just before the window
-            let startSnapshot = { timestamp: tracker.startTime, bytesIn: 0, bytesOut: 0 };
-            for (const snapshot of tracker.windowSnapshots) {
-              if (snapshot.timestamp <= windowStart) {
-                startSnapshot = snapshot;
-              } else {
-                break;
-              }
-            }
-            
-            // Calculate bytes transferred since window start
-            windowBytesIn = tracker.bytesIn - startSnapshot.bytesIn;
-            windowBytesOut = tracker.bytesOut - startSnapshot.bytesOut;
-          } else if (tracker.startTime > windowStart) {
-            // Connection started within window, use all its bytes
-            windowBytesIn = tracker.bytesIn;
-            windowBytesOut = tracker.bytesOut;
-          }
-          
-          // Add to IP totals
-          const current = ipData.get(tracker.remoteIP) || { bytesIn: 0, bytesOut: 0 };
-          current.bytesIn += windowBytesIn;
-          current.bytesOut += windowBytesOut;
-          ipData.set(tracker.remoteIP, current);
+      // Get throughput from each IP's dedicated tracker
+      for (const [ip, tracker] of this.ipThroughputTrackers) {
+        const rate = tracker.getRate(windowSeconds);
+        if (rate.in > 0 || rate.out > 0) {
+          ipThroughput.set(ip, rate);
         }
       }
       
-      // Convert to rates (bytes per second)
-      for (const [ip, data] of ipData) {
-        ipThroughput.set(ip, {
-          in: Math.round(data.bytesIn / windowSeconds),
-          out: Math.round(data.bytesOut / windowSeconds)
-        });
-      }
-      
       return ipThroughput;
     }
   };
@@ -322,8 +246,7 @@ export class MetricsCollector implements IMetrics {
       bytesIn: 0,
       bytesOut: 0,
       startTime: now,
-      lastUpdate: now,
-      windowSnapshots: []  // Initialize empty snapshots array
+      lastUpdate: now
     });
     
     // Cleanup old request timestamps
@@ -353,21 +276,21 @@ export class MetricsCollector implements IMetrics {
       tracker.bytesOut += bytesOut;
       tracker.lastUpdate = Date.now();
       
-      // Initialize snapshots array if not present
-      if (!tracker.windowSnapshots) {
-        tracker.windowSnapshots = [];
+      // Update per-route throughput tracker
+      let routeTracker = this.routeThroughputTrackers.get(tracker.routeName);
+      if (!routeTracker) {
+        routeTracker = new ThroughputTracker(this.retentionSeconds);
+        this.routeThroughputTrackers.set(tracker.routeName, routeTracker);
       }
+      routeTracker.recordBytes(bytesIn, bytesOut);
       
-      // Add current snapshot - we'll use these for accurate windowed calculations
-      tracker.windowSnapshots.push({
-        timestamp: Date.now(),
-        bytesIn: tracker.bytesIn,
-        bytesOut: tracker.bytesOut
-      });
-      
-      // Keep only snapshots from last 5 minutes to prevent memory growth
-      const fiveMinutesAgo = Date.now() - 300000;
-      tracker.windowSnapshots = tracker.windowSnapshots.filter(s => s.timestamp > fiveMinutesAgo);
+      // Update per-IP throughput tracker
+      let ipTracker = this.ipThroughputTrackers.get(tracker.remoteIP);
+      if (!ipTracker) {
+        ipTracker = new ThroughputTracker(this.retentionSeconds);
+        this.ipThroughputTrackers.set(tracker.remoteIP, ipTracker);
+      }
+      ipTracker.recordBytes(bytesIn, bytesOut);
     }
   }
   
@@ -388,8 +311,19 @@ export class MetricsCollector implements IMetrics {
     
     // Start periodic sampling
     this.samplingInterval = setInterval(() => {
+      // Sample global throughput
       this.throughputTracker.takeSample();
       
+      // Sample per-route throughput
+      for (const [_, tracker] of this.routeThroughputTrackers) {
+        tracker.takeSample();
+      }
+      
+      // Sample per-IP throughput
+      for (const [_, tracker] of this.ipThroughputTrackers) {
+        tracker.takeSample();
+      }
+      
       // Clean up old connection trackers (connections closed more than 5 minutes ago)
       const cutoff = Date.now() - 300000;
       for (const [id, tracker] of this.connectionByteTrackers) {
@@ -397,6 +331,22 @@ export class MetricsCollector implements IMetrics {
           this.connectionByteTrackers.delete(id);
         }
       }
+      
+      // Clean up unused route trackers
+      const activeRoutes = new Set(Array.from(this.connectionByteTrackers.values()).map(t => t.routeName));
+      for (const [route, _] of this.routeThroughputTrackers) {
+        if (!activeRoutes.has(route)) {
+          this.routeThroughputTrackers.delete(route);
+        }
+      }
+      
+      // Clean up unused IP trackers
+      const activeIPs = new Set(Array.from(this.connectionByteTrackers.values()).map(t => t.remoteIP));
+      for (const [ip, _] of this.ipThroughputTrackers) {
+        if (!activeIPs.has(ip)) {
+          this.ipThroughputTrackers.delete(ip);
+        }
+      }
     }, this.sampleIntervalMs);
     
     // Subscribe to new connections

package/ts/proxies/smart-proxy/models/metrics-types.ts

@@ -49,8 +49,8 @@ export interface IMetrics {
     average(): IThroughputData;      // Last 60 seconds
     custom(seconds: number): IThroughputData;
     history(seconds: number): Array<IThroughputHistoryPoint>;
-    byRoute(windowSeconds?: number): Map<string, IThroughputData>;
-    byIP(windowSeconds?: number): Map<string, IThroughputData>;
+    byRoute(windowSeconds?: number): Map<string, IThroughputData>;  // Default: 1 second
+    byIP(windowSeconds?: number): Map<string, IThroughputData>;     // Default: 1 second
   };
   
   // Request metrics
@@ -109,10 +109,4 @@ export interface IByteTracker {
   bytesOut: number;
   startTime: number;
   lastUpdate: number;
-  // Track bytes at window boundaries for rate calculation
-  windowSnapshots?: Array<{
-    timestamp: number;
-    bytesIn: number;
-    bytesOut: number;
-  }>;
 }