Merge branch 'feat/migration-to-scss-3-remake' of https://github.com/hydralauncher/hydra into feat/migration-to-scss-3-remake

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

@@ -46,9 +46,9 @@ const addGameToLibrary = async (
 
     await gamesSublevel.put(levelKeys.game(shop, objectId), game);
 
-    updateLocalUnlockedAchivements(game!);
+    updateLocalUnlockedAchivements(game);
 
-    createGame(game!).catch(() => {});
+    createGame(game).catch(() => {});
   }
 };
 

src/main/level/index.ts

@@ -1,3 +1,2 @@
 export { db } from "./level";
-
 export * from "./sublevels";

src/main/level/sublevels/index.ts

@@ -2,5 +2,4 @@ export * from "./downloads";
 export * from "./games";
 export * from "./game-shop-cache";
 export * from "./game-achievements";
-
 export * from "./keys";

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

@@ -234,6 +234,8 @@ export class DownloadManager {
     });
 
     WindowManager.mainWindow?.setProgressBar(-1);
+    WindowManager.mainWindow?.webContents.send("on-download-progress", null);
+
     if (downloadKey === this.downloadingGameId) {
       this.downloadingGameId = null;
     }

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

@@ -35,22 +35,20 @@ export const mergeWithRemoteGames = async () => {
             name: "getById",
           });
 
-          if (steamGame) {
+          const iconUrl = steamGame?.clientIcon
-            const iconUrl = steamGame?.clientIcon
+            ? steamUrlBuilder.icon(game.objectId, steamGame.clientIcon)
-              ? steamUrlBuilder.icon(game.objectId, steamGame.clientIcon)
+            : null;
-              : null;
 
-            gamesSublevel.put(levelKeys.game(game.shop, game.objectId), {
+          gamesSublevel.put(levelKeys.game(game.shop, game.objectId), {
-              objectId: game.objectId,
+            objectId: game.objectId,
-              title: steamGame?.name,
+            title: steamGame?.name,
-              remoteId: game.id,
+            remoteId: game.id,
-              shop: game.shop,
+            shop: game.shop,
-              iconUrl,
+            iconUrl,
-              lastTimePlayed: game.lastTimePlayed,
+            lastTimePlayed: game.lastTimePlayed,
-              playTimeInMilliseconds: game.playTimeInMilliseconds,
+            playTimeInMilliseconds: game.playTimeInMilliseconds,
-              isDeleted: false,
+            isDeleted: false,
-            });
+          });
-          }
         }
       }
     })

src/main/services/steam.ts

@@ -21,11 +21,18 @@ export const getSteamAppDetails = async (
   });
 
   return axios
-    .get(
+    .get<SteamAppDetailsResponse>(
       `http://store.steampowered.com/api/appdetails?${searchParams.toString()}`
     )
     .then((response) => {
-      if (response.data[objectId].success) return response.data[objectId].data;
+      if (response.data[objectId].success) {
+        const data = response.data[objectId].data;
+        return {
+          ...data,
+          objectId,
+        };
+      }
+
       return null;
     })
     .catch((err) => {

src/preload/index.ts

@@ -32,10 +32,10 @@ contextBridge.exposeInMainWorld("electron", {
     ipcRenderer.invoke("pauseGameSeed", shop, objectId),
   resumeGameSeed: (shop: GameShop, objectId: string) =>
     ipcRenderer.invoke("resumeGameSeed", shop, objectId),
-  onDownloadProgress: (cb: (value: DownloadProgress) => void) => {
+  onDownloadProgress: (cb: (value: DownloadProgress | null) => void) => {
     const listener = (
       _event: Electron.IpcRendererEvent,
-      value: DownloadProgress
+      value: DownloadProgress | null
     ) => cb(value);
     ipcRenderer.on("on-download-progress", listener);
     return () => ipcRenderer.removeListener("on-download-progress", listener);

src/renderer/src/app.tsx

@@ -84,7 +84,7 @@ export function App() {
   useEffect(() => {
     const unsubscribe = window.electron.onDownloadProgress(
       (downloadProgress) => {
-        if (downloadProgress.progress === 1) {
+        if (downloadProgress?.progress === 1) {
           clearDownload();
           updateLibrary();
           return;

src/renderer/src/declaration.d.ts

@@ -50,7 +50,7 @@ declare global {
     pauseGameSeed: (shop: GameShop, objectId: string) => Promise<void>;
     resumeGameSeed: (shop: GameShop, objectId: string) => Promise<void>;
     onDownloadProgress: (
-      cb: (value: DownloadProgress) => void
+      cb: (value: DownloadProgress | null) => void
     ) => () => Electron.IpcRenderer;
     onSeedingStatus: (
       cb: (value: SeedingStatus[]) => void

src/renderer/src/features/download-slice.ts

@@ -18,9 +18,9 @@ export const downloadSlice = createSlice({
   name: "download",
   initialState,
   reducers: {
-    setLastPacket: (state, action: PayloadAction<DownloadProgress>) => {
+    setLastPacket: (state, action: PayloadAction<DownloadProgress | null>) => {
       state.lastPacket = action.payload;
-      if (!state.gameId) state.gameId = action.payload.gameId;
+      if (!state.gameId && action.payload) state.gameId = action.payload.gameId;
     },
     clearDownload: (state) => {
       state.lastPacket = null;

src/renderer/src/hooks/use-download.ts

@@ -114,7 +114,7 @@ export function useDownload() {
     pauseSeeding,
     resumeSeeding,
     clearDownload: () => dispatch(clearDownload()),
-    setLastPacket: (packet: DownloadProgress) =>
+    setLastPacket: (packet: DownloadProgress | null) =>
       dispatch(setLastPacket(packet)),
   };
 }

src/types/steam.types.ts

@@ -25,6 +25,7 @@ export interface SteamMovies {
 
 export interface SteamAppDetails {
   name: string;
+  steam_appid: number;
   detailed_description: string;
   about_the_game: string;
   short_description: string;