Merge branch 'main' into feature/torbox-integration

# Conflicts:
#	src/renderer/src/constants.ts
#	src/shared/constants.ts

src/main/events/auth/get-session-hash.ts

@@ -9,6 +9,8 @@ const getSessionHash = async (_event: Electron.IpcMainInvokeEvent) => {
   if (!auth) return null;
   const payload = jwt.decode(auth.accessToken) as jwt.JwtPayload;
 
+  if (!payload) return null;
+
   return payload.sessionId;
 };
 

src/main/events/cloud-save/get-game-artifacts.ts

@@ -1,7 +1,7 @@
 import { HydraApi } from "@main/services";
 import { registerEvent } from "../register-event";
 import type { GameArtifact, GameShop } from "@types";
-import { SubscriptionRequiredError } from "@shared";
+import { SubscriptionRequiredError, UserNotLoggedInError } from "@shared";
 
 const getGameArtifacts = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -22,6 +22,10 @@ const getGameArtifacts = async (
       return [];
     }
 
+    if (err instanceof UserNotLoggedInError) {
+      return [];
+    }
+
     throw err;
   });
 };

src/main/events/hardware/check-folder-write-permission.ts

@@ -0,0 +1,15 @@
+import fs from "node:fs";
+
+import { registerEvent } from "../register-event";
+
+const checkFolderWritePermission = async (
+  _event: Electron.IpcMainInvokeEvent,
+  path: string
+) =>
+  new Promise((resolve) => {
+    fs.access(path, fs.constants.W_OK, (err) => {
+      resolve(!err);
+    });
+  });
+
+registerEvent("checkFolderWritePermission", checkFolderWritePermission);

src/main/events/hardware/get-disk-free-space.ts

@@ -1,10 +1,10 @@
-import checkDiskSpace from "check-disk-space";
+import disk from "diskusage";
 
 import { registerEvent } from "../register-event";
 
 const getDiskFreeSpace = async (
   _event: Electron.IpcMainInvokeEvent,
   path: string
-) => checkDiskSpace(path);
+) => disk.check(path);
 
 registerEvent("getDiskFreeSpace", getDiskFreeSpace);

src/main/events/index.ts

@@ -11,6 +11,7 @@ import "./catalogue/get-trending-games";
 import "./catalogue/get-publishers";
 import "./catalogue/get-developers";
 import "./hardware/get-disk-free-space";
+import "./hardware/check-folder-write-permission";
 import "./library/add-game-to-library";
 import "./library/create-game-shortcut";
 import "./library/close-game";
@@ -22,13 +23,17 @@ import "./library/open-game-executable-path";
 import "./library/open-game-installer";
 import "./library/open-game-installer-path";
 import "./library/update-executable-path";
+import "./library/update-launch-options";
 import "./library/verify-executable-path";
 import "./library/remove-game";
 import "./library/remove-game-from-library";
 import "./library/select-game-wine-prefix";
+import "./library/reset-game-achievements";
 import "./misc/open-checkout";
 import "./misc/open-external";
 import "./misc/show-open-dialog";
+import "./misc/get-features";
+import "./misc/show-item-in-folder";
 import "./torrenting/cancel-game-download";
 import "./torrenting/pause-game-download";
 import "./torrenting/resume-game-download";
@@ -70,7 +75,6 @@ import "./cloud-save/delete-game-artifact";
 import "./cloud-save/select-game-backup-path";
 import "./notifications/publish-new-repacks-notification";
 import { isPortableVersion } from "@main/helpers";
-import "./misc/show-item-in-folder";
 
 ipcMain.handle("ping", () => "pong");
 ipcMain.handle("getVersion", () => appVersion);

src/main/events/library/open-game.ts

@@ -7,11 +7,16 @@ import { parseExecutablePath } from "../helpers/parse-executable-path";
 const openGame = async (
   _event: Electron.IpcMainInvokeEvent,
   gameId: number,
-  executablePath: string
+  executablePath: string,
+  launchOptions: string | null
 ) => {
+  // TODO: revisit this for launchOptions
   const parsedPath = parseExecutablePath(executablePath);
 
-  await gameRepository.update({ id: gameId }, { executablePath: parsedPath });
+  await gameRepository.update(
+    { id: gameId },
+    { executablePath: parsedPath, launchOptions }
+  );
 
   shell.openPath(parsedPath);
 };

src/main/events/library/reset-game-achievements.ts

@@ -0,0 +1,56 @@
+import { gameAchievementRepository, gameRepository } from "@main/repository";
+import { registerEvent } from "../register-event";
+import { findAchievementFiles } from "@main/services/achievements/find-achivement-files";
+import fs from "fs";
+import { achievementsLogger, HydraApi, WindowManager } from "@main/services";
+import { getUnlockedAchievements } from "../user/get-unlocked-achievements";
+
+const resetGameAchievements = async (
+  _event: Electron.IpcMainInvokeEvent,
+  gameId: number
+) => {
+  try {
+    const game = await gameRepository.findOne({ where: { id: gameId } });
+
+    if (!game) return;
+
+    const achievementFiles = findAchievementFiles(game);
+
+    if (achievementFiles.length) {
+      for (const achievementFile of achievementFiles) {
+        achievementsLogger.log(`deleting ${achievementFile.filePath}`);
+        await fs.promises.rm(achievementFile.filePath);
+      }
+    }
+
+    await gameAchievementRepository.update(
+      { objectId: game.objectID },
+      {
+        unlockedAchievements: null,
+      }
+    );
+
+    await HydraApi.delete(`/profile/games/achievements/${game.remoteId}`).then(
+      () =>
+        achievementsLogger.log(
+          `Deleted achievements from ${game.remoteId} - ${game.objectID} - ${game.title}`
+        )
+    );
+
+    const gameAchievements = await getUnlockedAchievements(
+      game.objectID,
+      game.shop,
+      true
+    );
+
+    WindowManager.mainWindow?.webContents.send(
+      `on-update-achievements-${game.objectID}-${game.shop}`,
+      gameAchievements
+    );
+  } catch (error) {
+    achievementsLogger.error(error);
+    throw error;
+  }
+};
+
+registerEvent("resetGameAchievements", resetGameAchievements);

src/main/events/library/update-launch-options.ts

@@ -0,0 +1,19 @@
+import { gameRepository } from "@main/repository";
+import { registerEvent } from "../register-event";
+
+const updateLaunchOptions = async (
+  _event: Electron.IpcMainInvokeEvent,
+  id: number,
+  launchOptions: string | null
+) => {
+  return gameRepository.update(
+    {
+      id,
+    },
+    {
+      launchOptions: launchOptions?.trim() != "" ? launchOptions : null,
+    }
+  );
+};
+
+registerEvent("updateLaunchOptions", updateLaunchOptions);

src/main/events/misc/get-features.ts

@@ -0,0 +1,8 @@
+import { registerEvent } from "../register-event";
+import { HydraApi } from "@main/services";
+
+const getFeatures = async (_event: Electron.IpcMainInvokeEvent) => {
+  return HydraApi.get<string[]>("/features", null, { needsAuth: false });
+};
+
+registerEvent("getFeatures", getFeatures);

src/main/events/misc/open-checkout.ts

@@ -1,16 +1,10 @@
 import { shell } from "electron";
 import { registerEvent } from "../register-event";
-import {
-  userAuthRepository,
-  userPreferencesRepository,
-} from "@main/repository";
+import { userAuthRepository } from "@main/repository";
 import { HydraApi } from "@main/services";
 
 const openCheckout = async (_event: Electron.IpcMainInvokeEvent) => {
-  const [userAuth, userPreferences] = await Promise.all([
-    userAuthRepository.findOne({ where: { id: 1 } }),
-    userPreferencesRepository.findOne({ where: { id: 1 } }),
-  ]);
+  const userAuth = await userAuthRepository.findOne({ where: { id: 1 } });
 
   if (!userAuth) {
     return;
@@ -22,7 +16,6 @@ const openCheckout = async (_event: Electron.IpcMainInvokeEvent) => {
 
   const params = new URLSearchParams({
     token: paymentToken,
-    lng: userPreferences?.language || "en",
   });
 
   shell.openExternal(