@push.rocks/smartvpn 2.6.0 → 2.7.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 +1 -1
- package/dist_ts/smartvpn.classes.vpnbridge.js +2 -2
- package/dist_ts/smartvpn.paths.d.ts +7 -0
- package/dist_ts/smartvpn.paths.js +13 -1
- package/dist_ts/smartvpn.plugins.d.ts +2 -1
- package/dist_ts/smartvpn.plugins.js +3 -2
- package/notices/cargo-dependencies.html +27 -0
- package/notices/inventory.json +14 -4
- package/package.json +12 -13
- package/readme.md +29 -2
- package/third-party-notices.md +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/smartvpn.classes.vpnbridge.ts +1 -1
- package/ts/smartvpn.paths.ts +13 -0
- package/ts/smartvpn.plugins.ts +2 -1
|
Binary file
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "e06e9bec1206146c13370d105610c056dd3684cca29d1280e7befd5a08c34e99",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartvpn",
|
|
6
|
-
"projectVersion": "2.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "2.7.1",
|
|
7
|
+
"gitCommit": "d1bbbeaec9ed99d89334375aa615471c3f2615ef",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-10-
|
|
10
|
-
"tsrustVersion": "
|
|
9
|
+
"builtAt": "2026-10-26T21:48:04.722Z",
|
|
10
|
+
"tsrustVersion": "1.1.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": "8ae1a19ef3b0b11251a3af628ef1caaf7ff81d0c66b8033c32fccf8da4271e77",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartvpn",
|
|
6
|
-
"projectVersion": "2.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "2.7.1",
|
|
7
|
+
"gitCommit": "d1bbbeaec9ed99d89334375aa615471c3f2615ef",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-10-
|
|
10
|
-
"tsrustVersion": "
|
|
9
|
+
"builtAt": "2026-10-26T21:50:58.538Z",
|
|
10
|
+
"tsrustVersion": "1.1.1",
|
|
11
11
|
"binary": "smartvpn_daemon",
|
|
12
12
|
"target": "linux_arm64_musl"
|
|
13
13
|
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartvpn',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.7.1',
|
|
7
7
|
description: 'A VPN solution with TypeScript control plane and Rust data plane daemon'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHlFQUF5RTtDQUN2RixDQUFBIn0=
|
|
@@ -27,7 +27,7 @@ export class VpnBridge extends plugins.events.EventEmitter {
|
|
|
27
27
|
this.bridge = new plugins.smartrust.RustBridge({
|
|
28
28
|
binaryName,
|
|
29
29
|
binaryPath: options.transport.transport === 'stdio'
|
|
30
|
-
? options.transport.binaryPath ?? paths.
|
|
30
|
+
? options.transport.binaryPath ?? paths.getStdioBinaryPath(binaryName)
|
|
31
31
|
: undefined,
|
|
32
32
|
localPaths: [],
|
|
33
33
|
searchSystemPath: false,
|
|
@@ -116,4 +116,4 @@ export class VpnBridge extends plugins.events.EventEmitter {
|
|
|
116
116
|
return this.bridge.running;
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR2cG4uY2xhc3Nlcy52cG5icmlkZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHZwbi5jbGFzc2VzLnZwbmJyaWRnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHVCQUF1QixDQUFDO0FBQ2pELE9BQU8sS0FBSyxLQUFLLE1BQU0scUJBQXFCLENBQUM7QUFVN0M7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFNBQXlDLFNBQVEsT0FBTyxDQUFDLE1BQU0sQ0FBQyxZQUFZO0lBS3ZGLFlBQVksT0FLWDtRQUNDLEtBQUssRUFBRSxDQUFDO1FBRVIsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDO1FBQy9DLElBQUksV0FBVyxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQzlCLElBQUksT0FBTyxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsS0FBSyxPQUFPLElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxRQUFRLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLEtBQUssT0FBTyxFQUFFLENBQUM7Z0JBQzlHLE1BQU0sSUFBSSxLQUFLLENBQUMsNERBQTRELENBQUMsQ0FBQztZQUNoRixDQUFDO1lBQ0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLElBQUksV0FBVyxHQUFHLENBQUMsSUFBSSxXQUFXLEdBQUcsV0FBVyxFQUFFLENBQUM7Z0JBQ25GLE1BQU0sSUFBSSxLQUFLLENBQUMsdUVBQXVFLENBQUMsQ0FBQztZQUMzRixDQUFDO1FBQ0gsQ0FBQztRQUNELE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxVQUFVLElBQUksaUJBQWlCLENBQUM7UUFDM0QsSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLFNBQVMsS0FBSyxPQUFPLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxVQUFVLEtBQUssU0FBUztlQUNwRixDQUFDLE9BQU8sT0FBTyxD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
|
|
@@ -1,3 +1,10 @@
|
|
|
1
1
|
export declare const packageDir: string;
|
|
2
2
|
/** Select only an explicitly requested binary or this package's Linux musl artifact. */
|
|
3
3
|
export declare function getBinaryPath(binaryName: string, platform?: NodeJS.Platform, arch?: string, override?: string | undefined): string;
|
|
4
|
+
/**
|
|
5
|
+
* The executable a stdio VpnBridge hands smartrust when the caller names none: the
|
|
6
|
+
* SMARTVPN_RUST_BINARY override, else this package's artifact. Inside a Node.js single
|
|
7
|
+
* executable application without an override: none, so smartrust runs the sidecar the
|
|
8
|
+
* executable embeds under `binaryName`.
|
|
9
|
+
*/
|
|
10
|
+
export declare function getStdioBinaryPath(binaryName: string): string | undefined;
|
|
@@ -13,4 +13,16 @@ export function getBinaryPath(binaryName, platform = process.platform, arch = pr
|
|
|
13
13
|
const suffix = arch === 'x64' ? 'linux_amd64_musl' : 'linux_arm64_musl';
|
|
14
14
|
return plugins.path.join(packageDir, 'dist_rust', `${binaryName}_${suffix}`);
|
|
15
15
|
}
|
|
16
|
-
|
|
16
|
+
/**
|
|
17
|
+
* The executable a stdio VpnBridge hands smartrust when the caller names none: the
|
|
18
|
+
* SMARTVPN_RUST_BINARY override, else this package's artifact. Inside a Node.js single
|
|
19
|
+
* executable application without an override: none, so smartrust runs the sidecar the
|
|
20
|
+
* executable embeds under `binaryName`.
|
|
21
|
+
*/
|
|
22
|
+
export function getStdioBinaryPath(binaryName) {
|
|
23
|
+
if (process.env.SMARTVPN_RUST_BINARY === undefined && plugins.smartsea.isSea()) {
|
|
24
|
+
return undefined;
|
|
25
|
+
}
|
|
26
|
+
return getBinaryPath(binaryName);
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR2cG4ucGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHZwbi5wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHVCQUF1QixDQUFDO0FBRWpELE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FDekMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQy9ELEtBQUssQ0FDTixDQUFDO0FBRUYsd0ZBQXdGO0FBQ3hGLE1BQU0sVUFBVSxhQUFhLENBQzNCLFVBQWtCLEVBQ2xCLFFBQVEsR0FBb0IsT0FBTyxDQUFDLFFBQVEsRUFDNUMsSUFBSSxHQUFXLE9BQU8sQ0FBQyxJQUFJLEVBQzNCLFFBQVEsR0FBdUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0I7SUFFL0QsaUZBQWlGO0lBQ2pGLDZFQUE2RTtJQUM3RSxJQUFJLFFBQVEsS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUMzQixPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDO0lBQ0QsSUFBSSxRQUFRLEtBQUssT0FBTyxJQUFJLENBQUMsSUFBSSxLQUFLLEtBQUssSUFBSSxJQUFJLEtBQUssT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUNqRSxNQUFNLElBQUksS0FBSyxDQUFDLHlDQUF5QyxRQUFRLElBQUksSUFBSSx1RkFBdUYsQ0FBQyxDQUFDO0lBQ3BLLENBQUM7SUFDRCxNQUFNLE1BQU0sR0FBRyxJQUFJLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUM7SUFDeEUsT0FBTyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLEdBQUcsVUFBVSxJQUFJLE1BQU0sRUFBRSxDQUFDLENBQUM7QUFDL0UsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLGtCQUFrQixDQUFDLFVBQWtCO0lBQ25ELElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsS0FBSyxTQUFTLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDO1FBQy9FLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxPQUFPLGFBQWEsQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUNuQyxDQUFDIn0=
|
|
@@ -7,4 +7,5 @@ export { path, fs, os, url, events };
|
|
|
7
7
|
import * as smartnftables from '@push.rocks/smartnftables';
|
|
8
8
|
import * as smartpath from '@push.rocks/smartpath';
|
|
9
9
|
import * as smartrust from '@push.rocks/smartrust';
|
|
10
|
-
|
|
10
|
+
import * as smartsea from '@push.rocks/smartsea';
|
|
11
|
+
export { smartnftables, smartpath, smartrust, smartsea };
|
|
@@ -9,5 +9,6 @@ export { path, fs, os, url, events };
|
|
|
9
9
|
import * as smartnftables from '@push.rocks/smartnftables';
|
|
10
10
|
import * as smartpath from '@push.rocks/smartpath';
|
|
11
11
|
import * as smartrust from '@push.rocks/smartrust';
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
import * as smartsea from '@push.rocks/smartsea';
|
|
13
|
+
export { smartnftables, smartpath, smartrust, smartsea };
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR2cG4ucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0dnBuLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYztBQUNkLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBRWpDLE9BQU8sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFFckMsY0FBYztBQUNkLE9BQU8sS0FBSyxhQUFhLE1BQU0sMkJBQTJCLENBQUM7QUFDM0QsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFFakQsT0FBTyxFQUFFLGFBQWEsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxDQUFDIn0=
|
|
@@ -1602,6 +1602,32 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
|
|
|
1602
1602
|
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
1603
1603
|
DEALINGS IN THE SOFTWARE.</pre>
|
|
1604
1604
|
</section>
|
|
1605
|
+
<section>
|
|
1606
|
+
<h2>MIT License (MIT)</h2>
|
|
1607
|
+
<ul>
|
|
1608
|
+
<li>tikv-jemalloc-ctl 0.7.0</li>
|
|
1609
|
+
</ul>
|
|
1610
|
+
<pre>Copyright (c) 2017 Steven Fackler
|
|
1611
|
+
|
|
1612
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
1613
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
1614
|
+
in the Software without restriction, including without limitation the rights
|
|
1615
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
1616
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
1617
|
+
furnished to do so, subject to the following conditions:
|
|
1618
|
+
|
|
1619
|
+
The above copyright notice and this permission notice shall be included in all
|
|
1620
|
+
copies or substantial portions of the Software.
|
|
1621
|
+
|
|
1622
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
1623
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
1624
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
1625
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
1626
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
1627
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
1628
|
+
SOFTWARE.
|
|
1629
|
+
</pre>
|
|
1630
|
+
</section>
|
|
1605
1631
|
<section>
|
|
1606
1632
|
<h2>MIT License (MIT)</h2>
|
|
1607
1633
|
<ul>
|
|
@@ -3534,6 +3560,7 @@ DEALINGS IN THE SOFTWARE.</pre>
|
|
|
3534
3560
|
<li>itoa 1.0.17</li>
|
|
3535
3561
|
<li>once_cell 1.21.3</li>
|
|
3536
3562
|
<li>parking 2.2.1</li>
|
|
3563
|
+
<li>paste 1.0.15</li>
|
|
3537
3564
|
<li>pin-project-lite 0.2.16</li>
|
|
3538
3565
|
<li>piper 0.2.4</li>
|
|
3539
3566
|
<li>proc-macro2 1.0.106</li>
|
package/notices/inventory.json
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"files": {
|
|
6
6
|
"assets/third-party-licenses.md": "6be2373e39312d90eb3571bef614c89df565f98c917795d7aea3497f52ef19f1",
|
|
7
7
|
"notices/aho-corasick-license.txt": "0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f",
|
|
8
|
-
"notices/cargo-dependencies.html": "
|
|
8
|
+
"notices/cargo-dependencies.html": "16aba7d84413a8e418b4a2bfb6c1e2ed97fd5df834380501630a5694d37dcc4a",
|
|
9
9
|
"notices/compiler-builtins-license.txt": "ab6eec6caf0fa5775e411c7a8bc6a45c4ef2956b0980b157ab74fc5cd62a928b",
|
|
10
10
|
"notices/defmt-license.txt": "0d17b75c1867fd568bcbb735f329d0d4253846c4b756a65e4d440c1e4bd59187",
|
|
11
11
|
"notices/jemalloc-license.txt": "94aa2caa98c25d942f58b956c71dba6a99ff98fc3a31cbc669fe2a4cd0268b53",
|
|
@@ -17,11 +17,11 @@
|
|
|
17
17
|
"notices/valuable-license.txt": "ed60d479b8fd1f64e9cbc3de449a16a53ac1b3d1b6aeb9bf9d190a8e93061b44",
|
|
18
18
|
"rust-toolchain.toml": "19da9ff32e229a69ff5dde28ac23233256ff25e413a8c579155cf641f4f0634f",
|
|
19
19
|
"rust/.cargo/config.toml": "eb6896791bd573f2cb099aa41c7d3668c6d368166945abd3553c8d8029ba8b7b",
|
|
20
|
-
"rust/Cargo.lock": "
|
|
21
|
-
"rust/Cargo.toml": "
|
|
20
|
+
"rust/Cargo.lock": "1684d251ee05413f0305152879a2a1d993dfb51682a8e393e24cc8cab25bac51",
|
|
21
|
+
"rust/Cargo.toml": "6bf9e1f26e6f137f1a6af8f624e320dcdc14aa07612758d1c095cf8b09bbabb0",
|
|
22
22
|
"rust/about.hbs": "a7c35d089563a08520a6e5f351aadae659e1f7bf24cabedbca3de8a89e966f86",
|
|
23
23
|
"rust/about.toml": "a457e0cc7532020c0f87532919a754997213ccbec6211c9501b8c198d404ed72",
|
|
24
|
-
"third-party-notices.md": "
|
|
24
|
+
"third-party-notices.md": "97f0781c96dd6628f6a3488f1f1e7706012d7c8a8deace551009d06fad8e16a1"
|
|
25
25
|
},
|
|
26
26
|
"supplementalCargoNotices": {
|
|
27
27
|
"aho-corasick@1.1.4": "notices/aho-corasick-license.txt",
|
|
@@ -664,6 +664,11 @@
|
|
|
664
664
|
"version": "0.9.12",
|
|
665
665
|
"license": "MIT OR Apache-2.0"
|
|
666
666
|
},
|
|
667
|
+
{
|
|
668
|
+
"name": "paste",
|
|
669
|
+
"version": "1.0.15",
|
|
670
|
+
"license": "MIT OR Apache-2.0"
|
|
671
|
+
},
|
|
667
672
|
{
|
|
668
673
|
"name": "pem",
|
|
669
674
|
"version": "3.0.6",
|
|
@@ -999,6 +1004,11 @@
|
|
|
999
1004
|
"version": "1.1.9",
|
|
1000
1005
|
"license": "MIT OR Apache-2.0"
|
|
1001
1006
|
},
|
|
1007
|
+
{
|
|
1008
|
+
"name": "tikv-jemalloc-ctl",
|
|
1009
|
+
"version": "0.7.0",
|
|
1010
|
+
"license": "MIT/Apache-2.0"
|
|
1011
|
+
},
|
|
1002
1012
|
{
|
|
1003
1013
|
"name": "tikv-jemalloc-sys",
|
|
1004
1014
|
"version": "0.7.1+5.3.1-0-g81034ce1f1373e37dc865038e1bc8eeecf559ce8",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartvpn",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.7.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A VPN solution with TypeScript control plane and Rust data plane daemon",
|
|
6
6
|
"type": "module",
|
|
@@ -23,16 +23,15 @@
|
|
|
23
23
|
],
|
|
24
24
|
"license": "MIT",
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@push.rocks/smartnftables": "^4.
|
|
26
|
+
"@push.rocks/smartnftables": "^4.8.0",
|
|
27
27
|
"@push.rocks/smartpath": "^6.0.0",
|
|
28
|
-
"@push.rocks/smartrust": "^2.
|
|
28
|
+
"@push.rocks/smartrust": "^2.6.0",
|
|
29
|
+
"@push.rocks/smartsea": "^1.0.1"
|
|
29
30
|
},
|
|
30
31
|
"devDependencies": {
|
|
31
|
-
"@git.zone/
|
|
32
|
-
"@git.zone/
|
|
33
|
-
"@
|
|
34
|
-
"@git.zone/tstest": "^7.2.1",
|
|
35
|
-
"@types/node": "^26.6.4"
|
|
32
|
+
"@git.zone/rsrepo": "^1.1.1",
|
|
33
|
+
"@git.zone/tsrepo": "^1.1.1",
|
|
34
|
+
"@types/node": "^26.6.5"
|
|
36
35
|
},
|
|
37
36
|
"files": [
|
|
38
37
|
"ts/**/*",
|
|
@@ -54,11 +53,11 @@
|
|
|
54
53
|
]
|
|
55
54
|
},
|
|
56
55
|
"scripts": {
|
|
57
|
-
"build": "(
|
|
58
|
-
"build:release": "(
|
|
59
|
-
"test:before": "(
|
|
60
|
-
"test": "
|
|
56
|
+
"build": "(tsrepo build tsfolders) && (rsrepo)",
|
|
57
|
+
"build:release": "(tsrepo build tsfolders) && (rsrepo --configured-targets) && (rsrepo verify)",
|
|
58
|
+
"test:before": "(rsrepo)",
|
|
59
|
+
"test": "tsrepo test test/ --verbose --logfile --timeout 90",
|
|
61
60
|
"test:rust": "cd rust && cargo test",
|
|
62
|
-
"buildDocs": "
|
|
61
|
+
"buildDocs": "tsrepo docs"
|
|
63
62
|
}
|
|
64
63
|
}
|
package/readme.md
CHANGED
|
@@ -130,7 +130,10 @@ A Linux stdio client accepts `networkNamespaceFd` in `IVpnClientOptions`. Pass a
|
|
|
130
130
|
already open network namespace descriptor; the caller retains ownership and keeps
|
|
131
131
|
it valid through each `start()`. The child validates its inherited duplicate,
|
|
132
132
|
enters the namespace before creating runtime threads or sockets, then closes the
|
|
133
|
-
duplicate.
|
|
133
|
+
duplicate. jemalloc's background purge threads start after entry too, so every
|
|
134
|
+
thread of the daemon runs in the namespace. A child that already runs another
|
|
135
|
+
thread at entry, for example under `_RJEM_MALLOC_CONF=background_thread:true`,
|
|
136
|
+
refuses to start. Invalid descriptors and failed entry cannot produce a ready client.
|
|
134
137
|
Stopping the client waits for process termination before the caller releases its
|
|
135
138
|
namespace owner. A running child remains in its namespace if the caller closes
|
|
136
139
|
the original descriptor, but a later start still requires a valid descriptor.
|
|
@@ -241,6 +244,19 @@ policy removal, conntrack drainage, delivery of previously queued network packet
|
|
|
241
244
|
or safe allocation reuse. IPv6, underlay, workload links, sysctls, global routes and
|
|
242
245
|
firewall policy remain the caller's responsibility.
|
|
243
246
|
|
|
247
|
+
Apart from the retirement on changed or restored kernel inventory above, SmartVPN
|
|
248
|
+
never deletes a device it made unless its owner releases it with `disconnect()` (or
|
|
249
|
+
`stop()`). A prepare accepted before the session stops, whether by transport loss,
|
|
250
|
+
the relay's `Disconnect`, `stopManagedForwarding` or lease expiry, still runs to its
|
|
251
|
+
own end, which its route and audit steps bound (3 seconds each). A TUN it made
|
|
252
|
+
stays, with the same interface index, in the stopped session's custody. Only then
|
|
253
|
+
does the prepare reject, with the stopped session's refusal `Stopped managed session
|
|
254
|
+
cannot restart`, and the `stopped` event follows.
|
|
255
|
+
`inspectManagedSession(generation)` reports phase `stopped` with that device as
|
|
256
|
+
`runtime`; it holds the split routes of the assignment it was prepared for
|
|
257
|
+
(`runtime.assignment`). A rejected prepare therefore does not prove that no device
|
|
258
|
+
exists: inspect, and lower a device that is still there, before disconnecting.
|
|
259
|
+
|
|
244
260
|
### Retained managed TUN runtime
|
|
245
261
|
|
|
246
262
|
An authenticated native managed connection with `forwardingMode: 'tun'` returns
|
|
@@ -1124,6 +1140,17 @@ directory's Rust builds, platform packages, or a daemon found on `PATH`.
|
|
|
1124
1140
|
Other platforms must provide that explicit executable. Socket transport connects
|
|
1125
1141
|
to an independently managed daemon and does not require a local binary.
|
|
1126
1142
|
|
|
1143
|
+
Inside a Node.js single executable application (SEA), a stdio bridge without a
|
|
1144
|
+
`binaryPath` and without `SMARTVPN_RUST_BINARY` names no executable:
|
|
1145
|
+
`@push.rocks/smartrust` runs the sidecar the executable embeds under the bridge's
|
|
1146
|
+
`binaryName` (`smartvpn_daemon` unless set), so a SEA build embeds the daemon
|
|
1147
|
+
under that name. A sidecar the executable cannot provide rejects `start()` with
|
|
1148
|
+
`RustBinaryLocatorError` code `ERR_RUST_BINARY_SEA_SIDECAR_UNAVAILABLE`. An
|
|
1149
|
+
explicit `binaryPath` or `SMARTVPN_RUST_BINARY` still selects that exact file.
|
|
1150
|
+
SmartVPN uses only `@push.rocks/smartnftables`' `SmartNftables` table API, which
|
|
1151
|
+
runs the host's `nft` command; it never starts the `smartnftables` sidecar, so a
|
|
1152
|
+
SEA build does not embed one.
|
|
1153
|
+
|
|
1127
1154
|
For an unprivileged build host, musl's upstream `musl-gcc` wrappers can provide
|
|
1128
1155
|
the C toolchains using existing native and cross GCC compilers. Build musl 1.2.5
|
|
1129
1156
|
in separate disposable prefixes for each architecture, with `--disable-shared`
|
|
@@ -1146,7 +1173,7 @@ pnpm test
|
|
|
1146
1173
|
cd rust && cargo test
|
|
1147
1174
|
|
|
1148
1175
|
# Run a specific TS test
|
|
1149
|
-
|
|
1176
|
+
pnpm exec tsrepo test test/test.flowcontrol.node.ts --verbose
|
|
1150
1177
|
```
|
|
1151
1178
|
|
|
1152
1179
|
### Project Structure
|
package/third-party-notices.md
CHANGED
|
@@ -6,7 +6,7 @@ SmartVPN's own code is MIT-licensed under [license.md](./license.md).
|
|
|
6
6
|
## Cargo dependencies
|
|
7
7
|
|
|
8
8
|
[Cargo dependency notices](./notices/cargo-dependencies.html) reproduce the selected
|
|
9
|
-
upstream license and copyright texts for
|
|
9
|
+
upstream license and copyright texts for 272 third-party packages. Eight additional
|
|
10
10
|
locked, feature-inactive packages are covered by these supplemental MIT notices:
|
|
11
11
|
|
|
12
12
|
- [aho-corasick 1.1.4](./notices/aho-corasick-license.txt), from the published crate's `LICENSE-MIT`.
|
|
@@ -22,7 +22,7 @@ locked, feature-inactive packages are covered by these supplemental MIT notices:
|
|
|
22
22
|
- [valuable 0.1.1](./notices/valuable-license.txt), from
|
|
23
23
|
[its pinned upstream LICENSE](https://github.com/tokio-rs/valuable/blob/9efc29b6e58cef28f6566a47aa7e142a55fead77/LICENSE).
|
|
24
24
|
|
|
25
|
-
Together these cover all
|
|
25
|
+
Together these cover all 280 locked external packages, conservatively including
|
|
26
26
|
build-only and target-inactive dependencies. Listing a package does not mean it
|
|
27
27
|
is linked into either Linux executable. MIT is preferred where offered as an
|
|
28
28
|
alternative; other selected terms include Apache-2.0, BSD, ISC, Unicode-3.0,
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -47,7 +47,7 @@ export class VpnBridge<TCommands extends TCommandMap> extends plugins.events.Eve
|
|
|
47
47
|
this.bridge = new plugins.smartrust.RustBridge<TCommands>({
|
|
48
48
|
binaryName,
|
|
49
49
|
binaryPath: options.transport.transport === 'stdio'
|
|
50
|
-
? options.transport.binaryPath ?? paths.
|
|
50
|
+
? options.transport.binaryPath ?? paths.getStdioBinaryPath(binaryName)
|
|
51
51
|
: undefined,
|
|
52
52
|
localPaths: [],
|
|
53
53
|
searchSystemPath: false,
|
package/ts/smartvpn.paths.ts
CHANGED
|
@@ -23,3 +23,16 @@ export function getBinaryPath(
|
|
|
23
23
|
const suffix = arch === 'x64' ? 'linux_amd64_musl' : 'linux_arm64_musl';
|
|
24
24
|
return plugins.path.join(packageDir, 'dist_rust', `${binaryName}_${suffix}`);
|
|
25
25
|
}
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* The executable a stdio VpnBridge hands smartrust when the caller names none: the
|
|
29
|
+
* SMARTVPN_RUST_BINARY override, else this package's artifact. Inside a Node.js single
|
|
30
|
+
* executable application without an override: none, so smartrust runs the sidecar the
|
|
31
|
+
* executable embeds under `binaryName`.
|
|
32
|
+
*/
|
|
33
|
+
export function getStdioBinaryPath(binaryName: string): string | undefined {
|
|
34
|
+
if (process.env.SMARTVPN_RUST_BINARY === undefined && plugins.smartsea.isSea()) {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
return getBinaryPath(binaryName);
|
|
38
|
+
}
|
package/ts/smartvpn.plugins.ts
CHANGED
|
@@ -11,5 +11,6 @@ export { path, fs, os, url, events };
|
|
|
11
11
|
import * as smartnftables from '@push.rocks/smartnftables';
|
|
12
12
|
import * as smartpath from '@push.rocks/smartpath';
|
|
13
13
|
import * as smartrust from '@push.rocks/smartrust';
|
|
14
|
+
import * as smartsea from '@push.rocks/smartsea';
|
|
14
15
|
|
|
15
|
-
export { smartnftables, smartpath, smartrust };
|
|
16
|
+
export { smartnftables, smartpath, smartrust, smartsea };
|