Merge branch 'v1.5.0' into feature/playlists/107

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

@@ -36,10 +36,3 @@ ipc.on<void>("bs-launch.restore-steamvr", (_, reply) => {
     const steamLauncher = SteamLauncherService.getInstance();
     reply(from(steamLauncher.restoreSteamVR()));
 });
-
-ipc.on<void>("restore-original-oculus-folder", (_, reply) => {
-    const oculusLauncher = OculusLauncherService.getInstance();
-    reply(from(
-        oculusLauncher.deleteBsSymlinks().then(() => oculusLauncher.restoreOriginalBeatSaber())
-    ));
-});

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

@@ -5,9 +5,9 @@ import path from "path";
 import log from "electron-log";
 
 export abstract class AbstractLauncherService {
-    
+
     protected readonly localVersions = BSLocalVersionService.getInstance();
-    
+
     constructor(){
         this.localVersions = BSLocalVersionService.getInstance();
     }
@@ -46,18 +46,20 @@ export abstract class AbstractLauncherService {
 
     }
 
-    protected launchBs(bsExePath: string, args: string[], options?: SpawnOptionsWithoutStdio): Promise<number> {
-        return new Promise<number>((resolve, reject) => {
-            const bsProcess = this.launchBSProcess(bsExePath, args, options);
+    protected launchBs(bsExePath: string, args: string[], options?: SpawnOptionsWithoutStdio): {process: ChildProcessWithoutNullStreams, exit: Promise<number>} {
+        const process = this.launchBSProcess(bsExePath, args, options);
 
-            bsProcess.on("error", reject);
-            bsProcess.on("exit", resolve);
-
-            setTimeout(() => {
-                bsProcess.removeAllListeners("error");
-                bsProcess.removeAllListeners("exit");
-                resolve(-1);
-            }, 30_000);
+        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);
+            });
         });
+
+        return { process, exit };
     }
-}
+}

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

@@ -12,6 +12,9 @@ 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";
+import { UtilsService } from "../utils.service";
+import { spawn } from "child_process";
+import { tryit } from "../../../shared/helpers/error.helpers";
 
 export class OculusLauncherService extends AbstractLauncherService implements StoreLauncherInterface {
 
@@ -26,6 +29,7 @@ export class OculusLauncherService extends AbstractLauncherService implements St
 
     private readonly oculus: OculusService;
     private readonly pathsService: InstallationLocationService;
+    private readonly util: UtilsService;
 
     private readonly oculusLib$ = new ReplaySubject<string>();
 
@@ -33,6 +37,7 @@ export class OculusLauncherService extends AbstractLauncherService implements St
         super();
         this.oculus = OculusService.getInstance();
         this.pathsService = InstallationLocationService.getInstance();
+        this.util = UtilsService.getInstance();
 
         this.oculus.tryGetGameFolder([OCULUS_BS_DIR, OCULUS_BS_BACKUP_DIR]).then(async dirPath => {
             if(dirPath){
@@ -100,6 +105,15 @@ export class OculusLauncherService extends AbstractLauncherService implements St
         return rename(bsFolderBackupPath, originalPath);
     }
 
+    private launchSymlinkCleaner(pid: number, symlinkPath: string){
+
+        log.info("Launch Symlink Cleaner", pid, symlinkPath);
+
+        const exeName = "oculus_symlink_cleaner.exe";
+        const scriptPath = this.util.getAssetsScriptsPath();
+        spawn(path.join(scriptPath, exeName), [`${pid}`, symlinkPath], { detached: true, stdio: "ignore" });
+    }
+
     public launch(launchOptions: LaunchOption): Observable<BSLaunchEventData> {
 
         const prepareOriginalVersion: () => Promise<string> = async () => {
@@ -157,7 +171,16 @@ export class OculusLauncherService extends AbstractLauncherService implements St
                 obs.next({type: BSLaunchEvent.BS_LAUNCHING});
 
                 // Launch Beat Saber
-                return this.launchBs(exePath, this.buildBsLaunchArgs(launchOptions)).catch(err => {
+                const process = this.launchBs(exePath, this.buildBsLaunchArgs(launchOptions));
+
+                if(launchOptions.version.oculus !== true && process?.process?.pid){
+                    const { error } = tryit(() => this.launchSymlinkCleaner(process.process.pid, bsPath));
+                    if(error){
+                        log.error("Error while launching symlink cleaner", error);
+                    }
+                }
+
+                return process.exit.catch(err => {
                     throw CustomError.fromError(err, BSLaunchError.BS_EXIT_ERROR);
                 });
 

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

@@ -107,7 +107,7 @@ export class SteamLauncherService extends AbstractLauncherService implements Sto
             obs.next({type: BSLaunchEvent.BS_LAUNCHING});
 
             const launchPromise = !launchOptions.admin ? (
-                this.launchBs(exePath, launchArgs, { env: {...process.env, "SteamAppId": BS_APP_ID} })
+                this.launchBs(exePath, launchArgs, { env: {...process.env, "SteamAppId": BS_APP_ID} }).exit
             ) : (
                 new Promise<number>(resolve => {
                     const adminProcess = exec(`"${this.getStartBsAsAdminExePath()}" "${exePath}" ${launchArgs.join(" ")}`, { env: {...process.env, "SteamAppId": BS_APP_ID} });
@@ -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/installation-location.service.ts

@@ -1,7 +1,8 @@
 import path from "path";
 import { app } from "electron";
 import ElectronStore from "electron-store";
-import { copyDirectoryWithJunctions, deleteFolder, ensureFolderExist } from "../helpers/fs.helpers";
+import { copyDirectoryWithJunctions, deleteFolder, ensureFolderExist, pathExist } from "../helpers/fs.helpers";
+import { tryit } from "../../shared/helpers/error.helpers";
 import { pathExistsSync } from "fs-extra";
 
 export class InstallationLocationService {
@@ -69,8 +70,8 @@ export class InstallationLocationService {
                 return this.installPathConfig.get(this.STORE_INSTALLATION_PATH_KEY) as string;
             }
 
-            const oldPath = path.join(app.getPath("documents"), this.INSTALLATION_FOLDER);
-            if(pathExistsSync(oldPath)){
+            const { result: oldPath } = tryit(() => path.join(app.getPath("documents"), this.INSTALLATION_FOLDER));
+            if(oldPath && pathExistsSync(oldPath)){
                 return app.getPath("documents");
             }