chore: resolving conflicts with yarn.lock

src/main/constants.ts

@@ -19,6 +19,10 @@ export const seedsPath = app.isPackaged
   ? path.join(process.resourcesPath, "seeds")
   : path.join(__dirname, "..", "..", "seeds");
 
+export const achievementSoundPath = app.isPackaged
+  ? path.join(process.resourcesPath, "achievement.wav")
+  : path.join(__dirname, "..", "..", "resources", "achievement.wav");
+
 export const backupsPath = path.join(app.getPath("userData"), "Backups");
 
 export const appVersion = app.getVersion();

src/main/index.ts

@@ -98,7 +98,6 @@ app.whenReady().then(async () => {
     WindowManager.createMainWindow();
   }
 
-  WindowManager.createNotificationWindow();
   WindowManager.createSystemTray(userPreferences?.language || "en");
 });
 

src/main/services/achievements/achievement-watcher-manager.ts

@@ -13,7 +13,7 @@ import type { AchievementFile, UnlockedAchievement } from "@types";
 import { achievementsLogger } from "../logger";
 import { Cracker } from "@shared";
 import { IsNull, Not } from "typeorm";
-import { WindowManager } from "../window-manager";
+import { publishCombinedNewAchievementNotification } from "../notifications";
 
 const fileStats: Map<string, number> = new Map();
 const fltFiles: Map<string, Set<string>> = new Map();
@@ -249,11 +249,12 @@ export class AchievementWatcherManager {
       0
     );
 
-    WindowManager.notificationWindow?.webContents.send(
-      "on-combined-achievements-unlocked",
-      totalNewGamesWithAchievements,
-      totalNewAchievements
-    );
+    if (totalNewAchievements > 0) {
+      publishCombinedNewAchievementNotification(
+        totalNewAchievements,
+        totalNewGamesWithAchievements
+      );
+    }
 
     this.hasFinishedMergingWithRemote = true;
   };

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

@@ -8,11 +8,12 @@ import { HydraApi } from "../hydra-api";
 import { getUnlockedAchievements } from "@main/events/user/get-unlocked-achievements";
 import { Game } from "@main/entity";
 import { achievementsLogger } from "../logger";
+import { publishNewAchievementNotification } from "../notifications";
 
 const saveAchievementsOnLocal = async (
   objectId: string,
   shop: GameShop,
-  achievements: any[],
+  achievements: UnlockedAchievement[],
   sendUpdateEvent: boolean
 ) => {
   return gameAchievementRepository
@@ -82,6 +83,8 @@ export const mergeAchievements = async (
       };
     });
 
+  const mergedLocalAchievements = unlockedAchievements.concat(newAchievements);
+
   if (
     newAchievements.length &&
     publishNotification &&
@@ -107,16 +110,15 @@ export const mergeAchievements = async (
         };
       });
 
-    WindowManager.notificationWindow?.webContents.send(
-      "on-achievement-unlocked",
-      game.objectID,
-      game.shop,
-      achievementsInfo
-    );
+    publishNewAchievementNotification({
+      achievements: achievementsInfo,
+      unlockedAchievementCount: mergedLocalAchievements.length,
+      totalAchievementCount: achievementsData.length,
+      gameTitle: game.title,
+      gameIcon: game.iconUrl,
+    });
   }
 
-  const mergedLocalAchievements = unlockedAchievements.concat(newAchievements);
-
   if (game.remoteId) {
     await HydraApi.put("/profile/games/achievements", {
       id: game.remoteId,

src/main/services/notifications.ts

@@ -1,67 +0,0 @@
-import { Notification, nativeImage } 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";
-
-const getGameIconNativeImage = async (gameId: number) => {
-  try {
-    const game = await gameRepository.findOne({
-      where: {
-        id: gameId,
-      },
-    });
-
-    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;
-  }
-};
-
-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", {
-        ns: "notifications",
-      }),
-      body: t("game_ready_to_install", {
-        ns: "notifications",
-        title: game.title,
-      }),
-      icon,
-    }).show();
-  }
-};
-
-export const publishNotificationUpdateReadyToInstall = async (
-  version: string
-) => {
-  new Notification({
-    title: t("new_update_available", {
-      ns: "notifications",
-      version,
-    }),
-    body: t("restart_to_install_update", {
-      ns: "notifications",
-    }),
-    icon: trayIcon,
-  }).show();
-};
-
-export const publishNewFriendRequestNotification = async () => {};

src/main/services/notifications/index.ts

@@ -0,0 +1,168 @@
+import { Notification, app, nativeImage } 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 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";
+
+const getGameIconNativeImage = async (gameId: number) => {
+  try {
+    const game = await gameRepository.findOne({
+      where: {
+        id: gameId,
+      },
+    });
+
+    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;
+  }
+};
+
+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", {
+        ns: "notifications",
+      }),
+      body: t("game_ready_to_install", {
+        ns: "notifications",
+        title: game.title,
+      }),
+      icon,
+    }).show();
+  }
+};
+
+export const publishNotificationUpdateReadyToInstall = async (
+  version: string
+) => {
+  new Notification({
+    title: t("new_update_available", {
+      ns: "notifications",
+      version,
+    }),
+    body: t("restart_to_install_update", {
+      ns: "notifications",
+    }),
+    icon: trayIcon,
+  }).show();
+};
+
+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
+) => {
+  const options: NotificationOptions = {
+    title: t("achievement_unlocked", { ns: "achievement" }),
+    body: t("new_achievements_unlocked", {
+      ns: "achievement",
+      gameCount,
+      achievementCount,
+    }),
+    icon,
+    silent: true,
+  };
+
+  new Notification({
+    ...options,
+    toastXml: toXmlString(options),
+  }).show();
+
+  if (process.platform !== "linux") {
+    sound.play(achievementSoundPath);
+  }
+};
+
+export const publishNewAchievementNotification = async (info: {
+  achievements: { displayName: string; iconUrl: string }[];
+  unlockedAchievementCount: number;
+  totalAchievementCount: number;
+  gameTitle: string;
+  gameIcon: string | null;
+}) => {
+  const partialOptions =
+    info.achievements.length > 1
+      ? {
+          title: t("achievements_unlocked_for_game", {
+            ns: "achievement",
+            gameTitle: info.gameTitle,
+            achievementCount: info.achievements.length,
+          }),
+          body: info.achievements.map((a) => a.displayName).join(", "),
+          icon: (await downloadImage(info.gameIcon)) ?? icon,
+        }
+      : {
+          title: t("achievement_unlocked", { ns: "achievement" }),
+          body: info.achievements[0].displayName,
+          icon: (await downloadImage(info.achievements[0].iconUrl)) ?? icon,
+        };
+
+  const options: NotificationOptions = {
+    ...partialOptions,
+    silent: true,
+    progress: {
+      value: info.unlockedAchievementCount / info.totalAchievementCount,
+      valueOverride: t("achievement_progress", {
+        ns: "achievement",
+        unlockedCount: info.unlockedAchievementCount,
+        totalCount: info.totalAchievementCount,
+      }),
+    },
+  };
+
+  new Notification({
+    ...options,
+    toastXml: toXmlString(options),
+  }).show();
+
+  if (process.platform !== "linux") {
+    sound.play(achievementSoundPath);
+  }
+};

src/main/services/notifications/xml.ts

@@ -0,0 +1,79 @@
+export interface NotificationOptions {
+  title: string;
+  body?: string;
+  icon: string;
+  duration?: "short" | "long";
+  silent?: boolean;
+  progress?: {
+    status?: string;
+    value: number;
+    valueOverride: string;
+  };
+}
+
+function escape(string: string) {
+  return string.replace(/[<>&'"]/g, (match) => {
+    switch (match) {
+      case "<":
+        return "&lt;";
+      case ">":
+        return "&gt;";
+      case "&":
+        return "&amp;";
+      case "'":
+        return "&apos;";
+      case '"':
+        return "&quot;";
+      default:
+        return "";
+    }
+  });
+}
+
+function addAttributeOrTrim(name: string, value: string) {
+  return value ? `${name}="${value}" ` : "";
+}
+
+export function toXmlString(options: NotificationOptions) {
+  let template =
+    "<toast " +
+    `displayTimestamp="${new Date().toISOString()}" ` +
+    `scenario="default" ` +
+    `duration="${options.duration ?? "short"}" ` +
+    `activationType="protocol" ` +
+    ">";
+
+  //Visual
+  template += `<visual><binding template="ToastGeneric">`;
+  if (options.icon)
+    template += `<image placement="appLogoOverride" src="${options.icon}" hint-crop="none"/>`;
+  template +=
+    `<text><![CDATA[${options.title}]]></text>` +
+    `<text><![CDATA[${options.body}]]></text>`;
+
+  //Progress bar
+  if (options.progress) {
+    template +=
+      "<progress " +
+      `value="${options.progress.value}" ` +
+      `status="" ` +
+      addAttributeOrTrim(
+        "valueStringOverride",
+        escape(options.progress.valueOverride)
+      ) +
+      "/>";
+  }
+  template += "</binding></visual>";
+
+  //Actions
+  template += "<actions>";
+  template += "</actions>";
+
+  //Audio
+  template += "<audio " + `silent="true" ` + `loop="false" ` + "/>";
+
+  //EOF
+  template += "</toast>";
+
+  return template;
+}

src/main/services/window-manager.ts

@@ -20,7 +20,6 @@ import UserAgent from "user-agents";
 
 export class WindowManager {
   public static mainWindow: Electron.BrowserWindow | null = null;
-  public static notificationWindow: Electron.BrowserWindow | null = null;
 
   private static loadMainWindowURL(hash = "") {
     // HMR for renderer base on electron-vite cli.
@@ -39,21 +38,6 @@ export class WindowManager {
     }
   }
 
-  private static loadNotificationWindowURL() {
-    if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
-      this.notificationWindow?.loadURL(
-        `${process.env["ELECTRON_RENDERER_URL"]}#/achievement-notification`
-      );
-    } else {
-      this.notificationWindow?.loadFile(
-        path.join(__dirname, "../renderer/index.html"),
-        {
-          hash: "achievement-notification",
-        }
-      );
-    }
-  }
-
   public static createMainWindow() {
     if (this.mainWindow) return;
 
@@ -151,32 +135,6 @@ export class WindowManager {
     });
   }
 
-  public static createNotificationWindow() {
-    this.notificationWindow = new BrowserWindow({
-      transparent: true,
-      maximizable: false,
-      autoHideMenuBar: true,
-      minimizable: false,
-      focusable: false,
-      skipTaskbar: true,
-      frame: false,
-      width: 350,
-      height: 104,
-      x: 0,
-      y: 0,
-      webPreferences: {
-        preload: path.join(__dirname, "../preload/index.mjs"),
-        sandbox: false,
-      },
-    });
-    this.notificationWindow.setIgnoreMouseEvents(true);
-    // this.notificationWindow.setVisibleOnAllWorkspaces(true, {
-    //   visibleOnFullScreen: true,
-    // });
-    this.notificationWindow.setAlwaysOnTop(true, "screen-saver", 1);
-    this.loadNotificationWindowURL();
-  }
-
   public static openAuthWindow() {
     if (this.mainWindow) {
       const authWindow = new BrowserWindow({