fix: merge with ci

src/main/index.ts

@@ -8,7 +8,6 @@ import { electronApp, optimizer } from "@electron-toolkit/utils";
 import { logger, WindowManager } from "@main/services";
 import resources from "@locales";
 import { PythonRPC } from "./services/python-rpc";
-import { Aria2 } from "./services/aria2";
 import { db, levelKeys } from "./level";
 import { loadState } from "./main";
 
@@ -143,7 +142,6 @@ app.on("window-all-closed", () => {
 app.on("before-quit", () => {
   /* Disconnects libtorrent */
   PythonRPC.kill();
-  Aria2.kill();
 });
 
 app.on("activate", () => {

src/main/main.ts

@@ -2,7 +2,6 @@ import { DownloadManager, Ludusavi, startMainLoop } from "./services";
 import { RealDebridClient } from "./services/download/real-debrid";
 import { HydraApi } from "./services/hydra-api";
 import { uploadGamesBatch } from "./services/library-sync";
-import { Aria2 } from "./services/aria2";
 import { downloadsSublevel } from "./level/sublevels/downloads";
 import { sortBy } from "lodash-es";
 import { Downloader } from "@shared";
@@ -21,8 +20,6 @@ export const loadState = async () => {
 
   await import("./events");
 
-  Aria2.spawn();
-
   if (userPreferences?.realDebridApiToken) {
     RealDebridClient.authorize(userPreferences.realDebridApiToken);
   }

src/main/services/aria2.ts

@@ -1,28 +0,0 @@
-import path from "node:path";
-import cp from "node:child_process";
-import { app } from "electron";
-
-export class Aria2 {
-  private static process: cp.ChildProcess | null = null;
-  private static readonly binaryPath = app.isPackaged
-    ? path.join(process.resourcesPath, "aria2", "aria2c")
-    : path.join(__dirname, "..", "..", "aria2", "aria2c");
-
-  public static spawn() {
-    this.process = cp.spawn(
-      this.binaryPath,
-      [
-        "--enable-rpc",
-        "--rpc-listen-all",
-        "--file-allocation=none",
-        "--allow-overwrite=true",
-        "--disk-cache=64M",
-      ],
-      { stdio: "inherit", windowsHide: true }
-    );
-  }
-
-  public static kill() {
-    this.process?.kill();
-  }
-}

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

@@ -372,6 +372,7 @@ export class DownloadManager {
           game_id: downloadId,
           url: downloadUrl,
           save_path: download.downloadPath,
+          allow_multiple_connections: true,
         };
       }
       case Downloader.TorBox: {
@@ -384,6 +385,7 @@ export class DownloadManager {
           url,
           save_path: download.downloadPath,
           out: name,
+          allow_multiple_connections: true,
         };
       }
       case Downloader.Hydra: {
@@ -398,6 +400,7 @@ export class DownloadManager {
           game_id: downloadId,
           url: downloadUrl,
           save_path: download.downloadPath,
+          allow_multiple_connections: true,
         };
       }
     }

src/main/services/python-rpc.ts

@@ -21,6 +21,12 @@ const binaryNameByPlatform: Partial<Record<NodeJS.Platform, string>> = {
   win32: "hydra-python-rpc.exe",
 };
 
+const rustBinaryNameByPlatform: Partial<Record<NodeJS.Platform, string>> = {
+  darwin: "hydra-httpdl",
+  linux: "hydra-httpdl",
+  win32: "hydra-httpdl.exe",
+};
+
 export class PythonRPC {
   public static readonly BITTORRENT_PORT = "5881";
   public static readonly RPC_PORT = "8084";
@@ -52,6 +58,20 @@ export class PythonRPC {
       this.RPC_PASSWORD,
       initialDownload ? JSON.stringify(initialDownload) : "",
       initialSeeding ? JSON.stringify(initialSeeding) : "",
+      app.isPackaged
+        ? path.join(
+            process.resourcesPath,
+            rustBinaryNameByPlatform[process.platform]!
+          )
+        : path.join(
+            __dirname,
+            "..",
+            "..",
+            "rust_rpc",
+            "target",
+            "debug",
+            rustBinaryNameByPlatform[process.platform]!
+          ),
     ];
 
     if (app.isPackaged) {