fix(dui): do not break the get streams loop if one server times out (#…

…2860) * fix(dui): do not break the get streams loop if one server times out * add configurable timeout to http client factory * configurettimeout value overrides * fix(dui): Fixed regression with cancellation of searches --------- Co-authored-by: Gergő Jedlicska <[email protected]> Co-authored-by: Jedd Morgan <[email protected]>
specklesystems · Aug 25, 2023 · 2c3023b · 2c3023b
1 parent 562080c
commit 2c3023b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/Core/Core/Api/GraphQL/Client.cs b/Core/Core/Api/GraphQL/Client.cs
@@ -35,7 +35,7 @@ public Client(Account account)
 
     Account = account;
 
-    HttpClient = Http.GetHttpProxyClient();
+    HttpClient = Http.GetHttpProxyClient(null, TimeSpan.FromSeconds(30));
     Http.AddAuthHeader(HttpClient, account.token);
 
     HttpClient.DefaultRequestHeaders.Add("apollographql-client-name", Setup.HostApplication);

diff --git a/Core/Core/Helpers/Http.cs b/Core/Core/Helpers/Http.cs
@@ -176,12 +176,14 @@ public static async Task<bool> HttpPing(string address)
     }
   }
 
-  public static HttpClient GetHttpProxyClient(SpeckleHttpClientHandler? handler = null)
+  public static HttpClient GetHttpProxyClient(SpeckleHttpClientHandler? handler = null, TimeSpan? timeout = null)
   {
     IWebProxy proxy = WebRequest.GetSystemWebProxy();
     proxy.Credentials = CredentialCache.DefaultCredentials;
 
-    return new HttpClient(handler ?? new SpeckleHttpClientHandler());
+    var client = new HttpClient(handler ?? new SpeckleHttpClientHandler());
+    client.Timeout = timeout ?? TimeSpan.FromSeconds(100);
+    return client;
   }
 
   public static bool CanAddAuth(string? authToken, out string? bearerHeader)

diff --git a/Core/Core/Transports/ServerUtils/ServerAPI.cs b/Core/Core/Transports/ServerUtils/ServerAPI.cs
@@ -40,7 +40,7 @@ public ServerApi(string baseUri, string? authorizationToken, string blobStorageF
     );
 
     _client.BaseAddress = new Uri(baseUri);
-    _client.Timeout = new TimeSpan(0, 0, timeoutSeconds);
+    _client.Timeout = TimeSpan.FromSeconds(timeoutSeconds);
 
     Http.AddAuthHeader(_client, authorizationToken);
   }

diff --git a/DesktopUI2/DesktopUI2/ViewModels/HomeViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/HomeViewModel.cs
@@ -204,14 +204,14 @@ private async Task GetStreams()
         }
         catch (OperationCanceledException)
         {
-          return;
+          continue;
         }
-        catch (Exception e)
+        catch (Exception ex)
         {
-          if (e.InnerException is TaskCanceledException)
+          if (ex.InnerException is TaskCanceledException)
             return;
 
-          SpeckleLog.Logger.Error(e, "Could not fetch streams");
+          SpeckleLog.Logger.Error(ex, "Could not fetch streams");
 
           Dispatcher.UIThread.Post(
             () =>
@@ -731,15 +731,17 @@ private async void OpenStreamCommand(object streamAccountWrapper)
     if (await CheckIsOffline().ConfigureAwait(true))
       return;
 
-
-
     if (streamAccountWrapper != null)
     {
       var streamState = new StreamState(streamAccountWrapper as StreamAccountWrapper);
 
       if (!await streamState.Client.IsStreamAccessible(streamState.StreamId).ConfigureAwait(true))
       {
-        Dialogs.ShowDialog("Stream not found", "Please ensure the stream exists and that you have access to it.", DialogIconKind.Error);
+        Dialogs.ShowDialog(
+          "Stream not found",
+          "Please ensure the stream exists and that you have access to it.",
+          DialogIconKind.Error
+        );
         return;
       }
 
@@ -755,16 +757,17 @@ private async void OpenSavedStreamCommand(object streamViewModel)
     if (await CheckIsOffline().ConfigureAwait(true))
       return;
 
-
-
     if (streamViewModel != null && streamViewModel is StreamViewModel svm && !svm.NoAccess)
     {
-
       try
       {
         if (!await svm.Client.IsStreamAccessible(svm.Stream.id).ConfigureAwait(true))
         {
-          Dialogs.ShowDialog("Stream not found", "Please ensure the stream exists and that you have access to it.", DialogIconKind.Error);
+          Dialogs.ShowDialog(
+            "Stream not found",
+            "Please ensure the stream exists and that you have access to it.",
+            DialogIconKind.Error
+          );
           return;
         }
 
@@ -778,7 +781,6 @@ private async void OpenSavedStreamCommand(object streamViewModel)
         SpeckleLog.Logger.Error(ex, "Failed to open saved stream {exceptionMessage}", ex.Message);
       }
     }
-
   }
 
   public void ToggleDarkThemeCommand()