diff --git a/AGENTS.md b/AGENTS.md index 275f0f8..cbeaf92 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -15,9 +15,11 @@ | --- | --- | --- | | `agent/` | 远程设备守护程序 ads-agent,注册设备、连接手机 ADB、建立转发并重连;源码在 `src/` | Rust、TOML | | `client/` | 本地守护程序 ads-client,维护设备租约、监听本地端口并自动调用 adb connect;源码在 `src/` | Rust、TOML | -| `server/` | 公网中继 ads-server,负责认证、设备注册、独占租约、会话配对及数据转发 | Go | +| `server/` | ads-server 控制中心、旧协议兼容转发及独立 ads-relay 中继节点 | Go | +| `server/cmd/ads-relay/` | 独立中继入口,提供短期票据认证、WSS 数据配对及可选 STUN | Go | +| `server/internal/relay/` | 中继票据、数据通道、租约撤销、STUN 与测试 | Go | | `crates/` | Rust 工作区共享库容器 | Rust、TOML | -| `crates/ads-core/` | 共用网络与协议代码,包括 WSS、ADB smart socket 和流式转发;源码在 `src/` | Rust、TOML | +| `crates/ads-core/` | 共用网络与协议代码,包括 WSS、WebRTC P2P、节点回退、ADB smart socket 和流式转发;源码在 `src/` | Rust、TOML | | `desktop/` | 跨平台桌面客户端及其测试项目、.NET SDK 配置与使用说明 | C#、Avalonia XAML(AXAML)、JSON、Markdown | | `desktop/Ads.Desktop/` | Avalonia 桌面应用,管理配置、设备列表、连接、托盘及 scrcpy 子进程;`Assets/` 保存图标资源 | C#、AXAML、XML(csproj)、PNG | | `desktop/Ads.Desktop.Tests/` | 桌面客户端单元测试 | C#、XML(csproj) | diff --git a/Cargo.lock b/Cargo.lock index 2ce41f8..cdec041 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,6 +29,7 @@ name = "ads-core" version = "0.1.0" dependencies = [ "anyhow", + "bytes", "clap", "futures-util", "rustls", @@ -36,8 +37,45 @@ dependencies = [ "serde_json", "tokio", "tokio-tungstenite", + "tracing", "tracing-subscriber", "url", + "webrtc", +] + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", ] [[package]] @@ -105,6 +143,110 @@ version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" +[[package]] +name = "arc-swap" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b5d51209f6de83d37a0b33d320acb8da88823e42a94c075140708f032a5" +dependencies = [ + "rustversion", +] + +[[package]] +name = "asn1-rs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror 1.0.69", + "time", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", + "synstructure 0.13.2", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "async-trait" +version = "0.1.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.10", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + [[package]] name = "bitflags" version = "2.13.2" @@ -120,12 +262,42 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "bytes" version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + [[package]] name = "cc" version = "1.11.1" @@ -136,12 +308,59 @@ dependencies = [ "shlex", ] +[[package]] +name = "ccm" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae3c82e4355234767756212c570e29833699ab63e6ffd161887314cc5b43847" +dependencies = [ + "aead", + "cipher", + "ctr", + "subtle", +] + [[package]] name = "cfg-if" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + [[package]] name = "clap" version = "4.6.7" @@ -188,6 +407,12 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "cpufeatures" version = "0.2.17" @@ -197,6 +422,33 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.7" @@ -204,15 +456,82 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", + "rand_core 0.6.4", "typenum", ] +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "fiat-crypto", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "data-encoding" version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4583a4551df46e2792f82ceeac45e850d2e2d5debba0b91f102385cda5b11f06" +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "deranged" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e" + [[package]] name = "digest" version = "0.10.7" @@ -220,7 +539,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", + "subtle", ] [[package]] @@ -234,6 +555,77 @@ dependencies = [ "syn 3.0.10", ] +[[package]] +name = "dtls" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f531dd7c181beaf3cebab3716afa4d0d41ab888be85232583f56bbaf07ca208a" +dependencies = [ + "aes", + "aes-gcm", + "async-trait", + "bincode", + "byteorder", + "cbc", + "ccm", + "chacha20poly1305", + "der-parser", + "hmac", + "log", + "p256", + "p384", + "portable-atomic", + "rand", + "rand_core 0.6.4", + "rcgen", + "ring", + "rustls", + "sec1", + "serde", + "sha1", + "sha2", + "thiserror 1.0.69", + "tokio", + "webrtc-util", + "x25519-dalek", + "x509-parser", +] + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "errno" version = "0.3.14" @@ -244,6 +636,22 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "ff" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + [[package]] name = "find-msvc-tools" version = "0.1.15" @@ -259,12 +667,54 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "futures" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" +dependencies = [ + "futures-core", + "futures-sink", +] + [[package]] name = "futures-core" version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" +[[package]] +name = "futures-executor" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" + [[package]] name = "futures-macro" version = "0.3.34" @@ -294,10 +744,13 @@ version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ + "futures-channel", "futures-core", + "futures-io", "futures-macro", "futures-sink", "futures-task", + "memchr", "pin-project-lite", "slab", ] @@ -310,6 +763,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -331,16 +785,72 @@ checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 5.3.0", "wasip2", ] +[[package]] +name = "getrandom" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", +] + +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "heck" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + [[package]] name = "http" version = "1.5.0" @@ -461,6 +971,43 @@ dependencies = [ "icu_properties", ] +[[package]] +name = "inout" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "interceptor" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea51375727680dc15f06e8ad90fa31df75d79dd030100e8ad60eef1c27fe2c98" +dependencies = [ + "async-trait", + "bytes", + "futures", + "log", + "portable-atomic", + "rand", + "rtcp", + "rtp", + "thiserror 1.0.69", + "tokio", + "waitgroup", + "webrtc-srtp", + "webrtc-util", +] + +[[package]] +name = "ipnet" +version = "2.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" + [[package]] name = "is_terminal_polyfill" version = "1.70.2" @@ -473,6 +1020,17 @@ version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" +[[package]] +name = "js-sys" +version = "0.3.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dc09d2154098bbf4ef54eab6b117a3c24cbbffe94046b16ee6d6d4510584d3a" +dependencies = [ + "cfg-if", + "futures-util", + "wasm-bindgen", +] + [[package]] name = "lazy_static" version = "1.5.1" @@ -515,12 +1073,37 @@ dependencies = [ "regex-automata", ] +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + [[package]] name = "memchr" version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "mio" version = "1.2.4" @@ -532,6 +1115,29 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset", + "pin-utils", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "nu-ansi-term" version = "0.50.3" @@ -541,6 +1147,49 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "num-bigint" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" + +[[package]] +name = "num-integer" +version = "0.1.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "oid-registry" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" +dependencies = [ + "asn1-rs", +] + [[package]] name = "once_cell" version = "1.21.4" @@ -553,6 +1202,36 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + [[package]] name = "parking_lot" version = "0.12.5" @@ -576,6 +1255,25 @@ dependencies = [ "windows-link", ] +[[package]] +name = "pem" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" +dependencies = [ + "base64", + "serde_core", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.2" @@ -588,6 +1286,51 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" +[[package]] +name = "pin-utils" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13bee6c73da26345c729282832b60b0363cf3dd9f4bfd81d8551b7a1c889a113" + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "portable-atomic" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" + [[package]] name = "potential_utf" version = "0.1.6" @@ -597,6 +1340,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "powerfmt" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958" + [[package]] name = "ppv-lite86" version = "0.2.21" @@ -606,6 +1355,15 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + [[package]] name = "proc-macro2" version = "1.0.107" @@ -630,6 +1388,12 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "rand" version = "0.9.5" @@ -637,7 +1401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" dependencies = [ "rand_chacha", - "rand_core", + "rand_core 0.9.5", ] [[package]] @@ -647,7 +1411,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.9.5", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.17", ] [[package]] @@ -659,13 +1432,39 @@ dependencies = [ "getrandom 0.3.4", ] +[[package]] +name = "rcgen" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2" +dependencies = [ + "pem", + "ring", + "rustls-pki-types", + "time", + "x509-parser", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags", + "bitflags 2.13.2", +] + +[[package]] +name = "regex" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] @@ -685,6 +1484,16 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + [[package]] name = "ring" version = "0.17.14" @@ -699,6 +1508,50 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rtcp" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81d30d1c4091644431c22acf9f8be6191b56805e0e977f15ca7104b4a6d6eaec" +dependencies = [ + "bytes", + "thiserror 1.0.69", + "webrtc-util", +] + +[[package]] +name = "rtp" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f126f38ea84c02480e32e547c1459a939052f74fb92117ac3eef23fdac6b023" +dependencies = [ + "bytes", + "memchr", + "portable-atomic", + "rand", + "serde", + "thiserror 1.0.69", + "webrtc-util", +] + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + [[package]] name = "rustls" version = "0.23.46" @@ -733,12 +1586,50 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustversion" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" + [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sdp" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32c374dceda16965d541c8800ce9cc4e1c14acfd661ddf7952feeedc3411e5c6" +dependencies = [ + "rand", + "substring", + "thiserror 1.0.69", + "url", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "semver" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" + [[package]] name = "serde" version = "1.0.229" @@ -793,6 +1684,17 @@ dependencies = [ "digest", ] +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -818,6 +1720,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + [[package]] name = "slab" version = "0.4.12" @@ -830,6 +1742,25 @@ version = "1.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "149309498a5f7334b12ddae0cad8aba81ce785fe91755068867e017cf98fee46" +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "socket2" version = "0.6.5" @@ -840,6 +1771,16 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -852,6 +1793,34 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "stun" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a512c5d501e3e3b5a4bb3e8e31462d56d54a66b95a28b8596e14422bf21c32b" +dependencies = [ + "base64", + "crc", + "lazy_static", + "md-5", + "rand", + "ring", + "subtle", + "thiserror 1.0.69", + "tokio", + "url", + "webrtc-util", +] + +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", +] + [[package]] name = "subtle" version = "2.6.1" @@ -880,6 +1849,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "synstructure" version = "0.14.0" @@ -891,13 +1871,33 @@ dependencies = [ "syn 3.0.10", ] +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + [[package]] name = "thiserror" version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.21", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", ] [[package]] @@ -920,6 +1920,36 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "time" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde_core", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" + +[[package]] +name = "time-macros" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85" +dependencies = [ + "num-conv", + "time-core", +] + [[package]] name = "tinystr" version = "0.8.5" @@ -942,7 +1972,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.6.5", "tokio-macros", "windows-sys 0.61.2", ] @@ -984,6 +2014,19 @@ dependencies = [ "webpki-roots 0.26.11", ] +[[package]] +name = "tokio-util" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e464cf451ba96ebfc6f9b6542f17ee8b8956e33f1e40d9690624e59d7a7f8a4b" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "tracing" version = "0.1.44" @@ -1060,22 +2103,59 @@ dependencies = [ "rustls", "rustls-pki-types", "sha1", - "thiserror", + "thiserror 2.0.21", "utf-8", ] +[[package]] +name = "turn" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ed995882f66ab94238de77c62e5e778389698ab700afa4696f4754da8f457cb" +dependencies = [ + "async-trait", + "base64", + "futures", + "log", + "md-5", + "portable-atomic", + "rand", + "ring", + "stun", + "thiserror 1.0.69", + "tokio", + "tokio-util", + "webrtc-util", +] + [[package]] name = "typenum" version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" +[[package]] +name = "unicase" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357cc3acc6a036009fd6c973ed009037c732d60d0b4f6c673e9041497482a28f" + [[package]] name = "unicode-ident" version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563" +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + [[package]] name = "untrusted" version = "0.9.0" @@ -1121,6 +2201,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a3b425286980a367278453f3b6d28cdcb134b574e5a35824a6ff5eebad50bb6" +[[package]] +name = "uuid" +version = "1.29.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bed99139f7dac9b5cfe5f17be4d66dc7079a34dee1d74bcc77217119240e267c" +dependencies = [ + "getrandom 0.4.3", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "valuable" version = "0.1.1" @@ -1133,6 +2224,15 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + [[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" @@ -1148,6 +2248,50 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "wasm-bindgen" +version = "0.2.130" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0181c14ddd6c7b8b0b0132a5f1ea2f32be0d893cd3ea97b6e3b28886b8a3d1c" +dependencies = [ + "cfg-if", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.130" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e931a02a39abdbf66966fc35902b5ed58344750a70885bed4ebb3d8eaf28ed9" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.130" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ca4b54280e455bd831e33a6b8e734baf432fe63fbc35c42ac14ce67a043a53a" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn 3.0.10", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.130" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b1f9c3798725016c6ee5f2f57869ec0831e8bbc0ab0310a86e787e97f41389e" +dependencies = [ + "unicode-ident", +] + [[package]] name = "webpki-roots" version = "0.26.11" @@ -1166,6 +2310,197 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "webrtc" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08fd686c0920ac08f3a57eacc48e31f0e4ca1ffefba4478784606f78c14e83ad" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "dtls", + "hex", + "interceptor", + "lazy_static", + "log", + "portable-atomic", + "rand", + "rcgen", + "regex", + "ring", + "rtcp", + "rtp", + "sdp", + "serde", + "serde_json", + "sha2", + "smol_str", + "stun", + "thiserror 1.0.69", + "tokio", + "turn", + "unicase", + "url", + "waitgroup", + "webrtc-data", + "webrtc-ice", + "webrtc-mdns", + "webrtc-media", + "webrtc-sctp", + "webrtc-srtp", + "webrtc-util", +] + +[[package]] +name = "webrtc-data" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "062a5438d63bb0756a221693d76cc0dd6119affee1dfdfe57abe3a2a8c8b3eea" +dependencies = [ + "bytes", + "log", + "portable-atomic", + "thiserror 1.0.69", + "tokio", + "webrtc-sctp", + "webrtc-util", +] + +[[package]] +name = "webrtc-ice" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cb13fd1a373e68addc4bba0c8ca058627518e54342583d024bdcbb8ae5d97d" +dependencies = [ + "arc-swap", + "async-trait", + "crc", + "log", + "portable-atomic", + "rand", + "serde", + "serde_json", + "stun", + "thiserror 1.0.69", + "tokio", + "turn", + "url", + "uuid", + "waitgroup", + "webrtc-mdns", + "webrtc-util", +] + +[[package]] +name = "webrtc-mdns" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17279a067e75df72ce923fdeb7f04cd808f6f5aa4910dc6bcb4fbe66b396ace" +dependencies = [ + "log", + "socket2 0.5.10", + "thiserror 1.0.69", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-media" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94a84c910fec0848fd5a0d8a5651e0ddbdedaf25a7d3ae3f0b15f71ac73a1773" +dependencies = [ + "byteorder", + "bytes", + "rand", + "rtp", + "thiserror 1.0.69", +] + +[[package]] +name = "webrtc-sctp" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f985465467d8910c1f8ac4382cd64f83b1f6a1a75021a82b221546f6fb3b856f" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "crc", + "log", + "portable-atomic", + "rand", + "thiserror 1.0.69", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-srtp" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d8cdc33413f1d0192670a80ce93d17cb78d57fe3a2414be30d6f6dff121123" +dependencies = [ + "aead", + "aes", + "aes-gcm", + "byteorder", + "bytes", + "ctr", + "hmac", + "log", + "rtcp", + "rtp", + "sha1", + "subtle", + "thiserror 1.0.69", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-util" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1c0c7e0c8f280f2bbfae442701465777ac07adaf46ce0c5863cd58e13fe472a" +dependencies = [ + "async-trait", + "bitflags 1.3.2", + "bytes", + "ipnet", + "lazy_static", + "log", + "nix", + "portable-atomic", + "rand", + "thiserror 1.0.69", + "tokio", + "winapi", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-link" version = "0.2.1" @@ -1266,6 +2601,45 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" +[[package]] +name = "x25519-dalek" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" +dependencies = [ + "curve25519-dalek", + "rand_core 0.6.4", + "serde", + "zeroize", +] + +[[package]] +name = "x509-parser" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +dependencies = [ + "asn1-rs", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "ring", + "rusticata-macros", + "thiserror 1.0.69", + "time", +] + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time", +] + [[package]] name = "yoke" version = "0.8.4" @@ -1286,7 +2660,7 @@ dependencies = [ "proc-macro2", "quote", "syn 3.0.10", - "synstructure", + "synstructure 0.14.0", ] [[package]] @@ -1327,7 +2701,7 @@ dependencies = [ "proc-macro2", "quote", "syn 3.0.10", - "synstructure", + "synstructure 0.14.0", ] [[package]] @@ -1335,6 +2709,20 @@ name = "zeroize" version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] [[package]] name = "zerotrie" diff --git a/README.md b/README.md index 642ab5f..60c4a90 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,17 @@ # Android Device Streaming -公网中继 + 远程设备守护程序 + 本地连接守护程序。两端主动出站连接服务器,无需 VPN 或路由器端口映射。连接后,普通本地 `adb devices` 可以显示远程手机,Android Studio / scrcpy 使用本地 ADB 的正常设备通道。 +一个控制中心 + 多个中继节点 + P2P 优先。两端连接控制中心取得设备租约、交换信令,优先通过 WebRTC DataChannel 直连;直连失败时自动选择独立 WSS 中继。普通本地 `adb devices` 显示本地映射地址,Android Studio / scrcpy 使用同一通道。 ```text -本地 ADB → 127.0.0.1:15555 → ads-client (Rust) - │ WSS - ads-server (Go) - │ WSS - ads-agent (Rust) → 手机 adbd TCP:5555 + ads-server 控制中心(注册、租约、信令、节点健康) + ↙ WSS WSS ↘ +本地 ADB → ads-client ═══════ WebRTC P2P ═══════ ads-agent → 手机 adbd + ╲ 失败则 WSS 中继 ╱ + relay-1 / relay-2 / … ``` +已部署的集群和使用方法见 [集群部署与协议](docs/cluster.md)。不配置集群时保留原有 v1 单中继模式,供兼容旧客户端;以下原有单机启动命令也仍可使用。 + ## 目录说明 下表覆盖项目根目录及主要自有子项目;第三方源码的内部目录由其自身文档说明。语言列为主要语言或文件格式,产物目录不视为源码模块。 @@ -18,9 +20,11 @@ | --- | --- | --- | | `agent/` | 远程设备守护程序 ads-agent,注册设备、连接手机 ADB、建立转发并重连;源码在 `src/` | Rust、TOML | | `client/` | 本地守护程序 ads-client,维护设备租约、监听本地端口并自动调用 adb connect;源码在 `src/` | Rust、TOML | -| `server/` | 公网中继 ads-server,负责认证、设备注册、独占租约、会话配对及数据转发 | Go | +| `server/` | ads-server 控制中心、旧协议兼容转发及独立 ads-relay 中继节点 | Go | +| `server/cmd/ads-relay/` | 独立中继入口,提供短期票据认证、WSS 数据配对及可选 STUN | Go | +| `server/internal/relay/` | 中继票据、数据通道、租约撤销、STUN 与测试 | Go | | `crates/` | Rust 工作区共享库容器 | Rust、TOML | -| `crates/ads-core/` | 共用网络与协议代码,包括 WSS、ADB smart socket 和流式转发;源码在 `src/` | Rust、TOML | +| `crates/ads-core/` | 共用网络与协议代码,包括 WSS、WebRTC P2P、节点回退、ADB smart socket 和流式转发;源码在 `src/` | Rust、TOML | | `desktop/` | 跨平台桌面客户端及其测试项目、.NET SDK 配置与使用说明 | C#、Avalonia XAML(AXAML)、JSON、Markdown | | `desktop/Ads.Desktop/` | Avalonia 桌面应用,管理配置、设备列表、连接、托盘及 scrcpy 子进程;`Assets/` 保存图标资源 | C#、AXAML、XML(csproj)、PNG | | `desktop/Ads.Desktop.Tests/` | 桌面客户端单元测试 | C#、XML(csproj) | @@ -48,13 +52,13 @@ | 目录 | 输出 | 职责 | |---|---|---| -| `server/` | `ads-server` | 角色认证、网关注册、设备独占、会话配对、二进制转发 | +| `server/` | `ads-server` / `ads-relay` | 控制中心:认证、注册、设备独占、信令、健康检查;独立中继:数据转发 | | `agent/` | `ads-agent` | 远程电脑后台进程,主动注册设备、接通手机、断线重连 | | `client/` | `ads-client` | 本地后台进程,保持设备租约,提供本地端口,自动调用 `adb connect` | | `crates/ads-core/` | 共用 Rust 库 | WSS、协议、ADB smart socket、流式转发 | | `deploy/` | 部署示例 | Caddy、systemd、launchd 示例 | -三个程序均为独立可执行文件。没有 UI,不依赖 Python 运行正式程序。两端守护程序当前作为前台长运行进程,启动安装交给各平台进程管理器;尚未实现原生 Windows Service 安装器。 +四个后端程序均为独立可执行文件;另有 Avalonia 桌面工作台,不依赖 Python 运行正式程序。两端守护程序当前作为前台长运行进程,启动安装交给各平台进程管理器;尚未实现原生 Windows Service 安装器。 ## 编译 @@ -73,7 +77,7 @@ Linux / macOS: sh scripts/build.sh ``` -产物在 `bin/`,Windows 是三个 `.exe`。Go 服务器和 Rust 核心使用跨平台 API;当前实际编译和集成测试平台为 Windows x64,Linux/macOS 仍需在对应平台验证构建、进程托管和 ADB 权限。 +产物在 `bin/`,Windows 是四个后端 `.exe`。Go 服务器和 Rust 核心使用跨平台 API;Rust 两端和桌面在 Windows x64 验证,Go 控制中心与中继已部署到 Linux amd64;其余平台仍需验证构建、进程托管和 ADB 权限。 ## 1. 公网服务器 diff --git a/agent/README.md b/agent/README.md index 4638ed5..7f3fbeb 100644 --- a/agent/README.md +++ b/agent/README.md @@ -12,3 +12,5 @@ $env:ADS_AGENT_TOKEN = '<设备端令牌>' 也可用 `--adb-server 127.0.0.1:5037 --adb-serial <序列号>` 替代 `--target`。该模式仍要求手机开启 TCP adbd(默认 5555,可用 `--device-port` 修改),不是通用的 USB-only 接入。 Windows 可由任务计划程序在登录后启动;Linux/macOS 可使用 `deploy/` 示例托管。当前二进制不是原生 Windows Service,不能直接用 `sc.exe create` 安装。 + +新版注册时协商 v2,按控制中心指令与本地客户端交换 WebRTC SDP,优先直连或连接独立中继;兼容控制中心下发的 v1 转发指令。无需增加手机或远程电脑的公网入站端口。控制连接丢失时会结束所属数据通道。 diff --git a/agent/src/main.rs b/agent/src/main.rs index 215f73e..8e803b1 100644 --- a/agent/src/main.rs +++ b/agent/src/main.rs @@ -51,8 +51,18 @@ async fn upstream(args: &Args) -> Result { } } -async fn serve_session(args: Arc, session: String) -> Result<()> { +async fn serve_session(args: Arc, session: String, signal_key: Option) -> Result<()> { let tcp = upstream(&args).await.context("cannot reach phone adbd")?; + if let Some(key) = signal_key { + let signal = dial( + args.network + .url("/v2/signal", &[("session", &session), ("key", &key)])?, + &args.token, + args.network.connect_address.as_deref(), + ) + .await?; + return ads_core::transport::agent_session(tcp, signal, &args.network).await; + } let ws = dial( args.network.url( "/v1/data", @@ -67,7 +77,8 @@ async fn serve_session(args: Arc, session: String) -> Result<()> { async fn online(args: Arc) -> Result<()> { let mut ws = dial( - args.network.url("/v1/agent", &[("device", &args.device)])?, + args.network + .url("/v1/agent", &[("device", &args.device), ("v", "2")])?, &args.token, args.network.connect_address.as_deref(), ) @@ -82,12 +93,13 @@ async fn online(args: Arc) -> Result<()> { tokio::select! { message = next_control(&mut ws) => { let message = message?; - if message.kind != "open" { bail!("unexpected gateway control message"); } + if message.kind != "open" && message.kind != "open_v2" { bail!("unexpected gateway control message"); } + let signal_key = if message.kind == "open_v2" { Some(message.signal_key.context("missing signal key")?) } else { None }; let session = message.session.context("missing session ticket")?; if tasks.len() >= 32 { warn!("gateway stream limit reached"); continue; } let args = args.clone(); tasks.spawn(async move { - if let Err(error) = serve_session(args, session).await { warn!(%error, "device stream ended"); } + if let Err(error) = serve_session(args, session, signal_key).await { warn!(%error, "device stream ended"); } }); }, _ = tasks.join_next(), if !tasks.is_empty() => {}, diff --git a/client/README.md b/client/README.md index 84e5d14..a7048c5 100644 --- a/client/README.md +++ b/client/README.md @@ -15,3 +15,10 @@ $env:ADS_CLIENT_TOKEN = '<本地端令牌>' - Ctrl+C 释放租约,并在启用自动连接时执行该端点的 `adb disconnect`。 使用本地 ADB 的正常通道,可配合 Android Studio 和 `scrcpy -s 127.0.0.1:15555`。不要将 `ADB_SERVER_SOCKET` 指向远程服务,否则其他终端可能查询到另一台 ADB Server。 + +- `--transport auto`(默认):WebRTC P2P 优先,超时后按控制中心节点顺序回退。 +- `--transport relay`:跳过 P2P,仍自动选择健康中继并在建立失败时尝试下一节点。 +- `--p2p-public-only`:诊断选项,只交换 STUN 公网候选地址,用于排除 LAN/VPN 直连。 +- `--status-file `:输出当前 p2p/relay/mixed/negotiating/idle、通道数和节点 ID,供桌面展示。 + +节点断线会中断现有 TCP 流;本地 ADB 在重试后创建新通道,重新选择路线,不支持将原 TCP 流无缝迁移。旧中心或旧 agent 会协商回 v1 模式。 diff --git a/client/src/main.rs b/client/src/main.rs index a2eedf1..6a9e531 100644 --- a/client/src/main.rs +++ b/client/src/main.rs @@ -33,11 +33,27 @@ struct Args { /// Do not periodically invoke local adb connect (useful for manual control/tests) #[arg(long)] no_auto_connect: bool, + /// Prefer direct WebRTC or force WSS relay nodes + #[arg(long, default_value = "auto", value_parser = ["auto", "relay"])] + transport: String, + /// Exclude LAN/VPN host candidates (diagnostic WAN test) + #[arg(long)] + p2p_public_only: bool, + /// Machine-readable active transport state for desktop clients + #[arg(long)] + status_file: Option, } -async fn lease_once(args: &Args, state: &watch::Sender>) -> Result<()> { +#[derive(Clone)] +struct LeaseState { + id: String, + protocol: u8, +} + +async fn lease_once(args: &Args, state: &watch::Sender>) -> Result<()> { let mut ws = dial( - args.network.url("/v1/lease", &[("device", &args.device)])?, + args.network + .url("/v1/lease", &[("device", &args.device), ("v", "2")])?, &args.token, args.network.connect_address.as_deref(), ) @@ -47,14 +63,17 @@ async fn lease_once(args: &Args, state: &watch::Sender>) -> Resul bail!("expected leased response"); } let id = response.lease.context("missing lease ticket")?; - state.send_replace(Some(id)); + state.send_replace(Some(LeaseState { + id, + protocol: response.protocol, + })); info!(device = %args.device, endpoint = %args.listen, "device leased; local tunnel ready"); loop { next_control(&mut ws).await?; } } -async fn maintain_lease(args: Arc, state: watch::Sender>) { +async fn maintain_lease(args: Arc, state: watch::Sender>) { let mut delay = 1; loop { let started = std::time::Instant::now(); @@ -96,7 +115,7 @@ async fn adb_command(args: &Args, action: &str) -> Result<()> { Ok(()) } -async fn maintain_adb(args: Arc, state: watch::Receiver>) { +async fn maintain_adb(args: Arc, state: watch::Receiver>) { loop { if state.borrow().is_some() { if let Err(error) = adb_command(&args, "connect").await { @@ -110,8 +129,9 @@ async fn maintain_adb(args: Arc, state: watch::Receiver>) { async fn accept_connections( args: Arc, listener: TcpListener, - state: watch::Receiver>, + state: watch::Receiver>, ) -> Result<()> { + let status = ads_core::transport::TransportStatus::new(args.status_file.clone()); let mut tasks = JoinSet::new(); loop { tokio::select! { @@ -121,11 +141,16 @@ async fn accept_connections( let Some(lease) = lease else { drop(tcp); continue; }; if tasks.len() >= 32 { drop(tcp); warn!("local stream limit reached"); continue; } let args = args.clone(); + let status = status.stream(); tasks.spawn(async move { let result = async { - let url = args.network.url("/v1/connect", &[("device", &args.device), ("lease", &lease)])?; + let path = if lease.protocol >= 2 { "/v2/connect" } else { "/v1/connect" }; + let public_only = if args.p2p_public_only { "1" } else { "0" }; + let url = args.network.url(path, &[("device", &args.device), ("lease", &lease.id), ("public_only", public_only)])?; let ws = dial(url, &args.token, args.network.connect_address.as_deref()).await?; - relay(tcp, ws).await + if lease.protocol >= 2 { + ads_core::transport::client_session(tcp, ws, &args.network, &args.transport, &status).await + } else { status.set("compat", "controller-v1"); relay(tcp, ws).await } }.await; if let Err(error) = result { warn!(%error, "local device stream ended"); } }); diff --git a/crates/ads-core/Cargo.toml b/crates/ads-core/Cargo.toml index a2bf52c..b6bd8ab 100644 --- a/crates/ads-core/Cargo.toml +++ b/crates/ads-core/Cargo.toml @@ -15,3 +15,6 @@ tokio-tungstenite.workspace = true tracing-subscriber.workspace = true url.workspace = true rustls = { version = "0.23", default-features = false, features = ["ring", "std", "tls12"] } +webrtc = "0.14" +bytes = "1" +tracing.workspace = true diff --git a/crates/ads-core/README.md b/crates/ads-core/README.md new file mode 100644 index 0000000..14946f7 --- /dev/null +++ b/crates/ads-core/README.md @@ -0,0 +1,5 @@ +# ads-core + +Rust 共享库,源码位于 `src/`(Rust)。`lib.rs` 提供 WSS/TLS、控制消息、ADB smart socket 和旧协议流式转发;`transport.rs` 提供 WebRTC DataChannel、SDP 信令、独立中继回退与桌面使用的状态文件。 + +数据通道可靠、有序、二进制,单块 16 KiB,接收队列和发送积压有界。WSS 保持正常域名证书验证;指定 origin 地址只覆盖 TCP 连接目标。节点短期票据只在内存与 Authorization 中使用,状态文件不含票据、密钥或 SDP。 diff --git a/crates/ads-core/src/lib.rs b/crates/ads-core/src/lib.rs index 00fd5cc..4c35f75 100644 --- a/crates/ads-core/src/lib.rs +++ b/crates/ads-core/src/lib.rs @@ -14,6 +14,7 @@ use tokio_tungstenite::{ MaybeTlsStream, WebSocketStream, }; use url::Url; +pub mod transport; pub type Ws = WebSocketStream>; pub const CONNECT_TIMEOUT: Duration = Duration::from_secs(10); @@ -112,7 +113,7 @@ pub async fn dial(url: Url, token: &str, connect_address: Option<&str>) -> Resul } } -#[derive(Debug, Deserialize, Serialize)] +#[derive(Clone, Deserialize, Serialize)] pub struct Control { #[serde(rename = "type")] pub kind: String, @@ -122,13 +123,29 @@ pub struct Control { pub lease: Option, #[serde(default, skip_serializing_if = "Option::is_none")] pub session: Option, + #[serde(default)] + pub protocol: u8, + #[serde(default)] + pub signal_key: Option, + #[serde(default)] + pub ice_servers: Vec, + #[serde(default)] + pub p2p_timeout_ms: u64, + #[serde(default)] + pub public_only: bool, + #[serde(default)] + pub routes: Vec, + #[serde(default)] + pub sdp: Option, + #[serde(default)] + pub node: Option, } pub async fn next_control(ws: &mut Ws) -> Result { loop { match ws.next().await.context("control connection closed")?? { Message::Text(text) => { - if text.len() > 16 * 1024 { + if text.len() > 128 * 1024 { bail!("control message too large"); } return Ok(serde_json::from_str(&text)?); diff --git a/crates/ads-core/src/transport.rs b/crates/ads-core/src/transport.rs new file mode 100644 index 0000000..9822522 --- /dev/null +++ b/crates/ads-core/src/transport.rs @@ -0,0 +1,582 @@ +//! v2 signaling, P2P-first data transport and ordered relay fallback. +use crate::{dial, next_control, relay, Control, NetworkArgs, Ws, IO_TIMEOUT}; +use anyhow::{bail, Context, Result}; +use bytes::Bytes; +use futures_util::SinkExt; +use serde::{Deserialize, Serialize}; +use std::{ + collections::BTreeMap, + path::PathBuf, + sync::{ + atomic::{AtomicU64, Ordering}, + Arc, Mutex, + }, + time::Duration, +}; +use tokio::{ + io::{AsyncReadExt, AsyncWriteExt}, + net::TcpStream, + sync::{mpsc, watch, Notify}, + time::{interval, timeout}, +}; +use tokio_tungstenite::tungstenite::Message; +use webrtc::{ + api::APIBuilder, + data_channel::{data_channel_message::DataChannelMessage, RTCDataChannel}, + ice_transport::ice_server::RTCIceServer, + peer_connection::{ + configuration::RTCConfiguration, sdp::session_description::RTCSessionDescription, + RTCPeerConnection, + }, +}; + +#[derive(Clone, Deserialize, Serialize)] +pub struct Route { + pub id: String, + pub url: String, + #[serde(default)] + pub connect_address: Option, + pub ticket: String, +} +impl std::fmt::Debug for Route { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("Route") + .field("id", &self.id) + .field("url", &self.url) + .finish_non_exhaustive() + } +} + +pub async fn send(ws: &mut Ws, value: serde_json::Value) -> Result<()> { + timeout( + IO_TIMEOUT, + ws.send(Message::Text(serde_json::to_string(&value)?.into())), + ) + .await??; + Ok(()) +} + +async fn monitor_signal(mut ws: Ws) -> Result<()> { + let mut heartbeat = interval(Duration::from_secs(20)); + loop { + tokio::select! { + result=next_control(&mut ws)=>{result?;}, + _=heartbeat.tick()=>{timeout(IO_TIMEOUT,ws.send(Message::Ping(Bytes::new()))).await??;} + } + } +} + +struct Channel { + dc: Arc, + incoming: mpsc::Receiver, + opened: watch::Receiver, + closed: watch::Receiver, + writable: Arc, +} + +async fn channel(dc: Arc) -> Channel { + let (tx, rx) = mpsc::channel(64); + let (opened_tx, opened) = watch::channel(false); + let (closed_tx, closed) = watch::channel(false); + dc.on_open(Box::new(move || { + let tx = opened_tx.clone(); + Box::pin(async move { + let _ = tx.send(true); + }) + })); + let close = closed_tx.clone(); + dc.on_close(Box::new(move || { + let tx = close.clone(); + Box::pin(async move { + let _ = tx.send(true); + }) + })); + let close = closed_tx.clone(); + dc.on_error(Box::new(move |_| { + let tx = close.clone(); + Box::pin(async move { + let _ = tx.send(true); + }) + })); + dc.on_message(Box::new(move |message: DataChannelMessage| { + let tx = tx.clone(); + let closed = closed_tx.clone(); + Box::pin(async move { + if message.is_string || message.data.len() > 16384 { + let _ = closed.send(true); + return; + } + if tx.send(message.data).await.is_err() { + let _ = closed.send(true); + } + }) + })); + let writable = Arc::new(Notify::new()); + let notify = writable.clone(); + dc.set_buffered_amount_low_threshold(256 * 1024).await; + dc.on_buffered_amount_low(Box::new(move || { + let notify = notify.clone(); + Box::pin(async move { + notify.notify_one(); + }) + })) + .await; + Channel { + dc, + incoming: rx, + opened, + closed, + writable, + } +} + +impl Channel { + async fn ready(&mut self) -> Result<()> { + loop { + if *self.opened.borrow() { + return Ok(()); + } + if *self.closed.borrow() { + bail!("P2P data channel closed before opening") + } + tokio::select! { + result=self.opened.changed()=>{result.context("P2P open event closed")?;}, + result=self.closed.changed()=>{result.context("P2P close event closed")?;} + } + } + } + + async fn run(mut self, tcp: TcpStream) -> Result<()> { + tcp.set_nodelay(true)?; + let (mut read, mut write) = tcp.into_split(); + let dc = self.dc.clone(); + let writable = self.writable.clone(); + let outbound = async { + let mut buffer = vec![0; 16384]; + loop { + let size = read.read(&mut buffer).await?; + if size == 0 { + return Ok::<(), anyhow::Error>(()); + } + while dc.buffered_amount().await > 1024 * 1024 { + timeout(IO_TIMEOUT, writable.notified()) + .await + .context("P2P send backpressure timed out")?; + } + let sent = timeout( + IO_TIMEOUT, + dc.send(&Bytes::copy_from_slice(&buffer[..size])), + ) + .await??; + if sent != size { + bail!("incomplete P2P message write") + } + } + }; + let inbound = async { + while let Some(data) = self.incoming.recv().await { + timeout(IO_TIMEOUT, write.write_all(&data)).await??; + } + Ok::<(), anyhow::Error>(()) + }; + tokio::select! {result=outbound=>result,result=inbound=>result,_=self.closed.changed()=>Ok(())} + } +} + +struct Peer { + pc: Arc, + channels: mpsc::Receiver, + public_only: bool, +} +impl Drop for Peer { + fn drop(&mut self) { + let pc = self.pc.clone(); + tokio::spawn(async move { + let _ = pc.close().await; + }); + } +} +impl Peer { + async fn new(offerer: bool, manifest: &Control) -> Result { + let api = APIBuilder::new().build(); + let ice_servers = manifest + .ice_servers + .iter() + .map(|url| RTCIceServer { + urls: vec![url.clone()], + ..Default::default() + }) + .collect(); + let pc = Arc::new( + api.new_peer_connection(RTCConfiguration { + ice_servers, + ..Default::default() + }) + .await?, + ); + let (tx, rx) = mpsc::channel(1); + if offerer { + let dc = pc.create_data_channel("ads-adb", None).await?; + tx.send(channel(dc).await) + .await + .map_err(|_| anyhow::anyhow!("P2P channel queue closed"))?; + } else { + pc.on_data_channel(Box::new(move |dc| { + let tx = tx.clone(); + Box::pin(async move { + if dc.label() != "ads-adb" { + let _ = dc.close().await; + return; + } + let _ = tx.try_send(channel(dc).await); + }) + })); + } + Ok(Self { + pc, + channels: rx, + public_only: manifest.public_only, + }) + } + + async fn description(&self, offer: bool) -> Result { + let mut complete = self.pc.gathering_complete_promise().await; + let sdp = if offer { + self.pc.create_offer(None).await? + } else { + self.pc.create_answer(None).await? + }; + self.pc.set_local_description(sdp).await?; + // STUN failures must not stall fallback; a partial SDP still has host candidates. + let _ = timeout(Duration::from_millis(2200), complete.recv()).await; + let mut sdp = self + .pc + .local_description() + .await + .context("missing local SDP")? + .sdp; + if self.public_only { + sdp = sdp + .lines() + .filter(|line| !line.starts_with("a=candidate:") || line.contains(" typ srflx")) + .collect::>() + .join("\r\n") + + "\r\n"; + } + Ok(sdp) + } + async fn take_channel(&mut self) -> Result { + let mut channel = self + .channels + .recv() + .await + .context("P2P channel not received")?; + channel.ready().await?; + Ok(channel) + } +} + +async fn node_dial(network: &NetworkArgs, route: &Route) -> Result { + let target = NetworkArgs { + server: route.url.clone(), + connect_address: route.connect_address.clone(), + allow_insecure: network.allow_insecure, + }; + timeout( + Duration::from_secs(4), + dial( + target.url("/v2/tunnel", &[])?, + &route.ticket, + target.connect_address.as_deref(), + ), + ) + .await + .context("relay node connection timed out")? +} + +async fn run_ws(tcp: TcpStream, data: Ws, signal: Ws) -> Result<()> { + tokio::select! {result=relay(tcp,data)=>result,result=monitor_signal(signal)=>{result?;bail!("controller signaling closed")}} +} +async fn run_p2p(tcp: TcpStream, data: Channel, signal: Ws, _peer: Peer) -> Result<()> { + tokio::select! {result=data.run(tcp)=>result,result=monitor_signal(signal)=>{result?;bail!("controller signaling closed")}} +} + +/// The controller carries SDP and route decisions only, never TCP payloads. +pub async fn client_session( + tcp: TcpStream, + mut signal: Ws, + network: &NetworkArgs, + mode: &str, + status: &StreamStatus, +) -> Result<()> { + let manifest = timeout(Duration::from_secs(15), next_control(&mut signal)).await??; + if manifest.kind != "session" { + bail!("expected session manifest") + } + if mode != "relay" { + let attempt = async { + let mut peer = Peer::new(true, &manifest).await?; + let offer = peer.description(true).await?; + send(&mut signal, serde_json::json!({"type":"offer","sdp":offer})).await?; + let answer = next_control(&mut signal).await?; + if answer.kind != "answer" { + bail!("peer did not accept P2P offer") + } + peer.pc + .set_remote_description(RTCSessionDescription::answer( + answer.sdp.context("missing answer SDP")?, + )?) + .await?; + let channel = peer.take_channel().await?; + send(&mut signal, serde_json::json!({"type":"p2p-ready"})).await?; + let ready = next_control(&mut signal).await?; + if ready.kind != "p2p-ready" { + bail!("peer did not commit P2P") + } + Ok::<_, anyhow::Error>((channel, peer)) + }; + match timeout( + Duration::from_millis(manifest.p2p_timeout_ms.clamp(1000, 30000)), + attempt, + ) + .await + { + Ok(Ok((channel, peer))) => { + status.set("p2p", ""); + return run_p2p(tcp, channel, signal, peer).await; + } + _ => { + tracing::info!("P2P unavailable; trying relay nodes"); + } + } + } + for route in &manifest.routes { + send( + &mut signal, + serde_json::json!({"type":"relay","node":route.id}), + ) + .await?; + let response = timeout(Duration::from_secs(7), async { + loop { + let reply = next_control(&mut signal).await?; + // A timed-out P2P answer or an earlier node reply can arrive late. + if reply.node.as_deref() == Some(route.id.as_str()) + && (reply.kind == "route-ready" || reply.kind == "route-error") + { + return Ok::<_, anyhow::Error>(reply.kind == "route-ready"); + } + } + }) + .await; + if !matches!(response, Ok(Ok(true))) { + continue; + } + match node_dial(network, route).await { + Ok(data) => { + send( + &mut signal, + serde_json::json!({"type":"route-ready","node":route.id}), + ) + .await?; + status.set("relay", &route.id); + return run_ws(tcp, data, signal).await; + } + Err(_) => { + send( + &mut signal, + serde_json::json!({"type":"route-error","node":route.id}), + ) + .await?; + } + } + } + bail!("P2P unavailable and all configured relay nodes failed") +} + +pub async fn agent_session(tcp: TcpStream, mut signal: Ws, network: &NetworkArgs) -> Result<()> { + let manifest = timeout(Duration::from_secs(15), next_control(&mut signal)).await??; + if manifest.kind != "session" { + bail!("expected agent session manifest") + } + let mut peer: Option = None; + let mut pending: Option<(String, Ws)> = None; + loop { + let message = next_control(&mut signal).await?; + match message.kind.as_str() { + "offer" => { + let attempt = async { + let value = Peer::new(false, &manifest).await?; + value + .pc + .set_remote_description(RTCSessionDescription::offer( + message.sdp.context("missing offer SDP")?, + )?) + .await?; + let answer = value.description(false).await?; + Ok::<_, anyhow::Error>((value, answer)) + }; + match timeout(Duration::from_secs(5), attempt).await { + Ok(Ok((value, answer))) => { + peer = Some(value); + send( + &mut signal, + serde_json::json!({"type":"answer","sdp":answer}), + ) + .await?; + } + _ => { + send( + &mut signal, + serde_json::json!({"type":"route-error","node":"p2p"}), + ) + .await?; + } + } + } + "p2p-ready" => { + if let Some(mut value) = peer.take() { + match timeout(Duration::from_secs(2), value.take_channel()).await { + Ok(Ok(channel)) => { + send(&mut signal, serde_json::json!({"type":"p2p-ready"})).await?; + return run_p2p(tcp, channel, signal, value).await; + } + _ => { + send( + &mut signal, + serde_json::json!({"type":"route-error","node":"p2p"}), + ) + .await?; + } + } + } + } + "relay" => { + peer = None; + pending = None; + let id = message.node.context("missing relay node")?; + if let Some(route) = manifest.routes.iter().find(|route| route.id == id) { + match node_dial(network, route).await { + Ok(data) => { + pending = Some((id.clone(), data)); + send( + &mut signal, + serde_json::json!({"type":"route-ready","node":id}), + ) + .await?; + } + Err(_) => { + send( + &mut signal, + serde_json::json!({"type":"route-error","node":id}), + ) + .await?; + } + } + } else { + bail!("unknown relay node") + } + } + "route-ready" => { + if let Some((id, data)) = pending.take() { + if message.node.as_deref() != Some(id.as_str()) { + bail!("relay commit does not match selected node") + } + return run_ws(tcp, data, signal).await; + } + } + "route-error" => { + pending = None; + } + _ => bail!("unexpected session signal"), + } + } +} + +#[derive(Clone, Serialize)] +struct RouteState { + transport: String, + node: String, +} +pub struct TransportStatus { + file: Option, + next: AtomicU64, + streams: Mutex>, +} +pub struct StreamStatus { + owner: Arc, + id: u64, +} +impl TransportStatus { + pub fn new(file: Option) -> Arc { + Arc::new(Self { + file, + next: AtomicU64::new(1), + streams: Mutex::new(BTreeMap::new()), + }) + } + pub fn stream(self: &Arc) -> StreamStatus { + let id = self.next.fetch_add(1, Ordering::Relaxed); + let value = StreamStatus { + owner: self.clone(), + id, + }; + value.set("negotiating", ""); + value + } + fn publish(&self, streams: &BTreeMap) { + if let Some(file) = &self.file { + let p2p = streams.values().filter(|v| v.transport == "p2p").count(); + let relay = streams + .values() + .filter(|v| v.transport == "relay" || v.transport == "compat") + .count(); + let transport = if p2p > 0 && relay > 0 { + "mixed" + } else if p2p > 0 { + "p2p" + } else if relay > 0 { + "relay" + } else if streams.is_empty() { + "idle" + } else { + "negotiating" + }; + let nodes = streams + .values() + .filter(|v| !v.node.is_empty()) + .map(|v| v.node.clone()) + .collect::>(); + let body = serde_json::json!({"transport":transport,"p2p_streams":p2p,"relay_streams":relay,"active_streams":streams.len(),"nodes":nodes}); + if let Some(parent) = file.parent() { + let _ = std::fs::create_dir_all(parent); + } + let temp = file.with_extension("tmp"); + if std::fs::write(&temp, body.to_string()).is_ok() { + let _ = std::fs::rename(temp, file); + } + } + } +} +impl StreamStatus { + pub fn set(&self, transport: &str, node: &str) { + let mut streams = self.owner.streams.lock().unwrap_or_else(|e| e.into_inner()); + streams.insert( + self.id, + RouteState { + transport: transport.into(), + node: node.into(), + }, + ); + self.owner.publish(&streams); + if transport != "negotiating" { + tracing::info!(transport, node, "transport selected"); + } + } +} +impl Drop for StreamStatus { + fn drop(&mut self) { + let mut streams = self.owner.streams.lock().unwrap_or_else(|e| e.into_inner()); + streams.remove(&self.id); + self.owner.publish(&streams); + } +} diff --git a/deploy/README.md b/deploy/README.md index 687fcf7..0fe3a97 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -1,6 +1,6 @@ # Process management examples -Actual `ttstd.com` deployment and startup commands are documented in `docs/deployment-ttstd.md`. +Actual multi-node deployment is documented in [docs/cluster.md](../docs/cluster.md). Earlier single-node deployment and startup commands are in [docs/deployment-ttstd.md](../docs/deployment-ttstd.md). Examples are templates, not installed automatically. Replace paths, domain, user and tokens before use. Public endpoints require HTTPS/WSS. diff --git a/deploy/ads-control.service b/deploy/ads-control.service new file mode 100644 index 0000000..0e92d9f --- /dev/null +++ b/deploy/ads-control.service @@ -0,0 +1,23 @@ +[Unit] +Description=ADS control center +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +User=ads +WorkingDirectory=/opt/ads +EnvironmentFile=/etc/ads/server.env +Environment=GOMEMLIMIT=128MiB +ExecStart=/opt/ads/ads-server --listen 127.0.0.1:18081 --cluster-config /etc/ads/cluster.json +Restart=on-failure +RestartSec=3 +NoNewPrivileges=true +PrivateTmp=true +ProtectSystem=strict +ProtectHome=true +MemoryMax=256M +LimitNOFILE=8192 + +[Install] +WantedBy=multi-user.target diff --git a/deploy/ads-relay-tls.service b/deploy/ads-relay-tls.service new file mode 100644 index 0000000..bc90b9d --- /dev/null +++ b/deploy/ads-relay-tls.service @@ -0,0 +1,25 @@ +[Unit] +Description=ADS relay node +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +User=ads +WorkingDirectory=/opt/ads +EnvironmentFile=/etc/ads/relay.env +Environment=GOMEMLIMIT=64MiB +ExecStart=/opt/ads/ads-relay --id relay-2 --listen 0.0.0.0:443 --capacity 128 --tls-cert /etc/ads/tls/fullchain.pem --tls-key /etc/ads/tls/privkey.pem +Restart=on-failure +RestartSec=3 +AmbientCapabilities=CAP_NET_BIND_SERVICE +CapabilityBoundingSet=CAP_NET_BIND_SERVICE +NoNewPrivileges=true +PrivateTmp=true +ProtectSystem=strict +ProtectHome=true +MemoryMax=128M +LimitNOFILE=8192 + +[Install] +WantedBy=multi-user.target diff --git a/deploy/ads-relay.service b/deploy/ads-relay.service new file mode 100644 index 0000000..ad8305b --- /dev/null +++ b/deploy/ads-relay.service @@ -0,0 +1,23 @@ +[Unit] +Description=ADS relay node +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +User=ads +WorkingDirectory=/opt/ads +EnvironmentFile=/etc/ads/relay.env +Environment=GOMEMLIMIT=64MiB +ExecStart=/opt/ads/ads-relay --id relay-1 --listen 127.0.0.1:18082 --capacity 128 +Restart=on-failure +RestartSec=3 +NoNewPrivileges=true +PrivateTmp=true +ProtectSystem=strict +ProtectHome=true +MemoryMax=128M +LimitNOFILE=8192 + +[Install] +WantedBy=multi-user.target diff --git a/deploy/cluster.example.json b/deploy/cluster.example.json new file mode 100644 index 0000000..9679815 --- /dev/null +++ b/deploy/cluster.example.json @@ -0,0 +1,8 @@ +{ + "nodes": [ + {"id":"relay-1","url":"wss://ttstd.com/ads-relay-1","connect_address":"175.178.213.60:443","priority":10}, + {"id":"relay-2","url":"wss://ttstd.com","connect_address":"47.242.112.133:443","priority":20} + ], + "ice_servers": ["stun:47.242.112.133:3478", "stun:175.178.213.60:3478"], + "p2p_timeout_ms": 10000 +} diff --git a/deploy/nginx-ads-relay-path.conf b/deploy/nginx-ads-relay-path.conf new file mode 100644 index 0000000..e0bf3ff --- /dev/null +++ b/deploy/nginx-ads-relay-path.conf @@ -0,0 +1,23 @@ +# Include inside the existing ttstd.com HTTPS server block. +# URI prefix /ads-relay-1/ is stripped before forwarding to the relay. +location = /ads-relay-1 { + return 308 /ads-relay-1/; +} +location ^~ /ads-relay-1/ { + proxy_pass http://127.0.0.1:18082/; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_buffering off; + proxy_request_buffering off; + proxy_read_timeout 3600s; + proxy_send_timeout 3600s; + # Do not cache authenticated requests or log tickets in query strings. + proxy_cache off; + proxy_hide_header Cache-Control; + add_header Cache-Control "no-store" always; + access_log off; +} diff --git a/desktop/Ads.Desktop.Smoke/Program.cs b/desktop/Ads.Desktop.Smoke/Program.cs index 7ac4df0..b96f719 100644 --- a/desktop/Ads.Desktop.Smoke/Program.cs +++ b/desktop/Ads.Desktop.Smoke/Program.cs @@ -62,6 +62,7 @@ internal static class Program { Require(window.FindControl("ServerBox")?.Text == RelayOptions.DefaultServer, "Server binding is wrong"); Require(window.FindControl("OriginBox")?.Text == RelayOptions.DefaultOrigin, "Origin binding is wrong"); + Require(window.FindControl("RelayOnlyCheck")?.IsChecked == vm.RelayOnly, "Transport preference binding is wrong"); if (!live) { Require(window.FindControl