feat: add control center, multiple relay nodes and P2P-first transport
This commit is contained in:
1 parent
0988e9c363
commit
2abfb63da9
44 files changed
+3477
-67
No files matched your search
+16
-4
@@ -51,8 +51,18 @@ async fn upstream(args: &Args) -> Result<TcpStream> {
|
||||
}
|
||||
}
|
||||
|
||||
async fn serve_session(args: Arc<Args>, session: String) -> Result<()> {
|
||||
async fn serve_session(args: Arc<Args>, session: String, signal_key: Option<String>) -> 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<Args>, session: String) -> Result<()> {
|
||||
|
||||
async fn online(args: Arc<Args>) -> 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<Args>) -> 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() => {},
|
||||
|
||||
Reference in new issue
Block a user