Merge branch 'main' into hyd-228-investigate-why-users-are-being-logged-out-when-updating

# Conflicts:
#	src/main/events/user-preferences/auto-launch.ts

src/main/events/auth/sign-out.ts

@@ -1,6 +1,6 @@
 import { registerEvent } from "../register-event";
 import * as Sentry from "@sentry/electron/main";
-import { HydraApi, TorrentDownloader, gamesPlaytime } from "@main/services";
+import { HydraApi, PythonInstance, gamesPlaytime } from "@main/services";
 import { dataSource } from "@main/data-source";
 import { DownloadQueue, Game, UserAuth } from "@main/entity";
 
@@ -24,7 +24,7 @@ const signOut = async (_event: Electron.IpcMainInvokeEvent) => {
   Sentry.setUser(null);
 
   /* Disconnects libtorrent */
-  TorrentDownloader.kill();
+  PythonInstance.killTorrent();
 
   await Promise.all([
     databaseOperations,

src/main/events/library/close-game.ts

@@ -1,39 +1,45 @@
-import path from "node:path";
-
 import { gameRepository } from "@main/repository";
-import { getProcesses } from "@main/helpers";
-
 import { registerEvent } from "../register-event";
+import { PythonInstance, logger } from "@main/services";
+import sudo from "sudo-prompt";
+import { app } from "electron";
+
+const getKillCommand = (pid: number) => {
+  if (process.platform == "win32") {
+    return `taskkill /PID ${pid}`;
+  }
+
+  return `kill -9 ${pid}`;
+};
 
 const closeGame = async (
   _event: Electron.IpcMainInvokeEvent,
   gameId: number
 ) => {
-  const processes = await getProcesses();
+  const processes = await PythonInstance.getProcessList();
   const game = await gameRepository.findOne({
     where: { id: gameId, isDeleted: false },
   });
 
-  if (!game) return false;
-
-  const executablePath = game.executablePath!;
-
-  const basename = path.win32.basename(executablePath);
-  const basenameWithoutExtension = path.win32.basename(
-    executablePath,
-    path.extname(executablePath)
-  );
+  if (!game) return;
 
   const gameProcess = processes.find((runningProcess) => {
-    if (process.platform === "win32") {
-      return runningProcess.name === basename;
-    }
-
-    return [basename, basenameWithoutExtension].includes(runningProcess.name);
+    return runningProcess.exe === game.executablePath;
   });
 
-  if (gameProcess) return process.kill(gameProcess.pid);
-  return false;
+  if (gameProcess) {
+    try {
+      process.kill(gameProcess.pid);
+    } catch (err) {
+      sudo.exec(
+        getKillCommand(gameProcess.pid),
+        { name: app.getName() },
+        (error, _stdout, _stderr) => {
+          logger.error(error);
+        }
+      );
+    }
+  }
 };
 
 registerEvent("closeGame", closeGame);

src/main/events/library/create-game-shortcut.ts

@@ -4,6 +4,7 @@ import { IsNull, Not } from "typeorm";
 import createDesktopShortcut from "create-desktop-shortcuts";
 import path from "node:path";
 import { app } from "electron";
+import { removeSymbolsFromName } from "@shared";
 
 const createGameShortcut = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -22,7 +23,7 @@ const createGameShortcut = async (
 
     const options = {
       filePath,
-      name: game.title,
+      name: removeSymbolsFromName(game.title),
     };
 
     return createDesktopShortcut({

src/main/events/user-preferences/auto-launch.ts

@@ -1,9 +1,6 @@
-import { windowsStartupPath } from "@main/constants";
 import { registerEvent } from "../register-event";
 import AutoLaunch from "auto-launch";
 import { app } from "electron";
-import fs from "node:fs";
-import path from "node:path";
 
 const autoLaunch = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -15,23 +12,10 @@ const autoLaunch = async (
     name: app.getName(),
   });
 
-  if (process.platform == "win32") {
-    const destination = path.join(windowsStartupPath, "Hydra.vbs");
-
-    if (enabled) {
-      const scriptPath = path.join(process.resourcesPath, "hydralauncher.vbs");
-
-      fs.copyFileSync(scriptPath, destination);
-    } else {
-      appLauncher.disable().catch(() => {});
-      fs.rmSync(destination);
-    }
+  if (enabled) {
+    appLauncher.enable().catch(() => {});
   } else {
-    if (enabled) {
-      appLauncher.enable().catch(() => {});
-    } else {
-      appLauncher.disable().catch(() => {});
-    }
+    appLauncher.disable().catch(() => {});
   }
 };