Merge pull request #1203 from hydralauncher/fix/replace-nbsp-with-space

fix: replace nbsp with space

.github/workflows/build.yml

@@ -43,6 +43,7 @@ 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 }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Windows
@@ -52,6 +53,7 @@ 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 }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create artifact

.github/workflows/release.yml

@@ -45,6 +45,7 @@ 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 }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Windows
@@ -54,6 +55,7 @@ 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 }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create artifact

package.json

@@ -53,10 +53,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",

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,11 @@ const startGameDownload = async (
       logger.error("Failed to create game download", err);
     });
 
+    const { infoHash } = await parseTorrent(payload.uri);
+    if (infoHash) {
+      HydraAnalytics.postDownload(infoHash).catch(() => {});
+    }
+
     await DownloadManager.cancelDownload(updatedGame!.id);
     await DownloadManager.startDownload(updatedGame!);
 

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,47 +1,47 @@
-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";
 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;
 
-    if (!game?.iconUrl) return undefined;
+  const fileName = url.split("/").pop()!;
+  const outputPath = path.join(app.getPath("temp"), fileName);
+  const writer = fs.createWriteStream(outputPath);
 
-    const images = await parseICO(
-      Buffer.from(game.iconUrl.split("base64,")[1], "base64")
-    );
+  const response = await axios.get(url, {
+    responseType: "stream",
+  });
 
-    const highResIcon = images.find((image) => image.width >= 128);
-    if (!highResIcon) return undefined;
+  response.data.pipe(writer);
 
-    return nativeImage.createFromBuffer(Buffer.from(highResIcon.buffer));
-  } catch (err) {
-    return undefined;
-  }
-};
+  return new Promise<string | undefined>((resolve) => {
+    writer.on("finish", () => {
+      resolve(outputPath);
+    });
+    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/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/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,