From aa253466a3487074051a8b1435233174f39330e5 Mon Sep 17 00:00:00 2001 From: Zamitto <167933696+zamitto@users.noreply.github.com> Date: Tue, 2 Jul 2024 23:31:07 -0300 Subject: [PATCH] feat: refactor --- src/main/events/auth/sign-out.ts | 2 +- src/main/events/index.ts | 1 - src/main/events/library/remove-game-from-library.ts | 2 +- src/main/events/profile/get-me.ts | 3 ++- src/main/events/user-preferences/auto-launch.ts | 6 +++--- src/main/services/hydra-api.ts | 2 +- src/main/services/library-sync/create-game.ts | 2 +- src/main/services/library-sync/merge-with-remote-games.ts | 2 +- src/main/services/library-sync/update-game-playtime.ts | 2 +- src/main/services/library-sync/upload-games-batch.ts | 2 +- src/shared/index.ts | 7 +++++++ src/types/index.ts | 7 ------- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/events/auth/sign-out.ts b/src/main/events/auth/sign-out.ts index 9c2ce2e0..af2d5e27 100644 --- a/src/main/events/auth/sign-out.ts +++ b/src/main/events/auth/sign-out.ts @@ -28,7 +28,7 @@ const signOut = async (_event: Electron.IpcMainInvokeEvent) => { await Promise.all([ databaseOperations, - HydraApi.post("/auth/logout").catch(), + HydraApi.post("/auth/logout").catch(() => {}), ]); }; diff --git a/src/main/events/index.ts b/src/main/events/index.ts index d1075e3e..1b500be9 100644 --- a/src/main/events/index.ts +++ b/src/main/events/index.ts @@ -22,7 +22,6 @@ import "./library/open-game-installer-path"; import "./library/update-executable-path"; import "./library/remove-game"; import "./library/remove-game-from-library"; -import "./misc/is-user-logged-in"; import "./misc/open-external"; import "./misc/show-open-dialog"; import "./torrenting/cancel-game-download"; diff --git a/src/main/events/library/remove-game-from-library.ts b/src/main/events/library/remove-game-from-library.ts index dbb73ffc..468f5b26 100644 --- a/src/main/events/library/remove-game-from-library.ts +++ b/src/main/events/library/remove-game-from-library.ts @@ -20,7 +20,7 @@ const removeRemoveGameFromLibrary = async (gameId: number) => { const game = await gameRepository.findOne({ where: { id: gameId } }); if (game?.remoteId) { - HydraApi.delete(`/games/${game.remoteId}`).catch(); + HydraApi.delete(`/games/${game.remoteId}`).catch(() => {}); } }; diff --git a/src/main/events/profile/get-me.ts b/src/main/events/profile/get-me.ts index e625ff1e..83463680 100644 --- a/src/main/events/profile/get-me.ts +++ b/src/main/events/profile/get-me.ts @@ -1,8 +1,9 @@ import { registerEvent } from "../register-event"; import * as Sentry from "@sentry/electron/main"; import { HydraApi } from "@main/services"; -import { UserNotLoggedInError, UserProfile } from "@types"; +import { UserProfile } from "@types"; import { userAuthRepository } from "@main/repository"; +import { UserNotLoggedInError } from "@shared"; const getMe = async ( _event: Electron.IpcMainInvokeEvent diff --git a/src/main/events/user-preferences/auto-launch.ts b/src/main/events/user-preferences/auto-launch.ts index cb40a969..0a3029f2 100644 --- a/src/main/events/user-preferences/auto-launch.ts +++ b/src/main/events/user-preferences/auto-launch.ts @@ -23,14 +23,14 @@ const autoLaunch = async ( fs.copyFileSync(scriptPath, destination); } else { - appLauncher.disable().catch(); + appLauncher.disable().catch(() => {}); fs.rmSync(destination); } } else { if (enabled) { - appLauncher.enable().catch(); + appLauncher.enable().catch(() => {}); } else { - appLauncher.disable().catch(); + appLauncher.disable().catch(() => {}); } } }; diff --git a/src/main/services/hydra-api.ts b/src/main/services/hydra-api.ts index 5aa6635d..98b783f3 100644 --- a/src/main/services/hydra-api.ts +++ b/src/main/services/hydra-api.ts @@ -5,7 +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"; +import { UserNotLoggedInError } from "@shared"; export class HydraApi { private static instance: AxiosInstance; diff --git a/src/main/services/library-sync/create-game.ts b/src/main/services/library-sync/create-game.ts index 183b58a7..c0e8b1f8 100644 --- a/src/main/services/library-sync/create-game.ts +++ b/src/main/services/library-sync/create-game.ts @@ -21,5 +21,5 @@ export const createGame = async (game: Game) => { { remoteId, playTimeInMilliseconds, lastTimePlayed } ); }) - .catch(); + .catch(() => {}); }; diff --git a/src/main/services/library-sync/merge-with-remote-games.ts b/src/main/services/library-sync/merge-with-remote-games.ts index 937007dd..2162ea58 100644 --- a/src/main/services/library-sync/merge-with-remote-games.ts +++ b/src/main/services/library-sync/merge-with-remote-games.ts @@ -60,5 +60,5 @@ export const mergeWithRemoteGames = async () => { } } }) - .catch(); + .catch(() => {}); }; diff --git a/src/main/services/library-sync/update-game-playtime.ts b/src/main/services/library-sync/update-game-playtime.ts index 70d88d50..39206a12 100644 --- a/src/main/services/library-sync/update-game-playtime.ts +++ b/src/main/services/library-sync/update-game-playtime.ts @@ -9,5 +9,5 @@ export const updateGamePlaytime = async ( HydraApi.put(`/games/${game.remoteId}`, { playTimeDeltaInSeconds: Math.trunc(deltaInMillis / 1000), lastTimePlayed, - }).catch(); + }).catch(() => {}); }; diff --git a/src/main/services/library-sync/upload-games-batch.ts b/src/main/services/library-sync/upload-games-batch.ts index a46e0ec7..88f02375 100644 --- a/src/main/services/library-sync/upload-games-batch.ts +++ b/src/main/services/library-sync/upload-games-batch.ts @@ -23,7 +23,7 @@ export const uploadGamesBatch = async () => { lastTimePlayed: game.lastTimePlayed, }; }) - ).catch(); + ).catch(() => {}); } await mergeWithRemoteGames(); diff --git a/src/shared/index.ts b/src/shared/index.ts index 7a2933d7..ff556ad2 100644 --- a/src/shared/index.ts +++ b/src/shared/index.ts @@ -8,6 +8,13 @@ export enum DownloadSourceStatus { Errored, } +export class UserNotLoggedInError extends Error { + constructor() { + super("user not logged in"); + this.name = "UserNotLoggedInError"; + } +} + const FORMAT = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]; export const formatBytes = (bytes: number): string => { diff --git a/src/types/index.ts b/src/types/index.ts index 9027af1e..71071620 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -290,10 +290,3 @@ export interface DownloadSource { createdAt: Date; updatedAt: Date; } - -export class UserNotLoggedInError extends Error { - constructor() { - super("user not logged in"); - this.name = "UserNotLoggedInError"; - } -}