bumb to 1.4.5

[bugfix-416] Wait for SteamVR folder rename before exit

assets/jsons/bs-versions.json

@@ -681,5 +681,14 @@
 		"ReleaseImg": "https://clan.akamai.steamstatic.com/images/32055887/ae11d195bbe41a0f244d7b4d055a0ab89f88e5bb.png",
 		"ReleaseDate": "1702309893",
 		"year": "2023"
+	},
+    {
+		"BSVersion": "1.34.5",
+		"BSManifest": "7413405154512822201",
+		"OculusBinaryId": "6639053626194360",
+		"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/4036983137766828694",
+		"ReleaseImg": "https://clan.cloudflare.steamstatic.com/images/32055887/925e60f14c6815f7617fde11a894ed20f54a0846.png",
+		"ReleaseDate": "1707745958",
+		"year": "2024"
 	}
 ]

assets/jsons/patreons.json

@@ -68,7 +68,16 @@
 		"type": "diamond",
 		"link": "https://www.youtube.com/@lumberjack462"
 	},
-  {
+    {
 		"username": "Xero"
+	},
+    {
+		"username": "Minescence"
+	},
+    {
+		"username": "Finlay"
+	},
+    {
+		"username": "mereknom"
 	}
 ]

release/app/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "bs-manager",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "bs-manager",
-      "version": "1.4.3",
+      "version": "1.4.4",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bs-manager",
-  "version": "1.4.4-alpha.2",
+  "version": "1.4.5",
   "description": "BSManager",
   "main": "./dist/main/main.js",
   "author": {

src/main/ipcs/bs-launcher-ipcs.ts

@@ -6,6 +6,7 @@ import { from } from "rxjs";
 import { SteamLauncherService } from "../services/bs-launcher/steam-launcher.service";
 import { OculusLauncherService } from "../services/bs-launcher/oculus-launcher.service";
 import { SteamService } from "../services/steam.service";
+import log from "electron-log";
 import isElevated from "is-elevated";
 
 const ipc = IpcService.getInstance();
@@ -19,9 +20,12 @@ ipc.on<boolean>("bs-launch.need-start-as-admin", (_, reply) => {
     const steam = SteamService.getInstance();
     reply(from(isElevated().then(elevated => {
         if(elevated){ return false; }
-        return steam.isElevated();
+        return steam.isElevated().catch(e => {
+            log.error("Error while checking if Steam is running as admin", e);
+            return false;
+        });
     })));
-})
+});
 
 ipc.on<LaunchOption>("create-launch-shortcut", (req, reply) => {
     const bsLauncher = BSLauncherService.getInstance();

src/main/services/bs-launcher/oculus-launcher.service.ts

@@ -11,6 +11,7 @@ import { AbstractLauncherService } from "./abstract-launcher.service";
 import { taskRunning } from "../../helpers/os.helpers";
 import { CustomError } from "../../../shared/models/exceptions/custom-error.class";
 import { InstallationLocationService } from "../installation-location.service";
+import { ensurePathNotAlreadyExist } from "../../helpers/fs.helpers";
 
 export class OculusLauncherService extends AbstractLauncherService implements StoreLauncherInterface {
 
@@ -86,7 +87,7 @@ export class OculusLauncherService extends AbstractLauncherService implements St
     private async backupOriginalBeatSaber(): Promise<void>{
         const bsFolder = await this.oculus.getGameFolder(OCULUS_BS_DIR);
         if(!bsFolder){ return; }
-        const backupPath = path.join(bsFolder, "..", OCULUS_BS_BACKUP_DIR);
+        const backupPath = await ensurePathNotAlreadyExist(path.join(bsFolder, "..", OCULUS_BS_BACKUP_DIR));
         log.info("Backing up original Beat Saber", bsFolder, backupPath);
         return rename(bsFolder, backupPath);
     }

src/main/services/bs-launcher/steam-launcher.service.ts

@@ -123,13 +123,16 @@ export class SteamLauncherService extends AbstractLauncherService implements Sto
                 })
             );
 
-            await launchPromise.then(exitCode => {
+            try {
+                const exitCode = await launchPromise;
                 log.info("BS process exit code", exitCode);
-            }).catch(err => {
+            }
+            catch(err: any) {
                 throw CustomError.fromError(err, BSLaunchError.BS_EXIT_ERROR);
-            }).finally(() => {
-                this.restoreSteamVR().catch(log.error);
-            });
+            }
+            finally {
+                await this.restoreSteamVR().catch(log.error);
+            }
 
         })().then(() => {
             obs.complete();

src/main/services/liv/liv.service.ts

@@ -1,8 +1,9 @@
 import { execOnOs } from "../../helpers/env.helpers";
-import { list, createKey, putValue, deleteKey, RegSzValue } from "regedit-rs";
 import path from "path";
 import { Log } from "../../decorators/log.decorator";
 
+const { list, createKey, putValue, deleteKey, RegSzValue } = (execOnOs({ win32: () => require("regedit-rs") }, true) ?? {}) as typeof import("regedit-rs");
+
 export class LivService {
 
     private static instance: LivService;

src/main/services/oculus.service.ts

@@ -1,4 +1,3 @@
-import { list } from "regedit-rs";
 import path from "path";
 import { pathExist, resolveGUIDPath } from "../helpers/fs.helpers";
 import log from "electron-log";
@@ -7,6 +6,9 @@ import { tryit } from "../../shared/helpers/error.helpers";
 import { shell } from "electron";
 import { taskRunning } from "../helpers/os.helpers";
 import { sToMs } from "../../shared/helpers/time.helpers";
+import { execOnOs } from "../helpers/env.helpers";
+
+const { list } = (execOnOs({ win32: () => require("regedit-rs") }, true) ?? {}) as typeof import("regedit-rs");
 
 export class OculusService {
     private static instance: OculusService;

src/main/services/steam.service.ts

@@ -1,4 +1,4 @@
-import { list, RegDwordValue } from "regedit-rs"
+import { RegDwordValue } from "regedit-rs"
 import path from "path";
 import { parse } from "@node-steam/vdf";
 import { readFile } from "fs/promises";
@@ -7,6 +7,9 @@ import log from "electron-log";
 import { app, shell } from "electron";
 import { getProcessPid, taskRunning } from "../helpers/os.helpers";
 import { isElevated } from "query-process";
+import { execOnOs } from "../helpers/env.helpers";
+
+const { list } = (execOnOs({ win32: () => require("regedit-rs") }, true) ?? {}) as typeof import("regedit-rs");
 
 export class SteamService {
 
@@ -43,6 +46,11 @@ export class SteamService {
         return getProcessPid(SteamService.PROCESS_NAME);
     }
 
+    /**
+     * Check if the Steam process is running as administrator
+     * @throws Can throw an error if the Steam process is running as admin
+     * @returns true if the Steam process is running as administrator
+     */
     public async isElevated(): Promise<boolean>{
         if(process.platform === "linux"){ return true; }
         const steamPid = await this.getSteamPid();