[chore] npm i

.editorconfig

@@ -2,7 +2,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

.eslintrc.js

@@ -46,12 +46,7 @@ module.exports = {
         "react/prop-types": "off",
         "import/no-cycle": "off",
         "prefer-promise-reject-errors": "off",
-        "react/jsx-no-target-blank": "off",
-        "@typescript-eslint/ban-types": ["error", {
-            types: {
-                Function: false,
-            }
-        }]
+        "react/jsx-no-target-blank": "off"
     },
     parserOptions: {
         ecmaVersion: 2020,

.github/workflows/e2e-tests.yaml

@@ -0,0 +1,48 @@
+name : e2e-tests
+
+on:
+    push:
+        branches: ["master"]
+    pull_request:
+        branches: ["master"]
+    workflow_dispatch:
+
+jobs:
+    e2e-tests-windows:
+        runs-on: windows-latest
+
+        steps:
+            - name: Cleanup files
+              run: cmd /r dir
+            
+            - name: Checkout
+              uses: actions/checkout@v3
+
+            - name: Use Node.js
+              uses: actions/setup-node@v3
+              with:
+                  node-version: 18.x
+                  cache: "npm"
+
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Install Playwright deps
+              run: npx playwright install --with-deps
+            
+            - name: Build
+              run: npm run build
+
+            - name: Package
+              run: npm exec -c 'electron-builder build --publish "never" --win --x64'
+            
+            - name: Run e2e tests
+              run: npm run e2e-test-ci
+            
+            - name: Upload test results
+              if: always()
+              uses: actions/upload-artifact@v3
+              with:
+                  name: playwright-output
+                  path: test-results/
+

.gitignore

@@ -28,5 +28,4 @@ npm-debug.log.*
 *.sass.d.ts
 *.scss.d.ts
 
-# externals
-externals/bs-admin-start/target/*
+test-results

assets/jsons/patreons.json

@@ -67,11 +67,5 @@
 		"username": "Lumberjack462",
 		"type": "diamond",
 		"link": "https://www.youtube.com/@lumberjack462"
-	},
-    {
-		"username": "Xero"
-	},
-    {
-		"username": "Minescence"
 	}
-]
+]

assets/jsons/translations/de.json

@@ -719,16 +719,6 @@
                 "enter-oculus-token": "Ein Oculus-Token eingeben"
             },
             "valid-btn": "Validieren"
-        },
-        "launch-as-admin": {
-            "title": "Administratorberechtigungen",
-            "body": {
-                "info": "Es wurde festgestellt, dass Steam mit Administratorrechten ausgeführt wird. Um mit Steam zu kommunizieren, muss auch Beat Saber als Administrator gestartet werden. Andernfalls könnte Beat Saber Probleme haben und nach dem Starten schließen.",
-                "info-2": "Das Starten von Beat Saber im Administratormodus gibt auch den installierten Mods Administratorrechte. Daher wird empfohlen, Steam ohne Administratorrechte neu zu starten.",
-                "info-3": "Beachten Sie, dass es nicht ratsam ist, Steam Administratorrechte zu geben, da dies auch die installierten Spiele und Mods betrifft und ein Sicherheitsrisiko darstellt."
-            },
-            "launch-as-admin": "Als Administrator starten",
-            "not-remind-me": "Nicht mehr erinnern"
         }
     },
     "maps": {

assets/jsons/translations/en.json

@@ -719,16 +719,6 @@
                 "enter-oculus-token": "Enter an Oculus token"
             },
             "valid-btn": "Validate"
-        },
-        "launch-as-admin": {
-            "title": "Administrator Permissions",
-            "body": {
-                "info": "Steam has been detected as running with administrator permissions. To communicate with Steam, Beat Saber must also be launched as an administrator. Otherwise, Beat Saber might experience problems and close after launching.",
-                "info-2": "Launching Beat Saber in administrator mode will also give administrator rights to the installed mods. Therefore, it is recommended to restart Steam without administrator permissions.",
-                "info-3": "Note that it is advised against giving administrator rights to Steam, as this affects the installed games and mods, presenting a security risk."
-            },
-            "launch-as-admin": "Launch as Administrator",
-            "not-remind-me": "Do not remind me"
         }
     },
     "maps": {

assets/jsons/translations/es.json

@@ -719,16 +719,6 @@
                 "enter-oculus-token": "Introducir un token de Oculus"
             },
             "valid-btn": "Validar"
-        },
-        "launch-as-admin": {
-            "title": "Permisos Administrador",
-            "body": {
-                "info": "Se ha detectado que Steam está funcionando con permisos de administrador. Para comunicarse con Steam, Beat Saber también debe iniciarse como administrador. De lo contrario, Beat Saber podría experimentar problemas y cerrarse después de iniciar.",
-                "info-2": "Iniciar Beat Saber en modo administrador también otorgará derechos de administrador a los mods instalados. Por lo tanto, se recomienda reiniciar Steam sin permisos de administrador.",
-                "info-3": "Tenga en cuenta que se desaconseja otorgar derechos de administrador a Steam, ya que esto afecta a los juegos y mods instalados, presentando un riesgo de seguridad."
-            },
-            "launch-as-admin": "Iniciar como Administrador",
-            "not-remind-me": "No volver a recordármelo"
         }
     },
     "maps": {

assets/jsons/translations/fr.json

@@ -719,16 +719,6 @@
                 "enter-oculus-token": "Entrer un token Oculus"
             },
             "valid-btn": "Valider"
-        },
-        "launch-as-admin": {
-            "title": "Permissions Administrateur",
-            "body": {
-                "info": "Steam a été détecté comme fonctionnant avec des permissions administrateur. Afin communiquer avec Steam, Beat Saber doit également être lancé en tant qu'administrateur. Dans le cas contraire, Beat Saber pourrait rencontrer des problèmes et se fermer après son lancement.",
-                "info-2": "Lancer Beat Saber en mode administrateur donnera également les droits administrateur aux mods installés. Il est donc plutôt recommandé de redémarrer Steam sans permissions administrateur.",
-                "info-3": "Notez qu'il est déconseillé de donner des droits d'administrateur à Steam, car cela affecte également les jeux et mods installés, présentant un risque pour la sécurité."
-            },
-            "launch-as-admin": "Lancer en administateur",
-            "not-remind-me": "Ne plus me rappeler"
         }
     },
     "maps": {

assets/jsons/translations/ja.json

@@ -719,16 +719,6 @@
                 "enter-oculus-token": "オキュラストークンを入力する"
             },
             "valid-btn": "確認"
-        },
-        "launch-as-admin": {
-            "title": "管理者権限",
-            "body": {
-                "info": "Steamが管理者権限で動作していることが検出されました。Steamと通信するためには、Beat Saberも管理者として起動する必要があります。そうでない場合、Beat Saberは問題が発生し、起動後に終了する可能性があります。",
-                "info-2": "管理者モードでBeat Saberを起動すると、インストールされたMODにも管理者権限が与えられます。そのため、管理者権限なしでSteamを再起動することをお勧めします。",
-                "info-3": "Steamに管理者権限を与えることはお勧めできません。これはインストールされたゲームやMODにも影響を与え、セキュリティリスクをもたらすからです。"
-            },
-            "launch-as-admin": "管理者として起動",
-            "not-remind-me": "Больше не напоминать"
         }
     },
     "maps": {

assets/jsons/translations/ru.json

@@ -719,15 +719,6 @@
                 "enter-oculus-token": "Введите токен Oculus"
             },
             "valid-btn": "Подтвердить"
-        },
-        "launch-as-admin": {
-            "title": "Права Администратора",
-            "body": {
-                "info": "Обнаружено, что Steam работает с правами администратора. Чтобы связаться со Steam, Beat Saber также должен быть запущен от имени администратора. В противном случае Beat Saber может столкнуться с проблемами и закрыться после запуска.",
-                "info-2": "Запуск Beat Saber в режиме администратора также даст права администратора установленным модам. Поэтому рекомендуется перезапустить Steam без прав администратора.",
-                "info-3": "Обратите внимание, что не рекомендуется предоставлять права администратора Steam, так как это также влияет на установленные игры и моды, представляя угрозу безопасности."
-            },
-            "launch-as-admin": "Запустить от имени администратора"
         }
     },
     "maps": {

assets/jsons/translations/zh-tw.json

@@ -719,16 +719,6 @@
                 "enter-oculus-token": "輸入Oculus令牌"
             },
             "valid-btn": "驗證"
-        },
-        "launch-as-admin": {
-            "title": "管理員權限",
-            "body": {
-                "info": "檢測到Steam正在以管理員權限運行。為了與Steam通信，Beat Saber也必須以管理員身份啟動。否則，Beat Saber可能會遇到問題並在啟動後關閉。",
-                "info-2": "以管理員模式啟動Beat Saber還會將管理員權限賦予已安裝的模組。因此，建議重啟Steam，不使用管理員權限。",
-                "info-3": "請注意，不建議給Steam管理員權限，因為這也會影響已安裝的遊戲和模組，帶來安全風險。"
-            },
-            "launch-as-admin": "以管理員身份啟動",
-            "not-remind-me": "不再提醒我"
         }
     },
     "maps": {

assets/jsons/translations/zh.json

@@ -719,16 +719,6 @@
                 "enter-oculus-token": "输入Oculus令牌"
             },
             "valid-btn": "验证"
-        },
-        "launch-as-admin": {
-            "title": "管理员权限",
-            "body": {
-                "info": "检测到Steam正在以管理员权限运行。为了与Steam通信，Beat Saber也必须以管理员身份启动。否则，Beat Saber可能会遇到问题并在启动后关闭。",
-                "info-2": "以管理员模式启动Beat Saber还会将管理员权限赋予已安装的模组。因此，建议重启Steam，不使用管理员权限。",
-                "info-3": "请注意，不建议给Steam管理员权限，因为这也会影响已安装的游戏和模组，带来安全风险。"
-            },
-            "launch-as-admin": "以管理员身份启动",
-            "not-remind-me": "不再提醒我"
         }
     },
     "maps": {

e2e-tests/helpers/electron.helpers.ts

@@ -0,0 +1,243 @@
+/**
+* Code taken from https://github.com/kubeshop/monokle/blob/main/tests/electronHelpers.ts
+* don't tunch unless you know what you're doing
+*/
+
+import { Page } from "@playwright/test";
+import path from "path";
+import {ElectronApplication, _electron as electron} from 'playwright-core';
+import { pause } from "shared/helpers/promise.helpers";
+import log from "electron-log";
+import * as fs from 'fs';
+import * as ASAR from 'asar';
+
+export const TEST_OUTPUT_DIR = 'test-results';
+
+export async function startApp(): Promise<StartAppResponse> {
+    const latestBuild = findLatestBuild();
+    const appInfo = parseElectronApp(latestBuild);
+    const electronApp = await electron.launch({
+        args: [appInfo.main],
+        env: {
+            ...process.env,
+            E2E_BUILD: "true",
+        },
+        executablePath: appInfo.executable,
+        recordVideo: {
+            dir: getRecordingPath(appInfo.platform),
+            size: {
+                width: 1200,
+                height: 800,
+            },
+        },
+    });
+  
+    const appWindow = await electronApp.firstWindow();
+
+    if (!appWindow) {
+        throw new Error('Unable to get main window');
+    }
+
+    await pause(3000);
+
+    appWindow.on('console', log.info);
+    appWindow.screenshot({path: path.join(TEST_OUTPUT_DIR, "initial-screen.png")});
+  
+    return {appWindow, appInfo, electronApp};
+}
+
+export function findLatestBuild(): string {
+    const rootDir = path.resolve('./');
+    const outDir = path.join(rootDir, 'release', 'build');
+    const builds = fs.readdirSync(outDir);
+    const platforms = ['win32', 'win', 'windows', 'darwin', 'mac', 'macos', 'osx', 'linux', 'ubuntu'];
+  
+    const latestBuild = builds
+        .map(fileName => {
+            // make sure it's a directory with "-" delimited platform in its name
+            const stats = fs.statSync(path.join(outDir, fileName));
+            const isBuild = fileName.toLocaleLowerCase().split('-').some(part => platforms.includes(part));
+
+            if(!stats.isDirectory() || !isBuild){ return undefined; }
+
+            return {
+                name: fileName,
+                time: fs.statSync(path.join(outDir, fileName)).mtimeMs,
+            };
+        })
+        .sort((a, b) => b.time - a.time)
+        .map(file => file?.name)[0];
+
+    if (!latestBuild) {
+        throw new Error('No build found in out directory');
+    }
+    
+    return path.join(outDir, latestBuild);
+}
+
+/**
+ * Given a directory containing an Electron app build,
+ * return the path to the app's executable and the path to the app's main file.
+ */
+export function parseElectronApp(buildDir: string): ElectronAppInfo {
+    log.info(`Parsing Electron app in ${buildDir}`);
+
+    let platform: string | undefined;
+
+    if (buildDir.endsWith('.app')) {
+        buildDir = path.dirname(buildDir);
+        platform = 'darwin';
+    }
+    else if (buildDir.endsWith('.exe')) {
+        buildDir = path.dirname(buildDir);
+        platform = 'win32';
+    }
+  
+    const baseName = path.basename(buildDir).toLowerCase();
+    if (!platform) {
+        // parse the directory name to figure out the platform
+        if (baseName.includes('win')) {
+            platform = 'win32';
+        }
+        if (baseName.includes('linux') || baseName.includes('ubuntu') || baseName.includes('debian')) {
+            platform = 'linux';
+        }
+        if (baseName.includes('darwin') || baseName.includes('mac') || baseName.includes('osx')) {
+            platform = 'darwin';
+        }
+    }
+  
+    if (!platform) {
+        throw new Error(`Platform not found in directory name: ${baseName}`);
+    }
+  
+    let arch: Architecture;
+    if (baseName.includes('x32') || baseName.includes('i386')) {
+        arch = 'x32';
+    }
+    if (baseName.includes('x64')) {
+        arch = 'x64';
+    }
+    if (baseName.includes('arm64')) {
+        arch = 'arm64';
+    }
+  
+    let executable: string;
+    let main: string;
+    let name: string;
+    let asar: boolean;
+    let resourcesDir: string;
+  
+    if (platform === 'darwin') {
+      // MacOS Structure
+      // <buildDir>/
+      //   <appName>.app/
+      //     Contents/
+      //       MacOS/
+      //        <appName> (executable)
+      //       Info.plist
+      //       PkgInfo
+      //       Resources/
+      //         electron.icns
+      //         file.icns
+      //         app.asar (asar bundle) - or -
+      //         app
+      //           package.json
+      //           (your app structure)
+  
+        const list = fs.readdirSync(buildDir);
+        const appBundle = list.find(fileName => {
+            return fileName.endsWith('.app');
+        });
+
+        const appDir = path.join(buildDir, appBundle, 'Contents', 'MacOS');
+        const appName = fs.readdirSync(appDir)[0];
+        executable = path.join(appDir, appName);
+  
+        resourcesDir = path.join(buildDir, appBundle, 'Contents', 'Resources');
+        const resourcesList = fs.readdirSync(resourcesDir);
+        asar = resourcesList.includes('app.asar');
+  
+        let packageJson: {main: string; name: string};
+        if (asar) {
+            const asarPath = path.join(resourcesDir, 'app.asar');
+            packageJson = JSON.parse(ASAR.extractFile(asarPath, 'package.json').toString('utf8'));
+            main = path.join(asarPath, packageJson.main);
+        } else {
+            packageJson = JSON.parse(fs.readFileSync(path.join(resourcesDir, 'app', 'package.json'), 'utf8'));
+            main = path.join(resourcesDir, 'app', packageJson.main);
+        }
+        name = packageJson.name;
+    } 
+    else if (platform === 'win32') {
+      // Windows Structure
+      // <buildDir>/
+      //   <appName>.exe (executable)
+      //   resources/
+      //     app.asar (asar bundle) - or -
+      //     app
+      //       package.json
+      //       (your app structure)
+  
+        const list = fs.readdirSync(buildDir);
+        const exe = list.find(fileName => {
+            return fileName.endsWith('.exe');
+        });
+
+        executable = path.join(buildDir, exe);
+  
+        resourcesDir = path.join(buildDir, 'resources');
+        const resourcesList = fs.readdirSync(resourcesDir);
+        asar = resourcesList.includes('app.asar');
+  
+        let packageJson: {main: string; name: string};
+  
+        if (asar) {
+            const asarPath = path.join(resourcesDir, 'app.asar');
+            packageJson = JSON.parse(ASAR.extractFile(asarPath, 'package.json').toString('utf8'));
+            main = path.join(asarPath, packageJson.main);
+        } else {
+            packageJson = JSON.parse(fs.readFileSync(path.join(resourcesDir, 'app', 'package.json'), 'utf8'));
+            main = path.join(resourcesDir, 'app', packageJson.main);
+        }
+        name = packageJson.name;
+    } 
+    else {
+        /**  @todo add support for linux */
+        throw new Error(`Platform not supported: ${platform}`);
+    }
+
+    return { executable, main, asar, name, platform, resourcesDir, arch };
+}
+
+export function getRecordingPath(...paths: string[]): string {
+    return path.join(TEST_OUTPUT_DIR, ...paths);
+}
+
+export function getMainWindow(windows: Page[]): Page {
+    const mainWindow = windows.find(w => w.url().includes('index.html'));
+    return mainWindow;
+}
+
+type Architecture = 'x64' | 'x32' | 'arm64';
+export interface ElectronAppInfo {
+  /** Path to the app's executable file */
+  executable: string;
+  /** Path to the app's main (JS) file */
+  main: string;
+  /** Name of the app */
+  name: string;
+  /** Resources directory */
+  resourcesDir: string;
+  /** True if the app is using asar */
+  asar: boolean;
+  /** OS platform */
+  platform: 'darwin' | 'win32' | 'linux';
+  arch: Architecture;
+}
+
+interface StartAppResponse {
+    electronApp: ElectronApplication;
+    appWindow: Page;
+    appInfo: ElectronAppInfo;
+}

e2e-tests/main.test.ts

@@ -0,0 +1,55 @@
+import {Page} from 'playwright';
+import { test, expect } from '@playwright/test';
+import { getRecordingPath, startApp } from './helpers/electron.helpers';
+import { pause } from 'shared/helpers/promise.helpers';
+import { MainWindow } from './models/main-window.class';
+import { AddVersionPanel } from './models/add-version-panel.class';
+
+
+let appWindow: Page;
+let mainWindow: MainWindow;
+let addVersionPanel: AddVersionPanel;
+
+test.beforeAll(async () => {
+    const startAppResponse = await startApp();
+    appWindow = startAppResponse.appWindow;
+    mainWindow = new MainWindow(appWindow);
+    addVersionPanel = new AddVersionPanel(appWindow);
+});
+
+test.beforeEach(async () => {
+    await pause(1000);
+    await mainWindow.clickAddVersionButton();
+});
+
+test.afterEach(async () => {
+    await pause(1000);
+});
+
+test('should be able to select then unselect a bs version', async () => {
+    const versionManifest = "8948172000430595334";
+    await addVersionPanel.selectYear("2021");
+    await pause(1000);
+
+    await addVersionPanel.clickVersion(versionManifest); // select version 0.12.2
+    await pause(1000);
+
+    expect(await addVersionPanel.downloadVersionButton.isVisible()).toBeTruthy();
+
+    await addVersionPanel.clickVersion(versionManifest);  // deselect version 0.12.2
+    await pause(3000);
+
+    expect(await addVersionPanel.downloadVersionButton.isVisible()).toBeFalsy();
+
+    // sadly we can't test if the download works or not :( (Steam ids, dot-net, etc)
+});
+
+test('should be able to download a map then delete it', async () => {
+    // TODO: implement this test
+});
+
+test.afterAll(async () => {
+    await pause(3000);
+    await appWindow.screenshot({path: getRecordingPath("final-screen.png")});
+    await appWindow.close();
+});

e2e-tests/models/add-version-panel.class.ts

@@ -0,0 +1,26 @@
+import { Page, Locator } from "playwright";
+import { MainWindow } from "./main-window.class";
+
+export class AddVersionPanel extends MainWindow {
+
+    private readonly _yearsTabBar: Locator;
+    private readonly _downloadVersionButton: Locator;
+
+    constructor(page: Page) {
+        super(page);
+
+        this._yearsTabBar = page.locator("#version-years-tab-bar");
+        this._downloadVersionButton = page.locator("#download-version-btn");
+    }
+
+    selectYear(year: string): Promise<void>{
+        return this._yearsTabBar.getByText(year).click();
+    }
+
+    clickVersion(manifest: string): Promise<void>{
+        return this._page.locator(`#version-item-${manifest}`).click();
+    }
+
+    get downloadVersionButton(): Locator { return this._downloadVersionButton; }
+
+}

e2e-tests/models/main-window.class.ts

@@ -0,0 +1,36 @@
+import { Page, Locator } from "playwright"
+
+export class MainWindow {
+
+    protected readonly _page: Page;
+
+    private readonly _bsmLogo: Locator;
+    private readonly _addVersionButton: Locator;
+    private readonly _settingsButton: Locator;
+    private readonly _sharedContentButton: Locator;
+
+    constructor(page: Page) {
+        this._page = page;
+
+        this._bsmLogo = page.locator("#bsm-logo");
+        this._addVersionButton = page.locator("#add-version-btn");
+        this._settingsButton = page.locator("#settings-btn");
+        this._sharedContentButton = page.locator("#shared-contents-btn");
+    }
+    public async clickBsmLogo(): Promise<void> {
+        return this._bsmLogo.click();
+    }
+
+    public async clickAddVersionButton(): Promise<void> {
+        return this._addVersionButton.click();
+    }
+
+    public async clickSettingsButton(): Promise<void> {
+        return this._settingsButton.click();
+    }
+
+    public async clickSharedContentButton(): Promise<void> {
+        return this._sharedContentButton.click();
+    }
+
+}

externals/bs-admin-start/.cargo/config.toml

@@ -1,2 +0,0 @@
-[target.x86_64-pc-windows-msvc]
-rustflags = ["-C", "target-feature=+crt-static"]

externals/bs-admin-start/Cargo.lock

@@ -1,83 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.195"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.195"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "start_beat_saber_admin"
-version = "0.1.0"
-dependencies = [
- "winres",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "winres"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
-dependencies = [
- "toml",
-]

externals/bs-admin-start/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "start_beat_saber_admin"
-version = "0.1.0"
-edition = "2021"
-build = "build.rs"
-
-[build-dependencies]
-winres = "0.1.12"
-
-[profile.release]
-codegen-units = 1
-lto = true
-opt-level = "z"
-
-[package.metadata.winres]
-FileDescription = "Start Beat Saber as Admin"
-LegalCopyright = "Copyright © 2024 Zagrios"
-CompanyName = "Zagrios"

externals/bs-admin-start/build.rs

@@ -1,20 +0,0 @@
-extern crate winres;
-
-fn main() {
-  if cfg!(target_os = "windows") {
-    let mut res = winres::WindowsResource::new();
-    res.set_manifest(r#"
-      <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-      <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-          <security>
-              <requestedPrivileges>
-                  <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
-              </requestedPrivileges>
-          </security>
-      </trustInfo>
-      </assembly>
-    "#);
-    res.set_icon("./icon.ico");
-    res.compile().unwrap();
-  }
-}

externals/bs-admin-start/src/main.rs

@@ -1,47 +0,0 @@
-
-use std::{process::Command, path::Path};
-
-const EXECUTABLE_NAME: &str = "Beat Saber.exe";
-const AUTORIZED_ARGS: [&str; 8] = [
-    "fpfc",
-    "-vrmode",
-    "oculus",
-    "--verbose",
-    "--no-yeet",
-    "--disable-autoupdate",
-    "--combine-logs",
-    "editor"
-];
-
-fn main() {
-    let args: Vec<String> = std::env::args().collect();
-
-    let executable_path = Path::new(&args[1]);
-
-    if executable_path.file_name().unwrap() != EXECUTABLE_NAME {
-        eprintln!("Executable path is not Beat Saber.exe.");
-        return;
-    }
-
-    if !executable_path.exists() || !executable_path.is_file() {
-        eprintln!("Executable path is not valid.");
-        return;
-    }
-
-    let mut command = Command::new(executable_path);
-
-    if let Some(parent_dir) = executable_path.parent() {
-        command.current_dir(parent_dir);
-    }
-
-    for arg in args.iter().skip(2) {
-        if !AUTORIZED_ARGS.contains(&arg.as_str()) {
-            continue;
-        }
-        command.arg(arg);
-    }
-
-    command.env("SteamAppId", "620980");
-
-    let _ = command.spawn();
-}

package-lock.json

@@ -24,7 +24,6 @@
                 "framer-motion": "^10.16.16",
                 "fs-extra": "^11.2.0",
                 "history": "^5.3.0",
-                "is-elevated": "^3.0.0",
                 "jszip": "^3.10.1",
                 "md5-file": "^5.0.0",
                 "node-abi": "^3.47.0",
@@ -56,6 +55,7 @@
             },
             "devDependencies": {
                 "@electron/rebuild": "^3.2.13",
+                "@playwright/test": "^1.38.1",
                 "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
                 "@teamsupercell/typings-for-css-modules-loader": "^2.5.1",
                 "@testing-library/jest-dom": "^5.16.5",
@@ -82,6 +82,7 @@
                 "@types/webpack-env": "^1.18.0",
                 "@typescript-eslint/eslint-plugin": "^5.34.0",
                 "@typescript-eslint/parser": "^5.34.0",
+                "asar": "^3.2.0",
                 "autoprefixer": "^10.4.8",
                 "browserslist-config-erb": "^0.0.3",
                 "chalk": "^4.1.2",
@@ -115,6 +116,8 @@
                 "lint-staged": "^12.5.0",
                 "mini-css-extract-plugin": "^2.6.1",
                 "opencollective-postinstall": "^2.0.3",
+                "playwright": "^1.38.1",
+                "playwright-core": "^1.38.1",
                 "postcss": "^8.4.16",
                 "postcss-loader": "^6.2.1",
                 "prettier": "^2.7.1",
@@ -138,7 +141,8 @@
                 "webpack-bundle-analyzer": "^4.6.1",
                 "webpack-cli": "^4.10.0",
                 "webpack-dev-server": "^4.10.0",
-                "webpack-merge": "^5.8.0"
+                "webpack-merge": "^5.8.0",
+                "xvfb-maybe": "^0.2.1"
             }
         },
         "node_modules/@adobe/css-tools": {
@@ -2016,6 +2020,21 @@
                 "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
             }
         },
+        "node_modules/@playwright/test": {
+            "version": "1.38.1",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.1.tgz",
+            "integrity": "sha512-NqRp8XMwj3AK+zKLbZShl0r/9wKgzqI/527bkptKXomtuo+dOjU9NdMASQ8DNC9z9zLOMbG53T4eihYr3XR+BQ==",
+            "dev": true,
+            "dependencies": {
+                "playwright": "1.38.1"
+            },
+            "bin": {
+                "playwright": "cli.js"
+            },
+            "engines": {
+                "node": ">=16"
+            }
+        },
         "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.5.tgz",
@@ -4124,6 +4143,48 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/asar": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz",
+            "integrity": "sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==",
+            "deprecated": "Please use @electron/asar moving forward.  There is no API change, just a package name change",
+            "dev": true,
+            "dependencies": {
+                "chromium-pickle-js": "^0.2.0",
+                "commander": "^5.0.0",
+                "glob": "^7.1.6",
+                "minimatch": "^3.0.4"
+            },
+            "bin": {
+                "asar": "bin/asar.js"
+            },
+            "engines": {
+                "node": ">=10.12.0"
+            },
+            "optionalDependencies": {
+                "@types/glob": "^7.1.1"
+            }
+        },
+        "node_modules/asar/node_modules/@types/glob": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+            "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+            "dev": true,
+            "optional": true,
+            "dependencies": {
+                "@types/minimatch": "*",
+                "@types/node": "*"
+            }
+        },
+        "node_modules/asar/node_modules/commander": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+            "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
         "node_modules/asn1": {
             "version": "0.2.6",
             "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -7048,6 +7109,7 @@
             "version": "1.4.4",
             "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
             "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+            "dev": true,
             "dependencies": {
                 "once": "^1.4.0"
             }
@@ -10291,125 +10353,6 @@
                 "node": ">= 10"
             }
         },
-        "node_modules/is-admin": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-admin/-/is-admin-3.0.0.tgz",
-            "integrity": "sha512-wOa3CXFJAu8BZ2BDtG9xYOOrsq6oiSvc2jFPy4X/HINx5bmJUcW8e+apItVbU2E7GIfBVaFVO7Zit4oAWtTJcw==",
-            "dependencies": {
-                "execa": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-admin/node_modules/cross-spawn": {
-            "version": "6.0.5",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-            "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-            "dependencies": {
-                "nice-try": "^1.0.4",
-                "path-key": "^2.0.1",
-                "semver": "^5.5.0",
-                "shebang-command": "^1.2.0",
-                "which": "^1.2.9"
-            },
-            "engines": {
-                "node": ">=4.8"
-            }
-        },
-        "node_modules/is-admin/node_modules/execa": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-            "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-            "dependencies": {
-                "cross-spawn": "^6.0.0",
-                "get-stream": "^4.0.0",
-                "is-stream": "^1.1.0",
-                "npm-run-path": "^2.0.0",
-                "p-finally": "^1.0.0",
-                "signal-exit": "^3.0.0",
-                "strip-eof": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/is-admin/node_modules/get-stream": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-            "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-            "dependencies": {
-                "pump": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/is-admin/node_modules/is-stream": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-            "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-admin/node_modules/npm-run-path": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-            "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
-            "dependencies": {
-                "path-key": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/is-admin/node_modules/path-key": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-            "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/is-admin/node_modules/semver": {
-            "version": "5.7.2",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-            "bin": {
-                "semver": "bin/semver"
-            }
-        },
-        "node_modules/is-admin/node_modules/shebang-command": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-            "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-            "dependencies": {
-                "shebang-regex": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-admin/node_modules/shebang-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-            "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-admin/node_modules/which": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "which": "bin/which"
-            }
-        },
         "node_modules/is-arguments": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -10550,18 +10493,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/is-elevated": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-elevated/-/is-elevated-3.0.0.tgz",
-            "integrity": "sha512-wjcp6RkouU9jpg55zERl+BglvV5j4jx5c/EMvQ+d12j/+nIEenNWPu+qc0tCg3JkLodbKZMg1qhJzEwG4qjclg==",
-            "dependencies": {
-                "is-admin": "^3.0.0",
-                "is-root": "^2.1.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -10726,14 +10657,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/is-root": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-            "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==",
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/is-set": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
@@ -10899,7 +10822,8 @@
         "node_modules/isexe": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true
         },
         "node_modules/isobject": {
             "version": "3.0.1",
@@ -13710,11 +13634,6 @@
             "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
             "dev": true
         },
-        "node_modules/nice-try": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-        },
         "node_modules/no-case": {
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
@@ -14223,14 +14142,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/p-finally": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-            "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/p-limit": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -14602,6 +14513,36 @@
                 "node": ">=8"
             }
         },
+        "node_modules/playwright": {
+            "version": "1.38.1",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.1.tgz",
+            "integrity": "sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow==",
+            "dev": true,
+            "dependencies": {
+                "playwright-core": "1.38.1"
+            },
+            "bin": {
+                "playwright": "cli.js"
+            },
+            "engines": {
+                "node": ">=16"
+            },
+            "optionalDependencies": {
+                "fsevents": "2.3.2"
+            }
+        },
+        "node_modules/playwright-core": {
+            "version": "1.38.1",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.1.tgz",
+            "integrity": "sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg==",
+            "dev": true,
+            "bin": {
+                "playwright-core": "cli.js"
+            },
+            "engines": {
+                "node": ">=16"
+            }
+        },
         "node_modules/plist": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
@@ -15540,6 +15481,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
             "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+            "dev": true,
             "dependencies": {
                 "end-of-stream": "^1.1.0",
                 "once": "^1.3.1"
@@ -16779,7 +16721,8 @@
         "node_modules/signal-exit": {
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true
         },
         "node_modules/simple-swizzle": {
             "version": "0.2.2",
@@ -17240,14 +17183,6 @@
                 "node": ">=4"
             }
         },
-        "node_modules/strip-eof": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-            "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/strip-final-newline": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
@@ -19238,6 +19173,46 @@
                 "node": ">=0.4"
             }
         },
+        "node_modules/xvfb-maybe": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/xvfb-maybe/-/xvfb-maybe-0.2.1.tgz",
+            "integrity": "sha512-9IyRz3l6Qyhl6LvnGRF5jMPB4oBEepQnuzvVAFTynP6ACLLSevqigICJ9d/+ofl29m2daeaVBChnPYUnaeJ7yA==",
+            "dev": true,
+            "dependencies": {
+                "debug": "^2.2.0",
+                "which": "^1.2.4"
+            },
+            "bin": {
+                "xvfb-maybe": "src/xvfb-maybe.js"
+            }
+        },
+        "node_modules/xvfb-maybe/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/xvfb-maybe/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/xvfb-maybe/node_modules/which": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+            "dev": true,
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "which": "bin/which"
+            }
+        },
         "node_modules/y18n": {
             "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
@@ -20832,6 +20807,15 @@
                 "rimraf": "^3.0.2"
             }
         },
+        "@playwright/test": {
+            "version": "1.38.1",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.1.tgz",
+            "integrity": "sha512-NqRp8XMwj3AK+zKLbZShl0r/9wKgzqI/527bkptKXomtuo+dOjU9NdMASQ8DNC9z9zLOMbG53T4eihYr3XR+BQ==",
+            "dev": true,
+            "requires": {
+                "playwright": "1.38.1"
+            }
+        },
         "@pmmmwh/react-refresh-webpack-plugin": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.5.tgz",
@@ -22557,6 +22541,38 @@
             "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
             "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA=="
         },
+        "asar": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz",
+            "integrity": "sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==",
+            "dev": true,
+            "requires": {
+                "@types/glob": "^7.1.1",
+                "chromium-pickle-js": "^0.2.0",
+                "commander": "^5.0.0",
+                "glob": "^7.1.6",
+                "minimatch": "^3.0.4"
+            },
+            "dependencies": {
+                "@types/glob": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+                    "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "@types/minimatch": "*",
+                        "@types/node": "*"
+                    }
+                },
+                "commander": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+                    "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+                    "dev": true
+                }
+            }
+        },
         "asn1": {
             "version": "0.2.6",
             "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -24767,6 +24783,7 @@
             "version": "1.4.4",
             "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
             "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+            "dev": true,
             "requires": {
                 "once": "^1.4.0"
             }
@@ -27134,94 +27151,6 @@
             "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
             "dev": true
         },
-        "is-admin": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-admin/-/is-admin-3.0.0.tgz",
-            "integrity": "sha512-wOa3CXFJAu8BZ2BDtG9xYOOrsq6oiSvc2jFPy4X/HINx5bmJUcW8e+apItVbU2E7GIfBVaFVO7Zit4oAWtTJcw==",
-            "requires": {
-                "execa": "^1.0.0"
-            },
-            "dependencies": {
-                "cross-spawn": {
-                    "version": "6.0.5",
-                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-                    "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-                    "requires": {
-                        "nice-try": "^1.0.4",
-                        "path-key": "^2.0.1",
-                        "semver": "^5.5.0",
-                        "shebang-command": "^1.2.0",
-                        "which": "^1.2.9"
-                    }
-                },
-                "execa": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-                    "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-                    "requires": {
-                        "cross-spawn": "^6.0.0",
-                        "get-stream": "^4.0.0",
-                        "is-stream": "^1.1.0",
-                        "npm-run-path": "^2.0.0",
-                        "p-finally": "^1.0.0",
-                        "signal-exit": "^3.0.0",
-                        "strip-eof": "^1.0.0"
-                    }
-                },
-                "get-stream": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-                    "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-                    "requires": {
-                        "pump": "^3.0.0"
-                    }
-                },
-                "is-stream": {
-                    "version": "1.1.0",
-                    "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-                    "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="
-                },
-                "npm-run-path": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-                    "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
-                    "requires": {
-                        "path-key": "^2.0.0"
-                    }
-                },
-                "path-key": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-                    "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="
-                },
-                "semver": {
-                    "version": "5.7.2",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-                    "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-                },
-                "shebang-command": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-                    "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-                    "requires": {
-                        "shebang-regex": "^1.0.0"
-                    }
-                },
-                "shebang-regex": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-                    "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="
-                },
-                "which": {
-                    "version": "1.3.1",
-                    "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-                    "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
         "is-arguments": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -27317,15 +27246,6 @@
             "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
             "dev": true
         },
-        "is-elevated": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-elevated/-/is-elevated-3.0.0.tgz",
-            "integrity": "sha512-wjcp6RkouU9jpg55zERl+BglvV5j4jx5c/EMvQ+d12j/+nIEenNWPu+qc0tCg3JkLodbKZMg1qhJzEwG4qjclg==",
-            "requires": {
-                "is-admin": "^3.0.0",
-                "is-root": "^2.1.0"
-            }
-        },
         "is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -27436,11 +27356,6 @@
                 "has-tostringtag": "^1.0.0"
             }
         },
-        "is-root": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-            "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="
-        },
         "is-set": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
@@ -27552,7 +27467,8 @@
         "isexe": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true
         },
         "isobject": {
             "version": "3.0.1",
@@ -29840,11 +29756,6 @@
             "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
             "dev": true
         },
-        "nice-try": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-        },
         "no-case": {
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
@@ -30216,11 +30127,6 @@
             "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
             "dev": true
         },
-        "p-finally": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-            "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="
-        },
         "p-limit": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -30503,6 +30409,22 @@
                 "find-up": "^3.0.0"
             }
         },
+        "playwright": {
+            "version": "1.38.1",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.1.tgz",
+            "integrity": "sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow==",
+            "dev": true,
+            "requires": {
+                "fsevents": "2.3.2",
+                "playwright-core": "1.38.1"
+            }
+        },
+        "playwright-core": {
+            "version": "1.38.1",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.1.tgz",
+            "integrity": "sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg==",
+            "dev": true
+        },
         "plist": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
@@ -31111,6 +31033,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
             "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+            "dev": true,
             "requires": {
                 "end-of-stream": "^1.1.0",
                 "once": "^1.3.1"
@@ -32053,7 +31976,8 @@
         "signal-exit": {
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true
         },
         "simple-swizzle": {
             "version": "0.2.2",
@@ -32417,11 +32341,6 @@
             "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
             "dev": true
         },
-        "strip-eof": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-            "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="
-        },
         "strip-final-newline": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
@@ -33870,6 +33789,42 @@
             "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
             "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
         },
+        "xvfb-maybe": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/xvfb-maybe/-/xvfb-maybe-0.2.1.tgz",
+            "integrity": "sha512-9IyRz3l6Qyhl6LvnGRF5jMPB4oBEepQnuzvVAFTynP6ACLLSevqigICJ9d/+ofl29m2daeaVBChnPYUnaeJ7yA==",
+            "dev": true,
+            "requires": {
+                "debug": "^2.2.0",
+                "which": "^1.2.4"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+                    "dev": true
+                },
+                "which": {
+                    "version": "1.3.1",
+                    "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+                    "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+                    "dev": true,
+                    "requires": {
+                        "isexe": "^2.0.0"
+                    }
+                }
+            }
+        },
         "y18n": {
             "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",

package.json

@@ -14,7 +14,9 @@
         "start:preload": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.preload.dev.ts",
         "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
         "test": "jest",
-        "publish": "npm run build && electron-builder -c.win.certificateSha1=842a817a51e2a1d360fcd62f54bf5f9193e919e1 --publish always --win --x64"
+        "publish": "npm run build && electron-builder -c.win.certificateSha1=842a817a51e2a1d360fcd62f54bf5f9193e919e1 --publish always --win --x64",
+        "e2e-test": "npm run package && xvfb-maybe npx playwright test --workers=1",
+        "e2e-test-ci": "xvfb-maybe npx playwright test --workers=1"
     },
     "lint-staged": {
         "*.{js,jsx,ts,tsx}": [
@@ -149,6 +151,7 @@
     },
     "devDependencies": {
         "@electron/rebuild": "^3.2.13",
+        "@playwright/test": "^1.38.1",
         "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
         "@teamsupercell/typings-for-css-modules-loader": "^2.5.1",
         "@testing-library/jest-dom": "^5.16.5",
@@ -175,6 +178,7 @@
         "@types/webpack-env": "^1.18.0",
         "@typescript-eslint/eslint-plugin": "^5.34.0",
         "@typescript-eslint/parser": "^5.34.0",
+        "asar": "^3.2.0",
         "autoprefixer": "^10.4.8",
         "browserslist-config-erb": "^0.0.3",
         "chalk": "^4.1.2",
@@ -208,6 +212,8 @@
         "lint-staged": "^12.5.0",
         "mini-css-extract-plugin": "^2.6.1",
         "opencollective-postinstall": "^2.0.3",
+        "playwright": "^1.38.1",
+        "playwright-core": "^1.38.1",
         "postcss": "^8.4.16",
         "postcss-loader": "^6.2.1",
         "prettier": "^2.7.1",
@@ -231,7 +237,8 @@
         "webpack-bundle-analyzer": "^4.6.1",
         "webpack-cli": "^4.10.0",
         "webpack-dev-server": "^4.10.0",
-        "webpack-merge": "^5.8.0"
+        "webpack-merge": "^5.8.0",
+        "xvfb-maybe": "^0.2.1"
     },
     "dependencies": {
         "@electron/fuses": "^1.6.2",
@@ -250,7 +257,6 @@
         "framer-motion": "^10.16.16",
         "fs-extra": "^11.2.0",
         "history": "^5.3.0",
-        "is-elevated": "^3.0.0",
         "jszip": "^3.10.1",
         "md5-file": "^5.0.0",
         "node-abi": "^3.47.0",

playwright.config.ts

@@ -0,0 +1,18 @@
+import { defineConfig, devices } from '@playwright/test';
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// require('dotenv').config();
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+    testDir: "./e2e-tests",
+    testMatch: "**/*.test.ts",
+    timeout: 200000,
+    fullyParallel: true,
+    retries: 1,
+});

release/app/package-lock.json

@@ -11,8 +11,7 @@
       "license": "MIT",
       "dependencies": {
         "ps-list": "^7.2.0",
-        "query-process": "^0.0.3",
-        "regedit-rs": "^1.0.2",
+        "regedit-rs": "^1.0.1",
         "sharp": "^0.32.6"
       }
     },
@@ -345,160 +344,6 @@
         "once": "^1.3.1"
       }
     },
-    "node_modules/query-process": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process/-/query-process-0.0.3.tgz",
-      "integrity": "sha512-6WRue0P+c84abP0o8MkDvigoS/gkkJzsSBt10PsOoBkP7Yodo4DducFsn9XyS4S+LuVYPAE5Hr4+kVNR5Onykg==",
-      "engines": {
-        "node": ">= 10"
-      },
-      "optionalDependencies": {
-        "query-process-android-arm-eabi": "0.0.3",
-        "query-process-android-arm64": "0.0.3",
-        "query-process-linux-arm-gnueabihf": "0.0.3",
-        "query-process-linux-arm64-gnu": "0.0.3",
-        "query-process-linux-arm64-musl": "0.0.3",
-        "query-process-linux-x64-gnu": "0.0.3",
-        "query-process-linux-x64-musl": "0.0.3",
-        "query-process-win32-arm64-msvc": "0.0.3",
-        "query-process-win32-x64-msvc": "0.0.3"
-      }
-    },
-    "node_modules/query-process-android-arm-eabi": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-android-arm-eabi/-/query-process-android-arm-eabi-0.0.3.tgz",
-      "integrity": "sha512-NB+9T+/poBcygDiG+7d2lJSeioP5ZyLT0HwUBdnLgNWvNCpzbJxydup1SLpnt5G2NF6nlTgbUZlH4hvxY7t/bw==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/query-process-android-arm64": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-android-arm64/-/query-process-android-arm64-0.0.3.tgz",
-      "integrity": "sha512-TiAw2yO62vQzM0s02471LToHyUs/PRkLGGlA715z10BPIM5NckzIe245AI45CDyH6tE/3nVHUd0LX/dfjQtTcw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/query-process-linux-arm-gnueabihf": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-linux-arm-gnueabihf/-/query-process-linux-arm-gnueabihf-0.0.3.tgz",
-      "integrity": "sha512-w7NLHBKt7qselCDoh/PVWyeuEb2NiiDDf1A9UB4K3Ns/H24hK3NbfMMBm8mCFxUnFUqoVX8O+VMs7dD/FNlTxA==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/query-process-linux-arm64-gnu": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-linux-arm64-gnu/-/query-process-linux-arm64-gnu-0.0.3.tgz",
-      "integrity": "sha512-nrPHjnSqCBuuN7IZkZWOnBpiJjyKOjfpT0Xt2EjSGp+I7C0CHbnhCL/vG1hBzaWZn0mxJ5nf0c5N0Fja7krnpQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/query-process-linux-arm64-musl": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-linux-arm64-musl/-/query-process-linux-arm64-musl-0.0.3.tgz",
-      "integrity": "sha512-vk8xMYTnS1PRKhwJgqLKyBAGIFP2CYZW2BsaKuNgQKUrDv7NnBaG7yukZT8niHNO1ycSrFpR/xqeJ8R23hO07A==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/query-process-linux-x64-gnu": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-linux-x64-gnu/-/query-process-linux-x64-gnu-0.0.3.tgz",
-      "integrity": "sha512-j1tGcNnGyVCABJ1PHZD1gKuyuomNzsPow3NDuZzUGjPqvKu67RsmKJJJOhMyT1SvUkcqdLFdtS1KTD20I4GS5Q==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/query-process-linux-x64-musl": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-linux-x64-musl/-/query-process-linux-x64-musl-0.0.3.tgz",
-      "integrity": "sha512-AOGrrI/Qcb30iKFstiW60zNG/HQevCY0Q38eMHGd7LrBZ5sEN7NzZOjzKp43KeNHejuZBDMxf0gdGAqDznOAng==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/query-process-win32-arm64-msvc": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-win32-arm64-msvc/-/query-process-win32-arm64-msvc-0.0.3.tgz",
-      "integrity": "sha512-LHvxbzMFwPPUXHe4bDCAqs1bYbp8j0bMW8XyJGPZnIYrnwHz6g8VE5WQEtXQxSznsbfVxAKJXUtn088EjDVazw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/query-process-win32-x64-msvc": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-win32-x64-msvc/-/query-process-win32-x64-msvc-0.0.3.tgz",
-      "integrity": "sha512-LfHAKmfqyKCgl9K+sTz0KyNwMwB79VcXZUy/Et9iQKLuZt7PDYpHWcFdhrfHw2qqIdKWTED8KmnmsOLhUn/2OA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/queue-tick": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
@@ -532,22 +377,22 @@
       }
     },
     "node_modules/regedit-rs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regedit-rs/-/regedit-rs-1.0.2.tgz",
-      "integrity": "sha512-4vEgiZNO1FCG8z/Zx3v/6PU1+eZ+ELe6R0ca+VB96Vw+Mi3M0IVHAjtMFbl97lUSX11dJqpyousX/wY8QcI1lA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/regedit-rs/-/regedit-rs-1.0.1.tgz",
+      "integrity": "sha512-wsvoGP5JDevIcx3q52aATW1c1dY86bQx7/tJ32gqV+L98OHRJykobKkjYqGzROtz9c2Pr+wGJZr0glFyc2dpvQ==",
       "engines": {
         "node": ">= 10"
       },
       "optionalDependencies": {
-        "regedit-rs-win32-arm64-msvc": "1.0.2",
-        "regedit-rs-win32-ia32-msvc": "1.0.2",
-        "regedit-rs-win32-x64-msvc": "1.0.2"
+        "regedit-rs-win32-arm64-msvc": "1.0.1",
+        "regedit-rs-win32-ia32-msvc": "1.0.1",
+        "regedit-rs-win32-x64-msvc": "1.0.1"
       }
     },
     "node_modules/regedit-rs-win32-arm64-msvc": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regedit-rs-win32-arm64-msvc/-/regedit-rs-win32-arm64-msvc-1.0.2.tgz",
-      "integrity": "sha512-hM1sxazOJWKmiC9DM8QXW9Iqm50Mh/Y9G4/rRYQpWXjMzq7lTqjwVZRkAoBrHliFS6d1Lt4qkm5+Ybt6GkbDpw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/regedit-rs-win32-arm64-msvc/-/regedit-rs-win32-arm64-msvc-1.0.1.tgz",
+      "integrity": "sha512-QA46d/wiUHlW2h0ZlHKrtDhnwoxMpVle+EbFziEbLYC7dimtAiWCeXu4zNymaFClDimYSifQkWgza5GBmD8etg==",
       "cpu": [
         "arm64"
       ],
@@ -560,9 +405,9 @@
       }
     },
     "node_modules/regedit-rs-win32-ia32-msvc": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regedit-rs-win32-ia32-msvc/-/regedit-rs-win32-ia32-msvc-1.0.2.tgz",
-      "integrity": "sha512-FLINrCJ30wm6NYw7skQUDET8NP1N46kH77dqesCiU+/FjWzzPE5luZYY+j4uf+hKjPY6/MCj2CB9l9VdPhaBVQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/regedit-rs-win32-ia32-msvc/-/regedit-rs-win32-ia32-msvc-1.0.1.tgz",
+      "integrity": "sha512-V2NisvicQqiozl0yMas9tjDYmBwHWf48M/dMJUWMQxxkJaDCNoHW8PljL59A/h8ew2NBFsJK5RYkYfxW1o+OyQ==",
       "cpu": [
         "ia32"
       ],
@@ -575,9 +420,9 @@
       }
     },
     "node_modules/regedit-rs-win32-x64-msvc": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regedit-rs-win32-x64-msvc/-/regedit-rs-win32-x64-msvc-1.0.2.tgz",
-      "integrity": "sha512-ccCSyd5vWBKVWftBKLKzegqwwPMWcQtIW0ub66dCFFuv2s+x2EcZZWGdD9dVXX2Z6V9DU2JRPKgWUNjVPaj6Xg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/regedit-rs-win32-x64-msvc/-/regedit-rs-win32-x64-msvc-1.0.1.tgz",
+      "integrity": "sha512-qhQawjYPzXGrz0xODJiviwrzw0eytGP9+quuQJUQAiLEw2P1tQ0LCyID3jOvNltLH+tqJChSV4JaQcPVleohZg==",
       "cpu": [
         "x64"
       ],
@@ -1006,76 +851,6 @@
         "once": "^1.3.1"
       }
     },
-    "query-process": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process/-/query-process-0.0.3.tgz",
-      "integrity": "sha512-6WRue0P+c84abP0o8MkDvigoS/gkkJzsSBt10PsOoBkP7Yodo4DducFsn9XyS4S+LuVYPAE5Hr4+kVNR5Onykg==",
-      "requires": {
-        "query-process-android-arm-eabi": "0.0.3",
-        "query-process-android-arm64": "0.0.3",
-        "query-process-linux-arm-gnueabihf": "0.0.3",
-        "query-process-linux-arm64-gnu": "0.0.3",
-        "query-process-linux-arm64-musl": "0.0.3",
-        "query-process-linux-x64-gnu": "0.0.3",
-        "query-process-linux-x64-musl": "0.0.3",
-        "query-process-win32-arm64-msvc": "0.0.3",
-        "query-process-win32-x64-msvc": "0.0.3"
-      }
-    },
-    "query-process-android-arm-eabi": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-android-arm-eabi/-/query-process-android-arm-eabi-0.0.3.tgz",
-      "integrity": "sha512-NB+9T+/poBcygDiG+7d2lJSeioP5ZyLT0HwUBdnLgNWvNCpzbJxydup1SLpnt5G2NF6nlTgbUZlH4hvxY7t/bw==",
-      "optional": true
-    },
-    "query-process-android-arm64": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-android-arm64/-/query-process-android-arm64-0.0.3.tgz",
-      "integrity": "sha512-TiAw2yO62vQzM0s02471LToHyUs/PRkLGGlA715z10BPIM5NckzIe245AI45CDyH6tE/3nVHUd0LX/dfjQtTcw==",
-      "optional": true
-    },
-    "query-process-linux-arm-gnueabihf": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-linux-arm-gnueabihf/-/query-process-linux-arm-gnueabihf-0.0.3.tgz",
-      "integrity": "sha512-w7NLHBKt7qselCDoh/PVWyeuEb2NiiDDf1A9UB4K3Ns/H24hK3NbfMMBm8mCFxUnFUqoVX8O+VMs7dD/FNlTxA==",
-      "optional": true
-    },
-    "query-process-linux-arm64-gnu": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-linux-arm64-gnu/-/query-process-linux-arm64-gnu-0.0.3.tgz",
-      "integrity": "sha512-nrPHjnSqCBuuN7IZkZWOnBpiJjyKOjfpT0Xt2EjSGp+I7C0CHbnhCL/vG1hBzaWZn0mxJ5nf0c5N0Fja7krnpQ==",
-      "optional": true
-    },
-    "query-process-linux-arm64-musl": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-linux-arm64-musl/-/query-process-linux-arm64-musl-0.0.3.tgz",
-      "integrity": "sha512-vk8xMYTnS1PRKhwJgqLKyBAGIFP2CYZW2BsaKuNgQKUrDv7NnBaG7yukZT8niHNO1ycSrFpR/xqeJ8R23hO07A==",
-      "optional": true
-    },
-    "query-process-linux-x64-gnu": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-linux-x64-gnu/-/query-process-linux-x64-gnu-0.0.3.tgz",
-      "integrity": "sha512-j1tGcNnGyVCABJ1PHZD1gKuyuomNzsPow3NDuZzUGjPqvKu67RsmKJJJOhMyT1SvUkcqdLFdtS1KTD20I4GS5Q==",
-      "optional": true
-    },
-    "query-process-linux-x64-musl": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-linux-x64-musl/-/query-process-linux-x64-musl-0.0.3.tgz",
-      "integrity": "sha512-AOGrrI/Qcb30iKFstiW60zNG/HQevCY0Q38eMHGd7LrBZ5sEN7NzZOjzKp43KeNHejuZBDMxf0gdGAqDznOAng==",
-      "optional": true
-    },
-    "query-process-win32-arm64-msvc": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-win32-arm64-msvc/-/query-process-win32-arm64-msvc-0.0.3.tgz",
-      "integrity": "sha512-LHvxbzMFwPPUXHe4bDCAqs1bYbp8j0bMW8XyJGPZnIYrnwHz6g8VE5WQEtXQxSznsbfVxAKJXUtn088EjDVazw==",
-      "optional": true
-    },
-    "query-process-win32-x64-msvc": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/query-process-win32-x64-msvc/-/query-process-win32-x64-msvc-0.0.3.tgz",
-      "integrity": "sha512-LfHAKmfqyKCgl9K+sTz0KyNwMwB79VcXZUy/Et9iQKLuZt7PDYpHWcFdhrfHw2qqIdKWTED8KmnmsOLhUn/2OA==",
-      "optional": true
-    },
     "queue-tick": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
@@ -1103,31 +878,31 @@
       }
     },
     "regedit-rs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regedit-rs/-/regedit-rs-1.0.2.tgz",
-      "integrity": "sha512-4vEgiZNO1FCG8z/Zx3v/6PU1+eZ+ELe6R0ca+VB96Vw+Mi3M0IVHAjtMFbl97lUSX11dJqpyousX/wY8QcI1lA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/regedit-rs/-/regedit-rs-1.0.1.tgz",
+      "integrity": "sha512-wsvoGP5JDevIcx3q52aATW1c1dY86bQx7/tJ32gqV+L98OHRJykobKkjYqGzROtz9c2Pr+wGJZr0glFyc2dpvQ==",
       "requires": {
-        "regedit-rs-win32-arm64-msvc": "1.0.2",
-        "regedit-rs-win32-ia32-msvc": "1.0.2",
-        "regedit-rs-win32-x64-msvc": "1.0.2"
+        "regedit-rs-win32-arm64-msvc": "1.0.1",
+        "regedit-rs-win32-ia32-msvc": "1.0.1",
+        "regedit-rs-win32-x64-msvc": "1.0.1"
       }
     },
     "regedit-rs-win32-arm64-msvc": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regedit-rs-win32-arm64-msvc/-/regedit-rs-win32-arm64-msvc-1.0.2.tgz",
-      "integrity": "sha512-hM1sxazOJWKmiC9DM8QXW9Iqm50Mh/Y9G4/rRYQpWXjMzq7lTqjwVZRkAoBrHliFS6d1Lt4qkm5+Ybt6GkbDpw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/regedit-rs-win32-arm64-msvc/-/regedit-rs-win32-arm64-msvc-1.0.1.tgz",
+      "integrity": "sha512-QA46d/wiUHlW2h0ZlHKrtDhnwoxMpVle+EbFziEbLYC7dimtAiWCeXu4zNymaFClDimYSifQkWgza5GBmD8etg==",
       "optional": true
     },
     "regedit-rs-win32-ia32-msvc": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regedit-rs-win32-ia32-msvc/-/regedit-rs-win32-ia32-msvc-1.0.2.tgz",
-      "integrity": "sha512-FLINrCJ30wm6NYw7skQUDET8NP1N46kH77dqesCiU+/FjWzzPE5luZYY+j4uf+hKjPY6/MCj2CB9l9VdPhaBVQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/regedit-rs-win32-ia32-msvc/-/regedit-rs-win32-ia32-msvc-1.0.1.tgz",
+      "integrity": "sha512-V2NisvicQqiozl0yMas9tjDYmBwHWf48M/dMJUWMQxxkJaDCNoHW8PljL59A/h8ew2NBFsJK5RYkYfxW1o+OyQ==",
       "optional": true
     },
     "regedit-rs-win32-x64-msvc": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regedit-rs-win32-x64-msvc/-/regedit-rs-win32-x64-msvc-1.0.2.tgz",
-      "integrity": "sha512-ccCSyd5vWBKVWftBKLKzegqwwPMWcQtIW0ub66dCFFuv2s+x2EcZZWGdD9dVXX2Z6V9DU2JRPKgWUNjVPaj6Xg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/regedit-rs-win32-x64-msvc/-/regedit-rs-win32-x64-msvc-1.0.1.tgz",
+      "integrity": "sha512-qhQawjYPzXGrz0xODJiviwrzw0eytGP9+quuQJUQAiLEw2P1tQ0LCyID3jOvNltLH+tqJChSV4JaQcPVleohZg==",
       "optional": true
     },
     "safe-buffer": {

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bs-manager",
-  "version": "1.4.4",
+  "version": "1.4.3",
   "description": "BSManager",
   "main": "./dist/main/main.js",
   "author": {
@@ -15,8 +15,7 @@
   },
   "dependencies": {
     "ps-list": "^7.2.0",
-    "query-process": "^0.0.3",
-    "regedit-rs": "^1.0.2",
+    "regedit-rs": "^1.0.1",
     "sharp": "^0.32.6"
   },
   "license": "MIT"

src/main/decorators/log.decorator.ts

@@ -1,67 +0,0 @@
-import log from "electron-log";
-import { isPromise } from "../../shared/helpers/promise.helpers";
-import { tryit } from "../../shared/helpers/error.helpers";
-
-type LogOptions = {
-    logInput?: boolean;
-    logOutput?: boolean;
-    logArgs?: boolean;
-};
-
-const stringifyArgs = (args: unknown[]) => {
-    return args?.map(a => JSON.stringify(a)).join(', ');
-};
-
-const logInfo = (message: string, propertyKey: string, args: unknown[], logArgs: boolean, result: unknown) => {
-    log.info(`[${message}] ${propertyKey}(${logArgs ? stringifyArgs(args) : ''})`, result);
-};
-
-const logError = (propertyKey: string, args: unknown[], logArgs: boolean, error: unknown) => {
-    log.error(`[ERROR] ${propertyKey}(${logArgs ? stringifyArgs(args) : ''})`, error);
-    throw error;
-};
-
-export function Log(options?: LogOptions){
-
-    const logInput = options?.logInput ?? false;
-    const logOutput = options?.logOutput ?? true;
-    const logArgs = options?.logArgs ?? true;
-
-    return (target: unknown, propertyKey: string, descriptor: PropertyDescriptor) => {
-        const originalMethod = descriptor.value;
-
-        descriptor.value = function(...args: unknown[]) {
-
-            if (logInput) {
-                logInfo('INPUT', propertyKey, args, logArgs, null);
-            }
-
-            const outcome = tryit(() => originalMethod.apply(this, args));
-
-            if (isPromise(outcome)) {
-                return outcome.then(({ result, error }) => {
-
-                    if (error) {
-                        logError(propertyKey, args, logArgs, error);
-                    }
-                    if (logOutput) {
-                        logInfo('OUTPUT', propertyKey, args, logArgs, result);
-                    }
-                    return result;
-                });
-            }
-
-            const { result, error } = outcome;
-
-            if (error) {
-                logError(propertyKey, args, logArgs, error);
-            }
-
-            if (logOutput) {
-                logInfo('OUTPUT', propertyKey, args, logArgs, result);
-            }
-
-            return result;
-        };
-    };
-}

src/main/helpers/os.helpers.ts

@@ -10,16 +10,4 @@ export async function taskRunning(task: string): Promise<boolean> {
         log.error(error);
         return false;
     }
-}
-
-export async function getProcessPid(task: string): Promise<number> {
-    try {
-        const processes = await psList();
-        const process = processes.find(process => process.name?.includes(task) || process.cmd?.includes(task));
-        return process?.pid;
-    }
-    catch(error){
-        log.error(error);
-        return null;
-    }
-}
+}

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

@@ -5,8 +5,6 @@ import { IpcService } from '../services/ipc.service';
 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 isElevated from "is-elevated";
 
 const ipc = IpcService.getInstance();
 
@@ -15,14 +13,6 @@ ipc.on<LaunchOption>('bs-launch.launch', (req, reply) => {
     reply(bsLauncher.launch(req.args));
 });
 
-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();
-    })));
-})
-
 ipc.on<LaunchOption>("create-launch-shortcut", (req, reply) => {
     const bsLauncher = BSLauncherService.getInstance();
     reply(from(bsLauncher.createLaunchShortcut(req.args)));
@@ -39,4 +29,4 @@ ipc.on<void>("restore-original-oculus-folder", (_, reply) => {
     reply(from(
         oculusLauncher.deleteBsSymlinks().then(() => oculusLauncher.restoreOriginalBeatSaber())
     ));
-})
+})

src/main/main.ts

@@ -23,6 +23,7 @@ import { LivShortcut } from "./services/liv/liv-shortcut.service";
 import { SteamLauncherService } from "./services/bs-launcher/steam-launcher.service";
 
 const isDebug = process.env.NODE_ENV === "development" || process.env.DEBUG_PROD === "true";
+const isE2E = process.env.E2E_BUILD === "true";
 
 log.transports.file.level = "info";
 log.transports.file.resolvePath = () => {
@@ -54,7 +55,7 @@ const installExtensions = async () => {
         .catch(log.error);
 };
 
-const createWindow = async (window: AppWindow = "launcher.html") => {
+const createWindow = async (window: AppWindow) => {
     if (isDebug) {
         await installExtensions();
     }
@@ -98,7 +99,7 @@ if (!gotTheLock) {
         const deepLink = process.argv.find(arg => DeepLinkService.getInstance().isDeepLink(arg));
 
         if (!deepLink) {
-            createWindow();
+            createWindow(!isE2E ? "launcher.html" : "index.html");
         } else {
             DeepLinkService.getInstance().dispatchLinkOpened(deepLink);
         }

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

@@ -61,13 +61,13 @@ export class OculusLauncherService extends AbstractLauncherService implements St
         log.info("Symlinks found in Oculus library", symlinks);
 
         const bsSymlinks = symlinks.filter(dirent => dirent.startsWith(OCULUS_BS_DIR));
-
+        
         const bsmSymlinks = (await Promise.all(bsSymlinks.map(async symlink => {
             const symlinkPath = path.join(oculusLibPath, symlink);
             const targetPath = await readlink(symlinkPath).catch(err => log.error(err));
 
             log.info("Oculus Symlink", symlink, "target", targetPath);
-
+            
             if(!targetPath){ return null; }
 
             const bsmVersionsDir = path.join(this.pathsService.INSTALLATION_FOLDER, this.pathsService.VERSIONS_FOLDER);
@@ -138,24 +138,20 @@ export class OculusLauncherService extends AbstractLauncherService implements St
                 if(bsRunning){
                     throw CustomError.fromError(new Error("Cannot start two instance of Beat Saber for Oculus"), BSLaunchError.BS_ALREADY_RUNNING);
                 }
-
+                
                 // Remove previously symlinks created by BSM
                 await this.deleteBsSymlinks().catch(err => log.error("Error while deleting BSM symlinks", err));
 
                 const bsPath = await (launchOptions.version.oculus ? prepareOriginalVersion() : prepareDowngradedVersion());
 
+                // Launch Beat Saber
                 const exePath = path.join(bsPath, BS_EXECUTABLE);
 
                 if(!(await pathExists(exePath))){
                     throw CustomError.fromError(new Error(`BS Path not exist ${bsPath}`), BSLaunchError.BS_NOT_FOUND);
                 }
 
-                // Make sure Oculus is running
-                await this.oculus.startOculus().catch(err => log.error("Error while starting Oculus", err));
-
                 obs.next({type: BSLaunchEvent.BS_LAUNCHING});
-
-                // Launch Beat Saber
                 return this.launchBs(exePath, this.buildBsLaunchArgs(launchOptions)).catch(err => {
                     throw CustomError.fromError(err, BSLaunchError.BS_EXIT_ERROR);
                 });
@@ -174,4 +170,4 @@ export class OculusLauncherService extends AbstractLauncherService implements St
         });
     }
 
-}
+}

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

@@ -8,9 +8,6 @@ import { BS_APP_ID, BS_EXECUTABLE, STEAMVR_APP_ID } from "../../constants";
 import log from "electron-log";
 import { AbstractLauncherService } from "./abstract-launcher.service";
 import { CustomError } from "../../../shared/models/exceptions/custom-error.class";
-import isElevated from "is-elevated";
-import { UtilsService } from "../utils.service";
-import { exec } from "child_process";
 
 export class SteamLauncherService extends AbstractLauncherService implements StoreLauncherInterface{
 
@@ -24,12 +21,10 @@ export class SteamLauncherService extends AbstractLauncherService implements Sto
     }
 
     private readonly steam: SteamService;
-    private readonly util: UtilsService;
 
     private constructor(){
         super();
         this.steam = SteamService.getInstance();
-        this.util = UtilsService.getInstance();
     }
 
     private getSteamVRPath(): Promise<string> {
@@ -46,17 +41,6 @@ export class SteamLauncherService extends AbstractLauncherService implements Sto
         });
     }
 
-    private needStartBsAsAdmin(): Promise<boolean> {
-        return isElevated().then(elevated => {
-            if(elevated){ return false; }
-            return this.steam.isElevated();
-        })
-    }
-
-    private getStartBsAsAdminExePath(): string {
-        return path.join(this.util.getAssetsScriptsPath(), "start_beat_saber_admin.exe");
-    }
-
     public async restoreSteamVR(): Promise<void> {
         const steamVrFolder = await this.getSteamVRPath();
         const steamVrBackup = `${steamVrFolder}.bak`;
@@ -69,7 +53,7 @@ export class SteamLauncherService extends AbstractLauncherService implements Sto
             log.error("Error while restoring SteamVR", err);
         });
     }
-
+    
     public launch(launchOptions: LaunchOption): Observable<BSLaunchEventData>{
 
         return new Observable<BSLaunchEventData>(obs => {(async () => {
@@ -106,24 +90,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} })
-            ) : (
-                new Promise<number>(resolve => {
-                    const adminProcess = exec(`"${this.getStartBsAsAdminExePath()}" "${exePath}" ${launchArgs.join(" ")}`, { env: {...process.env, "SteamAppId": BS_APP_ID} });
-                    adminProcess.on("error", err => {
-                        log.error("Error while starting BS as Admin", err);
-                        resolve(-1)
-                    });
-
-                    setTimeout(() => {
-                        adminProcess.removeAllListeners("error");
-                        resolve(-1);
-                    }, 35_000);
-                })
-            );
-
-            await launchPromise.then(exitCode => {
+            await this.launchBs(exePath, launchArgs, { env: {...process.env, "SteamAppId": BS_APP_ID} }).then(exitCode => {
                 log.info("BS process exit code", exitCode);
             }).catch(err => {
                 throw CustomError.fromError(err, BSLaunchError.BS_EXIT_ERROR);
@@ -142,4 +109,4 @@ export class SteamLauncherService extends AbstractLauncherService implements Sto
         })});
     }
 
-}
+}

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

@@ -1,8 +1,6 @@
 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 {
 
@@ -22,7 +20,6 @@ export class LivService {
 
     }
 
-    @Log()
     public async isLivInstalled(): Promise<boolean> {
         return execOnOs({
             win32: async () => {
@@ -32,7 +29,6 @@ export class LivService {
         }, true);
     }
 
-    @Log()
     public async createLivShortcut(entry: LivEntry): Promise<void> {
         return execOnOs({
             win32: async () => {
@@ -50,7 +46,6 @@ export class LivService {
         });
     }
 
-    @Log()
     public async deleteLivShortcuts(ids: string[]): Promise<void> {
         return execOnOs({
             win32: async () => {
@@ -60,13 +55,11 @@ export class LivService {
         })
     }
 
-    @Log()
     public getLivShortcuts(): Promise<LivEntry[]> {
-
         return execOnOs({
             win32: async () => {
                 const regRes = await list(this.livExternalAppsRegeditKey).then(res => res[this.livExternalAppsRegeditKey]);
-
+                
                 if(!regRes.exists){
                     return [];
                 }

src/main/services/oculus.service.ts

@@ -1,14 +1,9 @@
+import { list } from "regedit-rs";
 import path from "path";
 import { pathExist, resolveGUIDPath } from "../helpers/fs.helpers";
 import log from "electron-log";
 import { lstat } from "fs-extra";
 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;
@@ -47,11 +42,11 @@ export class OculusService {
         const libsPath: OculusLibrary[] = (
             await Promise.all(libsRegData.keys.map(async key => {
                 const originalPath = await list([`${oculusLibsRegKey}\\${key}`]).then(res => res[`${oculusLibsRegKey}\\${key}`]);
-
+                
                 if (originalPath.values?.OriginalPath) {
                     return { id: key, path: originalPath.values.OriginalPath.value, isDefault: defaultLibraryId === key } as OculusLibrary;
-                }
-
+                } 
+                
                 if(originalPath.values?.Path) {
                     const { result } = tryit(() => resolveGUIDPath(originalPath.values.Path.value as string));
                     return result ? { id: key, path: result, isDefault: defaultLibraryId === key } as OculusLibrary : null;
@@ -87,7 +82,7 @@ export class OculusService {
 
     /**
      * Return the first game folder found in the list
-     * @param {string[]} gameFolders
+     * @param {string[]} gameFolders 
      */
     public async tryGetGameFolder(gameFolders: string[]): Promise<string> {
         for(const gameFolder of gameFolders){
@@ -97,29 +92,6 @@ export class OculusService {
 
         return null;
     }
-
-    public oculusRunning(): Promise<boolean> {
-        return taskRunning("OculusClient");
-    }
-
-    public async startOculus(): Promise<void>{
-        if(await this.oculusRunning()){ return; }
-
-        await shell.openPath("oculus://view/homepage");
-
-        return new Promise((resolve, reject) => {
-            const interval = setInterval(async () => {
-                if(!(await this.oculusRunning())){ return; }
-                clearInterval(interval);
-                resolve();
-            }, sToMs(3));
-
-            setTimeout(() => {
-                clearInterval(interval);
-                reject(new Error("Unable to open Oculus"));
-            }, sToMs(30));
-        });
-    }
 }
 
 export interface OculusLibrary {

src/main/services/steam.service.ts

@@ -1,22 +1,15 @@
-import { RegDwordValue } from "regedit-rs"
+import { list, RegDwordValue } from "regedit-rs"
 import path from "path";
 import { parse } from "@node-steam/vdf";
 import { readFile } from "fs/promises";
 import { pathExist } from "../helpers/fs.helpers";
 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");
+import { taskRunning } from "../helpers/os.helpers";
 
 export class SteamService {
 
-    private static readonly PROCESS_NAME = "steam";
-
     private static instance: SteamService;
-
     private steamPath: string = '';
 
     private constructor(){}
@@ -36,25 +29,12 @@ export class SteamService {
     }
 
     public async steamRunning(): Promise<boolean>{
-        const steamProcessRunning = await taskRunning(SteamService.PROCESS_NAME);
+        const steamProcessRunning = await taskRunning("steam");
         if(process.platform === "linux") { return steamProcessRunning; }
         const activeUser = await this.getActiveUser().catch(err => log.error(err));
         return steamProcessRunning && !!activeUser;
     }
 
-    public async getSteamPid(): Promise<number>{
-        return getProcessPid(SteamService.PROCESS_NAME);
-    }
-
-    public async isElevated(): Promise<boolean>{
-        if(process.platform === "linux"){ return true; }
-        const steamPid = await this.getSteamPid();
-
-        if(!steamPid){ return false; }
-
-        return isElevated(steamPid);
-    }
-
     public async getSteamPath(): Promise<string>{
 
         if(this.steamPath){ return this.steamPath; }
@@ -88,7 +68,7 @@ export class SteamService {
             let libraryFolders: any = path.join(steamPath, "steamapps", "libraryfolders.vdf");
 
             if (!(await pathExist(libraryFolders))) { return null; }
-
+            
             libraryFolders = parse(await readFile(libraryFolders, { encoding: "utf-8" }));
 
             if (!libraryFolders.libraryfolders) { return null; }
@@ -103,7 +83,7 @@ export class SteamService {
             }
 
             return null;
-
+            
         } catch (e) {
             log.error(e);
             return null;
@@ -111,7 +91,7 @@ export class SteamService {
     }
 
     public async openSteam(): Promise<void> {
-
+        
         await shell.openPath("steam://open/games");
 
         return new Promise((resolve, reject) => {

src/renderer/components/available-versions/available-version-item.component.tsx

@@ -23,7 +23,7 @@ export const AvailableVersionItem = memo(function AvailableVersionItem({version,
     const formatedDate = useConstant(() => dateFormat(+version.ReleaseDate * 1000, "ddd. d mmm yyyy"));
 
     return (
-        <motion.li className="group relative w-72 h-60 active:scale-[.98]" onClick={onClick} onHoverStart={() => setHovered(true)} onHoverEnd={() => setHovered(false)}>
+        <motion.li id={`version-item-${version.BSManifest}`} className="group relative w-72 h-60 active:scale-[.98]" onClick={onClick} onHoverStart={() => setHovered(true)} onHoverEnd={() => setHovered(false)}>
             <GlowEffect visible={hovered || selected} className="absolute" />
             <div className={`relative flex flex-col overflow-hidden rounded-md w-72 h-60 cursor-pointer group-hover:shadow-none duration-300 bg-light-main-color-2 dark:bg-main-color-2 ${!selected && "shadow-lg shadow-gray-900"}`}>
                 {version.recommended && (

src/renderer/components/available-versions/available-versions-slide.component.tsx

@@ -29,7 +29,7 @@ export function AvailableVersionsSlide({ versions }: Props) {
     }
 
     return (
-        <ol className="w-full flex items-start justify-center gap-6 shrink-0 content-start flex-wrap px-3.5 py-4 overflow-x-hidden overflow-y-scroll scrollbar-thin scrollbar-thumb-rounded-full scrollbar-thumb-neutral-900">
+        <ol id={`version-slide-${versions}`} className="w-full flex items-start justify-center gap-6 shrink-0 content-start flex-wrap px-3.5 py-4 overflow-x-hidden overflow-y-scroll scrollbar-thin scrollbar-thumb-rounded-full scrollbar-thumb-neutral-900">
             {getVersions().map(version => (
                 <AvailableVersionItem key={version.BSManifest} version={version} selected={equal(version, context.selectedVersion)} onClick={() => setSelectedVersion(version)}/>
             ))}

src/renderer/components/available-versions/available-versions-slider.component.tsx

@@ -26,7 +26,7 @@ export function AvailableVersionsSlider() {
 
     return (
         <div className="w-full h-fit max-h-full flex flex-col items-center grow min-h-0 gap-3">
-            <TabNavBar tabIndex={yearIndex} tabsText={availableYears} onTabChange={setSelectedYear} />
+            <TabNavBar id="version-years-tab-bar" tabIndex={yearIndex} tabsText={availableYears} onTabChange={setSelectedYear} />
             <ol className="w-full min-h-0 flex transition-transform duration-300" style={{ transform: `translate(${-(yearIndex * 100)}%, 0)` }}>
                 {availableYears.map(year => (
                     <AvailableVersionsSlide key={year} versions={getVersionOfYear(year)} />

src/renderer/components/modal/modal-types/need-launch-admin-modal.component.tsx

@@ -1,34 +0,0 @@
-import { BsmButton } from "renderer/components/shared/bsm-button.component"
-import { BsmImage } from "renderer/components/shared/bsm-image.component"
-import { ModalComponent, ModalExitCode } from "renderer/services/modale.service"
-import BeatConflict from "../../../../../assets/images/apngs/beat-conflict.png";
-import { useTranslation } from "renderer/hooks/use-translation.hook";
-import { BsmCheckbox } from "renderer/components/shared/bsm-checkbox.component";
-import { useState } from "react";
-
-export const NeedLaunchAdminModal: ModalComponent<boolean, void> = ({resolver}) => {
-
-    const t = useTranslation();
-
-    const [dontShowAgain, setDontShowAgain] = useState(false);
-
-    return (
-        <form className="text-gray-800 dark:text-gray-200 flex flex-col min-w-[350px]">
-            <h1 className="text-3xl uppercase tracking-wide w-full text-center">{t("modals.launch-as-admin.title")}</h1>
-            <BsmImage className="mx-auto h-24" image={BeatConflict} />
-            <div className="flex flex-col gap-3">
-                <p className="w-0 min-w-full">{t("modals.launch-as-admin.body.info")}</p>
-                <p className="w-0 min-w-full">{t("modals.launch-as-admin.body.info-2")}</p>
-                <p className="w-0 min-w-full text-sm italic">{t("modals.launch-as-admin.body.info-3")}</p>
-            </div>
-            <div className="flex flex-row justify-start items-center gap-1.5 my-4">
-                <BsmCheckbox className="relative z-[1] w-6 aspect-square" checked={dontShowAgain} onChange={setDontShowAgain} />
-                <span>{t("modals.launch-as-admin.not-remind-me")}</span>
-            </div>
-            <div className="grid grid-flow-col grid-cols-2 gap-4">
-                <BsmButton typeColor="cancel" className="rounded-md text-center flex items-center justify-center transition-all h-8" onClick={() => resolver({ exitCode: ModalExitCode.CANCELED })} withBar={false} text="misc.cancel" />
-                <BsmButton typeColor="primary" className="rounded-md text-center flex items-center justify-center transition-all h-8" onClick={() => resolver({ exitCode: ModalExitCode.COMPLETED, data: dontShowAgain })} withBar={false} text="modals.launch-as-admin.launch-as-admin" />
-            </div>
-        </form>
-    )
-}

src/renderer/components/nav-bar/bsmanager-icon.component.tsx

@@ -31,7 +31,7 @@ export const BsManagerIcon = memo(({ className }: { className?: string }) => {
     };
 
     return (
-        <motion.div className="cursor-pointer" whileTap={{ rotate: -10 }} variants={transitions} animate={playing && bpm > 0 ? "playing" : "idle"} onClick={clickAction}>
+        <motion.div id="bsm-logo" className="cursor-pointer" whileTap={{ rotate: -10 }} variants={transitions} animate={playing && bpm > 0 ? "playing" : "idle"} onClick={clickAction}>
             <svg className={className} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000">
                 <g fill={firstColor}>
                     <path d="M626.75,485.91l20.82,351.94a35.21,35.21,0,0,1-15.49,31.36L487.37,965.35l-.06,0A35.56,35.56,0,0,1,476,970.12a34.85,34.85,0,0,1-23.51-2.87L136.58,809.9a115.45,115.45,0,0,1-63.75-96.49L52,361.46a35.26,35.26,0,0,1,15.23-31.21l145.05-96.36a35.72,35.72,0,0,1,11.27-4.7,34.87,34.87,0,0,1,23.51,2.87L563,389.42a115.41,115.41,0,0,1,63.75,96.49Z" />

src/renderer/components/nav-bar/nav-bar-items/nav-bar-item.component.tsx

@@ -7,13 +7,14 @@ type Props = {
     progress?: number;
     isActive?: boolean;
     onCancel?: (e: React.MouseEvent) => void;
+    id?: string;
 };
 
-export function NavBarItem({ progress, isDownloading, children, isActive, onCancel }: Props) {
+export function NavBarItem({ progress, isDownloading, children, isActive, onCancel, id }: Props) {
     const { firstColor, secondColor } = useThemeColor();
 
     return (
-        <li className={`outline-none relative p-[1px] overflow-hidden rounded-xl flex justify-center items-center mb-1 ${isDownloading && "nav-item-download"} active:translate-y-[1px]`}>
+        <li id={id} className={`outline-none relative p-[1px] overflow-hidden rounded-xl flex justify-center items-center mb-1 ${isDownloading && "nav-item-download"} active:translate-y-[1px]`}>
             {isDownloading && <div className="download-progress absolute top-0 w-full h-full" style={{ transform: `translate(${-(100 - progress)}%, 0)`, background: `linear-gradient(90deg, ${firstColor}, ${secondColor}, ${firstColor}, ${secondColor})` }} />}
             <div className={`wrapper z-[1] px-1 py-[3px] w-full rounded-xl ${isDownloading && "bg-white dark:bg-black"} ${!isDownloading && "hover:bg-light-main-color-3 dark:hover:bg-main-color-3"} ${isActive && !isDownloading && "bg-light-main-color-3 dark:bg-main-color-3"}`}>
                 {children}

src/renderer/components/nav-bar/nav-bar-items/shared-nav-bar-item.component.tsx

@@ -16,7 +16,7 @@ export function SharedNavBarItem() {
     const color = useThemeColor("first-color");
 
     return (
-        <NavBarItem isActive={route === "/shared"}>
+        <NavBarItem id="shared-contents-btn" isActive={route === "/shared"}>
             <Tippy content={t("nav-bar.shared.tooltip")} className="font-bold !bg-neutral-900" placement="right-end" arrow={false} duration={[100, 0]} animation="shift-away-subtle">
                 <Link to="shared" className="w-full flex items-center justify-start content-center max-w-full h-[30px]">
                     <BsmIcon className="w-[19px] h-[19px] mr-[5px] shrink-0 brightness-125" icon="link" style={{ color }} />

src/renderer/components/nav-bar/nav-bar.component.tsx

@@ -48,12 +48,12 @@ export function NavBar() {
             <NavBarSpliter />
             <div className="w-full pb-2 flex flex-col items-center content-center justify-start gap-1">
                 <Tippy placement="right" content={t("nav-bar.add-version")} className="!bg-neutral-900" arrow={false}>
-                    <Link className="rounded-md w-9 h-9 flex justify-center items-center hover:bg-light-main-color-3 dark:hover:bg-main-color-3" to="blah">
+                    <Link id="add-version-btn" className="rounded-md w-9 h-9 flex justify-center items-center hover:bg-light-main-color-3 dark:hover:bg-main-color-3" to="blah">
                         <BsmIcon icon="add" className="text-blue-500 h-[34px]" style={{ color }} />
                     </Link>
                 </Tippy>
                 <Tippy placement="right" content={t("nav-bar.settings")} className="!bg-neutral-900" arrow={false}>
-                    <Link className="rounded-md w-9 h-9 flex justify-center items-center hover:bg-light-main-color-3 dark:hover:bg-main-color-3" to="settings">
+                    <Link id="settings-btn" className="rounded-md w-9 h-9 flex justify-center items-center hover:bg-light-main-color-3 dark:hover:bg-main-color-3" to="settings">
                         <BsmIcon icon="settings" className="text-blue-500 h-7" style={{ color }} />
                     </Link>
                 </Tippy>

src/renderer/components/shared/bsm-button.component.tsx

@@ -9,6 +9,7 @@ import { getCorrectTextColor } from "renderer/helpers/correct-text-color";
 type BsmButtonType = "primary" | "secondary" | "success" | "cancel" | "error";
 
 type Props = {
+    id?: string;
     className?: string;
     style?: CSSProperties;
     imgClassName?: string;
@@ -29,7 +30,7 @@ type Props = {
     textClassName?: string;
 };
 
-export function BsmButton({ className, style, imgClassName, iconClassName, icon, image, text, type, active, withBar = true, disabled, onClickOutside, onClick, typeColor, color, title, iconColor, textClassName }: Props) {
+export function BsmButton({ id, className, style, imgClassName, iconClassName, icon, image, text, type, active, withBar = true, disabled, onClickOutside, onClick, typeColor, color, title, iconColor, textClassName }: Props) {
     const t = useTranslation();
     const { firstColor, secondColor } = useThemeColor();
     const ref = useRef(null);
@@ -72,7 +73,7 @@ export function BsmButton({ className, style, imgClassName, iconClassName, icon,
     const handleClick = (e: MouseEvent<HTMLDivElement>) => !disabled && onClick?.(e);
 
     return (
-        <div ref={ref} onClick={handleClick} title={t(title)} className={`${className} overflow-hidden group ${!withBar && !disabled && (!!typeColor || !!color) && "hover:brightness-[1.15]"} ${disabled ? "brightness-75 cursor-not-allowed" : "cursor-pointer"} ${renderTypeColor}`} style={{ ...style, backgroundColor: primaryColor || color }}>
+        <div id={id} ref={ref} onClick={handleClick} title={t(title)} className={`${className} overflow-hidden group ${!withBar && !disabled && (!!typeColor || !!color) && "hover:brightness-[1.15]"} ${disabled ? "brightness-75 cursor-not-allowed" : "cursor-pointer"} ${renderTypeColor}`} style={{ ...style, backgroundColor: primaryColor || color }}>
             {image && <BsmImage image={image} className={imgClassName} />}
             {icon && <BsmIcon icon={icon} className={iconClassName ?? "h-full w-full text-gray-800 dark:text-white"} style={{ color: iconColor || textColor }} />}
             {text &&

src/renderer/components/shared/tab-nav-bar.component.tsx

@@ -4,6 +4,7 @@ import { useTranslation } from "renderer/hooks/use-translation.hook";
 import { LaserSlider } from "./laser-slider.component";
 
 type Props = {
+    id?: string,
     tabIndex: number;
     tabsText: string[];
     onTabChange: (index: number) => void;
@@ -22,7 +23,7 @@ export function TabNavBar(props: Props) {
     };
 
     return (
-        <nav className={`relative h-8 shrink-0 cursor-pointer rounded-md overflow-hidden shadow-md shadow-black bg-light-main-color-2 dark:bg-main-color-2 ${props.className}`}>
+        <nav id={props.id} className={`relative h-8 shrink-0 cursor-pointer rounded-md overflow-hidden shadow-md shadow-black bg-light-main-color-2 dark:bg-main-color-2 ${props.className}`}>
             <LaserSlider className="absolute w-full h-1 bottom-0" mode="horizontal" color={secondColor} nbSteps={props.tabsText.length} step={currentIndex} />
             <ul className="grid" style={{ gridTemplateColumns: `repeat(${props.tabsText.length}, minmax(0, 1fr))` }}>
                 {props.tabsText.map((text, index) =>

src/renderer/pages/available-versions-list.components.tsx

@@ -56,7 +56,7 @@ export function AvailableVersionsList() {
             <AnimatePresence>
                 {selectedVersion && !downloading && (
                     <motion.div initial={{ y: "150%" }} animate={{ y: "0%" }} exit={{ y: "150%" }} className="absolute bottom-5" onClick={startDownload}>
-                        <BsmButton text="misc.download" className="relative text-gray-800 dark:text-gray-100 rounded-md text-3xl font-bold italic tracking-wide px-3 pb-2 pt-1 shadow-md shadow-black" />
+                        <BsmButton id="download-version-btn" text="misc.download" className="relative text-gray-800 dark:text-gray-100 rounded-md text-3xl font-bold italic tracking-wide px-3 pb-2 pt-1 shadow-md shadow-black" />
                     </motion.div>
                 )}
             </AnimatePresence>

src/renderer/services/bs-launcher.service.ts

@@ -10,7 +10,6 @@ import { ModalExitCode, ModalService } from "./modale.service";
 import { OriginalOculusVersionBackupModal } from "renderer/components/modal/modal-types/original-oculus-version-backup.modal";
 import { CustomError } from "shared/models/exceptions/custom-error.class";
 import { sToMs } from "shared/helpers/time.helpers";
-import { NeedLaunchAdminModal } from "renderer/components/modal/modal-types/need-launch-admin-modal.component";
 
 export class BSLauncherService {
     private static instance: BSLauncherService;
@@ -22,7 +21,7 @@ export class BSLauncherService {
     private readonly modals: ModalService;
 
     public readonly versionRunning$: BehaviorSubject<BSVersion> = new BehaviorSubject(null);
-
+   
     public static getInstance(){
         if(!BSLauncherService.instance){ BSLauncherService.instance = new BSLauncherService(); }
         return BSLauncherService.instance;
@@ -71,17 +70,7 @@ export class BSLauncherService {
             }
         }))
     }
-
-    private async doMustStartAsAdmin(): Promise<boolean> {
-        const needAdmin = await lastValueFrom(this.ipcService.sendV2<boolean, void>("bs-launch.need-start-as-admin"));
-        if(!needAdmin){ return false; }
-        if(this.config.get("dont-remind-admin")){ return true; }
-        const modalRes = await this.modals.openModal(NeedLaunchAdminModal);
-        if(modalRes.exitCode !== ModalExitCode.COMPLETED){ throw new Error("Admin launch canceled"); }
-        this.config.set("dont-remind-admin", modalRes.data);
-        return true;
-    }
-
+    
     public doLaunch(launchOptions: LaunchOption): Observable<BSLaunchEventData>{
         return this.ipcService.sendV2<BSLaunchEventData, LaunchOption>("bs-launch.launch", {args: launchOptions});
     }
@@ -90,21 +79,17 @@ export class BSLauncherService {
 
         return new Observable<BSLaunchEventData>(obs => {
             (async () => {
-
+                
                 if(launchOptions.version.metadata?.store === BsStore.OCULUS && !this.notRewindBackupOculus()){
                     const { exitCode, data: notRewind } = await this.modals.openModal(OriginalOculusVersionBackupModal);
                     if(exitCode !== ModalExitCode.COMPLETED){ return; }
                     this.setNotRewindBackupOculus(notRewind);
                 }
-
-                if(launchOptions.version.metadata?.store !== BsStore.OCULUS){
-                    launchOptions.admin = await this.doMustStartAsAdmin();
-                }
-
+                
                 const launch$ = this.handleLaunchEvents(this.doLaunch(launchOptions));
 
                 await lastValueFrom(launch$);
-
+                
             })().then(() => {
                 obs.complete();
             }).catch(err => {

src/shared/helpers/error.helpers.ts

@@ -1,22 +1,7 @@
-import { isPromise } from "./promise.helpers";
-
-type TryitReturn<Return> = Return extends Promise<any> ? Promise<{ error: Error | null, result: Awaited<Return> | null }> : { error: Error | null, result: Return | null };
-
-export function tryit<Return>(func: () => Return): TryitReturn<Return> {
+export function tryit<Return>(func: () => Return): {error: Error, result: Return} {
     try {
-        const result = func();
-
-        if(isPromise(result)){
-            return result
-                .then((value) => ({ error: null, result: value }))
-                .catch((err) => ({ error: err instanceof Error ? err : new Error(`${err}`), result: null })) as Return extends Promise<any>
-                ? Promise<{error: Error, result: undefined} | {error: undefined, result: Awaited<Return>}>
-                : {error: Error, result: undefined} | {error: undefined, result: Return};
-        }
-
-        return { error: undefined, result } as TryitReturn<Return>;
-
+        return { error: null, result: func() };
     } catch (err) {
-        return { error: err, result: undefined } as TryitReturn<Return>;
+        return { error: err instanceof Error ? err : new Error(`${err}`), result: null }
     }
-}
+}

src/shared/helpers/function.helpers.ts

@@ -1,3 +0,0 @@
-export function isFunction(value: any): value is Function {
-    return !!(value && value.constructor && value.call && value.apply)
-}

src/shared/helpers/promise.helpers.ts

@@ -1,5 +1,3 @@
-import { isFunction } from "./function.helpers";
-
 export type AllSettledHelperOptions = {
     keepStructure?: boolean;
     removeFalsy?: boolean;
@@ -22,9 +20,8 @@ export async function allSettled<T>(promises: Promise<T>[], options?: AllSettled
     }, []);
 }
 
-export function isPromise(value: any): value is Promise<unknown> {
-    if(!value) { return false; }
-    if(!value.then) { return false; }
-    if(!isFunction(value.then)) { return false; }
-    return true;
+export async function pause(ms: number): Promise<void>{
+    return new Promise((resolve) => {
+        setTimeout(() => resolve(), ms);
+    });
 }

src/shared/models/bs-launch/launch-option.interface.ts

@@ -5,6 +5,5 @@ export interface LaunchOption {
     oculus?: boolean,
     desktop?: boolean,
     debug?: boolean,
-    additionalArgs?: string[],
-    admin?: boolean,
+    additionalArgs?: string[]
 }

tsconfig.json

@@ -20,8 +20,7 @@
         "resolveJsonModule": true,
         "allowJs": true,
         "outDir": "release/app/dist",
-        "strictNullChecks": false,
-        "experimentalDecorators": true
+        "strictNullChecks": false
     },
     "exclude": ["test", "release/build", "release/app/dist", ".erb/dll"]
 }