added connecting state and improved the logic on tooltip generation

ibetitsmike · ibetitsmike · commit d1b2c7d59b7e · 2025-06-24T14:46:36.000+02:00
diff --git a/App/ViewModels/AgentViewModel.cs b/App/ViewModels/AgentViewModel.cs
@@ -82,9 +82,10 @@ public AgentViewModel CreateDummy(IAgentExpanderHost expanderHost, Uuid id,
 public enum AgentConnectionStatus
 {
     Healthy,
+    Connecting,
     Unhealthy,
     NoRecentHandshake,
-    Offline,
+    Offline
 }
 
 public static class AgentConnectionStatusExtensions
@@ -93,6 +94,7 @@ public static string ToDisplayString(this AgentConnectionStatus status) =>
         status switch
         {
             AgentConnectionStatus.Healthy => "Healthy",
+            AgentConnectionStatus.Connecting => "Connecting",
             AgentConnectionStatus.Unhealthy => "High latency",
             AgentConnectionStatus.NoRecentHandshake => "No recent handshake",
             AgentConnectionStatus.Offline => "Offline",
@@ -224,7 +226,9 @@ public string FullyQualifiedDomainName
     [NotifyPropertyChangedFor(nameof(ConnectionTooltip))]
     public partial DateTime? LastHandshake { get; set; } = null;
 
-    public string ConnectionTooltip { get
+    public string ConnectionTooltip
+    {
+        get
         {
             var description = new StringBuilder();
             var highLatencyWarning = ConnectionStatus == AgentConnectionStatus.Unhealthy ? $"({AgentConnectionStatus.Unhealthy.ToDisplayString()})" : "";
diff --git a/App/ViewModels/TrayWindowViewModel.cs b/App/ViewModels/TrayWindowViewModel.cs
@@ -224,24 +224,28 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
             if (string.IsNullOrWhiteSpace(fqdn))
                 continue;
 
-#pragma warning disable CS8602 // Protobuf will always set this value, so we can safely dereference them.
-            var lastHandshakeAgo = DateTime.UtcNow.Subtract(agent.LastHandshake.ToDateTime());
-#pragma warning restore CS8602
-
-            // For compatibility with older deployments, we assume that if the
-            // last ping is null, the agent is healthy.
-            var isLatencyAcceptable = agent.LastPing == null || agent.LastPing.Latency.ToTimeSpan() < HealthyPingThreshold;
             var connectionStatus = AgentConnectionStatus.Healthy;
-            if (lastHandshakeAgo > TimeSpan.FromMinutes(5))
+
+            if (agent.LastHandshake != null && agent.LastHandshake.ToDateTime() != default && agent.LastHandshake.ToDateTime() < DateTime.UtcNow)
             {
-                connectionStatus = AgentConnectionStatus.NoRecentHandshake;
+                // For compatibility with older deployments, we assume that if the
+                // last ping is null, the agent is healthy.
+                var isLatencyAcceptable = agent.LastPing == null || agent.LastPing.Latency.ToTimeSpan() < HealthyPingThreshold;
+
+                var lastHandshakeAgo = DateTime.UtcNow.Subtract(agent.LastHandshake.ToDateTime());
+
+                if (lastHandshakeAgo > TimeSpan.FromMinutes(5))
+                    connectionStatus = AgentConnectionStatus.NoRecentHandshake;
+                else if (!isLatencyAcceptable)
+                    connectionStatus = AgentConnectionStatus.Unhealthy;
             }
-            else if (!isLatencyAcceptable)
+            else
             {
-                connectionStatus = AgentConnectionStatus.Unhealthy;
+                // If the last handshake is not correct (null, default or in the future),
+                // we assume the agent is connecting (yellow status icon).
+                connectionStatus = AgentConnectionStatus.Connecting;
             }
 
-            
             workspacesWithAgents.Add(agent.WorkspaceId);
             var workspace = rpcModel.Workspaces.FirstOrDefault(w => w.Id == agent.WorkspaceId);
 
@@ -257,7 +261,7 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
                 agent.LastPing?.PreferredDerp,
                 agent.LastPing?.Latency?.ToTimeSpan(),
                 agent.LastPing?.PreferredDerpLatency?.ToTimeSpan(),
-                agent.LastHandshake?.ToDateTime()));
+                agent.LastHandshake != null && agent.LastHandshake.ToDateTime() != default ? agent.LastHandshake?.ToDateTime() : null));
         }
 
         // For every stopped workspace that doesn't have any agents, add a
diff --git a/App/Views/Pages/TrayWindowMainPage.xaml b/App/Views/Pages/TrayWindowMainPage.xaml
@@ -152,6 +152,11 @@
                                                     <SolidColorBrush Color="#ffcc01" />
                                                 </converters:StringToBrushSelectorItem.Value>
                                             </converters:StringToBrushSelectorItem>
+                                            <converters:StringToBrushSelectorItem Key="Connecting">
+                                                <converters:StringToBrushSelectorItem.Value>
+                                                    <SolidColorBrush Color="#ffcc01" />
+                                                </converters:StringToBrushSelectorItem.Value>
+                                            </converters:StringToBrushSelectorItem>
                                             <converters:StringToBrushSelectorItem Key="Healthy">
                                                 <converters:StringToBrushSelectorItem.Value>
                                                     <SolidColorBrush Color="#34c759" />
