@push.rocks/smartproxy 19.6.6 → 19.6.7

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 (41) hide show
  1. package/dist_ts/proxies/smart-proxy/connection-manager.d.ts +4 -7
  2. package/dist_ts/proxies/smart-proxy/connection-manager.js +22 -22
  3. package/dist_ts/proxies/smart-proxy/http-proxy-bridge.d.ts +4 -3
  4. package/dist_ts/proxies/smart-proxy/http-proxy-bridge.js +9 -9
  5. package/dist_ts/proxies/smart-proxy/metrics-collector.d.ts +68 -56
  6. package/dist_ts/proxies/smart-proxy/metrics-collector.js +226 -176
  7. package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +5 -0
  8. package/dist_ts/proxies/smart-proxy/models/metrics-types.d.ts +94 -48
  9. package/dist_ts/proxies/smart-proxy/nftables-manager.d.ts +4 -4
  10. package/dist_ts/proxies/smart-proxy/nftables-manager.js +6 -6
  11. package/dist_ts/proxies/smart-proxy/port-manager.d.ts +4 -7
  12. package/dist_ts/proxies/smart-proxy/port-manager.js +6 -9
  13. package/dist_ts/proxies/smart-proxy/route-connection-handler.d.ts +4 -15
  14. package/dist_ts/proxies/smart-proxy/route-connection-handler.js +128 -128
  15. package/dist_ts/proxies/smart-proxy/security-manager.d.ts +3 -3
  16. package/dist_ts/proxies/smart-proxy/security-manager.js +9 -9
  17. package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +20 -13
  18. package/dist_ts/proxies/smart-proxy/smart-proxy.js +16 -13
  19. package/dist_ts/proxies/smart-proxy/throughput-tracker.d.ts +36 -0
  20. package/dist_ts/proxies/smart-proxy/throughput-tracker.js +117 -0
  21. package/dist_ts/proxies/smart-proxy/timeout-manager.d.ts +4 -3
  22. package/dist_ts/proxies/smart-proxy/timeout-manager.js +16 -16
  23. package/dist_ts/proxies/smart-proxy/tls-manager.d.ts +3 -3
  24. package/dist_ts/proxies/smart-proxy/tls-manager.js +12 -12
  25. package/package.json +1 -1
  26. package/readme.hints.md +0 -0
  27. package/readme.md +239 -73
  28. package/readme.plan.md +364 -0
  29. package/ts/proxies/smart-proxy/connection-manager.ts +23 -21
  30. package/ts/proxies/smart-proxy/http-proxy-bridge.ts +9 -8
  31. package/ts/proxies/smart-proxy/metrics-collector.ts +277 -189
  32. package/ts/proxies/smart-proxy/models/interfaces.ts +7 -0
  33. package/ts/proxies/smart-proxy/models/metrics-types.ts +93 -41
  34. package/ts/proxies/smart-proxy/nftables-manager.ts +5 -5
  35. package/ts/proxies/smart-proxy/port-manager.ts +6 -14
  36. package/ts/proxies/smart-proxy/route-connection-handler.ts +136 -136
  37. package/ts/proxies/smart-proxy/security-manager.ts +8 -8
  38. package/ts/proxies/smart-proxy/smart-proxy.ts +26 -35
  39. package/ts/proxies/smart-proxy/throughput-tracker.ts +144 -0
  40. package/ts/proxies/smart-proxy/timeout-manager.ts +16 -15
  41. package/ts/proxies/smart-proxy/tls-manager.ts +11 -11
@@ -1,16 +1,13 @@
1
1
  import * as plugins from '../../plugins.js';
2
- import type { IConnectionRecord, ISmartProxyOptions } from './models/interfaces.js';
3
- import { SecurityManager } from './security-manager.js';
4
- import { TimeoutManager } from './timeout-manager.js';
2
+ import type { IConnectionRecord } from './models/interfaces.js';
5
3
  import { LifecycleComponent } from '../../core/utils/lifecycle-component.js';
6
4
  import { WrappedSocket } from '../../core/models/wrapped-socket.js';
5
+ import type { SmartProxy } from './smart-proxy.js';
7
6
  /**
8
7
  * Manages connection lifecycle, tracking, and cleanup with performance optimizations
9
8
  */
10
9
  export declare class ConnectionManager extends LifecycleComponent {
11
- private settings;
12
- private securityManager;
13
- private timeoutManager;
10
+ private smartProxy;
14
11
  private connectionRecords;
15
12
  private terminationStats;
16
13
  private nextInactivityCheck;
@@ -18,7 +15,7 @@ export declare class ConnectionManager extends LifecycleComponent {
18
15
  private readonly cleanupBatchSize;
19
16
  private cleanupQueue;
20
17
  private cleanupTimer;
21
- constructor(settings: ISmartProxyOptions, securityManager: SecurityManager, timeoutManager: TimeoutManager);
18
+ constructor(smartProxy: SmartProxy);
22
19
  /**
23
20
  * Generate a unique connection ID
24
21
  */
@@ -1,6 +1,4 @@
1
1
  import * as plugins from '../../plugins.js';
2
- import { SecurityManager } from './security-manager.js';
3
- import { TimeoutManager } from './timeout-manager.js';
4
2
  import { logger } from '../../core/utils/logger.js';
5
3
  import { LifecycleComponent } from '../../core/utils/lifecycle-component.js';
6
4
  import { cleanupSocket } from '../../core/utils/socket-utils.js';
@@ -9,11 +7,9 @@ import { WrappedSocket } from '../../core/models/wrapped-socket.js';
9
7
  * Manages connection lifecycle, tracking, and cleanup with performance optimizations
10
8
  */
11
9
  export class ConnectionManager extends LifecycleComponent {
12
- constructor(settings, securityManager, timeoutManager) {
10
+ constructor(smartProxy) {
13
11
  super();
14
- this.settings = settings;
15
- this.securityManager = securityManager;
16
- this.timeoutManager = timeoutManager;
12
+ this.smartProxy = smartProxy;
17
13
  this.connectionRecords = new Map();
18
14
  this.terminationStats = { incoming: {}, outgoing: {} };
19
15
  // Performance optimization: Track connections needing inactivity check
@@ -23,9 +19,9 @@ export class ConnectionManager extends LifecycleComponent {
23
19
  this.cleanupQueue = new Set();
24
20
  this.cleanupTimer = null;
25
21
  // Set reasonable defaults for connection limits
26
- this.maxConnections = settings.defaults?.security?.maxConnections || 10000;
22
+ this.maxConnections = smartProxy.settings.defaults?.security?.maxConnections || 10000;
27
23
  // Start inactivity check timer if not disabled
28
- if (!settings.disableInactivityCheck) {
24
+ if (!smartProxy.settings.disableInactivityCheck) {
29
25
  this.startInactivityCheckTimer();
30
26
  }
31
27
  }
@@ -88,9 +84,9 @@ export class ConnectionManager extends LifecycleComponent {
88
84
  */
89
85
  trackConnection(connectionId, record) {
90
86
  this.connectionRecords.set(connectionId, record);
91
- this.securityManager.trackConnectionByIP(record.remoteIP, connectionId);
87
+ this.smartProxy.securityManager.trackConnectionByIP(record.remoteIP, connectionId);
92
88
  // Schedule inactivity check
93
- if (!this.settings.disableInactivityCheck) {
89
+ if (!this.smartProxy.settings.disableInactivityCheck) {
94
90
  this.scheduleInactivityCheck(connectionId, record);
95
91
  }
96
92
  }
@@ -98,14 +94,14 @@ export class ConnectionManager extends LifecycleComponent {
98
94
  * Schedule next inactivity check for a connection
99
95
  */
100
96
  scheduleInactivityCheck(connectionId, record) {
101
- let timeout = this.settings.inactivityTimeout;
97
+ let timeout = this.smartProxy.settings.inactivityTimeout;
102
98
  if (record.hasKeepAlive) {
103
- if (this.settings.keepAliveTreatment === 'immortal') {
99
+ if (this.smartProxy.settings.keepAliveTreatment === 'immortal') {
104
100
  // Don't schedule check for immortal connections
105
101
  return;
106
102
  }
107
- else if (this.settings.keepAliveTreatment === 'extended') {
108
- const multiplier = this.settings.keepAliveInactivityMultiplier || 6;
103
+ else if (this.smartProxy.settings.keepAliveTreatment === 'extended') {
104
+ const multiplier = this.smartProxy.settings.keepAliveInactivityMultiplier || 6;
109
105
  timeout = timeout * multiplier;
110
106
  }
111
107
  }
@@ -144,7 +140,7 @@ export class ConnectionManager extends LifecycleComponent {
144
140
  * Initiates cleanup once for a connection
145
141
  */
146
142
  initiateCleanupOnce(record, reason = 'normal') {
147
- if (this.settings.enableDetailedLogging) {
143
+ if (this.smartProxy.settings.enableDetailedLogging) {
148
144
  logger.log('info', `Connection cleanup initiated`, {
149
145
  connectionId: record.id,
150
146
  remoteIP: record.remoteIP,
@@ -214,7 +210,11 @@ export class ConnectionManager extends LifecycleComponent {
214
210
  // Remove from inactivity check
215
211
  this.nextInactivityCheck.delete(record.id);
216
212
  // Track connection termination
217
- this.securityManager.removeConnectionByIP(record.remoteIP, record.id);
213
+ this.smartProxy.securityManager.removeConnectionByIP(record.remoteIP, record.id);
214
+ // Remove from metrics tracking
215
+ if (this.smartProxy.metricsCollector) {
216
+ this.smartProxy.metricsCollector.removeConnection(record.id);
217
+ }
218
218
  if (record.cleanupTimer) {
219
219
  clearTimeout(record.cleanupTimer);
220
220
  record.cleanupTimer = undefined;
@@ -288,7 +288,7 @@ export class ConnectionManager extends LifecycleComponent {
288
288
  // Remove the record from the tracking map
289
289
  this.connectionRecords.delete(record.id);
290
290
  // Log connection details
291
- if (this.settings.enableDetailedLogging) {
291
+ if (this.smartProxy.settings.enableDetailedLogging) {
292
292
  logger.log('info', `Connection terminated: ${record.remoteIP}:${record.localPort} (${reason}) - ` +
293
293
  `${plugins.prettyMs(duration)}, IN: ${record.bytesReceived}B, OUT: ${record.bytesSent}B`, logData);
294
294
  }
@@ -355,7 +355,7 @@ export class ConnectionManager extends LifecycleComponent {
355
355
  */
356
356
  handleClose(side, record) {
357
357
  return () => {
358
- if (this.settings.enableDetailedLogging) {
358
+ if (this.smartProxy.settings.enableDetailedLogging) {
359
359
  logger.log('info', `Connection closed on ${side} side`, {
360
360
  connectionId: record.id,
361
361
  side,
@@ -476,9 +476,9 @@ export class ConnectionManager extends LifecycleComponent {
476
476
  }
477
477
  const inactivityTime = now - record.lastActivity;
478
478
  // Use extended timeout for extended-treatment keep-alive connections
479
- let effectiveTimeout = this.settings.inactivityTimeout;
480
- if (record.hasKeepAlive && this.settings.keepAliveTreatment === 'extended') {
481
- const multiplier = this.settings.keepAliveInactivityMultiplier || 6;
479
+ let effectiveTimeout = this.smartProxy.settings.inactivityTimeout;
480
+ if (record.hasKeepAlive && this.smartProxy.settings.keepAliveTreatment === 'extended') {
481
+ const multiplier = this.smartProxy.settings.keepAliveInactivityMultiplier || 6;
482
482
  effectiveTimeout = effectiveTimeout * multiplier;
483
483
  }
484
484
  if (inactivityTime > effectiveTimeout) {
@@ -611,4 +611,4 @@ export class ConnectionManager extends LifecycleComponent {
611
611
  setImmediate(processBatch);
612
612
  }
613
613
  }
614
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/connection-manager.ts"],"names":[],"mappings":"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"}
614
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/connection-manager.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,13 @@
1
1
  import * as plugins from '../../plugins.js';
2
2
  import { HttpProxy } from '../http-proxy/index.js';
3
- import type { IConnectionRecord, ISmartProxyOptions } from './models/interfaces.js';
3
+ import type { IConnectionRecord } from './models/interfaces.js';
4
4
  import type { IRouteConfig } from './models/route-types.js';
5
5
  import { WrappedSocket } from '../../core/models/wrapped-socket.js';
6
+ import type { SmartProxy } from './smart-proxy.js';
6
7
  export declare class HttpProxyBridge {
7
- private settings;
8
+ private smartProxy;
8
9
  private httpProxy;
9
- constructor(settings: ISmartProxyOptions);
10
+ constructor(smartProxy: SmartProxy);
10
11
  /**
11
12
  * Get the HttpProxy instance
12
13
  */
@@ -3,8 +3,8 @@ import { HttpProxy } from '../http-proxy/index.js';
3
3
  import { setupBidirectionalForwarding } from '../../core/utils/socket-utils.js';
4
4
  import { WrappedSocket } from '../../core/models/wrapped-socket.js';
5
5
  export class HttpProxyBridge {
6
- constructor(settings) {
7
- this.settings = settings;
6
+ constructor(smartProxy) {
7
+ this.smartProxy = smartProxy;
8
8
  this.httpProxy = null;
9
9
  }
10
10
  /**
@@ -17,16 +17,16 @@ export class HttpProxyBridge {
17
17
  * Initialize HttpProxy instance
18
18
  */
19
19
  async initialize() {
20
- if (!this.httpProxy && this.settings.useHttpProxy && this.settings.useHttpProxy.length > 0) {
20
+ if (!this.httpProxy && this.smartProxy.settings.useHttpProxy && this.smartProxy.settings.useHttpProxy.length > 0) {
21
21
  const httpProxyOptions = {
22
- port: this.settings.httpProxyPort,
22
+ port: this.smartProxy.settings.httpProxyPort,
23
23
  portProxyIntegration: true,
24
- logLevel: this.settings.enableDetailedLogging ? 'debug' : 'info'
24
+ logLevel: this.smartProxy.settings.enableDetailedLogging ? 'debug' : 'info'
25
25
  };
26
26
  this.httpProxy = new HttpProxy(httpProxyOptions);
27
- console.log(`Initialized HttpProxy on port ${this.settings.httpProxyPort}`);
27
+ console.log(`Initialized HttpProxy on port ${this.smartProxy.settings.httpProxyPort}`);
28
28
  // Apply route configurations to HttpProxy
29
- await this.syncRoutesToHttpProxy(this.settings.routes || []);
29
+ await this.syncRoutesToHttpProxy(this.smartProxy.settings.routes || []);
30
30
  }
31
31
  }
32
32
  /**
@@ -42,7 +42,7 @@ export class HttpProxyBridge {
42
42
  const routePorts = Array.isArray(route.match.ports)
43
43
  ? route.match.ports
44
44
  : [route.match.ports];
45
- return routePorts.some(port => this.settings.useHttpProxy?.includes(port));
45
+ return routePorts.some(port => this.smartProxy.settings.useHttpProxy?.includes(port));
46
46
  })
47
47
  .map(route => this.routeToHttpProxyConfig(route));
48
48
  // Apply configurations to HttpProxy
@@ -137,4 +137,4 @@ export class HttpProxyBridge {
137
137
  }
138
138
  }
139
139
  }
140
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1wcm94eS1icmlkZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9wcm94aWVzL3NtYXJ0LXByb3h5L2h0dHAtcHJveHktYnJpZGdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ25ELE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBR2hGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUVwRSxNQUFNLE9BQU8sZUFBZTtJQUcxQixZQUFvQixRQUE0QjtRQUE1QixhQUFRLEdBQVIsUUFBUSxDQUFvQjtRQUZ4QyxjQUFTLEdBQXFCLElBQUksQ0FBQztJQUVRLENBQUM7SUFFcEQ7O09BRUc7SUFDSSxZQUFZO1FBQ2pCLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQztJQUN4QixDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsVUFBVTtRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLFlBQVksSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDM0YsTUFBTSxnQkFBZ0IsR0FBUTtnQkFDNUIsSUFBSSxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYztnQkFDbEMsb0JBQW9CLEVBQUUsSUFBSTtnQkFDMUIsUUFBUSxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMscUJBQXFCLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTTthQUNqRSxDQUFDO1lBRUYsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1lBQ2pELE9BQU8sQ0FBQyxHQUFHLENB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
140
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1wcm94eS1icmlkZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9wcm94aWVzL3NtYXJ0LXByb3h5L2h0dHAtcHJveHktYnJpZGdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ25ELE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBR2hGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUdwRSxNQUFNLE9BQU8sZUFBZTtJQUcxQixZQUFvQixVQUFzQjtRQUF0QixlQUFVLEdBQVYsVUFBVSxDQUFZO1FBRmxDLGNBQVMsR0FBcUIsSUFBSSxDQUFDO0lBRUUsQ0FBQztJQUU5Qzs7T0FFRztJQUNJLFlBQVk7UUFDakIsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDO0lBQ3hCLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxVQUFVO1FBQ3JCLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLFlBQVksSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ2pILE1BQU0sZ0JBQWdCLEdBQVE7Z0JBQzVCLElBQUksRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxhQUFjO2dCQUM3QyxvQkFBb0IsRUFBRSxJQUFJO2dCQUMxQixRQUFRLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMscUJBQXFCLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTTthQUM1RSxDQUFDO1lBRUYsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLFNBQVMsQ0FBQyxn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
@@ -1,80 +1,92 @@
1
1
  import type { SmartProxy } from './smart-proxy.js';
2
- import type { IProxyStatsExtended } from './models/metrics-types.js';
2
+ import type { IMetrics, IThroughputData, IThroughputHistoryPoint } from './models/metrics-types.js';
3
3
  /**
4
- * Collects and computes metrics for SmartProxy on-demand
4
+ * Collects and provides metrics for SmartProxy with clean API
5
5
  */
6
- export declare class MetricsCollector implements IProxyStatsExtended {
6
+ export declare class MetricsCollector implements IMetrics {
7
7
  private smartProxy;
8
+ private throughputTracker;
8
9
  private requestTimestamps;
9
- private readonly RPS_WINDOW_SIZE;
10
- private readonly MAX_TIMESTAMPS;
11
- private cachedMetrics;
12
- private readonly CACHE_TTL;
10
+ private totalRequests;
11
+ private connectionByteTrackers;
12
+ private samplingInterval?;
13
13
  private connectionSubscription?;
14
- constructor(smartProxy: SmartProxy);
15
- /**
16
- * Get the current number of active connections
17
- */
18
- getActiveConnections(): number;
19
- /**
20
- * Get connection counts grouped by route name
21
- */
22
- getConnectionsByRoute(): Map<string, number>;
23
- /**
24
- * Get connection counts grouped by IP address
25
- */
26
- getConnectionsByIP(): Map<string, number>;
27
- /**
28
- * Get the total number of connections since proxy start
29
- */
30
- getTotalConnections(): number;
31
- /**
32
- * Get the current requests per second rate
33
- */
34
- getRequestsPerSecond(): number;
35
- /**
36
- * Record a new request for RPS tracking
37
- */
38
- recordRequest(): void;
39
- /**
40
- * Get total throughput (bytes transferred)
41
- */
42
- getThroughput(): {
43
- bytesIn: number;
44
- bytesOut: number;
14
+ private readonly sampleIntervalMs;
15
+ private readonly retentionSeconds;
16
+ constructor(smartProxy: SmartProxy, config?: {
17
+ sampleIntervalMs?: number;
18
+ retentionSeconds?: number;
19
+ });
20
+ connections: {
21
+ active: () => number;
22
+ total: () => number;
23
+ byRoute: () => Map<string, number>;
24
+ byIP: () => Map<string, number>;
25
+ topIPs: (limit?: number) => Array<{
26
+ ip: string;
27
+ count: number;
28
+ }>;
45
29
  };
46
- /**
47
- * Get throughput rate (bytes per second) for last minute
48
- */
49
- getThroughputRate(): {
50
- bytesInPerSec: number;
51
- bytesOutPerSec: number;
30
+ throughput: {
31
+ instant: () => IThroughputData;
32
+ recent: () => IThroughputData;
33
+ average: () => IThroughputData;
34
+ custom: (seconds: number) => IThroughputData;
35
+ history: (seconds: number) => Array<IThroughputHistoryPoint>;
36
+ byRoute: (windowSeconds?: number) => Map<string, IThroughputData>;
37
+ byIP: (windowSeconds?: number) => Map<string, IThroughputData>;
38
+ };
39
+ requests: {
40
+ perSecond: () => number;
41
+ perMinute: () => number;
42
+ total: () => number;
43
+ };
44
+ totals: {
45
+ bytesIn: () => number;
46
+ bytesOut: () => number;
47
+ connections: () => number;
48
+ };
49
+ percentiles: {
50
+ connectionDuration: () => {
51
+ p50: number;
52
+ p95: number;
53
+ p99: number;
54
+ };
55
+ bytesTransferred: () => {
56
+ in: {
57
+ p50: number;
58
+ p95: number;
59
+ p99: number;
60
+ };
61
+ out: {
62
+ p50: number;
63
+ p95: number;
64
+ p99: number;
65
+ };
66
+ };
52
67
  };
53
68
  /**
54
- * Get top IPs by connection count
69
+ * Record a new request
55
70
  */
56
- getTopIPs(limit?: number): Array<{
57
- ip: string;
58
- connections: number;
59
- }>;
71
+ recordRequest(connectionId: string, routeName: string, remoteIP: string): void;
60
72
  /**
61
- * Check if an IP has reached the connection limit
73
+ * Record bytes transferred for a connection
62
74
  */
63
- isIPBlocked(ip: string, maxConnectionsPerIP: number): boolean;
75
+ recordBytes(connectionId: string, bytesIn: number, bytesOut: number): void;
64
76
  /**
65
- * Clean up old request timestamps
77
+ * Clean up tracking for a closed connection
66
78
  */
67
- private cleanupOldRequests;
79
+ removeConnection(connectionId: string): void;
68
80
  /**
69
- * Start the metrics collector and set up subscriptions
81
+ * Start the metrics collector
70
82
  */
71
83
  start(): void;
72
84
  /**
73
- * Stop the metrics collector and clean up resources
85
+ * Stop the metrics collector
74
86
  */
75
87
  stop(): void;
76
88
  /**
77
- * Alias for stop() for backward compatibility
89
+ * Alias for stop() for compatibility
78
90
  */
79
91
  destroy(): void;
80
92
  }