refactor: enhance download progress tracking in DownloadManager

refactor: improve code formatting and consistency in DownloadManager

.env.example

@@ -1,6 +1,7 @@
 MAIN_VITE_API_URL=
 MAIN_VITE_AUTH_URL=
 MAIN_VITE_WS_URL=
+MAIN_VITE_NIMBUS_API_URL=
 RENDERER_VITE_REAL_DEBRID_REFERRAL_ID=
 RENDERER_VITE_TORBOX_REFERRAL_CODE=
 MAIN_VITE_LAUNCHER_SUBDOMAIN=

.github/workflows/build.yml

@@ -57,6 +57,7 @@ jobs:
           MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_STAGING_AUTH_URL }}
           MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_STAGING_CHECKOUT_URL }}
           MAIN_VITE_WS_URL: ${{ vars.MAIN_VITE_WS_STAGING_URL }}
+          MAIN_VITE_NIMBUS_API_URL: ${{ vars.MAIN_VITE_NIMBUS_API_URL }}
           RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.EXTERNAL_RESOURCES_URL }}
           MAIN_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.EXTERNAL_RESOURCES_URL }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -73,6 +74,7 @@ jobs:
           MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_STAGING_AUTH_URL }}
           MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_STAGING_CHECKOUT_URL }}
           MAIN_VITE_WS_URL: ${{ vars.MAIN_VITE_WS_STAGING_URL }}
+          MAIN_VITE_NIMBUS_API_URL: ${{ vars.MAIN_VITE_NIMBUS_API_URL }}
           RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.EXTERNAL_RESOURCES_URL }}
           MAIN_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.EXTERNAL_RESOURCES_URL }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -54,9 +54,10 @@ jobs:
           MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_API_URL }}
           MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_AUTH_URL }}
           MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_CHECKOUT_URL }}
+          MAIN_VITE_WS_URL: ${{ vars.MAIN_VITE_WS_URL }}
+          MAIN_VITE_NIMBUS_API_URL: ${{ vars.MAIN_VITE_NIMBUS_API_URL }}
           RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.EXTERNAL_RESOURCES_URL }}
           MAIN_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.EXTERNAL_RESOURCES_URL }}
-          MAIN_VITE_WS_URL: ${{ vars.MAIN_VITE_WS_URL }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           RENDERER_VITE_SENTRY_DSN: ${{ vars.SENTRY_DSN }}
@@ -71,9 +72,10 @@ jobs:
           MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_API_URL }}
           MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_AUTH_URL }}
           MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_CHECKOUT_URL }}
+          MAIN_VITE_WS_URL: ${{ vars.MAIN_VITE_WS_URL }}
+          MAIN_VITE_NIMBUS_API_URL: ${{ vars.MAIN_VITE_NIMBUS_API_URL }}
           RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.EXTERNAL_RESOURCES_URL }}
           MAIN_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.EXTERNAL_RESOURCES_URL }}
-          MAIN_VITE_WS_URL: ${{ vars.MAIN_VITE_WS_URL }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           RENDERER_VITE_SENTRY_DSN: ${{ vars.SENTRY_DSN }}

python_rpc/http_downloader.py

@@ -1,4 +1,5 @@
 import aria2p
+from aria2p.client import ClientException as DownloadNotFound
 
 class HttpDownloader:
     def __init__(self):
@@ -11,12 +12,16 @@ class HttpDownloader:
             )
         )
 
-    def start_download(self, url: str, save_path: str, header: str, out: str = None):
+    def start_download(self, url: str, save_path: str, header, out: str = None):
         if self.download:
             self.aria2.resume([self.download])
         else:
-            downloads = self.aria2.add(url, options={"header": header, "dir": save_path, "out": out})
-            
+            options = {"dir": save_path}
+            if header:
+                options["header"] = header
+            if out:
+                options["out"] = out
+            downloads = self.aria2.add(url, options=options)
             self.download = downloads[0]
     
     def pause_download(self):
@@ -32,7 +37,11 @@ class HttpDownloader:
         if self.download == None:
             return None
 
-        download = self.aria2.get_download(self.download.gid)
+        try:
+            download = self.aria2.get_download(self.download.gid)
+        except DownloadNotFound:
+            self.download = None
+            return None
 
         response = {
             'folderName': download.name,

src/locales/en/translation.json

@@ -175,6 +175,7 @@
     "repacks_modal_description": "Choose the repack you want to download",
     "select_folder_hint": "To change the default folder, go to the <0>Settings</0>",
     "download_now": "Download now",
+    "loading": "Loading...",
     "no_shop_details": "Could not retrieve shop details.",
     "download_options": "Download options",
     "download_path": "Download path",

src/main/services/aria2.ts

@@ -21,6 +21,7 @@ export class Aria2 {
         "--rpc-listen-all",
         "--file-allocation=none",
         "--allow-overwrite=true",
+        "--disable-ipv6",
       ],
       { stdio: "inherit", windowsHide: true }
     );

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

@@ -8,6 +8,7 @@ import {
   DatanodesApi,
   MediafireApi,
   PixelDrainApi,
+  VikingFileApi,
 } from "../hosters";
 import { PythonRPC } from "../python-rpc";
 import {
@@ -150,14 +151,28 @@ export class DownloadManager {
       if (!isDownloadingMetadata && !isCheckingFiles) {
         if (!download) return null;
 
-        await downloadsSublevel.put(downloadId, {
+        const updatedDownload = {
           ...download,
           bytesDownloaded,
           fileSize,
           progress,
           folderName,
-          status: "active",
-        });
+          status: "active" as const,
+        };
+
+        await downloadsSublevel.put(downloadId, updatedDownload);
+
+        return {
+          numPeers,
+          numSeeds,
+          downloadSpeed,
+          timeRemaining: calculateETA(fileSize, bytesDownloaded, downloadSpeed),
+          isDownloadingMetadata,
+          isCheckingFiles,
+          progress,
+          gameId: downloadId,
+          download: updatedDownload,
+        } as DownloadProgress;
       }
 
       return {
@@ -499,6 +514,29 @@ export class DownloadManager {
           allow_multiple_connections: true,
         };
       }
+      case Downloader.VikingFile: {
+        logger.log(
+          `[DownloadManager] Processing VikingFile download for URI: ${download.uri}`
+        );
+        try {
+          const downloadUrl = await VikingFileApi.getDownloadUrl(download.uri);
+          logger.log(`[DownloadManager] VikingFile direct URL obtained`);
+          return {
+            action: "start",
+            game_id: downloadId,
+            url: downloadUrl,
+            save_path: download.downloadPath,
+            header:
+              "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",
+          };
+        } catch (error) {
+          logger.error(
+            `[DownloadManager] Error processing VikingFile download:`,
+            error
+          );
+          throw error;
+        }
+      }
     }
   }
 

src/main/services/hosters/buzzheavier.ts

@@ -1,4 +1,6 @@
 import axios from "axios";
+import http from "http";
+import https from "https";
 import {
   HOSTER_USER_AGENT,
   extractHosterFilename,
@@ -28,6 +30,12 @@ export class BuzzheavierApi {
       await axios.get(baseUrl, {
         headers: { "User-Agent": HOSTER_USER_AGENT },
         timeout: 30000,
+        httpAgent: new http.Agent({
+          family: 4, // Force IPv4
+        }),
+        httpsAgent: new https.Agent({
+          family: 4, // Force IPv4
+        }),
       });
 
       const downloadUrl = `${baseUrl}/download`;
@@ -43,6 +51,12 @@ export class BuzzheavierApi {
         validateStatus: (status) =>
           status === 200 || status === 204 || status === 301 || status === 302,
         timeout: 30000,
+        httpAgent: new http.Agent({
+          family: 4, // Force IPv4
+        }),
+        httpsAgent: new https.Agent({
+          family: 4, // Force IPv4
+        }),
       });
 
       const hxRedirect = headResponse.headers["hx-redirect"];

src/main/services/hosters/index.ts

@@ -5,3 +5,4 @@ export * from "./mediafire";
 export * from "./pixeldrain";
 export * from "./buzzheavier";
 export * from "./fuckingfast";
+export * from "./vikingfile";

src/main/services/hosters/vikingfile.ts

@@ -0,0 +1,59 @@
+import axios from "axios";
+import https from "https";
+import { logger } from "../logger";
+
+interface UnlockResponse {
+  link: string;
+  hoster: string;
+}
+
+export class VikingFileApi {
+  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,*/*;q=0.8",
+    Referer: "https://vikingfile.com/",
+  };
+
+  public static async getDownloadUrl(uri: string): Promise<string> {
+    const unlockResponse = await axios.post<UnlockResponse>(
+      `${import.meta.env.MAIN_VITE_NIMBUS_API_URL}/hosters/unlock`,
+      { url: uri }
+    );
+
+    if (!unlockResponse.data.link) {
+      throw new Error("Failed to unlock VikingFile URL");
+    }
+
+    const redirectUrl = unlockResponse.data.link;
+
+    // Follow the redirect to get the final Cloudflare storage URL
+    try {
+      const redirectResponse = await axios.head(redirectUrl, {
+        headers: this.browserHeaders,
+        maxRedirects: 0,
+        validateStatus: (status) =>
+          status === 301 || status === 302 || status === 200,
+        httpsAgent: new https.Agent({
+          family: 4, // Force IPv4
+        }),
+      });
+
+      if (
+        redirectResponse.headers.location ||
+        redirectResponse.status === 301 ||
+        redirectResponse.status === 302
+      ) {
+        return redirectResponse.headers.location || redirectUrl;
+      }
+
+      return redirectUrl;
+    } catch (error) {
+      logger.error(
+        `[VikingFile] Error following redirect, using redirect URL:`,
+        error
+      );
+      return redirectUrl;
+    }
+  }
+}

src/main/services/python-rpc.ts

@@ -1,4 +1,5 @@
 import axios from "axios";
+import http from "http";
 
 import cp from "node:child_process";
 import fs from "node:fs";
@@ -31,6 +32,9 @@ export class PythonRPC {
   public static readonly RPC_PORT = "8084";
   public static readonly rpc = axios.create({
     baseURL: `http://localhost:${this.RPC_PORT}`,
+    httpAgent: new http.Agent({
+      family: 4, // Force IPv4
+    }),
   });
 
   private static pythonProcess: cp.ChildProcess | null = null;

src/main/vite-env.d.ts

@@ -7,6 +7,7 @@ interface ImportMetaEnv {
   readonly MAIN_VITE_CHECKOUT_URL: string;
   readonly MAIN_VITE_EXTERNAL_RESOURCES_URL: string;
   readonly MAIN_VITE_WS_URL: string;
+  readonly MAIN_VITE_NIMBUS_API_URL: string;
   readonly MAIN_VITE_LAUNCHER_SUBDOMAIN: string;
   readonly ELECTRON_RENDERER_URL: string;
 }

src/renderer/src/constants.ts

@@ -14,6 +14,7 @@ export const DOWNLOADER_NAME = {
   [Downloader.FuckingFast]: "FuckingFast",
   [Downloader.TorBox]: "TorBox",
   [Downloader.Hydra]: "Nimbus",
+  [Downloader.VikingFile]: "VikingFile",
 };
 
 export const MAX_MINUTES_TO_SHOW_IN_PLAYTIME = 120;

src/renderer/src/pages/game-details/modals/download-settings-modal.scss

@@ -19,23 +19,67 @@
     color: globals.$body-color;
   }
 
-  &__downloaders {
-    display: grid;
-    gap: globals.$spacing-unit;
-    grid-template-columns: repeat(2, 1fr);
+  &__downloaders-list {
+    display: flex;
+    flex-direction: column;
+    gap: calc(globals.$spacing-unit / 2);
+    max-height: 200px;
+    overflow-y: auto;
+    border: 1px solid globals.$border-color;
+    border-radius: 4px;
+    padding: calc(globals.$spacing-unit / 2);
+    background-color: globals.$dark-background-color;
   }
 
-  &__downloader-option {
-    position: relative;
+  &__downloader-item {
+    display: flex;
+    align-items: center;
+    gap: calc(globals.$spacing-unit * 1.5);
+    padding: calc(globals.$spacing-unit * 1.5) calc(globals.$spacing-unit * 2);
+    border: 1px solid transparent;
+    border-radius: 4px;
+    background-color: transparent;
+    cursor: pointer;
+    transition:
+      background-color 0.15s ease,
+      border-color 0.15s ease;
+    color: globals.$body-color;
+    font-size: 14px;
+    text-align: left;
 
-    &:only-child {
-      grid-column: 1 / -1;
+    &:hover:not(&--disabled) {
+      background-color: rgba(255, 255, 255, 0.05);
+    }
+
+    &--selected {
+      background-color: rgba(255, 255, 255, 0.08);
+    }
+
+    &--disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
     }
   }
 
-  &__downloader-icon {
-    position: absolute;
-    left: calc(globals.$spacing-unit * 2);
+  &__downloader-name {
+    flex: 1;
+  }
+
+  &__availability-indicator {
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    flex-shrink: 0;
+
+    &--available {
+      background-color: #22c55e;
+      box-shadow: 0 0 6px rgba(34, 197, 94, 0.5);
+    }
+
+    &--unavailable {
+      background-color: #ef4444;
+      box-shadow: 0 0 6px rgba(239, 68, 68, 0.5);
+    }
   }
 
   &__path-error {
@@ -49,4 +93,17 @@
   &__change-path-button {
     align-self: flex-end;
   }
+
+  &__loading-spinner {
+    animation: spin 1s linear infinite;
+  }
+}
+
+@keyframes spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
 }

src/renderer/src/pages/game-details/modals/download-settings-modal.tsx

@@ -7,8 +7,13 @@ import {
   Modal,
   TextField,
 } from "@renderer/components";
-import { CheckCircleFillIcon, DownloadIcon } from "@primer/octicons-react";
-import { Downloader, formatBytes, getDownloadersForUris } from "@shared";
+import { DownloadIcon, SyncIcon } from "@primer/octicons-react";
+import {
+  Downloader,
+  formatBytes,
+  getDownloadersForUri,
+  getDownloadersForUris,
+} from "@shared";
 import type { GameRepack } from "@types";
 import { DOWNLOADER_NAME } from "@renderer/constants";
 import { useAppSelector, useFeature, useToast } from "@renderer/hooks";
@@ -82,6 +87,40 @@ export function DownloadSettingsModal({
     return getDownloadersForUris(repack?.uris ?? []);
   }, [repack?.uris]);
 
+  const downloadOptions = useMemo(() => {
+    if (!repack) return [];
+
+    const unavailableUrisSet = new Set(repack.unavailableUris ?? []);
+
+    const downloaderMap = new Map<
+      Downloader,
+      { hasAvailable: boolean; hasUnavailable: boolean }
+    >();
+
+    for (const uri of repack.uris) {
+      const uriDownloaders = getDownloadersForUri(uri);
+      const isAvailable = !unavailableUrisSet.has(uri);
+
+      for (const downloader of uriDownloaders) {
+        const existing = downloaderMap.get(downloader);
+        if (existing) {
+          existing.hasAvailable = existing.hasAvailable || isAvailable;
+          existing.hasUnavailable = existing.hasUnavailable || !isAvailable;
+        } else {
+          downloaderMap.set(downloader, {
+            hasAvailable: isAvailable,
+            hasUnavailable: !isAvailable,
+          });
+        }
+      }
+    }
+
+    return Array.from(downloaderMap.entries()).map(([downloader, status]) => ({
+      downloader,
+      isAvailable: status.hasAvailable,
+    }));
+  }, [repack]);
+
   const getDefaultDownloader = useCallback(
     (availableDownloaders: Downloader[]) => {
       if (availableDownloaders.length === 0) return null;
@@ -186,31 +225,47 @@ export function DownloadSettingsModal({
         <div className="download-settings-modal__downloads-path-field">
           <span>{t("downloader")}</span>
 
-          <div className="download-settings-modal__downloaders">
-            {downloaders.map((downloader) => {
-              const shouldDisableButton =
-                (downloader === Downloader.RealDebrid &&
+          <div className="download-settings-modal__downloaders-list">
+            {downloadOptions.map((option) => {
+              const isUnavailable = !option.isAvailable;
+              const shouldDisableOption =
+                isUnavailable ||
+                (option.downloader === Downloader.RealDebrid &&
                   !userPreferences?.realDebridApiToken) ||
-                (downloader === Downloader.TorBox &&
+                (option.downloader === Downloader.TorBox &&
                   !userPreferences?.torBoxApiToken) ||
-                (downloader === Downloader.Hydra &&
+                (option.downloader === Downloader.Hydra &&
                   !isFeatureEnabled(Feature.Nimbus));
 
+              const isSelected = selectedDownloader === option.downloader;
+
               return (
-                <Button
-                  key={downloader}
-                  className="download-settings-modal__downloader-option"
-                  theme={
-                    selectedDownloader === downloader ? "primary" : "outline"
-                  }
-                  disabled={shouldDisableButton}
-                  onClick={() => setSelectedDownloader(downloader)}
+                <button
+                  type="button"
+                  key={option.downloader}
+                  className={`download-settings-modal__downloader-item ${
+                    isSelected
+                      ? "download-settings-modal__downloader-item--selected"
+                      : ""
+                  } ${
+                    shouldDisableOption
+                      ? "download-settings-modal__downloader-item--disabled"
+                      : ""
+                  }`}
+                  disabled={shouldDisableOption}
+                  onClick={() => setSelectedDownloader(option.downloader)}
                 >
-                  {selectedDownloader === downloader && (
-                    <CheckCircleFillIcon className="download-settings-modal__downloader-icon" />
-                  )}
-                  {DOWNLOADER_NAME[downloader]}
-                </Button>
+                  <span className="download-settings-modal__downloader-name">
+                    {DOWNLOADER_NAME[option.downloader]}
+                  </span>
+                  <span
+                    className={`download-settings-modal__availability-indicator ${
+                      option.isAvailable
+                        ? "download-settings-modal__availability-indicator--available"
+                        : "download-settings-modal__availability-indicator--unavailable"
+                    }`}
+                  />
+                </button>
               );
             })}
           </div>
@@ -267,8 +322,17 @@ export function DownloadSettingsModal({
             !hasWritePermission
           }
         >
-          <DownloadIcon />
-          {t("download_now")}
+          {downloadStarting ? (
+            <>
+              <SyncIcon className="download-settings-modal__loading-spinner" />
+              {t("loading")}
+            </>
+          ) : (
+            <>
+              <DownloadIcon />
+              {t("download_now")}
+            </>
+          )}
         </Button>
       </div>
     </Modal>

src/shared/constants.ts

@@ -10,6 +10,7 @@ export enum Downloader {
   Hydra,
   Buzzheavier,
   FuckingFast,
+  VikingFile,
 }
 
 export enum DownloadSourceStatus {

src/shared/index.ts

@@ -124,6 +124,9 @@ export const getDownloadersForUri = (uri: string) => {
   if (uri.startsWith("https://fuckingfast.co")) {
     return [Downloader.FuckingFast];
   }
+  if (uri.startsWith("https://vikingfile.com")) {
+    return [Downloader.VikingFile];
+  }
 
   if (realDebridHosts.some((host) => uri.startsWith(host)))
     return [Downloader.RealDebrid];

src/types/index.ts

@@ -20,6 +20,7 @@ export interface GameRepack {
   title: string;
   fileSize: string | null;
   uris: string[];
+  unavailableUris: string[];
   uploadDate: string | null;
   downloadSourceId: string;
   downloadSourceName: string;