From 05d4d5fea668e33ae0630dfff4c10048c109a8cf Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Thu, 12 Nov 2026 18:15:04 +0800 Subject: [PATCH] feat: manage multiple desktop device connections independently --- AGENTS.md | 2 +- README.md | 2 +- desktop/Ads.Desktop.Smoke/Program.cs | 72 +++- .../Ads.Desktop.Tests/ConnectionPortsTests.cs | 23 ++ desktop/Ads.Desktop/App.axaml.cs | 6 +- desktop/Ads.Desktop/ConnectionPorts.cs | 21 + desktop/Ads.Desktop/DeviceConnection.cs | 195 ++++++++++ desktop/Ads.Desktop/MainViewModel.cs | 368 +++++++----------- desktop/Ads.Desktop/MainWindow.axaml | 42 +- desktop/Ads.Desktop/WindowsUsbSession.cs | 8 +- desktop/README.md | 10 + docs/windows-usb.md | 4 +- 12 files changed, 504 insertions(+), 249 deletions(-) create mode 100644 desktop/Ads.Desktop.Tests/ConnectionPortsTests.cs create mode 100644 desktop/Ads.Desktop/ConnectionPorts.cs create mode 100644 desktop/Ads.Desktop/DeviceConnection.cs diff --git a/AGENTS.md b/AGENTS.md index d04309c..d13b5b3 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -22,7 +22,7 @@ | `crates/` | Rust 工作区共享库容器 | 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/` | Avalonia 多设备工作台,管理独立连接、自动端口分配、USB 模拟、多个 scrcpy 窗口及托盘;`Assets/` 保存图标资源 | C#、AXAML、XML(csproj)、PNG | | `desktop/Ads.Desktop.Tests/` | 桌面客户端单元测试 | C#、XML(csproj) | | `desktop/Ads.Desktop.Smoke/` | 桌面离屏布局、连接及可选真机冒烟验证入口 | C#、XML(csproj) | | `deploy/` | 服务器/设备端部署脚本与 Caddy、Nginx、systemd、launchd 配置示例 | Shell、服务/代理配置、XML(plist)、Markdown | diff --git a/README.md b/README.md index 2716964..5489f0f 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Windows 现支持可选的 [USB ADB 模拟](docs/windows-usb.md),默认网络 | `crates/` | Rust 工作区共享库容器 | 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/` | Avalonia 多设备工作台,管理独立连接、自动端口分配、USB 模拟、多个 scrcpy 窗口及托盘;`Assets/` 保存图标资源 | C#、AXAML、XML(csproj)、PNG | | `desktop/Ads.Desktop.Tests/` | 桌面客户端单元测试 | C#、XML(csproj) | | `desktop/Ads.Desktop.Smoke/` | 桌面离屏布局、连接及可选真机冒烟验证入口 | C#、XML(csproj) | | `deploy/` | 服务器/设备端部署脚本与 Caddy、Nginx、systemd、launchd 配置示例 | Shell、服务/代理配置、XML(plist)、Markdown | diff --git a/desktop/Ads.Desktop.Smoke/Program.cs b/desktop/Ads.Desktop.Smoke/Program.cs index aff542b..2f48cb0 100644 --- a/desktop/Ads.Desktop.Smoke/Program.cs +++ b/desktop/Ads.Desktop.Smoke/Program.cs @@ -3,6 +3,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Headless; using Avalonia.Threading; +using Avalonia.VisualTree; internal static class Program { @@ -23,7 +24,7 @@ internal static class Program Exception? failure = null; Dispatcher.UIThread.Post(async () => { - try { await RunAsync(args.Contains("--live"), args.Contains("--screen"), args.Contains("--usb")); } + try { if (args.Contains("--multi")) await RunMultiAsync(args.Contains("--usb")); else await RunAsync(args.Contains("--live"), args.Contains("--screen"), args.Contains("--usb")); } catch (Exception error) { failure = error; } finally { finished.Cancel(); } }); @@ -39,7 +40,7 @@ internal static class Program private static async Task UntilAsync(Func condition, string message) { - var deadline = DateTime.UtcNow.AddSeconds(35); + var deadline = DateTime.UtcNow.AddSeconds(60); while (!condition()) { if (DateTime.UtcNow > deadline) throw new InvalidOperationException(message); @@ -47,6 +48,68 @@ internal static class Program } } + private static async Task RunMultiAsync(bool usb) + { + var root = DesktopPaths.ProjectRoot()!; + var folder = Path.Combine(root, "work", "desktop-multi", Guid.NewGuid().ToString("N")); + using var vm = new MainViewModel(folder, backgroundMonitoring: true, loadLocalCredentials: true); + int FreePort() { var probe = new System.Net.Sockets.TcpListener(System.Net.IPAddress.Loopback, 0); probe.Start(); var port = ((System.Net.IPEndPoint)probe.LocalEndpoint).Port; probe.Stop(); return port; } + vm.Port = FreePort(); vm.UsbPort = FreePort(); vm.UsbMode = usb; + var secondId = Environment.GetEnvironmentVariable("ADS_MULTI_SECOND_DEVICE") ?? "smoke-multi-phone"; + var window = new MainWindow { DataContext = vm }; window.Show(); + try { + await vm.InitializeAsync(); + await UntilAsync(() => vm.Devices.Any(d => d.Id == "home-phone") && vm.Devices.Any(d => d.Id == secondId), "Two test devices were not discovered"); + vm.SelectedDevice = vm.Devices.Single(d => d.Id == "home-phone"); + Require(!vm.SelectedDevice.Busy, "First device is occupied"); + await vm.ConnectCommand.ExecuteAsync(null); + await UntilAsync(() => vm.Ready, "First phone was not ready: " + vm.Notice); + var first = vm.Connections.Single(); var firstEndpoint = first.Endpoint; + vm.SelectedDevice = vm.Devices.Single(d => d.Id == secondId); + Require(vm.ConnectCommand.CanExecute(null), "A connected phone prevented connecting another"); + await vm.ConnectCommand.ExecuteAsync(null); + await UntilAsync(() => vm.Connections.Count == 2 && vm.Connections.All(c => c.Ready && c.Model != "—"), "Both phones did not become ready: " + vm.Notice); + var second = vm.Connections.Single(c => c.DeviceId == secondId); + Require(first.Options.Port != second.Options.Port && first.Endpoint != second.Endpoint, "Device endpoints collided"); + if (usb) Require(first.Options.UsbPort != second.Options.UsbPort && first.Options.UsbPort != second.Options.Port && second.Options.UsbPort != first.Options.Port, "USB/IP ports collided"); + Require(first.Endpoint == firstEndpoint && first.HasConnection, "Selecting another phone altered the first connection"); + Require(vm.Devices.Count(d => d.IsLocal) == 2, "Local ownership was only shown for the selected phone"); + await vm.StartAllScreensCommand.ExecuteAsync(null); + await UntilAsync(() => vm.Connections.All(c => c.ScreenRunning) && vm.Logs.Any(l => l.Contains("[home-phone]") && l.Contains("INFO: Texture")) && vm.Logs.Any(l => l.Contains("[" + secondId + "]") && l.Contains("INFO: Texture")), "Two independent scrcpy streams did not start"); + Require(first.ScreenPort != second.ScreenPort, "scrcpy forwarding ports collided"); + Require(window.FindControl("ConnectionsList")?.ItemCount == 2, "Overview did not display both connections"); + using (var frame = window.CaptureRenderedFrame()) frame?.Save(Path.Combine(root, "work", usb ? "desktop-multi-usb.png" : "desktop-multi.png")); + var buttons = window.GetVisualDescendants().OfType