Merge branch 'main' of https://github.com/hydralauncher/hydra

.github/workflows/build.yml

@@ -67,8 +67,6 @@ jobs:
             dist/*.exe
             dist/*.zip
             dist/*.dmg
-            dist/*.AppImage
-            dist/*.snap
             dist/*.deb
             dist/*.rpm
             dist/*.tar.gz

README.md

@@ -168,8 +168,7 @@ yarn make
             <br />
             <sub><b>Guilherme Viana</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/eltociear">
             <img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="100;" alt="eltociear"/>

electron.vite.config.ts

@@ -4,7 +4,6 @@ import {
   loadEnv,
   swcPlugin,
   externalizeDepsPlugin,
-  bytecodePlugin,
 } from "electron-vite";
 import react from "@vitejs/plugin-react";
 import { vanillaExtractPlugin } from "@vanilla-extract/vite-plugin";
@@ -35,12 +34,7 @@ export default defineConfig(({ mode }) => {
           "@globals": resolve("src/globals"),
         },
       },
-      plugins: [
-        externalizeDepsPlugin(),
-        swcPlugin(),
-        bytecodePlugin(),
-        sentryPlugin,
-      ],
+      plugins: [externalizeDepsPlugin(), swcPlugin(), sentryPlugin],
     },
     preload: {
       plugins: [externalizeDepsPlugin()],
@@ -56,13 +50,7 @@ export default defineConfig(({ mode }) => {
           "@globals": resolve("src/globals"),
         },
       },
-      plugins: [
-        svgr(),
-        react(),
-        vanillaExtractPlugin(),
-        bytecodePlugin(),
-        sentryPlugin,
-      ],
+      plugins: [svgr(), react(), vanillaExtractPlugin(), sentryPlugin],
     },
   };
 });

src/locales/hu/translation.json

@@ -84,7 +84,6 @@
     "repacks_modal_description": "Choose the repack you want to download",
     "downloads_path": "Letöltések helye",
     "select_folder_hint": "Ahhoz, hogy megváltoztasd a helyet, hozzákell férned a",
-    "hydra_settings": "Hydra beállítások",
     "download_now": "Töltsd le most"
   },
   "activation": {

src/locales/pt/translation.json

@@ -1,7 +1,7 @@
 {
   "home": {
     "featured": "Destaque",
-    "recently_added": "Novidades",
+    "recently_added": "Recém adicionados",
     "trending": "Populares",
     "surprise_me": "Surpreenda-me",
     "no_results": "Nenhum resultado encontrado"

src/main/constants.ts

@@ -42,5 +42,7 @@ export const databasePath = path.join(
   "hydra.db"
 );
 
+export const imageCachePath = path.join(app.getPath("userData"), ".imagecache");
+
 export const INSTALLATION_ID_LENGTH = 6;
 export const ACTIVATION_KEY_MULTIPLIER = 7;

src/main/data-source.ts

@@ -2,7 +2,6 @@ import { DataSource } from "typeorm";
 import {
   Game,
   GameShopCache,
-  ImageCache,
   Repack,
   RepackerFriendlyName,
   UserPreferences,
@@ -19,7 +18,6 @@ export const createDataSource = (options: Partial<SqliteConnectionOptions>) =>
     database: databasePath,
     entities: [
       Game,
-      ImageCache,
       Repack,
       RepackerFriendlyName,
       UserPreferences,

src/main/entity/image-cache.entity.ts

@@ -1,25 +0,0 @@
-import {
-  Entity,
-  PrimaryGeneratedColumn,
-  Column,
-  CreateDateColumn,
-  UpdateDateColumn,
-} from "typeorm";
-
-@Entity("image_cache")
-export class ImageCache {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column("text", { unique: true })
-  url: string;
-
-  @Column("text")
-  data: string;
-
-  @CreateDateColumn()
-  createdAt: Date;
-
-  @UpdateDateColumn()
-  updatedAt: Date;
-}

src/main/entity/index.ts

@@ -1,5 +1,4 @@
 export * from "./game.entity";
-export * from "./image-cache.entity";
 export * from "./repack.entity";
 export * from "./repacker-friendly-name.entity";
 export * from "./user-preferences.entity";

src/main/events/helpers/search-games.ts

@@ -8,7 +8,7 @@ import { stateManager } from "@main/state-manager";
 
 const { Index } = flexSearch;
 const repacksIndex = new Index();
-const steamGamesIndex = new Index();
+const steamGamesIndex = new Index({ tokenize: "forward" });
 
 const repacks = stateManager.getValue("repacks");
 const steamGames = stateManager.getValue("steamGames");

src/main/events/misc/get-or-cache-image.ts

@@ -1,32 +1,35 @@
-import { imageCacheRepository } from "@main/repository";
+import crypto from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
 
 import { registerEvent } from "../register-event";
-import { getImageBase64 } from "@main/helpers";
+import { getFileBuffer } from "@main/helpers";
 import { logger } from "@main/services";
+import { imageCachePath } from "@main/constants";
 
 const getOrCacheImage = async (
   _event: Electron.IpcMainInvokeEvent,
   url: string
 ) => {
-  const cache = await imageCacheRepository.findOne({
-    where: {
-      url,
-    },
-  });
+  if (!fs.existsSync(imageCachePath)) fs.mkdirSync(imageCachePath);
 
-  if (cache) return cache.data;
+  const extname = path.extname(url);
 
-  getImageBase64(url).then((data) =>
-    imageCacheRepository
-      .save({
-        url,
-        data,
-      })
-      .catch(() => {
-        logger.error(`Failed to cache image "${url}"`, {
+  const checksum = crypto.createHash("sha256").update(url).digest("hex");
+  const cachePath = path.join(imageCachePath, `${checksum}${extname}`);
+
+  const cache = fs.existsSync(cachePath);
+
+  if (cache) return `hydra://${cachePath}`;
+
+  getFileBuffer(url).then((buffer) =>
+    fs.writeFile(cachePath, buffer, (err) => {
+      if (err) {
+        logger.error(`Failed to cache image`, err, {
           method: "getOrCacheImage",
         });
-      })
+      }
+    })
   );
 
   return url;

src/main/helpers/index.ts

@@ -74,12 +74,15 @@ export const getSteamAppAsset = (
   return `https://cdn.cloudflare.steamstatic.com/steamcommunity/public/images/apps/${objectID}/${clientIcon}.ico`;
 };
 
-export const getImageBase64 = async (url: string) =>
+export const getFileBuffer = async (url: string) =>
   fetch(url, { method: "GET" }).then((response) =>
-    response.arrayBuffer().then((buffer) => {
-      return `data:image/jpeg;base64,${Buffer.from(buffer).toString("base64")}`;
-    })
+    response.arrayBuffer().then((buffer) => Buffer.from(buffer))
   );
 
+export const getImageBase64 = async (url: string) =>
+  getFileBuffer(url).then((buffer) => {
+    return `data:image/jpeg;base64,${Buffer.from(buffer).toString("base64")}`;
+  });
+
 export * from "./formatters";
 export * from "./ps";

src/main/index.ts

@@ -1,4 +1,4 @@
-import { app, BrowserWindow } from "electron";
+import { app, BrowserWindow, net, protocol } from "electron";
 import { init } from "@sentry/electron/main";
 import i18n from "i18next";
 import path from "node:path";
@@ -52,6 +52,10 @@ if (process.defaultApp) {
 app.whenReady().then(() => {
   electronApp.setAppUserModelId("site.hydralauncher.hydra");
 
+  protocol.handle("hydra", (request) =>
+    net.fetch("file://" + request.url.slice("hydra://".length))
+  );
+
   dataSource.initialize().then(async () => {
     await resolveDatabaseUpdates();
 

src/main/repository.ts

@@ -2,7 +2,6 @@ import { dataSource } from "./data-source";
 import {
   Game,
   GameShopCache,
-  ImageCache,
   Repack,
   RepackerFriendlyName,
   UserPreferences,
@@ -12,8 +11,6 @@ import {
 
 export const gameRepository = dataSource.getRepository(Game);
 
-export const imageCacheRepository = dataSource.getRepository(ImageCache);
-
 export const repackRepository = dataSource.getRepository(Repack);
 
 export const repackerFriendlyNameRepository =

src/main/services/donwloaders/downloader.ts

@@ -11,6 +11,9 @@ import { HTTPDownloader } from "./http-downloader";
 import { Unrar } from "../unrar";
 import { GameStatus } from "@globals";
 import path from "node:path";
+import crypto from "node:crypto";
+import fs from "node:fs";
+
 
 interface DownloadStatus {
   numPeers: number;
@@ -112,7 +115,7 @@ export class Downloader {
     });
 
     if (
-      gameUpdate.progress === 1 &&
+      game?.progress === 1 &&
       gameUpdate.status !== GameStatus.Decompressing
     ) {
       const userPreferences = await userPreferencesRepository.findOne({
@@ -120,7 +123,10 @@ export class Downloader {
       });
 
       if (userPreferences?.downloadNotificationsEnabled) {
+        const iconPath = await this.createTempIcon(game.iconUrl);
+
         new Notification({
+          icon: iconPath,
           title: t("download_complete", {
             ns: "notifications",
             lng: userPreferences.language,
@@ -186,4 +192,23 @@ export class Downloader {
       return game.decompressionProgress;
     return game.progress;
   }
+
+  private static createTempIcon(encodedIcon: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+      const hash = crypto.randomBytes(16).toString("hex");
+      const iconPath = path.join(app.getPath("temp"), `${hash}.png`);
+
+      fs.writeFile(
+        iconPath,
+        Buffer.from(
+          encodedIcon.replace("data:image/jpeg;base64,", ""),
+          "base64"
+        ),
+        (err) => {
+          if (err) reject(err);
+          resolve(iconPath);
+        }
+      );
+    });
+  }
 }

src/main/services/process-watcher.ts

@@ -20,6 +20,7 @@ export const startProcessWatcher = async () => {
     });
 
     if (games.length === 0) {
+      await sleep(sleepTime);
       continue;
     }
 

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

@@ -52,8 +52,7 @@ const getXatabRepack = (url: string) => {
         worker.removeListener("message", onMessage);
       };
 
-      worker.on("message", onMessage);
-      worker.postMessage($downloadButton.href);
+      worker.once("message", onMessage);
     })();
   });
 };

src/main/workers/torrent-parser.worker.ts

@@ -1,16 +1,12 @@
 import { parentPort } from "worker_threads";
 import parseTorrent from "parse-torrent";
+import { getFileBuffer } from "@main/helpers";
 
 const port = parentPort;
 if (!port) throw new Error("IllegalState");
 
-const getTorrentBuffer = (url: string) =>
-  fetch(url, { method: "GET" }).then((response) =>
-    response.arrayBuffer().then((buffer) => Buffer.from(buffer))
-  );
-
 port.on("message", async (url: string) => {
-  const buffer = await getTorrentBuffer(url);
+  const buffer = await getFileBuffer(url);
   const torrent = await parseTorrent(buffer);
 
   port.postMessage(torrent);

src/renderer/index.html

@@ -6,7 +6,7 @@
     <title>Hydra</title>
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://steamcdn-a.akamaihd.net https://cdn.cloudflare.steamstatic.com https://cdn2.steamgriddb.com https://cdn.akamai.steamstatic.com; media-src 'self' data: https://cdn2.steamgriddb.com;"
+      content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data: hydra: https://steamcdn-a.akamaihd.net https://cdn.cloudflare.steamstatic.com https://cdn2.steamgriddb.com https://cdn.akamai.steamstatic.com;"
     />
   </head>
   <body style="background-color: #1c1c1c">

src/renderer/src/components/sidebar/sidebar.css.ts

@@ -52,7 +52,7 @@ export const menu = style({
   listStyle: "none",
   padding: "0",
   margin: "0",
-  gap: `${SPACING_UNIT * 2}px`,
+  gap: `${SPACING_UNIT / 2}px`,
   display: "flex",
   flexDirection: "column",
   overflow: "hidden",
@@ -64,16 +64,16 @@ export const menuItem = recipe({
     cursor: "pointer",
     textWrap: "nowrap",
     display: "flex",
-    opacity: "0.9",
     color: vars.color.muted,
+    borderRadius: "4px",
     ":hover": {
-      opacity: "1",
+      backgroundColor: "rgba(255, 255, 255, 0.15)",
     },
   },
   variants: {
     active: {
       true: {
-        opacity: "1",
+        backgroundColor: "rgba(255, 255, 255, 0.1)",
         fontWeight: "bold",
       },
     },
@@ -96,6 +96,7 @@ export const menuItemButton = style({
   cursor: "pointer",
   overflow: "hidden",
   width: "100%",
+  padding: `9px ${SPACING_UNIT}px`,
   selectors: {
     [`${menuItem({ active: true }).split(" ")[1]} &`]: {
       fontWeight: "bold",
@@ -120,20 +121,12 @@ export const sectionTitle = style({
   fontWeight: "bold",
 });
 
-export const section = recipe({
-  base: {
-    padding: `${SPACING_UNIT * 2}px 0`,
-    gap: `${SPACING_UNIT * 2}px`,
-    display: "flex",
-    flexDirection: "column",
-  },
-  variants: {
-    hasBorder: {
-      true: {
-        borderBottom: `solid 1px ${vars.color.border}`,
-      },
-    },
-  },
+export const section = style({
+  padding: `${SPACING_UNIT * 2}px 0`,
+  gap: `${SPACING_UNIT * 2}px`,
+  display: "flex",
+  flexDirection: "column",
+  paddingBottom: `${SPACING_UNIT}px`,
 });
 
 export const sidebarFooter = style({

src/renderer/src/components/sidebar/sidebar.tsx

@@ -6,7 +6,6 @@ import type { Game } from "@types";
 
 import { AsyncImage, TextField } from "@renderer/components";
 import { useDownload, useLibrary } from "@renderer/hooks";
-import { SPACING_UNIT } from "../../theme.css";
 
 import { routes } from "./routes";
 
@@ -94,7 +93,7 @@ export function Sidebar() {
   }, [library]);
 
   useEffect(() => {
-    window.onmousemove = (event) => {
+    window.onmousemove = (event: MouseEvent) => {
       if (isResizing) {
         const cursorXDelta = event.screenX - cursorPos.current.x;
         const newWidth = Math.max(
@@ -128,7 +127,7 @@ export function Sidebar() {
       const isVerifying = GameStatus.isVerifying(gameDownloading.status);
 
       if (isVerifying)
-        return t(gameDownloading.status, {
+        return t(gameDownloading.status!, {
           title: game.title,
           percentage: progress,
         });
@@ -163,11 +162,9 @@ export function Sidebar() {
           macos: window.electron.platform === "darwin",
         })}
       >
-        {window.electron.platform === "darwin" && (
-          <h2 style={{ marginBottom: SPACING_UNIT }}>Hydra</h2>
-        )}
+        {window.electron.platform === "darwin" && <h2>Hydra</h2>}
 
-        <section className={styles.section({ hasBorder: false })}>
+        <section className={styles.section}>
           <ul className={styles.menu}>
             {routes.map(({ nameKey, path, render }) => (
               <li
@@ -189,7 +186,7 @@ export function Sidebar() {
           </ul>
         </section>
 
-        <section className={styles.section({ hasBorder: false })}>
+        <section className={styles.section}>
           <small className={styles.sectionTitle}>{t("my_library")}</small>
 
           <TextField

src/renderer/src/pages/game-details/game-details-skeleton.tsx

@@ -13,7 +13,7 @@ export function GameDetailsSkeleton() {
       <div className={styles.hero}>
         <Skeleton className={styles.heroImageSkeleton} />
       </div>
-      <div className={styles.descriptionHeader}>
+      <div className={styles.heroPanelSkeleton}>
         <section className={styles.descriptionHeaderInfo}>
           <Skeleton width={155} />
           <Skeleton width={135} />

src/renderer/src/pages/game-details/game-details.css.ts

@@ -174,7 +174,6 @@ export const descriptionHeader = style({
   justifyContent: "space-between",
   alignItems: "center",
   backgroundColor: vars.color.background,
-  borderBottom: `solid 1px ${vars.color.border}`,
   height: "72px",
 });
 
@@ -233,6 +232,16 @@ export const randomizerButton = style({
   },
 });
 
+export const heroPanelSkeleton = style({
+  width: "100%",
+  padding: `${SPACING_UNIT * 2}px ${SPACING_UNIT * 2}px`,
+  display: "flex",
+  alignItems: "center",
+  backgroundColor: vars.color.background,
+  height: "72px",
+  borderBottom: `solid 1px ${vars.color.border}`,
+});
+
 globalStyle(".bb_tag", {
   marginTop: `${SPACING_UNIT * 2}px`,
   marginBottom: `${SPACING_UNIT * 2}px`,

src/renderer/src/pages/game-details/hero/hero-panel.css.ts

@@ -10,7 +10,6 @@ export const panel = style({
   justifyContent: "space-between",
   transition: "all ease 0.2s",
   borderBottom: `solid 1px ${vars.color.border}`,
-  color: "#8e919b",
   boxShadow: "0px 0px 15px 0px #000000",
 });
 

src/renderer/src/pages/game-details/installation-guides/dodi-installation-guide.tsx

@@ -21,7 +21,7 @@ export function DODIInstallationGuide({
 }: DODIInstallationGuideProps) {
   const { t } = useTranslation("game_details");
 
-  const [dontShowAgain, setDontShowAgain] = useState(true);
+  const [dontShowAgain, setDontShowAgain] = useState(false);
 
   const handleClose = () => {
     if (dontShowAgain) {

src/renderer/src/pages/game-details/installation-guides/online-fix-installation-guide.tsx

@@ -22,7 +22,7 @@ export function OnlineFixInstallationGuide({
   const [clipboardLocked, setClipboardLocked] = useState(false);
   const { t } = useTranslation("game_details");
 
-  const [dontShowAgain, setDontShowAgain] = useState(true);
+  const [dontShowAgain, setDontShowAgain] = useState(false);
 
   const handleCopyToClipboard = () => {
     setClipboardLocked(true);

src/renderer/src/pages/game-details/repacks-modal.tsx

@@ -44,12 +44,17 @@ export function RepacksModal({
   };
 
   const handleFilter: React.ChangeEventHandler<HTMLInputElement> = (event) => {
+    const term = event.target.value.toLocaleLowerCase();
+
     setFilteredRepacks(
-      gameDetails.repacks.filter((repack) =>
-        repack.title
-          .toLowerCase()
-          .includes(event.target.value.toLocaleLowerCase())
-      )
+      gameDetails.repacks.filter((repack) => {
+        const lowerCaseTitle = repack.title.toLowerCase();
+        const lowerCaseRepacker = repack.repacker.toLowerCase();
+
+        return [lowerCaseTitle, lowerCaseRepacker].some((value) =>
+          value.includes(term)
+        );
+      })
     );
   };
 

src/renderer/src/pages/home/search-results.tsx

@@ -4,7 +4,7 @@ import Skeleton, { SkeletonTheme } from "react-loading-skeleton";
 import type { CatalogueEntry } from "@types";
 
 import type { DebouncedFunc } from "lodash";
-import { debounce } from "lodash-es";
+import { debounce } from "lodash";
 
 import { InboxIcon } from "@primer/octicons-react";
 import { clearSearch } from "@renderer/features";