From 3a7bb071f0158aa55d4cbcd6966333ec12bd64e9 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Thu, 12 Nov 2026 22:30:05 +0800 Subject: [PATCH] feat: discover ADB devices from agent management --- agent/src/managed.rs | 11 +++++ crates/ads-core/src/lib.rs | 40 +++++++++++++++++++ crates/ads-management/src/lib.rs | 1 + ctl/src/main.rs | 3 ++ desktop/Ads.Desktop/AgentManagement.cs | 3 ++ desktop/Ads.Desktop/AgentManagementView.axaml | 2 + .../Ads.Desktop/AgentManagementViewModel.cs | 24 +++++++++-- docs/agent-management.md | 2 + flutter_manager/lib/ui/agent_model.dart | 20 ++++++++++ flutter_manager/lib/ui/agent_view.dart | 18 +++++++++ flutter_manager/test/agent_test.dart | 11 +++++ server/management.go | 2 +- 12 files changed, 132 insertions(+), 5 deletions(-) diff --git a/agent/src/managed.rs b/agent/src/managed.rs index d8a9d46..0026e46 100644 --- a/agent/src/managed.rs +++ b/agent/src/managed.rs @@ -170,6 +170,17 @@ impl Runtime { match request { Request::Status => Ok(Response::success(self.status().await)), Request::DevicesList => Ok(Response::success(self.status().await.devices)), + Request::DevicesDiscover => { + let config = self.state.lock().await.config.clone(); + let text = ads_core::adb_devices(&config.adb_server).await?; + let rows: Vec<_>=text.lines().filter_map(|line| { + let mut parts=line.split_whitespace(); + let serial=parts.next()?;let state=parts.next()?; + let configured=config.devices.iter().any(|d|d.target.as_deref()==Some(serial)||d.adb_serial.as_deref()==Some(serial)); + Some(serde_json::json!({"serial":serial,"state":state,"details":parts.collect::>().join(" "),"configured":configured})) + }).collect(); + Ok(Response::success(rows)) + } Request::ConfigGet => Ok(Response::success(&self.state.lock().await.config)), Request::Logs { after, limit } => { let logs = self.logs.lock().unwrap_or_else(|e| e.into_inner()); diff --git a/crates/ads-core/src/lib.rs b/crates/ads-core/src/lib.rs index 4c35f75..6faee9b 100644 --- a/crates/ads-core/src/lib.rs +++ b/crates/ads-core/src/lib.rs @@ -204,6 +204,22 @@ pub async fn tcp_connect(address: &str) -> Result { .context("TCP connect timed out")??) } +pub async fn adb_devices(server: &str) -> Result { + timeout(Duration::from_secs(5), async { + let mut stream = TcpStream::connect(server) + .await + .context("cannot connect to Agent host ADB server")?; + adb_request(&mut stream, "host:devices-l").await?; + let mut size = [0; 4]; + stream.read_exact(&mut size).await?; + let size = usize::from_str_radix(std::str::from_utf8(&size)?, 16)?; + let mut data = vec![0; size]; + stream.read_exact(&mut data).await?; + Ok::<_, anyhow::Error>(String::from_utf8(data)?) + }) + .await + .context("ADB discovery timed out")? +} async fn adb_request(stream: &mut TcpStream, service: &str) -> Result<()> { if service.len() > 65535 { bail!("ADB service name too long"); @@ -285,6 +301,30 @@ mod tests { assert_eq!(DEFAULT_RELAY, "wss://ttstd.com/ads"); } + #[tokio::test] + async fn discovers_adb_devices_with_length_framing() { + let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap(); + let address = listener.local_addr().unwrap().to_string(); + let peer = tokio::spawn(async move { + let (mut socket, _) = listener.accept().await.unwrap(); + let mut size = [0; 4]; + socket.read_exact(&mut size).await.unwrap(); + let count = usize::from_str_radix(std::str::from_utf8(&size).unwrap(), 16).unwrap(); + let mut service = vec![0; count]; + socket.read_exact(&mut service).await.unwrap(); + assert_eq!(service, b"host:devices-l"); + let body = "192.168.1.2:5555\tdevice model:Phone\nUSB123\tunauthorized\n"; + let reply = format!("OKAY{:04x}{}", body.len(), body); + for chunk in reply.as_bytes().chunks(3) { + socket.write_all(chunk).await.unwrap(); + } + }); + let list = adb_devices(&address).await.unwrap(); + assert!(list.contains("model:Phone")); + assert!(list.contains("unauthorized")); + peer.await.unwrap(); + } + #[tokio::test] async fn tls_failure_is_reported_without_a_provider_panic() { let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap(); diff --git a/crates/ads-management/src/lib.rs b/crates/ads-management/src/lib.rs index 4a0a7c3..bb72b64 100644 --- a/crates/ads-management/src/lib.rs +++ b/crates/ads-management/src/lib.rs @@ -142,6 +142,7 @@ fn validate_address(value: &str) -> Result<()> { pub enum Request { Status, DevicesList, + DevicesDiscover, DeviceAdd { device: DeviceConfig, }, diff --git a/ctl/src/main.rs b/ctl/src/main.rs index 2c78830..b4bffdb 100644 --- a/ctl/src/main.rs +++ b/ctl/src/main.rs @@ -65,6 +65,8 @@ enum Agents { } #[derive(Subcommand, Clone)] enum Devices { + /// Discover devices already known to the Agent host ADB server + Discover, List, Add { #[arg(long)] @@ -308,6 +310,7 @@ async fn main() -> Result<()> { Command::Restart => Request::Restart, Command::Devices { command } => match command { Devices::List => Request::DevicesList, + Devices::Discover => Request::DevicesDiscover, Devices::Add { id, target, diff --git a/desktop/Ads.Desktop/AgentManagement.cs b/desktop/Ads.Desktop/AgentManagement.cs index 0c9d79f..5516c93 100644 --- a/desktop/Ads.Desktop/AgentManagement.cs +++ b/desktop/Ads.Desktop/AgentManagement.cs @@ -3,6 +3,9 @@ using System.Net.Http.Json; using System.Text.Json; using System.Text.Json.Serialization; namespace Ads.Desktop; +public sealed record DiscoveredDevice(string Serial,string State,string Details,bool Configured) { + public string Description=>$"{Serial} · {State} · {(Configured ? "已添加" : "未添加")} · {Details}"; +} public sealed record ManagedDevice( string Id, string? Target, [property:JsonPropertyName("adb_serial")] string? AdbSerial, [property:JsonPropertyName("adb_server")] string? AdbServer, diff --git a/desktop/Ads.Desktop/AgentManagementView.axaml b/desktop/Ads.Desktop/AgentManagementView.axaml index 27e20cb..69634ea 100644 --- a/desktop/Ads.Desktop/AgentManagementView.axaml +++ b/desktop/Ads.Desktop/AgentManagementView.axaml @@ -15,6 +15,8 @@