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
@@ -56,6 +56,11 @@ public partial class AgentManagementViewModel : ObservableObject, IDisposable
|
||||
public AgentManagementViewModel(Func<(string,string)> server, Action<string>? logger=null, bool background=true, bool credentials=true)
|
||||
{
|
||||
this.server=server; log=logger ?? (_=>{});
|
||||
try {
|
||||
var paths=Path.Combine(DesktopPaths.SettingsFolder,"agent-ui-paths.json");
|
||||
if(File.Exists(paths))foreach(var entry in JsonSerializer.Deserialize<Dictionary<string,string>>(File.ReadAllText(paths)) ?? new())chosenPaths[entry.Key]=entry.Value;
|
||||
if(chosenPaths.TryGetValue("config",out var config))ConfigPath=config;
|
||||
}catch(Exception e){Notice="读取文件位置失败:"+e.Message;}
|
||||
var (initialServer,initialOrigin)=server();
|
||||
ConfigJson=JsonSerializer.Serialize(new {version=1,id="local-pc",name=Environment.MachineName,server=initialServer,connect_address=string.IsNullOrWhiteSpace(initialOrigin)?null:initialOrigin,adb_server="127.0.0.1:5037",devices=Array.Empty<object>()}, new JsonSerializerOptions{WriteIndented=true});
|
||||
if(credentials) {
|
||||
@@ -68,6 +73,16 @@ public partial class AgentManagementViewModel : ObservableObject, IDisposable
|
||||
public static string DefaultConfig() => OperatingSystem.IsWindows()
|
||||
? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),"AndroidDeviceStreaming","agent","agent.json")
|
||||
: Path.Combine(Environment.GetEnvironmentVariable("XDG_CONFIG_HOME") ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),".config"),"ads","agent.json");
|
||||
private readonly Dictionary<string,string> chosenPaths = new();
|
||||
public string AdminPath=>RememberedPath("admin");
|
||||
public string EnrollmentPath=>RememberedPath("enrollment");
|
||||
public string RememberedPath(string key) => chosenPaths.GetValueOrDefault(key,"");
|
||||
public void RememberPath(string key,string path) {
|
||||
chosenPaths[key]=path;OnPropertyChanged(nameof(AdminPath));OnPropertyChanged(nameof(EnrollmentPath));
|
||||
Directory.CreateDirectory(DesktopPaths.SettingsFolder);
|
||||
var file=Path.Combine(DesktopPaths.SettingsFolder,"agent-ui-paths.json");
|
||||
File.WriteAllText(file,JsonSerializer.Serialize(chosenPaths));
|
||||
}
|
||||
public void StartMonitoring()=>timer.Start();
|
||||
private string Redact(string value) { foreach(var secret in secrets) value=value.Replace(secret,"[REDACTED]",StringComparison.Ordinal);return value; }
|
||||
partial void OnAdminTokenChanged(string value){if(value.Length>0)secrets.Add(value);}
|
||||
@@ -98,14 +113,14 @@ public partial class AgentManagementViewModel : ObservableObject, IDisposable
|
||||
if(new FileInfo(path).Length>65536)throw new InvalidOperationException("凭据文件过大。");
|
||||
var token=File.ReadLines(path).Select(l=>l.Split('=',2)).FirstOrDefault(p=>p.Length==2&&p[0].Trim()=="ADS_ADMIN_TOKEN")?.ElementAt(1).Trim();
|
||||
if(string.IsNullOrEmpty(token)||token.Length<32||token.Contains('\r')||token.Contains('\n'))throw new InvalidOperationException("文件中没有有效的 ADS_ADMIN_TOKEN。");
|
||||
AdminToken=token;Notice="管理员凭据已加载,内容仅保存在内存中。";
|
||||
RememberPath("admin",path);AdminToken=token;Notice="管理员凭据已加载,内容仅保存在内存中。";
|
||||
}
|
||||
public void ImportEnrollment(string path)
|
||||
{
|
||||
if(new FileInfo(path).Length>65536)throw new InvalidOperationException("凭据文件过大。");
|
||||
var value=File.ReadLines(path).FirstOrDefault(l=>l.StartsWith("ADS_AGENT_TOKEN=",StringComparison.Ordinal))?[16..].Trim();
|
||||
if(string.IsNullOrEmpty(value)||value.Length<32)throw new InvalidOperationException("文件中没有有效的 ADS_AGENT_TOKEN。");
|
||||
EnrollmentToken=value;Notice="设备端凭据已加载,仅供本机初始化使用。";
|
||||
RememberPath("enrollment",path);EnrollmentToken=value;Notice="设备端凭据已加载,仅供本机初始化使用。";
|
||||
}
|
||||
private RelayOptions Options(){var(s,o)=server();return RelayOptions.Parse(s,o,AdminToken);}
|
||||
private async Task Guard(Func<Task> action)
|
||||
|
||||
Reference in new issue
Block a user