Merge branch 'main' of github.com:hydralauncher/hydra into feat/HYD-781

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

@@ -1,6 +1,7 @@
 import { registerEvent } from "../register-event";
 import { HydraApi } from "@main/services";
 import { CatalogueCategory } from "@shared";
+import { ShopAssets } from "@types";
 
 const getCatalogue = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -11,7 +12,7 @@ const getCatalogue = async (
     skip: "0",
   });
 
-  return HydraApi.get(
+  return HydraApi.get<ShopAssets[]>(
     `/catalogue/${category}?${params.toString()}`,
     {},
     { needsAuth: false }

src/main/events/catalogue/get-game-shop-details.ts

@@ -1,10 +1,13 @@
 import { getSteamAppDetails, logger } from "@main/services";
 
-import type { ShopDetails, GameShop } from "@types";
+import type { ShopDetails, GameShop, ShopDetailsWithAssets } from "@types";
 
 import { registerEvent } from "../register-event";
-import { steamGamesWorker } from "@main/workers";
-import { gamesShopCacheSublevel, levelKeys } from "@main/level";
+import {
+  gamesShopAssetsSublevel,
+  gamesShopCacheSublevel,
+  levelKeys,
+} from "@main/level";
 
 const getLocalizedSteamAppDetails = async (
   objectId: string,
@@ -14,22 +17,7 @@ const getLocalizedSteamAppDetails = async (
     return getSteamAppDetails(objectId, language);
   }
 
-  return getSteamAppDetails(objectId, language).then(
-    async (localizedAppDetails) => {
-      const steamGame = await steamGamesWorker.run(Number(objectId), {
-        name: "getById",
-      });
-
-      if (steamGame && localizedAppDetails) {
-        return {
-          ...localizedAppDetails,
-          name: steamGame.name,
-        };
-      }
-
-      return null;
-    }
-  );
+  return getSteamAppDetails(objectId, language);
 };
 
 const getGameShopDetails = async (
@@ -37,34 +25,44 @@ const getGameShopDetails = async (
   objectId: string,
   shop: GameShop,
   language: string
-): Promise<ShopDetails | null> => {
+): Promise<ShopDetailsWithAssets | null> => {
   if (shop === "steam") {
-    const cachedData = await gamesShopCacheSublevel.get(
-      levelKeys.gameShopCacheItem(shop, objectId, language)
-    );
+    const [cachedData, cachedAssets] = await Promise.all([
+      gamesShopCacheSublevel.get(
+        levelKeys.gameShopCacheItem(shop, objectId, language)
+      ),
+      gamesShopAssetsSublevel.get(levelKeys.game(shop, objectId)),
+    ]);
 
     const appDetails = getLocalizedSteamAppDetails(objectId, language).then(
       (result) => {
         if (result) {
+          result.name = cachedAssets?.title ?? result.name;
+
           gamesShopCacheSublevel
             .put(levelKeys.gameShopCacheItem(shop, objectId, language), result)
             .catch((err) => {
               logger.error("Could not cache game details", err);
             });
+
+          return {
+            ...result,
+            assets: cachedAssets ?? null,
+          };
         }
 
-        return result;
+        return null;
       }
     );
 
     if (cachedData) {
       return {
         ...cachedData,
-        objectId,
-      } as ShopDetails;
+        assets: cachedAssets ?? null,
+      };
     }
 
-    return Promise.resolve(appDetails);
+    return appDetails;
   }
 
   throw new Error("Not implemented");

src/main/events/catalogue/get-trending-games.ts

@@ -11,12 +11,12 @@ const getTrendingGames = async (_event: Electron.IpcMainInvokeEvent) => {
     .then((language) => language || "en");
 
   const trendingGames = await HydraApi.get<TrendingGame[]>(
-    "/games/trending",
+    "/games/featured",
     { language },
     { needsAuth: false }
   ).catch(() => []);
 
-  return trendingGames;
+  return trendingGames.slice(0, 1);
 };
 
 registerEvent("getTrendingGames", getTrendingGames);

src/main/events/catalogue/save-game-shop-assets.ts

@@ -0,0 +1,14 @@
+import type { GameShop, ShopAssets } from "@types";
+import { gamesShopAssetsSublevel, levelKeys } from "@main/level";
+import { registerEvent } from "../register-event";
+
+const saveGameShopAssets = async (
+  _event: Electron.IpcMainInvokeEvent,
+  objectId: string,
+  shop: GameShop,
+  assets: ShopAssets
+): Promise<void> => {
+  return gamesShopAssetsSublevel.put(levelKeys.game(shop, objectId), assets);
+};
+
+registerEvent("saveGameShopAssets", saveGameShopAssets);

src/main/events/index.ts

@@ -3,6 +3,7 @@ import { ipcMain } from "electron";
 
 import "./catalogue/get-catalogue";
 import "./catalogue/get-game-shop-details";
+import "./catalogue/save-game-shop-assets";
 import "./catalogue/get-how-long-to-beat";
 import "./catalogue/get-random-game";
 import "./catalogue/search-games";

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

@@ -1,12 +1,13 @@
 import { registerEvent } from "../register-event";
-
 import type { GameShop } from "@types";
-
-import { steamGamesWorker } from "@main/workers";
 import { createGame } from "@main/services/library-sync";
-import { steamUrlBuilder } from "@shared";
 import { updateLocalUnlockedAchievements } from "@main/services/achievements/update-local-unlocked-achivements";
-import { downloadsSublevel, gamesSublevel, levelKeys } from "@main/level";
+import {
+  downloadsSublevel,
+  gamesShopAssetsSublevel,
+  gamesSublevel,
+  levelKeys,
+} from "@main/level";
 
 const addGameToLibrary = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -17,6 +18,8 @@ const addGameToLibrary = async (
   const gameKey = levelKeys.game(shop, objectId);
   let game = await gamesSublevel.get(gameKey);
 
+  const gameAssets = await gamesShopAssetsSublevel.get(gameKey);
+
   if (game) {
     await downloadsSublevel.del(gameKey);
 
@@ -24,17 +27,9 @@ const addGameToLibrary = async (
 
     await gamesSublevel.put(gameKey, game);
   } else {
-    const steamGame = await steamGamesWorker.run(Number(objectId), {
-      name: "getById",
-    });
-
-    const iconUrl = steamGame?.clientIcon
-      ? steamUrlBuilder.icon(objectId, steamGame.clientIcon)
-      : null;
-
     game = {
       title,
-      iconUrl,
+      iconUrl: gameAssets?.iconUrl ?? null,
       objectId,
       shop,
       remoteId: null,

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

@@ -1,6 +1,10 @@
 import type { LibraryGame } from "@types";
 import { registerEvent } from "../register-event";
-import { downloadsSublevel, gamesSublevel } from "@main/level";
+import {
+  downloadsSublevel,
+  gamesShopAssetsSublevel,
+  gamesSublevel,
+} from "@main/level";
 
 const getLibrary = async (): Promise<LibraryGame[]> => {
   return gamesSublevel
@@ -12,11 +16,13 @@ const getLibrary = async (): Promise<LibraryGame[]> => {
           .filter(([_key, game]) => game.isDeleted === false)
           .map(async ([key, game]) => {
             const download = await downloadsSublevel.get(key);
+            const gameAssets = await gamesShopAssetsSublevel.get(key);
 
             return {
               id: key,
               ...game,
               download: download ?? null,
+              ...gameAssets,
             };
           })
       );

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

@@ -1,11 +1,14 @@
 import { registerEvent } from "../register-event";
 import type { Download, StartGameDownloadPayload } from "@types";
 import { DownloadManager, HydraApi, logger } from "@main/services";
-
-import { steamGamesWorker } from "@main/workers";
 import { createGame } from "@main/services/library-sync";
-import { Downloader, DownloadError, steamUrlBuilder } from "@shared";
-import { downloadsSublevel, gamesSublevel, levelKeys } from "@main/level";
+import { Downloader, DownloadError } from "@shared";
+import {
+  downloadsSublevel,
+  gamesShopAssetsSublevel,
+  gamesSublevel,
+  levelKeys,
+} from "@main/level";
 import { AxiosError } from "axios";
 
 const startGameDownload = async (
@@ -36,6 +39,7 @@ const startGameDownload = async (
   }
 
   const game = await gamesSublevel.get(gameKey);
+  const gameAssets = await gamesShopAssetsSublevel.get(gameKey);
 
   /* Delete any previous download */
   await downloadsSublevel.del(gameKey);
@@ -46,17 +50,9 @@ const startGameDownload = async (
       isDeleted: false,
     });
   } else {
-    const steamGame = await steamGamesWorker.run(Number(objectId), {
-      name: "getById",
-    });
-
-    const iconUrl = steamGame?.clientIcon
-      ? steamUrlBuilder.icon(objectId, steamGame.clientIcon)
-      : null;
-
     await gamesSublevel.put(gameKey, {
       title,
-      iconUrl,
+      iconUrl: gameAssets?.iconUrl ?? null,
       objectId,
       shop,
       remoteId: null,

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

@@ -1,97 +1,12 @@
 import { registerEvent } from "../register-event";
-import { HydraApi, logger } from "@main/services";
-import { steamGamesWorker } from "@main/workers";
+import { HydraApi } from "@main/services";
 import type { UserProfile } from "@types";
-import { steamUrlBuilder } from "@shared";
-
-const getSteamGame = async (objectId: string) => {
-  try {
-    const steamGame = await steamGamesWorker.run(Number(objectId), {
-      name: "getById",
-    });
-
-    return {
-      title: steamGame.name as string,
-      iconUrl: steamUrlBuilder.icon(objectId, steamGame.clientIcon),
-    };
-  } catch (err) {
-    logger.error("Failed to get Steam game", err);
-
-    return null;
-  }
-};
 
 const getUser = async (
   _event: Electron.IpcMainInvokeEvent,
   userId: string
 ): Promise<UserProfile | null> => {
-  try {
-    const profile = await HydraApi.get<UserProfile | null>(`/users/${userId}`);
-
-    if (!profile) return null;
-
-    const recentGames = await Promise.all(
-      profile.recentGames
-        .map(async (game) => {
-          const steamGame = await getSteamGame(game.objectId);
-
-          return {
-            ...game,
-            ...steamGame,
-          };
-        })
-        .filter((game) => game)
-    );
-
-    const libraryGames = await Promise.all(
-      profile.libraryGames
-        .map(async (game) => {
-          const steamGame = await getSteamGame(game.objectId);
-
-          return {
-            ...game,
-            ...steamGame,
-          };
-        })
-        .filter((game) => game)
-    );
-
-    if (profile.currentGame) {
-      const steamGame = await getSteamGame(profile.currentGame.objectId);
-
-      if (steamGame) {
-        profile.currentGame = {
-          ...profile.currentGame,
-          ...steamGame,
-        };
-      }
-    }
-
-    const friends = await Promise.all(
-      profile.friends.map(async (friend) => {
-        if (!friend.currentGame) return friend;
-
-        const currentGame = await getSteamGame(friend.currentGame.objectId);
-
-        return {
-          ...friend,
-          currentGame: {
-            ...friend.currentGame,
-            ...currentGame,
-          },
-        };
-      })
-    );
-
-    return {
-      ...profile,
-      friends,
-      libraryGames,
-      recentGames,
-    };
-  } catch (err) {
-    return null;
-  }
+  return HydraApi.get<UserProfile>(`/users/${userId}`).catch(() => null);
 };
 
 registerEvent("getUser", getUser);

src/main/level/sublevels/game-shop-assets.ts

@@ -0,0 +1,11 @@
+import type { ShopAssets } from "@types";
+
+import { db } from "../level";
+import { levelKeys } from "./keys";
+
+export const gamesShopAssetsSublevel = db.sublevel<string, ShopAssets>(
+  levelKeys.gameShopAssets,
+  {
+    valueEncoding: "json",
+  }
+);

src/main/level/sublevels/index.ts

@@ -1,5 +1,6 @@
 export * from "./downloads";
 export * from "./games";
+export * from "./game-shop-assets";
 export * from "./game-shop-cache";
 export * from "./game-achievements";
 export * from "./keys";

src/main/level/sublevels/keys.ts

@@ -6,6 +6,7 @@ export const levelKeys = {
   user: "user",
   auth: "auth",
   themes: "themes",
+  gameShopAssets: "gameShopAssets",
   gameShopCache: "gameShopCache",
   gameShopCacheItem: (shop: GameShop, objectId: string, language: string) =>
     `${shop}:${objectId}:${language}`,

src/main/services/library-sync/merge-with-remote-games.ts

@@ -1,10 +1,15 @@
+import { ShopAssets } from "@types";
 import { HydraApi } from "../hydra-api";
-import { steamGamesWorker } from "@main/workers";
-import { steamUrlBuilder } from "@shared";
-import { gamesSublevel, levelKeys } from "@main/level";
+import { gamesShopAssetsSublevel, gamesSublevel, levelKeys } from "@main/level";
+
+type ProfileGame = {
+  id: string;
+  lastTimePlayed: Date | null;
+  playTimeInMilliseconds: number;
+} & ShopAssets;
 
 export const mergeWithRemoteGames = async () => {
-  return HydraApi.get("/profile/games")
+  return HydraApi.get<ProfileGame[]>("/profile/games")
     .then(async (response) => {
       for (const game of response) {
         const localGame = await gamesSublevel.get(
@@ -31,25 +36,32 @@ export const mergeWithRemoteGames = async () => {
             playTimeInMilliseconds: updatedPlayTime,
           });
         } else {
-          const steamGame = await steamGamesWorker.run(Number(game.objectId), {
-            name: "getById",
-          });
-
-          const iconUrl = steamGame?.clientIcon
-            ? steamUrlBuilder.icon(game.objectId, steamGame.clientIcon)
-            : null;
-
           await gamesSublevel.put(levelKeys.game(game.shop, game.objectId), {
             objectId: game.objectId,
-            title: steamGame?.name,
+            title: game.title,
             remoteId: game.id,
             shop: game.shop,
-            iconUrl,
+            iconUrl: game.iconUrl,
             lastTimePlayed: game.lastTimePlayed,
             playTimeInMilliseconds: game.playTimeInMilliseconds,
             isDeleted: false,
           });
         }
+
+        await gamesShopAssetsSublevel.put(
+          levelKeys.game(game.shop, game.objectId),
+          {
+            shop: game.shop,
+            objectId: game.objectId,
+            title: game.title,
+            coverImageUrl: game.coverImageUrl,
+            libraryHeroImageUrl: game.libraryHeroImageUrl,
+            libraryImageUrl: game.libraryImageUrl,
+            logoImageUrl: game.logoImageUrl,
+            iconUrl: game.iconUrl,
+            logoPosition: game.logoPosition,
+          }
+        );
       }
     })
     .catch(() => {});

src/main/workers/index.ts

@@ -1,14 +0,0 @@
-import path from "node:path";
-import steamGamesWorkerPath from "./steam-games.worker?modulePath";
-
-import Piscina from "piscina";
-
-import { seedsPath } from "@main/constants";
-
-export const steamGamesWorker = new Piscina({
-  filename: steamGamesWorkerPath,
-  workerData: {
-    steamGamesPath: path.join(seedsPath, "steam-games.json"),
-  },
-  maxThreads: 1,
-});

src/main/workers/steam-games.worker.ts

@@ -1,17 +0,0 @@
-import type { SteamGame } from "@types";
-import { slice } from "lodash-es";
-import fs from "node:fs";
-
-import { workerData } from "node:worker_threads";
-
-const { steamGamesPath } = workerData;
-
-const data = fs.readFileSync(steamGamesPath, "utf-8");
-
-const steamGames = JSON.parse(data) as SteamGame[];
-
-export const getById = (id: number) =>
-  steamGames.find((game) => game.id === id);
-
-export const list = ({ limit, offset }: { limit: number; offset: number }) =>
-  slice(steamGames, offset, offset + limit);