@push.rocks/smartvpn 1.21.0 → 2.0.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/assets/third-party-licenses.md +157 -0
- package/dist_rust/{smartvpn_daemon_linux_amd64 → smartvpn_daemon_linux_amd64_musl} +0 -0
- package/dist_rust/smartvpn_daemon_linux_amd64_musl.tsrust-build.json +14 -0
- package/dist_rust/{smartvpn_daemon_linux_arm64 → smartvpn_daemon_linux_arm64_musl} +0 -0
- package/dist_rust/smartvpn_daemon_linux_arm64_musl.tsrust-build.json +14 -0
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/smartvpn.classes.vpnbridge.d.ts +3 -3
- package/dist_ts/smartvpn.classes.vpnbridge.js +13 -45
- package/dist_ts/smartvpn.classes.vpnclient.d.ts +5 -4
- package/dist_ts/smartvpn.classes.vpnclient.js +9 -5
- package/dist_ts/smartvpn.classes.vpnconfig.d.ts +1 -0
- package/dist_ts/smartvpn.classes.vpnconfig.js +52 -14
- package/dist_ts/smartvpn.classes.vpnserver.d.ts +17 -4
- package/dist_ts/smartvpn.classes.vpnserver.js +80 -40
- package/dist_ts/smartvpn.interfaces.d.ts +151 -16
- package/dist_ts/smartvpn.paths.d.ts +2 -0
- package/dist_ts/smartvpn.paths.js +14 -1
- package/notices/aho-corasick-license.txt +21 -0
- package/notices/cargo-dependencies.html +5202 -0
- package/notices/compiler-builtins-license.txt +275 -0
- package/notices/defmt-license.txt +25 -0
- package/notices/inventory.json +1427 -0
- package/notices/llvm-libunwind-license.txt +311 -0
- package/notices/mit-source-attributions.txt +31 -0
- package/notices/musl-copyright.txt +193 -0
- package/notices/proc-macro-error2-license.txt +21 -0
- package/notices/rust-standard-library.html +8266 -0
- package/notices/valuable-license.txt +25 -0
- package/package.json +8 -6
- package/readme.hints.md +69 -3
- package/readme.md +313 -5
- package/third-party-notices.md +81 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/smartvpn.classes.vpnbridge.ts +12 -50
- package/ts/smartvpn.classes.vpnclient.ts +9 -5
- package/ts/smartvpn.classes.vpnconfig.ts +49 -13
- package/ts/smartvpn.classes.vpnserver.ts +94 -40
- package/ts/smartvpn.interfaces.ts +155 -16
- package/ts/smartvpn.paths.ts +19 -0
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
# Third-party notices: managed Linux routing
|
|
2
|
+
|
|
3
|
+
The Linux daemon links the following unmodified registry dependencies. Their
|
|
4
|
+
exact upstream LICENSE-MIT texts are reproduced below. This file is distributed
|
|
5
|
+
under package.json's assets/**/* inclusion.
|
|
6
|
+
|
|
7
|
+
## rtnetlink 0.23.0
|
|
8
|
+
|
|
9
|
+
Source: https://crates.io/crates/rtnetlink/0.23.0
|
|
10
|
+
|
|
11
|
+
```text
|
|
12
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
13
|
+
this software and associated documentation files (the "Software"), to deal in
|
|
14
|
+
the Software without restriction, including without limitation the rights to
|
|
15
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
16
|
+
of the Software, and to permit persons to whom the Software is furnished to do
|
|
17
|
+
so, subject to the following conditions:
|
|
18
|
+
|
|
19
|
+
The above copyright notice and this permission notice shall be included in all
|
|
20
|
+
copies or substantial portions of the Software.
|
|
21
|
+
|
|
22
|
+
Distributions of all or part of the Software intended to be used by the
|
|
23
|
+
recipients as they would use the unmodified Software, containing modifications
|
|
24
|
+
that substantially alter, remove, or disable functionality of the Software,
|
|
25
|
+
outside of the documented configuration mechanisms provided by the Software,
|
|
26
|
+
shall be modified such that the Original Author's bug reporting email addresses
|
|
27
|
+
and urls are either replaced with the contact information of the parties
|
|
28
|
+
responsible for the changes, or removed entirely.
|
|
29
|
+
|
|
30
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
31
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
32
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
33
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
34
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
35
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
36
|
+
SOFTWARE.
|
|
37
|
+
```
|
|
38
|
+
|
|
39
|
+
## netlink-packet-core 0.9.0
|
|
40
|
+
|
|
41
|
+
Source: https://crates.io/crates/netlink-packet-core/0.9.0
|
|
42
|
+
|
|
43
|
+
```text
|
|
44
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
45
|
+
this software and associated documentation files (the "Software"), to deal in
|
|
46
|
+
the Software without restriction, including without limitation the rights to
|
|
47
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
48
|
+
of the Software, and to permit persons to whom the Software is furnished to do
|
|
49
|
+
so, subject to the following conditions:
|
|
50
|
+
|
|
51
|
+
The above copyright notice and this permission notice shall be included in all
|
|
52
|
+
copies or substantial portions of the Software.
|
|
53
|
+
|
|
54
|
+
Distributions of all or part of the Software intended to be used by the
|
|
55
|
+
recipients as they would use the unmodified Software, containing modifications
|
|
56
|
+
that substantially alter, remove, or disable functionality of the Software,
|
|
57
|
+
outside of the documented configuration mechanisms provided by the Software,
|
|
58
|
+
shall be modified such that the Original Author's bug reporting email addresses
|
|
59
|
+
and urls are either replaced with the contact information of the parties
|
|
60
|
+
responsible for the changes, or removed entirely.
|
|
61
|
+
|
|
62
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
63
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
64
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
65
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
66
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
67
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
68
|
+
SOFTWARE.
|
|
69
|
+
```
|
|
70
|
+
|
|
71
|
+
## netlink-packet-route 0.33.0
|
|
72
|
+
|
|
73
|
+
Source: https://crates.io/crates/netlink-packet-route/0.33.0
|
|
74
|
+
|
|
75
|
+
```text
|
|
76
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
77
|
+
this software and associated documentation files (the “Software”), to deal in
|
|
78
|
+
the Software without restriction, including without limitation the rights to
|
|
79
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
80
|
+
of the Software, and to permit persons to whom the Software is furnished to do
|
|
81
|
+
so, subject to the following conditions:
|
|
82
|
+
|
|
83
|
+
The above copyright notice and this permission notice shall be included in all
|
|
84
|
+
copies or substantial portions of the Software.
|
|
85
|
+
|
|
86
|
+
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
87
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
88
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
89
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
90
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
91
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
92
|
+
SOFTWARE.
|
|
93
|
+
```
|
|
94
|
+
|
|
95
|
+
## netlink-proto 0.13.0
|
|
96
|
+
|
|
97
|
+
Source: https://crates.io/crates/netlink-proto/0.13.0
|
|
98
|
+
|
|
99
|
+
```text
|
|
100
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
101
|
+
this software and associated documentation files (the "Software"), to deal in
|
|
102
|
+
the Software without restriction, including without limitation the rights to
|
|
103
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
104
|
+
of the Software, and to permit persons to whom the Software is furnished to do
|
|
105
|
+
so, subject to the following conditions:
|
|
106
|
+
|
|
107
|
+
The above copyright notice and this permission notice shall be included in all
|
|
108
|
+
copies or substantial portions of the Software.
|
|
109
|
+
|
|
110
|
+
Distributions of all or part of the Software intended to be used by the
|
|
111
|
+
recipients as they would use the unmodified Software, containing modifications
|
|
112
|
+
that substantially alter, remove, or disable functionality of the Software,
|
|
113
|
+
outside of the documented configuration mechanisms provided by the Software,
|
|
114
|
+
shall be modified such that the Original Author's bug reporting email addresses
|
|
115
|
+
and urls are either replaced with the contact information of the parties
|
|
116
|
+
responsible for the changes, or removed entirely.
|
|
117
|
+
|
|
118
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
119
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
120
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
121
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
122
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
123
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
124
|
+
SOFTWARE.
|
|
125
|
+
```
|
|
126
|
+
|
|
127
|
+
## netlink-sys 0.9.0
|
|
128
|
+
|
|
129
|
+
Source: https://crates.io/crates/netlink-sys/0.9.0
|
|
130
|
+
|
|
131
|
+
```text
|
|
132
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
133
|
+
this software and associated documentation files (the "Software"), to deal in
|
|
134
|
+
the Software without restriction, including without limitation the rights to
|
|
135
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
136
|
+
of the Software, and to permit persons to whom the Software is furnished to do
|
|
137
|
+
so, subject to the following conditions:
|
|
138
|
+
|
|
139
|
+
The above copyright notice and this permission notice shall be included in all
|
|
140
|
+
copies or substantial portions of the Software.
|
|
141
|
+
|
|
142
|
+
Distributions of all or part of the Software intended to be used by the
|
|
143
|
+
recipients as they would use the unmodified Software, containing modifications
|
|
144
|
+
that substantially alter, remove, or disable functionality of the Software,
|
|
145
|
+
outside of the documented configuration mechanisms provided by the Software,
|
|
146
|
+
shall be modified such that the Original Author's bug reporting email addresses
|
|
147
|
+
and urls are either replaced with the contact information of the parties
|
|
148
|
+
responsible for the changes, or removed entirely.
|
|
149
|
+
|
|
150
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
151
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
152
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
153
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
154
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
155
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
156
|
+
SOFTWARE.
|
|
157
|
+
```
|
|
Binary file
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"format": "tsrust.build-provenance.v2",
|
|
3
|
+
"binarySha256": "9dae4722a783f8de4ce2c5066eff1bf5d6ebde48750aaf3e96ad4e0374e153a3",
|
|
4
|
+
"buildInfo": {
|
|
5
|
+
"projectName": "@push.rocks/smartvpn",
|
|
6
|
+
"projectVersion": "2.0.0",
|
|
7
|
+
"gitCommit": "d6dbad135253e924e10c2dd0183377cd64e0c347",
|
|
8
|
+
"gitDirty": false,
|
|
9
|
+
"builtAt": "2026-09-07T08:10:39.362Z",
|
|
10
|
+
"tsrustVersion": "1.11.0",
|
|
11
|
+
"binary": "smartvpn_daemon",
|
|
12
|
+
"target": "linux_amd64_musl"
|
|
13
|
+
}
|
|
14
|
+
}
|
|
Binary file
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"format": "tsrust.build-provenance.v2",
|
|
3
|
+
"binarySha256": "939472012c3378f6e1727b32f7ee8d167a5566a918dd188c5e850190e0f10282",
|
|
4
|
+
"buildInfo": {
|
|
5
|
+
"projectName": "@push.rocks/smartvpn",
|
|
6
|
+
"projectVersion": "2.0.0",
|
|
7
|
+
"gitCommit": "d6dbad135253e924e10c2dd0183377cd64e0c347",
|
|
8
|
+
"gitDirty": false,
|
|
9
|
+
"builtAt": "2026-09-07T08:10:39.651Z",
|
|
10
|
+
"tsrustVersion": "1.11.0",
|
|
11
|
+
"binary": "smartvpn_daemon",
|
|
12
|
+
"target": "linux_arm64_musl"
|
|
13
|
+
}
|
|
14
|
+
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartvpn',
|
|
6
|
-
version: '
|
|
6
|
+
version: '2.0.0',
|
|
7
7
|
description: 'A VPN solution with TypeScript control plane and Rust data plane daemon'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHlFQUF5RTtDQUN2RixDQUFBIn0=
|
|
@@ -19,10 +19,10 @@ export declare class VpnBridge<TCommands extends TCommandMap> extends plugins.ev
|
|
|
19
19
|
*/
|
|
20
20
|
start(): Promise<boolean>;
|
|
21
21
|
/**
|
|
22
|
-
*
|
|
23
|
-
*
|
|
22
|
+
* Confirm closure of the owned transport. Socket mode leaves the remote daemon alive;
|
|
23
|
+
* stdio mode waits for child exit and stdio closure. Failure remains retryable upstream.
|
|
24
24
|
*/
|
|
25
|
-
stop(): void
|
|
25
|
+
stop(): Promise<void>;
|
|
26
26
|
/**
|
|
27
27
|
* Send a typed command to the daemon.
|
|
28
28
|
*/
|
|
@@ -1,42 +1,5 @@
|
|
|
1
1
|
import * as plugins from './smartvpn.plugins.js';
|
|
2
2
|
import * as paths from './smartvpn.paths.js';
|
|
3
|
-
/**
|
|
4
|
-
* Get the package root directory.
|
|
5
|
-
*/
|
|
6
|
-
function getPackageRoot() {
|
|
7
|
-
const thisDir = plugins.path.dirname(plugins.url.fileURLToPath(import.meta.url));
|
|
8
|
-
return plugins.path.resolve(thisDir, '..');
|
|
9
|
-
}
|
|
10
|
-
/**
|
|
11
|
-
* Map Node.js platform/arch to tsrust's platform suffix.
|
|
12
|
-
*/
|
|
13
|
-
function getTsrustPlatformSuffix() {
|
|
14
|
-
const archMap = { x64: 'amd64', arm64: 'arm64' };
|
|
15
|
-
const osMap = { linux: 'linux', darwin: 'macos' };
|
|
16
|
-
const os = osMap[process.platform];
|
|
17
|
-
const arch = archMap[process.arch];
|
|
18
|
-
if (os && arch) {
|
|
19
|
-
return `${os}_${arch}`;
|
|
20
|
-
}
|
|
21
|
-
return null;
|
|
22
|
-
}
|
|
23
|
-
/**
|
|
24
|
-
* Build local search paths for the smartvpn daemon binary.
|
|
25
|
-
*/
|
|
26
|
-
function buildLocalPaths(binaryName) {
|
|
27
|
-
const packageRoot = getPackageRoot();
|
|
28
|
-
const suffix = getTsrustPlatformSuffix();
|
|
29
|
-
const paths = [];
|
|
30
|
-
// dist_rust/ (tsrust cross-compiled output)
|
|
31
|
-
if (suffix) {
|
|
32
|
-
paths.push(plugins.path.join(packageRoot, 'dist_rust', `${binaryName}_${suffix}`));
|
|
33
|
-
}
|
|
34
|
-
paths.push(plugins.path.join(packageRoot, 'dist_rust', binaryName));
|
|
35
|
-
// Local dev build paths
|
|
36
|
-
paths.push(plugins.path.resolve(process.cwd(), 'rust', 'target', 'release', binaryName));
|
|
37
|
-
paths.push(plugins.path.resolve(process.cwd(), 'rust', 'target', 'debug', binaryName));
|
|
38
|
-
return paths;
|
|
39
|
-
}
|
|
40
3
|
/**
|
|
41
4
|
* Shared bridge wrapper around smartrust RustBridge.
|
|
42
5
|
* Supports stdio mode (dev: spawn child process) and socket mode (production: connect to running daemon).
|
|
@@ -49,9 +12,11 @@ export class VpnBridge extends plugins.events.EventEmitter {
|
|
|
49
12
|
this.mode = options.mode;
|
|
50
13
|
this.bridge = new plugins.smartrust.RustBridge({
|
|
51
14
|
binaryName,
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
15
|
+
binaryPath: options.transport.transport === 'stdio'
|
|
16
|
+
? paths.getBinaryPath(binaryName)
|
|
17
|
+
: undefined,
|
|
18
|
+
localPaths: [],
|
|
19
|
+
searchSystemPath: false,
|
|
55
20
|
cliArgs: ['--management', '--mode', this.mode],
|
|
56
21
|
maxPayloadSize: 10 * 1024 * 1024, // 10 MB
|
|
57
22
|
});
|
|
@@ -62,6 +27,9 @@ export class VpnBridge extends plugins.events.EventEmitter {
|
|
|
62
27
|
this.bridge.on('reconnected', () => {
|
|
63
28
|
this.emit('reconnected');
|
|
64
29
|
});
|
|
30
|
+
this.bridge.on('stderr', (line) => {
|
|
31
|
+
this.emit('stderr', line);
|
|
32
|
+
});
|
|
65
33
|
// Forward management events from the daemon
|
|
66
34
|
// smartrust emits 'management:<eventName>' for unsolicited events
|
|
67
35
|
this.bridge.on('management:status', (data) => {
|
|
@@ -101,11 +69,11 @@ export class VpnBridge extends plugins.events.EventEmitter {
|
|
|
101
69
|
}
|
|
102
70
|
}
|
|
103
71
|
/**
|
|
104
|
-
*
|
|
105
|
-
*
|
|
72
|
+
* Confirm closure of the owned transport. Socket mode leaves the remote daemon alive;
|
|
73
|
+
* stdio mode waits for child exit and stdio closure. Failure remains retryable upstream.
|
|
106
74
|
*/
|
|
107
|
-
stop() {
|
|
108
|
-
this.bridge.
|
|
75
|
+
async stop() {
|
|
76
|
+
await this.bridge.terminate();
|
|
109
77
|
}
|
|
110
78
|
/**
|
|
111
79
|
* Send a typed command to the daemon.
|
|
@@ -120,4 +88,4 @@ export class VpnBridge extends plugins.events.EventEmitter {
|
|
|
120
88
|
return this.bridge.running;
|
|
121
89
|
}
|
|
122
90
|
}
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR2cG4uY2xhc3Nlcy52cG5icmlkZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHZwbi5jbGFzc2VzLnZwbmJyaWRnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHVCQUF1QixDQUFDO0FBQ2pELE9BQU8sS0FBSyxLQUFLLE1BQU0scUJBQXFCLENBQUM7QUFPN0M7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFNBQXlDLFNBQVEsT0FBTyxDQUFDLE1BQU0sQ0FBQyxZQUFZO0lBS3ZGLFlBQVksT0FJWDtRQUNDLEtBQUssRUFBRSxDQUFDO1FBRVIsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLFVBQVUsSUFBSSxpQkFBaUIsQ0FBQztRQUMzRCxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQztRQUMxQyxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7UUFFekIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFZO1lBQ3hELFVBQVU7WUFDVixVQUFVLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLEtBQUssT0FBTztnQkFDakQsQ0FBQyxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUFDO2dCQUNqQyxDQUFDLENBQUMsU0FBUztZQUNiLFVBQVUsRUFBRSxFQUFFO1lBQ2QsZ0JBQWdCLEVBQUUsS0FBSztZQUN2QixPQUFPLEVBQUUsQ0FBQyxjQUFjLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUM7WUFDOUMsY0FBYyxFQUFFLEVBQUUsR0FBRyxJQUFJLEdBQUcsSUFBSSxFQUFFLFFBQVE7U0FDM0MsQ0FBQyxDQUFDO1FBRUgsbUNBQW1DO1FBQ25DLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQW1CLEVBQUUsTUFB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
|
|
@@ -34,13 +34,14 @@ export declare class VpnClient extends plugins.events.EventEmitter {
|
|
|
34
34
|
*/
|
|
35
35
|
getConnectionQuality(): Promise<IVpnConnectionQuality>;
|
|
36
36
|
/**
|
|
37
|
-
* Get MTU information
|
|
37
|
+
* Get active runtime MTU information, or null when disconnected.
|
|
38
|
+
* Unknown outer-path measurements remain null.
|
|
38
39
|
*/
|
|
39
|
-
getMtuInfo(): Promise<IVpnMtuInfo>;
|
|
40
|
+
getMtuInfo(): Promise<IVpnMtuInfo | null>;
|
|
40
41
|
/**
|
|
41
|
-
* Stop the daemon bridge.
|
|
42
|
+
* Stop the daemon bridge and wait for confirmed ownership release.
|
|
42
43
|
*/
|
|
43
|
-
stop(): void
|
|
44
|
+
stop(): Promise<void>;
|
|
44
45
|
/**
|
|
45
46
|
* Whether the bridge is running.
|
|
46
47
|
*/
|
|
@@ -18,6 +18,9 @@ export class VpnClient extends plugins.events.EventEmitter {
|
|
|
18
18
|
this.bridge.on('reconnected', () => {
|
|
19
19
|
this.emit('reconnected');
|
|
20
20
|
});
|
|
21
|
+
this.bridge.on('stderr', (line) => {
|
|
22
|
+
this.emit('stderr', line);
|
|
23
|
+
});
|
|
21
24
|
}
|
|
22
25
|
/**
|
|
23
26
|
* Start the daemon bridge (spawn or connect).
|
|
@@ -60,16 +63,17 @@ export class VpnClient extends plugins.events.EventEmitter {
|
|
|
60
63
|
return this.bridge.sendCommand('getConnectionQuality', {});
|
|
61
64
|
}
|
|
62
65
|
/**
|
|
63
|
-
* Get MTU information
|
|
66
|
+
* Get active runtime MTU information, or null when disconnected.
|
|
67
|
+
* Unknown outer-path measurements remain null.
|
|
64
68
|
*/
|
|
65
69
|
async getMtuInfo() {
|
|
66
70
|
return this.bridge.sendCommand('getMtuInfo', {});
|
|
67
71
|
}
|
|
68
72
|
/**
|
|
69
|
-
* Stop the daemon bridge.
|
|
73
|
+
* Stop the daemon bridge and wait for confirmed ownership release.
|
|
70
74
|
*/
|
|
71
|
-
stop() {
|
|
72
|
-
this.bridge.stop();
|
|
75
|
+
async stop() {
|
|
76
|
+
await this.bridge.stop();
|
|
73
77
|
}
|
|
74
78
|
/**
|
|
75
79
|
* Whether the bridge is running.
|
|
@@ -78,4 +82,4 @@ export class VpnClient extends plugins.events.EventEmitter {
|
|
|
78
82
|
return this.bridge.running;
|
|
79
83
|
}
|
|
80
84
|
}
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR2cG4uY2xhc3Nlcy52cG5jbGllbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHZwbi5jbGFzc2VzLnZwbmNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHVCQUF1QixDQUFDO0FBQ2pELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQVc1RDs7R0FFRztBQUNILE1BQU0sT0FBTyxTQUFVLFNBQVEsT0FBTyxDQUFDLE1BQU0sQ0FBQyxZQUFZO0lBSXhELFlBQVksT0FBMEI7UUFDcEMsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztRQUN2QixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksU0FBUyxDQUFxQjtZQUM5QyxTQUFTLEVBQUUsT0FBTyxDQUFDLFNBQVM7WUFDNUIsSUFBSSxFQUFFLFFBQVE7U0FDZixDQUFDLENBQUM7UUFFSCx3QkFBd0I7UUFDeEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBbUIsRUFBRSxNQUFxQixFQUFFLEVBQUU7WUFDcEUsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUN0QyxDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLGFBQWEsRUFBRSxHQUFHLEVBQUU7WUFDakMsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMzQixDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQVksRUFBRSxFQUFFO1lBQ3hDLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzVCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLEtBQUs7UUFDaEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBeUI7UUFDNUMsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDO1FBQzFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNULE1BQU0sSUFBSSxLQUFLLENBQUMsdUNBQXVDLENBQUMsQ0FBQztRQUMzRCxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxTQUFTLEVBQUUsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUM3RCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsVUFBVTtRQUNyQixNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLFlBQVksRUFBRSxFQUEyQixDQUFDLENBQUM7SUFDM0UsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLFNBQVM7UUFDcEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxXQUFXLEVBQUUsRUFBMkIsQ0FBQyxDQUFDO0lBQzNFLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxhQUFhO1FBQ3hCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsZUFBZSxFQUFFLEVBQTJCLENBQUMsQ0FBQztJQUMvRSxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsb0JBQW9CO1FBQy9CLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsc0JBQXNCLEVBQUUsRUFBMkIsQ0FBQyxDQUFDO0lBQ3RGLENBQUM7SUFFRDs7O09BR0c7SUFDSSxLQUFLLENBQUMsVUFBVTtRQUNyQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLFlBQVksRUFBRSxFQUEyQixDQUFDLENBQUM7SUFDNUUsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLElBQUk7UUFDZixNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBVyxPQUFPO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUM7SUFDN0IsQ0FBQztDQUNGIn0=
|
|
@@ -3,6 +3,7 @@ import type { IVpnClientConfig, IVpnServerConfig } from './smartvpn.interfaces.j
|
|
|
3
3
|
* VPN configuration loader, saver, and validator.
|
|
4
4
|
*/
|
|
5
5
|
export declare class VpnConfig {
|
|
6
|
+
private static validateMtu;
|
|
6
7
|
/**
|
|
7
8
|
* Validate a client config object. Throws on invalid config.
|
|
8
9
|
*/
|
|
@@ -3,6 +3,11 @@ import * as plugins from './smartvpn.plugins.js';
|
|
|
3
3
|
* VPN configuration loader, saver, and validator.
|
|
4
4
|
*/
|
|
5
5
|
export class VpnConfig {
|
|
6
|
+
static validateMtu(mtu) {
|
|
7
|
+
if (mtu !== undefined && (!Number.isInteger(mtu) || mtu < 576 || mtu > 65472)) {
|
|
8
|
+
throw new Error('VpnConfig: mtu must be an integer between 576 and 65472 inner IP bytes');
|
|
9
|
+
}
|
|
10
|
+
}
|
|
6
11
|
/**
|
|
7
12
|
* Validate a client config object. Throws on invalid config.
|
|
8
13
|
*/
|
|
@@ -26,15 +31,27 @@ export class VpnConfig {
|
|
|
26
31
|
if (config.wgPresharedKey) {
|
|
27
32
|
VpnConfig.validateBase64Key(config.wgPresharedKey, 'wgPresharedKey');
|
|
28
33
|
}
|
|
29
|
-
if (config.wgAllowedIps) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
+
if (!Array.isArray(config.wgAllowedIps) || config.wgAllowedIps.length === 0) {
|
|
35
|
+
throw new Error('VpnConfig: wgAllowedIps must be a nonempty array for WireGuard transport');
|
|
36
|
+
}
|
|
37
|
+
for (const cidr of config.wgAllowedIps) {
|
|
38
|
+
if (!VpnConfig.isValidCidr(cidr)) {
|
|
39
|
+
throw new Error(`VpnConfig: invalid allowedIp CIDR: ${cidr}`);
|
|
34
40
|
}
|
|
35
41
|
}
|
|
42
|
+
if (!VpnConfig.isValidIp(config.wgAddress)) {
|
|
43
|
+
throw new Error('VpnConfig: wgAddress must be an IPv4 address');
|
|
44
|
+
}
|
|
45
|
+
if (config.wgAddressPrefix !== undefined && (!Number.isInteger(config.wgAddressPrefix) || config.wgAddressPrefix < 0 || config.wgAddressPrefix > 32)) {
|
|
46
|
+
throw new Error('VpnConfig: wgAddressPrefix must be an integer from 0 through 32');
|
|
47
|
+
}
|
|
36
48
|
}
|
|
37
49
|
else {
|
|
50
|
+
if (config.managedNetwork && (!config.managedNetwork.authorityId || !config.managedNetwork.nodeId
|
|
51
|
+
|| config.managedNetwork.authorityId.trim() !== config.managedNetwork.authorityId
|
|
52
|
+
|| config.managedNetwork.nodeId.trim() !== config.managedNetwork.nodeId)) {
|
|
53
|
+
throw new Error('VpnConfig: managedNetwork requires an explicit authorityId and nodeId');
|
|
54
|
+
}
|
|
38
55
|
if (!config.serverUrl) {
|
|
39
56
|
throw new Error('VpnConfig: serverUrl is required');
|
|
40
57
|
}
|
|
@@ -57,9 +74,7 @@ export class VpnConfig {
|
|
|
57
74
|
}
|
|
58
75
|
VpnConfig.validateBase64Key(config.clientPublicKey, 'clientPublicKey');
|
|
59
76
|
}
|
|
60
|
-
|
|
61
|
-
throw new Error('VpnConfig: mtu must be between 576 and 65535');
|
|
62
|
-
}
|
|
77
|
+
VpnConfig.validateMtu(config.mtu);
|
|
63
78
|
if (config.keepaliveIntervalSecs !== undefined && config.keepaliveIntervalSecs < 1) {
|
|
64
79
|
throw new Error('VpnConfig: keepaliveIntervalSecs must be >= 1');
|
|
65
80
|
}
|
|
@@ -75,16 +90,41 @@ export class VpnConfig {
|
|
|
75
90
|
* Validate a server config object. Throws on invalid config.
|
|
76
91
|
*/
|
|
77
92
|
static validateServerConfig(config) {
|
|
93
|
+
if (config.forwardingMode === 'managed') {
|
|
94
|
+
if (!config.managedAuthorityId || config.managedAuthorityId.trim() !== config.managedAuthorityId) {
|
|
95
|
+
throw new Error('VpnConfig: managed mode requires managedAuthorityId');
|
|
96
|
+
}
|
|
97
|
+
if (config.clients?.length || config.wgPeers?.length || config.enableNat === true
|
|
98
|
+
|| config.destinationPolicy !== undefined || config.clientAllowedIPs !== undefined || config.dns !== undefined
|
|
99
|
+
|| config.bridgeLanSubnet !== undefined || config.bridgePhysicalInterface !== undefined
|
|
100
|
+
|| config.bridgeIpRangeStart !== undefined || config.bridgeIpRangeEnd !== undefined
|
|
101
|
+
|| config.socketForwardProxyProtocol === true || config.socketForwardProxyProtocolSource !== undefined
|
|
102
|
+
|| config.socketForwardProxyProtocolVpnMetadata === true) {
|
|
103
|
+
throw new Error('VpnConfig: managed mode does not accept standalone clients, peers, routing, DNS, NAT or bridge configuration');
|
|
104
|
+
}
|
|
105
|
+
if (config.wgPrivateKey && ['all', 'wireguard'].includes(config.transportMode ?? 'all') && !config.serverEndpoint) {
|
|
106
|
+
throw new Error('VpnConfig: managed WireGuard requires an explicit serverEndpoint');
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
else if (config.managedAuthorityId !== undefined) {
|
|
110
|
+
throw new Error('VpnConfig: managedAuthorityId requires managed mode');
|
|
111
|
+
}
|
|
112
|
+
if (config.wgPrivateKey) {
|
|
113
|
+
VpnConfig.validateBase64Key(config.wgPrivateKey, 'wgPrivateKey');
|
|
114
|
+
}
|
|
78
115
|
if (config.transportMode === 'wireguard') {
|
|
79
116
|
// WireGuard server validation
|
|
80
117
|
if (!config.privateKey) {
|
|
81
118
|
throw new Error('VpnConfig: privateKey is required');
|
|
82
119
|
}
|
|
83
120
|
VpnConfig.validateBase64Key(config.privateKey, 'privateKey');
|
|
84
|
-
if (
|
|
121
|
+
if (config.forwardingMode === 'managed' && !config.wgPrivateKey) {
|
|
122
|
+
throw new Error('VpnConfig: managed WireGuard requires wgPrivateKey');
|
|
123
|
+
}
|
|
124
|
+
if (config.forwardingMode !== 'managed' && (!config.wgPeers || config.wgPeers.length === 0)) {
|
|
85
125
|
throw new Error('VpnConfig: at least one wgPeers entry is required for WireGuard mode');
|
|
86
126
|
}
|
|
87
|
-
for (const peer of config.wgPeers) {
|
|
127
|
+
for (const peer of config.wgPeers ?? []) {
|
|
88
128
|
if (!peer.publicKey) {
|
|
89
129
|
throw new Error('VpnConfig: peer publicKey is required');
|
|
90
130
|
}
|
|
@@ -134,9 +174,7 @@ export class VpnConfig {
|
|
|
134
174
|
}
|
|
135
175
|
}
|
|
136
176
|
}
|
|
137
|
-
|
|
138
|
-
throw new Error('VpnConfig: mtu must be between 576 and 65535');
|
|
139
|
-
}
|
|
177
|
+
VpnConfig.validateMtu(config.mtu);
|
|
140
178
|
if (config.keepaliveIntervalSecs !== undefined && config.keepaliveIntervalSecs < 1) {
|
|
141
179
|
throw new Error('VpnConfig: keepaliveIntervalSecs must be >= 1');
|
|
142
180
|
}
|
|
@@ -219,4 +257,4 @@ export class VpnConfig {
|
|
|
219
257
|
}
|
|
220
258
|
}
|
|
221
259
|
}
|
|
222
|
-
//# 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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"}
|
|
260
|
+
//# 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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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as plugins from './smartvpn.plugins.js';
|
|
2
|
-
import type { IVpnServerOptions, IVpnServerConfig, IVpnStatus, IVpnServerStatistics, IVpnClientInfo, IVpnKeypair, IVpnClientTelemetry, IWgPeerConfig, IWgPeerInfo, IClientEntry, IClientConfigBundle } from './smartvpn.interfaces.js';
|
|
2
|
+
import type { IVpnServerOptions, IVpnServerConfig, IVpnStatus, IVpnServerStatistics, IVpnClientInfo, IVpnKeypair, IVpnClientTelemetry, IWgPeerConfig, IWgPeerInfo, IClientEntry, IClientCreateOptions, TClientUpdateOptions, IClientConfigBundle, IManagedNetworkSnapshot, IManagedNetworkStatus, IManagedNodeProjection } from './smartvpn.interfaces.js';
|
|
3
3
|
/**
|
|
4
4
|
* VPN Server — manages a smartvpn daemon in server mode.
|
|
5
5
|
*/
|
|
@@ -10,11 +10,16 @@ export declare class VpnServer extends plugins.events.EventEmitter {
|
|
|
10
10
|
private nftHealthInterval?;
|
|
11
11
|
private nftSubnet?;
|
|
12
12
|
private nftPolicy?;
|
|
13
|
+
private nftHealthCheck?;
|
|
14
|
+
private startOperation?;
|
|
15
|
+
private stopOperation?;
|
|
16
|
+
private remotePolicyStopAcknowledged;
|
|
13
17
|
constructor(options: IVpnServerOptions);
|
|
14
18
|
/**
|
|
15
19
|
* Start the daemon bridge (spawn or connect).
|
|
16
20
|
*/
|
|
17
21
|
start(config?: IVpnServerConfig): Promise<void>;
|
|
22
|
+
private startOwnedResources;
|
|
18
23
|
/**
|
|
19
24
|
* Stop the VPN server.
|
|
20
25
|
*/
|
|
@@ -23,6 +28,11 @@ export declare class VpnServer extends plugins.events.EventEmitter {
|
|
|
23
28
|
* Get server status.
|
|
24
29
|
*/
|
|
25
30
|
getStatus(): Promise<IVpnStatus>;
|
|
31
|
+
/** Apply a complete caller-owned snapshot. An IPC timeout does not cancel its owner.
|
|
32
|
+
* Inspect status and replay the exact target after uncertainty or a pending failure. */
|
|
33
|
+
reconcileManagedNetwork(snapshot: IManagedNetworkSnapshot): Promise<IManagedNetworkStatus>;
|
|
34
|
+
getManagedNetworkStatus(): Promise<IManagedNetworkStatus>;
|
|
35
|
+
getManagedNodeProjection(nodeId: string): Promise<IManagedNodeProjection>;
|
|
26
36
|
/**
|
|
27
37
|
* Get server statistics.
|
|
28
38
|
*/
|
|
@@ -71,7 +81,7 @@ export declare class VpnServer extends plugins.events.EventEmitter {
|
|
|
71
81
|
* Create a new client. Generates keypairs, assigns IP, returns full config bundle.
|
|
72
82
|
* The secrets (private keys) are only returned at creation time.
|
|
73
83
|
*/
|
|
74
|
-
createClient(opts:
|
|
84
|
+
createClient(opts: IClientCreateOptions): Promise<IClientConfigBundle>;
|
|
75
85
|
/**
|
|
76
86
|
* Remove a registered client (also disconnects if connected).
|
|
77
87
|
*/
|
|
@@ -87,7 +97,7 @@ export declare class VpnServer extends plugins.events.EventEmitter {
|
|
|
87
97
|
/**
|
|
88
98
|
* Update a registered client's fields (ACLs, tags, description, etc.).
|
|
89
99
|
*/
|
|
90
|
-
updateClient(clientId: string, update:
|
|
100
|
+
updateClient(clientId: string, update: TClientUpdateOptions): Promise<void>;
|
|
91
101
|
/**
|
|
92
102
|
* Enable a previously disabled client.
|
|
93
103
|
*/
|
|
@@ -113,15 +123,18 @@ export declare class VpnServer extends plugins.events.EventEmitter {
|
|
|
113
123
|
* Also starts a 60-second health check interval to re-apply if rules are removed externally.
|
|
114
124
|
*/
|
|
115
125
|
private setupTunDestinationPolicy;
|
|
126
|
+
private checkTunDestinationPolicy;
|
|
116
127
|
/**
|
|
117
128
|
* Apply destination policy as nftables rules.
|
|
118
129
|
* Order: blockList (drop) → allowList (accept) → default action.
|
|
119
130
|
*/
|
|
120
131
|
private applyDestinationPolicyRules;
|
|
121
132
|
/**
|
|
122
|
-
*
|
|
133
|
+
* Drain startup, confirm daemon closure, then drain policy work and clean up.
|
|
134
|
+
* Failure preserves ownership so callers can retry; no timeout implies success.
|
|
123
135
|
*/
|
|
124
136
|
stop(): Promise<void>;
|
|
137
|
+
private stopOwnedResources;
|
|
125
138
|
/**
|
|
126
139
|
* Whether the bridge is running.
|
|
127
140
|
*/
|