comments

Author: deansheather

App/Converters/VpnLifecycleToBoolConverter.cs

@@ -6,6 +6,7 @@
 
 namespace Coder.Desktop.App.Converters;
 
+[DependencyProperty<bool>("Unknown", DefaultValue = false)]
 [DependencyProperty<bool>("Starting", DefaultValue = false)]
 [DependencyProperty<bool>("Started", DefaultValue = false)]
 [DependencyProperty<bool>("Stopping", DefaultValue = false)]
@@ -18,6 +19,7 @@ public object Convert(object value, Type targetType, object parameter, string la
 
         return lifecycle switch
         {
+            VpnLifecycle.Unknown => Unknown,
             VpnLifecycle.Starting => Starting,
             VpnLifecycle.Started => Started,
             VpnLifecycle.Stopping => Stopping,

App/Models/RpcModel.cs

@@ -13,6 +13,7 @@ public enum RpcLifecycle
 
 public enum VpnLifecycle
 {
+    Unknown,
     Stopped,
     Starting,
     Started,
@@ -23,7 +24,7 @@ public class RpcModel
 {
     public RpcLifecycle RpcLifecycle { get; set; } = RpcLifecycle.Disconnected;
 
-    public VpnLifecycle VpnLifecycle { get; set; } = VpnLifecycle.Stopped;
+    public VpnLifecycle VpnLifecycle { get; set; } = VpnLifecycle.Unknown;
 
     public List<Workspace> Workspaces { get; set; } = [];
 

App/Services/RpcController.cs

@@ -126,7 +126,7 @@ public async Task Reconnect(CancellationToken ct = default)
             MutateState(state =>
             {
                 state.RpcLifecycle = RpcLifecycle.Disconnected;
-                state.VpnLifecycle = VpnLifecycle.Stopped;
+                state.VpnLifecycle = VpnLifecycle.Unknown;
                 state.Workspaces.Clear();
                 state.Agents.Clear();
             });
@@ -136,7 +136,7 @@ public async Task Reconnect(CancellationToken ct = default)
         MutateState(state =>
         {
             state.RpcLifecycle = RpcLifecycle.Connected;
-            state.VpnLifecycle = VpnLifecycle.Stopping; // prevents clicking the toggle
+            state.VpnLifecycle = VpnLifecycle.Unknown;
             state.Workspaces.Clear();
             state.Agents.Clear();
         });
@@ -250,7 +250,7 @@ private void ApplyStatusUpdate(Status status)
         {
             state.VpnLifecycle = status.Lifecycle switch
             {
-                Status.Types.Lifecycle.Unknown => VpnLifecycle.Stopping, // disables the switch
+                Status.Types.Lifecycle.Unknown => VpnLifecycle.Unknown,
                 Status.Types.Lifecycle.Starting => VpnLifecycle.Starting,
                 Status.Types.Lifecycle.Started => VpnLifecycle.Started,
                 Status.Types.Lifecycle.Stopping => VpnLifecycle.Stopping,

App/ViewModels/TrayWindowViewModel.cs

@@ -22,8 +22,7 @@ public partial class TrayWindowViewModel : ObservableObject
     private DispatcherQueue? _dispatcherQueue;
 
     [ObservableProperty]
-    public partial VpnLifecycle VpnLifecycle { get; set; } =
-        VpnLifecycle.Stopping; // to prevent interaction until we get the real state
+    public partial VpnLifecycle VpnLifecycle { get; set; } = VpnLifecycle.Unknown;
 
     // VpnSwitchOn needs to be its own property as it is a two-way binding
     [ObservableProperty]
@@ -82,7 +81,7 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
         // Window should not show the current Page if the RPC is disconnected.
         if (rpcModel.RpcLifecycle is RpcLifecycle.Disconnected)
         {
-            VpnLifecycle = VpnLifecycle.Stopping;
+            VpnLifecycle = VpnLifecycle.Unknown;
             VpnSwitchOn = false;
             Agents = [];
             return;

Vpn.Proto/vpn.proto

@@ -50,7 +50,7 @@ message ClientMessage {
   oneof msg {
     StartRequest start = 2;
     StopRequest stop = 3;
-  StatusRequest status = 4;
+    StatusRequest status = 4;
   }
 }
 
@@ -60,7 +60,7 @@ message ServiceMessage {
   oneof msg {
     StartResponse start = 2;
     StopResponse stop = 3;
-  Status status = 4; // either in reply to a StatusRequest or broadcasted
+    Status status = 4; // either in reply to a StatusRequest or broadcasted
   }
 }