@push.rocks/smartproxy 27.18.0 → 27.20.0
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/changelog.md +28 -0
- package/dist_rust/rustproxy_linux_amd64 +0 -0
- package/dist_rust/rustproxy_linux_arm64 +0 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/core/models/route-context.d.ts +2 -0
- package/dist_ts/core/models/route-context.js +1 -1
- package/dist_ts/proxies/smart-proxy/datagram-handler-server.js +6 -4
- package/dist_ts/proxies/smart-proxy/models/metrics-types.d.ts +12 -0
- package/dist_ts/proxies/smart-proxy/models/route-types.d.ts +8 -0
- package/dist_ts/proxies/smart-proxy/models/route-types.js +1 -1
- package/dist_ts/proxies/smart-proxy/models/rust-types.d.ts +14 -0
- package/dist_ts/proxies/smart-proxy/rust-metrics-adapter.d.ts +8 -1
- package/dist_ts/proxies/smart-proxy/rust-metrics-adapter.js +73 -7
- package/dist_ts/proxies/smart-proxy/rust-proxy-bridge.d.ts +2 -1
- package/dist_ts/proxies/smart-proxy/rust-proxy-bridge.js +9 -1
- package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +5 -1
- package/dist_ts/proxies/smart-proxy/smart-proxy.js +7 -1
- package/dist_ts/proxies/smart-proxy/socket-handler-server.js +2 -1
- package/dist_ts/proxies/smart-proxy/utils/route-validator.js +28 -1
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/core/models/route-context.ts +2 -0
- package/ts/proxies/smart-proxy/datagram-handler-server.ts +14 -3
- package/ts/proxies/smart-proxy/models/metrics-types.ts +14 -0
- package/ts/proxies/smart-proxy/models/route-types.ts +10 -0
- package/ts/proxies/smart-proxy/models/rust-types.ts +16 -0
- package/ts/proxies/smart-proxy/rust-metrics-adapter.ts +110 -7
- package/ts/proxies/smart-proxy/rust-proxy-bridge.ts +14 -0
- package/ts/proxies/smart-proxy/smart-proxy.ts +8 -1
- package/ts/proxies/smart-proxy/socket-handler-server.ts +1 -0
- package/ts/proxies/smart-proxy/utils/route-validator.ts +28 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,33 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-07-24 - 27.20.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- add route-level ingress origin security policies (ingress)
|
|
8
|
+
- Add security.ingress.allowedOrigins support for direct, trustedProxy, and smartVpn origins with validation
|
|
9
|
+
- Enforce ingress origin checks across HTTP, TCP passthrough, UDP, QUIC, and HTTP/3 paths
|
|
10
|
+
- Propagate ingress origin and VPN metadata through route contexts and socket/datagram handler metadata
|
|
11
|
+
|
|
12
|
+
## 2026-07-21 - 27.19.0
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
- add bounded protocol and throughput metrics history (metrics)
|
|
17
|
+
- Add on-demand metrics history retrieval through the Rust bridge and SmartProxy API
|
|
18
|
+
- Expose frontend and backend active protocol history accessors in the metrics interface
|
|
19
|
+
- Track protocol history samples in rustproxy-metrics without expanding the regular metrics snapshot
|
|
20
|
+
- Normalize throughput history into wall-clock one-second buckets and merge refreshed history with snapshot fallback
|
|
21
|
+
|
|
22
|
+
## 2026-07-21 - 27.19.0
|
|
23
|
+
|
|
24
|
+
### Features
|
|
25
|
+
|
|
26
|
+
- expose bounded active-connection protocol histories (rustproxy-metrics, smartproxy)
|
|
27
|
+
- Retain one-hour wall-clock frontend and backend protocol samples in Rust, with WebSocket tracked as an overlay outside the unique active total.
|
|
28
|
+
- Add an on-demand history command and TypeScript API capped at ten minutes without expanding the continuously polled metrics snapshot.
|
|
29
|
+
- Keep throughput history on true one-second buckets across configurable sub-second sampling intervals.
|
|
30
|
+
|
|
3
31
|
## 2026-07-21 - 27.18.0
|
|
4
32
|
|
|
5
33
|
### Features
|
|
Binary file
|
|
Binary file
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '27.
|
|
6
|
+
version: '27.20.0',
|
|
7
7
|
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.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLHFQQUFxUDtDQUNuUSxDQUFBIn0=
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
|
+
import type { TIngressOrigin } from '../../proxies/smart-proxy/models/route-types.js';
|
|
2
3
|
/**
|
|
3
4
|
* Shared Route Context Interface
|
|
4
5
|
*
|
|
@@ -13,6 +14,7 @@ export interface IRouteContext {
|
|
|
13
14
|
domain?: string;
|
|
14
15
|
clientIp: string;
|
|
15
16
|
serverIp: string;
|
|
17
|
+
ingressOrigin?: TIngressOrigin;
|
|
16
18
|
vpn?: {
|
|
17
19
|
clientId: string;
|
|
18
20
|
assignedIp: string;
|
|
@@ -41,4 +41,4 @@ export function toBaseContext(httpContext) {
|
|
|
41
41
|
}
|
|
42
42
|
return baseContext;
|
|
43
43
|
}
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUtY29udGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL2NvcmUvbW9kZWxzL3JvdXRlLWNvbnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQW9FNUM7O0dBRUc7QUFDSCxNQUFNLFVBQVUsc0JBQXNCLENBQUMsT0FRdEM7SUFDQyxPQUFPO1FBQ0wsR0FBRyxPQUFPO1FBQ1YsU0FBUyxFQUFFLElBQUksQ0FBQyxHQUFHLEVBQUU7S0FDdEIsQ0FBQztBQUNKLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGFBQWEsQ0FBQyxXQUE4QjtJQUMxRCxrRUFBa0U7SUFDbEUsTUFBTSxXQUFXLEdBQWtCO1FBQ2pDLElBQUksRUFBRSxXQUFXLENBQUMsSUFBSTtRQUN0QixNQUFNLEVBQUUsV0FBVyxDQUFDLE1BQU07UUFDMUIsUUFBUSxFQUFFLFdBQVcsQ0FBQyxRQUFRO1FBQzlCLFFBQVEsRUFBRSxXQUFXLENBQUMsUUFBUTtRQUM5QixHQUFHLEVBQUUsV0FBVyxDQUFDLEdBQUc7UUFDcEIsSUFBSSxFQUFFLFdBQVcsQ0FBQyxJQUFJO1FBQ3RCLEtBQUssRUFBRSxXQUFXLENBQUMsS0FBSztRQUN4QixPQUFPLEVBQUUsV0FBVyxDQUFDLE9BQU87UUFDNUIsS0FBSyxFQUFFLFdBQVcsQ0FBQyxLQUFLO1FBQ3hCLFVBQVUsRUFBRSxXQUFXLENBQUMsVUFBVTtRQUNsQyxTQUFTLEVBQUUsV0FBVyxDQUFDLFNBQVM7UUFDaEMsT0FBTyxFQUFFLFdBQVcsQ0FBQyxPQUFPO1FBQzVCLFNBQVMsRUFBRSxXQUFXLENBQUMsU0FBUztRQUNoQyxZQUFZLEVBQUUsV0FBVyxDQUFDLFlBQVk7S0FDdkMsQ0FBQztJQUVGLHdDQUF3QztJQUN4QyxJQUFJLFdBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUMzQixXQUFXLENBQUMsVUFBVSxHQUFHLFdBQVcsQ0FBQyxVQUFVLENBQUM7SUFDbEQsQ0FBQztJQUVELCtCQUErQjtJQUMvQixJQUFJLFdBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUMzQixXQUFXLENBQUMsVUFBVSxHQUFHLFdBQVcsQ0FBQyxVQUFVLENBQUM7SUFDbEQsQ0FBQztJQUVELE9BQU8sV0FBVyxDQUFDO0FBQ3JCLENBQUMifQ==
|
|
@@ -143,8 +143,10 @@ export class DatagramHandlerServer {
|
|
|
143
143
|
const context = {
|
|
144
144
|
port: msg.destPort,
|
|
145
145
|
domain: undefined,
|
|
146
|
-
clientIp: msg.sourceIp,
|
|
146
|
+
clientIp: msg.clientIp || msg.sourceIp,
|
|
147
147
|
serverIp: '0.0.0.0',
|
|
148
|
+
ingressOrigin: msg.ingressOrigin,
|
|
149
|
+
vpn: msg.vpn,
|
|
148
150
|
path: undefined,
|
|
149
151
|
isTls: false,
|
|
150
152
|
tlsVersion: undefined,
|
|
@@ -154,8 +156,8 @@ export class DatagramHandlerServer {
|
|
|
154
156
|
connectionId: `udp-${msg.sourceIp}:${msg.sourcePort}-${Date.now()}`,
|
|
155
157
|
};
|
|
156
158
|
const info = {
|
|
157
|
-
sourceIp: msg.sourceIp,
|
|
158
|
-
sourcePort: msg.sourcePort,
|
|
159
|
+
sourceIp: msg.clientIp || msg.sourceIp,
|
|
160
|
+
sourcePort: msg.clientPort ?? msg.sourcePort,
|
|
159
161
|
destPort: msg.destPort,
|
|
160
162
|
context,
|
|
161
163
|
};
|
|
@@ -202,4 +204,4 @@ export class DatagramHandlerServer {
|
|
|
202
204
|
return this.socketPath;
|
|
203
205
|
}
|
|
204
206
|
}
|
|
205
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
207
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"datagram-handler-server.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/datagram-handler-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,16 @@ export interface IThroughputHistoryPoint {
|
|
|
26
26
|
in: number;
|
|
27
27
|
out: number;
|
|
28
28
|
}
|
|
29
|
+
export interface IProtocolHistoryPoint {
|
|
30
|
+
timestamp: number;
|
|
31
|
+
total: number;
|
|
32
|
+
protocols: Record<string, number>;
|
|
33
|
+
}
|
|
34
|
+
export interface IMetricsHistory {
|
|
35
|
+
throughputHistory: IThroughputHistoryPoint[];
|
|
36
|
+
frontendConnectionHistory: IProtocolHistoryPoint[];
|
|
37
|
+
backendConnectionHistory: IProtocolHistoryPoint[];
|
|
38
|
+
}
|
|
29
39
|
export interface IRequestRateMetrics {
|
|
30
40
|
perSecond: number;
|
|
31
41
|
lastMinute: number;
|
|
@@ -69,6 +79,8 @@ export interface IMetrics {
|
|
|
69
79
|
}>;
|
|
70
80
|
frontendProtocols(): IProtocolDistribution;
|
|
71
81
|
backendProtocols(): IProtocolDistribution;
|
|
82
|
+
frontendHistory(seconds: number): Array<IProtocolHistoryPoint>;
|
|
83
|
+
backendHistory(seconds: number): Array<IProtocolHistoryPoint>;
|
|
72
84
|
};
|
|
73
85
|
throughput: {
|
|
74
86
|
instant(): IThroughputData;
|
|
@@ -17,6 +17,10 @@ export type TTlsMode = 'passthrough' | 'terminate' | 'terminate-and-reencrypt';
|
|
|
17
17
|
* Transport protocol for route matching
|
|
18
18
|
*/
|
|
19
19
|
export type TTransportProtocol = 'tcp' | 'udp' | 'all';
|
|
20
|
+
/**
|
|
21
|
+
* Trusted transport path established by SmartProxy for an accepted connection.
|
|
22
|
+
*/
|
|
23
|
+
export type TIngressOrigin = 'direct' | 'trustedProxy' | 'smartVpn';
|
|
20
24
|
/**
|
|
21
25
|
* Inbound PROXY protocol handling for a listener.
|
|
22
26
|
*/
|
|
@@ -158,6 +162,10 @@ export interface IRouteSecurity {
|
|
|
158
162
|
/** Allowed VPN tunnel IPs, kept for compatibility. Prefer allowedClients. */
|
|
159
163
|
allowedAssignedIps?: string[];
|
|
160
164
|
};
|
|
165
|
+
ingress?: {
|
|
166
|
+
/** Omit ingress entirely for legacy all-origin behavior. */
|
|
167
|
+
allowedOrigins: TIngressOrigin[];
|
|
168
|
+
};
|
|
161
169
|
/** Browser-facing challenge policy. SmartProxy enforces this in the HTTP path. */
|
|
162
170
|
challenge?: plugins.smartchallenge.IRouteChallengeConfig;
|
|
163
171
|
}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import * as plugins from '../../../plugins.js';
|
|
2
2
|
// Configuration moved to models/interfaces.ts as ISmartProxyOptions
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUtdHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90cy9wcm94aWVzL3NtYXJ0LXByb3h5L21vZGVscy9yb3V0ZS10eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHFCQUFxQixDQUFDO0FBb2UvQyxvRUFBb0UifQ==
|
|
@@ -81,6 +81,20 @@ export interface IRustThroughputSample {
|
|
|
81
81
|
bytesIn: number;
|
|
82
82
|
bytesOut: number;
|
|
83
83
|
}
|
|
84
|
+
export interface IRustProtocolHistorySample {
|
|
85
|
+
timestampMs: number;
|
|
86
|
+
total: number;
|
|
87
|
+
h1Active: number;
|
|
88
|
+
h2Active: number;
|
|
89
|
+
h3Active: number;
|
|
90
|
+
wsActive: number;
|
|
91
|
+
otherActive: number;
|
|
92
|
+
}
|
|
93
|
+
export interface IRustMetricsHistory {
|
|
94
|
+
throughputHistory: IRustThroughputSample[];
|
|
95
|
+
frontendProtocolHistory: IRustProtocolHistorySample[];
|
|
96
|
+
backendProtocolHistory: IRustProtocolHistorySample[];
|
|
97
|
+
}
|
|
84
98
|
export interface IRustRouteMetrics {
|
|
85
99
|
activeConnections: number;
|
|
86
100
|
totalConnections: number;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { IMetrics, IBackendMetrics, IProtocolCacheEntry, IProtocolDistribution, IRequestRateMetrics, IThroughputData, IThroughputHistoryPoint } from './models/metrics-types.js';
|
|
1
|
+
import type { IMetrics, IMetricsHistory, IBackendMetrics, IProtocolCacheEntry, IProtocolDistribution, IProtocolHistoryPoint, IRequestRateMetrics, IThroughputData, IThroughputHistoryPoint } from './models/metrics-types.js';
|
|
2
2
|
import type { RustProxyBridge } from './rust-proxy-bridge.js';
|
|
3
3
|
/**
|
|
4
4
|
* Adapts Rust JSON metrics to the IMetrics interface.
|
|
@@ -14,6 +14,7 @@ import type { RustProxyBridge } from './rust-proxy-bridge.js';
|
|
|
14
14
|
export declare class RustMetricsAdapter implements IMetrics {
|
|
15
15
|
private bridge;
|
|
16
16
|
private cache;
|
|
17
|
+
private historyCache;
|
|
17
18
|
private pollTimer;
|
|
18
19
|
private pollIntervalMs;
|
|
19
20
|
constructor(bridge: RustProxyBridge, pollIntervalMs?: number);
|
|
@@ -21,6 +22,10 @@ export declare class RustMetricsAdapter implements IMetrics {
|
|
|
21
22
|
* Poll Rust for metrics once. Can be awaited to ensure cache is fresh.
|
|
22
23
|
*/
|
|
23
24
|
poll(): Promise<void>;
|
|
25
|
+
/**
|
|
26
|
+
* Fetch histories only when an observer needs them; regular polling stays lightweight.
|
|
27
|
+
*/
|
|
28
|
+
refreshHistory(seconds: number): Promise<IMetricsHistory>;
|
|
24
29
|
startPolling(): void;
|
|
25
30
|
stopPolling(): void;
|
|
26
31
|
connections: {
|
|
@@ -40,6 +45,8 @@ export declare class RustMetricsAdapter implements IMetrics {
|
|
|
40
45
|
}>;
|
|
41
46
|
frontendProtocols: () => IProtocolDistribution;
|
|
42
47
|
backendProtocols: () => IProtocolDistribution;
|
|
48
|
+
frontendHistory: (seconds: number) => Array<IProtocolHistoryPoint>;
|
|
49
|
+
backendHistory: (seconds: number) => Array<IProtocolHistoryPoint>;
|
|
43
50
|
};
|
|
44
51
|
throughput: {
|
|
45
52
|
instant: () => IThroughputData;
|
|
@@ -1,3 +1,45 @@
|
|
|
1
|
+
function normalizeHistoryWindow(seconds, available) {
|
|
2
|
+
if (!Number.isFinite(seconds) || seconds <= 0 || available <= 0)
|
|
3
|
+
return 0;
|
|
4
|
+
return Math.min(Math.floor(seconds), available);
|
|
5
|
+
}
|
|
6
|
+
function sliceHistory(points, seconds) {
|
|
7
|
+
const window = normalizeHistoryWindow(seconds, points.length);
|
|
8
|
+
return window === 0 ? [] : points.slice(-window);
|
|
9
|
+
}
|
|
10
|
+
function sliceWallClockHistory(points, seconds) {
|
|
11
|
+
const requestedSeconds = Number.isFinite(seconds) ? Math.floor(seconds) : 0;
|
|
12
|
+
if (requestedSeconds <= 0 || points.length === 0)
|
|
13
|
+
return [];
|
|
14
|
+
const newestTimestamp = points[points.length - 1].timestampMs;
|
|
15
|
+
const oldestTimestamp = newestTimestamp - (requestedSeconds - 1) * 1_000;
|
|
16
|
+
return points
|
|
17
|
+
.filter((point) => point.timestampMs >= oldestTimestamp)
|
|
18
|
+
.slice(-requestedSeconds);
|
|
19
|
+
}
|
|
20
|
+
function mergeThroughputHistory(cachedHistory, snapshotHistory) {
|
|
21
|
+
const mergedByTimestamp = new Map();
|
|
22
|
+
for (const point of cachedHistory) {
|
|
23
|
+
mergedByTimestamp.set(point.timestampMs, point);
|
|
24
|
+
}
|
|
25
|
+
for (const point of snapshotHistory) {
|
|
26
|
+
mergedByTimestamp.set(point.timestampMs, point);
|
|
27
|
+
}
|
|
28
|
+
return [...mergedByTimestamp.values()].sort((a, b) => a.timestampMs - b.timestampMs);
|
|
29
|
+
}
|
|
30
|
+
function mapProtocolHistoryPoint(sample) {
|
|
31
|
+
return {
|
|
32
|
+
timestamp: sample.timestampMs,
|
|
33
|
+
total: sample.total,
|
|
34
|
+
protocols: {
|
|
35
|
+
'HTTP/1.1': sample.h1Active,
|
|
36
|
+
'HTTP/2': sample.h2Active,
|
|
37
|
+
'HTTP/3': sample.h3Active,
|
|
38
|
+
WebSocket: sample.wsActive,
|
|
39
|
+
Other: sample.otherActive,
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
}
|
|
1
43
|
/**
|
|
2
44
|
* Adapts Rust JSON metrics to the IMetrics interface.
|
|
3
45
|
*
|
|
@@ -12,6 +54,7 @@
|
|
|
12
54
|
export class RustMetricsAdapter {
|
|
13
55
|
bridge;
|
|
14
56
|
cache = null;
|
|
57
|
+
historyCache = null;
|
|
15
58
|
pollTimer = null;
|
|
16
59
|
pollIntervalMs;
|
|
17
60
|
constructor(bridge, pollIntervalMs = 1000) {
|
|
@@ -29,6 +72,22 @@ export class RustMetricsAdapter {
|
|
|
29
72
|
// Ignore poll errors (bridge may be shutting down)
|
|
30
73
|
}
|
|
31
74
|
}
|
|
75
|
+
/**
|
|
76
|
+
* Fetch histories only when an observer needs them; regular polling stays lightweight.
|
|
77
|
+
*/
|
|
78
|
+
async refreshHistory(seconds) {
|
|
79
|
+
const history = await this.bridge.getMetricsHistory(seconds);
|
|
80
|
+
this.historyCache = history;
|
|
81
|
+
return {
|
|
82
|
+
throughputHistory: history.throughputHistory.map((point) => ({
|
|
83
|
+
timestamp: point.timestampMs,
|
|
84
|
+
in: point.bytesIn,
|
|
85
|
+
out: point.bytesOut,
|
|
86
|
+
})),
|
|
87
|
+
frontendConnectionHistory: history.frontendProtocolHistory.map(mapProtocolHistoryPoint),
|
|
88
|
+
backendConnectionHistory: history.backendProtocolHistory.map(mapProtocolHistoryPoint),
|
|
89
|
+
};
|
|
90
|
+
}
|
|
32
91
|
startPolling() {
|
|
33
92
|
if (this.pollTimer)
|
|
34
93
|
return;
|
|
@@ -146,6 +205,14 @@ export class RustMetricsAdapter {
|
|
|
146
205
|
otherTotal: bp?.otherTotal ?? 0,
|
|
147
206
|
};
|
|
148
207
|
},
|
|
208
|
+
frontendHistory: (seconds) => {
|
|
209
|
+
const history = this.historyCache?.frontendProtocolHistory ?? [];
|
|
210
|
+
return sliceHistory(history, seconds).map(mapProtocolHistoryPoint);
|
|
211
|
+
},
|
|
212
|
+
backendHistory: (seconds) => {
|
|
213
|
+
const history = this.historyCache?.backendProtocolHistory ?? [];
|
|
214
|
+
return sliceHistory(history, seconds).map(mapProtocolHistoryPoint);
|
|
215
|
+
},
|
|
149
216
|
};
|
|
150
217
|
throughput = {
|
|
151
218
|
instant: () => {
|
|
@@ -167,12 +234,11 @@ export class RustMetricsAdapter {
|
|
|
167
234
|
return this.throughput.instant();
|
|
168
235
|
},
|
|
169
236
|
history: (seconds) => {
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
out: p.bytesOut,
|
|
237
|
+
const history = mergeThroughputHistory(this.historyCache?.throughputHistory ?? [], this.cache?.throughputHistory ?? []);
|
|
238
|
+
return sliceWallClockHistory(history, seconds).map((point) => ({
|
|
239
|
+
timestamp: point.timestampMs,
|
|
240
|
+
in: point.bytesIn,
|
|
241
|
+
out: point.bytesOut,
|
|
176
242
|
}));
|
|
177
243
|
},
|
|
178
244
|
byRoute: (_windowSeconds) => {
|
|
@@ -302,4 +368,4 @@ export class RustMetricsAdapter {
|
|
|
302
368
|
},
|
|
303
369
|
};
|
|
304
370
|
}
|
|
305
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rust-metrics-adapter.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/rust-metrics-adapter.ts"],"names":[],"mappings":"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"}
|
|
371
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rust-metrics-adapter.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/rust-metrics-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
|
-
import type { IRustCertificateStatus, IRustChallengeOptions, IRustMetricsSnapshot, IRustProxyOptions, IRustRouteConfig, IRustStatistics } from './models/rust-types.js';
|
|
2
|
+
import type { IRustCertificateStatus, IRustChallengeOptions, IRustMetricsSnapshot, IRustProxyOptions, IRustMetricsHistory, IRustRouteConfig, IRustStatistics } from './models/rust-types.js';
|
|
3
3
|
import type { IActiveConnectionSnapshot, IActiveConnectionSnapshotOptions, IActiveConnectionSnapshotPage, ISmartProxySecurityPolicy } from './models/interfaces.js';
|
|
4
4
|
/**
|
|
5
5
|
* Bridge between TypeScript SmartProxy and the Rust binary.
|
|
@@ -26,6 +26,7 @@ export declare class RustProxyBridge extends plugins.EventEmitter {
|
|
|
26
26
|
updateRoutes(routes: IRustRouteConfig[]): Promise<void>;
|
|
27
27
|
setSecurityPolicy(policy: ISmartProxySecurityPolicy): Promise<void>;
|
|
28
28
|
getMetrics(): Promise<IRustMetricsSnapshot>;
|
|
29
|
+
getMetricsHistory(seconds: number): Promise<IRustMetricsHistory>;
|
|
29
30
|
getStatistics(): Promise<IRustStatistics>;
|
|
30
31
|
getActiveConnectionSnapshots(options?: IActiveConnectionSnapshotOptions): Promise<IActiveConnectionSnapshot[]>;
|
|
31
32
|
getActiveConnectionSnapshotPage(options?: IActiveConnectionSnapshotOptions): Promise<IActiveConnectionSnapshotPage>;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
2
|
import { logger } from '../../core/utils/logger.js';
|
|
3
3
|
const MAXIMUM_RUST_CONNECTION_ID = 18446744073709551615n;
|
|
4
|
+
const MAXIMUM_METRICS_HISTORY_SECONDS = 600;
|
|
4
5
|
function validateActiveConnectionSnapshotOptions(options) {
|
|
5
6
|
if (options.afterId === undefined) {
|
|
6
7
|
return;
|
|
@@ -112,6 +113,13 @@ export class RustProxyBridge extends plugins.EventEmitter {
|
|
|
112
113
|
async getMetrics() {
|
|
113
114
|
return this.bridge.sendCommand('getMetrics', {});
|
|
114
115
|
}
|
|
116
|
+
async getMetricsHistory(seconds) {
|
|
117
|
+
if (!Number.isFinite(seconds) || seconds < 0) {
|
|
118
|
+
throw new Error('Metrics history seconds must be a finite non-negative number');
|
|
119
|
+
}
|
|
120
|
+
const boundedSeconds = Math.min(MAXIMUM_METRICS_HISTORY_SECONDS, Math.floor(seconds));
|
|
121
|
+
return this.bridge.sendCommand('getMetricsHistory', { seconds: boundedSeconds });
|
|
122
|
+
}
|
|
115
123
|
async getStatistics() {
|
|
116
124
|
return this.bridge.sendCommand('getStatistics', {});
|
|
117
125
|
}
|
|
@@ -155,4 +163,4 @@ export class RustProxyBridge extends plugins.EventEmitter {
|
|
|
155
163
|
await this.bridge.sendCommand('setDatagramHandlerRelay', { socketPath });
|
|
156
164
|
}
|
|
157
165
|
}
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
166
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVzdC1wcm94eS1icmlkZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9wcm94aWVzL3NtYXJ0LXByb3h5L3J1c3QtcHJveHktYnJpZGdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBWXBELE1BQU0sMEJBQTBCLEdBQUcscUJBQTJCLENBQUM7QUFDL0QsTUFBTSwrQkFBK0IsR0FBRyxHQUFHLENBQUM7QUFFNUMsU0FBUyx1Q0FBdUMsQ0FBQyxPQUF5QztJQUN4RixJQUFJLE9BQU8sQ0FBQyxPQUFPLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDbEMsT0FBTztJQUNULENBQUM7SUFDRCxJQUFJLE9BQU8sT0FBTyxDQUFDLE9BQU8sS0FBSyxRQUFRLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1FBQzFFLE1BQU0sSUFBSSxLQUFLLENBQUMsdUVBQXVFLENBQUMsQ0FBQztJQUMzRixDQUFDO0lBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLDBCQUEwQixFQUFFLENBQUM7UUFDekQsTUFBTSxJQUFJLEtBQUssQ0FBQywrREFBK0QsQ0FBQyxDQUFDO0lBQ25GLENBQUM7QUFDSCxDQUFDO0FBMkJEOzs7R0FHRztBQUNILFNBQVMsY0FBYztJQUNyQixNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDakYsT0FBTyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENB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
|
|
@@ -2,7 +2,7 @@ import * as plugins from '../../plugins.js';
|
|
|
2
2
|
import { SharedRouteManager as RouteManager } from '../../core/routing/route-manager.js';
|
|
3
3
|
import type { ISmartProxyOptions, ISmartProxySecurityPolicy, IActiveConnectionSnapshot, IActiveConnectionSnapshotOptions, IActiveConnectionSnapshotPage } from './models/interfaces.js';
|
|
4
4
|
import type { IRouteConfig } from './models/route-types.js';
|
|
5
|
-
import type { IMetrics } from './models/metrics-types.js';
|
|
5
|
+
import type { IMetrics, IMetricsHistory } from './models/metrics-types.js';
|
|
6
6
|
import type { IRustCertificateStatus, IRustStatistics } from './models/rust-types.js';
|
|
7
7
|
type TChallengeProvider = plugins.smartchallenge.IChallengeProvider;
|
|
8
8
|
/**
|
|
@@ -79,6 +79,10 @@ export declare class SmartProxy extends plugins.EventEmitter {
|
|
|
79
79
|
* Get the metrics interface.
|
|
80
80
|
*/
|
|
81
81
|
getMetrics(): IMetrics;
|
|
82
|
+
/**
|
|
83
|
+
* Refresh bounded histories on demand without expanding the periodic metrics poll.
|
|
84
|
+
*/
|
|
85
|
+
refreshMetricsHistory(seconds: number): Promise<IMetricsHistory>;
|
|
82
86
|
/**
|
|
83
87
|
* Get sanitized active connection snapshots from the Rust engine.
|
|
84
88
|
*/
|