From 41ef0164fd10aab53ffa9d391b3544c305c593a8 Mon Sep 17 00:00:00 2001
From: Aeywoo <65846594+Aeywoo@users.noreply.github.com>
Date: Thu, 9 May 2024 02:49:39 -0400
Subject: [PATCH 1/8] Update en.json

Clearer sentence structure, outlying why their credentials are required more clearly, how they are used and ensuring users are aware that their Steam credentials are only being used through DepotDownloader.
---
 assets/jsons/translations/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/jsons/translations/en.json b/assets/jsons/translations/en.json
index b185748e..887d27a1 100644
--- a/assets/jsons/translations/en.json
+++ b/assets/jsons/translations/en.json
@@ -550,8 +550,8 @@
         },
         "steam-credentials": {
             "title": "Steam Credentials",
-            "p-1": "The credentials are only used to download the game because steam need to verify that you paid the game in order to be allowed to download it. They aren't saved and directly passed to DepotDownloader. If you don't want to enter your credentials you can follow this tutorial :",
-            "p-2": "and then click on the gear icon in the top right corner and select \"Import a version\", select the folder where beat saber has been downloaded (If you follow the tutorial above you should have the correct location)"
+            "p-1": "Your Steam credentials are only required to download versions of Beat Saber, we use DepotDownloader to achieve this which requires your Steam credentials to verify that you own the game within your library before allowing you to retrieve the game files, your credentials are not stored or saved and are passed directly to DepotDownloader. However, if you don't want to do that, you can follow this tutorial instead: ",
+            "p-2": "Afterwards you can click on the gear icon in the top right corner and select \"Import a version\", then you can select the folder where Beat Saber was downloaded to. (If you followed the tutorial, you will have the right location)"
         },
         "bs-import-version": {
             "title": "Import a version",

From 576cd2dec59e9186376f64b323baf85dd2cac707 Mon Sep 17 00:00:00 2001
From: Elias Benbourenane <eliasbenbourenane@gmail.com>
Date: Tue, 14 May 2024 20:56:12 +0000
Subject: [PATCH 2/8] Initial test of a GH Actions build workflow

---
 .github/workflows/build.yaml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/workflows/build.yaml

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
new file mode 100644
index 00000000..2e9fbb1c
--- /dev/null
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,34 @@
+# This workflow will...
+
+name: Build
+
+on:
+    push:
+        branches: ["master"]
+    workflow_dispatch:
+
+jobs:
+    release:
+        runs-on: ${{ matrix.os }}
+
+        strategy:
+            matrix:
+                os: [windows-latest]
+
+        steps:
+            - name: Check out Git repository
+              uses: actions/checkout@v4
+
+            - name: Use Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 18.x
+                  cache: "npm"
+            - run: npm ci
+            - run: npm run package
+
+            - name: Upload artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: release
+                  path: release

From cbab039ca4858266bf6eee071fda01235f46ae15 Mon Sep 17 00:00:00 2001
From: MathieuG-P <40181755+Zagrios@users.noreply.github.com>
Date: Wed, 15 May 2024 16:46:56 +0200
Subject: [PATCH 3/8] add patreon

---
 assets/jsons/patreons.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/jsons/patreons.json b/assets/jsons/patreons.json
index 09dd6b90..39628dd0 100644
--- a/assets/jsons/patreons.json
+++ b/assets/jsons/patreons.json
@@ -86,5 +86,8 @@
     {
 		"username": "Stuijvi",
 		"type": "gold"
-	}
+	},
+    {
+        "username": "_ monaka"
+    }
 ]

From 7b7cdd55596c4bbf94f03e7a5339a94bf3d73b50 Mon Sep 17 00:00:00 2001
From: GaetanGrd <40648115+GaetanGrd@users.noreply.github.com>
Date: Wed, 15 May 2024 20:21:15 +0200
Subject: [PATCH 4/8] Update README.md

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0657d5e6..ed7a8ca0 100644
--- a/README.md
+++ b/README.md
@@ -287,13 +287,11 @@
 <div>
   <ul>
     <li><strong>via Oculus</strong>: For Oculus users, <a href="https://github.com/Zagrios/bs-manager">BSManager</a>
-      uses authentication directly via the <a href="https://about.meta.com/fr/">META</a> website
-      to retrieve the connection token, ensuring reliable and secure access to your account data.</li>
+      requires you to retrieve a connection token by following the instructions in this guide: <a href="https://github.com/Zagrios/bs-manager/wiki/How-to-obtain-your-Oculus-Token">How to obtain your Oculus Token</a>. Once obtained, please insert it into the form.</li>
   </ul>
 </div>
 
 <div align="center">
-  <img height=450 src="https://github.com/Zagrios/bs-manager/assets/40648115/1e4a2f98-af16-45aa-821d-0c4e90e1e54b" />
   <img height=450 src="https://github.com/Zagrios/bs-manager/assets/40648115/3674e629-542d-4de3-b8db-b248f25126d7" />
 </div>
 

From aad4cb9a2e3b616ecbfd5568be5536568ad86150 Mon Sep 17 00:00:00 2001
From: GaetanGrd <40648115+GaetanGrd@users.noreply.github.com>
Date: Sat, 18 May 2024 19:12:06 +0200
Subject: [PATCH 5/8] =?UTF-8?q?Add=20website=20bouton=20=F0=9F=91=80and=20?=
 =?UTF-8?q?update=20twitter=20logo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ed7a8ca0..8bab5b11 100644
--- a/README.md
+++ b/README.md
@@ -57,10 +57,12 @@
   <a href="https://discord.gg/uSqbHVpKdV"><img
       src="https://img.shields.io/badge/-DISCORD-5865f2?style=for-the-badge&logo=discord&logoColor=ffffff"
       alt="discord" /></a>
-  <a href="https://www.patreon.com/bsmanager"><img
-      src="https://img.shields.io/badge/-🥰%20Support%20BSM-EC4546?style=for-the-badge" alt="Donation" /></a>
   <a href="https://twitter.com/BSManager_"><img
-      src="https://img.shields.io/badge/-Twitter-F5F8FA?style=for-the-badge&logo=Twitter" alt="Twitter" /></a>
+      src="https://img.shields.io/badge/-Twitter-black?style=for-the-badge&logo=X" alt="Twitter" /></a> 
+<a href="https://www.bsmanager.io">
+  <img src="https://img.shields.io/badge/-WebSite-00649c?style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAwIDEwMDAiPgogIDxnIGZpbGw9IiMzYjgyZmYiPgogICAgPHBhdGggZD0ibTYyNi43NSA0ODUuOTEgMjAuODIgMzUxLjk0YTM1LjIxIDM1LjIxIDAgMCAxLTE1LjQ5IDMxLjM2bC0xNDQuNzEgOTYuMTRoLS4wNmEzNS41NiAzNS41NiAwIDAgMS0xMS4zMSA0Ljc3IDM0Ljg1IDM0Ljg1IDAgMCAxLTIzLjUxLTIuODdMMTM2LjU4IDgwOS45YTExNS40NSAxMTUuNDUgMCAwIDEtNjMuNzUtOTYuNDlMNTIgMzYxLjQ2YTM1LjI2IDM1LjI2IDAgMCAxIDE1LjIzLTMxLjIxbDE0NS4wNS05Ni4zNmEzNS43MiAzNS43MiAwIDAgMSAxMS4yNy00LjcgMzQuODcgMzQuODcgMCAwIDEgMjMuNTEgMi44N0w1NjMgMzg5LjQyYTExNS40MSAxMTUuNDEgMCAwIDEgNjMuNzUgOTYuNDlaIi8+CiAgICA8cGF0aCBmaWx0ZXI9ImJyaWdodG5lc3MoMzAlKSIgZD0ibTYxMy43OCA0ODYuNjcgMjAuODIgMzUyYTIyLjM0IDIyLjM0IDAgMCAxLTMyLjI2IDIxLjMxTDI4Ni40IDcwMi41N0ExMDIuNDMgMTAyLjQzIDAgMCAxIDIyOS44MyA2MTdMMjA5IDI2NWEyMi4zNSAyMi4zNSAwIDAgMSAzMi4yNi0yMS4zMkw1NTcuMiA0MDEuMDVhMTAyLjQyIDEwMi40MiAwIDAgMSA1Ni41OCA4NS42MloiLz4KICA8L2c+CiAgPHBhdGggZD0iTTcxOC4yOSA3NzYuNDggNzAwIDgwNC4xOGMtNDAuNjMgMzkuNS04Ny4wNiA2Ny4yNS0xMzMuODEgOTAuNzUtODcuMzIgNDMuOS0yMDMuNjcgNzcuMTktMjQ5IDkwLjM0YTQ4IDQ4IDAgMCAxLTI2LjE3LjE2Yy02NC0xNy43Mi0xODguNjItNzItMjM2LjI4LTEyNS40OWE0LjIzIDQuMjMgMCAwIDEgNS4zLTYuNDVjMzUuNjQgMjAuODcgMTExLjIyIDU3LjY0IDE1Ni4zNyA3NC4yMiA0OS4xOCAxOC4wNiA4MS4yOSA4Ljc0IDkyLjI4LTMuMjZhNC43NyA0Ljc3IDAgMCAxIDcuMjQuMjFjMTkuNTEgMjQgMTA3LjI2IDQuNiAxNjYuNjQtMTMgNjQuMzQtMTkgMTg1Ljg1LTc2LjU2IDIzNS43Mi0xMzUuMThabS0xOTYuMiAxNTcuMzMtMTQ3LjQ1IDU1LjY4YTMuOTIgMy45MiAwIDAgMCAxLjQ0IDcuNThsNTQuNjItLjc3YTM1LjYzIDM1LjYzIDAgMCAwIDE5LTUuNzlsNzYtNDkuNTVhNCA0IDAgMCAwLTMuNjEtNy4xNVpNMjE4LjkyIDE5NS41NmMtMjEuMTQuMDctMzMuNTUgMzUuODYtMzMuMTYgODkuMDguMiAyOCAyLjU4IDkyLjc0IDQuNzkgMTQ3LjczLjIzIDUuNzEtOC4xOCA2LjQ4LTkgLjgxbC0zOC40Mi0yNzAuNzFhNC4zOCA0LjM4IDAgMCAxIDcuMTItNCA2My42MyA2My42MyAwIDAgMCAyMS45MyAxMS44NSA0LjYxIDQuNjEgMCAwIDAgNS45LTMuNzJjNC4yLTI3LjcgMTYuNjMtNTguNzQgMzcuMzUtODguNzRhNC4zNiA0LjM2IDAgMCAxIDcuNTYuNjljMTAuODYgMjMuODcgNDkgMTAzLjggOTMuMzQgMTUyLjc5YTQuNjUgNC42NSAwIDAgMS01LjYyIDcuMjJjLTM2LjU3LTE5LjM4LTgzLjAxLTQzLjAyLTkxLjc5LTQzWm0tMTUuNDcgMzg0LjhhNC41MSA0LjUxIDAgMCAxLTQuNDYtMy45MmwtMTMuODItMTA3LjI5YTQuNSA0LjUgMCAwIDEgOC45My0xLjE1bDEzLjgyIDEwNy4yOWE0LjUgNC41IDAgMCAxLTMuODkgNSAzLjg2IDMuODYgMCAwIDEtLjU4LjA3Wk01NzcuMDggNTQuNThjLTQ2Ljc5IDE1Ljg1LTExNS40NSA0MC41Ni0xNTguNzMgNjIuNzlhMzUuNSAzNS41IDAgMCAwLTE4LjU3IDI0LjUzYy0zLjk1IDE5LjQ5LTExIDU2LjA5LTE5IDEwNy4yNi0uNyA0LjQ4LTcuMzYgMy43OC03LjExLS43NWwxMC42Ni0xOTQuNzNhMy43OCAzLjc4IDAgMCAxIDcuNDYtLjY2bDMuNDkgMTQuODVhMi41NyAyLjU3IDAgMCAwIDQuNjkuNzdjNi4xOC0xMCAyMi4zNy0zMi43OSA1Ny4zMi02NWE0LjEzIDQuMTMgMCAwIDEgNi41NiA0LjcybC0zMi41NCA3Mi44OXM3OC43OC0xOS4zNyAxNDQtMzMuMDljNC4xMS0uODcgNS42OSA1LjA4IDEuNzcgNi40MloiIGZpbGw9IiNmZmYiIHN0cm9rZT0iYmxhY2siLz4KICA8ZyBmaWxsPSIjZjQ0Ij4KICAgIDxwYXRoIGZpbHRlcj0iYnJpZ2h0bmVzcyg2MCUpIHNhdHVyYXRlKDEyMCUpIiBkPSJtOTQ3LjA3IDQxMC4zNS01Ny43NSAzNDcuNzlhMzUuMTggMzUuMTggMCAwIDEtMjIuMDYgMjcuMTVsLTE2Mi40MyA2MS42NWgtLjA2YTM1LjUyIDM1LjUyIDAgMCAxLTEyLjA2IDIuMTEgMzQuODMgMzQuODMgMCAwIDEtMjIuMjktOGwtMjczLjE3LTIyMy41YTExNS40MyAxMTUuNDMgMCAwIDEtNDAuNzYtMTA4LjIybDU3Ljc1LTM0Ny44QTM1LjI1IDM1LjI1IDAgMCAxIDQzNiAxMzQuNDdsMTYyLjgzLTYxLjc5YTM1LjUxIDM1LjUxIDAgMCAxIDEyLTIuMDggMzQuODMgMzQuODMgMCAwIDEgMjIuMjkgOGwyNzMuMTkgMjIzLjUyYTExNS4zOCAxMTUuMzggMCAwIDEgNDAuNzYgMTA4LjIzWiIvPgogICAgPHBhdGggZD0iTTkzNC4yNSA0MDguMjIgODc2LjUgNzU2YTIyLjM0IDIyLjM0IDAgMCAxLTM2LjE4IDEzLjYzbC0yNzMuMTctMjIzLjVhMTAyLjQyIDEwMi40MiAwIDAgMS0zNi4xNy05Nmw1Ny43NS0zNDcuODNhMjIuMzQgMjIuMzQgMCAwIDEgMzYuMTgtMTMuNjNsMjczLjE3IDIyMy41MWExMDIuNDIgMTAyLjQyIDAgMCAxIDM2LjE3IDk2LjA0WiIvPgogIDwvZz4KICA8ZWxsaXBzZSBmaWxsPSIjZmZmIiBzdHJva2U9ImJsYWNrIiBjeD0iNzMyLjYxIiBjeT0iNDI5LjE2IiByeD0iNjIuODMiIHJ5PSIxMTAuNzMiIHRyYW5zZm9ybT0icm90YXRlKC0xNS40NSA3MzIuNzAzIDQyOS4xOTkpIi8+Cjwvc3ZnPg=="  alt="Website" /></a>
+  <a href="https://www.patreon.com/bsmanager"><img
+      src="https://img.shields.io/badge/-🤍%20Support%20BSM-EC4546?style=for-the-badge" alt="Donation" /></a>
 </div>
 
 <!--

From 28f0a4d8c6dbc74a91fd853e050e0cc8a60dad7e Mon Sep 17 00:00:00 2001
From: Zagrios <40181755+Zagrios@users.noreply.github.com>
Date: Sun, 19 May 2024 10:49:10 +0200
Subject: [PATCH 6/8] [bugfix-450] fix crash due to wrong app version on Linux

---
 package.json                 | 1 +
 src/renderer/windows/App.tsx | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ed824b0f..0d563201 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
     "name": "bs-manager",
     "description": "Manage maps, mods and more for Beat Saber",
     "main": "./src/main/main.ts",
+    "version": "1.5.0",
     "scripts": {
         "build-rust-scripts": "node -r esbuild-register ./.erb/scripts/build-rust-scripts.js",
         "build": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
diff --git a/src/renderer/windows/App.tsx b/src/renderer/windows/App.tsx
index 6ea15823..9b542008 100644
--- a/src/renderer/windows/App.tsx
+++ b/src/renderer/windows/App.tsx
@@ -23,7 +23,7 @@ import { ConfigurationService } from "renderer/services/configuration.service";
 import { OsDiagnosticService } from "renderer/services/os-diagnostic.service";
 import { useService } from "renderer/hooks/use-service.hook";
 import { AutoUpdaterService } from "renderer/services/auto-updater.service";
-import { gt } from "semver"
+import { gt, parse } from "semver"
 
 export default function App() {
     useService(OsDiagnosticService);
@@ -49,7 +49,7 @@ export default function App() {
 
         autoUpdater.setLastAppVersion(appVersion);
 
-        if (lastAppVersion && gt(appVersion, lastAppVersion)) {
+        if (parse(lastAppVersion) && gt(appVersion, lastAppVersion)) {
             autoUpdater.showChangelog(appVersion);
         }
     };

From 69e573a12cb0044cffea25dd8083cc09aeb8aec6 Mon Sep 17 00:00:00 2001
From: MathieuG-P <40181755+Zagrios@users.noreply.github.com>
Date: Sun, 19 May 2024 20:07:58 +0200
Subject: [PATCH 7/8] Revert "[chore] use winhttp.dll to detect bsipa
 installation"

---
 src/main/services/mods/bs-mods-manager.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/services/mods/bs-mods-manager.service.ts b/src/main/services/mods/bs-mods-manager.service.ts
index c465c3bc..42b5add8 100644
--- a/src/main/services/mods/bs-mods-manager.service.ts
+++ b/src/main/services/mods/bs-mods-manager.service.ts
@@ -112,7 +112,7 @@ export class BsModsManagerService {
 
     private async getBsipaInstalled(version: BSVersion): Promise<Mod> {
         const bsPath = await this.bsLocalService.getVersionPath(version);
-        const injectorPath = path.join(bsPath, "IPA", "winhttp.dll");
+        const injectorPath = path.join(bsPath, "Beat Saber_Data", "Managed", "IPA.Injector.dll");
         if (!(await pathExist(injectorPath))) {
             return undefined;
         }

From 32f03eaaa2f569917b01a5e67c138900a748ed84 Mon Sep 17 00:00:00 2001
From: MathieuG-P <40181755+Zagrios@users.noreply.github.com>
Date: Mon, 20 May 2024 21:43:11 +0200
Subject: [PATCH 8/8] [bugfix] Fix the issue where the launch shortcut window
 never closes after launching BS

---
 .../bs-launcher/abstract-launcher.service.ts  | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/services/bs-launcher/abstract-launcher.service.ts b/src/main/services/bs-launcher/abstract-launcher.service.ts
index b5827999..7dfb4946 100644
--- a/src/main/services/bs-launcher/abstract-launcher.service.ts
+++ b/src/main/services/bs-launcher/abstract-launcher.service.ts
@@ -3,6 +3,7 @@ import { BSLocalVersionService } from "../bs-local-version.service";
 import { ChildProcessWithoutNullStreams, SpawnOptionsWithoutStdio, spawn } from "child_process";
 import path from "path";
 import log from "electron-log";
+import { sToMs } from "shared/helpers/time.helpers";
 
 export abstract class AbstractLauncherService {
 
@@ -46,20 +47,40 @@ export abstract class AbstractLauncherService {
 
     }
 
-    protected launchBs(bsExePath: string, args: string[], options?: SpawnOptionsWithoutStdio): {process: ChildProcessWithoutNullStreams, exit: Promise<number>} {
+    protected launchBs(bsExePath: string, args: string[], options?: SpawnBsProcessOptions): {process: ChildProcessWithoutNullStreams, exit: Promise<number>} {
         const process = this.launchBSProcess(bsExePath, args, options);
 
+        let timoutId: NodeJS.Timeout;
+
         const exit = new Promise<number>((resolve, reject) => {
+
             process.on("error", (err) => {
                 log.error(`Error while launching BS`, err);
                 reject(err);
             });
+
             process.on("exit", (code) => {
                 log.info(`BS process exit with code ${code}`);
                 resolve(code);
             });
+
+            const unrefAfter = options?.unrefAfter ?? sToMs(10);
+
+            timoutId = setTimeout(() => {
+                log.error("BS process unref after timeout", unrefAfter);
+                process.unref();
+                process.removeAllListeners();
+                resolve(-1);
+            }, unrefAfter);
+
+        }).finally(() => {
+            clearTimeout(timoutId);
         });
 
         return { process, exit };
     }
 }
+
+export type SpawnBsProcessOptions = {
+    unrefAfter?: number;
+} & SpawnOptionsWithoutStdio;