fix: fixing errors with electron dl manager

.gitignore

@@ -2,7 +2,6 @@
 node_modules
 hydra-download-manager
 fastlist.exe
-unrar.wasm
 __pycache__
 dist
 out

electron-builder.yml

@@ -6,7 +6,6 @@ extraResources:
   - hydra-download-manager
   - hydra.db
   - fastlist.exe
-  - unrar.wasm
 files:
   - "!**/.vscode/*"
   - "!src/*"

electron.vite.config.ts

@@ -31,7 +31,7 @@ export default defineConfig(({ mode }) => {
           "@main": resolve("src/main"),
           "@locales": resolve("src/locales"),
           "@resources": resolve("resources"),
-          "@globals": resolve("src/globals"),
+          "@shared": resolve("src/shared"),
         },
       },
       plugins: [externalizeDepsPlugin(), swcPlugin(), sentryPlugin],
@@ -47,7 +47,7 @@ export default defineConfig(({ mode }) => {
         alias: {
           "@renderer": resolve("src/renderer/src"),
           "@locales": resolve("src/locales"),
-          "@globals": resolve("src/globals"),
+          "@shared": resolve("src/shared"),
         },
       },
       plugins: [svgr(), react(), vanillaExtractPlugin(), sentryPlugin],

package.json

@@ -43,7 +43,7 @@
     "classnames": "^2.5.1",
     "color.js": "^1.2.0",
     "date-fns": "^3.6.0",
-    "electron-dl-manager": "^3.0.0",
+    "easydl": "^1.1.1",
     "fetch-cookie": "^3.0.1",
     "flexsearch": "^0.7.43",
     "i18next": "^23.11.2",

postinstall.cjs

@@ -6,5 +6,3 @@ if (process.platform === "win32") {
     "fastlist.exe"
   );
 }
-
-fs.copyFileSync("node_modules/node-unrar-js/esm/js/unrar.wasm", "unrar.wasm");

src/main/entity/game.entity.ts

@@ -7,9 +7,10 @@ import {
   OneToOne,
   JoinColumn,
 } from "typeorm";
-import type { GameShop } from "@types";
 import { Repack } from "./repack.entity";
-import { GameStatus } from "@globals";
+
+import type { GameShop } from "@types";
+import { Downloader, GameStatus } from "@shared";
 
 @Entity("game")
 export class Game {
@@ -34,9 +35,6 @@ export class Game {
   @Column("text", { nullable: true })
   executablePath: string | null;
 
-  @Column("text", { nullable: true })
-  rarPath: string | null;
-
   @Column("int", { default: 0 })
   playTimeInMilliseconds: number;
 
@@ -46,6 +44,9 @@ export class Game {
   @Column("text", { nullable: true })
   status: GameStatus | null;
 
+  @Column("int", { default: Downloader.Torrent })
+  downloader: Downloader;
+
   /**
    * Progress is a float between 0 and 1
    */
@@ -55,9 +56,6 @@ export class Game {
   @Column("float", { default: 0 })
   fileVerificationProgress: number;
 
-  @Column("float", { default: 0 })
-  decompressionProgress: number;
-
   @Column("int", { default: 0 })
   bytesDownloaded: number;
 

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

@@ -16,6 +16,7 @@ const addGameToLibrary = async (
   const game = await gameRepository.findOne({
     where: {
       objectID,
+      isDeleted: false,
     },
   });
 

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

@@ -10,7 +10,9 @@ const closeGame = async (
   gameId: number
 ) => {
   const processes = await getProcesses();
-  const game = await gameRepository.findOne({ where: { id: gameId } });
+  const game = await gameRepository.findOne({
+    where: { id: gameId, isDeleted: false },
+  });
 
   if (!game) return false;
 

src/main/events/library/delete-game-folder.ts

@@ -1,7 +1,7 @@
 import path from "node:path";
 import fs from "node:fs";
 
-import { GameStatus } from "@globals";
+import { GameStatus } from "@shared";
 import { gameRepository } from "@main/repository";
 
 import { getDownloadsPath } from "../helpers/get-downloads-path";
@@ -16,6 +16,7 @@ const deleteGameFolder = async (
     where: {
       id: gameId,
       status: GameStatus.Cancelled,
+      isDeleted: false,
     },
   });
 

src/main/events/library/get-library.ts

@@ -2,7 +2,7 @@ import { gameRepository } from "@main/repository";
 
 import { searchRepacks } from "../helpers/search-games";
 import { registerEvent } from "../register-event";
-import { GameStatus } from "@globals";
+import { GameStatus } from "@shared";
 import { sortBy } from "lodash-es";
 
 const getLibrary = async () =>

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

@@ -13,7 +13,9 @@ const openGameInstaller = async (
   _event: Electron.IpcMainInvokeEvent,
   gameId: number
 ) => {
-  const game = await gameRepository.findOne({ where: { id: gameId } });
+  const game = await gameRepository.findOne({
+    where: { id: gameId, isDeleted: false },
+  });
 
   if (!game) return true;
 

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

@@ -1,6 +1,6 @@
 import { registerEvent } from "../register-event";
 import { gameRepository } from "../../repository";
-import { GameStatus } from "@globals";
+import { GameStatus } from "@shared";
 
 const removeGame = async (
   _event: Electron.IpcMainInvokeEvent,

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

@@ -4,8 +4,8 @@ import { registerEvent } from "../register-event";
 import { WindowManager } from "@main/services";
 
 import { In } from "typeorm";
-import { Downloader } from "@main/services/downloaders/downloader";
-import { GameStatus } from "@globals";
+import { DownloadManager } from "@main/services";
+import { GameStatus } from "@shared";
 
 const cancelGameDownload = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -14,19 +14,20 @@ const cancelGameDownload = async (
   const game = await gameRepository.findOne({
     where: {
       id: gameId,
+      isDeleted: false,
       status: In([
         GameStatus.Downloading,
         GameStatus.DownloadingMetadata,
         GameStatus.CheckingFiles,
         GameStatus.Paused,
         GameStatus.Seeding,
         GameStatus.Finished,
-        GameStatus.Decompressing,
       ]),
     },
   });
 
   if (!game) return;
+  DownloadManager.cancelDownload();
 
   await gameRepository
     .update(
@@ -44,7 +45,6 @@ const cancelGameDownload = async (
         game.status !== GameStatus.Paused &&
         game.status !== GameStatus.Seeding
       ) {
-        Downloader.cancelDownload();
         if (result.affected) WindowManager.mainWindow?.setProgressBar(-1);
       }
     });

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

@@ -1,15 +1,15 @@
-import { WindowManager } from "@main/services";
-
 import { registerEvent } from "../register-event";
 import { gameRepository } from "../../repository";
 import { In } from "typeorm";
-import { Downloader } from "@main/services/downloaders/downloader";
-import { GameStatus } from "@globals";
+import { DownloadManager, WindowManager } from "@main/services";
+import { GameStatus } from "@shared";
 
 const pauseGameDownload = async (
   _event: Electron.IpcMainInvokeEvent,
   gameId: number
 ) => {
+  DownloadManager.pauseDownload();
+
   await gameRepository
     .update(
       {
@@ -23,10 +23,7 @@ const pauseGameDownload = async (
       { status: GameStatus.Paused }
     )
     .then((result) => {
-      if (result.affected) {
-        Downloader.pauseDownload();
-        WindowManager.mainWindow?.setProgressBar(-1);
-      }
+      if (result.affected) WindowManager.mainWindow?.setProgressBar(-1);
     });
 };
 

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

@@ -2,8 +2,8 @@ import { registerEvent } from "../register-event";
 import { gameRepository } from "../../repository";
 import { getDownloadsPath } from "../helpers/get-downloads-path";
 import { In } from "typeorm";
-import { Downloader } from "@main/services/downloaders/downloader";
-import { GameStatus } from "@globals";
+import { DownloadManager } from "@main/services";
+import { GameStatus } from "@shared";
 
 const resumeGameDownload = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -12,18 +12,18 @@ const resumeGameDownload = async (
   const game = await gameRepository.findOne({
     where: {
       id: gameId,
+      isDeleted: false,
     },
     relations: { repack: true },
   });
 
   if (!game) return;
-
-  Downloader.resumeDownload();
+  DownloadManager.pauseDownload();
 
   if (game.status === GameStatus.Paused) {
     const downloadsPath = game.downloadPath ?? (await getDownloadsPath());
 
-    Downloader.downloadGame(game, game.repack);
+    DownloadManager.resumeDownload(gameId);
 
     await gameRepository.update(
       {
@@ -39,7 +39,7 @@ const resumeGameDownload = async (
     await gameRepository.update(
       { id: game.id },
       {
-        status: GameStatus.DownloadingMetadata,
+        status: GameStatus.Downloading,
         downloadPath: downloadsPath,
       }
     );

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

@@ -1,13 +1,17 @@
 import { getSteamGameIconUrl } from "@main/services";
-import { gameRepository, repackRepository } from "@main/repository";
+import {
+  gameRepository,
+  repackRepository,
+  userPreferencesRepository,
+} from "@main/repository";
 
 import { registerEvent } from "../register-event";
 
 import type { GameShop } from "@types";
 import { getFileBase64 } from "@main/helpers";
 import { In } from "typeorm";
-import { Downloader } from "@main/services/downloaders/downloader";
-import { GameStatus } from "@globals";
+import { DownloadManager } from "@main/services";
+import { Downloader, GameStatus } from "@shared";
 
 const startGameDownload = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -17,6 +21,14 @@ const startGameDownload = async (
   gameShop: GameShop,
   downloadPath: string
 ) => {
+  const userPreferences = await userPreferencesRepository.findOne({
+    where: { id: 1 },
+  });
+
+  const downloader = userPreferences?.realDebridApiToken
+    ? Downloader.Http
+    : Downloader.Torrent;
+
   const [game, repack] = await Promise.all([
     gameRepository.findOne({
       where: {
@@ -30,13 +42,8 @@ const startGameDownload = async (
     }),
   ]);
 
-  if (!repack) return;
-
-  if (game?.status === GameStatus.Downloading) {
-    return;
-  }
-
-  Downloader.pauseDownload();
+  if (!repack || game?.status === GameStatus.Downloading) return;
+  DownloadManager.pauseDownload();
 
   await gameRepository.update(
     {
@@ -57,12 +64,13 @@ const startGameDownload = async (
       {
         status: GameStatus.DownloadingMetadata,
         downloadPath: downloadPath,
+        downloader,
         repack: { id: repackId },
         isDeleted: false,
       }
     );
 
-    Downloader.downloadGame(game, repack);
+    DownloadManager.downloadGame(game.id);
 
     game.status = GameStatus.DownloadingMetadata;
 
@@ -74,13 +82,14 @@ const startGameDownload = async (
       title,
       iconUrl,
       objectID,
+      downloader,
       shop: gameShop,
-      status: GameStatus.DownloadingMetadata,
-      downloadPath: downloadPath,
+      status: GameStatus.Downloading,
+      downloadPath,
       repack: { id: repackId },
     });
 
-    Downloader.downloadGame(createdGame, repack);
+    DownloadManager.downloadGame(createdGame.id);
 
     const { repack: _, ...rest } = createdGame;
 

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

@@ -2,11 +2,16 @@ import { userPreferencesRepository } from "@main/repository";
 import { registerEvent } from "../register-event";
 
 import type { UserPreferences } from "@types";
+import { RealDebridClient } from "@main/services/real-debrid";
 
 const updateUserPreferences = async (
   _event: Electron.IpcMainInvokeEvent,
   preferences: Partial<UserPreferences>
 ) => {
+  if (preferences.realDebridApiToken) {
+    RealDebridClient.authorize(preferences.realDebridApiToken);
+  }
+
   await userPreferencesRepository.upsert(
     {
       id: 1,