@push.rocks/smartproxy 19.6.6 → 19.6.8
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.
- package/dist_ts/core/models/wrapped-socket.d.ts +4 -0
- package/dist_ts/core/models/wrapped-socket.js +18 -1
- package/dist_ts/core/routing/matchers/path.js +3 -2
- package/dist_ts/proxies/smart-proxy/connection-manager.d.ts +4 -7
- package/dist_ts/proxies/smart-proxy/connection-manager.js +22 -22
- package/dist_ts/proxies/smart-proxy/http-proxy-bridge.d.ts +4 -3
- package/dist_ts/proxies/smart-proxy/http-proxy-bridge.js +9 -9
- package/dist_ts/proxies/smart-proxy/metrics-collector.d.ts +68 -56
- package/dist_ts/proxies/smart-proxy/metrics-collector.js +252 -176
- package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +6 -1
- package/dist_ts/proxies/smart-proxy/models/metrics-types.d.ts +99 -47
- package/dist_ts/proxies/smart-proxy/nftables-manager.d.ts +4 -4
- package/dist_ts/proxies/smart-proxy/nftables-manager.js +6 -6
- package/dist_ts/proxies/smart-proxy/port-manager.d.ts +4 -7
- package/dist_ts/proxies/smart-proxy/port-manager.js +6 -9
- package/dist_ts/proxies/smart-proxy/route-connection-handler.d.ts +4 -15
- package/dist_ts/proxies/smart-proxy/route-connection-handler.js +133 -130
- package/dist_ts/proxies/smart-proxy/security-manager.d.ts +3 -3
- package/dist_ts/proxies/smart-proxy/security-manager.js +9 -9
- package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +20 -13
- package/dist_ts/proxies/smart-proxy/smart-proxy.js +16 -13
- package/dist_ts/proxies/smart-proxy/throughput-tracker.d.ts +36 -0
- package/dist_ts/proxies/smart-proxy/throughput-tracker.js +117 -0
- package/dist_ts/proxies/smart-proxy/timeout-manager.d.ts +5 -4
- package/dist_ts/proxies/smart-proxy/timeout-manager.js +20 -16
- package/dist_ts/proxies/smart-proxy/tls-manager.d.ts +3 -3
- package/dist_ts/proxies/smart-proxy/tls-manager.js +12 -12
- package/dist_ts/routing/router/http-router.js +2 -2
- package/package.json +1 -1
- package/readme.hints.md +0 -0
- package/readme.md +239 -73
- package/readme.plan.md +364 -0
- package/ts/core/models/wrapped-socket.ts +18 -0
- package/ts/core/routing/matchers/path.ts +2 -1
- package/ts/proxies/smart-proxy/connection-manager.ts +23 -21
- package/ts/proxies/smart-proxy/http-proxy-bridge.ts +9 -8
- package/ts/proxies/smart-proxy/metrics-collector.ts +305 -188
- package/ts/proxies/smart-proxy/models/interfaces.ts +8 -1
- package/ts/proxies/smart-proxy/models/metrics-types.ts +99 -41
- package/ts/proxies/smart-proxy/nftables-manager.ts +5 -5
- package/ts/proxies/smart-proxy/port-manager.ts +6 -14
- package/ts/proxies/smart-proxy/route-connection-handler.ts +141 -138
- package/ts/proxies/smart-proxy/security-manager.ts +8 -8
- package/ts/proxies/smart-proxy/smart-proxy.ts +26 -35
- package/ts/proxies/smart-proxy/throughput-tracker.ts +144 -0
- package/ts/proxies/smart-proxy/timeout-manager.ts +22 -16
- package/ts/proxies/smart-proxy/tls-manager.ts +11 -11
- package/ts/routing/router/http-router.ts +1 -1
|
@@ -1,211 +1,283 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
|
+
import { ThroughputTracker } from './throughput-tracker.js';
|
|
2
3
|
import { logger } from '../../core/utils/logger.js';
|
|
3
4
|
/**
|
|
4
|
-
* Collects and
|
|
5
|
+
* Collects and provides metrics for SmartProxy with clean API
|
|
5
6
|
*/
|
|
6
7
|
export class MetricsCollector {
|
|
7
|
-
constructor(smartProxy) {
|
|
8
|
+
constructor(smartProxy, config) {
|
|
8
9
|
this.smartProxy = smartProxy;
|
|
9
|
-
//
|
|
10
|
+
// Request tracking
|
|
10
11
|
this.requestTimestamps = [];
|
|
11
|
-
this.
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
this.
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
routeConfigName: record.routeConfig?.name,
|
|
55
|
-
routeConfigKeys: record.routeConfig ? Object.keys(record.routeConfig) : [],
|
|
56
|
-
component: 'metrics'
|
|
57
|
-
});
|
|
12
|
+
this.totalRequests = 0;
|
|
13
|
+
// Connection byte tracking for per-route/IP metrics
|
|
14
|
+
this.connectionByteTrackers = new Map();
|
|
15
|
+
// Connection metrics implementation
|
|
16
|
+
this.connections = {
|
|
17
|
+
active: () => {
|
|
18
|
+
return this.smartProxy.connectionManager.getConnectionCount();
|
|
19
|
+
},
|
|
20
|
+
total: () => {
|
|
21
|
+
const stats = this.smartProxy.connectionManager.getTerminationStats();
|
|
22
|
+
let total = this.smartProxy.connectionManager.getConnectionCount();
|
|
23
|
+
for (const reason in stats.incoming) {
|
|
24
|
+
total += stats.incoming[reason];
|
|
25
|
+
}
|
|
26
|
+
return total;
|
|
27
|
+
},
|
|
28
|
+
byRoute: () => {
|
|
29
|
+
const routeCounts = new Map();
|
|
30
|
+
const connections = this.smartProxy.connectionManager.getConnections();
|
|
31
|
+
for (const [_, record] of connections) {
|
|
32
|
+
const routeName = record.routeName ||
|
|
33
|
+
record.routeConfig?.name ||
|
|
34
|
+
'unknown';
|
|
35
|
+
const current = routeCounts.get(routeName) || 0;
|
|
36
|
+
routeCounts.set(routeName, current + 1);
|
|
37
|
+
}
|
|
38
|
+
return routeCounts;
|
|
39
|
+
},
|
|
40
|
+
byIP: () => {
|
|
41
|
+
const ipCounts = new Map();
|
|
42
|
+
for (const [_, record] of this.smartProxy.connectionManager.getConnections()) {
|
|
43
|
+
const ip = record.remoteIP;
|
|
44
|
+
const current = ipCounts.get(ip) || 0;
|
|
45
|
+
ipCounts.set(ip, current + 1);
|
|
46
|
+
}
|
|
47
|
+
return ipCounts;
|
|
48
|
+
},
|
|
49
|
+
topIPs: (limit = 10) => {
|
|
50
|
+
const ipCounts = this.connections.byIP();
|
|
51
|
+
return Array.from(ipCounts.entries())
|
|
52
|
+
.sort((a, b) => b[1] - a[1])
|
|
53
|
+
.slice(0, limit)
|
|
54
|
+
.map(([ip, count]) => ({ ip, count }));
|
|
58
55
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
56
|
+
};
|
|
57
|
+
// Throughput metrics implementation
|
|
58
|
+
this.throughput = {
|
|
59
|
+
instant: () => {
|
|
60
|
+
return this.throughputTracker.getRate(1);
|
|
61
|
+
},
|
|
62
|
+
recent: () => {
|
|
63
|
+
return this.throughputTracker.getRate(10);
|
|
64
|
+
},
|
|
65
|
+
average: () => {
|
|
66
|
+
return this.throughputTracker.getRate(60);
|
|
67
|
+
},
|
|
68
|
+
custom: (seconds) => {
|
|
69
|
+
return this.throughputTracker.getRate(seconds);
|
|
70
|
+
},
|
|
71
|
+
history: (seconds) => {
|
|
72
|
+
return this.throughputTracker.getHistory(seconds);
|
|
73
|
+
},
|
|
74
|
+
byRoute: (windowSeconds = 60) => {
|
|
75
|
+
const routeThroughput = new Map();
|
|
76
|
+
const now = Date.now();
|
|
77
|
+
const windowStart = now - (windowSeconds * 1000);
|
|
78
|
+
// Aggregate bytes by route with proper time calculation
|
|
79
|
+
const routeData = new Map();
|
|
80
|
+
for (const [_, tracker] of this.connectionByteTrackers) {
|
|
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);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
// Convert to rates (bytes per second)
|
|
97
|
+
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
|
+
}
|
|
104
|
+
}
|
|
105
|
+
return routeThroughput;
|
|
106
|
+
},
|
|
107
|
+
byIP: (windowSeconds = 60) => {
|
|
108
|
+
const ipThroughput = new Map();
|
|
109
|
+
const now = Date.now();
|
|
110
|
+
const windowStart = now - (windowSeconds * 1000);
|
|
111
|
+
// Aggregate bytes by IP with proper time calculation
|
|
112
|
+
const ipData = new Map();
|
|
113
|
+
for (const [_, tracker] of this.connectionByteTrackers) {
|
|
114
|
+
// 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);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
// Convert to rates (bytes per second)
|
|
130
|
+
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
|
+
}
|
|
137
|
+
}
|
|
138
|
+
return ipThroughput;
|
|
139
|
+
}
|
|
140
|
+
};
|
|
141
|
+
// Request metrics implementation
|
|
142
|
+
this.requests = {
|
|
143
|
+
perSecond: () => {
|
|
144
|
+
const now = Date.now();
|
|
145
|
+
const oneSecondAgo = now - 1000;
|
|
146
|
+
// Clean old timestamps
|
|
147
|
+
this.requestTimestamps = this.requestTimestamps.filter(ts => ts > now - 60000);
|
|
148
|
+
// Count requests in last second
|
|
149
|
+
const recentRequests = this.requestTimestamps.filter(ts => ts > oneSecondAgo);
|
|
150
|
+
return recentRequests.length;
|
|
151
|
+
},
|
|
152
|
+
perMinute: () => {
|
|
153
|
+
const now = Date.now();
|
|
154
|
+
const oneMinuteAgo = now - 60000;
|
|
155
|
+
// Count requests in last minute
|
|
156
|
+
const recentRequests = this.requestTimestamps.filter(ts => ts > oneMinuteAgo);
|
|
157
|
+
return recentRequests.length;
|
|
158
|
+
},
|
|
159
|
+
total: () => {
|
|
160
|
+
return this.totalRequests;
|
|
161
|
+
}
|
|
162
|
+
};
|
|
163
|
+
// Totals implementation
|
|
164
|
+
this.totals = {
|
|
165
|
+
bytesIn: () => {
|
|
166
|
+
let total = 0;
|
|
167
|
+
// Sum from all active connections
|
|
168
|
+
for (const [_, record] of this.smartProxy.connectionManager.getConnections()) {
|
|
169
|
+
total += record.bytesReceived;
|
|
170
|
+
}
|
|
171
|
+
// TODO: Add historical data from terminated connections
|
|
172
|
+
return total;
|
|
173
|
+
},
|
|
174
|
+
bytesOut: () => {
|
|
175
|
+
let total = 0;
|
|
176
|
+
// Sum from all active connections
|
|
177
|
+
for (const [_, record] of this.smartProxy.connectionManager.getConnections()) {
|
|
178
|
+
total += record.bytesSent;
|
|
179
|
+
}
|
|
180
|
+
// TODO: Add historical data from terminated connections
|
|
181
|
+
return total;
|
|
182
|
+
},
|
|
183
|
+
connections: () => {
|
|
184
|
+
return this.connections.total();
|
|
185
|
+
}
|
|
186
|
+
};
|
|
187
|
+
// Percentiles implementation (placeholder for now)
|
|
188
|
+
this.percentiles = {
|
|
189
|
+
connectionDuration: () => {
|
|
190
|
+
// TODO: Implement percentile calculations
|
|
191
|
+
return { p50: 0, p95: 0, p99: 0 };
|
|
192
|
+
},
|
|
193
|
+
bytesTransferred: () => {
|
|
194
|
+
// TODO: Implement percentile calculations
|
|
195
|
+
return {
|
|
196
|
+
in: { p50: 0, p95: 0, p99: 0 },
|
|
197
|
+
out: { p50: 0, p95: 0, p99: 0 }
|
|
198
|
+
};
|
|
199
|
+
}
|
|
200
|
+
};
|
|
201
|
+
this.sampleIntervalMs = config?.sampleIntervalMs || 1000;
|
|
202
|
+
this.retentionSeconds = config?.retentionSeconds || 3600;
|
|
203
|
+
this.throughputTracker = new ThroughputTracker(this.retentionSeconds);
|
|
113
204
|
}
|
|
114
205
|
/**
|
|
115
|
-
* Record a new request
|
|
206
|
+
* Record a new request
|
|
116
207
|
*/
|
|
117
|
-
recordRequest() {
|
|
208
|
+
recordRequest(connectionId, routeName, remoteIP) {
|
|
118
209
|
const now = Date.now();
|
|
119
210
|
this.requestTimestamps.push(now);
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
211
|
+
this.totalRequests++;
|
|
212
|
+
// Initialize byte tracker for this connection
|
|
213
|
+
this.connectionByteTrackers.set(connectionId, {
|
|
214
|
+
connectionId,
|
|
215
|
+
routeName,
|
|
216
|
+
remoteIP,
|
|
217
|
+
bytesIn: 0,
|
|
218
|
+
bytesOut: 0,
|
|
219
|
+
startTime: now,
|
|
220
|
+
lastUpdate: now
|
|
221
|
+
});
|
|
222
|
+
// Cleanup old request timestamps
|
|
223
|
+
if (this.requestTimestamps.length > 5000) {
|
|
224
|
+
// First try to clean up old timestamps (older than 1 minute)
|
|
225
|
+
const cutoff = now - 60000;
|
|
124
226
|
this.requestTimestamps = this.requestTimestamps.filter(ts => ts > cutoff);
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
* Get total throughput (bytes transferred)
|
|
129
|
-
*/
|
|
130
|
-
getThroughput() {
|
|
131
|
-
let bytesIn = 0;
|
|
132
|
-
let bytesOut = 0;
|
|
133
|
-
// Sum bytes from all active connections
|
|
134
|
-
for (const [_, record] of this.smartProxy.connectionManager.getConnections()) {
|
|
135
|
-
bytesIn += record.bytesReceived;
|
|
136
|
-
bytesOut += record.bytesSent;
|
|
137
|
-
}
|
|
138
|
-
return { bytesIn, bytesOut };
|
|
139
|
-
}
|
|
140
|
-
/**
|
|
141
|
-
* Get throughput rate (bytes per second) for last minute
|
|
142
|
-
*/
|
|
143
|
-
getThroughputRate() {
|
|
144
|
-
const now = Date.now();
|
|
145
|
-
let recentBytesIn = 0;
|
|
146
|
-
let recentBytesOut = 0;
|
|
147
|
-
// Calculate bytes transferred in last minute from active connections
|
|
148
|
-
for (const [_, record] of this.smartProxy.connectionManager.getConnections()) {
|
|
149
|
-
const connectionAge = now - record.incomingStartTime;
|
|
150
|
-
if (connectionAge < 60000) { // Connection started within last minute
|
|
151
|
-
recentBytesIn += record.bytesReceived;
|
|
152
|
-
recentBytesOut += record.bytesSent;
|
|
153
|
-
}
|
|
154
|
-
else {
|
|
155
|
-
// For older connections, estimate rate based on average
|
|
156
|
-
const rate = connectionAge / 60000;
|
|
157
|
-
recentBytesIn += record.bytesReceived / rate;
|
|
158
|
-
recentBytesOut += record.bytesSent / rate;
|
|
227
|
+
// If still too many, enforce hard cap of 5000 most recent
|
|
228
|
+
if (this.requestTimestamps.length > 5000) {
|
|
229
|
+
this.requestTimestamps = this.requestTimestamps.slice(-5000);
|
|
159
230
|
}
|
|
160
231
|
}
|
|
161
|
-
return {
|
|
162
|
-
bytesInPerSec: Math.round(recentBytesIn / 60),
|
|
163
|
-
bytesOutPerSec: Math.round(recentBytesOut / 60)
|
|
164
|
-
};
|
|
165
|
-
}
|
|
166
|
-
/**
|
|
167
|
-
* Get top IPs by connection count
|
|
168
|
-
*/
|
|
169
|
-
getTopIPs(limit = 10) {
|
|
170
|
-
const ipCounts = this.getConnectionsByIP();
|
|
171
|
-
const sorted = Array.from(ipCounts.entries())
|
|
172
|
-
.sort((a, b) => b[1] - a[1])
|
|
173
|
-
.slice(0, limit)
|
|
174
|
-
.map(([ip, connections]) => ({ ip, connections }));
|
|
175
|
-
return sorted;
|
|
176
232
|
}
|
|
177
233
|
/**
|
|
178
|
-
*
|
|
234
|
+
* Record bytes transferred for a connection
|
|
179
235
|
*/
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
236
|
+
recordBytes(connectionId, bytesIn, bytesOut) {
|
|
237
|
+
// Update global throughput tracker
|
|
238
|
+
this.throughputTracker.recordBytes(bytesIn, bytesOut);
|
|
239
|
+
// Update connection-specific tracker
|
|
240
|
+
const tracker = this.connectionByteTrackers.get(connectionId);
|
|
241
|
+
if (tracker) {
|
|
242
|
+
tracker.bytesIn += bytesIn;
|
|
243
|
+
tracker.bytesOut += bytesOut;
|
|
244
|
+
tracker.lastUpdate = Date.now();
|
|
245
|
+
}
|
|
184
246
|
}
|
|
185
247
|
/**
|
|
186
|
-
* Clean up
|
|
248
|
+
* Clean up tracking for a closed connection
|
|
187
249
|
*/
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
this.requestTimestamps = this.requestTimestamps.filter(ts => ts > cutoff);
|
|
250
|
+
removeConnection(connectionId) {
|
|
251
|
+
this.connectionByteTrackers.delete(connectionId);
|
|
191
252
|
}
|
|
192
253
|
/**
|
|
193
|
-
* Start the metrics collector
|
|
254
|
+
* Start the metrics collector
|
|
194
255
|
*/
|
|
195
256
|
start() {
|
|
196
257
|
if (!this.smartProxy.routeConnectionHandler) {
|
|
197
258
|
throw new Error('MetricsCollector: RouteConnectionHandler not available');
|
|
198
259
|
}
|
|
199
|
-
//
|
|
260
|
+
// Start periodic sampling
|
|
261
|
+
this.samplingInterval = setInterval(() => {
|
|
262
|
+
this.throughputTracker.takeSample();
|
|
263
|
+
// Clean up old connection trackers (connections closed more than 5 minutes ago)
|
|
264
|
+
const cutoff = Date.now() - 300000;
|
|
265
|
+
for (const [id, tracker] of this.connectionByteTrackers) {
|
|
266
|
+
if (tracker.lastUpdate < cutoff) {
|
|
267
|
+
this.connectionByteTrackers.delete(id);
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
}, this.sampleIntervalMs);
|
|
271
|
+
// Subscribe to new connections
|
|
200
272
|
this.connectionSubscription = this.smartProxy.routeConnectionHandler.newConnectionSubject.subscribe({
|
|
201
273
|
next: (record) => {
|
|
202
|
-
|
|
203
|
-
|
|
274
|
+
const routeName = record.routeConfig?.name || 'unknown';
|
|
275
|
+
this.recordRequest(record.id, routeName, record.remoteIP);
|
|
204
276
|
if (this.smartProxy.settings?.enableDetailedLogging) {
|
|
205
277
|
logger.log('debug', `MetricsCollector: New connection recorded`, {
|
|
206
278
|
connectionId: record.id,
|
|
207
279
|
remoteIP: record.remoteIP,
|
|
208
|
-
routeName
|
|
280
|
+
routeName,
|
|
209
281
|
component: 'metrics'
|
|
210
282
|
});
|
|
211
283
|
}
|
|
@@ -220,9 +292,13 @@ export class MetricsCollector {
|
|
|
220
292
|
logger.log('debug', 'MetricsCollector started', { component: 'metrics' });
|
|
221
293
|
}
|
|
222
294
|
/**
|
|
223
|
-
* Stop the metrics collector
|
|
295
|
+
* Stop the metrics collector
|
|
224
296
|
*/
|
|
225
297
|
stop() {
|
|
298
|
+
if (this.samplingInterval) {
|
|
299
|
+
clearInterval(this.samplingInterval);
|
|
300
|
+
this.samplingInterval = undefined;
|
|
301
|
+
}
|
|
226
302
|
if (this.connectionSubscription) {
|
|
227
303
|
this.connectionSubscription.unsubscribe();
|
|
228
304
|
this.connectionSubscription = undefined;
|
|
@@ -230,10 +306,10 @@ export class MetricsCollector {
|
|
|
230
306
|
logger.log('debug', 'MetricsCollector stopped', { component: 'metrics' });
|
|
231
307
|
}
|
|
232
308
|
/**
|
|
233
|
-
* Alias for stop() for
|
|
309
|
+
* Alias for stop() for compatibility
|
|
234
310
|
*/
|
|
235
311
|
destroy() {
|
|
236
312
|
this.stop();
|
|
237
313
|
}
|
|
238
314
|
}
|
|
239
|
-
//# 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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"}
|
|
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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"}
|
|
@@ -76,6 +76,11 @@ export interface ISmartProxyOptions {
|
|
|
76
76
|
extendedKeepAliveLifetime?: number;
|
|
77
77
|
useHttpProxy?: number[];
|
|
78
78
|
httpProxyPort?: number;
|
|
79
|
+
metrics?: {
|
|
80
|
+
enabled?: boolean;
|
|
81
|
+
sampleIntervalMs?: number;
|
|
82
|
+
retentionSeconds?: number;
|
|
83
|
+
};
|
|
79
84
|
/**
|
|
80
85
|
* Global ACME configuration options for SmartProxy
|
|
81
86
|
*
|
|
@@ -111,7 +116,7 @@ export interface IConnectionRecord {
|
|
|
111
116
|
outgoingClosedTime?: number;
|
|
112
117
|
lockedDomain?: string;
|
|
113
118
|
connectionClosed: boolean;
|
|
114
|
-
cleanupTimer?: NodeJS.Timeout;
|
|
119
|
+
cleanupTimer?: NodeJS.Timeout | null;
|
|
115
120
|
alertFallbackTimeout?: NodeJS.Timeout;
|
|
116
121
|
lastActivity: number;
|
|
117
122
|
pendingData: Buffer[];
|