feat: migration to scss

.env.example

@@ -1,4 +1,4 @@
 MAIN_VITE_API_URL=API_URL
 MAIN_VITE_AUTH_URL=AUTH_URL
 MAIN_VITE_STEAMGRIDDB_API_KEY=YOUR_API_KEY
-
+RENDERER_VITE_INTERCOM_APP_ID=YOUR_APP_ID

.github/workflows/build.yml

@@ -43,6 +43,8 @@ jobs:
           MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_STAGING_API_URL }}
           MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_STAGING_AUTH_URL }}
           MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_STAGING_CHECKOUT_URL }}
+          MAIN_VITE_ANALYTICS_API_URL: ${{ vars.MAIN_VITE_ANALYTICS_API_URL }}
+          RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Windows
@@ -52,6 +54,8 @@ jobs:
           MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_STAGING_API_URL }}
           MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_STAGING_AUTH_URL }}
           MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_STAGING_CHECKOUT_URL }}
+          MAIN_VITE_ANALYTICS_API_URL: ${{ vars.MAIN_VITE_ANALYTICS_API_URL }}
+          RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create artifact

.github/workflows/release.yml

@@ -45,8 +45,9 @@ jobs:
           MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_API_URL }}
           MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_AUTH_URL }}
           MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_CHECKOUT_URL }}
+          MAIN_VITE_ANALYTICS_API_URL: ${{ vars.MAIN_VITE_ANALYTICS_API_URL }}
+          RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Build Windows
         if: matrix.os == 'windows-latest'
         run: yarn build:win
@@ -54,8 +55,9 @@ jobs:
           MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_API_URL }}
           MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_AUTH_URL }}
           MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_CHECKOUT_URL }}
+          MAIN_VITE_ANALYTICS_API_URL: ${{ vars.MAIN_VITE_ANALYTICS_API_URL }}
+          RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Create artifact
         uses: actions/upload-artifact@v4
         with:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hydralauncher",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "Hydra",
   "main": "./out/main/index.js",
   "author": "Los Broxas",
@@ -36,6 +36,7 @@
     "@electron-toolkit/utils": "^3.0.0",
     "@fontsource/noto-sans": "^5.0.22",
     "@hookform/resolvers": "^3.9.0",
+    "@intercom/messenger-js-sdk": "^0.0.14",
     "@primer/octicons-react": "^19.9.0",
     "@reduxjs/toolkit": "^2.2.3",
     "@vanilla-extract/css": "^1.14.2",
@@ -53,10 +54,10 @@
     "dexie": "^4.0.9",
     "electron-log": "^5.2.0",
     "electron-updater": "^6.3.9",
+    "file-type": "^19.6.0",
     "flexsearch": "^0.7.43",
     "i18next": "^23.11.2",
     "i18next-browser-languagedetector": "^7.2.1",
-    "icojs": "^0.19.4",
     "jsdom": "^24.0.0",
     "jsonwebtoken": "^9.0.2",
     "knex": "^3.1.0",

requirements.txt

@@ -1,5 +1,5 @@
 libtorrent
-cx_Freeze
+cx_Freeze == 7.2.3
 cx_Logging; sys_platform == 'win32'
 pywin32; sys_platform == 'win32'
 psutil

src/locales/en/translation.json

@@ -25,7 +25,8 @@
     "queued": "{{title}} (Queued)",
     "game_has_no_executable": "Game has no executable selected",
     "sign_in": "Sign in",
-    "friends": "Friends"
+    "friends": "Friends",
+    "need_help": "Need help?"
   },
   "header": {
     "search": "Search games",
@@ -254,7 +255,8 @@
     "blocked_users": "Blocked users",
     "user_unblocked": "User has been unblocked",
     "enable_achievement_notifications": "When an achievement is unlocked",
-    "launch_minimized": "Launch Hydra minimized"
+    "launch_minimized": "Launch Hydra minimized",
+    "disable_nsfw_alert": "Disable NSFW alert"
   },
   "notifications": {
     "download_complete": "Download complete",

src/locales/es/translation.json

@@ -25,7 +25,8 @@
     "queued": "{{title}} (En cola)",
     "game_has_no_executable": "El juego no tiene un ejecutable seleccionado",
     "sign_in": "Iniciar sesión",
-    "friends": "Amigos"
+    "friends": "Amigos",
+    "need_help": "¿Necesitas ayuda?"
   },
   "header": {
     "search": "Buscar juegos",

src/locales/pt-BR/translation.json

@@ -25,7 +25,8 @@
     "queued": "{{title}} (Na fila)",
     "game_has_no_executable": "Jogo não possui executável selecionado",
     "sign_in": "Login",
-    "friends": "Amigos"
+    "friends": "Amigos",
+    "need_help": "Precisa de ajuda?"
   },
   "header": {
     "search": "Buscar jogos",
@@ -250,7 +251,8 @@
     "blocked_users": "Usuários bloqueados",
     "user_unblocked": "Usuário desbloqueado",
     "enable_achievement_notifications": "Quando uma conquista é desbloqueada",
-    "launch_minimized": "Iniciar o Hydra minimizado"
+    "launch_minimized": "Iniciar o Hydra minimizado",
+    "disable_nsfw_alert": "Desativar alerta de conteúdo inapropriado"
   },
   "notifications": {
     "download_complete": "Download concluído",

src/locales/ru/translation.json

@@ -7,7 +7,7 @@
     "featured": "Рекомендованное",
     "surprise_me": "Удиви меня",
     "no_results": "Ничего не найдено",
-    "hot": "Сейчас жарко",
+    "hot": "Сейчас в топе",
     "start_typing": "Начинаю вводить текст для поиска...",
     "weekly": "📅 Лучшие игры недели"
   },
@@ -24,7 +24,8 @@
     "queued": "{{title}} (В очереди)",
     "game_has_no_executable": "Файл запуска игры не выбран",
     "sign_in": "Войти",
-    "friends": "Друзья"
+    "friends": "Друзья",
+    "need_help": "Нужна помощь?"
   },
   "header": {
     "search": "Поиск",

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

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

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

@@ -1,5 +1,5 @@
 import { registerEvent } from "../register-event";
-
+import parseTorrent from "parse-torrent";
 import type { StartGameDownloadPayload } from "@types";
 import { DownloadManager, HydraApi, logger } from "@main/services";
 
@@ -9,6 +9,7 @@ import { createGame } from "@main/services/library-sync";
 import { steamUrlBuilder } from "@shared";
 import { dataSource } from "@main/data-source";
 import { DownloadQueue, Game } from "@main/entity";
+import { HydraAnalytics } from "@main/services/hydra-analytics";
 
 const startGameDownload = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -90,6 +91,17 @@ const startGameDownload = async (
       logger.error("Failed to create game download", err);
     });
 
+    if (uri.startsWith("magnet:")) {
+      try {
+        const { infoHash } = await parseTorrent(payload.uri);
+        if (infoHash) {
+          HydraAnalytics.postDownload(infoHash).catch(() => {});
+        }
+      } catch (err) {
+        logger.error("Failed to parse torrent", err);
+      }
+    }
+
     await DownloadManager.cancelDownload(updatedGame!.id);
     await DownloadManager.startDownload(updatedGame!);
 

src/main/knex-client.ts

@@ -12,6 +12,7 @@ import { CreateUserSubscription } from "./migrations/20241015235142_create_user_
 import { AddBackgroundImageUrl } from "./migrations/20241016100249_add_background_image_url";
 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";
 export type HydraMigration = Knex.Migration & { name: string };
 
 class MigrationSource implements Knex.MigrationSource<HydraMigration> {
@@ -28,6 +29,7 @@ class MigrationSource implements Knex.MigrationSource<HydraMigration> {
       AddBackgroundImageUrl,
       AddWinePrefixToGame,
       AddStartMinimizedColumn,
+      AddDisableNsfwAlertColumn,
     ]);
   }
   getMigrationName(migration: HydraMigration): string {

src/main/migrations/20241106053733_add_disable_nsfw_alert_column.ts

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

src/main/services/achievements/merge-achievements.ts

@@ -102,7 +102,7 @@ export const mergeAchievements = async (
           );
         });
       })
-      .filter((achievement) => achievement)
+      .filter((achievement) => Boolean(achievement))
       .map((achievement) => {
         return {
           displayName: achievement!.displayName,

src/main/services/hydra-analytics.ts

@@ -0,0 +1,34 @@
+import { userSubscriptionRepository } from "@main/repository";
+import axios from "axios";
+import { appVersion } from "@main/constants";
+
+export class HydraAnalytics {
+  private static instance = axios.create({
+    baseURL: import.meta.env.MAIN_VITE_ANALYTICS_API_URL,
+    headers: { "User-Agent": `Hydra Launcher v${appVersion}` },
+  });
+
+  private static async hasActiveSubscription() {
+    const userSubscription = await userSubscriptionRepository.findOne({
+      where: { id: 1 },
+    });
+
+    return (
+      userSubscription?.expiresAt && userSubscription.expiresAt > new Date()
+    );
+  }
+
+  static async postDownload(hash: string) {
+    const hasSubscription = await this.hasActiveSubscription();
+
+    return this.instance
+      .post("/track", {
+        event: "download",
+        attributes: {
+          hash,
+          hasSubscription,
+        },
+      })
+      .then((response) => response.data);
+  }
+}

src/main/services/notifications/index.ts

@@ -1,9 +1,8 @@
-import { Notification, app, nativeImage } from "electron";
+import { Notification, app } from "electron";
 import { t } from "i18next";
-import { parseICO } from "icojs";
 import trayIcon from "@resources/tray-icon.png?asset";
 import { Game } from "@main/entity";
-import { gameRepository, userPreferencesRepository } from "@main/repository";
+import { userPreferencesRepository } from "@main/repository";
 import fs from "node:fs";
 import axios from "axios";
 import path from "node:path";
@@ -11,37 +10,38 @@ import sound from "sound-play";
 import { achievementSoundPath } from "@main/constants";
 import icon from "@resources/icon.png?asset";
 import { NotificationOptions, toXmlString } from "./xml";
+import { logger } from "../logger";
 
-const getGameIconNativeImage = async (gameId: number) => {
-  try {
-    const game = await gameRepository.findOne({
-      where: {
-        id: gameId,
-      },
+async function downloadImage(url: string | null) {
+  if (!url) return undefined;
+  if (!url.startsWith("http")) return undefined;
+
+  const fileName = url.split("/").pop()!;
+  const outputPath = path.join(app.getPath("temp"), fileName);
+  const writer = fs.createWriteStream(outputPath);
+
+  const response = await axios.get(url, {
+    responseType: "stream",
+  });
+
+  response.data.pipe(writer);
+
+  return new Promise<string | undefined>((resolve) => {
+    writer.on("finish", () => {
+      resolve(outputPath);
     });
-
-    if (!game?.iconUrl) return undefined;
-
-    const images = await parseICO(
-      Buffer.from(game.iconUrl.split("base64,")[1], "base64")
-    );
-
-    const highResIcon = images.find((image) => image.width >= 128);
-    if (!highResIcon) return undefined;
-
-    return nativeImage.createFromBuffer(Buffer.from(highResIcon.buffer));
-  } catch (err) {
-    return undefined;
-  }
-};
+    writer.on("error", () => {
+      logger.error("Failed to download image", { url });
+      resolve(undefined);
+    });
+  });
+}
 
 export const publishDownloadCompleteNotification = async (game: Game) => {
   const userPreferences = await userPreferencesRepository.findOne({
     where: { id: 1 },
   });
 
-  const icon = await getGameIconNativeImage(game.id);
-
   if (userPreferences?.downloadNotificationsEnabled) {
     new Notification({
       title: t("download_complete", {
@@ -51,7 +51,7 @@ export const publishDownloadCompleteNotification = async (game: Game) => {
         ns: "notifications",
         title: game.title,
       }),
-      icon,
+      icon: await downloadImage(game.iconUrl),
     }).show();
   }
 };
@@ -73,28 +73,6 @@ export const publishNotificationUpdateReadyToInstall = async (
 
 export const publishNewFriendRequestNotification = async () => {};
 
-async function downloadImage(url: string | null) {
-  if (!url) return null;
-  if (!url.startsWith("http")) return null;
-
-  const fileName = url.split("/").pop()!;
-  const outputPath = path.join(app.getPath("temp"), fileName);
-  const writer = fs.createWriteStream(outputPath);
-
-  const response = await axios.get(url, {
-    responseType: "stream",
-  });
-
-  response.data.pipe(writer);
-
-  return new Promise<string>((resolve, reject) => {
-    writer.on("finish", () => {
-      resolve(outputPath);
-    });
-    writer.on("error", reject);
-  });
-}
-
 export const publishCombinedNewAchievementNotification = async (
   achievementCount,
   gameCount

src/main/services/user/get-user-data.ts

@@ -56,6 +56,7 @@ export const getUserData = () => {
           id: loggedUser.userId,
           username: "",
           bio: "",
+          email: null,
           profileVisibility: "PUBLIC" as ProfileVisibility,
           subscription: loggedUser.subscription
             ? {

src/main/services/window-manager.ts

@@ -85,6 +85,10 @@ export class WindowManager {
           return callback(details);
         }
 
+        if (details.url.includes("intercom.io")) {
+          return callback(details);
+        }
+
         const headers = {
           "access-control-allow-origin": ["*"],
           "access-control-allow-methods": ["GET, POST, PUT, DELETE, OPTIONS"],

src/main/vite-env.d.ts

@@ -3,6 +3,7 @@
 interface ImportMetaEnv {
   readonly MAIN_VITE_STEAMGRIDDB_API_KEY: string;
   readonly MAIN_VITE_API_URL: string;
+  readonly MAIN_VITE_ANALYTICS_API_URL: string;
   readonly MAIN_VITE_AUTH_URL: string;
   readonly MAIN_VITE_CHECKOUT_URL: string;
 }

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: local: *; media-src 'self' local: data: *;"
+      content="default-src 'self'; script-src *; style-src 'self' 'unsafe-inline'; img-src 'self' data: local: *; media-src 'self' local: data: *; connect-src *; font-src *;"
     />
   </head>
   <body>

src/renderer/src/app.css.ts

@@ -1,128 +0,0 @@
-import {
-  ComplexStyleRule,
-  createContainer,
-  globalStyle,
-  style,
-} from "@vanilla-extract/css";
-import { SPACING_UNIT, vars } from "./theme.css";
-
-export const appContainer = createContainer();
-
-globalStyle("*", {
-  boxSizing: "border-box",
-});
-
-globalStyle("::-webkit-scrollbar", {
-  width: "9px",
-  backgroundColor: vars.color.darkBackground,
-});
-
-globalStyle("::-webkit-scrollbar-track", {
-  backgroundColor: "rgba(255, 255, 255, 0.03)",
-});
-
-globalStyle("::-webkit-scrollbar-thumb", {
-  backgroundColor: "rgba(255, 255, 255, 0.08)",
-  borderRadius: "24px",
-});
-
-globalStyle("::-webkit-scrollbar-thumb:hover", {
-  backgroundColor: "rgba(255, 255, 255, 0.16)",
-});
-
-globalStyle("html, body, #root, main", {
-  height: "100%",
-});
-
-globalStyle("body", {
-  overflow: "hidden",
-  userSelect: "none",
-  fontFamily: "Noto Sans, sans-serif",
-  fontSize: vars.size.body,
-  color: vars.color.body,
-  margin: "0",
-});
-
-globalStyle("button", {
-  padding: "0",
-  backgroundColor: "transparent",
-  border: "none",
-  fontFamily: "inherit",
-});
-
-globalStyle("h1, h2, h3, h4, h5, h6, p", {
-  margin: 0,
-});
-
-globalStyle("p", {
-  lineHeight: "20px",
-});
-
-globalStyle("#root, main", {
-  display: "flex",
-});
-
-globalStyle("#root", {
-  flexDirection: "column",
-});
-
-globalStyle("main", {
-  overflow: "hidden",
-});
-
-globalStyle(
-  "input::-webkit-outer-spin-button, input::-webkit-inner-spin-button",
-  {
-    WebkitAppearance: "none",
-    margin: "0",
-  }
-);
-
-globalStyle("label", {
-  fontSize: vars.size.body,
-});
-
-globalStyle("input[type=number]", {
-  MozAppearance: "textfield",
-});
-
-globalStyle("img", {
-  WebkitUserDrag: "none",
-} as Record<string, string>);
-
-globalStyle("progress[value]", {
-  WebkitAppearance: "none",
-});
-
-export const container = style({
-  width: "100%",
-  height: "100%",
-  overflow: "hidden",
-  display: "flex",
-  flexDirection: "column",
-  containerName: appContainer,
-  containerType: "inline-size",
-});
-
-export const content = style({
-  overflowY: "auto",
-  alignItems: "center",
-  display: "flex",
-  flexDirection: "column",
-  position: "relative",
-  height: "100%",
-  background: `linear-gradient(0deg, ${vars.color.darkBackground} 50%, ${vars.color.background} 100%)`,
-});
-
-export const titleBar = style({
-  display: "flex",
-  width: "100%",
-  height: "35px",
-  minHeight: "35px",
-  backgroundColor: vars.color.darkBackground,
-  alignItems: "center",
-  padding: `0 ${SPACING_UNIT * 2}px`,
-  WebkitAppRegion: "drag",
-  zIndex: "4",
-  borderBottom: `1px solid ${vars.color.border}`,
-} as ComplexStyleRule);

src/renderer/src/app.scss

@@ -127,4 +127,10 @@ progress[value] {
   -webkit-app-region: drag;
   z-index: 4;
   border-bottom: 1px solid globals.$border-color;
+
+  &__cloud-text {
+    background: linear-gradient(270deg, #16b195 50%, #3e62c0 100%);
+    background-clip: text;
+    color: transparent;
+  }
 }

src/renderer/src/app.tsx

@@ -3,6 +3,7 @@ import { useCallback, useContext, useEffect, useRef } from "react";
 import { Sidebar, BottomPanel, Header, Toast } from "@renderer/components";
 
 import "./app.scss";
+import Intercom from "@intercom/messenger-js-sdk";
 
 import {
   useAppDispatch,
@@ -13,8 +14,6 @@ import {
   useUserDetails,
 } from "@renderer/hooks";
 
-import * as styles from "./app.css";
-
 import { Outlet, useLocation, useNavigate } from "react-router-dom";
 import {
   setSearch,
@@ -36,6 +35,12 @@ export interface AppProps {
   children: React.ReactNode;
 }
 
+console.log(import.meta.env);
+
+Intercom({
+  app_id: import.meta.env.RENDERER_VITE_INTERCOM_APP_ID,
+});
+
 export function App() {
   const contentRef = useRef<HTMLDivElement>(null);
   const { updateLibrary, library } = useLibrary();
@@ -56,8 +61,13 @@ export function App() {
     hideFriendsModal,
   } = useUserDetails();
 
-  const { userDetails, fetchUserDetails, updateUserDetails, clearUserDetails } =
-    useUserDetails();
+  const {
+    userDetails,
+    hasActiveSubscription,
+    fetchUserDetails,
+    updateUserDetails,
+    clearUserDetails,
+  } = useUserDetails();
 
   const dispatch = useAppDispatch();
 
@@ -206,7 +216,9 @@ export function App() {
 
   useEffect(() => {
     new MutationObserver(() => {
-      const modal = document.body.querySelector("[role=dialog]");
+      const modal = document.body.querySelector(
+        "[role=dialog]:not([data-intercom-frame='true'])"
+      );
 
       dispatch(toggleDraggingDisabled(Boolean(modal)));
     }).observe(document.body, {
@@ -271,8 +283,13 @@ export function App() {
   return (
     <>
       {window.electron.platform === "win32" && (
-        <div className={styles.titleBar}>
-          <h4>Hydra</h4>
+        <div className="title-bar">
+          <h4>
+            Hydra
+            {hasActiveSubscription && (
+              <span className="title-bar__cloud-text"> Cloud</span>
+            )}
+          </h4>
         </div>
       )}
 
@@ -295,14 +312,14 @@ export function App() {
       <main>
         <Sidebar />
 
-        <article className={styles.container}>
+        <article className="container">
           <Header
             onSearch={handleSearch}
             search={search}
             onClear={handleClear}
           />
 
-          <section ref={contentRef} className={styles.content}>
+          <section ref={contentRef} className="container__content">
             <Outlet />
           </section>
         </article>

src/renderer/src/components/badge/badge.scss

@@ -4,7 +4,7 @@
   color: globals.$muted-color;
   font-size: 10px;
   padding: calc(globals.$spacing-unit / 2) globals.$spacing-unit;
-  border: solid 1px globals.$border-color;
+  border: solid 1px globals.$muted-color;
   border-radius: 4px;
   display: flex;
   align-items: center;

src/renderer/src/components/header/header.scss

@@ -10,6 +10,7 @@
   padding: calc(globals.$spacing-unit * 2) calc(globals.$spacing-unit * 3);
   color: globals.$muted-color;
   border-bottom: solid 1px globals.$border-color;
+  background-color: globals.$dark-background-color;
 
   &--dragging-disabled {
     -webkit-app-region: no-drag;
@@ -20,7 +21,7 @@
   }
 
   &__search {
-    background-color: globals.$dark-background-color;
+    background-color: globals.$background-color;
     display: inline-flex;
     transition: all ease 0.2s;
     width: 200px;

src/renderer/src/components/sidebar/sidebar.scss

@@ -107,4 +107,30 @@
     flex-direction: column;
     padding-bottom: globals.$spacing-unit;
   }
+
+  &__help-button {
+    color: globals.$muted-color;
+    padding: globals.$spacing-unit calc(globals.$spacing-unit * 2);
+    gap: 9px;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    border-top: solid 1px globals.$border-color;
+    transition: background-color ease 0.1s;
+
+    &:hover {
+      background-color: rgba(255, 255, 255, 0.15);
+    }
+  }
+
+  &__help-button-icon {
+    background: linear-gradient(0deg, #16b195 50%, #3e62c0 100%);
+    width: 24px;
+    height: 24px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+    border-radius: 50%;
+  }
 }

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

@@ -5,7 +5,12 @@ import { useLocation, useNavigate } from "react-router-dom";
 import type { LibraryGame } from "@types";
 
 import { TextField } from "@renderer/components";
-import { useDownload, useLibrary, useToast } from "@renderer/hooks";
+import {
+  useDownload,
+  useLibrary,
+  useToast,
+  useUserDetails,
+} from "@renderer/hooks";
 
 import { routes } from "./routes";
 
@@ -17,6 +22,9 @@ import SteamLogo from "@renderer/assets/steam-logo.svg?react";
 import { SidebarProfile } from "./sidebar-profile";
 import { sortBy } from "lodash-es";
 import cn from "classnames";
+import { CommentDiscussionIcon } from "@primer/octicons-react";
+
+import { show, update } from "@intercom/messenger-js-sdk";
 
 const SIDEBAR_MIN_WIDTH = 200;
 const SIDEBAR_INITIAL_WIDTH = 250;
@@ -44,6 +52,20 @@ export function Sidebar() {
     return sortBy(library, (game) => game.title);
   }, [library]);
 
+  const { userDetails, hasActiveSubscription } = useUserDetails();
+
+  useEffect(() => {
+    if (userDetails) {
+      update({
+        name: userDetails.displayName,
+        Username: userDetails.username,
+        Email: userDetails.email,
+        "Subscription expiration date": userDetails?.subscription?.expiresAt,
+        "Payment status": userDetails?.subscription?.status,
+      });
+    }
+  }, [userDetails, hasActiveSubscription]);
+
   const { lastPacket, progress } = useDownload();
 
   const { showWarningToast } = useToast();
@@ -168,77 +190,91 @@ export function Sidebar() {
         maxWidth: sidebarWidth,
       }}
     >
-      <SidebarProfile />
+      <div
+        style={{ display: "flex", flexDirection: "column", overflow: "hidden" }}
+      >
+        <SidebarProfile />
 
-      <div className="sidebar__content">
-        <section className="sidebar__section">
-          <ul className="sidebar__menu">
-            {routes.map(({ nameKey, path, render }) => (
-              <li
-                key={nameKey}
-                className={cn("sidebar__menu-item", {
-                  "sidebar__menu-item--active": location.pathname === path,
-                })}
-              >
-                <button
-                  type="button"
-                  className="sidebar__menu-item-button"
-                  onClick={() => handleSidebarItemClick(path)}
+        <div className="sidebar__content">
+          <section className="sidebar__section">
+            <ul className="sidebar__menu">
+              {routes.map(({ nameKey, path, render }) => (
+                <li
+                  key={nameKey}
+                  className={cn("sidebar__menu-item", {
+                    "sidebar__menu-item--active": location.pathname === path,
+                  })}
                 >
-                  {render()}
-                  <span>{t(nameKey)}</span>
-                </button>
-              </li>
-            ))}
-          </ul>
-        </section>
+                  <button
+                    type="button"
+                    className="sidebar__menu-item-button"
+                    onClick={() => handleSidebarItemClick(path)}
+                  >
+                    {render()}
+                    <span>{t(nameKey)}</span>
+                  </button>
+                </li>
+              ))}
+            </ul>
+          </section>
 
-        <section className="sidebar__section">
-          <small className="sidebar__section-title">{t("my_library")}</small>
+          <section className="sidebar__section">
+            <small className="sidebar__section-title">{t("my_library")}</small>
 
-          <TextField
-            ref={filterRef}
-            placeholder={t("filter")}
-            onChange={handleFilter}
-            theme="dark"
-          />
+            <TextField
+              ref={filterRef}
+              placeholder={t("filter")}
+              onChange={handleFilter}
+              theme="dark"
+            />
 
-          <ul className="sidebar__menu">
-            {filteredLibrary.map((game) => (
-              <li
-                key={game.id}
-                className={cn("sidebar__menu-item", {
-                  "sidebar__menu-item--active":
-                    location.pathname === `/game/${game.shop}/${game.objectID}`,
-                  "sidebar__menu-item--muted": game.status === "removed",
-                })}
-              >
-                <button
-                  type="button"
-                  className="sidebar__menu-item-button"
-                  onClick={(event) => handleSidebarGameClick(event, game)}
+            <ul className="sidebar__menu">
+              {filteredLibrary.map((game) => (
+                <li
+                  key={game.id}
+                  className={cn("sidebar__menu-item", {
+                    "sidebar__menu-item--active":
+                      location.pathname ===
+                      `/game/${game.shop}/${game.objectID}`,
+                    "sidebar__menu-item--muted": game.status === "removed",
+                  })}
                 >
-                  {game.iconUrl ? (
-                    <img
-                      className="sidebar__game-icon"
-                      src={game.iconUrl}
-                      alt={game.title}
-                      loading="lazy"
-                    />
-                  ) : (
-                    <SteamLogo className="sidebar__game-icon" />
-                  )}
+                  <button
+                    type="button"
+                    className="sidebar__menu-item-button"
+                    onClick={(event) => handleSidebarGameClick(event, game)}
+                  >
+                    {game.iconUrl ? (
+                      <img
+                        className="sidebar__game-icon"
+                        src={game.iconUrl}
+                        alt={game.title}
+                        loading="lazy"
+                      />
+                    ) : (
+                      <SteamLogo className="sidebar__game-icon" />
+                    )}
 
-                  <span className="sidebar__menu-item-button-label">
-                    {getGameTitle(game)}
-                  </span>
-                </button>
-              </li>
-            ))}
-          </ul>
-        </section>
+                    <span className="sidebar__menu-item-button-label">
+                      {getGameTitle(game)}
+                    </span>
+                  </button>
+                </li>
+              ))}
+            </ul>
+          </section>
+        </div>
       </div>
 
+      {hasActiveSubscription && (
+        <button type="button" className="sidebar__help-button" onClick={show}>
+          <div className="sidebar__help-button-icon">
+            <CommentDiscussionIcon size={14} />
+          </div>
+          <span>{t("need_help")}</span>
+        </button>
+      )}
+
       <button
         type="button"
         className="sidebar__handle"

src/renderer/src/components/toast/toast.scss

@@ -1,6 +1,6 @@
 @use "../../scss/globals.scss";
 
-$toast-height: 80;
+$toast-height: 80px;
 
 .toast {
   animation-duration: 0.2s;
@@ -12,7 +12,7 @@ $toast-height: 80;
   border: solid 1px globals.$border-color;
   right: calc(globals.$spacing-unit * 2);
   //bottom panel height + 16px
-  bottom: calc(26 + #{globals.$spacing-unit * 2});
+  bottom: calc(26px + #{globals.$spacing-unit * 2});
   overflow: hidden;
   display: flex;
   flex-direction: column;
@@ -24,7 +24,7 @@ $toast-height: 80;
 
   &--closing {
     animation-name: slide-out;
-    transform: translateY(calc($toast-height #{globals.$spacing-unit * 2}));
+    transform: translateY(calc($toast-height + #{globals.$spacing-unit * 2}));
   }
 
   &__content {
@@ -38,10 +38,10 @@ $toast-height: 80;
   &__progress {
     width: 100%;
     height: 5px;
-    ::-webkit-progress-bar {
+    &::-webkit-progress-bar {
       background-color: globals.$dark-background-color;
     }
-    ::-webkit-progress-value {
+    &::-webkit-progress-value {
       background-color: globals.$muted-color;
     }
   }
@@ -68,7 +68,7 @@ $toast-height: 80;
 
 @keyframes slide-in {
   0% {
-    transform: translateY(calc($toast-height #{globals.$spacing-unit * 2}));
+    transform: translateY(calc($toast-height + #{globals.$spacing-unit * 2}));
   }
 
   100% {
@@ -76,12 +76,12 @@ $toast-height: 80;
   }
 }
 
-@keyframes slide-in {
+@keyframes slide-out {
   0% {
     transform: translateY(0);
   }
 
   100% {
-    transform: translateY(calc($toast-height #{globals.$spacing-unit * 2}));
+    transform: translateY(calc($toast-height + #{globals.$spacing-unit * 2}));
   }
 }

src/renderer/src/context/game-details/game-details.context.tsx

@@ -147,7 +147,8 @@ export function GameDetailsContextProvider({
         if (
           result?.content_descriptors.ids.includes(
             SteamContentDescriptor.AdultOnlySexualContent
-          )
+          ) &&
+          !userPreferences?.disableNsfwAlert
         ) {
           setHasNSFWContentBlocked(true);
         }

src/renderer/src/dexie.ts

@@ -10,12 +10,22 @@ export interface HowLongToBeatEntry {
   updatedAt: Date;
 }
 
+export interface CatalogueCache {
+  id?: number;
+  category: string;
+  games: { objectId: string; shop: GameShop }[];
+  createdAt: Date;
+  updatedAt: Date;
+  expiresAt: Date;
+}
+
 export const db = new Dexie("Hydra");
 
-db.version(4).stores({
+db.version(5).stores({
   repacks: `++id, title, uris, fileSize, uploadDate, downloadSourceId, repacker, createdAt, updatedAt`,
   downloadSources: `++id, url, name, etag, downloadCount, status, createdAt, updatedAt`,
   howLongToBeatEntries: `++id, categories, [shop+objectId], createdAt, updatedAt`,
+  catalogueCache: `++id, category, games, createdAt, updatedAt, expiresAt`,
 });
 
 export const downloadSourcesTable = db.table("downloadSources");
@@ -24,4 +34,6 @@ export const howLongToBeatEntriesTable = db.table<HowLongToBeatEntry>(
   "howLongToBeatEntries"
 );
 
+export const catalogueCacheTable = db.table<CatalogueCache>("catalogueCache");
+
 db.open();

src/renderer/src/pages/home/home.tsx

@@ -15,6 +15,14 @@ import * as styles from "./home.css";
 import { SPACING_UNIT, vars } from "@renderer/theme.css";
 import { buildGameDetailsPath } from "@renderer/helpers";
 import { CatalogueCategory } from "@shared";
+import { catalogueCacheTable, db } from "@renderer/dexie";
+import { add } from "date-fns";
+
+const categoryCacheDurationInSeconds = {
+  [CatalogueCategory.Hot]: 60 * 60 * 2,
+  [CatalogueCategory.Weekly]: 60 * 60 * 24,
+  [CatalogueCategory.Achievements]: 60 * 60 * 24,
+};
 
 export default function Home() {
   const { t } = useTranslation("home");
@@ -36,19 +44,43 @@ export default function Home() {
     [CatalogueCategory.Achievements]: [],
   });
 
-  const getCatalogue = useCallback((category: CatalogueCategory) => {
-    setCurrentCatalogueCategory(category);
-    setIsLoading(true);
+  const getCatalogue = useCallback(async (category: CatalogueCategory) => {
+    try {
+      const catalogueCache = await catalogueCacheTable
+        .where("expiresAt")
+        .above(new Date())
+        .and((cache) => cache.category === category)
+        .first();
 
-    window.electron
-      .getCatalogue(category)
-      .then((catalogue) => {
-        setCatalogue((prev) => ({ ...prev, [category]: catalogue }));
-      })
-      .catch(() => {})
-      .finally(() => {
-        setIsLoading(false);
+      setCurrentCatalogueCategory(category);
+      setIsLoading(true);
+
+      if (catalogueCache)
+        return setCatalogue((prev) => ({
+          ...prev,
+          [category]: catalogueCache.games,
+        }));
+
+      const catalogue = await window.electron.getCatalogue(category);
+
+      db.transaction("rw", catalogueCacheTable, async () => {
+        await catalogueCacheTable.where("category").equals(category).delete();
+
+        await catalogueCacheTable.add({
+          category,
+          games: catalogue,
+          createdAt: new Date(),
+          updatedAt: new Date(),
+          expiresAt: add(new Date(), {
+            seconds: categoryCacheDurationInSeconds[category],
+          }),
+        });
       });
+
+      setCatalogue((prev) => ({ ...prev, [category]: catalogue }));
+    } finally {
+      setIsLoading(false);
+    }
   }, []);
 
   const getRandomGame = useCallback(() => {

src/renderer/src/pages/settings/settings-behavior.tsx

@@ -18,6 +18,7 @@ export function SettingsBehavior() {
     preferQuitInsteadOfHiding: false,
     runAtStartup: false,
     startMinimized: false,
+    disableNsfwAlert: false,
   });
 
   const { t } = useTranslation("settings");
@@ -28,6 +29,7 @@ export function SettingsBehavior() {
         preferQuitInsteadOfHiding: userPreferences.preferQuitInsteadOfHiding,
         runAtStartup: userPreferences.runAtStartup,
         startMinimized: userPreferences.startMinimized,
+        disableNsfwAlert: userPreferences.disableNsfwAlert,
       });
     }
   }, [userPreferences]);
@@ -86,6 +88,14 @@ export function SettingsBehavior() {
           />
         </div>
       )}
+
+      <CheckboxField
+        label={t("disable_nsfw_alert")}
+        checked={form.disableNsfwAlert}
+        onChange={() =>
+          handleChange({ disableNsfwAlert: !form.disableNsfwAlert })
+        }
+      />
     </>
   );
 }

src/renderer/src/vite-env.d.ts

@@ -1,2 +1,10 @@
 /// <reference types="vite/client" />
 /// <reference types="vite-plugin-svgr/client" />
+
+interface ImportMetaEnv {
+  readonly RENDERER_VITE_INTERCOM_APP_ID: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}

src/shared/index.ts

@@ -55,6 +55,9 @@ export const removeDuplicateSpaces = (name: string) =>
 
 export const replaceDotsWithSpace = (name: string) => name.replace(/\./g, " ");
 
+export const replaceNbspWithSpace = (name: string) =>
+  name.replace(new RegExp(String.fromCharCode(160), "g"), " ");
+
 export const replaceUnderscoreWithSpace = (name: string) =>
   name.replace(/_/g, " ");
 
@@ -69,6 +72,7 @@ export const formatName = pipe<string>(
   removeSpecialEditionFromName,
   replaceUnderscoreWithSpace,
   replaceDotsWithSpace,
+  replaceNbspWithSpace,
   (str) => str.replace(/DIRECTOR'S CUT/g, ""),
   removeSymbolsFromName,
   removeDuplicateSpaces,

src/types/index.ts

@@ -161,6 +161,7 @@ export interface UserPreferences {
   preferQuitInsteadOfHiding: boolean;
   runAtStartup: boolean;
   startMinimized: boolean;
+  disableNsfwAlert: boolean;
 }
 
 export interface Steam250Game {
@@ -245,6 +246,7 @@ export interface Subscription {
 export interface UserDetails {
   id: string;
   username: string;
+  email: string | null;
   displayName: string;
   profileImageUrl: string | null;
   backgroundImageUrl: string | null;
@@ -257,6 +259,7 @@ export interface UserProfile {
   id: string;
   displayName: string;
   profileImageUrl: string | null;
+  email: string | null;
   backgroundImageUrl: string | null;
   profileVisibility: ProfileVisibility;
   libraryGames: UserGame[];
@@ -373,4 +376,4 @@ export interface ComparedAchievements {
 export * from "./steam.types";
 export * from "./real-debrid.types";
 export * from "./ludusavi.types";
-export * from "./howlongtobeat.types";
+export * from "./how-long-to-beat.types";

yarn.lock

@@ -480,11 +480,6 @@
   resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-2.2.2.tgz#1a6d89603fb215dc4d4178052d05b30b83c75402"
   integrity sha512-UNtPCbrwrenpmrXuRwn9jYpPoweNXj8X5sMvYgsqYyaH8jQ6LfUJSk3dJLnBK+6sfYPrF4iAIo5sd5HQ+tg75A==
 
-"@canvas/image-data@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/@canvas/image-data/-/image-data-1.0.0.tgz"
-  integrity sha512-BxOqI5LgsIQP1odU5KMwV9yoijleOPzHL18/YvNqF9KFSGF2K/DLlYAbDQsWqd/1nbaFuSkYD/191dpMtNh4vw==
-
 "@commitlint/cli@^19.5.0":
   version "19.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-19.5.0.tgz#a6e2f7f8397ddf9abd5ee5870e30a1bf51b7be2b"
@@ -1071,6 +1066,11 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
+"@intercom/messenger-js-sdk@^0.0.14":
+  version "0.0.14"
+  resolved "https://registry.yarnpkg.com/@intercom/messenger-js-sdk/-/messenger-js-sdk-0.0.14.tgz#a27999370cc0a82a2a57a779426df25a57891863"
+  integrity sha512-2dH4BDAh9EI90K7hUkAdZ76W79LM45Sd1OBX7t6Vzy8twpNiQ5X+7sH9G5hlJlkSGnf+vFWlFcy9TOYAyEs1hA==
+
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz"
@@ -1090,21 +1090,6 @@
   dependencies:
     minipass "^7.0.4"
 
-"@jimp/bmp@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.22.12.tgz#0316044dc7b1a90274aef266d50349347fb864d4"
-  integrity sha512-aeI64HD0npropd+AR76MCcvvRaa+Qck6loCOS03CkkxGHN5/r336qTM5HPUdHKMDOGzqknuVPA8+kK1t03z12g==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-    bmp-js "^0.1.0"
-
-"@jimp/utils@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.npmjs.org/@jimp/utils/-/utils-0.22.12.tgz"
-  integrity sha512-yJ5cWUknGnilBq97ZXOyOS0HhsHOyAyjHwYfHxGbSyMTohgQI6sVyE8KPgDwH8HHW/nMKXk8TrSwAE71zt716Q==
-  dependencies:
-    regenerator-runtime "^0.13.3"
-
 "@jridgewell/gen-mapping@^0.3.5":
   version "0.3.5"
   resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz"
@@ -1620,7 +1605,7 @@
 
 "@tokenizer/token@^0.3.0":
   version "0.3.0"
-  resolved "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276"
   integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==
 
 "@tootallnate/once@2":
@@ -2523,11 +2508,6 @@ bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bmp-js@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz#e05a63f796a6c1ff25f4771ec7adadc148c07233"
-  integrity sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==
-
 boolean@^3.0.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
@@ -3139,23 +3119,6 @@ decimal.js@^10.4.3:
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
   integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
-decode-bmp@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/decode-bmp/-/decode-bmp-0.2.1.tgz#cec3e0197ec3b6c60f02220f50e8757030ff2427"
-  integrity sha512-NiOaGe+GN0KJqi2STf24hfMkFitDUaIoUU3eKvP/wAbLe8o6FuW5n/x7MHPR0HKvBokp6MQY/j7w8lewEeVCIA==
-  dependencies:
-    "@canvas/image-data" "^1.0.0"
-    to-data-view "^1.1.0"
-
-decode-ico@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/decode-ico/-/decode-ico-0.4.1.tgz#e0f7373081532c7b8495bd51fb225d354e14de25"
-  integrity sha512-69NZfbKIzux1vBOd31al3XnMnH+2mqDhEgLdpygErm4d60N+UwA5Sq5WFjmEDQzumgB9fElojGwWG0vybVfFmA==
-  dependencies:
-    "@canvas/image-data" "^1.0.0"
-    decode-bmp "^0.2.0"
-    to-data-view "^1.1.0"
-
 decompress-response@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
@@ -3967,13 +3930,13 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-type@^19.0.0:
-  version "19.5.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-19.5.0.tgz#c13c5eca9c1c7270f6d5fbff70331b3c976f92b5"
-  integrity sha512-dMuq6WWnP6BpQY0zYJNpTtQWgeCImSMG0BTIzUBXvxbwc1HWP/E7AE4UWU9XSCOPGJuOHda0HpDnwM2FW+d90A==
+file-type@^19.6.0:
+  version "19.6.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-19.6.0.tgz#b43d8870453363891884cf5e79bb3e4464f2efd3"
+  integrity sha512-VZR5I7k5wkD0HgFnMsq5hOsSc710MJMu5Nc5QYsbe38NN5iPV/XTObYLc/cpttRTf6lX538+5uO1ZQRhYibiZQ==
   dependencies:
     get-stream "^9.0.1"
-    strtok3 "^8.1.0"
+    strtok3 "^9.0.1"
     token-types "^6.0.0"
     uint8array-extras "^1.3.0"
 
@@ -4529,18 +4492,6 @@ i18next@^23.11.2:
   dependencies:
     "@babel/runtime" "^7.23.2"
 
-icojs@^0.19.4:
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/icojs/-/icojs-0.19.4.tgz#fdbc9e61a0945ed1d331beb358d67f72cf7d78dc"
-  integrity sha512-86oNepPk2jAmbb96BPeucZI7HoSBobFlXDhhjIbwRb3wkQpvdBO5HO9KtMUNzMFT3qqQZsjLsfW+L0/9Rl9VqA==
-  dependencies:
-    "@jimp/bmp" "^0.22.12"
-    decode-ico "^0.4.1"
-    file-type "^19.0.0"
-    jpeg-js "^0.4.4"
-    pngjs "^7.0.0"
-    to-data-view "^2.0.0"
-
 iconv-corefoundation@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a"
@@ -4955,11 +4906,6 @@ jiti@^1.19.1:
   resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.6.tgz#6c7f7398dd4b3142767f9a168af2f317a428d268"
   integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==
 
-jpeg-js@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa"
-  integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -5961,10 +5907,10 @@ pe-library@^0.4.1:
   resolved "https://registry.yarnpkg.com/pe-library/-/pe-library-0.4.1.tgz#e269be0340dcb13aa6949d743da7d658c3e2fbea"
   integrity sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==
 
-peek-readable@^5.1.4:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.2.0.tgz#7458f18126217c154938c32a185f5d05f3df3710"
-  integrity sha512-U94a+eXHzct7vAd19GH3UQ2dH4Satbng0MyYTMaQatL0pvYYL5CTPR25HBhKtecl+4bfu1/i3vC6k0hydO5Vcw==
+peek-readable@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.3.1.tgz#9cc2c275cceda9f3d07a988f4f664c2080387dff"
+  integrity sha512-GVlENSDW6KHaXcd9zkZltB7tCLosKB/4Hg0fqBJkAoBgYG2Tn1xtMgXtSUuMU9AK/gCm/tTdT8mgAeF4YNeeqw==
 
 pend@~1.2.0:
   version "1.2.0"
@@ -6011,11 +5957,6 @@ plist@^3.0.4, plist@^3.0.5, plist@^3.1.0:
     base64-js "^1.5.1"
     xmlbuilder "^15.1.1"
 
-pngjs@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-7.0.0.tgz#a8b7446020ebbc6ac739db6c5415a65d17090e26"
-  integrity sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==
-
 possible-typed-array-names@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
@@ -6262,11 +6203,6 @@ reflect.getprototypeof@^1.0.4:
     globalthis "^1.0.3"
     which-builtin-type "^1.1.3"
 
-regenerator-runtime@^0.13.3:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
-
 regenerator-runtime@^0.14.0:
   version "0.14.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
@@ -6971,13 +6907,13 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
-strtok3@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-8.1.0.tgz#9234a6f42ee03bf8569c7ae0788d5fd4e67e095b"
-  integrity sha512-ExzDvHYPj6F6QkSNe/JxSlBxTh3OrI6wrAIz53ulxo1c4hBJ1bT9C/JrAthEKHWG9riVH3Xzg7B03Oxty6S2Lw==
+strtok3@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-9.0.1.tgz#7e3d7bbd2b829c9def6a7bb90d82e240abdd32be"
+  integrity sha512-ERPW+XkvX9W2A+ov07iy+ZFJpVdik04GhDA4eVogiG9hpC97Kem2iucyzhFxbFRvQ5o2UckFtKZdp1hkGvnrEw==
   dependencies:
     "@tokenizer/token" "^0.3.0"
-    peek-readable "^5.1.4"
+    peek-readable "^5.3.1"
 
 sudo-prompt@^9.2.1:
   version "9.2.1"
@@ -7154,16 +7090,6 @@ tmp@^0.2.0:
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
   integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
 
-to-data-view@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/to-data-view/-/to-data-view-1.1.0.tgz#08d6492b0b8deb9b29bdf1f61c23eadfa8994d00"
-  integrity sha512-1eAdufMg6mwgmlojAx3QeMnzB/BTVp7Tbndi3U7ftcT2zCZadjxkkmLmd97zmaxWi+sgGcgWrokmpEoy0Dn0vQ==
-
-to-data-view@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-data-view/-/to-data-view-2.0.0.tgz#4cc3f5c9eb59514a7436fc54c587c3c34c9b1d60"
-  integrity sha512-RGEM5KqlPHr+WVTPmGNAXNeFEmsBnlkxXaIfEpUYV0AST2Z5W1EGq9L/MENFrMMmL2WQr1wjkmZy/M92eKhjYA==
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"