chore: merge with main

package.json

@@ -19,7 +19,7 @@
     "start": "electron-vite preview",
     "dev": "electron-vite dev",
     "build": "npm run typecheck && electron-vite build",
-    "postinstall": "electron-builder install-app-deps",
+    "postinstall": "electron-builder install-app-deps && node ./postinstall.js",
     "build:unpack": "npm run build && electron-builder --dir",
     "build:win": "npm run build && electron-builder --win",
     "build:mac": "electron-vite build && electron-builder --mac",
@@ -56,7 +56,7 @@
     "react-loading-skeleton": "^3.4.0",
     "react-redux": "^9.1.1",
     "react-router-dom": "^6.22.3",
-    "tasklist": "^5.0.0",
+    "tough-cookie": "^4.1.3",
     "typeorm": "^0.3.20",
     "windows-1251": "^3.0.4",
     "winston": "^3.13.0",

postinstall.cjs

@@ -0,0 +1,12 @@
+const fs = require("fs");
+
+if (process.platform === "win32") {
+  if (!fs.existsSync("resources/dist")) {
+    fs.mkdirSync("resources/dist");
+  }
+
+  fs.copyFileSync(
+    "node_modules/ps-list/vendor/fastlist-0.3.0-x64.exe",
+    "resources/dist/fastlist.exe"
+  );
+}

src/locales/es/translation.json

@@ -16,8 +16,8 @@
     "paused": "{{title}} (Pausado)",
     "downloading": "{{title}} ({{percentage}} - Descargando…)",
     "filter": "Filtrar biblioteca",
-    "home": "Hogar",
-    "follow_us": "Síganos"
+    "home": "Inicio",
+    "follow_us": "Síguenos"
   },
   "header": {
     "search": "Buscar",
@@ -25,7 +25,7 @@
     "downloads": "Descargas",
     "search_results": "Resultados de búsqueda",
     "settings": "Ajustes",
-    "home": "Início"
+    "home": "Inicio"
   },
   "bottom_panel": {
     "no_downloads_in_progress": "Sin descargas en progreso",
@@ -70,7 +70,7 @@
     "install": "Instalar",
     "play": "Jugar",
     "not_played_yet": "Aún no has jugado a {{title}}",
-    "close": "Cerca",
+    "close": "Cerrar",
     "deleting": "Eliminando instalador…",
     "playing_now": "Jugando ahora",
     "last_time_played": "Jugado por última vez {{period}}"
@@ -100,7 +100,7 @@
     "checking_files": "Verificando archivos…",
     "starting_download": "Iniciando descarga…",
     "remove_from_list": "Eliminar",
-    "delete": "Quitar instalador",
+    "delete": "Eliminar instalador",
     "delete_modal_description": "Esto eliminará todos los archivos de instalación de su computadora.",
     "delete_modal_title": "¿Está seguro?",
     "deleting": "Eliminando instalador…",
@@ -112,8 +112,8 @@
     "notifications": "Notificaciones",
     "enable_download_notifications": "Cuando se completa una descarga",
     "enable_repack_list_notifications": "Cuando se añade un repack nuevo",
-    "telemetry": "Telemetria",
-    "telemetry_description": "Habilitar estadísticas de uso anónimas"
+    "telemetry": "Telemetría",
+    "telemetry_description": "Habilitar recopilación de datos de manera anónima"
   },
   "notifications": {
     "download_complete": "Descarga completada",
@@ -132,7 +132,7 @@
   "binary_not_found_modal": {
     "title": "Programas no instalados",
     "description": "Los ejecutables de Wine o Lutris no se encontraron en su sistema",
-    "instructions": "Comprueba la forma correcta de instalar cualquiera de ellos en tu distro Linux para que el juego pueda ejecutarse con normalidad"
+    "instructions": "Comprueba como instalar de forma correcta uno de los dos en tu distro de Linux para ejecutar el juego con normalidad"
   },
   "catalogue": {
     "next_page": "Siguiente página",

src/locales/fr/translation.json

@@ -25,7 +25,7 @@
     "downloads": "Téléchargements",
     "search_results": "Résultats de la recherche",
     "settings": "Paramètres",
-    "home": "Maison"
+    "home": "Accueil"
   },
   "bottom_panel": {
     "no_downloads_in_progress": "Aucun téléchargement en cours",

src/main/events/catalogue/get-random-game.ts

@@ -21,6 +21,8 @@ const getRandomGame = async () => {
         }
       }
     }
+
+    return null;
   });
 };
 

src/main/helpers/ps.ts

@@ -1,12 +1,33 @@
 import psList from "ps-list";
-import { tasklist } from "tasklist";
+import path from "node:path";
+import childProcess from "node:child_process";
+import { promisify } from "node:util";
+import { app } from "electron";
+
+const TEN_MEGABYTES = 1000 * 1000 * 10;
+const execFile = promisify(childProcess.execFile);
 
 export const getProcesses = async () => {
-  if (process.platform === "win32") {
-    return tasklist().then((tasks) =>
-      tasks.map((task) => ({ ...task, name: task.imageName }))
-    );
-  }
+  if (process.platform == "win32") {
+    const binaryPath = app.isPackaged
+      ? path.join(process.resourcesPath, "dist", "fastlist.exe")
+      : path.join(__dirname, "..", "..", "resources", "dist", "fastlist.exe");
 
-  return psList();
+    const { stdout } = await execFile(binaryPath, {
+      maxBuffer: TEN_MEGABYTES,
+      windowsHide: true,
+    });
+
+    return stdout
+      .trim()
+      .split("\r\n")
+      .map((line) => line.split("\t"))
+      .map(([pid, ppid, name]) => ({
+        pid: Number.parseInt(pid, 10),
+        ppid: Number.parseInt(ppid, 10),
+        name,
+      }));
+  } else {
+    return psList();
+  }
 };

src/main/main.ts

@@ -48,7 +48,7 @@ Promise.all([writePipe.createPipe(), readPipe.createPipe()]).then(async () => {
     });
   }
 
-  readPipe.socket.on("data", (data) => {
+  readPipe.socket?.on("data", (data) => {
     TorrentClient.onSocketData(data);
   });
 });

src/main/services/process-watcher.ts

@@ -1,7 +1,6 @@
 import path from "node:path";
 
 import { IsNull, Not } from "typeorm";
-
 import { gameRepository } from "@main/repository";
 import { getProcesses } from "@main/helpers";
 import { WindowManager } from "./window-manager";
@@ -9,27 +8,34 @@ import { WindowManager } from "./window-manager";
 const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
 export const startProcessWatcher = async () => {
-  const sleepTime = 100;
+  const sleepTime = 300;
   const gamesPlaytime = new Map<number, number>();
 
   // eslint-disable-next-line no-constant-condition
   while (true) {
+    await sleep(sleepTime);
+
     const games = await gameRepository.find({
       where: {
         executablePath: Not(IsNull()),
       },
     });
 
+    if (games.length == 0) {
+      continue;
+    }
+
     const processes = await getProcesses();
 
     for (const game of games) {
-      const gameProcess = processes.find((runningProcess) => {
-        const basename = path.win32.basename(game.executablePath);
-        const basenameWithoutExtension = path.win32.basename(
-          game.executablePath,
-          path.extname(game.executablePath)
-        );
+      const executablePath = game.executablePath!;
+      const basename = path.win32.basename(executablePath);
+      const basenameWithoutExtension = path.win32.basename(
+        executablePath,
+        path.extname(executablePath)
+      );
 
+      const gameProcess = processes.find((runningProcess) => {
         if (process.platform === "win32") {
           return runningProcess.name === basename;
         }
@@ -41,7 +47,7 @@ export const startProcessWatcher = async () => {
 
       if (gameProcess) {
         if (gamesPlaytime.has(game.id)) {
-          const zero = gamesPlaytime.get(game.id);
+          const zero = gamesPlaytime.get(game.id) ?? 0;
           const delta = performance.now() - zero;
 
           if (WindowManager.mainWindow) {
@@ -55,26 +61,15 @@ export const startProcessWatcher = async () => {
           gameRepository.update(game.id, {
             lastTimePlayed: new Date().toUTCString(),
           });
-
-          gamesPlaytime.set(game.id, performance.now());
-          await sleep(sleepTime);
-          continue;
         }
 
         gamesPlaytime.set(game.id, performance.now());
-
-        await sleep(sleepTime);
-        continue;
-      }
-
-      if (gamesPlaytime.has(game.id)) {
+      } else if (gamesPlaytime.has(game.id)) {
         gamesPlaytime.delete(game.id);
         if (WindowManager.mainWindow) {
           WindowManager.mainWindow.webContents.send("on-game-close", game.id);
         }
       }
-
-      await sleep(sleepTime);
     }
   }
 };

src/main/services/repack-tracker/helpers.ts

@@ -1,13 +1,9 @@
+import type { Repack } from "@main/entity";
 import { repackRepository } from "@main/repository";
 
-import type { GameRepack } from "@types";
+import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity";
 
-export type GameRepackInput = Omit<
-  GameRepack,
-  "id" | "repackerFriendlyName" | "createdAt" | "updatedAt"
->;
-
-export const savePage = async (repacks: GameRepackInput[]) =>
+export const savePage = async (repacks: QueryDeepPartialEntity<Repack>[]) =>
   Promise.all(
     repacks.map((repack) => repackRepository.insert(repack).catch(() => {}))
   );

src/main/services/repack-tracker/xatab.ts

@@ -31,11 +31,12 @@ const formatXatabDownloadSize = (str: string) =>
 const getXatabRepack = async (url: string) => {
   const data = await requestWebPage(url);
   const { window } = new JSDOM(data);
+  const { document } = window;
 
-  const $uploadDate = window.document.querySelector(".entry__date");
-  const $size = window.document.querySelector(".entry__info-size");
+  const $uploadDate = document.querySelector(".entry__date");
+  const $size = document.querySelector(".entry__info-size");
 
-  const $downloadButton = window.document.querySelector(
+  const $downloadButton = document.querySelector(
     ".download-torrent"
   ) as HTMLAnchorElement;
 
@@ -74,8 +75,10 @@ export const getNewRepacksFromXatab = async (
         ...repack,
         page,
       });
-    } catch (err) {
-      logger.error(err.message, { method: "getNewRepacksFromXatab" });
+    } catch (err: unknown) {
+      logger.error((err as Error).message, {
+        method: "getNewRepacksFromXatab",
+      });
     }
   }
 

src/main/services/steam-250.ts

@@ -13,8 +13,8 @@ export const requestSteam250 = async (path: string) => {
         const steamGameUrl = ($title as HTMLAnchorElement).href;
 
         return {
-          title: $title.textContent,
-          objectID: steamGameUrl.split("/").pop(),
+          title: $title.textContent!,
+          objectID: steamGameUrl.split("/").pop()!,
         };
       });
   });

src/main/services/torrent-client.ts

@@ -47,7 +47,7 @@ export class TorrentClient {
     const commonArgs = [BITTORRENT_PORT, writePipePath, readPipePath];
 
     if (app.isPackaged) {
-      const binaryName = binaryNameByPlatform[process.platform];
+      const binaryName = binaryNameByPlatform[process.platform]!;
       const binaryPath = path.join(
         process.resourcesPath,
         "hydra-download-manager",
@@ -133,7 +133,7 @@ export class TorrentClient {
         relations: { repack: true },
       });
 
-      if (game.progress === 1) {
+      if (game?.progress === 1) {
         const userPreferences = await userPreferencesRepository.findOne({
           where: { id: 1 },
         });
@@ -153,7 +153,7 @@ export class TorrentClient {
         }
       }
 
-      if (WindowManager.mainWindow) {
+      if (WindowManager.mainWindow && game) {
         const progress = this.getGameProgress(game);
         WindowManager.mainWindow.setProgressBar(progress === 1 ? -1 : progress);
 

src/renderer/src/components/hero/hero.tsx

@@ -6,7 +6,7 @@ import { ShopDetails } from "@types";
 import { getSteamLanguage, steamUrlBuilder } from "@renderer/helpers";
 import { useTranslation } from "react-i18next";
 
-const FEATURED_GAME_ID = "377160";
+const FEATURED_GAME_ID = "253230";
 
 export function Hero() {
   const [featuredGameDetails, setFeaturedGameDetails] =
@@ -36,7 +36,7 @@ export function Hero() {
     >
       <div className={styles.backdrop}>
         <AsyncImage
-          src="https://cdn2.steamgriddb.com/hero/e7a7ba56b1be30e178cd52820e063396.png"
+          src="https://cdn2.steamgriddb.com/hero/a6115ed32394915aac1e5502382eaaea.jpg"
           alt={featuredGameDetails?.name}
           className={styles.heroMedia}
         />

src/types/index.ts

@@ -38,11 +38,6 @@ export interface SteamAppDetails {
   };
 }
 
-export type ShopDetails = SteamAppDetails & {
-  objectID: string;
-  repacks: GameRepack[];
-};
-
 export interface GameRepack {
   id: number;
   title: string;
@@ -55,6 +50,11 @@ export interface GameRepack {
   updatedAt: Date;
 }
 
+export type ShopDetails = SteamAppDetails & {
+  objectID: string;
+  repacks: GameRepack[];
+};
+
 export interface TorrentFile {
   path: string;
   length: number;

tsconfig.node.json

@@ -16,4 +16,4 @@
       "@locales": ["src/locales/index.ts"]
     }
   }
-}
+}