Add targeted local port cleanup to desktop workbench

This commit is contained in:
tongtong committed 2026-11-12 15:46:15 +08:00
1 parent 51c4f86918
commit ab9cc8d0a5
8 files changed
+312 -1

No files matched your search

+34
View File
@@ -35,6 +35,7 @@ public partial class MainViewModel : ObservableObject, IDisposable
[ObservableProperty] private string relayStatus = "中继尚未检测";
[ObservableProperty] private string credentialSource = "未加载客户端凭据";
[ObservableProperty] private string toolsStatus = "请检查工具路径";
[ObservableProperty] private string portCleanupStatus = "清理会结束所选本地端口的监听进程。";
[ObservableProperty] private string model = "—";
[ObservableProperty] private string androidVersion = "—";
[ObservableProperty] private string apiLevel = "—";
@@ -115,6 +116,7 @@ public partial class MainViewModel : ObservableObject, IDisposable
ConnectCommand.NotifyCanExecuteChanged(); DisconnectCommand.NotifyCanExecuteChanged();
ReconnectCommand.NotifyCanExecuteChanged(); ReadDeviceInfoCommand.NotifyCanExecuteChanged();
StartScrcpyCommand.NotifyCanExecuteChanged(); StopScrcpyCommand.NotifyCanExecuteChanged();
ClearPortCommand.NotifyCanExecuteChanged();
}
private string Redact(string text)
@@ -203,6 +205,38 @@ public partial class MainViewModel : ObservableObject, IDisposable
private bool CanReadDeviceInfo() => !IsWorking && Ready;
private bool CanStartScrcpy() => !IsWorking && Ready && !ScreenRunning;
private bool CanStopScrcpy() => ScreenRunning;
private bool CanClearPort() => !IsWorking;
[RelayCommand(CanExecute = nameof(CanClearPort))]
private Task ClearPortAsync() => Guard(() => Exclusive(async () =>
{
var selectedPort = Port;
if (selectedPort == 5037) throw new InvalidOperationException("不能清理 ADB 主服务端口 5037,请选择隧道端口。");
var releasedOwnConnection = HasConnection && endpoint == $"127.0.0.1:{selectedPort}";
if (releasedOwnConnection)
{
Log($"清理端口 {selectedPort}:先断开当前工作台管理的连接。");
await DisconnectCoreAsync();
}
var owners = await Task.Run(() => LocalPortProcesses.Inspect(selectedPort), lifetime.Token);
PortCleanupStatus = owners.Count == 0 ? $"端口 {selectedPort} 没有监听进程。" :
string.Join(";", owners.Select(owner => $"{owner.Name} · PID {owner.Id} · 端口 {selectedPort}"));
foreach (var owner in owners) Log($"清理端口 {selectedPort}:{owner.Name}(PID {owner.Id})。");
var ended = await LocalPortProcesses.TerminateAsync(selectedPort, owners, lifetime.Token);
try
{
var adb = DesktopPaths.ResolveTool(AdbPath, "adb");
await AdbAsync(adb, lifetime.Token, "disconnect", $"127.0.0.1:{selectedPort}");
}
catch (Exception error) { Log("清除 ADB 端点:" + error.Message); }
PortCleanupStatus = releasedOwnConnection && ended == 0
? $"本机连接已断开,端口 {selectedPort} 已释放。"
: $"端口 {selectedPort} 已释放,结束了 {ended} 个占用进程。";
Notice = PortCleanupStatus + " 现在可以重新连接设备。";
Log(PortCleanupStatus);
if (Token.Length >= 32)
try { await RefreshDevicesAsync(announce: false); } catch (Exception error) { Log(error.Message); }
}));
private async Task Exclusive(Func<Task> action)
{