Add retrying functionality to profile importing via code and reflect the

importing being in progress in the UI
ebkr · Oct 24, 2024 · 81d1d0b · 81d1d0b
1 parent f5ed710
commit 81d1d0b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/src/components/profiles-modals/ImportProfileModal.vue b/src/components/profiles-modals/ImportProfileModal.vue
@@ -21,6 +21,7 @@ import OnlineModList from "../views/OnlineModList.vue";
 export default class ImportProfileModal extends mixins(ProfilesMixin) {
     private importUpdateSelection: "IMPORT" | "UPDATE" | null = null;
     private importPhaseDescription: string = 'Downloading mods: 0%';
+    private importViaCodeInProgress: boolean = false;
     private profileImportCode: string = '';
     private listenerId: number = 0;
     private newProfileName: string = '';
@@ -65,6 +66,7 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
         this.listenerId = 0;
         this.newProfileName = '';
         this.importUpdateSelection = null;
+        this.importViaCodeInProgress = false;
         this.profileImportCode = '';
         this.profileImportFilePath = null;
         this.profileImportContent = null;
@@ -74,11 +76,14 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
     // User selects importing via code from the UI.
     async importProfileUsingCode() {
         try {
+            this.importViaCodeInProgress = true;
             const filepath = await ProfileImportExport.downloadProfileCode(this.profileImportCode.trim());
             await this.importProfileHandler([filepath]);
         } catch (e: any) {
             const err = R2Error.fromThrownValue(e, 'Failed to import profile');
             this.$store.commit('error/handleError', err);
+        } finally {
+            this.importViaCodeInProgress = false;
         }
     }
 
@@ -252,7 +257,7 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
         </template>
     </ModalCard>
 
-    <ModalCard v-else-if="activeStep === 'IMPORT_CODE'" key="IMPORT_CODE" :is-active="isOpen" @close-modal="closeModal">
+    <ModalCard :can-close="!importViaCodeInProgress" v-else-if="activeStep === 'IMPORT_CODE'" key="IMPORT_CODE" :is-active="isOpen" @close-modal="closeModal">
         <template v-slot:header>
             <h2 class="modal-title">Enter the profile code</h2>
         </template>
@@ -277,6 +282,13 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
                 v-if="!isProfileCodeValid(profileImportCode)">
                 Fix issues before importing
             </button>
+            <button
+                disabled
+                id="modal-import-profile-from-code-loading"
+                class="button is-disabled"
+                v-else-if="importViaCodeInProgress">
+                Loading...
+            </button>
             <button
                 id="modal-import-profile-from-code"
                 class="button is-info"

diff --git a/src/r2mm/mods/ProfileImportExport.ts b/src/r2mm/mods/ProfileImportExport.ts
@@ -1,9 +1,11 @@
+import { retry } from "../../utils/Common";
 import FileUtils from '../../utils/FileUtils';
 import path from 'path';
 import R2Error from "../../model/errors/R2Error";
 import PathResolver from '../../r2mm/manager/PathResolver';
 import FsProvider from '../../providers/generic/file/FsProvider';
 import { ProfileApiClient } from '../../r2mm/profiles/ProfilesClient';
+import {AxiosResponse} from "axios";
 
 const IMPORT_CACHE_DIRNAME = "_import_cache";
 const PROFILE_DATA_PREFIX = "#r2modman";
@@ -51,7 +53,14 @@ async function saveDownloadedProfile(profileData: string): Promise<string> {
  */
 async function downloadProfileCode(profileCode: string): Promise<string> {
     try {
-        const response = await ProfileApiClient.getProfile(profileCode);
+        const response: AxiosResponse<string> = await retry(
+            () => ProfileApiClient.getProfile(profileCode),
+            5,
+            1000,
+            undefined,
+            undefined,
+            true
+        );
         return saveDownloadedProfile(response.data);
     } catch (e: any) {
         if (e.message === 'Network Error') {

diff --git a/src/utils/Common.ts b/src/utils/Common.ts
@@ -31,7 +31,8 @@ export async function retry<T>(
     attempts: number = 3,
     interval: number = 5000,
     canRetry: () => boolean = () => true,
-    onError: (e: Error | unknown) => void = console.error
+    onError: (e: Error | unknown) => void = console.error,
+    throwLastErrorAsIs: boolean = false
 ): Promise<T> {
     for (let currentAttempt = 1; currentAttempt <= attempts; currentAttempt++) {
         if (!canRetry()) {
@@ -46,6 +47,9 @@ export async function retry<T>(
             if (currentAttempt < attempts) {
                 await sleep(interval);
             }
+            if (throwLastErrorAsIs && currentAttempt === attempts) {
+                throw e;
+            }
         }
     }
     throw new Error(`Retry failed after ${attempts} attempts!`);