resolved conflicts

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

@@ -3,7 +3,6 @@ import jwt from "jsonwebtoken";
 import { registerEvent } from "../register-event";
 import { db, levelKeys } from "@main/level";
 import type { Auth } from "@types";
-import { Crypto } from "@main/services";
 
 const getSessionHash = async (_event: Electron.IpcMainInvokeEvent) => {
   const auth = await db.get<string, Auth>(levelKeys.auth, {
@@ -11,9 +10,7 @@ const getSessionHash = async (_event: Electron.IpcMainInvokeEvent) => {
   });
 
   if (!auth) return null;
-  const payload = jwt.decode(
-    Crypto.decrypt(auth.accessToken)
-  ) as jwt.JwtPayload;
+  const payload = jwt.decode(auth.accessToken) as jwt.JwtPayload;
 
   if (!payload) return null;
 

src/main/events/cloud-save/upload-save-game.ts

@@ -1,44 +1,8 @@
-import { HydraApi, logger, Ludusavi, WindowManager } from "@main/services";
+import { CloudSync } from "@main/services";
 import { registerEvent } from "../register-event";
-import fs from "node:fs";
-import path from "node:path";
-import * as tar from "tar";
-import crypto from "node:crypto";
 import type { GameShop } from "@types";
-import axios from "axios";
-import os from "node:os";
-import { backupsPath } from "@main/constants";
-import { app } from "electron";
-import { normalizePath } from "@main/helpers";
-import { gamesSublevel, levelKeys } from "@main/level";
-
-const bundleBackup = async (
-  shop: GameShop,
-  objectId: string,
-  winePrefix: string | null
-) => {
-  const backupPath = path.join(backupsPath, `${shop}-${objectId}`);
-
-  // Remove existing backup
-  if (fs.existsSync(backupPath)) {
-    fs.rmSync(backupPath, { recursive: true });
-  }
-
-  await Ludusavi.backupGame(shop, objectId, backupPath, winePrefix);
-
-  const tarLocation = path.join(backupsPath, `${crypto.randomUUID()}.tar`);
-
-  await tar.create(
-    {
-      gzip: false,
-      file: tarLocation,
-      cwd: backupPath,
-    },
-    ["."]
-  );
-
-  return tarLocation;
-};
+import { t } from "i18next";
+import { format } from "date-fns";
 
 const uploadSaveGame = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -46,61 +10,15 @@ const uploadSaveGame = async (
   shop: GameShop,
   downloadOptionTitle: string | null
 ) => {
-  const game = await gamesSublevel.get(levelKeys.game(shop, objectId));
-
-  const bundleLocation = await bundleBackup(
-    shop,
+  return CloudSync.uploadSaveGame(
     objectId,
-    game?.winePrefixPath ?? null
+    shop,
+    downloadOptionTitle,
+    t("backup_from", {
+      ns: "game_details",
+      date: format(new Date(), "dd/MM/yyyy"),
+    })
   );
-
-  fs.stat(bundleLocation, async (err, stat) => {
-    if (err) {
-      logger.error("Failed to get zip file stats", err);
-      throw err;
-    }
-
-    const { uploadUrl } = await HydraApi.post<{
-      id: string;
-      uploadUrl: string;
-    }>("/profile/games/artifacts", {
-      artifactLengthInBytes: stat.size,
-      shop,
-      objectId,
-      hostname: os.hostname(),
-      homeDir: normalizePath(app.getPath("home")),
-      downloadOptionTitle,
-      platform: os.platform(),
-    });
-
-    fs.readFile(bundleLocation, async (err, fileBuffer) => {
-      if (err) {
-        logger.error("Failed to read zip file", err);
-        throw err;
-      }
-
-      await axios.put(uploadUrl, fileBuffer, {
-        headers: {
-          "Content-Type": "application/tar",
-        },
-        onUploadProgress: (progressEvent) => {
-          logger.log(progressEvent);
-        },
-      });
-
-      WindowManager.mainWindow?.webContents.send(
-        `on-upload-complete-${objectId}-${shop}`,
-        true
-      );
-
-      fs.rm(bundleLocation, (err) => {
-        if (err) {
-          logger.error("Failed to remove tar file", err);
-          throw err;
-        }
-      });
-    });
-  });
 };
 
 registerEvent("uploadSaveGame", uploadSaveGame);

src/main/events/index.ts

@@ -31,11 +31,13 @@ import "./library/remove-game";
 import "./library/remove-game-from-library";
 import "./library/select-game-wine-prefix";
 import "./library/reset-game-achievements";
+import "./library/toggle-automatic-cloud-sync";
 import "./misc/open-checkout";
 import "./misc/open-external";
 import "./misc/show-open-dialog";
 import "./misc/get-features";
 import "./misc/show-item-in-folder";
+import "./misc/get-badges";
 import "./torrenting/cancel-game-download";
 import "./torrenting/pause-game-download";
 import "./torrenting/resume-game-download";
@@ -58,6 +60,7 @@ import "./user/get-blocked-users";
 import "./user/block-user";
 import "./user/unblock-user";
 import "./user/get-user-friends";
+import "./user/get-auth";
 import "./user/get-user-stats";
 import "./user/report-user";
 import "./user/get-unlocked-achievements";
@@ -77,6 +80,16 @@ import "./cloud-save/upload-save-game";
 import "./cloud-save/delete-game-artifact";
 import "./cloud-save/select-game-backup-path";
 import "./notifications/publish-new-repacks-notification";
+import "./themes/add-custom-theme";
+import "./themes/delete-custom-theme";
+import "./themes/get-all-custom-themes";
+import "./themes/delete-all-custom-themes";
+import "./themes/update-custom-theme";
+import "./themes/open-editor-window";
+import "./themes/get-custom-theme-by-id";
+import "./themes/get-active-custom-theme";
+import "./themes/close-editor-window";
+import "./themes/toggle-custom-theme";
 import { isPortableVersion } from "@main/helpers";
 
 ipcMain.handle("ping", () => "pong");

src/main/events/library/add-game-to-library.ts

@@ -5,7 +5,7 @@ import type { Game, GameShop } from "@types";
 import { steamGamesWorker } from "@main/workers";
 import { createGame } from "@main/services/library-sync";
 import { steamUrlBuilder } from "@shared";
-import { updateLocalUnlockedAchivements } from "@main/services/achievements/update-local-unlocked-achivements";
+import { updateLocalUnlockedAchievements } from "@main/services/achievements/update-local-unlocked-achivements";
 import { downloadsSublevel, gamesSublevel, levelKeys } from "@main/level";
 
 const addGameToLibrary = async (
@@ -46,9 +46,9 @@ const addGameToLibrary = async (
 
     await gamesSublevel.put(levelKeys.game(shop, objectId), game);
 
-    updateLocalUnlockedAchivements(game);
+    await createGame(game).catch(() => {});
 
-    createGame(game).catch(() => {});
+    updateLocalUnlockedAchievements(game);
   }
 };
 

src/main/events/library/toggle-automatic-cloud-sync.ts

@@ -0,0 +1,23 @@
+import { registerEvent } from "../register-event";
+import { levelKeys, gamesSublevel } from "@main/level";
+import type { GameShop } from "@types";
+
+const toggleAutomaticCloudSync = async (
+  _event: Electron.IpcMainInvokeEvent,
+  shop: GameShop,
+  objectId: string,
+  automaticCloudSync: boolean
+) => {
+  const gameKey = levelKeys.game(shop, objectId);
+
+  const game = await gamesSublevel.get(gameKey);
+
+  if (!game) return;
+
+  await gamesSublevel.put(gameKey, {
+    ...game,
+    automaticCloudSync,
+  });
+};
+
+registerEvent("toggleAutomaticCloudSync", toggleAutomaticCloudSync);

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

@@ -0,0 +1,22 @@
+import { Badge } from "@types";
+import { registerEvent } from "../register-event";
+import { HydraApi } from "@main/services";
+import { db, levelKeys } from "@main/level";
+
+const getBadges = async (_event: Electron.IpcMainInvokeEvent) => {
+  const language = await db
+    .get<string, string>(levelKeys.language, {
+      valueEncoding: "utf-8",
+    })
+    .then((language) => language || "en");
+
+  const params = new URLSearchParams({
+    locale: language,
+  });
+
+  return HydraApi.get<Badge[]>(`/badges?${params.toString()}`, null, {
+    needsAuth: false,
+  });
+};
+
+registerEvent("getBadges", getBadges);

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

@@ -1,6 +1,6 @@
 import { shell } from "electron";
 import { registerEvent } from "../register-event";
-import { Crypto, HydraApi } from "@main/services";
+import { HydraApi } from "@main/services";
 import { db, levelKeys } from "@main/level";
 import type { Auth } from "@types";
 
@@ -14,7 +14,7 @@ const openCheckout = async (_event: Electron.IpcMainInvokeEvent) => {
   }
 
   const paymentToken = await HydraApi.post("/auth/payment", {
-    refreshToken: Crypto.decrypt(auth.refreshToken),
+    refreshToken: auth.refreshToken,
   }).then((response) => response.accessToken);
 
   const params = new URLSearchParams({

src/main/events/themes/add-custom-theme.ts

@@ -0,0 +1,12 @@
+import { Theme } from "@types";
+import { registerEvent } from "../register-event";
+import { themesSublevel } from "@main/level";
+
+const addCustomTheme = async (
+  _event: Electron.IpcMainInvokeEvent,
+  theme: Theme
+) => {
+  await themesSublevel.put(theme.id, theme);
+};
+
+registerEvent("addCustomTheme", addCustomTheme);

src/main/events/themes/close-editor-window.ts

@@ -0,0 +1,11 @@
+import { WindowManager } from "@main/services";
+import { registerEvent } from "../register-event";
+
+const closeEditorWindow = async (
+  _event: Electron.IpcMainInvokeEvent,
+  themeId?: string
+) => {
+  WindowManager.closeEditorWindow(themeId);
+};
+
+registerEvent("closeEditorWindow", closeEditorWindow);

src/main/events/themes/delete-all-custom-themes.ts

@@ -0,0 +1,8 @@
+import { themesSublevel } from "@main/level";
+import { registerEvent } from "../register-event";
+
+const deleteAllCustomThemes = async (_event: Electron.IpcMainInvokeEvent) => {
+  await themesSublevel.clear();
+};
+
+registerEvent("deleteAllCustomThemes", deleteAllCustomThemes);

src/main/events/themes/delete-custom-theme.ts

@@ -0,0 +1,11 @@
+import { themesSublevel } from "@main/level";
+import { registerEvent } from "../register-event";
+
+const deleteCustomTheme = async (
+  _event: Electron.IpcMainInvokeEvent,
+  themeId: string
+) => {
+  await themesSublevel.del(themeId);
+};
+
+registerEvent("deleteCustomTheme", deleteCustomTheme);

src/main/events/themes/get-active-custom-theme.ts

@@ -0,0 +1,9 @@
+import { themesSublevel } from "@main/level";
+import { registerEvent } from "../register-event";
+
+const getActiveCustomTheme = async () => {
+  const allThemes = await themesSublevel.values().all();
+  return allThemes.find((theme) => theme.isActive);
+};
+
+registerEvent("getActiveCustomTheme", getActiveCustomTheme);

src/main/events/themes/get-all-custom-themes.ts

@@ -0,0 +1,8 @@
+import { themesSublevel } from "@main/level";
+import { registerEvent } from "../register-event";
+
+const getAllCustomThemes = async (_event: Electron.IpcMainInvokeEvent) => {
+  return themesSublevel.values().all();
+};
+
+registerEvent("getAllCustomThemes", getAllCustomThemes);

src/main/events/themes/get-custom-theme-by-id.ts

@@ -0,0 +1,11 @@
+import { themesSublevel } from "@main/level";
+import { registerEvent } from "../register-event";
+
+const getCustomThemeById = async (
+  _event: Electron.IpcMainInvokeEvent,
+  themeId: string
+) => {
+  return themesSublevel.get(themeId);
+};
+
+registerEvent("getCustomThemeById", getCustomThemeById);

src/main/events/themes/open-editor-window.ts

@@ -0,0 +1,11 @@
+import { WindowManager } from "@main/services";
+import { registerEvent } from "../register-event";
+
+const openEditorWindow = async (
+  _event: Electron.IpcMainInvokeEvent,
+  themeId: string
+) => {
+  WindowManager.openEditorWindow(themeId);
+};
+
+registerEvent("openEditorWindow", openEditorWindow);

src/main/events/themes/toggle-custom-theme.ts

@@ -0,0 +1,22 @@
+import { themesSublevel } from "@main/level";
+import { registerEvent } from "../register-event";
+
+const toggleCustomTheme = async (
+  _event: Electron.IpcMainInvokeEvent,
+  themeId: string,
+  isActive: boolean
+) => {
+  const theme = await themesSublevel.get(themeId);
+
+  if (!theme) {
+    throw new Error("Theme not found");
+  }
+
+  await themesSublevel.put(themeId, {
+    ...theme,
+    isActive,
+    updatedAt: new Date(),
+  });
+};
+
+registerEvent("toggleCustomTheme", toggleCustomTheme);

src/main/events/themes/update-custom-theme.ts

@@ -0,0 +1,27 @@
+import { themesSublevel } from "@main/level";
+import { registerEvent } from "../register-event";
+import { WindowManager } from "@main/services";
+
+const updateCustomTheme = async (
+  _event: Electron.IpcMainInvokeEvent,
+  themeId: string,
+  code: string
+) => {
+  const theme = await themesSublevel.get(themeId);
+
+  if (!theme) {
+    throw new Error("Theme not found");
+  }
+
+  await themesSublevel.put(themeId, {
+    ...theme,
+    code,
+    updatedAt: new Date(),
+  });
+
+  if (theme.isActive) {
+    WindowManager.mainWindow?.webContents.send("css-injected", code);
+  }
+};
+
+registerEvent("updateCustomTheme", updateCustomTheme);

src/main/events/torrenting/cancel-game-download.ts

@@ -13,7 +13,14 @@ const cancelGameDownload = async (
 
   await DownloadManager.cancelDownload(downloadKey);
 
-  await downloadsSublevel.del(downloadKey);
+  const download = await downloadsSublevel.get(downloadKey);
+
+  if (!download) return;
+
+  await downloadsSublevel.put(downloadKey, {
+    ...download,
+    status: "removed",
+  });
 };
 
 registerEvent("cancelGameDownload", cancelGameDownload);

src/main/events/torrenting/pause-game-seed.ts

@@ -15,6 +15,7 @@ const pauseGameSeed = async (
 
   await downloadsSublevel.put(downloadKey, {
     ...download,
+    status: "complete",
     shouldSeed: false,
   });
 

src/main/events/torrenting/resume-game-seed.ts

@@ -8,12 +8,14 @@ const resumeGameSeed = async (
   shop: GameShop,
   objectId: string
 ) => {
-  const download = await downloadsSublevel.get(levelKeys.game(shop, objectId));
+  const downloadKey = levelKeys.game(shop, objectId);
+  const download = await downloadsSublevel.get(downloadKey);
 
   if (!download) return;
 
-  await downloadsSublevel.put(levelKeys.game(shop, objectId), {
+  await downloadsSublevel.put(downloadKey, {
     ...download,
+    status: "seeding",
     shouldSeed: true,
   });
 

src/main/events/user-preferences/get-user-preferences.ts

@@ -1,27 +1,10 @@
 import { registerEvent } from "../register-event";
 import { db, levelKeys } from "@main/level";
-import { Crypto } from "@main/services";
 import type { UserPreferences } from "@types";
 
 const getUserPreferences = async () =>
-  db
-    .get<string, UserPreferences | null>(levelKeys.userPreferences, {
-      valueEncoding: "json",
-    })
-    .then((userPreferences) => {
-      if (userPreferences?.realDebridApiToken) {
-        userPreferences.realDebridApiToken = Crypto.decrypt(
-          userPreferences.realDebridApiToken
-        );
-      }
-
-      if (userPreferences?.torBoxApiToken) {
-        userPreferences.torBoxApiToken = Crypto.decrypt(
-          userPreferences.torBoxApiToken
-        );
-      }
-
-      return userPreferences;
-    });
+  db.get<string, UserPreferences | null>(levelKeys.userPreferences, {
+    valueEncoding: "json",
+  });
 
 registerEvent("getUserPreferences", getUserPreferences);

src/main/events/user-preferences/update-user-preferences.ts

@@ -3,7 +3,6 @@ import { registerEvent } from "../register-event";
 import type { UserPreferences } from "@types";
 import i18next from "i18next";
 import { db, levelKeys } from "@main/level";
-import { Crypto } from "@main/services";
 import { patchUserProfile } from "../profile/update-profile";
 
 const updateUserPreferences = async (
@@ -24,16 +23,6 @@ const updateUserPreferences = async (
     patchUserProfile({ language: preferences.language }).catch(() => {});
   }
 
-  if (preferences.realDebridApiToken) {
-    preferences.realDebridApiToken = Crypto.encrypt(
-      preferences.realDebridApiToken
-    );
-  }
-
-  if (preferences.torBoxApiToken) {
-    preferences.torBoxApiToken = Crypto.encrypt(preferences.torBoxApiToken);
-  }
-
   if (!preferences.downloadsPath) {
     preferences.downloadsPath = null;
   }

src/main/events/user/get-auth.ts

@@ -0,0 +1,11 @@
+import { db, levelKeys } from "@main/level";
+import type { Auth } from "@types";
+
+import { registerEvent } from "../register-event";
+
+const getAuth = async (_event: Electron.IpcMainInvokeEvent) =>
+  db.get<string, Auth>(levelKeys.auth, {
+    valueEncoding: "json",
+  });
+
+registerEvent("getAuth", getAuth);

src/main/events/user/get-unlocked-achievements.ts

@@ -32,7 +32,7 @@ export const getUnlockedAchievements = async (
 
   return achievementsData
     .map((achievementData) => {
-      const unlockedAchiementData = unlockedAchievements.find(
+      const unlockedAchievementData = unlockedAchievements.find(
         (localAchievement) => {
           return (
             localAchievement.name.toUpperCase() ==
@@ -45,11 +45,11 @@ export const getUnlockedAchievements = async (
         ? achievementData.icon
         : achievementData.icongray;
 
-      if (unlockedAchiementData) {
+      if (unlockedAchievementData) {
         return {
           ...achievementData,
           unlocked: true,
-          unlockTime: unlockedAchiementData.unlockTime,
+          unlockTime: unlockedAchievementData.unlockTime,
         };
       }
 

src/main/index.ts

@@ -3,6 +3,7 @@ import updater from "electron-updater";
 import i18n from "i18next";
 import path from "node:path";
 import url from "node:url";
+import kill from "kill-port";
 import { electronApp, optimizer } from "@electron-toolkit/utils";
 import { logger, WindowManager } from "@main/services";
 import resources from "@locales";
@@ -58,7 +59,7 @@ app.whenReady().then(async () => {
     return net.fetch(url.pathToFileURL(decodeURI(filePath)).toString());
   });
 
-  await loadState();
+  await kill(PythonRPC.RPC_PORT).finally(() => loadState());
 
   const language = await db.get<string, string>(levelKeys.language, {
     valueEncoding: "utf-8",
@@ -85,6 +86,29 @@ const handleDeepLinkPath = (uri?: string) => {
 
     if (url.host === "install-source") {
       WindowManager.redirect(`settings${url.search}`);
+      return;
+    }
+
+    if (url.host === "profile") {
+      const userId = url.searchParams.get("userId");
+
+      if (userId) {
+        WindowManager.redirect(`profile/${userId}`);
+      }
+
+      return;
+    }
+
+    if (url.host === "install-theme") {
+      const themeName = url.searchParams.get("theme");
+      const authorId = url.searchParams.get("authorId");
+      const authorName = url.searchParams.get("authorName");
+
+      if (themeName && authorId && authorName) {
+        WindowManager.redirect(
+          `settings?theme=${themeName}&authorId=${authorId}&authorName=${authorName}`
+        );
+      }
     }
   } catch (error) {
     logger.error("Error handling deep link", uri, error);

src/main/level/sublevels/index.ts

@@ -3,3 +3,4 @@ export * from "./games";
 export * from "./game-shop-cache";
 export * from "./game-achievements";
 export * from "./keys";
+export * from "./themes";

src/main/level/sublevels/keys.ts

@@ -5,6 +5,7 @@ export const levelKeys = {
   game: (shop: GameShop, objectId: string) => `${shop}:${objectId}`,
   user: "user",
   auth: "auth",
+  themes: "themes",
   gameShopCache: "gameShopCache",
   gameShopCacheItem: (shop: GameShop, objectId: string, language: string) =>
     `${shop}:${objectId}:${language}`,

src/main/level/sublevels/themes.ts

@@ -0,0 +1,7 @@
+import type { Theme } from "@types";
+import { db } from "../level";
+import { levelKeys } from "./keys";
+
+export const themesSublevel = db.sublevel<string, Theme>(levelKeys.themes, {
+  valueEncoding: "json",
+});

src/main/main.ts

@@ -1,10 +1,4 @@
-import {
-  Crypto,
-  DownloadManager,
-  logger,
-  Ludusavi,
-  startMainLoop,
-} from "./services";
+import { DownloadManager, logger, Ludusavi, startMainLoop } from "./services";
 import { RealDebridClient } from "./services/download/real-debrid";
 import { HydraApi } from "./services/hydra-api";
 import { uploadGamesBatch } from "./services/library-sync";
@@ -38,13 +32,11 @@ export const loadState = async () => {
   Aria2.spawn();
 
   if (userPreferences?.realDebridApiToken) {
-    RealDebridClient.authorize(
-      Crypto.decrypt(userPreferences.realDebridApiToken)
-    );
+    RealDebridClient.authorize(userPreferences.realDebridApiToken);
   }
 
   if (userPreferences?.torBoxApiToken) {
-    TorBoxClient.authorize(Crypto.decrypt(userPreferences.torBoxApiToken));
+    TorBoxClient.authorize(userPreferences.torBoxApiToken);
   }
 
   Ludusavi.addManifestToLudusaviConfig();
@@ -57,21 +49,17 @@ export const loadState = async () => {
     .values()
     .all()
     .then((games) => {
-      return sortBy(
-        games.filter((game) => game.queued),
-        "timestamp",
-        "DESC"
-      );
+      return sortBy(games, "timestamp", "DESC");
     });
 
-  const [nextItemOnQueue] = downloads;
+  const [nextItemOnQueue] = downloads.filter((game) => game.queued);
 
   const downloadsToSeed = downloads.filter(
-    (download) =>
-      download.shouldSeed &&
-      download.downloader === Downloader.Torrent &&
-      download.progress === 1 &&
-      download.uri !== null
+    (game) =>
+      game.shouldSeed &&
+      game.downloader === Downloader.Torrent &&
+      game.progress === 1 &&
+      game.uri !== null
   );
 
   await DownloadManager.startRPC(nextItemOnQueue, downloadsToSeed);
@@ -123,9 +111,7 @@ const migrateFromSqlite = async () => {
           levelKeys.userPreferences,
           {
             ...rest,
-            realDebridApiToken: realDebridApiToken
-              ? Crypto.encrypt(realDebridApiToken)
-              : null,
+            realDebridApiToken,
             preferQuitInsteadOfHiding: rest.preferQuitInsteadOfHiding === 1,
             runAtStartup: rest.runAtStartup === 1,
             startMinimized: rest.startMinimized === 1,
@@ -144,7 +130,9 @@ const migrateFromSqlite = async () => {
         );
 
         if (rest.language) {
-          await db.put(levelKeys.language, rest.language);
+          await db.put<string, string>(levelKeys.language, rest.language, {
+            valueEncoding: "utf-8",
+          });
         }
       }
     })
@@ -191,8 +179,8 @@ const migrateFromSqlite = async () => {
         await db.put<string, Auth>(
           levelKeys.auth,
           {
-            accessToken: Crypto.encrypt(users[0].accessToken),
-            refreshToken: Crypto.encrypt(users[0].refreshToken),
+            accessToken: users[0].accessToken,
+            refreshToken: users[0].refreshToken,
             tokenExpirationTimestamp: users[0].tokenExpirationTimestamp,
           },
           {

src/main/services/achievements/merge-achievements.ts

@@ -23,23 +23,21 @@ const saveAchievementsOnLocal = async (
   return gameAchievementsSublevel
     .get(levelKey)
     .then(async (gameAchievement) => {
-      if (gameAchievement) {
-        await gameAchievementsSublevel.put(levelKey, {
-          ...gameAchievement,
-          unlockedAchievements: unlockedAchievements,
-        });
+      await gameAchievementsSublevel.put(levelKey, {
+        achievements: gameAchievement?.achievements ?? [],
+        unlockedAchievements: unlockedAchievements,
+      });
 
-        if (!sendUpdateEvent) return;
+      if (!sendUpdateEvent) return;
 
-        return getUnlockedAchievements(objectId, shop, true)
-          .then((achievements) => {
-            WindowManager.mainWindow?.webContents.send(
-              `on-update-achievements-${objectId}-${shop}`,
-              achievements
-            );
-          })
-          .catch(() => {});
-      }
+      return getUnlockedAchievements(objectId, shop, true)
+        .then((achievements) => {
+          WindowManager.mainWindow?.webContents.send(
+            `on-update-achievements-${objectId}-${shop}`,
+            achievements
+          );
+        })
+        .catch(() => {});
     });
 };
 
@@ -133,7 +131,7 @@ export const mergeAchievements = async (
         );
       })
       .catch((err) => {
-        if (err! instanceof SubscriptionRequiredError) {
+        if (err instanceof SubscriptionRequiredError) {
           achievementsLogger.log(
             "Achievements not synchronized on API due to lack of subscription",
             game.objectId,

src/main/services/achievements/update-local-unlocked-achivements.ts

@@ -6,7 +6,7 @@ import { parseAchievementFile } from "./parse-achievement-file";
 import { mergeAchievements } from "./merge-achievements";
 import type { Game, UnlockedAchievement } from "@types";
 
-export const updateLocalUnlockedAchivements = async (game: Game) => {
+export const updateLocalUnlockedAchievements = async (game: Game) => {
   const gameAchievementFiles = findAchievementFiles(game);
 
   const achievementFileInsideDirectory =

src/main/services/cloud-sync.ts

@@ -0,0 +1,112 @@
+import { levelKeys, gamesSublevel, db } from "@main/level";
+import { app } from "electron";
+import path from "node:path";
+import * as tar from "tar";
+import crypto from "node:crypto";
+import fs from "node:fs";
+import os from "node:os";
+import type { GameShop, User } from "@types";
+import { backupsPath } from "@main/constants";
+import { HydraApi } from "./hydra-api";
+import { normalizePath } from "@main/helpers";
+import { logger } from "./logger";
+import { WindowManager } from "./window-manager";
+import axios from "axios";
+import { Ludusavi } from "./ludusavi";
+import { isFuture, isToday } from "date-fns";
+import { SubscriptionRequiredError } from "@shared";
+
+export class CloudSync {
+  private static async bundleBackup(
+    shop: GameShop,
+    objectId: string,
+    winePrefix: string | null
+  ) {
+    const backupPath = path.join(backupsPath, `${shop}-${objectId}`);
+
+    // Remove existing backup
+    if (fs.existsSync(backupPath)) {
+      fs.rmSync(backupPath, { recursive: true });
+    }
+
+    await Ludusavi.backupGame(shop, objectId, backupPath, winePrefix);
+
+    const tarLocation = path.join(backupsPath, `${crypto.randomUUID()}.tar`);
+
+    await tar.create(
+      {
+        gzip: false,
+        file: tarLocation,
+        cwd: backupPath,
+      },
+      ["."]
+    );
+
+    return tarLocation;
+  }
+
+  public static async uploadSaveGame(
+    objectId: string,
+    shop: GameShop,
+    downloadOptionTitle: string | null,
+    label?: string
+  ) {
+    const hasActiveSubscription = await db
+      .get<string, User>(levelKeys.user, { valueEncoding: "json" })
+      .then((user) => {
+        const expiresAt = user?.subscription?.expiresAt;
+        return expiresAt && (isFuture(expiresAt) || isToday(expiresAt));
+      });
+
+    if (!hasActiveSubscription) {
+      throw new SubscriptionRequiredError();
+    }
+
+    const game = await gamesSublevel.get(levelKeys.game(shop, objectId));
+
+    const bundleLocation = await this.bundleBackup(
+      shop,
+      objectId,
+      game?.winePrefixPath ?? null
+    );
+
+    const stat = await fs.promises.stat(bundleLocation);
+
+    const { uploadUrl } = await HydraApi.post<{
+      id: string;
+      uploadUrl: string;
+    }>("/profile/games/artifacts", {
+      artifactLengthInBytes: stat.size,
+      shop,
+      objectId,
+      hostname: os.hostname(),
+      homeDir: normalizePath(app.getPath("home")),
+      downloadOptionTitle,
+      platform: os.platform(),
+      label,
+    });
+
+    const fileBuffer = await fs.promises.readFile(bundleLocation);
+
+    await axios.put(uploadUrl, fileBuffer, {
+      headers: {
+        "Content-Type": "application/tar",
+      },
+      onUploadProgress: (progressEvent) => {
+        logger.log(progressEvent);
+      },
+    });
+
+    WindowManager.mainWindow?.webContents.send(
+      `on-upload-complete-${objectId}-${shop}`,
+      true
+    );
+
+    fs.rm(bundleLocation, (err) => {
+      if (err) {
+        logger.error("Failed to remove tar file", err);
+        throw err;
+      }
+    });
+  }
+}

src/main/services/crypto.ts

@@ -1,28 +0,0 @@
-import { safeStorage } from "electron";
-import { logger } from "./logger";
-
-export class Crypto {
-  public static encrypt(str: string) {
-    if (safeStorage.isEncryptionAvailable()) {
-      return safeStorage.encryptString(str).toString("base64");
-    } else {
-      logger.warn(
-        "Encrypt method returned raw string because encryption is not available"
-      );
-
-      return str;
-    }
-  }
-
-  public static decrypt(b64: string) {
-    if (safeStorage.isEncryptionAvailable()) {
-      return safeStorage.decryptString(Buffer.from(b64, "base64"));
-    } else {
-      logger.warn(
-        "Decrypt method returned raw string because encryption is not available"
-      );
-
-      return b64;
-    }
-  }
-}

src/main/services/download/download-manager.ts

@@ -2,7 +2,13 @@ import { Downloader, DownloadError } from "@shared";
 import { WindowManager } from "../window-manager";
 import { publishDownloadCompleteNotification } from "../notifications";
 import type { Download, DownloadProgress, UserPreferences } from "@types";
-import { GofileApi, QiwiApi, DatanodesApi, MediafireApi } from "../hosters";
+import {
+  GofileApi,
+  QiwiApi,
+  DatanodesApi,
+  MediafireApi,
+  PixelDrainApi,
+} from "../hosters";
 import { PythonRPC } from "../python-rpc";
 import {
   LibtorrentPayload,
@@ -219,8 +225,10 @@ export class DownloadManager {
       } as PauseDownloadPayload)
       .catch(() => {});
 
-    WindowManager.mainWindow?.setProgressBar(-1);
-    this.downloadingGameId = null;
+    if (downloadKey === this.downloadingGameId) {
+      WindowManager.mainWindow?.setProgressBar(-1);
+      this.downloadingGameId = null;
+    }
   }
 
   static async resumeDownload(download: Download) {
@@ -228,14 +236,17 @@ export class DownloadManager {
   }
 
   static async cancelDownload(downloadKey = this.downloadingGameId) {
-    await PythonRPC.rpc.post("/action", {
-      action: "cancel",
-      game_id: downloadKey,
-    });
-
-    WindowManager.mainWindow?.setProgressBar(-1);
+    await PythonRPC.rpc
+      .post("/action", {
+        action: "cancel",
+        game_id: downloadKey,
+      })
+      .catch((err) => {
+        logger.error("Failed to cancel game download", err);
+      });
 
     if (downloadKey === this.downloadingGameId) {
+      WindowManager.mainWindow?.setProgressBar(-1);
       WindowManager.mainWindow?.webContents.send("on-download-progress", null);
       this.downloadingGameId = null;
     }
@@ -278,11 +289,12 @@ export class DownloadManager {
       }
       case Downloader.PixelDrain: {
         const id = download.uri.split("/").pop();
+        const downloadUrl = await PixelDrainApi.getDownloadUrl(id!);
 
         return {
           action: "start",
           game_id: downloadId,
-          url: `https://cdn.pd5-gamedriveorg.workers.dev/api/file/${id}`,
+          url: downloadUrl,
           save_path: download.downloadPath,
         };
       }

src/main/services/download/torbox.ts

@@ -6,6 +6,7 @@ import type {
   TorBoxAddTorrentRequest,
   TorBoxRequestLinkRequest,
 } from "@types";
+import { appVersion } from "@main/constants";
 
 export class TorBoxClient {
   private static instance: AxiosInstance;
@@ -18,6 +19,7 @@ export class TorBoxClient {
       baseURL: this.baseURL,
       headers: {
         Authorization: `Bearer ${apiToken}`,
+        "User-Agent": `Hydra/${appVersion}`,
       },
     });
   }

src/main/services/hosters/datanodes.ts

@@ -1,47 +1,71 @@
 import axios, { AxiosResponse } from "axios";
+import { wrapper } from "axios-cookiejar-support";
+import { CookieJar } from "tough-cookie";
 
 export class DatanodesApi {
-  private static readonly session = axios.create({});
+  private static readonly jar = new CookieJar();
+
+  private static readonly session = wrapper(
+    axios.create({
+      jar: DatanodesApi.jar,
+      withCredentials: true,
+    })
+  );
 
   public static async getDownloadUrl(downloadUrl: string): Promise<string> {
-    const parsedUrl = new URL(downloadUrl);
-    const pathSegments = parsedUrl.pathname.split("/");
+    try {
+      const parsedUrl = new URL(downloadUrl);
+      const pathSegments = parsedUrl.pathname.split("/").filter(Boolean);
+      const fileCode = pathSegments[0];
 
-    const fileCode = decodeURIComponent(pathSegments[1]);
-    const fileName = decodeURIComponent(pathSegments[pathSegments.length - 1]);
+      await this.jar.setCookie("lang=english;", "https://datanodes.to");
 
-    const payload = new URLSearchParams({
-      op: "download2",
-      id: fileCode,
-      rand: "",
-      referer: "https://datanodes.to/download",
-      method_free: "Free Download >>",
-      method_premium: "",
-      adblock_detected: "",
-    });
+      const payload = new URLSearchParams({
+        op: "download2",
+        id: fileCode,
+        method_free: "Free Download >>",
+        dl: "1",
+      });
 
-    const response: AxiosResponse = await this.session.post(
-      "https://datanodes.to/download",
-      payload,
-      {
-        headers: {
-          "Content-Type": "application/x-www-form-urlencoded",
-          Cookie: `lang=english; file_name=${fileName}; file_code=${fileCode};`,
-          Host: "datanodes.to",
-          Origin: "https://datanodes.to",
-          Referer: "https://datanodes.to/download",
-          "User-Agent":
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36",
-        },
-        maxRedirects: 0,
-        validateStatus: (status: number) => status === 302 || status < 400,
+      const response: AxiosResponse = await this.session.post(
+        "https://datanodes.to/download",
+        payload,
+        {
+          headers: {
+            "User-Agent":
+              "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:135.0) Gecko/20100101 Firefox/135.0",
+            Referer: "https://datanodes.to/download",
+            Origin: "https://datanodes.to",
+            "Content-Type": "application/x-www-form-urlencoded",
+          },
+          maxRedirects: 0,
+          validateStatus: (status: number) => status === 302 || status < 400,
+        }
+      );
+
+      if (response.status === 302) {
+        return response.headers["location"];
       }
-    );
 
-    if (response.status === 302) {
-      return response.headers["location"];
+      if (typeof response.data === "object" && response.data.url) {
+        return decodeURIComponent(response.data.url);
+      }
+
+      const htmlContent = String(response.data);
+      if (!htmlContent) {
+        throw new Error("Empty response received");
+      }
+
+      const downloadLinkRegex = /href=["'](https:\/\/[^"']+)["']/;
+      const downloadLinkMatch = downloadLinkRegex.exec(htmlContent);
+      if (downloadLinkMatch) {
+        return downloadLinkMatch[1];
+      }
+
+      throw new Error("Failed to get the download link");
+    } catch (error) {
+      console.error("Error fetching download URL:", error);
+      throw error;
     }
-
-    return "";
   }
 }

src/main/services/hosters/index.ts

@@ -2,3 +2,4 @@ export * from "./gofile";
 export * from "./qiwi";
 export * from "./datanodes";
 export * from "./mediafire";
+export * from "./pixeldrain";

src/main/services/hosters/pixeldrain.ts

@@ -0,0 +1,42 @@
+import axios from "axios";
+
+export class PixelDrainApi {
+  private static readonly browserHeaders = {
+    "User-Agent":
+      "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
+    Accept:
+      "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
+    "Accept-Language": "en-US,en;q=0.9",
+    "Accept-Encoding": "gzip, deflate, br",
+    DNT: "1",
+    Connection: "keep-alive",
+    "Sec-Fetch-Dest": "document",
+    "Sec-Fetch-Mode": "navigate",
+    "Sec-Fetch-Site": "none",
+    "Sec-Fetch-User": "?1",
+  };
+
+  public static async getDownloadUrl(fileId: string): Promise<string> {
+    try {
+      const response = await axios.get(`https://pd.cybar.xyz/${fileId}`, {
+        headers: this.browserHeaders,
+        maxRedirects: 0,
+        validateStatus: (status) =>
+          status === 301 || status === 302 || status === 200,
+      });
+
+      if (
+        response.headers.location ||
+        response.status === 301 ||
+        response.status === 302
+      ) {
+        return response.headers.location;
+      }
+
+      throw new Error(`No redirect URL found (status: ${response.status})`);
+    } catch (error) {
+      console.error("Error fetching PixelDrain URL:", error);
+      throw error;
+    }
+  }
+}

src/main/services/hydra-api.ts

@@ -12,7 +12,6 @@ import { isFuture, isToday } from "date-fns";
 import { db } from "@main/level";
 import { levelKeys } from "@main/level/sublevels";
 import type { Auth, User } from "@types";
-import { Crypto } from "./crypto";
 
 interface HydraApiOptions {
   needsAuth?: boolean;
@@ -32,8 +31,9 @@ export class HydraApi {
   private static readonly EXPIRATION_OFFSET_IN_MS = 1000 * 60 * 5; // 5 minutes
   private static readonly ADD_LOG_INTERCEPTOR = true;
 
-  private static readonly secondsToMilliseconds = (seconds: number) =>
-    seconds * 1000;
+  private static secondsToMilliseconds(seconds: number) {
+    return seconds * 1000;
+  }
 
   private static userAuth: HydraApiUserAuth = {
     authToken: "",
@@ -81,8 +81,8 @@ export class HydraApi {
     db.put<string, Auth>(
       levelKeys.auth,
       {
-        accessToken: Crypto.encrypt(accessToken),
-        refreshToken: Crypto.encrypt(refreshToken),
+        accessToken,
+        refreshToken,
         tokenExpirationTimestamp,
       },
       { valueEncoding: "json" }
@@ -204,12 +204,8 @@ export class HydraApi {
     const user = result.at(1) as User | undefined;
 
     this.userAuth = {
-      authToken: userAuth?.accessToken
-        ? Crypto.decrypt(userAuth.accessToken)
-        : "",
-      refreshToken: userAuth?.refreshToken
-        ? Crypto.decrypt(userAuth.refreshToken)
-        : "",
+      authToken: userAuth?.accessToken ?? "",
+      refreshToken: userAuth?.refreshToken ?? "",
       expirationTimestamp: userAuth?.tokenExpirationTimestamp ?? 0,
       subscription: user?.subscription
         ? { expiresAt: user.subscription?.expiresAt }
@@ -258,7 +254,7 @@ export class HydraApi {
           levelKeys.auth,
           {
             ...auth,
-            accessToken: Crypto.encrypt(accessToken),
+            accessToken,
             tokenExpirationTimestamp,
           },
           { valueEncoding: "json" }

src/main/services/index.ts

@@ -1,4 +1,3 @@
-export * from "./crypto";
 export * from "./logger";
 export * from "./steam";
 export * from "./steam-250";
@@ -8,3 +7,4 @@ export * from "./process-watcher";
 export * from "./main-loop";
 export * from "./hydra-api";
 export * from "./ludusavi";
+export * from "./cloud-sync";

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

@@ -24,7 +24,7 @@ export const mergeWithRemoteGames = async () => {
               ? game.playTimeInMilliseconds
               : localGame.playTimeInMilliseconds;
 
-          gamesSublevel.put(levelKeys.game(game.shop, game.objectId), {
+          await gamesSublevel.put(levelKeys.game(game.shop, game.objectId), {
             ...localGame,
             remoteId: game.id,
             lastTimePlayed: updatedLastTimePlayed,
@@ -39,7 +39,7 @@ export const mergeWithRemoteGames = async () => {
             ? steamUrlBuilder.icon(game.objectId, steamGame.clientIcon)
             : null;
 
-          gamesSublevel.put(levelKeys.game(game.shop, game.objectId), {
+          await gamesSublevel.put(levelKeys.game(game.shop, game.objectId), {
             objectId: game.objectId,
             title: steamGame?.name,
             remoteId: game.id,

src/main/services/process-watcher.ts

@@ -6,6 +6,9 @@ import axios from "axios";
 import { exec } from "child_process";
 import { ProcessPayload } from "./download/types";
 import { gamesSublevel, levelKeys } from "@main/level";
+import { t } from "i18next";
+import { CloudSync } from "./cloud-sync";
+import { format } from "date-fns";
 
 const commands = {
   findWineDir: `lsof -c wine 2>/dev/null | grep '/drive_c/windows$' | head -n 1 | awk '{for(i=9;i<=NF;i++) printf "%s ", $i; print ""}'`,
@@ -225,6 +228,18 @@ function onOpenGame(game: Game) {
 
   if (game.remoteId) {
     updateGamePlaytime(game, 0, new Date()).catch(() => {});
+
+    if (game.automaticCloudSync) {
+      CloudSync.uploadSaveGame(
+        game.objectId,
+        game.shop,
+        null,
+        t("automatic_backup_from", {
+          ns: "game_details",
+          date: format(new Date(), "dd/MM/yyyy"),
+        })
+      );
+    }
   } else {
     createGame({ ...game, lastTimePlayed: new Date() }).catch(() => {});
   }
@@ -287,6 +302,18 @@ const onCloseGame = (game: Game) => {
       performance.now() - gamePlaytime.lastSyncTick,
       game.lastTimePlayed!
     ).catch(() => {});
+
+    if (game.automaticCloudSync) {
+      CloudSync.uploadSaveGame(
+        game.objectId,
+        game.shop,
+        null,
+        t("automatic_backup_from", {
+          ns: "game_details",
+          date: format(new Date(), "dd/MM/yyyy"),
+        })
+      );
+    }
   } else {
     createGame(game).catch(() => {});
   }

src/main/services/window-manager.ts

@@ -24,6 +24,8 @@ import { isStaging } from "@main/constants";
 export class WindowManager {
   public static mainWindow: Electron.BrowserWindow | null = null;
 
+  private static readonly editorWindows: Map<string, BrowserWindow> = new Map();
+
   private static initialConfigInitializationMainWindow: Electron.BrowserWindowConstructorOptions =
     {
       width: 1200,
@@ -36,7 +38,7 @@ export class WindowManager {
       trafficLightPosition: { x: 16, y: 16 },
       titleBarOverlay: {
         symbolColor: "#DADBE1",
-        color: "#151515",
+        color: "#00000000",
         height: 34,
       },
       webPreferences: {
@@ -46,6 +48,23 @@ export class WindowManager {
       show: false,
     };
 
+  private static loadMainWindowURL(hash = "") {
+    // HMR for renderer base on electron-vite cli.
+    // Load the remote URL for development or the local html file for production.
+    if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
+      this.mainWindow?.loadURL(
+        `${process.env["ELECTRON_RENDERER_URL"]}#/${hash}`
+      );
+    } else {
+      this.mainWindow?.loadFile(
+        path.join(__dirname, "../renderer/index.html"),
+        {
+          hash,
+        }
+      );
+    }
+  }
+
   private static async saveScreenConfig({
     ...configScreenWhenClosed
   }: {
@@ -66,6 +85,7 @@ export class WindowManager {
     });
     return data ?? {};
   }
+
   private static updateInitialConfig(
     newConfig: Partial<Electron.BrowserWindowConstructorOptions>
   ) {
@@ -75,23 +95,6 @@ export class WindowManager {
     };
   }
 
-  private static loadMainWindowURL(hash = "") {
-    // HMR for renderer base on electron-vite cli.
-    // Load the remote URL for development or the local html file for production.
-    if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
-      this.mainWindow?.loadURL(
-        `${process.env["ELECTRON_RENDERER_URL"]}#/${hash}`
-      );
-    } else {
-      this.mainWindow?.loadFile(
-        path.join(__dirname, "../renderer/index.html"),
-        {
-          hash,
-        }
-      );
-    }
-  }
-
   public static async createMainWindow() {
     if (this.mainWindow) return;
 
@@ -261,6 +264,87 @@ export class WindowManager {
     }
   }
 
+  public static openEditorWindow(themeId: string) {
+    if (this.mainWindow) {
+      const existingWindow = this.editorWindows.get(themeId);
+      if (existingWindow) {
+        if (existingWindow.isMinimized()) {
+          existingWindow.restore();
+        }
+        existingWindow.focus();
+        return;
+      }
+
+      const editorWindow = new BrowserWindow({
+        width: 600,
+        height: 720,
+        minWidth: 600,
+        minHeight: 540,
+        backgroundColor: "#1c1c1c",
+        titleBarStyle: process.platform === "linux" ? "default" : "hidden",
+        ...(process.platform === "linux" ? { icon } : {}),
+        trafficLightPosition: { x: 16, y: 16 },
+        titleBarOverlay: {
+          symbolColor: "#DADBE1",
+          color: "#151515",
+          height: 34,
+        },
+        webPreferences: {
+          preload: path.join(__dirname, "../preload/index.mjs"),
+          sandbox: false,
+        },
+        show: false,
+      });
+
+      this.editorWindows.set(themeId, editorWindow);
+
+      editorWindow.removeMenu();
+
+      if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
+        editorWindow.loadURL(
+          `${process.env["ELECTRON_RENDERER_URL"]}#/theme-editor?themeId=${themeId}`
+        );
+      } else {
+        editorWindow.loadFile(path.join(__dirname, "../renderer/index.html"), {
+          hash: `theme-editor?themeId=${themeId}`,
+        });
+      }
+
+      editorWindow.once("ready-to-show", () => {
+        editorWindow.show();
+        this.mainWindow?.webContents.openDevTools();
+        if (isStaging) {
+          editorWindow.webContents.openDevTools();
+        }
+      });
+
+      editorWindow.webContents.on("before-input-event", (event, input) => {
+        if (input.key === "F12") {
+          event.preventDefault();
+          this.mainWindow?.webContents.toggleDevTools();
+        }
+      });
+
+      editorWindow.on("close", () => {
+        this.mainWindow?.webContents.closeDevTools();
+        this.editorWindows.delete(themeId);
+      });
+    }
+  }
+
+  public static closeEditorWindow(themeId?: string) {
+    if (themeId) {
+      const editorWindow = this.editorWindows.get(themeId);
+      if (editorWindow) {
+        editorWindow.close();
+      }
+    } else {
+      this.editorWindows.forEach((editorWindow) => {
+        editorWindow.close();
+      });
+    }
+  }
+
   public static redirect(hash: string) {
     if (!this.mainWindow) this.createMainWindow();
     this.loadMainWindowURL(hash);