PR comments

Author: deansheather

App/ViewModels/TrayWindowViewModel.cs

@@ -21,14 +21,15 @@ public partial class TrayWindowViewModel : ObservableObject
     private readonly IRpcController _rpcController;
     private readonly ICredentialManager _credentialManager;
 
-    private ToggleSwitch? _vpnActiveSwitch;
-    private bool _isProgrammaticStateChange;
-
     private DispatcherQueue? _dispatcherQueue;
 
     [ObservableProperty]
     public partial VpnLifecycle VpnLifecycle { get; set; } = VpnLifecycle.Unknown;
 
+    // This is a separate property because we need the switch to be 2-way.
+    [ObservableProperty]
+    public partial bool VpnSwitchActive { get; set; } = false;
+
     [ObservableProperty]
     public partial string? VpnFailedMessage { get; set; } = null;
 
@@ -83,13 +84,13 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
         if (rpcModel.RpcLifecycle is RpcLifecycle.Disconnected)
         {
             VpnLifecycle = VpnLifecycle.Unknown;
-            SetVpnSwitch(false);
+            VpnSwitchActive = false;
             Agents = [];
             return;
         }
 
         VpnLifecycle = rpcModel.VpnLifecycle;
-        SetVpnSwitch(rpcModel.VpnLifecycle is VpnLifecycle.Starting or VpnLifecycle.Started);
+        VpnSwitchActive = rpcModel.VpnLifecycle is VpnLifecycle.Starting or VpnLifecycle.Started;
 
         // Get the current dashboard URL.
         var credentialModel = _credentialManager.GetCredentials();
@@ -188,42 +189,20 @@ private void UpdateFromCredentialsModel(CredentialModel credentialModel)
         DashboardUrl = credentialModel.CoderUrl ?? DefaultDashboardUrl;
     }
 
-    private void SetVpnSwitch(bool value)
-    {
-        if (_vpnActiveSwitch == null) return;
-        _isProgrammaticStateChange = true;
-        _vpnActiveSwitch.IsOn = value;
-        _isProgrammaticStateChange = false;
-    }
-
-    // HACK: using a two-way bool to store the VPN active state results in
-    // erroneous events being sent (even outside our change handlers). This
-    // sucks and breaks the ViewModel separation but is necessary for the
-    // switch to function correctly.
-    public void VpnSwitch_Loaded(object sender, RoutedEventArgs e)
-    {
-        if (sender is not ToggleSwitch toggleSwitch) return;
-        _vpnActiveSwitch = toggleSwitch;
-        SetVpnSwitch(VpnLifecycle is VpnLifecycle.Starting or VpnLifecycle.Started);
-    }
-
     public void VpnSwitch_Toggled(object sender, RoutedEventArgs e)
     {
         if (sender is not ToggleSwitch toggleSwitch) return;
 
-        // HACK: the toggled event gets fired even when the switch state is
-        // changed from code, so we ignore all events while we're performing
-        // changes.
-        if (_isProgrammaticStateChange) return;
-
         VpnFailedMessage = "";
         try
         {
             // The start/stop methods will call back to update the state.
-            if (toggleSwitch.IsOn)
+            if (toggleSwitch.IsOn && VpnLifecycle is VpnLifecycle.Stopped)
                 _rpcController.StartVpn();
-            else
+            else if (!toggleSwitch.IsOn && VpnLifecycle is VpnLifecycle.Started)
                 _rpcController.StopVpn();
+            else
+                toggleSwitch.IsOn = VpnLifecycle is VpnLifecycle.Starting or VpnLifecycle.Started;
         }
         catch
         {

App/Views/Pages/TrayWindowMainPage.xaml

@@ -57,8 +57,8 @@
                 Grid.Column="2"
                 OnContent=""
                 OffContent=""
+                IsOn="{x:Bind ViewModel.VpnSwitchActive, Mode=TwoWay}"
                 IsEnabled="{x:Bind ViewModel.VpnLifecycle, Converter={StaticResource NotConnectingBoolConverter}, Mode=OneWay}"
-                Loaded="{x:Bind ViewModel.VpnSwitch_Loaded}"
                 Toggled="{x:Bind ViewModel.VpnSwitch_Toggled}"
                 Margin="0,0,-110,0"
                 HorizontalAlignment="Right" />

App/packages.lock.json

@@ -35,12 +35,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1"
         }
       },
-      "Microsoft.NET.ILLink.Tasks": {
-        "type": "Direct",
-        "requested": "[8.0.12, )",
-        "resolved": "8.0.12",
-        "contentHash": "FV4HnQ3JI15PHnJ5PGTbz+rYvrih42oLi/7UMIshNwCwUZhTq13UzrggtXk4ygrcMcN+4jsS6hhshx2p/Zd0ig=="
-      },
       "Microsoft.WindowsAppSDK": {
         "type": "Direct",
         "requested": "[1.6.250108002, )",

CoderSdk/CoderApiClient.cs

@@ -17,6 +17,12 @@ public override string ConvertName(string name)
     }
 }
 
+[JsonSerializable(typeof(BuildInfo))]
+[JsonSerializable(typeof(User))]
+public partial class CoderSdkJsonContext : JsonSerializerContext
+{
+}
+
 /// <summary>
 ///     Provides a limited selection of API methods for a Coder instance.
 /// </summary>
@@ -37,6 +43,7 @@ public CoderApiClient(Uri baseUrl)
         _httpClient.BaseAddress = baseUrl;
         _jsonOptions = new JsonSerializerOptions
         {
+            TypeInfoResolver = CoderSdkJsonContext.Default,
             PropertyNameCaseInsensitive = true,
             PropertyNamingPolicy = new SnakeCaseNamingPolicy(),
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
@@ -53,17 +60,19 @@ public void SetSessionToken(string token)
         _httpClient.DefaultRequestHeaders.Remove("Coder-Session-Token");
         _httpClient.DefaultRequestHeaders.Add("Coder-Session-Token", token);
     }
+    private async Task<TResponse> SendRequestNoBodyAsync<TResponse>(HttpMethod method, string path, CancellationToken ct = default) =>
+        await SendRequestAsync<object, TResponse>(method, path, null, ct);
 
-    private async Task<TResponse> SendRequestAsync<TResponse>(HttpMethod method, string path,
-        object? payload, CancellationToken ct = default)
+    private async Task<TResponse> SendRequestAsync<TRequest, TResponse>(HttpMethod method, string path,
+        TRequest? payload, CancellationToken ct = default)
     {
         try
         {
             var request = new HttpRequestMessage(method, path);
 
             if (payload is not null)
             {
-                var json = JsonSerializer.Serialize(payload, _jsonOptions);
+                var json = JsonSerializer.Serialize(payload, typeof(TRequest), _jsonOptions);
                 request.Content = new StringContent(json, Encoding.UTF8, "application/json");
             }
 

CoderSdk/Deployment.cs

@@ -17,6 +17,6 @@ public partial class CoderApiClient
 {
     public Task<BuildInfo> GetBuildInfo(CancellationToken ct = default)
     {
-        return SendRequestAsync<BuildInfo>(HttpMethod.Get, "/api/v2/buildinfo", null, ct);
+        return SendRequestNoBodyAsync<BuildInfo>(HttpMethod.Get, "/api/v2/buildinfo", ct);
     }
 }

CoderSdk/Users.cs

@@ -12,6 +12,6 @@ public partial class CoderApiClient
 {
     public Task<User> GetUser(string user, CancellationToken ct = default)
     {
-        return SendRequestAsync<User>(HttpMethod.Get, $"/api/v2/users/{user}", null, ct);
+        return SendRequestNoBodyAsync<User>(HttpMethod.Get, $"/api/v2/users/{user}", ct);
     }
 }