diff --git a/desktop/Ads.Desktop.Tests/DesktopParityTests.cs b/desktop/Ads.Desktop.Tests/DesktopParityTests.cs new file mode 100644 index 0000000..c6b6788 --- /dev/null +++ b/desktop/Ads.Desktop.Tests/DesktopParityTests.cs @@ -0,0 +1,32 @@ +using Ads.Desktop; +using System.Reflection; +using System.Text.Json; +using Xunit; +namespace Ads.Desktop.Tests; +public class DesktopParityTests +{ + [Fact] public void SeparateEditionsCanOwnTheirLocksAndDuplicateWakesSameEdition() + { + if(!OperatingSystem.IsWindows())return; + var scope=@"Local\TTSTD.ADS.Test."+Guid.NewGuid().ToString("N"); + var type=typeof(MainViewModel).Assembly.GetType("Ads.Desktop.DesktopInstance")!; + using var first=(IDisposable)Activator.CreateInstance(type,new object[]{scope+".Avalonia"})!; + using var flutter=new Mutex(true,scope+".Flutter.Instance",out var flutterPrimary); + try { + Assert.True(flutterPrimary); + Assert.True((bool)type.GetProperty("Primary")!.GetValue(first)!); + using var duplicate=(IDisposable)Activator.CreateInstance(type,new object[]{scope+".Avalonia"})!; + Assert.False((bool)type.GetProperty("Primary")!.GetValue(duplicate)!); + using var wake=new ManualResetEventSlim(); + type.GetMethod("Listen")!.Invoke(first,new object[]{(Action)(()=>wake.Set())}); + type.GetMethod("Activate")!.Invoke(duplicate,null); + Assert.True(wake.Wait(TimeSpan.FromSeconds(3))); + } finally { if(flutterPrimary)flutter.ReleaseMutex(); } + } + [Fact] public void RelayManagementReadsServerNodeConfiguration() + { + var json="""{"id":"relay-1","url":"wss://example.com/relay","connect_address":"127.0.0.1:443","priority":5,"default":true,"healthy":true,"sessions":2,"capacity":32}"""; + var node=JsonSerializer.Deserialize(json,new JsonSerializerOptions(JsonSerializerDefaults.Web))!; + Assert.True(node.Default);Assert.Equal(5,node.Priority);Assert.Equal("127.0.0.1:443",node.ConnectAddress);Assert.Contains("默认",node.Description); + } +} diff --git a/desktop/Ads.Desktop/DesktopInstance.cs b/desktop/Ads.Desktop/DesktopInstance.cs index fca44b2..8917220 100644 --- a/desktop/Ads.Desktop/DesktopInstance.cs +++ b/desktop/Ads.Desktop/DesktopInstance.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; namespace Ads.Desktop; -/// Shares the Windows desktop UI lease with Flutter, including tray mode. +/// Owns the Avalonia Windows desktop UI lease, including tray mode. internal sealed class DesktopInstance : IDisposable { private readonly Mutex mutex; @@ -10,10 +10,10 @@ internal sealed class DesktopInstance : IDisposable private RegisteredWaitHandle? registration; public bool Primary { get; } - public DesktopInstance() + public DesktopInstance(string scope = @"Local\TTSTD.ADS.Avalonia") { - activation = new EventWaitHandle(false, EventResetMode.AutoReset, @"Local\TTSTD.ADS.Desktop.Activate"); - mutex = new Mutex(true, @"Local\TTSTD.ADS.Desktop.Instance", out var primary); + activation = new EventWaitHandle(false, EventResetMode.AutoReset, scope + ".Activate"); + mutex = new Mutex(true, scope + ".Instance", out var primary); Primary = primary; } diff --git a/desktop/Ads.Desktop/LocalAdb.cs b/desktop/Ads.Desktop/LocalAdb.cs new file mode 100644 index 0000000..6e56279 --- /dev/null +++ b/desktop/Ads.Desktop/LocalAdb.cs @@ -0,0 +1,20 @@ +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; +namespace Ads.Desktop; +public partial class MainViewModel +{ + [ObservableProperty] private string localAdbListing=""; + [RelayCommand] private Task ReadLocalAdbAsync()=>Guard(()=>Exclusive(ReadLocalAdbCoreAsync)); + private async Task ReadLocalAdbCoreAsync() + { + var adb=DesktopPaths.ResolveTool(AdbPath,"adb"); + LocalAdbListing=await AdbAsync(adb,lifetime.Token,"devices","-l"); + Notice="本机 ADB 设备列表已更新。"; + } + [RelayCommand] private Task StartLocalAdbServerAsync()=>Guard(()=>Exclusive(async()=>{ + var adb=DesktopPaths.ResolveTool(AdbPath,"adb"); + var result=await AdbAsync(adb,lifetime.Token,"start-server"); + Log(string.IsNullOrWhiteSpace(result)?"本机 ADB Server 已启动。":result.Trim()); + await ReadLocalAdbCoreAsync(); + })); +} diff --git a/desktop/Ads.Desktop/MainViewModel.cs b/desktop/Ads.Desktop/MainViewModel.cs index 16cd977..f0480a1 100644 --- a/desktop/Ads.Desktop/MainViewModel.cs +++ b/desktop/Ads.Desktop/MainViewModel.cs @@ -215,6 +215,12 @@ public partial class MainViewModel : ObservableObject, IDisposable var options = RelayOptions.Parse(Server, Origin, Token); var rows = await RelayApi.GetDevicesAsync(options, lifetime.Token); if (Server.Trim() != options.BaseUri.OriginalString || Origin.Trim() != options.Origin || Token != options.Token) return; + foreach (var connection in Connections.Where(c => c.HasConnection).ToArray()) { + if (rows.Any(r => r.Id == connection.DeviceId)) { missingRelayDevices.Remove(connection.DeviceId); continue; } + var misses=missingRelayDevices.GetValueOrDefault(connection.DeviceId)+1; + missingRelayDevices[connection.DeviceId]=misses; + if(misses>=3) { await connection.DisconnectAsync(); missingRelayDevices.Remove(connection.DeviceId); Log($"[{connection.DeviceId}] 设备连续三轮不在列表,停止自动重连。"); } + } var selectedId = SelectedDevice?.Id ?? preferredDevice; Devices.Clear(); foreach (var row in rows) { diff --git a/desktop/Ads.Desktop/MainWindow.axaml b/desktop/Ads.Desktop/MainWindow.axaml index c0d95e4..6d30147 100644 --- a/desktop/Ads.Desktop/MainWindow.axaml +++ b/desktop/Ads.Desktop/MainWindow.axaml @@ -1,7 +1,7 @@ - + @@ -94,6 +94,27 @@ + + + +