视口修复

Author: AtmoOmen

Assets/CHANGELOG.md

@@ -5,3 +5,4 @@
 * 优化了 MCP 调用流程
 * 优化了软件退出流程
 * 提升了读操作的并发量
+* 修复了局域网远程控制的 Avalonia 根在收到视口前开始渲染会导致软件无响应的问题

DirectorPrompt/Services/BrowserRemoteTransport.cs

@@ -28,6 +28,7 @@ public sealed class BrowserRemoteTransport : IAvaloniaRemoteTransportConnection,
 
     private WebApplication? application;
     private PendingFrame?   latestFrame;
+    private bool            isStarted;
     private long            sentSequenceID = -1;
     private WebSocket?      socket;
 
@@ -70,6 +71,18 @@ public async Task StartServerAsync(CancellationToken cancellationToken = default
 
     public void Start()
     {
+        isStarted = true;
+        StartRemoteSession();
+    }
+
+    private void StartRemoteSession()
+    {
+        lock (connectionLock)
+        {
+            if (!isStarted || socket is null)
+                return;
+        }
+
         OnMessage?.Invoke
         (
             this,
@@ -164,7 +177,7 @@ private async Task HandleRemoteAsync(HttpContext context)
             sentSequenceID = -1;
         }
 
-        Resize(1280, 800);
+        StartRemoteSession();
         await SendLatestFrameAsync();
 
         try
@@ -301,6 +314,9 @@ private void HandleMessage(string message)
 
     private void Resize(double width, double height, double dpi = 96)
     {
+        if (!double.IsFinite(width) || !double.IsFinite(height) || width <= 0 || height <= 0)
+            return;
+
         OnMessage?.Invoke
         (
             this,

DirectorPrompt/Services/LanSharingService.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Avalonia.Controls;
+using Avalonia.Controls.Embedding;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Remote.Protocol;
@@ -28,10 +29,12 @@ RemoteInteractionRouter remoteInteractionRouter
 
     private BrowserRemoteTransport? transport;
     private IDisposable?            remoteServer;
+    private EmbeddableControlRoot?  remoteRoot;
     private Control?                remoteContent;
     private MainWindow?             remoteWindow;
     private RemoteWindowService?    remoteWindowService;
     private Uri?                    endpoint;
+    private bool                    remoteRenderingStarted;
 
     public Uri? Endpoint
     {
@@ -109,7 +112,6 @@ await Dispatcher.UIThread.InvokeAsync
                 );
             }
 
-            currentTransport.Start();
             transport = currentTransport;
             Endpoint  = new Uri($"http://{address}:{port}/");
 
@@ -173,6 +175,8 @@ private void DisposeRemoteVisual()
     {
         remoteServer?.Dispose();
         remoteServer = null;
+        remoteRoot = null;
+        remoteRenderingStarted = false;
         remoteContent?.RemoveHandler(InputElement.PointerReleasedEvent, OnRemoteInteraction);
         remoteContent?.RemoveHandler(InputElement.KeyDownEvent,         OnRemoteInteraction);
         remoteContent?.DataContext = null;
@@ -215,10 +219,15 @@ internal MainWindow CreateRemoteVisual(BrowserRemoteTransport currentTransport)
                        ) ??
                        throw new InvalidOperationException("Avalonia 远程控制服务不可用");
 
+        remoteRoot = serverType.GetField("_topLevel", BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(remoteServer) as EmbeddableControlRoot ??
+                     throw new InvalidOperationException("Avalonia 远程控制根不可用");
+        remoteRoot.StopRendering();
+
         serverType.GetProperty("Content")!.SetValue(remoteServer, content);
         currentWindowService.Attach(remoteOverlay, remotePopupLayer);
         remoteInteractionRouter.Attach(currentWindowService);
         currentTransport.ViewportChanged += OnRemoteViewportChanged;
+        currentTransport.Start();
         remoteContent                    =  content;
         remoteWindowService              =  currentWindowService;
         return remoteWindow;
@@ -237,19 +246,40 @@ private void OnRemoteInteraction(object? sender, RoutedEventArgs e)
 
     private void OnRemoteViewportChanged(double width, double height)
     {
+        if (width <= 0 || height <= 0)
+            return;
+
         if (Dispatcher.UIThread.CheckAccess())
         {
             remoteWindow?.SetRemoteViewportWidth(width);
+            ScheduleRemoteRendering();
             return;
         }
 
         Dispatcher.UIThread.Post
         (
-            () => remoteWindow?.SetRemoteViewportWidth(width),
+            () =>
+            {
+                remoteWindow?.SetRemoteViewportWidth(width);
+                ScheduleRemoteRendering();
+            },
             DispatcherPriority.Send
         );
     }
 
+    private void ScheduleRemoteRendering()
+    {
+        if (remoteRenderingStarted)
+            return;
+
+        remoteRenderingStarted = true;
+        Dispatcher.UIThread.Post
+        (
+            () => remoteRoot?.StartRendering(),
+            DispatcherPriority.Render
+        );
+    }
+
     private static IPAddress GetLanAddress()
     {
         var address = NetworkInterface.GetAllNetworkInterfaces()

DirectorPrompt/Services/RemotePopupHost.cs

@@ -80,6 +80,12 @@ private static void PositionCurrentPopup()
         if (popupLayer is null || currentPopup is null)
             return;
 
+        var layerWidth  = popupLayer.Bounds.Width;
+        var layerHeight = popupLayer.Bounds.Height;
+
+        if (layerWidth <= 0 || layerHeight <= 0)
+            return;
+
         var point = currentPopup.Owner.TranslatePoint
         (
             new Point(0, currentPopup.Owner.Bounds.Height),
@@ -92,14 +98,14 @@ private static void PositionCurrentPopup()
         var left = Math.Max(8, point.Value.X);
         var top  = Math.Max(8, point.Value.Y);
 
-        if (popupLayer.Bounds.Width > 0 && currentPopup.Content.Width > popupLayer.Bounds.Width - 16)
-            currentPopup.Content.Width = Math.Max(0, popupLayer.Bounds.Width - 16);
+        if (currentPopup.Content.Width > layerWidth - 16)
+            currentPopup.Content.Width = Math.Max(1, layerWidth - 16);
 
-        currentPopup.DismissLayer.Width  = Math.Max(0, popupLayer.Bounds.Width);
-        currentPopup.DismissLayer.Height = Math.Max(0, popupLayer.Bounds.Height);
+        currentPopup.DismissLayer.Width  = layerWidth;
+        currentPopup.DismissLayer.Height = layerHeight;
 
-        if (left + currentPopup.Content.Width > popupLayer.Bounds.Width - 8)
-            left = Math.Max(8, popupLayer.Bounds.Width - currentPopup.Content.Width - 8);
+        if (left + currentPopup.Content.Width > layerWidth - 8)
+            left = Math.Max(8, layerWidth - currentPopup.Content.Width - 8);
 
         Canvas.SetLeft(currentPopup.Content, left);
         Canvas.SetTop(currentPopup.Content, top);