feat: discover ADB devices from agent management
This commit is contained in:
1 parent
8ecfe880cc
commit
3a7bb071f0
12 files changed
+132
-5
No files matched your search
@@ -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::<Vec<_>>().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());
|
||||
|
||||
@@ -204,6 +204,22 @@ pub async fn tcp_connect(address: &str) -> Result<TcpStream> {
|
||||
.context("TCP connect timed out")??)
|
||||
}
|
||||
|
||||
pub async fn adb_devices(server: &str) -> Result<String> {
|
||||
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();
|
||||
|
||||
@@ -142,6 +142,7 @@ fn validate_address(value: &str) -> Result<()> {
|
||||
pub enum Request {
|
||||
Status,
|
||||
DevicesList,
|
||||
DevicesDiscover,
|
||||
DeviceAdd {
|
||||
device: DeviceConfig,
|
||||
},
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
<ScrollViewer Grid.Column="1"><StackPanel Spacing="14">
|
||||
<Border Classes="agentCard"><StackPanel Spacing="10"><TextBlock Text="{Binding SelectedAgent.Details}" TextWrapping="Wrap" Foreground="#66D9C0"/><WrapPanel><Button x:Name="LoadAgentConfigButton" Content="读取配置" Command="{Binding LoadConfigCommand}"/><Button Content="重启 Agent" Command="{Binding RestartAgentCommand}"/></WrapPanel><TextBlock Text="重启由监督进程执行,设备连接会短暂中断。" FontSize="12" Foreground="#A8B7CC"/></StackPanel></Border>
|
||||
<Border Classes="agentCard"><StackPanel Spacing="8">
|
||||
<Button Content="发现 ADB 设备" Command="{Binding DiscoverDevicesCommand}" HorizontalAlignment="Left"/>
|
||||
<ListBox ItemsSource="{Binding DiscoveredDevices}" SelectedItem="{Binding SelectedDiscoveredDevice}" MaxHeight="160"><ListBox.ItemTemplate><DataTemplate><TextBlock Text="{Binding Description}" TextWrapping="Wrap"/></DataTemplate></ListBox.ItemTemplate></ListBox>
|
||||
<TextBlock Text="手机管理" FontSize="18" FontWeight="SemiBold"/>
|
||||
<ListBox x:Name="ManagedDevicesList" ItemsSource="{Binding AgentDevices}" SelectedItem="{Binding SelectedManagedDevice}" MinHeight="70" MaxHeight="180"><ListBox.ItemTemplate><DataTemplate><TextBlock Text="{Binding Description}" TextWrapping="Wrap" Margin="3,7"/></DataTemplate></ListBox.ItemTemplate></ListBox>
|
||||
<WrapPanel><Button Content="启用" Command="{Binding EnableDeviceCommand}"/><Button Content="停用" Command="{Binding DisableDeviceCommand}"/><Button Content="移除配置" Command="{Binding RemoveDeviceCommand}"/></WrapPanel>
|
||||
|
||||
@@ -24,6 +24,22 @@ public partial class AgentManagementViewModel : ObservableObject, IDisposable
|
||||
[ObservableProperty] private bool isBusy;
|
||||
[ObservableProperty] private bool autoRefresh = true;
|
||||
[ObservableProperty] private bool followLogs;
|
||||
public ObservableCollection<DiscoveredDevice> DiscoveredDevices { get; } = new();
|
||||
[ObservableProperty] private DiscoveredDevice? selectedDiscoveredDevice;
|
||||
partial void OnSelectedDiscoveredDeviceChanged(DiscoveredDevice? value) {
|
||||
if(value is null)return;
|
||||
if(value.Configured || value.State!="device"){Notice="该设备已添加或尚未授权/离线。";return;}
|
||||
DeviceId="phone-"+Convert.ToHexString(System.Security.Cryptography.SHA256.HashData(System.Text.Encoding.UTF8.GetBytes((SelectedAgent?.Id ?? "")+":"+value.Serial)))[..12].ToLowerInvariant();
|
||||
var tcp=System.Net.IPEndPoint.TryParse(value.Serial,out _);
|
||||
Target=tcp?value.Serial:"";AdbSerial=tcp?"":value.Serial;
|
||||
Notice=value.Configured?"该设备已添加。":"已填入添加表单;确认设备 ID 后点击添加手机。";
|
||||
}
|
||||
[RelayCommand(CanExecute=nameof(CanManage))] private Task DiscoverDevicesAsync()=>Guard(async()=>{
|
||||
var rows=await CallAsync(new{op="devices_discover"});
|
||||
DiscoveredDevices.Clear();SelectedDiscoveredDevice=null;
|
||||
foreach(var row in rows.Deserialize<DiscoveredDevice[]>(new JsonSerializerOptions(JsonSerializerDefaults.Web)) ?? [])DiscoveredDevices.Add(row);
|
||||
Notice=$"发现 {DiscoveredDevices.Count} 台 ADB 设备;选择未添加且状态为 device 的设备。USB 接入仍须启用 TCP adbd。";
|
||||
});
|
||||
public ObservableCollection<ManagedAgent> Agents { get; } = new();
|
||||
public ObservableCollection<ManagedDevice> AgentDevices { get; } = new();
|
||||
private readonly Func<(string Server,string Origin)> server;
|
||||
@@ -61,7 +77,7 @@ public partial class AgentManagementViewModel : ObservableObject, IDisposable
|
||||
var selected=SelectedManagedDevice?.Id; AgentDevices.Clear();
|
||||
foreach(var device in value?.Status.Devices ?? [])AgentDevices.Add(device);
|
||||
SelectedManagedDevice=AgentDevices.FirstOrDefault(d=>d.Id==selected) ?? AgentDevices.FirstOrDefault();
|
||||
logCursor=0;logInstance="";RemoteLogText="";UpdateCommands();
|
||||
DiscoveredDevices.Clear();SelectedDiscoveredDevice=null;logCursor=0;logInstance="";RemoteLogText="";UpdateCommands();
|
||||
}
|
||||
partial void OnSelectedManagedDeviceChanged(ManagedDevice? value)=>UpdateCommands();
|
||||
partial void OnIsBusyChanged(bool value)=>UpdateCommands();
|
||||
@@ -72,7 +88,7 @@ public partial class AgentManagementViewModel : ObservableObject, IDisposable
|
||||
private bool CanLocal()=>!IsBusy && LocalMode;
|
||||
private void UpdateCommands()
|
||||
{
|
||||
LoadConfigCommand.NotifyCanExecuteChanged();SaveConfigCommand.NotifyCanExecuteChanged();AddDeviceCommand.NotifyCanExecuteChanged();
|
||||
DiscoverDevicesCommand.NotifyCanExecuteChanged();LoadConfigCommand.NotifyCanExecuteChanged();SaveConfigCommand.NotifyCanExecuteChanged();AddDeviceCommand.NotifyCanExecuteChanged();
|
||||
RemoveDeviceCommand.NotifyCanExecuteChanged();EnableDeviceCommand.NotifyCanExecuteChanged();DisableDeviceCommand.NotifyCanExecuteChanged();
|
||||
ReadLogsCommand.NotifyCanExecuteChanged();RestartAgentCommand.NotifyCanExecuteChanged();
|
||||
InitializeLocalCommand.NotifyCanExecuteChanged();StartLocalCommand.NotifyCanExecuteChanged();InstallServiceCommand.NotifyCanExecuteChanged();
|
||||
@@ -131,9 +147,9 @@ public partial class AgentManagementViewModel : ObservableObject, IDisposable
|
||||
Agents.Clear();foreach(var row in rows)Agents.Add(row);
|
||||
var chosen=Agents.FirstOrDefault(r=>r.Id==selected) ?? Agents.FirstOrDefault(r=>r.Online) ?? Agents.FirstOrDefault();
|
||||
// Preserve log cursor and draft configuration during periodic metadata refreshes.
|
||||
var cursor=logCursor;var instance=logInstance;var text=RemoteLogText;
|
||||
var discovered=DiscoveredDevices.ToArray();var cursor=logCursor;var instance=logInstance;var text=RemoteLogText;
|
||||
SelectedAgent=chosen;
|
||||
if(selected==chosen?.Id){logCursor=cursor;logInstance=instance;RemoteLogText=text;}
|
||||
if(selected==chosen?.Id){foreach(var item in discovered)DiscoveredDevices.Add(item);logCursor=cursor;logInstance=instance;RemoteLogText=text;}
|
||||
SelectedManagedDevice=AgentDevices.FirstOrDefault(d=>d.Id==selectedDevice) ?? AgentDevices.FirstOrDefault();
|
||||
Notice=$"{rows.Length} 个 Agent · {rows.Count(r=>r.Online)} 个在线";lastError=null;
|
||||
}
|
||||
|
||||
@@ -118,3 +118,5 @@ sudo ./adsctl --config /home/agent/.config/ads/agent.json service install --syst
|
||||
v3 增加 `/agents/register`(Agent WSS)、`/agents`(管理员 HTTP/WSS 列表)、`/rpc?agent=ID`(管理员 HTTP POST/WSS 请求)。均在 `/v3` 下,支持部署路径前缀。关联请求有超时与数量限制;服务端保留有限的离线主机快照,重启控制中心后重新注册。此版本不提供远程二进制升级、用户账号管理、任意命令执行或跨平台 USB 后端。
|
||||
|
||||
Windows 排障:本机管理返回拒绝访问时,检查配置目录所有者是否为实际使用管理客户端的用户。管理员权限创建目录可能将所有者设为 Administrators,普通 UAC 桌面进程不能使用这个组访问私有管道。保留原 ACL,将专属配置目录所有者调整为实际用户,再重启 Agent 重建管道。不要向 Everyone 授予管理权限。
|
||||
|
||||
设备发现:两套客户端点击“发现 ADB 设备”,查询所选 Agent 主机的 ADB server,显示已添加、未添加、未授权/离线状态。选择在线且未添加的条目会填入添加表单,确认后添加;不自动暴露所有新插入的手机。CLI 使用 `adsctl devices discover`,远程可加 `--agent ID`。须先启动该主机的 ADB server;SYSTEM Agent 也通过配置的 TCP ADB server 地址查询。此能力需要控制中心与 Agent 更新到支持 devices_discover 的版本。
|
||||
@@ -24,6 +24,25 @@ class AgentModel extends ChangeNotifier {
|
||||
configPath = '',
|
||||
configText = '',
|
||||
logText = '';
|
||||
List<JsonMap> discoveredDevices = [];
|
||||
Future<void> discoverDevices() => run(() async {
|
||||
final rows = await _call({'op': 'devices_discover'});
|
||||
discoveredDevices = (rows! as List<Object?>)
|
||||
.map((v) => Map<String, Object?>.from(v! as Map))
|
||||
.toList();
|
||||
notice =
|
||||
'发现 ${discoveredDevices.length} 台 ADB 设备;选择后确认添加。USB 接入仍须启用 TCP adbd。';
|
||||
});
|
||||
void chooseDiscovered(JsonMap row) {
|
||||
final serial = row['serial']! as String;
|
||||
final tcp = RegExp(r'^.+:\d+$').hasMatch(serial);
|
||||
target = tcp ? serial : '';
|
||||
adbSerial = tcp ? '' : serial;
|
||||
deviceId = 'phone-${DateTime.now().microsecondsSinceEpoch}';
|
||||
notice = '已填入添加表单,请确认设备 ID 后添加手机。';
|
||||
_notify();
|
||||
}
|
||||
|
||||
String deviceId = '', target = '', adbSerial = '', adbServer = '';
|
||||
String notice = '远程管理需要独立管理员凭据;也可选择管理本机 Agent。';
|
||||
Timer? _timer;
|
||||
@@ -105,6 +124,7 @@ class AgentModel extends ChangeNotifier {
|
||||
|
||||
void select(String? id) {
|
||||
if (id != selectedId) {
|
||||
discoveredDevices = [];
|
||||
selectedId = id;
|
||||
_cursor = 0;
|
||||
_instance = '';
|
||||
|
||||
@@ -166,6 +166,24 @@ class _AgentViewState extends State<AgentView> {
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
button(
|
||||
'发现 ADB 设备',
|
||||
m.discoverDevices,
|
||||
enabled: m.canManage,
|
||||
),
|
||||
for (final row in m.discoveredDevices)
|
||||
ListTile(
|
||||
title: Text('${row['serial']} · ${row['state']}'),
|
||||
subtitle: Text(
|
||||
row['configured'] == true ? '已添加' : '未添加',
|
||||
),
|
||||
onTap:
|
||||
!m.busy &&
|
||||
row['configured'] != true &&
|
||||
row['state'] == 'device'
|
||||
? () => m.chooseDiscovered(row)
|
||||
: null,
|
||||
),
|
||||
for (final device
|
||||
in m.selected?.devices ?? <ManagedPhone>[])
|
||||
ListTile(
|
||||
|
||||
@@ -37,6 +37,13 @@ class FakeApi implements AgentApi {
|
||||
Future<Object?> request(String agent, JsonMap operation) async {
|
||||
calls.add({...operation, 'agent': agent});
|
||||
return switch (operation['op']) {
|
||||
'devices_discover' => [
|
||||
<String, Object?>{
|
||||
'serial': '192.168.1.2:5555',
|
||||
'state': 'device',
|
||||
'configured': false,
|
||||
},
|
||||
],
|
||||
'config_get' => {'id': agent, 'devices': <Object?>[]},
|
||||
'logs' => {
|
||||
'instance': 'i',
|
||||
@@ -81,6 +88,10 @@ void main() {
|
||||
await m.deviceOperation('device_enable', enabled: false);
|
||||
expect(api.calls.last['id'], 'two-phone');
|
||||
expect(api.calls.last['enabled'], false);
|
||||
await m.discoverDevices();
|
||||
m.chooseDiscovered(m.discoveredDevices.single);
|
||||
expect(m.target, '192.168.1.2:5555');
|
||||
expect(m.adbSerial, isEmpty);
|
||||
await m.readLogs();
|
||||
expect(m.logText, contains('[REDACTED]'));
|
||||
expect(m.logText, isNot(contains('private-token')));
|
||||
|
||||
@@ -207,7 +207,7 @@ func validManagementRequest(raw []byte) bool {
|
||||
return false
|
||||
}
|
||||
switch request.Op {
|
||||
case "status", "devices_list", "device_add", "device_remove", "device_enable", "config_get", "config_set", "logs", "restart":
|
||||
case "status", "devices_list", "devices_discover", "device_add", "device_remove", "device_enable", "config_get", "config_set", "logs", "restart":
|
||||
return true
|
||||
}
|
||||
return false
|
||||
|
||||
Reference in new issue
Block a user