@push.rocks/smartproxy 19.6.10 → 19.6.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist_ts/proxies/smart-proxy/metrics-collector.js +80 -38
  2. package/dist_ts/proxies/smart-proxy/models/metrics-types.d.ts +5 -0
  3. package/package.json +1 -1
  4. package/readme.hints.md +20 -3
  5. package/ts/proxies/smart-proxy/metrics-collector.ts +84 -39
  6. package/ts/proxies/smart-proxy/models/metrics-types.ts +6 -0
package/dist_ts/proxies/smart-proxy/metrics-collector.js CHANGED
@@ -75,32 +75,46 @@ export class MetricsCollector {
75
75
  const routeThroughput = new Map();
76
76
  const now = Date.now();
77
77
  const windowStart = now - (windowSeconds * 1000);
78
- // Aggregate bytes by route with proper time calculation
78
+ // Aggregate bytes by route - calculate actual bytes transferred in window
79
79
  const routeData = new Map();
80
80
  for (const [_, tracker] of this.connectionByteTrackers) {
81
81
  // Only include connections that were active within the window
82
- if (tracker.lastUpdate > windowStart || tracker.startTime > windowStart) {
83
- // Calculate the actual duration this connection was active within the window
84
- const connectionStart = Math.max(tracker.startTime, windowStart);
85
- const connectionEnd = tracker.lastUpdate;
86
- const durationInWindow = (connectionEnd - connectionStart) / 1000; // Convert to seconds
87
- if (durationInWindow > 0) {
88
- const current = routeData.get(tracker.routeName) || { bytesIn: 0, bytesOut: 0, totalDuration: 0 };
89
- current.bytesIn += tracker.bytesIn;
90
- current.bytesOut += tracker.bytesOut;
91
- current.totalDuration += durationInWindow;
92
- routeData.set(tracker.routeName, current);
82
+ if (tracker.lastUpdate > windowStart) {
83
+ let windowBytesIn = 0;
84
+ let windowBytesOut = 0;
85
+ if (tracker.windowSnapshots && tracker.windowSnapshots.length > 0) {
86
+ // Find the earliest snapshot within or just before the window
87
+ let startSnapshot = { timestamp: tracker.startTime, bytesIn: 0, bytesOut: 0 };
88
+ for (const snapshot of tracker.windowSnapshots) {
89
+ if (snapshot.timestamp <= windowStart) {
90
+ startSnapshot = snapshot;
91
+ }
92
+ else {
93
+ break;
94
+ }
95
+ }
96
+ // Calculate bytes transferred since window start
97
+ windowBytesIn = tracker.bytesIn - startSnapshot.bytesIn;
98
+ windowBytesOut = tracker.bytesOut - startSnapshot.bytesOut;
93
99
  }
100
+ else if (tracker.startTime > windowStart) {
101
+ // Connection started within window, use all its bytes
102
+ windowBytesIn = tracker.bytesIn;
103
+ windowBytesOut = tracker.bytesOut;
104
+ }
105
+ // Add to route totals
106
+ const current = routeData.get(tracker.routeName) || { bytesIn: 0, bytesOut: 0 };
107
+ current.bytesIn += windowBytesIn;
108
+ current.bytesOut += windowBytesOut;
109
+ routeData.set(tracker.routeName, current);
94
110
  }
95
111
  }
96
112
  // Convert to rates (bytes per second)
97
113
  for (const [route, data] of routeData) {
98
- if (data.totalDuration > 0) {
99
- routeThroughput.set(route, {
100
- in: Math.round(data.bytesIn / data.totalDuration),
101
- out: Math.round(data.bytesOut / data.totalDuration)
102
- });
103
- }
114
+ routeThroughput.set(route, {
115
+ in: Math.round(data.bytesIn / windowSeconds),
116
+ out: Math.round(data.bytesOut / windowSeconds)
117
+ });
104
118
  }
105
119
  return routeThroughput;
106
120
  },
@@ -108,32 +122,46 @@ export class MetricsCollector {
108
122
  const ipThroughput = new Map();
109
123
  const now = Date.now();
110
124
  const windowStart = now - (windowSeconds * 1000);
111
- // Aggregate bytes by IP with proper time calculation
125
+ // Aggregate bytes by IP - calculate actual bytes transferred in window
112
126
  const ipData = new Map();
113
127
  for (const [_, tracker] of this.connectionByteTrackers) {
114
128
  // Only include connections that were active within the window
115
- if (tracker.lastUpdate > windowStart || tracker.startTime > windowStart) {
116
- // Calculate the actual duration this connection was active within the window
117
- const connectionStart = Math.max(tracker.startTime, windowStart);
118
- const connectionEnd = tracker.lastUpdate;
119
- const durationInWindow = (connectionEnd - connectionStart) / 1000; // Convert to seconds
120
- if (durationInWindow > 0) {
121
- const current = ipData.get(tracker.remoteIP) || { bytesIn: 0, bytesOut: 0, totalDuration: 0 };
122
- current.bytesIn += tracker.bytesIn;
123
- current.bytesOut += tracker.bytesOut;
124
- current.totalDuration += durationInWindow;
125
- ipData.set(tracker.remoteIP, current);
129
+ if (tracker.lastUpdate > windowStart) {
130
+ let windowBytesIn = 0;
131
+ let windowBytesOut = 0;
132
+ if (tracker.windowSnapshots && tracker.windowSnapshots.length > 0) {
133
+ // Find the earliest snapshot within or just before the window
134
+ let startSnapshot = { timestamp: tracker.startTime, bytesIn: 0, bytesOut: 0 };
135
+ for (const snapshot of tracker.windowSnapshots) {
136
+ if (snapshot.timestamp <= windowStart) {
137
+ startSnapshot = snapshot;
138
+ }
139
+ else {
140
+ break;
141
+ }
142
+ }
143
+ // Calculate bytes transferred since window start
144
+ windowBytesIn = tracker.bytesIn - startSnapshot.bytesIn;
145
+ windowBytesOut = tracker.bytesOut - startSnapshot.bytesOut;
146
+ }
147
+ else if (tracker.startTime > windowStart) {
148
+ // Connection started within window, use all its bytes
149
+ windowBytesIn = tracker.bytesIn;
150
+ windowBytesOut = tracker.bytesOut;
126
151
  }
152
+ // Add to IP totals
153
+ const current = ipData.get(tracker.remoteIP) || { bytesIn: 0, bytesOut: 0 };
154
+ current.bytesIn += windowBytesIn;
155
+ current.bytesOut += windowBytesOut;
156
+ ipData.set(tracker.remoteIP, current);
127
157
  }
128
158
  }
129
159
  // Convert to rates (bytes per second)
130
160
  for (const [ip, data] of ipData) {
131
- if (data.totalDuration > 0) {
132
- ipThroughput.set(ip, {
133
- in: Math.round(data.bytesIn / data.totalDuration),
134
- out: Math.round(data.bytesOut / data.totalDuration)
135
- });
136
- }
161
+ ipThroughput.set(ip, {
162
+ in: Math.round(data.bytesIn / windowSeconds),
163
+ out: Math.round(data.bytesOut / windowSeconds)
164
+ });
137
165
  }
138
166
  return ipThroughput;
139
167
  }
@@ -217,7 +245,8 @@ export class MetricsCollector {
217
245
  bytesIn: 0,
218
246
  bytesOut: 0,
219
247
  startTime: now,
220
- lastUpdate: now
248
+ lastUpdate: now,
249
+ windowSnapshots: [] // Initialize empty snapshots array
221
250
  });
222
251
  // Cleanup old request timestamps
223
252
  if (this.requestTimestamps.length > 5000) {
@@ -242,6 +271,19 @@ export class MetricsCollector {
242
271
  tracker.bytesIn += bytesIn;
243
272
  tracker.bytesOut += bytesOut;
244
273
  tracker.lastUpdate = Date.now();
274
+ // Initialize snapshots array if not present
275
+ if (!tracker.windowSnapshots) {
276
+ tracker.windowSnapshots = [];
277
+ }
278
+ // Add current snapshot - we'll use these for accurate windowed calculations
279
+ tracker.windowSnapshots.push({
280
+ timestamp: Date.now(),
281
+ bytesIn: tracker.bytesIn,
282
+ bytesOut: tracker.bytesOut
283
+ });
284
+ // Keep only snapshots from last 5 minutes to prevent memory growth
285
+ const fiveMinutesAgo = Date.now() - 300000;
286
+ tracker.windowSnapshots = tracker.windowSnapshots.filter(s => s.timestamp > fiveMinutesAgo);
245
287
  }
246
288
  }
247
289
  /**
@@ -312,4 +354,4 @@ export class MetricsCollector {
312
354
  this.stop();
313
355
  }
314
356
  }
315
- //# 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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"}
357
+ //# 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 CHANGED
@@ -104,4 +104,9 @@ export interface IByteTracker {
104
104
  bytesOut: number;
105
105
  startTime: number;
106
106
  lastUpdate: number;
107
+ windowSnapshots?: Array<{
108
+ timestamp: number;
109
+ bytesIn: number;
110
+ bytesOut: number;
111
+ }>;
107
112
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartproxy",
3
- "version": "19.6.10",
3
+ "version": "19.6.11",
4
4
  "private": false,
5
5
  "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.",
6
6
  "main": "dist_ts/index.js",
package/readme.hints.md CHANGED
@@ -2,6 +2,20 @@
2
2
 
3
3
  ## Byte Tracking and Metrics
4
4
 
5
+ ### Throughput Drift Issue (Fixed)
6
+
7
+ **Problem**: Throughput numbers were gradually increasing over time for long-lived connections.
8
+
9
+ **Root Cause**: The `byRoute()` and `byIP()` methods were dividing cumulative total bytes (since connection start) by the window duration, causing rates to appear higher as connections aged:
10
+ - Hour 1: 1GB total / 60s = 17 MB/s ✓
11
+ - Hour 2: 2GB total / 60s = 34 MB/s ✗ (appears doubled!)
12
+ - Hour 3: 3GB total / 60s = 50 MB/s ✗ (keeps rising!)
13
+
14
+ **Solution**: Implemented snapshot-based byte tracking that calculates actual bytes transferred within each time window:
15
+ - Store periodic snapshots of byte counts with timestamps
16
+ - Calculate delta between window start and end snapshots
17
+ - Divide delta by window duration for accurate throughput
18
+
5
19
  ### What Gets Counted (Network Interface Throughput)
6
20
 
7
21
  The byte tracking is designed to match network interface throughput (what Unifi/network monitoring tools show):
@@ -41,10 +55,13 @@ The byte tracking is designed to match network interface throughput (what Unifi/
41
55
 
42
56
  The metrics system has three layers:
43
57
  1. **Connection Records** (`record.bytesReceived/bytesSent`): Track total bytes per connection
44
- 2. **ThroughputTracker**: Accumulates bytes between samples for rate calculations (bytes/second)
45
- 3. **connectionByteTrackers**: Track bytes per connection with timestamps for per-route/IP metrics
58
+ 2. **ThroughputTracker**: Accumulates bytes between samples for global rate calculations (resets each second)
59
+ 3. **connectionByteTrackers**: Track bytes per connection with snapshots for accurate windowed per-route/IP metrics
46
60
 
47
- Total byte counts come from connection records only, preventing double counting.
61
+ Key features:
62
+ - Global throughput uses sampling with accumulator reset (accurate)
63
+ - Per-route/IP throughput uses snapshots to calculate window-specific deltas (accurate)
64
+ - All byte counting happens exactly once at the data flow point
48
65
 
49
66
  ### Understanding "High" Byte Counts
50
67
 
package/ts/proxies/smart-proxy/metrics-collector.ts CHANGED
@@ -124,35 +124,49 @@ export class MetricsCollector implements IMetrics {
124
124
  const now = Date.now();
125
125
  const windowStart = now - (windowSeconds * 1000);
126
126
 
127
- // Aggregate bytes by route with proper time calculation
128
- const routeData = new Map<string, { bytesIn: number; bytesOut: number; totalDuration: number }>();
127
+ // Aggregate bytes by route - calculate actual bytes transferred in window
128
+ const routeData = new Map<string, { bytesIn: number; bytesOut: number }>();
129
129
 
130
130
  for (const [_, tracker] of this.connectionByteTrackers) {
131
131
  // Only include connections that were active within the window
132
- if (tracker.lastUpdate > windowStart || tracker.startTime > windowStart) {
133
- // Calculate the actual duration this connection was active within the window
134
- const connectionStart = Math.max(tracker.startTime, windowStart);
135
- const connectionEnd = tracker.lastUpdate;
136
- const durationInWindow = (connectionEnd - connectionStart) / 1000; // Convert to seconds
132
+ if (tracker.lastUpdate > windowStart) {
133
+ let windowBytesIn = 0;
134
+ let windowBytesOut = 0;
137
135
 
138
- if (durationInWindow > 0) {
139
- const current = routeData.get(tracker.routeName) || { bytesIn: 0, bytesOut: 0, totalDuration: 0 };
140
- current.bytesIn += tracker.bytesIn;
141
- current.bytesOut += tracker.bytesOut;
142
- current.totalDuration += durationInWindow;
143
- routeData.set(tracker.routeName, current);
136
+ if (tracker.windowSnapshots && tracker.windowSnapshots.length > 0) {
137
+ // Find the earliest snapshot within or just before the window
138
+ let startSnapshot = { timestamp: tracker.startTime, bytesIn: 0, bytesOut: 0 };
139
+ for (const snapshot of tracker.windowSnapshots) {
140
+ if (snapshot.timestamp <= windowStart) {
141
+ startSnapshot = snapshot;
142
+ } else {
143
+ break;
144
+ }
145
+ }
146
+
147
+ // Calculate bytes transferred since window start
148
+ windowBytesIn = tracker.bytesIn - startSnapshot.bytesIn;
149
+ windowBytesOut = tracker.bytesOut - startSnapshot.bytesOut;
150
+ } else if (tracker.startTime > windowStart) {
151
+ // Connection started within window, use all its bytes
152
+ windowBytesIn = tracker.bytesIn;
153
+ windowBytesOut = tracker.bytesOut;
144
154
  }
155
+
156
+ // Add to route totals
157
+ const current = routeData.get(tracker.routeName) || { bytesIn: 0, bytesOut: 0 };
158
+ current.bytesIn += windowBytesIn;
159
+ current.bytesOut += windowBytesOut;
160
+ routeData.set(tracker.routeName, current);
145
161
  }
146
162
  }
147
163
 
148
164
  // Convert to rates (bytes per second)
149
165
  for (const [route, data] of routeData) {
150
- if (data.totalDuration > 0) {
151
- routeThroughput.set(route, {
152
- in: Math.round(data.bytesIn / data.totalDuration),
153
- out: Math.round(data.bytesOut / data.totalDuration)
154
- });
155
- }
166
+ routeThroughput.set(route, {
167
+ in: Math.round(data.bytesIn / windowSeconds),
168
+ out: Math.round(data.bytesOut / windowSeconds)
169
+ });
156
170
  }
157
171
 
158
172
  return routeThroughput;
@@ -163,35 +177,49 @@ export class MetricsCollector implements IMetrics {
163
177
  const now = Date.now();
164
178
  const windowStart = now - (windowSeconds * 1000);
165
179
 
166
- // Aggregate bytes by IP with proper time calculation
167
- const ipData = new Map<string, { bytesIn: number; bytesOut: number; totalDuration: number }>();
180
+ // Aggregate bytes by IP - calculate actual bytes transferred in window
181
+ const ipData = new Map<string, { bytesIn: number; bytesOut: number }>();
168
182
 
169
183
  for (const [_, tracker] of this.connectionByteTrackers) {
170
184
  // Only include connections that were active within the window
171
- if (tracker.lastUpdate > windowStart || tracker.startTime > windowStart) {
172
- // Calculate the actual duration this connection was active within the window
173
- const connectionStart = Math.max(tracker.startTime, windowStart);
174
- const connectionEnd = tracker.lastUpdate;
175
- const durationInWindow = (connectionEnd - connectionStart) / 1000; // Convert to seconds
185
+ if (tracker.lastUpdate > windowStart) {
186
+ let windowBytesIn = 0;
187
+ let windowBytesOut = 0;
176
188
 
177
- if (durationInWindow > 0) {
178
- const current = ipData.get(tracker.remoteIP) || { bytesIn: 0, bytesOut: 0, totalDuration: 0 };
179
- current.bytesIn += tracker.bytesIn;
180
- current.bytesOut += tracker.bytesOut;
181
- current.totalDuration += durationInWindow;
182
- ipData.set(tracker.remoteIP, current);
189
+ if (tracker.windowSnapshots && tracker.windowSnapshots.length > 0) {
190
+ // Find the earliest snapshot within or just before the window
191
+ let startSnapshot = { timestamp: tracker.startTime, bytesIn: 0, bytesOut: 0 };
192
+ for (const snapshot of tracker.windowSnapshots) {
193
+ if (snapshot.timestamp <= windowStart) {
194
+ startSnapshot = snapshot;
195
+ } else {
196
+ break;
197
+ }
198
+ }
199
+
200
+ // Calculate bytes transferred since window start
201
+ windowBytesIn = tracker.bytesIn - startSnapshot.bytesIn;
202
+ windowBytesOut = tracker.bytesOut - startSnapshot.bytesOut;
203
+ } else if (tracker.startTime > windowStart) {
204
+ // Connection started within window, use all its bytes
205
+ windowBytesIn = tracker.bytesIn;
206
+ windowBytesOut = tracker.bytesOut;
183
207
  }
208
+
209
+ // Add to IP totals
210
+ const current = ipData.get(tracker.remoteIP) || { bytesIn: 0, bytesOut: 0 };
211
+ current.bytesIn += windowBytesIn;
212
+ current.bytesOut += windowBytesOut;
213
+ ipData.set(tracker.remoteIP, current);
184
214
  }
185
215
  }
186
216
 
187
217
  // Convert to rates (bytes per second)
188
218
  for (const [ip, data] of ipData) {
189
- if (data.totalDuration > 0) {
190
- ipThroughput.set(ip, {
191
- in: Math.round(data.bytesIn / data.totalDuration),
192
- out: Math.round(data.bytesOut / data.totalDuration)
193
- });
194
- }
219
+ ipThroughput.set(ip, {
220
+ in: Math.round(data.bytesIn / windowSeconds),
221
+ out: Math.round(data.bytesOut / windowSeconds)
222
+ });
195
223
  }
196
224
 
197
225
  return ipThroughput;
@@ -294,7 +322,8 @@ export class MetricsCollector implements IMetrics {
294
322
  bytesIn: 0,
295
323
  bytesOut: 0,
296
324
  startTime: now,
297
- lastUpdate: now
325
+ lastUpdate: now,
326
+ windowSnapshots: [] // Initialize empty snapshots array
298
327
  });
299
328
 
300
329
  // Cleanup old request timestamps
@@ -323,6 +352,22 @@ export class MetricsCollector implements IMetrics {
323
352
  tracker.bytesIn += bytesIn;
324
353
  tracker.bytesOut += bytesOut;
325
354
  tracker.lastUpdate = Date.now();
355
+
356
+ // Initialize snapshots array if not present
357
+ if (!tracker.windowSnapshots) {
358
+ tracker.windowSnapshots = [];
359
+ }
360
+
361
+ // Add current snapshot - we'll use these for accurate windowed calculations
362
+ tracker.windowSnapshots.push({
363
+ timestamp: Date.now(),
364
+ bytesIn: tracker.bytesIn,
365
+ bytesOut: tracker.bytesOut
366
+ });
367
+
368
+ // Keep only snapshots from last 5 minutes to prevent memory growth
369
+ const fiveMinutesAgo = Date.now() - 300000;
370
+ tracker.windowSnapshots = tracker.windowSnapshots.filter(s => s.timestamp > fiveMinutesAgo);
326
371
  }
327
372
  }
328
373
 
package/ts/proxies/smart-proxy/models/metrics-types.ts CHANGED
@@ -109,4 +109,10 @@ export interface IByteTracker {
109
109
  bytesOut: number;
110
110
  startTime: number;
111
111
  lastUpdate: number;
112
+ // Track bytes at window boundaries for rate calculation
113
+ windowSnapshots?: Array<{
114
+ timestamp: number;
115
+ bytesIn: number;
116
+ bytesOut: number;
117
+ }>;
112
118
  }