fix(profiles): catch server errors and send to client

sct · Feb 6, 2021 · 8b2c7d0 · 8b2c7d0
1 parent 57e6fce
commit 8b2c7d0
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 32 deletions.
diff --git a/server/api/sonarr.ts b/server/api/sonarr.ts
@@ -345,9 +345,8 @@ class SonarrAPI extends ExternalAPI {
           message: e.message,
         }
       );
-      return [];
 
-      // throw new Error('Failed to get language profiles');
+      throw new Error('Failed to get language profiles');
     }
   }
 

diff --git a/server/routes/service.ts b/server/routes/service.ts
@@ -121,36 +121,40 @@ serviceRoutes.get<{ sonarrId: string }>(
       }:${sonarrSettings.port}${sonarrSettings.baseUrl ?? ''}/api`,
     });
 
-    const profiles = await sonarr.getProfiles();
-    const rootFolders = await sonarr.getRootFolders();
-    const languageProfiles = await sonarr.getLanguageProfiles();
-
-    return res.status(200).json({
-      server: {
-        id: sonarrSettings.id,
-        name: sonarrSettings.name,
-        is4k: sonarrSettings.is4k,
-        isDefault: sonarrSettings.isDefault,
-        activeDirectory: sonarrSettings.activeDirectory,
-        activeProfileId: sonarrSettings.activeProfileId,
-        activeAnimeProfileId: sonarrSettings.activeAnimeProfileId,
-        activeAnimeDirectory: sonarrSettings.activeAnimeDirectory,
-        activeLanguageProfileId: sonarrSettings.activeLanguageProfileId,
-        activeAnimeLanguageProfileId:
-          sonarrSettings.activeAnimeLanguageProfileId,
-      },
-      profiles: profiles.map((profile) => ({
-        id: profile.id,
-        name: profile.name,
-      })),
-      rootFolders: rootFolders.map((folder) => ({
-        id: folder.id,
-        freeSpace: folder.freeSpace,
-        path: folder.path,
-        totalSpace: folder.totalSpace,
-      })),
-      languageProfiles: languageProfiles,
-    } as ServiceCommonServerWithDetails);
+    try {
+      const profiles = await sonarr.getProfiles();
+      const rootFolders = await sonarr.getRootFolders();
+      const languageProfiles = await sonarr.getLanguageProfiles();
+
+      return res.status(200).json({
+        server: {
+          id: sonarrSettings.id,
+          name: sonarrSettings.name,
+          is4k: sonarrSettings.is4k,
+          isDefault: sonarrSettings.isDefault,
+          activeDirectory: sonarrSettings.activeDirectory,
+          activeProfileId: sonarrSettings.activeProfileId,
+          activeAnimeProfileId: sonarrSettings.activeAnimeProfileId,
+          activeAnimeDirectory: sonarrSettings.activeAnimeDirectory,
+          activeLanguageProfileId: sonarrSettings.activeLanguageProfileId,
+          activeAnimeLanguageProfileId:
+            sonarrSettings.activeAnimeLanguageProfileId,
+        },
+        profiles: profiles.map((profile) => ({
+          id: profile.id,
+          name: profile.name,
+        })),
+        rootFolders: rootFolders.map((folder) => ({
+          id: folder.id,
+          freeSpace: folder.freeSpace,
+          path: folder.path,
+          totalSpace: folder.totalSpace,
+        })),
+        languageProfiles: languageProfiles,
+      } as ServiceCommonServerWithDetails);
+    } catch (e) {
+      next({ status: 500, message: e.message });
+    }
   }
 );