Fix retry mechanism on API loading not working

CollapseLauncher · May 24, 2024 · d329d4f · d329d4f
1 parent 0cb0675
commit d329d4f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/CollapseLauncher/Classes/Extension/TaskExtensions.cs b/CollapseLauncher/Classes/Extension/TaskExtensions.cs
@@ -70,9 +70,10 @@ internal static class TaskExtensions
             }
 
             if (lastException is not null
-                && lastException is TaskCanceledException
                 && !fromToken.IsCancellationRequested)
-                throw new TimeoutException($"The operation has timed out with inner exception!", lastException);
+                throw lastException is TaskCanceledException ? 
+                    new TimeoutException($"The operation has timed out with inner exception!", lastException) :
+                    lastException;
 
             throw new TimeoutException($"The operation has timed out!");
         }

diff --git a/CollapseLauncher/Classes/Helper/LauncherApiLoader/ILauncherApi.cs b/CollapseLauncher/Classes/Helper/LauncherApiLoader/ILauncherApi.cs
@@ -17,7 +17,7 @@ internal interface ILauncherApi
         string? GameRegionTranslation { get; }
         RegionResourceProp? LauncherGameResource { get; }
         LauncherGameNews? LauncherGameNews { get; }
-        Task LoadAsync(OnLoadAction? beforeLoadRoutine = null, OnLoadAction? afterLoadRoutine = null,
+        Task<bool> LoadAsync(OnLoadAction? beforeLoadRoutine = null, OnLoadAction? afterLoadRoutine = null,
             ActionOnTimeOutRetry? onTimeoutRoutine = null, ErrorLoadRoutineDelegate? errorLoadRoutine = null,
             CancellationToken token = default);
     }

diff --git a/CollapseLauncher/Classes/Helper/LauncherApiLoader/LauncherApiBase.cs b/CollapseLauncher/Classes/Helper/LauncherApiLoader/LauncherApiBase.cs
@@ -46,25 +46,27 @@ protected LauncherApiBase(PresetConfig presetConfig, string gameName, string gam
             GameRegion   = gameRegion;
         }
 
-        public async Task LoadAsync(OnLoadAction?             beforeLoadRoutine, OnLoadAction? afterLoadRoutine,
-                                    ActionOnTimeOutRetry?     onTimeoutRoutine,
-                                    ErrorLoadRoutineDelegate? errorLoadRoutine, CancellationToken token)
+        public async Task<bool> LoadAsync(OnLoadAction?         beforeLoadRoutine, OnLoadAction?             afterLoadRoutine,
+                                          ActionOnTimeOutRetry? onTimeoutRoutine,  ErrorLoadRoutineDelegate? errorLoadRoutine,
+                                          CancellationToken     token)
         {
             beforeLoadRoutine?.Invoke(token);
 
             try
             {
                 IsLoadingCompleted = false;
                 await LoadAsyncInner(onTimeoutRoutine, token);
+                afterLoadRoutine?.Invoke(token);
+
+                return true;
             }
             catch (Exception ex)
             {
                 errorLoadRoutine?.Invoke(ex);
+                return false;
             }
             finally
             {
-                afterLoadRoutine?.Invoke(token);
-
                 IsLoadingCompleted = true;
             }
         }

diff --git a/CollapseLauncher/Classes/RegionManagement/RegionManagement.cs b/CollapseLauncher/Classes/RegionManagement/RegionManagement.cs
@@ -75,12 +75,20 @@ void AfterLoadRoutine(CancellationToken token)
                 LoadingMessageHelper.HideLoadingFrame();
 
                 IsLoadRegionComplete = true;
+
+                LogWriteLine($"Game: {regionToChangeName} has been completely initialized!", LogType.Scheme, true);
+                FinalizeLoadRegion(gameName, gameRegion);
+                ChangeBackgroundImageAsRegionAsync();
             }
 
             void OnErrorRoutine(Exception ex)
             {
+                LoadingMessageHelper.HideActionButton();
+                LoadingMessageHelper.HideLoadingFrame();
+
                 LogWriteLine($"Error has occurred while loading: {regionToChangeName}!\r\n{ex}", LogType.Scheme, true);
                 ErrorSender.SendExceptionWithoutPage(ex, ErrorType.Connection);
+                MainFrameChanger.ChangeWindowFrame(typeof(DisconnectedPage));
             }
 
             async void CancelLoadEvent(object sender, RoutedEventArgs args)
@@ -114,13 +122,7 @@ void ActionOnTimeOutRetry(int retryAttemptCount, int retryAttemptTotal, int time
                 LoadingMessageHelper.ShowActionButton(Lang._Misc.Cancel, "", CancelLoadEvent);
             }
 
-            await preset.GameLauncherApi.LoadAsync(BeforeLoadRoutine, AfterLoadRoutine, ActionOnTimeOutRetry, OnErrorRoutine, tokenSource.Token);
-
-            LogWriteLine($"Game: {regionToChangeName} has been completely initialized!", LogType.Scheme, true);
-            FinalizeLoadRegion(gameName, gameRegion);
-            ChangeBackgroundImageAsRegionAsync();
-
-            return true;
+            return await preset.GameLauncherApi.LoadAsync(BeforeLoadRoutine, AfterLoadRoutine, ActionOnTimeOutRetry, OnErrorRoutine, tokenSource.Token);
         }
 
         public void ClearMainPageState()