diff --git a/AGENTS.md b/AGENTS.md index c1d06b1..26d2a6b 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -25,7 +25,7 @@ | `crates/ads-core/` | 共用网络与协议代码,包括 WSS、WebRTC P2P、节点回退、ADB smart socket 和流式转发;源码在 `src/` | Rust、TOML | | `flutter_manager/` | 独立 Flutter Windows 管理中心,使用 Cupertino UI,提供电脑分组设备、Agent 管理、按天滚动日志、多设备连接、虚拟 USB、托盘与内嵌投屏 | Dart、C++、CMake、YAML、ICO | | `desktop/` | 跨平台桌面客户端及其测试项目、.NET SDK 配置与使用说明 | C#、Avalonia XAML(AXAML)、JSON、Markdown | -| `desktop/Ads.Desktop/` | Avalonia 多设备工作台,管理独立连接、自动端口分配、USB 模拟、多个 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 61a310f..c369dea 100644 --- a/README.md +++ b/README.md @@ -231,3 +231,5 @@ Linux 安装包:`bash scripts/build-linux-packages.sh`,提供 `.deb` 和 `.t Linux 原生虚拟 USB 已在 Ubuntu 实机通过 CLI 验证,部署和权限说明见 [Linux USB](docs/linux-usb.md)。Avalonia Linux GUI 已接入 pkexec 挂载,Flutter Linux 尚未接入。 Flutter 管理中心已迁移 Cupertino UI,设备按电脑归属分组,支持按电脑名搜索;运行日志按天保存并按大小滚动,路径及策略见 [Flutter 使用说明](flutter_manager/README.md)。 + +桌面日志界面提供“打开日志文件夹”。Avalonia 与 Flutter 均按天保存日志,单文件达到 5 MiB 后滚动,每日最多 5 份,保留最近 14 天。设备列表显示所属电脑及 Agent。Windows 安装包默认安装到 `%LOCALAPPDATA%/Programs/TongTongStudio/ADS-{Edition}`;用户配置和日志位置保持兼容。升级保持原 AppId,安装目录不再自动沿用旧的 TTSTD 路径。 diff --git a/agent/src/gateway.rs b/agent/src/gateway.rs index 370f2ae..ca3c60a 100644 --- a/agent/src/gateway.rs +++ b/agent/src/gateway.rs @@ -94,7 +94,7 @@ async fn online(args: Arc, health: &Option) -> Result<()> tasks.spawn(async move { let device=args.device.clone(); if let Err(error) = serve_session(args, session, signal_key).await { - if let Some(health)=health {health.lock().unwrap_or_else(|e|e.into_inner()).last_error=Some(error.to_string());} + if let Some(health)=health {health.lock().unwrap_or_else(|e|e.into_inner()).last_error=Some(format!("{error:#}"));} warn!(%device,%error, "device stream ended"); } }); @@ -113,7 +113,7 @@ pub async fn run(args: Arc, health: Option) { if let Some(health) = &health { let mut state = health.lock().unwrap_or_else(|e| e.into_inner()); state.connected = false; - state.last_error = Some(error.to_string()); + state.last_error = Some(format!("{error:#}")); } warn!(device=%args.device,%error, "gateway offline; reconnecting"); } diff --git a/crates/ads-core/src/lib.rs b/crates/ads-core/src/lib.rs index 6faee9b..d0fdbf3 100644 --- a/crates/ads-core/src/lib.rs +++ b/crates/ads-core/src/lib.rs @@ -243,8 +243,24 @@ async fn adb_request(stream: &mut TcpStream, service: &str) -> Result<()> { } } -/// Requires TCP adbd on the phone, even when selecting a USB transport. +/// Uses host-side adbd for emulators; other transports require TCP adbd on the phone. pub async fn adb_tcp_connect(server: &str, serial: &str, port: u16) -> Result { + // Emulator console serials identify a host-side raw adbd socket, not a + // device-internal TCP adbd listener. No tcpip restart is needed. + if let Some(console) = serial + .strip_prefix("emulator-") + .and_then(|v| v.parse::().ok()) + { + if console >= 1024 && console % 2 == 0 { + let host = server + .rsplit_once(':') + .context("ADB server requires host:port")? + .0; + return tcp_connect(&format!("{host}:{}", console + 1)) + .await + .context("cannot reach emulator host adbd"); + } + } let mut stream = tcp_connect(server).await?; timeout(CONNECT_TIMEOUT, async { adb_request(&mut stream, &format!("host:transport:{serial}")).await?; @@ -268,6 +284,26 @@ pub fn init_logging() { mod tests { use super::*; + #[tokio::test] + async fn emulator_uses_host_adbd_socket() { + let listener = loop { + let socket = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap(); + if socket.local_addr().unwrap().port() % 2 == 1 { + break socket; + } + }; + let serial = format!("emulator-{}", listener.local_addr().unwrap().port() - 1); + let peer = tokio::spawn(async move { + let (mut stream, _) = listener.accept().await.unwrap(); + stream.write_all(b"raw-adbd").await.unwrap(); + }); + let mut stream = adb_tcp_connect("127.0.0.1:1", &serial, 5555).await.unwrap(); + let mut bytes = [0; 8]; + stream.read_exact(&mut bytes).await.unwrap(); + assert_eq!(&bytes, b"raw-adbd"); + peer.await.unwrap(); + } + #[test] fn rejects_unsafe_configuration() { let network = NetworkArgs { diff --git a/deploy/windows/desktop-installer.iss b/deploy/windows/desktop-installer.iss index 3f56e09..dafcd5a 100644 --- a/deploy/windows/desktop-installer.iss +++ b/deploy/windows/desktop-installer.iss @@ -6,7 +6,8 @@ AppId=TTSTD.ADS.{#Edition} AppName=ADS {#Edition} AppVersion={#Version} AppPublisher=TongTong Studio -DefaultDirName={localappdata}\Programs\TTSTD\ADS-{#Edition} +DefaultDirName={localappdata}\Programs\TongTongStudio\ADS-{#Edition} +UsePreviousAppDir=no DefaultGroupName=ADS {#Edition} PrivilegesRequired=lowest ArchitecturesAllowed=x64compatible diff --git a/desktop/Ads.Desktop.Tests/DailyLogTests.cs b/desktop/Ads.Desktop.Tests/DailyLogTests.cs new file mode 100644 index 0000000..96fe768 --- /dev/null +++ b/desktop/Ads.Desktop.Tests/DailyLogTests.cs @@ -0,0 +1,17 @@ +using Ads.Desktop; +using Xunit; +namespace Ads.Desktop.Tests; +public class DailyLogTests { + [Fact] public void PersistsAndCleansOnlyOwnedExpiredLogs() { + var folder=Path.Combine(Path.GetTempPath(),Guid.NewGuid().ToString()); + Directory.CreateDirectory(folder); + try { + File.WriteAllText(Path.Combine(folder,"ads-2000-01-01.1.log"),"old"); + File.WriteAllText(Path.Combine(folder,"ads-2000-01-01-custom.log"),"keep"); + new DailyLog(folder).Write("connection diagnostic"); + Assert.False(File.Exists(Path.Combine(folder,"ads-2000-01-01.1.log"))); + Assert.True(File.Exists(Path.Combine(folder,"ads-2000-01-01-custom.log"))); + Assert.Contains("connection diagnostic",File.ReadAllText(Path.Combine(folder,$"ads-{DateTime.Now:yyyy-MM-dd}.log"))); + } finally { Directory.Delete(folder,true); } + } +} diff --git a/desktop/Ads.Desktop/DailyLog.cs b/desktop/Ads.Desktop/DailyLog.cs new file mode 100644 index 0000000..3c4899a --- /dev/null +++ b/desktop/Ads.Desktop/DailyLog.cs @@ -0,0 +1,38 @@ +using System.Text; +namespace Ads.Desktop; +public sealed class DailyLog +{ + readonly string folder; readonly object gate = new(); DateTime cleanedDate; + public string Folder => folder; + public DailyLog(string path) => folder = path; + public void Write(string message) + { + lock (gate) + { + try + { + Directory.CreateDirectory(folder); var now = DateTime.Now; var name = $"ads-{now:yyyy-MM-dd}"; + if (cleanedDate != now.Date) + { + foreach (var file in Directory.EnumerateFiles(folder, "ads-*.log")) + { + var text = Path.GetFileName(file); + if (System.Text.RegularExpressions.Regex.IsMatch(text, @"^ads-\d{4}-\d{2}-\d{2}(\.[1-4])?\.log$") && DateTime.TryParseExact(text.Substring(4, 10), "yyyy-MM-dd", null, System.Globalization.DateTimeStyles.None, out var date) && date < now.Date.AddDays(-13)) File.Delete(file); + } + cleanedDate = now.Date; + } + var path = Path.Combine(folder, name + ".log"); + if (File.Exists(path) && new FileInfo(path).Length >= 5 * 1024 * 1024) + { + var oldest = Path.Combine(folder, name + ".4.log"); if (File.Exists(oldest)) File.Delete(oldest); + for (var i = 3; i >= 1; i--) { var old = Path.Combine(folder, $"{name}.{i}.log"); if (File.Exists(old)) File.Move(old, Path.Combine(folder, $"{name}.{i + 1}.log")); } + File.Move(path, Path.Combine(folder, name + ".1.log")); + } + if (message.Length > 16384) message = message[..16384] + " [truncated]"; + File.AppendAllText(path, $"{now:O} {message}\n", Encoding.UTF8); + } + catch (IOException) { } + catch (UnauthorizedAccessException) { } + } + } +} diff --git a/desktop/Ads.Desktop/MainViewModel.cs b/desktop/Ads.Desktop/MainViewModel.cs index fbd7949..8e940ce 100644 --- a/desktop/Ads.Desktop/MainViewModel.cs +++ b/desktop/Ads.Desktop/MainViewModel.cs @@ -8,8 +8,9 @@ using CommunityToolkit.Mvvm.Input; namespace Ads.Desktop; -public sealed record DeviceItem(string Id, bool Busy, bool IsLocal, bool Online = true, string LocalSummary = "") +public sealed record DeviceItem(string Id, bool Busy, bool IsLocal, bool Online = true, string LocalSummary = "", string ComputerName="", string AgentId="") { + public string ComputerLabel => "电脑:"+(ComputerName.Length==0?"未上报电脑名":ComputerName)+(AgentId.Length==0?"":" · "+AgentId); public string Description => IsLocal ? "本机 · " + LocalSummary : !Online ? "远程暂时离线" : Busy ? "在线 · 其他客户端使用中" : "在线 · 可连接"; } @@ -143,9 +144,13 @@ public partial class MainViewModel : ObservableObject, IDisposable return text; } + private DailyLog? dailyLog; + public string LogFolder => Path.Combine(folder,"logs"); + [RelayCommand] private void OpenLogFolder(){try{Directory.CreateDirectory(LogFolder);Process.Start(new ProcessStartInfo(LogFolder){UseShellExecute=true});}catch(Exception error){Report(error);}} private void Log(string message) { - var line = $"{DateTime.Now:HH:mm:ss} {Redact(message)}"; + var safe=Redact(message);(dailyLog ??= new DailyLog(LogFolder)).Write(safe); + var line = $"{DateTime.Now:HH:mm:ss} {safe}"; void Append() { if (disposed) return; Logs.Add(line); while (Logs.Count > 1000) Logs.RemoveAt(0); } if (Dispatcher.UIThread.CheckAccess()) Append(); else Dispatcher.UIThread.Post(Append); } @@ -202,7 +207,7 @@ public partial class MainViewModel : ObservableObject, IDisposable Devices.Clear(); foreach (var row in rows) { var connection = sessions.GetValueOrDefault(row.Id); - Devices.Add(new DeviceItem(row.Id, row.Busy || connection?.HasConnection == true, connection?.HasConnection == true, true, connection?.Status ?? "")); + Devices.Add(new DeviceItem(row.Id, row.Busy || connection?.HasConnection == true, connection?.HasConnection == true, true, connection?.Status ?? "",row.ComputerName,row.AgentId)); } foreach (var local in Connections.Where(c => rows.All(r => r.Id != c.DeviceId))) Devices.Add(new DeviceItem(local.DeviceId, true, true, false, local.Status)); diff --git a/desktop/Ads.Desktop/MainWindow.axaml b/desktop/Ads.Desktop/MainWindow.axaml index 4e194cb..d2d84b0 100644 --- a/desktop/Ads.Desktop/MainWindow.axaml +++ b/desktop/Ads.Desktop/MainWindow.axaml @@ -16,6 +16,7 @@ +