feat: adding source search

src/main/entity/user-preferences.entity.ts

@@ -41,6 +41,9 @@ export class UserPreferences {
   @Column("boolean", { default: false })
   disableNsfwAlert: boolean;
 
+  @Column("boolean", { default: false })
+  showHiddenAchievementsDescription: boolean;
+
   @CreateDateColumn()
   createdAt: Date;
 

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

@@ -1,6 +1,6 @@
 import { registerEvent } from "../register-event";
 import type { StartGameDownloadPayload } from "@types";
-import { DownloadManager, HydraApi, logger } from "@main/services";
+import { DownloadManager, HydraApi } from "@main/services";
 
 import { Not } from "typeorm";
 import { steamGamesWorker } from "@main/workers";
@@ -76,24 +76,23 @@ const startGameDownload = async (
       },
     });
 
-    createGame(updatedGame!).catch(() => {});
-
-    HydraApi.post(
-      "/games/download",
-      {
-        objectId: updatedGame!.objectID,
-        shop: updatedGame!.shop,
-      },
-      { needsAuth: false }
-    ).catch((err) => {
-      logger.error("Failed to create game download", err);
-    });
-
     await DownloadManager.cancelDownload(updatedGame!.id);
     await DownloadManager.startDownload(updatedGame!);
 
     await downloadQueueRepository.delete({ game: { id: updatedGame!.id } });
     await downloadQueueRepository.insert({ game: { id: updatedGame!.id } });
+
+    await Promise.all([
+      createGame(updatedGame!).catch(() => {}),
+      HydraApi.post(
+        "/games/download",
+        {
+          objectId: updatedGame!.objectID,
+          shop: updatedGame!.shop,
+        },
+        { needsAuth: false }
+      ).catch(() => {}),
+    ]);
   });
 };
 

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

@@ -1,6 +1,9 @@
 import type { GameShop, UnlockedAchievement, UserAchievement } from "@types";
 import { registerEvent } from "../register-event";
-import { gameAchievementRepository } from "@main/repository";
+import {
+  gameAchievementRepository,
+  userPreferencesRepository,
+} from "@main/repository";
 import { getGameAchievementData } from "@main/services/achievements/get-game-achievement-data";
 
 export const getUnlockedAchievements = async (
@@ -12,10 +15,17 @@ export const getUnlockedAchievements = async (
     where: { objectId, shop },
   });
 
+  const userPreferences = await userPreferencesRepository.findOne({
+    where: { id: 1 },
+  });
+
+  const showHiddenAchievementsDescription =
+    userPreferences?.showHiddenAchievementsDescription || false;
+
   const achievementsData = await getGameAchievementData(
     objectId,
     shop,
-    useCachedData
+    useCachedData ? cachedAchievements : null
   );
 
   const unlockedAchievements = JSON.parse(
@@ -50,6 +60,10 @@ export const getUnlockedAchievements = async (
         unlocked: false,
         unlockTime: null,
         icongray: icongray,
+        description:
+          !achievementData.hidden || showHiddenAchievementsDescription
+            ? achievementData.description
+            : undefined,
       } as UserAchievement;
     })
     .sort((a, b) => {

src/main/knex-client.ts

@@ -13,6 +13,8 @@ import { AddBackgroundImageUrl } from "./migrations/20241016100249_add_backgroun
 import { AddWinePrefixToGame } from "./migrations/20241019081648_add_wine_prefix_to_game";
 import { AddStartMinimizedColumn } from "./migrations/20241030171454_add_start_minimized_column";
 import { AddDisableNsfwAlertColumn } from "./migrations/20241106053733_add_disable_nsfw_alert_column";
+import { AddHiddenAchievementDescriptionColumn } from "./migrations/20241216140633_add_hidden_achievement_description_column ";
+
 export type HydraMigration = Knex.Migration & { name: string };
 
 class MigrationSource implements Knex.MigrationSource<HydraMigration> {
@@ -30,6 +32,7 @@ class MigrationSource implements Knex.MigrationSource<HydraMigration> {
       AddWinePrefixToGame,
       AddStartMinimizedColumn,
       AddDisableNsfwAlertColumn,
+      AddHiddenAchievementDescriptionColumn,
     ]);
   }
   getMigrationName(migration: HydraMigration): string {

src/main/migrations/20241216140633_add_hidden_achievement_description_column .ts

@@ -0,0 +1,20 @@
+import type { HydraMigration } from "@main/knex-client";
+import type { Knex } from "knex";
+
+export const AddHiddenAchievementDescriptionColumn: HydraMigration = {
+  name: "AddHiddenAchievementDescriptionColumn",
+  up: (knex: Knex) => {
+    return knex.schema.alterTable("user_preferences", (table) => {
+      return table
+        .boolean("showHiddenAchievementsDescription")
+        .notNullable()
+        .defaultTo(0);
+    });
+  },
+
+  down: async (knex: Knex) => {
+    return knex.schema.alterTable("user_preferences", (table) => {
+      return table.dropColumn("showHiddenAchievementsDescription");
+    });
+  },
+};

src/main/scripts/get-games-icon-hash.ts

@@ -1,40 +0,0 @@
-import path from "node:path";
-import fs from "node:fs";
-
-import { getSteamGameClientIcon, logger } from "@main/services";
-import { chunk } from "lodash-es";
-import { seedsPath } from "@main/constants";
-
-import type { SteamGame } from "@types";
-
-const steamGamesPath = path.join(seedsPath, "steam-games.json");
-
-const steamGames = JSON.parse(
-  fs.readFileSync(steamGamesPath, "utf-8")
-) as SteamGame[];
-
-const chunks = chunk(steamGames, 1500);
-
-for (const chunk of chunks) {
-  await Promise.all(
-    chunk.map(async (steamGame) => {
-      if (steamGame.clientIcon) return;
-
-      const index = steamGames.findIndex((game) => game.id === steamGame.id);
-
-      try {
-        const clientIcon = await getSteamGameClientIcon(String(steamGame.id));
-
-        steamGames[index].clientIcon = clientIcon;
-
-        logger.log("info", `Set ${steamGame.name} client icon`);
-      } catch (err) {
-        steamGames[index].clientIcon = null;
-        logger.log("info", `Could not set icon for ${steamGame.name}`);
-      }
-    })
-  );
-
-  fs.writeFileSync(steamGamesPath, JSON.stringify(steamGames));
-  logger.log("info", "Updated steam games");
-}

src/main/services/achievements/achievement-watcher-manager.ts

@@ -236,24 +236,28 @@ export class AchievementWatcherManager {
   };
 
   public static preSearchAchievements = async () => {
-    const newAchievementsCount =
-      process.platform === "win32"
-        ? await this.preSearchAchievementsWindows()
-        : await this.preSearchAchievementsWithWine();
+    try {
+      const newAchievementsCount =
+        process.platform === "win32"
+          ? await this.preSearchAchievementsWindows()
+          : await this.preSearchAchievementsWithWine();
 
-    const totalNewGamesWithAchievements = newAchievementsCount.filter(
-      (achievements) => achievements
-    ).length;
-    const totalNewAchievements = newAchievementsCount.reduce(
-      (acc, val) => acc + val,
-      0
-    );
-
-    if (totalNewAchievements > 0) {
-      publishCombinedNewAchievementNotification(
-        totalNewAchievements,
-        totalNewGamesWithAchievements
+      const totalNewGamesWithAchievements = newAchievementsCount.filter(
+        (achievements) => achievements
+      ).length;
+      const totalNewAchievements = newAchievementsCount.reduce(
+        (acc, val) => acc + val,
+        0
       );
+
+      if (totalNewAchievements > 0) {
+        publishCombinedNewAchievementNotification(
+          totalNewAchievements,
+          totalNewGamesWithAchievements
+        );
+      }
+    } catch (err) {
+      achievementsLogger.error("Error on preSearchAchievements", err);
     }
 
     this.hasFinishedMergingWithRemote = true;

src/main/services/achievements/get-game-achievement-data.ts

@@ -6,20 +6,15 @@ import { HydraApi } from "../hydra-api";
 import type { AchievementData, GameShop } from "@types";
 import { UserNotLoggedInError } from "@shared";
 import { logger } from "../logger";
+import { GameAchievement } from "@main/entity";
 
 export const getGameAchievementData = async (
   objectId: string,
   shop: GameShop,
-  useCachedData: boolean
+  cachedAchievements: GameAchievement | null
 ) => {
-  if (useCachedData) {
-    const cachedAchievements = await gameAchievementRepository.findOne({
-      where: { objectId, shop },
-    });
-
-    if (cachedAchievements && cachedAchievements.achievements) {
-      return JSON.parse(cachedAchievements.achievements) as AchievementData[];
-    }
+  if (cachedAchievements && cachedAchievements.achievements) {
+    return JSON.parse(cachedAchievements.achievements) as AchievementData[];
   }
 
   const userPreferences = await userPreferencesRepository.findOne({

src/main/services/achievements/parse-achievement-file.ts

@@ -9,144 +9,134 @@ export const parseAchievementFile = (
 ): UnlockedAchievement[] => {
   if (!existsSync(filePath)) return [];
 
-  if (type == Cracker.codex) {
-    const parsed = iniParse(filePath);
-    return processDefault(parsed);
+  try {
+    if (type == Cracker.codex) {
+      const parsed = iniParse(filePath);
+      return processDefault(parsed);
+    }
+
+    if (type == Cracker.rune) {
+      const parsed = iniParse(filePath);
+      return processDefault(parsed);
+    }
+
+    if (type === Cracker.onlineFix) {
+      const parsed = iniParse(filePath);
+      return processOnlineFix(parsed);
+    }
+
+    if (type === Cracker.goldberg) {
+      const parsed = jsonParse(filePath);
+      return processGoldberg(parsed);
+    }
+
+    if (type == Cracker.userstats) {
+      const parsed = iniParse(filePath);
+      return processUserStats(parsed);
+    }
+
+    if (type == Cracker.rld) {
+      const parsed = iniParse(filePath);
+      return processRld(parsed);
+    }
+
+    if (type === Cracker.skidrow) {
+      const parsed = iniParse(filePath);
+      return processSkidrow(parsed);
+    }
+
+    if (type === Cracker._3dm) {
+      const parsed = iniParse(filePath);
+      return process3DM(parsed);
+    }
+
+    if (type === Cracker.flt) {
+      const achievements = readdirSync(filePath);
+
+      return achievements.map((achievement) => {
+        return {
+          name: achievement,
+          unlockTime: Date.now(),
+        };
+      });
+    }
+
+    if (type === Cracker.creamAPI) {
+      const parsed = iniParse(filePath);
+      return processCreamAPI(parsed);
+    }
+
+    if (type === Cracker.empress) {
+      const parsed = jsonParse(filePath);
+      return processGoldberg(parsed);
+    }
+
+    if (type === Cracker.razor1911) {
+      return processRazor1911(filePath);
+    }
+
+    achievementsLogger.log(
+      `Unprocessed ${type} achievements found on ${filePath}`
+    );
+    return [];
+  } catch (err) {
+    achievementsLogger.error(`Error parsing ${type} - ${filePath}`, err);
+    return [];
   }
-
-  if (type == Cracker.rune) {
-    const parsed = iniParse(filePath);
-    return processDefault(parsed);
-  }
-
-  if (type === Cracker.onlineFix) {
-    const parsed = iniParse(filePath);
-    return processOnlineFix(parsed);
-  }
-
-  if (type === Cracker.goldberg) {
-    const parsed = jsonParse(filePath);
-    return processGoldberg(parsed);
-  }
-
-  if (type == Cracker.userstats) {
-    const parsed = iniParse(filePath);
-    return processUserStats(parsed);
-  }
-
-  if (type == Cracker.rld) {
-    const parsed = iniParse(filePath);
-    return processRld(parsed);
-  }
-
-  if (type === Cracker.skidrow) {
-    const parsed = iniParse(filePath);
-    return processSkidrow(parsed);
-  }
-
-  if (type === Cracker._3dm) {
-    const parsed = iniParse(filePath);
-    return process3DM(parsed);
-  }
-
-  if (type === Cracker.flt) {
-    const achievements = readdirSync(filePath);
-
-    return achievements.map((achievement) => {
-      return {
-        name: achievement,
-        unlockTime: Date.now(),
-      };
-    });
-  }
-
-  if (type === Cracker.creamAPI) {
-    const parsed = iniParse(filePath);
-    return processCreamAPI(parsed);
-  }
-
-  if (type === Cracker.empress) {
-    const parsed = jsonParse(filePath);
-    return processGoldberg(parsed);
-  }
-
-  if (type === Cracker.razor1911) {
-    return processRazor1911(filePath);
-  }
-
-  achievementsLogger.log(
-    `Unprocessed ${type} achievements found on ${filePath}`
-  );
-  return [];
 };
 
 const iniParse = (filePath: string) => {
-  try {
-    const fileContent = readFileSync(filePath, "utf-8");
+  const fileContent = readFileSync(filePath, "utf-8");
 
-    const lines =
-      fileContent.charCodeAt(0) === 0xfeff
-        ? fileContent.slice(1).split(/[\r\n]+/)
-        : fileContent.split(/[\r\n]+/);
+  const lines =
+    fileContent.charCodeAt(0) === 0xfeff
+      ? fileContent.slice(1).split(/[\r\n]+/)
+      : fileContent.split(/[\r\n]+/);
 
-    let objectName = "";
-    const object: Record<string, Record<string, string | number>> = {};
+  let objectName = "";
+  const object: Record<string, Record<string, string | number>> = {};
 
-    for (const line of lines) {
-      if (line.startsWith("###") || !line.length) continue;
+  for (const line of lines) {
+    if (line.startsWith("###") || !line.length) continue;
 
-      if (line.startsWith("[") && line.endsWith("]")) {
-        objectName = line.slice(1, -1);
-        object[objectName] = {};
-      } else {
-        const [name, ...value] = line.split("=");
-        object[objectName][name.trim()] = value.join("=").trim();
-      }
+    if (line.startsWith("[") && line.endsWith("]")) {
+      objectName = line.slice(1, -1);
+      object[objectName] = {};
+    } else {
+      const [name, ...value] = line.split("=");
+      object[objectName][name.trim()] = value.join("=").trim();
     }
-
-    return object;
-  } catch (err) {
-    achievementsLogger.error(`Error parsing ${filePath}`, err);
-    return {};
   }
+
+  return object;
 };
 
 const jsonParse = (filePath: string) => {
-  try {
-    return JSON.parse(readFileSync(filePath, "utf-8"));
-  } catch (err) {
-    achievementsLogger.error(`Error parsing ${filePath}`, err);
-    return {};
-  }
+  return JSON.parse(readFileSync(filePath, "utf-8"));
 };
 
 const processRazor1911 = (filePath: string): UnlockedAchievement[] => {
-  try {
-    const fileContent = readFileSync(filePath, "utf-8");
+  const fileContent = readFileSync(filePath, "utf-8");
 
-    const lines =
-      fileContent.charCodeAt(0) === 0xfeff
-        ? fileContent.slice(1).split(/[\r\n]+/)
-        : fileContent.split(/[\r\n]+/);
+  const lines =
+    fileContent.charCodeAt(0) === 0xfeff
+      ? fileContent.slice(1).split(/[\r\n]+/)
+      : fileContent.split(/[\r\n]+/);
 
-    const achievements: UnlockedAchievement[] = [];
-    for (const line of lines) {
-      if (!line.length) continue;
+  const achievements: UnlockedAchievement[] = [];
+  for (const line of lines) {
+    if (!line.length) continue;
 
-      const [name, unlocked, unlockTime] = line.split(" ");
-      if (unlocked === "1") {
-        achievements.push({
-          name,
-          unlockTime: Number(unlockTime) * 1000,
-        });
-      }
+    const [name, unlocked, unlockTime] = line.split(" ");
+    if (unlocked === "1") {
+      achievements.push({
+        name,
+        unlockTime: Number(unlockTime) * 1000,
+      });
     }
-
-    return achievements;
-  } catch (err) {
-    achievementsLogger.error(`Error processing ${filePath}`, err);
-    return [];
   }
+
+  return achievements;
 };
 
 const processOnlineFix = (unlockedAchievements: any): UnlockedAchievement[] => {

src/main/services/index.ts

@@ -1,7 +1,6 @@
 export * from "./logger";
 export * from "./steam";
 export * from "./steam-250";
-export * from "./steam-grid";
 export * from "./window-manager";
 export * from "./download";
 export * from "./process-watcher";

src/main/services/process-watcher.ts

@@ -1,53 +1,172 @@
-import { IsNull, Not } from "typeorm";
 import { gameRepository } from "@main/repository";
 import { WindowManager } from "./window-manager";
 import { createGame, updateGamePlaytime } from "./library-sync";
 import type { GameRunning } from "@types";
 import { PythonInstance } from "./download";
 import { Game } from "@main/entity";
+import axios from "axios";
+import { exec } from "child_process";
+
+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 ""}'`,
+  findWineExecutables: `lsof -c wine 2>/dev/null | grep '\\.exe$' | awk '{for(i=9;i<=NF;i++) printf "%s ", $i; print ""}'`,
+};
 
 export const gamesPlaytime = new Map<
   number,
   { lastTick: number; firstTick: number; lastSyncTick: number }
 >();
 
+interface ExecutableInfo {
+  name: string;
+  os: string;
+}
+
+interface GameExecutables {
+  [key: string]: ExecutableInfo[];
+}
+
 const TICKS_TO_UPDATE_API = 120;
 let currentTick = 1;
 
-const getSystemProcessSet = async () => {
-  const processes = await PythonInstance.getProcessList();
+const gameExecutables = (
+  await axios
+    .get(
+      import.meta.env.MAIN_VITE_EXTERNAL_RESOURCES_URL +
+        "/game-executables.json"
+    )
+    .catch(() => {
+      return { data: {} };
+    })
+).data as GameExecutables;
 
-  if (process.platform === "linux")
-    return new Set(processes.map((process) => process.name));
-  return new Set(processes.map((process) => process.exe));
+const findGamePathByProcess = (
+  processMap: Map<string, Set<string>>,
+  gameId: string
+) => {
+  const executables = gameExecutables[gameId].filter((info) => {
+    if (process.platform === "linux" && info.os === "linux") return true;
+    return info.os === "win32";
+  });
+
+  for (const executable of executables) {
+    const exe = executable.name.slice(executable.name.lastIndexOf("/") + 1);
+
+    if (!exe) continue;
+
+    const pathSet = processMap.get(exe);
+
+    if (pathSet) {
+      const executableName =
+        process.platform === "win32"
+          ? executable.name.replace(/\//g, "\\")
+          : executable.name;
+
+      pathSet.forEach((path) => {
+        if (path.toLowerCase().endsWith(executableName)) {
+          gameRepository.update(
+            { objectID: gameId, shop: "steam" },
+            { executablePath: path }
+          );
+
+          if (process.platform === "linux") {
+            exec(commands.findWineDir, (err, out) => {
+              if (err) return;
+
+              gameRepository.update(
+                { objectID: gameId, shop: "steam" },
+                {
+                  winePrefixPath: out.trim().replace("/drive_c/windows", ""),
+                }
+              );
+            });
+          }
+        }
+      });
+    }
+  }
 };
 
-const getExecutable = (game: Game) => {
-  if (process.platform === "linux")
-    return game.executablePath?.split("/").at(-1);
-  return game.executablePath;
+const getSystemProcessMap = async () => {
+  const processes = await PythonInstance.getProcessList();
+
+  const map = new Map<string, Set<string>>();
+
+  processes.forEach((process) => {
+    const key = process.name.toLowerCase();
+    const value = process.exe;
+
+    if (!key || !value) return;
+
+    const currentSet = map.get(key) ?? new Set();
+    map.set(key, currentSet.add(value));
+  });
+
+  if (process.platform === "linux") {
+    await new Promise((res) => {
+      exec(commands.findWineExecutables, (err, out) => {
+        if (err) {
+          res(null);
+          return;
+        }
+
+        const pathSet = new Set(
+          out
+            .trim()
+            .split("\n")
+            .map((path) => path.trim())
+        );
+
+        pathSet.forEach((path) => {
+          if (path.startsWith("/usr")) return;
+
+          const key = path.slice(path.lastIndexOf("/") + 1).toLowerCase();
+
+          if (!key || !path) return;
+
+          const currentSet = map.get(key) ?? new Set();
+          map.set(key, currentSet.add(path));
+        });
+
+        res(null);
+      });
+    });
+  }
+
+  return map;
 };
 
 export const watchProcesses = async () => {
   const games = await gameRepository.find({
     where: {
-      executablePath: Not(IsNull()),
       isDeleted: false,
     },
   });
 
-  if (games.length === 0) return;
+  if (!games.length) return;
 
-  const processSet = await getSystemProcessSet();
+  const processMap = await getSystemProcessMap();
 
   for (const game of games) {
-    const executable = getExecutable(game);
+    const executablePath = game.executablePath;
 
-    if (!executable) continue;
+    if (!executablePath) {
+      if (gameExecutables[game.objectID]) {
+        findGamePathByProcess(processMap, game.objectID);
+      }
+      continue;
+    }
 
-    const gameProcess = processSet.has(executable);
+    const executable = executablePath
+      .slice(
+        executablePath.lastIndexOf(process.platform === "win32" ? "\\" : "/") +
+          1
+      )
+      .toLowerCase();
 
-    if (gameProcess) {
+    const hasProcess = processMap.get(executable)?.has(executablePath);
+
+    if (hasProcess) {
       if (gamesPlaytime.has(game.id)) {
         onTickGame(game);
       } else {

src/main/services/steam-grid.ts

@@ -1,69 +0,0 @@
-import type { GameShop } from "@types";
-import axios from "axios";
-
-export interface SteamGridResponse {
-  success: boolean;
-  data: {
-    id: number;
-  };
-}
-
-export interface SteamGridGameResponse {
-  data: {
-    platforms: {
-      steam: {
-        metadata: {
-          clienticon: string;
-        };
-      };
-    };
-  };
-}
-
-export const getSteamGridData = async (
-  objectId: string,
-  path: string,
-  shop: GameShop,
-  params: Record<string, string> = {}
-): Promise<SteamGridResponse> => {
-  const searchParams = new URLSearchParams(params);
-
-  if (!import.meta.env.MAIN_VITE_STEAMGRIDDB_API_KEY) {
-    throw new Error("MAIN_VITE_STEAMGRIDDB_API_KEY is not set");
-  }
-
-  const response = await axios.get(
-    `https://www.steamgriddb.com/api/v2/${path}/${shop}/${objectId}?${searchParams.toString()}`,
-    {
-      headers: {
-        Authorization: `Bearer ${import.meta.env.MAIN_VITE_STEAMGRIDDB_API_KEY}`,
-      },
-    }
-  );
-
-  return response.data;
-};
-
-export const getSteamGridGameById = async (
-  id: number
-): Promise<SteamGridGameResponse> => {
-  const response = await axios.get(
-    `https://www.steamgriddb.com/api/public/game/${id}`,
-    {
-      headers: {
-        Referer: "https://www.steamgriddb.com/",
-      },
-    }
-  );
-
-  return response.data;
-};
-
-export const getSteamGameClientIcon = async (objectId: string) => {
-  const {
-    data: { id: steamGridGameId },
-  } = await getSteamGridData(objectId, "games", "steam");
-
-  const steamGridGame = await getSteamGridGameById(steamGridGameId);
-  return steamGridGame.data.platforms.steam.metadata.clienticon;
-};

src/main/vite-env.d.ts

@@ -6,6 +6,7 @@ interface ImportMetaEnv {
   readonly MAIN_VITE_ANALYTICS_API_URL: string;
   readonly MAIN_VITE_AUTH_URL: string;
   readonly MAIN_VITE_CHECKOUT_URL: string;
+  readonly MAIN_VITE_EXTERNAL_RESOURCES_URL: string;
 }
 
 interface ImportMeta {