@push.rocks/smartvpn 2.3.1 → 2.4.1
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_rust/smartvpn_daemon_linux_amd64_musl +0 -0
- package/dist_rust/smartvpn_daemon_linux_amd64_musl.tsrust-build.json +5 -5
- package/dist_rust/smartvpn_daemon_linux_arm64_musl +0 -0
- package/dist_rust/smartvpn_daemon_linux_arm64_musl.tsrust-build.json +5 -5
- package/dist_ts/00_commitinfo_data.js +3 -3
- package/dist_ts/smartvpn.classes.vpnclient.d.ts +8 -1
- package/dist_ts/smartvpn.classes.vpnclient.js +20 -5
- package/dist_ts/smartvpn.classes.vpnconfig.js +5 -1
- package/dist_ts/smartvpn.interfaces.d.ts +29 -2
- package/package.json +6 -6
- package/readme.md +22 -1
- package/ts/00_commitinfo_data.ts +3 -3
- package/ts/smartvpn.classes.vpnclient.ts +22 -4
- package/ts/smartvpn.classes.vpnconfig.ts +4 -0
- package/ts/smartvpn.interfaces.ts +24 -2
|
Binary file
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "86f648ec5fa8481fb70e5dad4491f78d0b3914a560c2876f9e89e9c48d706a63",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartvpn",
|
|
6
|
-
"projectVersion": "2.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "2.4.1",
|
|
7
|
+
"gitCommit": "d903d05e76d6cf4f2bf07b9f126af5fe3d49f1eb",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-09-
|
|
10
|
-
"tsrustVersion": "1.
|
|
9
|
+
"builtAt": "2026-09-29T12:38:57.084Z",
|
|
10
|
+
"tsrustVersion": "1.15.1",
|
|
11
11
|
"binary": "smartvpn_daemon",
|
|
12
12
|
"target": "linux_amd64_musl"
|
|
13
13
|
}
|
|
Binary file
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "226dcdedea265d113e5dceebc180d9f27d187df3f3a18cd3e5fe8bde02d9fe20",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartvpn",
|
|
6
|
-
"projectVersion": "2.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "2.4.1",
|
|
7
|
+
"gitCommit": "d903d05e76d6cf4f2bf07b9f126af5fe3d49f1eb",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-09-
|
|
10
|
-
"tsrustVersion": "1.
|
|
9
|
+
"builtAt": "2026-09-29T12:41:02.869Z",
|
|
10
|
+
"tsrustVersion": "1.15.1",
|
|
11
11
|
"binary": "smartvpn_daemon",
|
|
12
12
|
"target": "linux_arm64_musl"
|
|
13
13
|
}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
* autocreated commitinfo by @push.rocks/commitinfo
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
|
-
name:
|
|
6
|
-
version:
|
|
7
|
-
description:
|
|
5
|
+
name: '@push.rocks/smartvpn',
|
|
6
|
+
version: '2.4.1',
|
|
7
|
+
description: 'A VPN solution with TypeScript control plane and Rust data plane daemon'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHlFQUF5RTtDQUN2RixDQUFBIn0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as plugins from './smartvpn.plugins.js';
|
|
2
|
-
import type { IVpnClientOptions, IVpnClientConfig, IVpnStatus, IVpnStatistics, IVpnConnectionQuality, IVpnMtuInfo, IVpnConnectionResult, IVpnManagedRuntime, IVpnManagedSessionConfig, IVpnManagedSession } from './smartvpn.interfaces.js';
|
|
2
|
+
import type { IVpnClientOptions, IVpnClientConfig, IVpnStatus, IVpnStatistics, IVpnConnectionQuality, IVpnMtuInfo, IVpnConnectionResult, IVpnManagedRuntime, IVpnManagedSessionConfig, IVpnManagedSessionRenewal, IVpnManagedSession } from './smartvpn.interfaces.js';
|
|
3
3
|
/**
|
|
4
4
|
* VPN Client — manages a smartvpn daemon in client mode.
|
|
5
5
|
*/
|
|
@@ -30,7 +30,14 @@ export declare class VpnClient extends plugins.events.EventEmitter {
|
|
|
30
30
|
* This generation cannot forward again. Disconnect then closes its kernel owner. */
|
|
31
31
|
stopManagedForwarding(generation: string): Promise<IVpnManagedSession>;
|
|
32
32
|
inspectManagedSession(generation: string): Promise<IVpnManagedSession>;
|
|
33
|
+
/** Move the live generation's native lease in place, without teardown. The renewal
|
|
34
|
+
* must name the exact authority the generation authenticated under. A rejected
|
|
35
|
+
* renewal leaves the lease in force unchanged; a lapsed lease is never revived,
|
|
36
|
+
* so authenticate a new generation instead. The hub follows its own expiry from
|
|
37
|
+
* the managed network snapshot (SmartVPN hub 2.3.1 or later keeps the session). */
|
|
38
|
+
renewManagedSession(generation: string, renewal: IVpnManagedSessionRenewal): Promise<IVpnManagedSession>;
|
|
33
39
|
private sessionCommand;
|
|
40
|
+
private requireSessionGeneration;
|
|
34
41
|
private checkObservation;
|
|
35
42
|
/**
|
|
36
43
|
* Start the daemon bridge (spawn or connect).
|
|
@@ -104,17 +104,32 @@ export class VpnClient extends plugins.events.EventEmitter {
|
|
|
104
104
|
inspectManagedSession(generation) {
|
|
105
105
|
return this.sessionCommand('inspectManagedSession', generation);
|
|
106
106
|
}
|
|
107
|
+
/** Move the live generation's native lease in place, without teardown. The renewal
|
|
108
|
+
* must name the exact authority the generation authenticated under. A rejected
|
|
109
|
+
* renewal leaves the lease in force unchanged; a lapsed lease is never revived,
|
|
110
|
+
* so authenticate a new generation instead. The hub follows its own expiry from
|
|
111
|
+
* the managed network snapshot (SmartVPN hub 2.3.1 or later keeps the session). */
|
|
112
|
+
async renewManagedSession(generation, renewal) {
|
|
113
|
+
this.requireSessionGeneration(generation);
|
|
114
|
+
const epoch = this.bridgeEpoch;
|
|
115
|
+
const result = await this.bridge.sendCommand('renewManagedSession', { generation, renewal });
|
|
116
|
+
this.checkSession(result, epoch, generation);
|
|
117
|
+
return result;
|
|
118
|
+
}
|
|
107
119
|
async sessionCommand(method, generation) {
|
|
120
|
+
this.requireSessionGeneration(generation);
|
|
121
|
+
const epoch = this.bridgeEpoch;
|
|
122
|
+
const result = await this.bridge.sendCommand(method, { generation });
|
|
123
|
+
this.checkSession(result, epoch, generation);
|
|
124
|
+
return result;
|
|
125
|
+
}
|
|
126
|
+
requireSessionGeneration(generation) {
|
|
108
127
|
if (typeof generation !== 'string' || !/^[a-f0-9]{32}$/.test(generation)) {
|
|
109
128
|
throw new Error('Managed session generation must be a native 128-bit identifier');
|
|
110
129
|
}
|
|
111
130
|
if (generation === this.invalidatedSessionGeneration || generation === this.retiredSessionGeneration) {
|
|
112
131
|
throw new Error('Managed session observation is unavailable');
|
|
113
132
|
}
|
|
114
|
-
const epoch = this.bridgeEpoch;
|
|
115
|
-
const result = await this.bridge.sendCommand(method, { generation });
|
|
116
|
-
this.checkSession(result, epoch, generation);
|
|
117
|
-
return result;
|
|
118
133
|
}
|
|
119
134
|
checkObservation(runtime, epoch, generation) {
|
|
120
135
|
if (epoch !== this.bridgeEpoch || runtime.generation === this.lastInvalidatedGeneration
|
|
@@ -201,4 +216,4 @@ export class VpnClient extends plugins.events.EventEmitter {
|
|
|
201
216
|
return this.bridge.running;
|
|
202
217
|
}
|
|
203
218
|
}
|
|
204
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
219
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartvpn.classes.vpnclient.js","sourceRoot":"","sources":["../ts/smartvpn.classes.vpnclient.ts"],"names":[],"mappings":"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"}
|
|
@@ -178,6 +178,10 @@ export class VpnConfig {
|
|
|
178
178
|
if (config.keepaliveIntervalSecs !== undefined && config.keepaliveIntervalSecs < 1) {
|
|
179
179
|
throw new Error('VpnConfig: keepaliveIntervalSecs must be >= 1');
|
|
180
180
|
}
|
|
181
|
+
if (config.quicIdleTimeoutSecs !== undefined
|
|
182
|
+
&& (!Number.isSafeInteger(config.quicIdleTimeoutSecs) || config.quicIdleTimeoutSecs < 0)) {
|
|
183
|
+
throw new Error('VpnConfig: quicIdleTimeoutSecs must be a whole number >= 0');
|
|
184
|
+
}
|
|
181
185
|
}
|
|
182
186
|
/**
|
|
183
187
|
* Load a config from a JSON file.
|
|
@@ -257,4 +261,4 @@ export class VpnConfig {
|
|
|
257
261
|
}
|
|
258
262
|
}
|
|
259
263
|
}
|
|
260
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartvpn.classes.vpnconfig.js","sourceRoot":"","sources":["../ts/smartvpn.classes.vpnconfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,uBAAuB,CAAC;AAMjD;;GAEG;AACH,MAAM,OAAO,SAAS;IACZ,MAAM,CAAC,WAAW,CAAC,GAAY;QACrC,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,KAAK,CAAC,EAAE,CAAC;YAC9E,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,oBAAoB,CAAC,MAAwB;QACzD,IAAI,MAAM,CAAC,SAAS,KAAK,WAAW,EAAE,CAAC;YACrC,gCAAgC;YAChC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;YACjF,CAAC;YACD,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YACjE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;YAC9E,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;YACpF,CAAC;YACD,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;YACvE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;YAC/E,CAAC;YACD,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;gBAC1B,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;YACvE,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC5E,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;YAC9F,CAAC;YACD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gBACvC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;oBACjC,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3C,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAClE,CAAC;YACD,IAAI,MAAM,CAAC,eAAe,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,MAAM,CAAC,eAAe,GAAG,CAAC,IAAI,MAAM,CAAC,eAAe,GAAG,EAAE,CAAC,EAAE,CAAC;gBACrJ,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;YACrF,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,MAAM,CAAC,cAAc,IAAI,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM;mBAC5F,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,MAAM,CAAC,cAAc,CAAC,WAAW;mBAC9E,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3E,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;YAC3F,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACtD,CAAC;YACD,2GAA2G;YAC3G,IAAI,MAAM,CAAC,SAAS,KAAK,MAAM,EAAE,CAAC;gBAChC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;oBACpF,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAC;gBACpG,CAAC;YACH,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC5D,CAAC;YACD,mCAAmC;YACnC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBAC7B,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;YACzF,CAAC;YACD,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;YACzE,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;YACxF,CAAC;YACD,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;QACzE,CAAC;QACD,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,MAAM,CAAC,qBAAqB,KAAK,SAAS,IAAI,MAAM,CAAC,qBAAqB,GAAG,CAAC,EAAE,CAAC;YACnF,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;YACf,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;gBAC7B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,oBAAoB,CAAC,MAAwB;QACzD,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,kBAAkB,CAAC,IAAI,EAAE,KAAK,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBACjG,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;YACzE,CAAC;YACD,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,IAAI,MAAM,CAAC,SAAS,KAAK,IAAI;mBAC5E,MAAM,CAAC,iBAAiB,KAAK,SAAS,IAAI,MAAM,CAAC,gBAAgB,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS;mBAC3G,MAAM,CAAC,eAAe,KAAK,SAAS,IAAI,MAAM,CAAC,uBAAuB,KAAK,SAAS;mBACpF,MAAM,CAAC,kBAAkB,KAAK,SAAS,IAAI,MAAM,CAAC,gBAAgB,KAAK,SAAS;mBAChF,MAAM,CAAC,0BAA0B,KAAK,IAAI,IAAI,MAAM,CAAC,gCAAgC,KAAK,SAAS;mBACnG,MAAM,CAAC,qCAAqC,KAAK,IAAI,EAAE,CAAC;gBAC3D,MAAM,IAAI,KAAK,CAAC,8GAA8G,CAAC,CAAC;YAClI,CAAC;YACD,IAAI,MAAM,CAAC,YAAY,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;gBAClH,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAC;YACtF,CAAC;QACH,CAAC;aAAM,IAAI,MAAM,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACzE,CAAC;QACD,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QAAC,CAAC;QAC9F,IAAI,MAAM,CAAC,aAAa,KAAK,WAAW,EAAE,CAAC;YACzC,8BAA8B;YAC9B,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,CAAC;YACD,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAC7D,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;gBAChE,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;YACxE,CAAC;YACD,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC5F,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;YAC1F,CAAC;YACD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;gBACxC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;gBAC3D,CAAC;gBACD,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;gBAC9D,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACrD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBAC5D,CAAC;gBACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACnC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;wBACjC,MAAM,IAAI,KAAK,CAAC,2CAA2C,IAAI,EAAE,CAAC,CAAC;oBACrE,CAAC;gBACH,CAAC;gBACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtB,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;YACD,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,IAAI,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC,EAAE,CAAC;gBAClG,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;YACnD,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC5C,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YACjE,CAAC;YACD,sCAAsC;YACtC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;oBACpC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;wBACrB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;oBAClE,CAAC;oBACD,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;wBACtB,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,CAAC,QAAQ,yBAAyB,CAAC,CAAC;oBAClF,CAAC;oBACD,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,MAAM,CAAC,QAAQ,aAAa,CAAC,CAAC;gBACzF,CAAC;YACH,CAAC;QACH,CAAC;QACD,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,MAAM,CAAC,qBAAqB,KAAK,SAAS,IAAI,MAAM,CAAC,qBAAqB,GAAG,CAAC,EAAE,CAAC;YACnF,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,YAAY,CAAI,QAAgB;QAClD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAM,CAAC;IAClC,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAI,QAAgB,EAAE,MAAS;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAChD,MAAM,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,SAAS,CAAC,EAAU;QACjC,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACrC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1B,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;QACvE,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,aAAa,CAAC,MAAc;QACzC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,EAAE,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YAAE,OAAO,KAAK,CAAC;QAC3C,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACvC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,CAAC,IAAI,SAAS,IAAI,EAAE,CAAC;IAChE,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,WAAW,CAAC,IAAY;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACrC,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QACpD,OAAO;QACP,IAAI,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAClC,OAAO,SAAS,IAAI,EAAE,CAAC;QACzB,CAAC;QACD,qBAAqB;QACrB,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3B,OAAO,SAAS,IAAI,GAAG,CAAC;QAC1B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,iBAAiB,CAAC,GAAW,EAAE,SAAiB;QAC7D,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,cAAc,SAAS,oDAAoD,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3G,CAAC;QACD,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACvC,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,cAAc,SAAS,iCAAiC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;YACxF,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC;gBAAE,MAAM,CAAC,CAAC;YACtE,MAAM,IAAI,KAAK,CAAC,cAAc,SAAS,sBAAsB,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;CACF"}
|
|
264
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartvpn.classes.vpnconfig.js","sourceRoot":"","sources":["../ts/smartvpn.classes.vpnconfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,8 @@ interface IVpnClientConfigBase {
|
|
|
26
26
|
dns?: string[];
|
|
27
27
|
/** Inner TUN MTU in whole IP bytes, 576..65472 (default: 1420); not outer link MTU. */
|
|
28
28
|
mtu?: number;
|
|
29
|
-
/**
|
|
29
|
+
/** Application keepalive interval in seconds (default: 30), used for link-quality and
|
|
30
|
+
* dead-peer detection. It does not hold an idle transport open: QUIC keep-alive does. */
|
|
30
31
|
keepaliveIntervalSecs?: number;
|
|
31
32
|
/** Transport protocol: 'auto' (default, tries QUIC then WS), 'websocket', 'quic', or 'wireguard' */
|
|
32
33
|
transport?: 'auto' | 'websocket' | 'quic' | 'wireguard';
|
|
@@ -117,7 +118,11 @@ export interface IVpnServerConfig {
|
|
|
117
118
|
transportMode?: 'websocket' | 'quic' | 'both' | 'all' | 'wireguard';
|
|
118
119
|
/** QUIC listen address (host:port). Defaults to listenAddr. */
|
|
119
120
|
quicListenAddr?: string;
|
|
120
|
-
/** QUIC idle timeout in seconds (default: 30)
|
|
121
|
+
/** QUIC idle timeout in whole seconds (default: 30). Both ends send a QUIC keep-alive after a
|
|
122
|
+
* third of their idle timeout without traffic, so an idle session stays up and its NAT mapping
|
|
123
|
+
* fresh; the connection uses the smaller of the two ends' timeouts (clients advertise 30). A
|
|
124
|
+
* peer that stops answering is dropped after the timeout. `0` disables the server's idle
|
|
125
|
+
* timeout and keep-alive, so the client's timeout and keep-alive apply. */
|
|
121
126
|
quicIdleTimeoutSecs?: number;
|
|
122
127
|
/** WireGuard: server X25519 private key (base64). Required when transport includes WG. */
|
|
123
128
|
wgPrivateKey?: string;
|
|
@@ -437,6 +442,13 @@ export type TVpnClientCommands = {
|
|
|
437
442
|
};
|
|
438
443
|
result: IVpnManagedSession;
|
|
439
444
|
};
|
|
445
|
+
renewManagedSession: {
|
|
446
|
+
params: {
|
|
447
|
+
generation: string;
|
|
448
|
+
renewal: IVpnManagedSessionRenewal;
|
|
449
|
+
};
|
|
450
|
+
result: IVpnManagedSession;
|
|
451
|
+
};
|
|
440
452
|
connect: {
|
|
441
453
|
params: {
|
|
442
454
|
config: IVpnClientConfig;
|
|
@@ -710,6 +722,18 @@ export interface IVpnManagedSessionConfig {
|
|
|
710
722
|
deadlineBoottimeMs: number;
|
|
711
723
|
};
|
|
712
724
|
}
|
|
725
|
+
/** Moves a live generation's native lease in place. The identity fields must equal
|
|
726
|
+
* the ones the generation authenticated under; a changed credential requires a new
|
|
727
|
+
* session. The lease follows the authentication rules: same boot, future, at most
|
|
728
|
+
* fifteen minutes away. A later or nearer deadline replaces the one in force; a
|
|
729
|
+
* lease whose deadline already passed is final and never revived. */
|
|
730
|
+
export interface IVpnManagedSessionRenewal {
|
|
731
|
+
serverUrl: string;
|
|
732
|
+
serverPublicKey: string;
|
|
733
|
+
clientPublicKey: string;
|
|
734
|
+
managedNetwork: IManagedNetworkBinding;
|
|
735
|
+
lease: IVpnManagedSessionConfig['lease'];
|
|
736
|
+
}
|
|
713
737
|
/** Authentication returns the full validated assignment and planned exclusive
|
|
714
738
|
* TUN name before creating a device or route. Kernel policy remains caller-owned. */
|
|
715
739
|
export interface IVpnManagedSessionPlan {
|
|
@@ -739,6 +763,9 @@ export interface IVpnManagedSession {
|
|
|
739
763
|
* disabled. A stopped TUN stays owned until disconnect() joins deletion, or an
|
|
740
764
|
* owned stdio process is joined by stop(). Socket stop() does not delete it. */
|
|
741
765
|
runtime: IVpnManagedRuntime | null;
|
|
766
|
+
/** The native lease currently in force. `plan.lease` stays the lease the
|
|
767
|
+
* generation authenticated under; renewal moves only this one. */
|
|
768
|
+
lease: IVpnManagedSessionConfig['lease'];
|
|
742
769
|
}
|
|
743
770
|
/** Stopped means the complete packet I/O future ended; retired means the native
|
|
744
771
|
* session owner ended. Neither proves namespace-wide cleanup, conntrack drain,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartvpn",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A VPN solution with TypeScript control plane and Rust data plane daemon",
|
|
6
6
|
"type": "module",
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"@push.rocks/smartrust": "^2.1.0"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
|
-
"@git.zone/tsbuild": "^
|
|
32
|
-
"@git.zone/tsrun": "^
|
|
33
|
-
"@git.zone/tsrust": "^1.
|
|
34
|
-
"@git.zone/tstest": "^6.
|
|
35
|
-
"@types/node": "^26.
|
|
31
|
+
"@git.zone/tsbuild": "^5.0.0",
|
|
32
|
+
"@git.zone/tsrun": "^3.0.2",
|
|
33
|
+
"@git.zone/tsrust": "^1.15.1",
|
|
34
|
+
"@git.zone/tstest": "^6.3.2",
|
|
35
|
+
"@types/node": "^26.6.2"
|
|
36
36
|
},
|
|
37
37
|
"files": [
|
|
38
38
|
"ts/**/*",
|
package/readme.md
CHANGED
|
@@ -168,7 +168,26 @@ absolute `CLOCK_BOOTTIME` deadline, future and no more than fifteen minutes away
|
|
|
168
168
|
The caller derives this conservative deadline from its independently qualified
|
|
169
169
|
authority; SmartVPN does not turn wall-clock credentials into trusted time.
|
|
170
170
|
Native expiry interrupts the whole packet I/O future, including blocked writes,
|
|
171
|
-
and remains effective across suspend.
|
|
171
|
+
and remains effective across suspend.
|
|
172
|
+
|
|
173
|
+
`renewManagedSession(generation, renewal)` moves a live generation's lease in place,
|
|
174
|
+
without teardown, in the authenticated, prepared or forwarding phase. The renewal
|
|
175
|
+
names `serverUrl`, `serverPublicKey`, `clientPublicKey` and `managedNetwork`; they
|
|
176
|
+
must equal the values the generation authenticated under, because a changed
|
|
177
|
+
credential requires a new session. It carries no private key. Its `lease` follows
|
|
178
|
+
the authentication rules: the same boot, a future deadline, at most fifteen minutes
|
|
179
|
+
away. A later deadline extends the lease and a nearer one re-arms it. A rejected
|
|
180
|
+
renewal leaves the lease in force unchanged. A lease whose deadline has already
|
|
181
|
+
passed is final: packet I/O stops at that deadline, a late renewal rejects, and
|
|
182
|
+
the caller authenticates a new generation. `plan.lease` never changes; every
|
|
183
|
+
session observation reports the lease in force as `lease`.
|
|
184
|
+
|
|
185
|
+
The native lease is only the node's half. The hub ends a session at the node's
|
|
186
|
+
`expiresAt` from its own managed snapshot, so the controller renews that expiry
|
|
187
|
+
by reconciling a snapshot that changes only `expiresAt`. A hub running SmartVPN
|
|
188
|
+
2.3.1 or later keeps the live session through that reconcile; an older hub drains
|
|
189
|
+
it. Renew both halves before the nearer of the two deadlines. Renewal adds no
|
|
190
|
+
message between client and hub, so a 2.4 client works with any 2.3.x hub.
|
|
172
191
|
|
|
173
192
|
Register `managed-session-state`, `managed-session-invalidated` and
|
|
174
193
|
`managed-runtime-invalidated` listeners before
|
|
@@ -323,6 +342,8 @@ Every client authenticates with a **Noise IK handshake** (`Noise_IK_25519_ChaCha
|
|
|
323
342
|
|
|
324
343
|
The server runs with `transportMode: 'all'` by default: WebSocket and QUIC are enabled, and WireGuard joins the same server when `wgPrivateKey` is configured. All server transports share the same forwarding pipeline (`ForwardingEngine`), IP pool, client registry, and statistics, so WireGuard peers can use the same userspace NAT, bridge/hybrid routing, and monitoring model as WS/QUIC clients. Native SmartVPN clients auto-negotiate with `transport: 'auto'` (tries QUIC first, falls back to WS).
|
|
325
344
|
|
|
345
|
+
QUIC sessions stay up while idle. Each end advertises an idle timeout (clients 30 s, servers `quicIdleTimeoutSecs`, default 30 s), and the connection uses the smaller one. Each end sends a QUIC keep-alive after a third of its own idle timeout without traffic, so the end advertising the smaller timeout always pings in time. The keep-alive keeps NAT and conntrack mappings fresh, and a peer that stops answering is dropped once the idle timeout passes. `quicIdleTimeoutSecs: 0` disables the server's idle timeout and keep-alive; the client's 30 s timeout and its keep-alive then apply. Because the keep-alive interval is derived from the timeout, no configuration can drop an idle session between peers on this release. Against a 2.4.0 peer, which sends no keep-alive, sessions stay up at default timeouts; a server timeout of `0` or of 90 s or more against a 2.4.0 client still drops the session at the client's 30 s. The application keepalive (`keepaliveIntervalSecs`) measures link quality and detects dead peers; it does not hold the transport open.
|
|
346
|
+
|
|
326
347
|
### 📊 Per-Transport Metrics
|
|
327
348
|
|
|
328
349
|
Server statistics include per-transport breakdowns so you can see exactly how many clients use each protocol:
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* autocreated commitinfo by @push.rocks/commitinfo
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
|
-
name:
|
|
6
|
-
version:
|
|
7
|
-
description:
|
|
5
|
+
name: '@push.rocks/smartvpn',
|
|
6
|
+
version: '2.4.1',
|
|
7
|
+
description: 'A VPN solution with TypeScript control plane and Rust data plane daemon'
|
|
8
8
|
}
|
|
@@ -11,6 +11,7 @@ import type {
|
|
|
11
11
|
IVpnManagedRuntime,
|
|
12
12
|
IVpnManagedRuntimeInvalidation,
|
|
13
13
|
IVpnManagedSessionConfig,
|
|
14
|
+
IVpnManagedSessionRenewal,
|
|
14
15
|
IVpnManagedSession,
|
|
15
16
|
IVpnManagedSessionEvent,
|
|
16
17
|
TVpnClientCommands,
|
|
@@ -135,18 +136,35 @@ export class VpnClient extends plugins.events.EventEmitter {
|
|
|
135
136
|
return this.sessionCommand('inspectManagedSession', generation);
|
|
136
137
|
}
|
|
137
138
|
|
|
139
|
+
/** Move the live generation's native lease in place, without teardown. The renewal
|
|
140
|
+
* must name the exact authority the generation authenticated under. A rejected
|
|
141
|
+
* renewal leaves the lease in force unchanged; a lapsed lease is never revived,
|
|
142
|
+
* so authenticate a new generation instead. The hub follows its own expiry from
|
|
143
|
+
* the managed network snapshot (SmartVPN hub 2.3.1 or later keeps the session). */
|
|
144
|
+
public async renewManagedSession(generation: string, renewal: IVpnManagedSessionRenewal): Promise<IVpnManagedSession> {
|
|
145
|
+
this.requireSessionGeneration(generation);
|
|
146
|
+
const epoch = this.bridgeEpoch;
|
|
147
|
+
const result = await this.bridge.sendCommand('renewManagedSession', { generation, renewal });
|
|
148
|
+
this.checkSession(result, epoch, generation);
|
|
149
|
+
return result;
|
|
150
|
+
}
|
|
151
|
+
|
|
138
152
|
private async sessionCommand(method: 'prepareManagedTunnel' | 'enableManagedForwarding'
|
|
139
153
|
| 'stopManagedForwarding' | 'inspectManagedSession', generation: string): Promise<IVpnManagedSession> {
|
|
154
|
+
this.requireSessionGeneration(generation);
|
|
155
|
+
const epoch = this.bridgeEpoch;
|
|
156
|
+
const result = await this.bridge.sendCommand(method, { generation });
|
|
157
|
+
this.checkSession(result, epoch, generation);
|
|
158
|
+
return result;
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
private requireSessionGeneration(generation: string): void {
|
|
140
162
|
if (typeof generation !== 'string' || !/^[a-f0-9]{32}$/.test(generation)) {
|
|
141
163
|
throw new Error('Managed session generation must be a native 128-bit identifier');
|
|
142
164
|
}
|
|
143
165
|
if (generation === this.invalidatedSessionGeneration || generation === this.retiredSessionGeneration) {
|
|
144
166
|
throw new Error('Managed session observation is unavailable');
|
|
145
167
|
}
|
|
146
|
-
const epoch = this.bridgeEpoch;
|
|
147
|
-
const result = await this.bridge.sendCommand(method, { generation });
|
|
148
|
-
this.checkSession(result, epoch, generation);
|
|
149
|
-
return result;
|
|
150
168
|
}
|
|
151
169
|
|
|
152
170
|
private checkObservation(runtime: IVpnManagedRuntime, epoch: number, generation?: string): void {
|
|
@@ -180,6 +180,10 @@ export class VpnConfig {
|
|
|
180
180
|
if (config.keepaliveIntervalSecs !== undefined && config.keepaliveIntervalSecs < 1) {
|
|
181
181
|
throw new Error('VpnConfig: keepaliveIntervalSecs must be >= 1');
|
|
182
182
|
}
|
|
183
|
+
if (config.quicIdleTimeoutSecs !== undefined
|
|
184
|
+
&& (!Number.isSafeInteger(config.quicIdleTimeoutSecs) || config.quicIdleTimeoutSecs < 0)) {
|
|
185
|
+
throw new Error('VpnConfig: quicIdleTimeoutSecs must be a whole number >= 0');
|
|
186
|
+
}
|
|
183
187
|
}
|
|
184
188
|
|
|
185
189
|
/**
|
|
@@ -37,7 +37,8 @@ interface IVpnClientConfigBase {
|
|
|
37
37
|
dns?: string[];
|
|
38
38
|
/** Inner TUN MTU in whole IP bytes, 576..65472 (default: 1420); not outer link MTU. */
|
|
39
39
|
mtu?: number;
|
|
40
|
-
/**
|
|
40
|
+
/** Application keepalive interval in seconds (default: 30), used for link-quality and
|
|
41
|
+
* dead-peer detection. It does not hold an idle transport open: QUIC keep-alive does. */
|
|
41
42
|
keepaliveIntervalSecs?: number;
|
|
42
43
|
/** Transport protocol: 'auto' (default, tries QUIC then WS), 'websocket', 'quic', or 'wireguard' */
|
|
43
44
|
transport?: 'auto' | 'websocket' | 'quic' | 'wireguard';
|
|
@@ -137,7 +138,11 @@ export interface IVpnServerConfig {
|
|
|
137
138
|
transportMode?: 'websocket' | 'quic' | 'both' | 'all' | 'wireguard';
|
|
138
139
|
/** QUIC listen address (host:port). Defaults to listenAddr. */
|
|
139
140
|
quicListenAddr?: string;
|
|
140
|
-
/** QUIC idle timeout in seconds (default: 30)
|
|
141
|
+
/** QUIC idle timeout in whole seconds (default: 30). Both ends send a QUIC keep-alive after a
|
|
142
|
+
* third of their idle timeout without traffic, so an idle session stays up and its NAT mapping
|
|
143
|
+
* fresh; the connection uses the smaller of the two ends' timeouts (clients advertise 30). A
|
|
144
|
+
* peer that stops answering is dropped after the timeout. `0` disables the server's idle
|
|
145
|
+
* timeout and keep-alive, so the client's timeout and keep-alive apply. */
|
|
141
146
|
quicIdleTimeoutSecs?: number;
|
|
142
147
|
/** WireGuard: server X25519 private key (base64). Required when transport includes WG. */
|
|
143
148
|
wgPrivateKey?: string;
|
|
@@ -496,6 +501,7 @@ export type TVpnClientCommands = {
|
|
|
496
501
|
enableManagedForwarding: { params: { generation: string }; result: IVpnManagedSession };
|
|
497
502
|
stopManagedForwarding: { params: { generation: string }; result: IVpnManagedSession };
|
|
498
503
|
inspectManagedSession: { params: { generation: string }; result: IVpnManagedSession };
|
|
504
|
+
renewManagedSession: { params: { generation: string; renewal: IVpnManagedSessionRenewal }; result: IVpnManagedSession };
|
|
499
505
|
connect: { params: { config: IVpnClientConfig }; result: IVpnConnectionResult };
|
|
500
506
|
inspectManagedRuntime: { params: { generation: string }; result: IVpnManagedRuntime };
|
|
501
507
|
disconnect: { params: Record<string, never>; result: void };
|
|
@@ -627,6 +633,19 @@ export interface IVpnManagedSessionConfig {
|
|
|
627
633
|
lease: { bootId: string; deadlineBoottimeMs: number };
|
|
628
634
|
}
|
|
629
635
|
|
|
636
|
+
/** Moves a live generation's native lease in place. The identity fields must equal
|
|
637
|
+
* the ones the generation authenticated under; a changed credential requires a new
|
|
638
|
+
* session. The lease follows the authentication rules: same boot, future, at most
|
|
639
|
+
* fifteen minutes away. A later or nearer deadline replaces the one in force; a
|
|
640
|
+
* lease whose deadline already passed is final and never revived. */
|
|
641
|
+
export interface IVpnManagedSessionRenewal {
|
|
642
|
+
serverUrl: string;
|
|
643
|
+
serverPublicKey: string;
|
|
644
|
+
clientPublicKey: string;
|
|
645
|
+
managedNetwork: IManagedNetworkBinding;
|
|
646
|
+
lease: IVpnManagedSessionConfig['lease'];
|
|
647
|
+
}
|
|
648
|
+
|
|
630
649
|
/** Authentication returns the full validated assignment and planned exclusive
|
|
631
650
|
* TUN name before creating a device or route. Kernel policy remains caller-owned. */
|
|
632
651
|
export interface IVpnManagedSessionPlan {
|
|
@@ -654,6 +673,9 @@ export interface IVpnManagedSession {
|
|
|
654
673
|
* disabled. A stopped TUN stays owned until disconnect() joins deletion, or an
|
|
655
674
|
* owned stdio process is joined by stop(). Socket stop() does not delete it. */
|
|
656
675
|
runtime: IVpnManagedRuntime | null;
|
|
676
|
+
/** The native lease currently in force. `plan.lease` stays the lease the
|
|
677
|
+
* generation authenticated under; renewal moves only this one. */
|
|
678
|
+
lease: IVpnManagedSessionConfig['lease'];
|
|
657
679
|
}
|
|
658
680
|
|
|
659
681
|
/** Stopped means the complete packet I/O future ended; retired means the native
|