feat: removed blocking wait for reconnect, mutagen initializing improvements

Author: ibetitsmike

App/App.xaml.cs

@@ -165,20 +165,21 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
         }, CancellationToken.None);
 
         // Initialize file sync.
-        var syncSessionCts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-        var syncSessionController = _services.GetRequiredService<ISyncSessionController>();
-        _ = syncSessionController.RefreshState(syncSessionCts.Token).ContinueWith(t =>
-        {
-            if (t.IsCanceled || t.Exception != null)
-            {
-                _logger.LogError(t.Exception, "failed to refresh sync state (canceled = {canceled})", t.IsCanceled);
-#if DEBUG
-                Debugger.Break();
-#endif
-            }
 
-            syncSessionCts.Dispose();
-        }, CancellationToken.None);
+        _ = Task.Delay(20000).ContinueWith((_) =>
+        {
+            var syncSessionCts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+            var syncSessionController = _services.GetRequiredService<ISyncSessionController>();
+            syncSessionController.RefreshState(syncSessionCts.Token).ContinueWith(
+                t =>
+                {
+                    if (t.IsCanceled || t.Exception != null)
+                    {
+                        _logger.LogError(t.Exception, "failed to refresh sync state (canceled = {canceled})", t.IsCanceled);
+                    }
+                    syncSessionCts.Dispose();
+                }, CancellationToken.None);
+        });
 
         // Prevent the TrayWindow from closing, just hide it.
         var trayWindow = _services.GetRequiredService<TrayWindow>();

App/Services/RpcController.cs

@@ -313,7 +313,7 @@ private void SpeakerOnError(Exception e)
         Debug.WriteLine($"Error: {e}");
         try
         {
-            Reconnect(CancellationToken.None).Wait();
+            using var _ = Reconnect(CancellationToken.None);
         }
         catch
         {

App/ViewModels/FileSyncListViewModel.cs

@@ -189,7 +189,7 @@ private void SyncSessionStateChanged(object? sender, SyncSessionControllerStateM
         UpdateSyncSessionState(syncSessionState);
     }
 
-    private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel credentialModel)
+    private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel credentialModel, SyncSessionControllerStateModel? syncSessionState = null)
     {
         var oldMessage = UnavailableMessage;
         if (rpcModel.RpcLifecycle != RpcLifecycle.Connected)
@@ -204,6 +204,9 @@ private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel crede
         else if (rpcModel.VpnLifecycle != VpnLifecycle.Started)
         {
             UnavailableMessage = "Please start Coder Connect from the tray window to access file sync.";
+        } else if(syncSessionState != null && syncSessionState.Lifecycle == SyncSessionControllerLifecycle.Uninitialized)
+        {
+            UnavailableMessage = "Sync session controller is not initialized. Please wait...";
         }
         else
         {
@@ -219,6 +222,13 @@ private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel crede
 
     private void UpdateSyncSessionState(SyncSessionControllerStateModel syncSessionState)
     {
+        // This should never happen.
+        if (syncSessionState == null)
+            return;
+        if (syncSessionState.Lifecycle == SyncSessionControllerLifecycle.Uninitialized)
+        {
+            MaybeSetUnavailableMessage(_rpcController.GetState(), _credentialManager.GetCachedCredentials(), syncSessionState);
+        }
         Error = syncSessionState.DaemonError;
         Sessions = syncSessionState.SyncSessions.Select(s => new SyncSessionViewModel(this, s)).ToList();
     }

App/ViewModels/TrayWindowDisconnectedViewModel.cs

@@ -1,8 +1,13 @@
-using System.Threading.Tasks;
 using Coder.Desktop.App.Models;
 using Coder.Desktop.App.Services;
+using Coder.Desktop.App.Views.Pages;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
 
 namespace Coder.Desktop.App.ViewModels;
 
@@ -11,6 +16,8 @@ public partial class TrayWindowDisconnectedViewModel : ObservableObject
     private readonly IRpcController _rpcController;
 
     [ObservableProperty] public partial bool ReconnectButtonEnabled { get; set; } = true;
+    [ObservableProperty] public partial string ErrorMessage { get; set; } = string.Empty;
+    [ObservableProperty] public partial bool ReconnectFailed { get; set; } = false;
 
     public TrayWindowDisconnectedViewModel(IRpcController rpcController)
     {
@@ -26,6 +33,16 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
     [RelayCommand]
     public async Task Reconnect()
     {
-        await _rpcController.Reconnect();
+        try
+        {
+            ReconnectFailed = false;
+            ErrorMessage = string.Empty;
+            await _rpcController.Reconnect();
+        }
+        catch (Exception ex)
+        {
+            ErrorMessage = ex.Message;
+            ReconnectFailed = true;
+        }
     }
 }

App/Views/Pages/TrayWindowDisconnectedPage.xaml

@@ -30,6 +30,17 @@
 
         <controls:HorizontalRule />
 
+        <TextBlock TextWrapping="Wrap" Foreground="Red" Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+            <Bold>Reconnect failed</Bold>
+        </TextBlock>
+
+        <TextBlock
+            TextWrapping="Wrap"
+            Margin="0,0,0,10"
+            Foreground="Red"
+            Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"
+            Text="{x:Bind ViewModel.ErrorMessage, Mode=OneWay}" />
+
         <HyperlinkButton
             HorizontalContentAlignment="Left"
             HorizontalAlignment="Stretch"

App/Views/Pages/TrayWindowDisconnectedPage.xaml.cs

@@ -1,5 +1,7 @@
 using Coder.Desktop.App.ViewModels;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using System;
 
 namespace Coder.Desktop.App.Views.Pages;
 

App/Views/TrayWindow.xaml.cs

@@ -122,8 +122,7 @@ public TrayWindow(IRpcController rpcController, ICredentialManager credentialMan
     private void SetPageByState(RpcModel rpcModel, CredentialModel credentialModel,
         SyncSessionControllerStateModel syncSessionModel)
     {
-        if (credentialModel.State == CredentialState.Unknown ||
-            syncSessionModel.Lifecycle == SyncSessionControllerLifecycle.Uninitialized)
+        if (credentialModel.State == CredentialState.Unknown)
         {
             SetRootFrame(_loadingPage);
             return;