Merge pull request #1183 from thunderstore-io/improved-profile-errors

Improve profile code API error handling
ebkr · Jan 27, 2024 · c69c403 · c69c403
2 parents a98ddc8 + 983723b
commit c69c403
Showing 1 changed file with 46 additions and 31 deletions.
diff --git a/src/r2mm/profiles/ProfilesClient.ts b/src/r2mm/profiles/ProfilesClient.ts
@@ -6,45 +6,60 @@ const getProfileUrl = (profileImportCode: string): string => {
     return `https://thunderstore.io/api/experimental/legacyprofile/get/${profileImportCode}/`;
 }
 
-async function createProfile(payload: string): Promise<AxiosResponse<{ key: string }>> {
-    try {
-        return await Axios.post(
-            "https://thunderstore.io/api/experimental/legacyprofile/create/",
-            payload,
-            {
-                headers: { 'Content-Type': 'application/octet-stream' }
-            }
-        );
-    } catch (e: any) {
-        if (Axios.isAxiosError(e) && e.response) {
-            if (e.response.status == 429) {
-                let message = e.message;
-                try {
-                    message = e.response.data.detail || e.message;
-                } catch {
-                }
-                throw new R2Error(
-                    "Too many exports in a short period of time",
-                    message,
-                    "Wait for a minute and try again"
-                );
-            } else {
-                throw new R2Error(
-                    "Failed to upload profile",
-                    e.message,
-                    `${e.response.status}`
-                );
+function formatApiError<T>(e: T, genericTitle: string): R2Error | T {
+    if (Axios.isAxiosError(e) && e.response) {
+        if (e.response.status == 429) {
+            let message = e.message;
+            try {
+                message = e.response.data.detail || e.message;
+            } catch {
             }
+            return new R2Error(
+                "Too many attempts in a short period of time",
+                message,
+                "You were rate limited by the server, wait for a while and try again."
+            );
+        } else {
+            return new R2Error(
+                genericTitle,
+                e.message,
+                `${e.response.status}`
+            );
+        }
+    }
+    return e;
+}
+
+async function handleApiErrors<I, J>(
+    apiCall: Promise<AxiosResponse<I, J>>,
+    errorTitle: string,
+): Promise<AxiosResponse<I, J>> {
+    try {
+        const response = await apiCall;
+        if (Axios.isAxiosError(response)) {
+            throw response;
         }
-        throw e;
+        return response;
+    } catch (e: any) {
+        throw formatApiError(e, errorTitle);
     }
 }
 
-async function getProfile(profileImportCode: string): Promise<AxiosResponse<string>> {
+function createProfile(payload: string): Promise<AxiosResponse<{ key: string }>> {
+    return handleApiErrors(Axios.post(
+        "https://thunderstore.io/api/experimental/legacyprofile/create/",
+        payload,
+        {
+            headers: { 'Content-Type': 'application/octet-stream' }
+        }
+    ), "Failed to upload profile");
+}
+
+function getProfile(profileImportCode: string): Promise<AxiosResponse<string>> {
     const url = CdnProvider.addCdnQueryParameter(
         getProfileUrl(profileImportCode)
     );
-    return await Axios.get(url);
+    return handleApiErrors(Axios.get(url), "Failed to download profile");
 }
 
 export const ProfileApiClient = {