feat: improve desktop path selection and USB connection recovery
This commit is contained in:
1 parent
5aa575f182
commit
6490665af8
28 files changed
+846
-51
No files matched your search
@@ -12,7 +12,7 @@ public sealed record ConnectionOptions(RelayOptions Relay, string Client, string
|
||||
public partial class DeviceConnection : ObservableObject, IDisposable
|
||||
{
|
||||
public string DeviceId { get; }
|
||||
public ConnectionOptions Options { get; }
|
||||
public ConnectionOptions Options { get; private set; }
|
||||
public string Mode => Options.UsbMode ? "USB ADB" : "网络 ADB";
|
||||
public string PortSummary => $"隧道 {Options.Port}" + (Options.UsbPort is { } u ? $" · USB/IP {u}" : "") + (ScreenPort is { } p ? $" · 投屏 {p}" : "");
|
||||
public string RawEndpoint => $"127.0.0.1:{Options.Port}";
|
||||
@@ -29,6 +29,11 @@ public partial class DeviceConnection : ObservableObject, IDisposable
|
||||
[ObservableProperty] private string apiLevel = "—";
|
||||
[ObservableProperty] private string notice = "";
|
||||
private Process? client, scrcpy;
|
||||
private bool screenWanted, usbBroken;
|
||||
private (string Path,int Size,int Fps,bool Audio,bool ViewOnly,int Port)? screenRequest;
|
||||
private int missingUsbPolls, recoveryAttempts, stablePolls;
|
||||
private DateTime nextRecovery=DateTime.MinValue;
|
||||
private CancellationTokenSource? recoveryCancellation;
|
||||
private WindowsUsbSession? usb;
|
||||
private string? transportFile, leaseFile;
|
||||
private readonly Action<string> log;
|
||||
@@ -94,10 +99,11 @@ public partial class DeviceConnection : ObservableObject, IDisposable
|
||||
if (disposed || !HasConnection || !await gate.WaitAsync(0)) return;
|
||||
try {
|
||||
if (scrcpy is { HasExited: true }) {
|
||||
if(scrcpy.ExitCode==0)screenWanted=false; else if(scrcpy.ExitCode==2 && Options.UsbMode)usbBroken=true;
|
||||
log($"手机控制窗口已关闭,退出码 {scrcpy.ExitCode}。");
|
||||
scrcpy.Dispose(); scrcpy = null; ScreenRunning = false; ScreenPort = null;
|
||||
}
|
||||
if (client is { HasExited: true } || usb is { HasExited: true }) {
|
||||
if (!Options.UsbMode && client is { HasExited: true }) {
|
||||
var reason = client is { HasExited: true } ? $"连接程序退出,代码 {client.ExitCode}" : "USB 模拟进程退出";
|
||||
await DisconnectCoreAsync(); Status = reason; Notice = reason + ",可重新连接。"; log(Notice); return;
|
||||
}
|
||||
@@ -119,11 +125,50 @@ public partial class DeviceConnection : ObservableObject, IDisposable
|
||||
"device" => "已连接 · 可调试和控制", "unauthorized" => "等待手机允许此电脑调试",
|
||||
"offline" => "设备离线 · 正在恢复连接", _ => "正在恢复连接 · 等待设备或网络"
|
||||
};
|
||||
if(Options.UsbMode) {
|
||||
var unauthorized=row?[1]=="unauthorized";
|
||||
if(Ready && !usbBroken && usb is not {HasExited:true} && client is not {HasExited:true}) {missingUsbPolls=0;if(++stablePolls>=10)recoveryAttempts=0;}
|
||||
else if(!unauthorized && (++missingUsbPolls>=3 || usbBroken || usb is {HasExited:true} || client is {HasExited:true}) && DateTime.UtcNow>=nextRecovery) {
|
||||
stablePolls=0;await RecoverUsbCoreAsync();return;
|
||||
}
|
||||
}
|
||||
if(Ready && screenWanted && !ScreenRunning && screenRequest is {} request && DateTime.UtcNow>=nextRecovery) {
|
||||
nextRecovery=DateTime.UtcNow.AddSeconds(5);
|
||||
var restoredPort=ConnectionPorts.Allocate(request.Port,new[]{Options.Port,Options.UsbPort??0});
|
||||
await StartScreenCoreAsync(request.Path,request.Size,request.Fps,request.Audio,request.ViewOnly,restoredPort);
|
||||
}
|
||||
if (Ready && !wasReady) { log("设备已就绪。"); await ReadInfoCoreAsync(); }
|
||||
} catch (OperationCanceledException) when (lifetime.IsCancellationRequested) { }
|
||||
catch (Exception error) { Ready = false; Notice = error.Message; log(error.Message); }
|
||||
finally { gate.Release(); }
|
||||
}
|
||||
private async Task RecoverUsbCoreAsync()
|
||||
{
|
||||
recoveryCancellation?.Dispose();
|
||||
recoveryCancellation=CancellationTokenSource.CreateLinkedTokenSource(lifetime.Token);
|
||||
var cancellation=recoveryCancellation.Token;
|
||||
nextRecovery=DateTime.UtcNow.AddSeconds(new[]{2,4,8,16,30}[Math.Min(recoveryAttempts++,4)]);
|
||||
Status="USB 会话中断 · 正在重新挂载";Ready=false;missingUsbPolls=0;
|
||||
log($"USB 自动恢复,第 {recoveryAttempts} 次。");
|
||||
try {
|
||||
await StopScreenCoreAsync(false);
|
||||
if(usb!=null){await usb.StopAsync(log);usb.Dispose();usb=null;}
|
||||
cancellation.ThrowIfCancellationRequested();
|
||||
if(client is null || client.HasExited) {
|
||||
client?.Dispose();
|
||||
if(File.Exists(leaseFile!))File.Delete(leaseFile!);
|
||||
var info=ProcessTools.ClientStartInfo(Options.Client,Options.Adb,Options.Relay,DeviceId,RawEndpoint);
|
||||
foreach(var arg in new[]{"--transport",Options.RelayOnly?"relay":"auto","--status-file",transportFile!,"--no-auto-connect","--lease-status-file",leaseFile!})info.ArgumentList.Add(arg);
|
||||
client=Start(info);
|
||||
}
|
||||
var newPort=ConnectionPorts.Allocate(Options.UsbPort is >=65535 ?3240:Options.UsbPort!.Value+1,new[]{Options.Port,ScreenPort??0});
|
||||
Options=Options with {UsbPort=newPort};OnPropertyChanged(nameof(PortSummary));
|
||||
usb=new WindowsUsbSession(DeviceId);
|
||||
await usb.StartAsync(Options.Usbip,newPort,RawEndpoint,leaseFile!,log,cancellation);
|
||||
Endpoint=usb.Serial;usbBroken=false;Status="USB 已重新挂载 · 等待 ADB 就绪";
|
||||
} catch(OperationCanceledException) when(cancellation.IsCancellationRequested) { }
|
||||
catch(Exception error){Notice="USB 恢复失败,稍后重试:"+error.Message;log(Notice);}
|
||||
}
|
||||
public void MonitoringFailed(string message) { Ready = false; Status = "ADB 检测失败"; Notice = message; }
|
||||
public Task ReadInfoAsync() => Exclusive(ReadInfoCoreAsync);
|
||||
private async Task ReadInfoCoreAsync()
|
||||
@@ -136,7 +181,8 @@ public partial class DeviceConnection : ObservableObject, IDisposable
|
||||
ApiLevel = lines.ElementAtOrDefault(2)?.Trim() ?? "未知";
|
||||
Notice = "设备信息已更新。";
|
||||
}
|
||||
public Task StartScreenAsync(string path, int size, int fps, bool audio, bool viewOnly, int port) => Exclusive(async () =>
|
||||
public Task StartScreenAsync(string path, int size, int fps, bool audio, bool viewOnly, int port) => Exclusive(()=>StartScreenCoreAsync(path,size,fps,audio,viewOnly,port));
|
||||
private async Task StartScreenCoreAsync(string path, int size, int fps, bool audio, bool viewOnly, int port)
|
||||
{
|
||||
if (!Ready || Endpoint == null || ScreenRunning) return;
|
||||
if (size is < 256 or > 8192 || fps is < 1 or > 240) throw new InvalidOperationException("分辨率范围 256–8192,帧率范围 1–240。");
|
||||
@@ -145,19 +191,22 @@ public partial class DeviceConnection : ObservableObject, IDisposable
|
||||
var args = new List<string> { "--serial", Endpoint, "--force-adb-forward", "--window-title", $"ADS · {DeviceId}", "--max-size", size.ToString(), "--max-fps", fps.ToString(), "--port", port.ToString() };
|
||||
if (!audio) args.Add("--no-audio"); if (viewOnly) args.Add("--no-control");
|
||||
var info = ProcessTools.CreateStartInfo(executable, args); info.Environment["ADB"] = Options.Adb;
|
||||
screenRequest=(path,size,fps,audio,viewOnly,port);screenWanted=true;
|
||||
scrcpy = Start(info); ScreenPort = port; ScreenRunning = true; Notice = "手机控制窗口已启动。"; log(Notice);
|
||||
});
|
||||
public Task StopScreenAsync() => Exclusive(StopScreenCoreAsync);
|
||||
private async Task StopScreenCoreAsync()
|
||||
}
|
||||
public Task StopScreenAsync() {screenWanted=false;return Exclusive(()=>StopScreenCoreAsync());}
|
||||
private async Task StopScreenCoreAsync(bool cancelResume=true)
|
||||
{
|
||||
if(cancelResume)screenWanted=false;
|
||||
var current = scrcpy; scrcpy = null;
|
||||
try { await ProcessTools.StopAsync(current); }
|
||||
finally { ScreenRunning = false; ScreenPort = null; }
|
||||
}
|
||||
public Task DisconnectAsync() => Exclusive(DisconnectCoreAsync);
|
||||
public Task DisconnectAsync() {screenWanted=false;recoveryCancellation?.Cancel();return Exclusive(DisconnectCoreAsync);}
|
||||
// Shutdown must also work after the shared cancellation token has been cancelled.
|
||||
public async Task ShutdownAsync()
|
||||
{
|
||||
screenWanted=false;recoveryCancellation?.Cancel();
|
||||
await gate.WaitAsync();
|
||||
try { await DisconnectCoreAsync(); }
|
||||
finally { gate.Release(); }
|
||||
|
||||
Reference in new issue
Block a user