feat: refactor hydra api

src/main/services/hydra-api.ts

@@ -5,6 +5,7 @@ import url from "url";
 import { uploadGamesBatch } from "./library-sync";
 import { clearGamesRemoteIds } from "./library-sync/clear-games-remote-id";
 import { logger } from "./logger";
+import { UserNotLoggedInError } from "@types";
 
 export class HydraApi {
   private static instance: AxiosInstance;
@@ -19,7 +20,7 @@ export class HydraApi {
     expirationTimestamp: 0,
   };
 
-  static isLoggedIn() {
+  private static isLoggedIn() {
     return this.userAuth.authToken !== "";
   }
 
@@ -127,10 +128,6 @@ export class HydraApi {
   }
 
   private static async revalidateAccessTokenIfExpired() {
-    if (!this.isLoggedIn()) {
-      throw new Error("user is not logged in");
-    }
-
     const now = new Date();
 
     if (this.userAuth.expirationTimestamp < now.getTime()) {
@@ -188,6 +185,8 @@ export class HydraApi {
   };
 
   static async get(url: string) {
+    if (!this.isLoggedIn()) throw new UserNotLoggedInError();
+
     await this.revalidateAccessTokenIfExpired();
     return this.instance
       .get(url, this.getAxiosConfig())
@@ -195,6 +194,8 @@ export class HydraApi {
   }
 
   static async post(url: string, data?: any) {
+    if (!this.isLoggedIn()) throw new UserNotLoggedInError();
+
     await this.revalidateAccessTokenIfExpired();
     return this.instance
       .post(url, data, this.getAxiosConfig())
@@ -202,6 +203,8 @@ export class HydraApi {
   }
 
   static async put(url: string, data?: any) {
+    if (!this.isLoggedIn()) throw new UserNotLoggedInError();
+
     await this.revalidateAccessTokenIfExpired();
     return this.instance
       .put(url, data, this.getAxiosConfig())
@@ -209,6 +212,8 @@ export class HydraApi {
   }
 
   static async patch(url: string, data?: any) {
+    if (!this.isLoggedIn()) throw new UserNotLoggedInError();
+
     await this.revalidateAccessTokenIfExpired();
     return this.instance
       .patch(url, data, this.getAxiosConfig())
@@ -216,6 +221,8 @@ export class HydraApi {
   }
 
   static async delete(url: string) {
+    if (!this.isLoggedIn()) throw new UserNotLoggedInError();
+
     await this.revalidateAccessTokenIfExpired();
     return this.instance
       .delete(url, this.getAxiosConfig())

src/main/services/library-sync/create-game.ts

@@ -3,23 +3,23 @@ import { HydraApi } from "../hydra-api";
 import { gameRepository } from "@main/repository";
 
 export const createGame = async (game: Game) => {
-  if (!HydraApi.isLoggedIn()) return;
-
   HydraApi.post(`/games`, {
     objectId: game.objectID,
     playTimeInMilliseconds: Math.trunc(game.playTimeInMilliseconds),
     shop: game.shop,
     lastTimePlayed: game.lastTimePlayed,
-  }).then((response) => {
-    const {
-      id: remoteId,
-      playTimeInMilliseconds,
-      lastTimePlayed,
-    } = response.data;
+  })
+    .then((response) => {
+      const {
+        id: remoteId,
+        playTimeInMilliseconds,
+        lastTimePlayed,
+      } = response.data;
 
-    gameRepository.update(
-      { objectID: game.objectID },
-      { remoteId, playTimeInMilliseconds, lastTimePlayed }
-    );
-  });
+      gameRepository.update(
+        { objectID: game.objectID },
+        { remoteId, playTimeInMilliseconds, lastTimePlayed }
+      );
+    })
+    .catch();
 };

src/main/services/library-sync/merge-with-remote-games.ts

@@ -2,8 +2,6 @@ import { gameRepository } from "@main/repository";
 import { HydraApi } from "../hydra-api";
 import { steamGamesWorker } from "@main/workers";
 import { getSteamAppAsset } from "@main/helpers";
-import { logger } from "../logger";
-import { AxiosError } from "axios";
 
 export const mergeWithRemoteGames = async () => {
   try {
@@ -62,11 +60,5 @@ export const mergeWithRemoteGames = async () => {
         }
       }
     }
-  } catch (err) {
-    if (err instanceof AxiosError) {
-      logger.error("getRemoteGames", err.message);
-    } else {
-      logger.error("getRemoteGames", err);
-    }
-  }
+  } catch (err) {}
 };

src/main/services/library-sync/update-game-playtime.ts

@@ -6,10 +6,8 @@ export const updateGamePlaytime = async (
   deltaInMillis: number,
   lastTimePlayed: Date
 ) => {
-  if (!HydraApi.isLoggedIn()) return;
-
   HydraApi.put(`/games/${game.remoteId}`, {
     playTimeDeltaInSeconds: Math.trunc(deltaInMillis / 1000),
     lastTimePlayed,
-  });
+  }).catch();
 };

src/main/services/library-sync/upload-games-batch.ts

@@ -2,9 +2,6 @@ import { gameRepository } from "@main/repository";
 import { chunk } from "lodash-es";
 import { IsNull } from "typeorm";
 import { HydraApi } from "../hydra-api";
-import { logger } from "../logger";
-import { AxiosError } from "axios";
-
 import { mergeWithRemoteGames } from "./merge-with-remote-games";
 import { WindowManager } from "../window-manager";
 
@@ -27,18 +24,12 @@ export const uploadGamesBatch = async () => {
             lastTimePlayed: game.lastTimePlayed,
           };
         })
-      );
+      ).catch();
     }
 
     await mergeWithRemoteGames();
 
     if (WindowManager.mainWindow)
       WindowManager.mainWindow.webContents.send("on-library-batch-complete");
-  } catch (err) {
-    if (err instanceof AxiosError) {
-      logger.error("uploadGamesBatch", err.response, err.message);
-    } else {
-      logger.error("uploadGamesBatch", err);
-    }
-  }
+  } catch (err) {}
 };