add patch caching

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Description**
+[A clear and concise description of what the bug is.]
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+[A clear and concise description of what you expected to happen.]
+
+**Screenshots**
+[If applicable, add screenshots to help explain your problem.]
+
+**Version information**
+ - SteamOS Version: ``[Run ``uname -a`` and place the output here. Leave the single quotations outside.]``
+ - Selected Update Channel: [Stable, Beta or Preview.]
+
+**Logs**
+[Please reboot your deck (if possible) when attempting to recreate the issue, then run
+``cd ~ && journalctl -b0  -u plugin_loader.service > backendlog.txt``. This will save the log file to ``~`` aka ``/home/deck``. Please upload the file here in place of this textblock.]
+
+**Additional context**
+Have you modified the read-only filesystem at any point?  
+[Yes or No.]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,73 +0,0 @@
-name: Bug report
-description: File a bug/issue
-title: "[BUG] <title>"
-labels: [bug]
-body:
-  - type: checkboxes
-    id: low-effort-checks
-    attributes:
-      label: Please confirm
-      description: Issues without all checks may be ignored/closed.
-      options:
-        - label: I have searched existing issues
-        - label: This issue is not a duplicate of an existing one
-        - label: I have checked the [common issues section in the readme file](https://github.com/SteamDeckHomebrew/decky-loader#-common-issues)
-
-  - type: textarea
-    attributes:
-      label: Bug Report Description
-      description: A clear and concise description of what the bug is and if possible, the steps you used to get to the bug. If appropriate, include screenshots or videos.
-      placeholder: |
-        When I try to use ...
-
-        Steps to reproduce the behavior:
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Expected Behaviour
-      description: A brief description of the expected behavior.
-      placeholder: It should be ...
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: SteamOS version
-#      description: Can be found with `uname -a`
-#      placeholder: "Linux steamdeck 5.13.0-valve36-1-neptune #1 SMP PREEMPT Mon, 19 Dec 2022 23:39:41 +0000 x86_64 GNU/Linux"
-      placeholder: "SteamOS 3.4.3 Stable"
-    validations:
-      required: true
-
-  - type: dropdown
-    attributes:
-      label: Selected Update Channel
-      description: Which branch of Decky are you on?
-      multiple: false
-      options:
-         - Stable
-         - Prerelease
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Have you modified the read-only filesystem at any point?
-      description: Describe how here, if you haven't done anything you can leave this blank
-      placeholder: Yes, I've installed neofetch via pacman.
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Logs
-      description: Please reboot your deck (if possible) when attempting to recreate the issue, then run ``cd ~ && journalctl -b0  -u plugin_loader.service > deckylog.txt``. This will save the log file to ``~`` aka ``/home/deck``. Please upload the file here
-      placeholder: deckylog.txt
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Steam Deck Homebrew Discord Server
-    url: https://discord.gg/ZU74G2NJzk
-    about: Please ask and answer questions here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,35 +0,0 @@
-name: Feature request
-description: Request a new feature (NOT A PLUGIN)
-title: "[Request] <title>"
-labels: [feature request]
-body:
-  - type: checkboxes
-    id: low-effort-checks
-    attributes:
-      label: Please confirm
-      description: Issues without all checks may be ignored/closed.
-      options:
-        - label: I have searched existing issues
-        - label: This issue is not a duplicate of an existing one
-        - label: This is not a request for a plugin
-
-  - type: textarea
-    attributes:
-      label: Feature Request Description
-      description: A clear and concise description of what the new feature. 
-      placeholder: |
-        Decky plugins should be sortable in the quick access menu
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Further Description
-      description: A further explanation of the feature. If appropriate, include screenshots or videos.
-      placeholder: |
-        This would help make the UI clearer and easier to use as there is less clutter in the QAM.
-        It would also make it faster to access plugins that are used more.
-
-        This could be implemented by adding ...
-    validations:
-      required: false

.github/workflows/build.yml

@@ -130,7 +130,9 @@ jobs:
             OUT=$(semver bump ${{github.event.inputs.bump}} "$OUT")
             printf "OUT: ${OUT}\n"
           else
-            printf "no type selected, not bumping for release.\n"
+            printf "no type selected, defaulting to patch.\n"
+            OUT=$(semver bump patch "$OUT")
+            printf "OUT: ${OUT}\n"
           fi
         elif [[ ! "$VERSION" =~ "-pre" ]]; then
           printf "previous tag is a release, bumping by selected type.\n"
@@ -157,7 +159,7 @@ jobs:
       uses: softprops/action-gh-release@v1
       if: ${{ github.event_name == 'workflow_dispatch' && !env.ACT  }}
       with:
-        name: Release ${{ steps.ready_tag.outputs.tag_name }}
+        name: Prerelease ${{ steps.ready_tag.outputs.tag_name }}
         tag_name: ${{ steps.ready_tag.outputs.tag_name }}
         files: ./dist/PluginLoader
         prerelease: false

.github/workflows/lint.yml

@@ -1,27 +0,0 @@
-name: Lint
-
-on:
-  push:
-
-jobs:
-  lint:
-    name: Run linters
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v2 # Check out the repository first.
-      - name: Run prettier (JavaScript & TypeScript)
-        run: |
-          pushd frontend
-          npm install
-          npm run lint
-
-      - name: Run black (Python formatting)
-        uses: lgeiger/black-action@v1.0.1
-        with:
-          args: "./backend --experimental-string-processing --config ./backend/pyproject.toml"
-
-      - name: Run ruff (Python linting)
-        uses: jpetrucciani/ruff-check@main
-        with:
-          path: "./backend"

README.md

@@ -1,9 +1,7 @@
 <h1 align="center">
-  <a name="logo" href="https://deckbrew.xyz/"><img src="https://deckbrew.xyz/static/icon-45ca1f5aea376a9ad37e92db906f283e.png" alt="Deckbrew logo" width="200"></a>
+  <a name="logo" href="https://deckbrew.xyz/"><img src="https://deckbrew.xyz/logo.png" alt="Deckbrew logo" width="200"></a>
   <br>
   Decky Loader
-  <br>
-  <a name="logo" href="https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/decky_installer.desktop"><img src="./docs/images/download_button.png"  alt="Download decky" width="350"></a>
 </h1>
 
 <p align="center">
@@ -36,10 +34,13 @@ For more information about Decky Loader as well as documentation and development
 - Crankshaft is incompatible with Decky Loader. If you are using Crankshaft, please uninstall it before installing Decky Loader.
 - Syncthing may use port 8080 on Steam Deck, which Decky Loader needs to function. If you are using Syncthing as a service, please change its port to something else.
 - If you are using any software that uses port 1337 or 8080, please change its port to something else or uninstall it.
-- If you run the installer and it just opens a file in a text editor: click the (...) button in the top right of dolphin (the file manager) then 'configure' and 'configure dolphin'. Click on the 'confirmations' tab and set 'when opening an executable file' to 'run script'.
 
 ## 💾 Installation
-- This installation can be done without an admin/sudo password set.
+
+1. Press the <img src="./docs/images/light/steam.svg#gh-dark-mode-only" height=16><img src="./docs/images/dark/steam.svg#gh-light-mode-only" height=16> button and open the Settings menu.
+1. Navigate to the System menu and scroll to the System Settings. Toggle "Enable Developer Mode" so it is enabled.
+1. Navigate to the Developer menu and scroll to Miscellaneous. Toggle "CEF Remote Debugging" so it is enabled.
+1. Select "Restart Now" to apply your changes.
 1. Prepare a mouse and keyboard if possible.
    - Keyboards and mice can be connected to the Steam Deck via USB-C or Bluetooth.
    - Many Bluetooth keyboard and mouse apps are available for iOS and Android.
@@ -47,27 +48,24 @@ For more information about Decky Loader as well as documentation and development
    - If you have no other options, use the right trackpad as a mouse and press <img src="./docs/images/light/steam.svg#gh-dark-mode-only" height=16><img src="./docs/images/dark/steam.svg#gh-light-mode-only" height=16>+<img src="./docs/images/light/x.svg#gh-dark-mode-only" height=16><img src="./docs/images/dark/x.svg#gh-light-mode-only" height=16> to open the on-screen keyboard as needed.
 1. Press the <img src="./docs/images/light/steam.svg#gh-dark-mode-only" height=16><img src="./docs/images/dark/steam.svg#gh-light-mode-only" height=16> button and open the Power menu.
 1. Select "Switch to Desktop".
-1. Navigate to this Github page on a browser of your choice.
-1. Press the 'Download' button at the top of the page.
-1. Run the downloaded file by clicking on it in Dolphin (the file manager).
-1. Either type your admin password or allow Decky to temporarily set your password to `Decky!`
-1. Choose the version of Decky Loader you want to install.
+1. Open the Konsole app and enter the command `passwd`. You can skip this step if you have already created a sudo password using this command. ([YouTube Guide](https://www.youtube.com/watch?v=1vOMYGj22rQ))
+1. You will be prompted to create a password. Your text will not be visible. After you press enter, you will need to type your password again to confirm.
+1. Choose the version of Decky Loader you want to install and paste the following command into the Konsole app.
    - **Latest Release**  
      Intended for most users. This is the latest stable version of Decky Loader.  
+     `curl -L https://github.com/SteamDeckHomebrew/decky-loader/raw/main/dist/install_release.sh | sh`
    - **Latest Pre-Release**  
-     Intended for plugin developers. Pre-releases are unlikely to be fully stable but contain the latest changes. For more information on plugin development, please consult [the wiki page](https://deckbrew.xyz/en/loader-dev/development).
+     Intended for plugin developers. Pre-releases are unlikely to be fully stable but contain the latest changes. For more information on plugin development, please consult [the wiki page](https://deckbrew.xyz/en/loader-dev/development).  
+     `curl -L https://github.com/SteamDeckHomebrew/decky-loader/raw/main/dist/install_prerelease.sh | sh`
 1. Open the Return to Gaming Mode shortcut on your desktop.
 
-- There is also a fast install for those who can use Konsole. Run `curl -L https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/install_release.sh | sh` and type your password when prompted.
-
 ### 👋 Uninstallation
 
 We are sorry to see you go! If you are considering uninstalling because you are having issues, please consider [opening an issue](https://github.com/SteamDeckHomebrew/decky-loader/issues) or [joining our Discord](https://discord.gg/ZU74G2NJzk) so we can help you and other users.
 
 1. Press the <img src="./docs/images/light/steam.svg#gh-dark-mode-only" height=16><img src="./docs/images/dark/steam.svg#gh-light-mode-only" height=16> button and open the Power menu.
 1. Select "Switch to Desktop".
-1. Run the installer file again, and select `uninstall decky loader` 
-- There is also a fast uninstall for those who can use Konsole. Run `curl -L https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/uninstall.sh | sh` and type your password when prompted.
+1. Open the Konsole app and run `curl -L https://github.com/SteamDeckHomebrew/decky-loader/raw/main/dist/uninstall.sh | sh`.
 
 ## 🚀 Getting Started
 

act/run-act.sh

@@ -26,10 +26,10 @@ cd ..
 
 if [[ "$type" == "release" ]]; then
     printf "release!\n"
-    act workflow_dispatch -e act/release.json --artifact-server-path act/artifacts --container-architecture linux/amd64
+    act workflow_dispatch -e act/release.json --artifact-server-path act/artifacts
 elif [[ "$type" == "prerelease" ]]; then
     printf "prerelease!\n"
-    act workflow_dispatch -e act/prerelease.json --artifact-server-path act/artifacts --container-architecture linux/amd64
+    act workflow_dispatch -e act/prerelease.json --artifact-server-path act/artifacts
 else
     printf "Release type unspecified/badly specified.\n"
     printf "Options: 'release' or 'prerelease'\n"

backend/browser.py

@@ -1,33 +1,25 @@
 # Full imports
 import json
 
-# import pprint
-# from pprint import pformat
-
 # Partial imports
-from aiohttp import ClientSession
-from asyncio import sleep
+from aiohttp import ClientSession, web
+from asyncio import get_event_loop, sleep
+from concurrent.futures import ProcessPoolExecutor
 from hashlib import sha256
 from io import BytesIO
 from logging import getLogger
-from os import R_OK, W_OK, path, listdir, access, mkdir
+from os import R_OK, W_OK, path, rename, listdir, access, mkdir
 from shutil import rmtree
 from subprocess import call
 from time import time
 from zipfile import ZipFile
 
 # Local modules
-from helpers import (
-    get_ssl_context,
-    get_user,
-    get_user_group,
-    download_remote_binary_to_path,
-)
+from helpers import get_ssl_context, get_user, get_user_group, download_remote_binary_to_path
 from injector import get_gamepadui_tab
 
 logger = getLogger("Browser")
 
-
 class PluginInstallContext:
     def __init__(self, artifact, name, version, hash) -> None:
         self.artifact = artifact
@@ -35,7 +27,6 @@ class PluginInstallContext:
         self.version = version
         self.hash = hash
 
-
 class PluginBrowser:
     def __init__(self, plugin_path, plugins, loader) -> None:
         self.plugin_path = plugin_path
@@ -50,40 +41,32 @@ class PluginBrowser:
         zip_file = ZipFile(zip)
         zip_file.extractall(self.plugin_path)
         plugin_dir = self.find_plugin_folder(name)
-        code_chown = call(
-            ["chown", "-R", get_user() + ":" + get_user_group(), plugin_dir]
-        )
+        code_chown = call(["chown", "-R", get_user()+":"+get_user_group(), plugin_dir])
         code_chmod = call(["chmod", "-R", "555", plugin_dir])
         if code_chown != 0 or code_chmod != 0:
-            logger.error(
-                f"chown/chmod exited with a non-zero exit code (chown: {code_chown},"
-                f" chmod: {code_chmod})"
-            )
+            logger.error(f"chown/chmod exited with a non-zero exit code (chown: {code_chown}, chmod: {code_chmod})")
             return False
         return True
-
+    
     async def _download_remote_binaries_for_plugin_with_name(self, pluginBasePath):
         rv = False
         try:
-            packageJsonPath = path.join(pluginBasePath, "package.json")
-            pluginBinPath = path.join(pluginBasePath, "bin")
+            packageJsonPath = path.join(pluginBasePath, 'package.json')
+            pluginBinPath = path.join(pluginBasePath, 'bin')
 
             if access(packageJsonPath, R_OK):
                 with open(packageJsonPath, "r", encoding="utf-8") as f:
                     packageJson = json.load(f)
-                    if (
-                        "remote_binary" in packageJson
-                        and len(packageJson["remote_binary"]) > 0
-                    ):
+                    if "remote_binary" in packageJson and len(packageJson["remote_binary"]) > 0:
                         # create bin directory if needed.
-                        call(["chmod", "-R", "777", pluginBasePath])
+                        rc=call(["chmod", "-R", "777", pluginBasePath])
                         if access(pluginBasePath, W_OK):
-
+                            
                             if not path.exists(pluginBinPath):
                                 mkdir(pluginBinPath)
-
+                            
                             if not access(pluginBinPath, W_OK):
-                                call(["chmod", "-R", "777", pluginBinPath])
+                                rc=call(["chmod", "-R", "777", pluginBinPath])
 
                         rv = True
                         for remoteBinary in packageJson["remote_binary"]:
@@ -91,29 +74,16 @@ class PluginBrowser:
                             binName = remoteBinary["name"]
                             binURL = remoteBinary["url"]
                             binHash = remoteBinary["sha256hash"]
-                            if not await download_remote_binary_to_path(
-                                binURL, binHash, path.join(pluginBinPath, binName)
-                            ):
+                            if not await download_remote_binary_to_path(binURL, binHash, path.join(pluginBinPath, binName)):
                                 rv = False
-                                raise Exception(
-                                    "Error Downloading Remote Binary"
-                                    f" {binName}@{binURL} with hash {binHash} to"
-                                    f" {path.join(pluginBinPath, binName)}"
-                                )
+                                raise Exception(f"Error Downloading Remote Binary {binName}@{binURL} with hash {binHash} to {path.join(pluginBinPath, binName)}")
 
-                        call(
-                            [
-                                "chown",
-                                "-R",
-                                get_user() + ":" + get_user_group(),
-                                self.plugin_path,
-                            ]
-                        )
-                        call(["chmod", "-R", "555", pluginBasePath])
+                        code_chown = call(["chown", "-R", get_user()+":"+get_user_group(), self.plugin_path])
+                        rc=call(["chmod", "-R", "555", pluginBasePath])
                     else:
                         rv = True
-                        logger.debug("No Remote Binaries to Download")
-
+                        logger.debug(f"No Remote Binaries to Download")
+                
         except Exception as e:
             rv = False
             logger.debug(str(e))
@@ -123,16 +93,12 @@ class PluginBrowser:
     def find_plugin_folder(self, name):
         for folder in listdir(self.plugin_path):
             try:
-                with open(
-                    path.join(self.plugin_path, folder, "plugin.json"),
-                    "r",
-                    encoding="utf-8",
-                ) as f:
+                with open(path.join(self.plugin_path, folder, 'plugin.json'), "r", encoding="utf-8") as f:
                     plugin = json.load(f)
 
-                if plugin["name"] == name:
+                if plugin['name'] == name:
                     return str(path.join(self.plugin_path, folder))
-            except Exception:
+            except:
                 logger.debug(f"skipping {folder}")
 
     async def uninstall_plugin(self, name):
@@ -142,27 +108,18 @@ class PluginBrowser:
         try:
             logger.info("uninstalling " + name)
             logger.info(" at dir " + self.find_plugin_folder(name))
-            logger.debug("calling frontend unload for %s" % str(name))
-            res = await tab.evaluate_js(f"DeckyPluginLoader.unloadPlugin('{name}')")
-            logger.debug("result of unload from UI: %s", res)
-            # plugins_snapshot = self.plugins.copy()
-            # snapshot_string = pformat(plugins_snapshot)
-            # logger.debug("current plugins: %s", snapshot_string)
+            logger.debug("unloading %s" % str(name))
+            await tab.evaluate_js(f"DeckyPluginLoader.unloadPlugin('{name}')")
             if self.plugins[name]:
-                logger.debug("Plugin %s was found", name)
                 self.plugins[name].stop()
-                logger.debug("Plugin %s was stopped", name)
                 del self.plugins[name]
-                logger.debug("Plugin %s was removed from the dictionary", name)
             logger.debug("removing files %s" % str(name))
             rmtree(self.find_plugin_folder(name))
         except FileNotFoundError:
             logger.warning(f"Plugin {name} not installed, skipping uninstallation")
         except Exception as e:
-            logger.error(
-                f"Plugin {name} in {self.find_plugin_folder(name)} was not uninstalled"
-            )
-            logger.error("Error at %s", exc_info=e)
+            logger.error(f"Plugin {name} in {self.find_plugin_folder(name)} was not uninstalled")
+            logger.error(f"Error at %s", exc_info=e)
         if self.loader.watcher:
             self.loader.watcher.disabled = False
 
@@ -174,11 +131,8 @@ class PluginBrowser:
             pluginFolderPath = self.find_plugin_folder(name)
             if pluginFolderPath:
                 isInstalled = True
-        except Exception:
-            logger.error(
-                f"Failed to determine if {name} is already installed, continuing"
-                " anyway."
-            )
+        except:
+            logger.error(f"Failed to determine if {name} is already installed, continuing anyway.")
         logger.info(f"Installing {name} (Version: {version})")
         async with ClientSession() as client:
             logger.debug(f"Fetching {artifact}")
@@ -192,26 +146,22 @@ class PluginBrowser:
                     try:
                         logger.debug("Uninstalling existing plugin...")
                         await self.uninstall_plugin(name)
-                    except Exception:
+                    except:
                         logger.error(f"Plugin {name} could not be uninstalled.")
                 logger.debug("Unzipping...")
                 ret = self._unzip_to_plugin_dir(res_zip, name, hash)
                 if ret:
                     plugin_dir = self.find_plugin_folder(name)
-                    ret = await self._download_remote_binaries_for_plugin_with_name(
-                        plugin_dir
-                    )
+                    ret = await self._download_remote_binaries_for_plugin_with_name(plugin_dir)
                     if ret:
                         logger.info(f"Installed {name} (Version: {version})")
                         if name in self.loader.plugins:
                             self.loader.plugins[name].stop()
                             self.loader.plugins.pop(name, None)
                         await sleep(1)
-                        self.loader.import_plugin(
-                            path.join(plugin_dir, "main.py"), plugin_dir
-                        )
+                        self.loader.import_plugin(path.join(plugin_dir, "main.py"), plugin_dir)
                     else:
-                        logger.fatal("Failed Downloading Remote Binaries")
+                        logger.fatal(f"Failed Downloading Remote Binaries")
                 else:
                     self.log.fatal(f"SHA-256 Mismatch!!!! {name} (Version: {version})")
                 if self.loader.watcher:
@@ -221,21 +171,14 @@ class PluginBrowser:
 
     async def request_plugin_install(self, artifact, name, version, hash):
         request_id = str(time())
-        self.install_requests[request_id] = PluginInstallContext(
-            artifact, name, version, hash
-        )
+        self.install_requests[request_id] = PluginInstallContext(artifact, name, version, hash)
         tab = await get_gamepadui_tab()
         await tab.open_websocket()
-        await tab.evaluate_js(
-            f"DeckyPluginLoader.addPluginInstallPrompt('{name}', '{version}',"
-            f" '{request_id}', '{hash}')"
-        )
+        await tab.evaluate_js(f"DeckyPluginLoader.addPluginInstallPrompt('{name}', '{version}', '{request_id}', '{hash}')")
 
     async def confirm_plugin_install(self, request_id):
         request = self.install_requests.pop(request_id)
-        await self._install(
-            request.artifact, request.name, request.version, request.hash
-        )
+        await self._install(request.artifact, request.name, request.version, request.hash)
 
     def cancel_plugin_install(self, request_id):
         self.install_requests.pop(request_id)

backend/helpers.py

@@ -5,7 +5,8 @@ import ssl
 import subprocess
 import uuid
 import os
-import sys
+from subprocess import check_output
+from time import sleep
 from hashlib import sha256
 from io import BytesIO
 
@@ -18,138 +19,83 @@ REMOTE_DEBUGGER_UNIT = "steam-web-debug-portforward.service"
 # global vars
 csrf_token = str(uuid.uuid4())
 ssl_ctx = ssl.create_default_context(cafile=certifi.where())
+user = None
+group = None
 
 assets_regex = re.compile("^/plugins/.*/assets/.*")
 frontend_regex = re.compile("^/frontend/.*")
 
-
 def get_ssl_context():
     return ssl_ctx
 
-
 def get_csrf_token():
     return csrf_token
 
-
 @middleware
 async def csrf_middleware(request, handler):
-    if (
-        str(request.method) == "OPTIONS"
-        or request.headers.get("Authentication") == csrf_token
-        or str(request.rel_url) == "/auth/token"
-        or str(request.rel_url).startswith("/plugins/load_main/")
-        or str(request.rel_url).startswith("/static/")
-        or str(request.rel_url).startswith("/legacy/")
-        or str(request.rel_url).startswith("/steam_resource/")
-        or str(request.rel_url).startswith("/frontend/")
-        or assets_regex.match(str(request.rel_url))
-        or frontend_regex.match(str(request.rel_url))
-    ):
+    if str(request.method) == "OPTIONS" or request.headers.get('Authentication') == csrf_token or str(request.rel_url) == "/auth/token" or str(request.rel_url).startswith("/plugins/load_main/") or str(request.rel_url).startswith("/static/") or str(request.rel_url).startswith("/legacy/") or str(request.rel_url).startswith("/steam_resource/") or str(request.rel_url).startswith("/frontend/") or assets_regex.match(str(request.rel_url)) or frontend_regex.match(str(request.rel_url)):
         return await handler(request)
-    return Response(text="Forbidden", status="403")
+    return Response(text='Forbidden', status='403')
 
-
-# Deprecated
+# Get the user by checking for the first logged in user. As this is run
+# by systemd at startup the process is likely to start before the user
+# logs in, so we will wait here until they are available. Note that
+# other methods such as getenv wont work as there was no $SUDO_USER to
+# start the systemd service.
 def set_user():
-    pass
+    global user
+    cmd = "who | awk '{print $1}' | sort | head -1"
+    while user == None:
+        name = check_output(cmd, shell=True).decode().strip()
+        if name not in [None, '']:
+            user = name
+        sleep(0.1)
 
-
-# Get the user id hosting the plugin loader
-def get_user_id() -> int:
-    proc_path = os.path.realpath(sys.argv[0])
-    pws = sorted(pwd.getpwall(), reverse=True, key=lambda pw: len(pw.pw_dir))
-    for pw in pws:
-        if proc_path.startswith(os.path.realpath(pw.pw_dir)):
-            return pw.pw_uid
-    raise PermissionError(
-        "The plugin loader does not seem to be hosted by any known user."
-    )
-
-
-# Get the user hosting the plugin loader
+# Get the global user. get_user must be called first.
 def get_user() -> str:
-    return pwd.getpwuid(get_user_id()).pw_name
+    global user
+    if user == None:
+        raise ValueError("helpers.get_user method called before user variable was set. Run helpers.set_user first.")
+    return user
 
-
-# Get the effective user id of the running process
-def get_effective_user_id() -> int:
-    return os.geteuid()
-
-
-# Get the effective user of the running process
-def get_effective_user() -> str:
-    return pwd.getpwuid(get_effective_user_id()).pw_name
-
-
-# Get the effective user group id of the running process
-def get_effective_user_group_id() -> int:
-    return os.getegid()
-
-
-# Get the effective user group of the running process
-def get_effective_user_group() -> str:
-    return grp.getgrgid(get_effective_user_group_id()).gr_name
-
-
-# Get the user owner of the given file path.
+#Get the user owner of the given file path.
 def get_user_owner(file_path) -> str:
-    return pwd.getpwuid(os.stat(file_path).st_uid).pw_name
+    return pwd.getpwuid(os.stat(file_path).st_uid)[0]
 
-
-# Deprecated
-def set_user_group() -> str:
-    return get_user_group()
-
-
-# Get the group id of the user hosting the plugin loader
-def get_user_group_id() -> int:
-    return pwd.getpwuid(get_user_id()).pw_gid
-
-
-# Get the group of the user hosting the plugin loader
+#Get the user group of the given file path.
 def get_user_group(file_path) -> str:
-    if file_path:
-        return grp.getgrgid(os.stat(file_path).st_gid).gr_name
-    else:
-        return grp.getgrgid(get_user_group_id()).gr_name
+    return grp.getgrgid(os.stat(file_path).st_gid)[0]
 
+# Set the global user group. get_user must be called first
+def set_user_group() -> str:
+    global group
+    global user
+    if user == None:
+        raise ValueError("helpers.set_user_dir method called before user variable was set. Run helpers.set_user first.")
+    if group == None:
+        group = check_output(["id", "-g", "-n", user]).decode().strip()
+
+# Get the group of the global user. set_user_group must be called first.
+def get_user_group() -> str:
+    global group
+    if group == None:
+        raise ValueError("helpers.get_user_group method called before group variable was set. Run helpers.set_user_group first.")
+    return group
 
 # Get the default home path unless a user is specified
-def get_home_path(username=None) -> str:
-    if username is None:
-        username = get_user()
-    return pwd.getpwnam(username).pw_dir
-
-
-# Get the default homebrew path unless a home_path is specified
-def get_homebrew_path(home_path=None) -> str:
-    if home_path is None:
-        home_path = get_home_path()
-    return os.path.join(home_path, "homebrew")
-
-
-# Recursively create path and chown as user
-def mkdir_as_user(path):
-    path = os.path.realpath(path)
-    os.makedirs(path, exist_ok=True)
-    chown_path = get_home_path()
-    parts = os.path.relpath(path, chown_path).split(os.sep)
-    uid = get_user_id()
-    gid = get_user_group_id()
-    for p in parts:
-        chown_path = os.path.join(chown_path, p)
-        os.chown(chown_path, uid, gid)
-
-
-# Fetches the version of loader
-def get_loader_version() -> str:
-    with open(
-        os.path.join(os.path.dirname(sys.argv[0]), ".loader.version"),
-        "r",
-        encoding="utf-8",
-    ) as version_file:
-        return version_file.readline().replace("\n", "")
+def get_home_path(username = None) -> str:
+    if username == None:
+        raise ValueError("Username not defined, no home path can be found.")
+    else:
+        return str("/home/"+username)
 
+# Get the default homebrew path unless a user is specified
+def get_homebrew_path(home_path = None) -> str:
+    if home_path == None:
+        raise ValueError("Home path not defined, homebrew dir cannot be determined.")
+    else:
+        return str(home_path+"/homebrew")
+    # return str(home_path+"/homebrew")
 
 # Download Remote Binaries to local Plugin
 async def download_remote_binary_to_path(url, binHash, path) -> bool:
@@ -163,36 +109,27 @@ async def download_remote_binary_to_path(url, binHash, path) -> bool:
                 remoteHash = sha256(data.getbuffer()).hexdigest()
                 if binHash == remoteHash:
                     data.seek(0)
-                    with open(path, "wb") as f:
+                    with open(path, 'wb') as f:
                         f.write(data.getbuffer())
                         rv = True
                 else:
-                    raise Exception(
-                        f"Fatal Error: Hash Mismatch for remote binary {path}@{url}"
-                    )
+                    raise Exception(f"Fatal Error: Hash Mismatch for remote binary {path}@{url}")
             else:
                 rv = False
-    except Exception:
+    except:
         rv = False
 
     return rv
 
-
 async def is_systemd_unit_active(unit_name: str) -> bool:
-    res = subprocess.run(
-        ["systemctl", "is-active", unit_name],
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL,
-    )
+    res = subprocess.run(["systemctl", "is-active", unit_name], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     return res.returncode == 0
 
-
 async def stop_systemd_unit(unit_name: str) -> subprocess.CompletedProcess:
     cmd = ["systemctl", "stop", unit_name]
 
     return subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
-
 async def start_systemd_unit(unit_name: str) -> subprocess.CompletedProcess:
     cmd = ["systemctl", "start", unit_name]
 

backend/injector.py

@@ -2,9 +2,10 @@
 
 from asyncio import sleep
 from logging import getLogger
+from traceback import format_exc
 from typing import List
 
-from aiohttp import ClientSession
+from aiohttp import ClientSession, WSMsgType
 from aiohttp.client_exceptions import ClientConnectorError, ClientOSError
 from asyncio.exceptions import TimeoutError
 import uuid
@@ -38,12 +39,9 @@ class Tab:
         async for message in self.websocket:
             data = message.json()
             yield data
-        logger.warn(
-            f"The Tab {self.title} socket has been disconnected while listening for"
-            " messages."
-        )
+        logger.warn(f"The Tab {self.title} socket has been disconnected while listening for messages.")
         await self.close_websocket()
-
+            
     async def _send_devtools_cmd(self, dc, receive=True):
         if self.websocket:
             self.cmd_id += 1
@@ -56,24 +54,19 @@ class Tab:
             return None
         raise RuntimeError("Websocket not opened")
 
-    async def evaluate_js(
-        self, js, run_async=False, manage_socket=True, get_result=True
-    ):
+    async def evaluate_js(self, js, run_async=False, manage_socket=True, get_result=True):
         try:
             if manage_socket:
                 await self.open_websocket()
 
-            res = await self._send_devtools_cmd(
-                {
-                    "method": "Runtime.evaluate",
-                    "params": {
-                        "expression": js,
-                        "userGesture": True,
-                        "awaitPromise": run_async,
-                    },
-                },
-                get_result,
-            )
+            res = await self._send_devtools_cmd({
+                "method": "Runtime.evaluate",
+                "params": {
+                    "expression": js,
+                    "userGesture": True,
+                    "awaitPromise": run_async
+                }
+            }, get_result)
 
         finally:
             if manage_socket:
@@ -81,17 +74,9 @@ class Tab:
         return res
 
     async def has_global_var(self, var_name, manage_socket=True):
-        res = await self.evaluate_js(
-            f"window['{var_name}'] !== null && window['{var_name}'] !== undefined",
-            False,
-            manage_socket,
-        )
+        res = await self.evaluate_js(f"window['{var_name}'] !== null && window['{var_name}'] !== undefined", False, manage_socket)
 
-        if (
-            "result" not in res
-            or "result" not in res["result"]
-            or "value" not in res["result"]["result"]
-        ):
+        if not "result" in res or not "result" in res["result"] or not "value" in res["result"]["result"]:
             return False
 
         return res["result"]["result"]["value"]
@@ -101,12 +86,9 @@ class Tab:
             if manage_socket:
                 await self.open_websocket()
 
-            res = await self._send_devtools_cmd(
-                {
-                    "method": "Page.close",
-                },
-                False,
-            )
+            res = await self._send_devtools_cmd({
+                "method": "Page.close",
+            }, False)
 
         finally:
             if manage_socket:
@@ -117,42 +99,32 @@ class Tab:
         """
         Enables page domain notifications.
         """
-        await self._send_devtools_cmd(
-            {
-                "method": "Page.enable",
-            },
-            False,
-        )
+        await self._send_devtools_cmd({
+            "method": "Page.enable",
+        }, False)
 
     async def disable(self):
         """
         Disables page domain notifications.
         """
-        await self._send_devtools_cmd(
-            {
-                "method": "Page.disable",
-            },
-            False,
-        )
+        await self._send_devtools_cmd({
+            "method": "Page.disable",
+        }, False)
 
-    async def refresh(self, manage_socket=False):
+    async def refresh(self):
         try:
             if manage_socket:
                 await self.open_websocket()
 
-            await self._send_devtools_cmd(
-                {
-                    "method": "Page.reload",
-                },
-                False,
-            )
+            await self._send_devtools_cmd({
+                "method": "Page.reload",
+            }, False)
 
         finally:
             if manage_socket:
                 await self.close_websocket()
 
         return
-
     async def reload_and_evaluate(self, js, manage_socket=True):
         """
         Reloads the current tab, with JS to run on load via debugger
@@ -161,70 +133,64 @@ class Tab:
             if manage_socket:
                 await self.open_websocket()
 
-            await self._send_devtools_cmd({"method": "Debugger.enable"}, True)
+            await self._send_devtools_cmd({
+                "method": "Debugger.enable"
+            }, True)
 
-            await self._send_devtools_cmd(
-                {
-                    "method": "Runtime.evaluate",
-                    "params": {
-                        "expression": "location.reload();",
-                        "userGesture": True,
-                        "awaitPromise": False,
-                    },
-                },
-                False,
-            )
+            await self._send_devtools_cmd({
+                "method": "Runtime.evaluate",
+                "params": {
+                    "expression": "location.reload();",
+                    "userGesture": True,
+                    "awaitPromise": False
+                }
+            }, False)
 
-            breakpoint_res = await self._send_devtools_cmd(
-                {
-                    "method": "Debugger.setInstrumentationBreakpoint",
-                    "params": {"instrumentation": "beforeScriptExecution"},
-                },
-                True,
-            )
+            breakpoint_res = await self._send_devtools_cmd({
+                "method": "Debugger.setInstrumentationBreakpoint",
+                "params": {
+                    "instrumentation": "beforeScriptExecution"
+                }
+            }, True)
 
             logger.info(breakpoint_res)
-
+            
             # Page finishes loading when breakpoint hits
 
             for x in range(20):
                 # this works around 1/5 of the time, so just send it 8 times.
                 # the js accounts for being injected multiple times allowing only one instance to run at a time anyway
-                await self._send_devtools_cmd(
-                    {
-                        "method": "Runtime.evaluate",
-                        "params": {
-                            "expression": js,
-                            "userGesture": True,
-                            "awaitPromise": False,
-                        },
-                    },
-                    False,
-                )
-
-            await self._send_devtools_cmd(
-                {
-                    "method": "Debugger.removeBreakpoint",
+                await self._send_devtools_cmd({
+                    "method": "Runtime.evaluate",
                     "params": {
-                        "breakpointId": breakpoint_res["result"]["breakpointId"]
-                    },
-                },
-                False,
-            )
+                        "expression": js,
+                        "userGesture": True,
+                        "awaitPromise": False
+                    }
+                }, False)
+
+            await self._send_devtools_cmd({
+                "method": "Debugger.removeBreakpoint",
+                "params": {
+                    "breakpointId": breakpoint_res["result"]["breakpointId"]
+                }
+            }, False)
 
             for x in range(4):
-                await self._send_devtools_cmd({"method": "Debugger.resume"}, False)
+                await self._send_devtools_cmd({
+                    "method": "Debugger.resume"
+                }, False)
 
-            await self._send_devtools_cmd({"method": "Debugger.disable"}, True)
+            await self._send_devtools_cmd({
+                "method": "Debugger.disable"
+            }, True)
 
         finally:
             if manage_socket:
                 await self.close_websocket()
         return
 
-    async def add_script_to_evaluate_on_new_document(
-        self, js, add_dom_wrapper=True, manage_socket=True, get_result=True
-    ):
+    async def add_script_to_evaluate_on_new_document(self, js, add_dom_wrapper=True, manage_socket=True, get_result=True):
         """
         How the underlying call functions is not particularly clear from the devtools docs, so stealing puppeteer's description:
 
@@ -259,44 +225,35 @@ class Tab:
         """
         try:
 
-            wrappedjs = (
-                """
-            function scriptFunc() {{
+            wrappedjs = """
+            function scriptFunc() {
                 {js}
-            }}
-            if (document.readyState === 'loading') {{
-                addEventListener('DOMContentLoaded', () => {{
+            }
+            if (document.readyState === 'loading') {
+                addEventListener('DOMContentLoaded', () => {
                 scriptFunc();
-            }});
-            }} else {{
+            });
+            } else {
                 scriptFunc();
-            }}
-            """.format(
-                    js=js
-                )
-                if add_dom_wrapper
-                else js
-            )
+            }
+            """.format(js=js) if add_dom_wrapper else js
 
             if manage_socket:
                 await self.open_websocket()
 
-            res = await self._send_devtools_cmd(
-                {
-                    "method": "Page.addScriptToEvaluateOnNewDocument",
-                    "params": {"source": wrappedjs},
-                },
-                get_result,
-            )
+            res = await self._send_devtools_cmd({
+                "method": "Page.addScriptToEvaluateOnNewDocument",
+                "params": {
+                    "source": wrappedjs
+                }
+            }, get_result)
 
         finally:
             if manage_socket:
                 await self.close_websocket()
         return res
 
-    async def remove_script_to_evaluate_on_new_document(
-        self, script_id, manage_socket=True
-    ):
+    async def remove_script_to_evaluate_on_new_document(self, script_id, manage_socket=True):
         """
         Removes a script from a page that was added with `add_script_to_evaluate_on_new_document`
 
@@ -310,28 +267,21 @@ class Tab:
             if manage_socket:
                 await self.open_websocket()
 
-            await self._send_devtools_cmd(
-                {
-                    "method": "Page.removeScriptToEvaluateOnNewDocument",
-                    "params": {"identifier": script_id},
-                },
-                False,
-            )
+            res = await self._send_devtools_cmd({
+                "method": "Page.removeScriptToEvaluateOnNewDocument",
+                "params": {
+                    "identifier": script_id
+                }
+            }, False)
 
         finally:
             if manage_socket:
                 await self.close_websocket()
 
     async def has_element(self, element_name, manage_socket=True):
-        res = await self.evaluate_js(
-            f"document.getElementById('{element_name}') != null", False, manage_socket
-        )
+        res = await self.evaluate_js(f"document.getElementById('{element_name}') != null", False, manage_socket)
 
-        if (
-            "result" not in res
-            or "result" not in res["result"]
-            or "value" not in res["result"]["result"]
-        ):
+        if not "result" in res or not "result" in res["result"] or not "value" in res["result"]["result"]:
             return False
 
         return res["result"]["result"]["value"]
@@ -348,17 +298,23 @@ class Tab:
                     document.head.append(style);
                     style.textContent = `{style}`;
                 }})()
-                """,
-                False,
-                manage_socket,
-            )
+                """, False, manage_socket)
 
             if "exceptionDetails" in result["result"]:
-                return {"success": False, "result": result["result"]}
+                return {
+                    "success": False,
+                    "result": result["result"]
+                }
 
-            return {"success": True, "result": css_id}
+            return {
+                "success": True,
+                "result": css_id
+            }
         except Exception as e:
-            return {"success": False, "result": e}
+            return {
+                "success": False,
+                "result": e
+            }
 
     async def remove_css(self, css_id, manage_socket=True):
         try:
@@ -370,24 +326,25 @@ class Tab:
                     if (style.nodeName.toLowerCase() == 'style')
                         style.parentNode.removeChild(style);
                 }})()
-                """,
-                False,
-                manage_socket,
-            )
+                """, False, manage_socket)
 
             if "exceptionDetails" in result["result"]:
-                return {"success": False, "result": result}
+                return {
+                    "success": False,
+                    "result": result
+                }
 
-            return {"success": True}
+            return {
+                "success": True
+            }
         except Exception as e:
-            return {"success": False, "result": e}
+            return {
+                "success": False,
+                "result": e
+            }
 
     async def get_steam_resource(self, url):
-        res = await self.evaluate_js(
-            f'(async function test() {{ return await (await fetch("{url}")).text()'
-            " })()",
-            True,
-        )
+        res = await self.evaluate_js(f'(async function test() {{ return await (await fetch("{url}")).text() }})()', True)
         return res["result"]["result"]["value"]
 
     def __repr__(self):
@@ -430,45 +387,21 @@ async def get_tab(tab_name) -> Tab:
         raise ValueError(f"Tab {tab_name} not found")
     return tab
 
-
 async def get_tab_lambda(test) -> Tab:
     tabs = await get_tabs()
     tab = next((i for i in tabs if test(i)), None)
     if not tab:
-        raise ValueError("Tab not found by lambda")
+        raise ValueError(f"Tab not found by lambda")
     return tab
 
-
-def tab_is_gamepadui(t: Tab) -> bool:
-    return "https://steamloopback.host/routes/" in t.url and (
-        t.title == "Steam Shared Context presented by Valve™"
-        or t.title == "Steam"
-        or t.title == "SP"
-    )
-
-
 async def get_gamepadui_tab() -> Tab:
     tabs = await get_tabs()
-    tab = next((i for i in tabs if tab_is_gamepadui(i)), None)
+    tab = next((i for i in tabs if ("https://steamloopback.host/routes/" in i.url and (i.title == "Steam" or i.title == "SP"))), None)
     if not tab:
-        raise ValueError("GamepadUI Tab not found")
+        raise ValueError(f"GamepadUI Tab not found")
     return tab
 
-
 async def inject_to_tab(tab_name, js, run_async=False):
     tab = await get_tab(tab_name)
 
     return await tab.evaluate_js(js, run_async)
-
-
-async def close_old_tabs():
-    tabs = await get_tabs()
-    for t in tabs:
-        if not t.title or (
-            t.title != "Steam Shared Context presented by Valve™"
-            and t.title != "Steam"
-            and t.title != "SP"
-        ):
-            logger.debug("Closing tab: " + getattr(t, "title", "Untitled"))
-            await t.close()
-            await sleep(0.5)

backend/loader.py

@@ -21,7 +21,7 @@ from plugin import PluginWrapper
 
 class FileChangeHandler(RegexMatchingEventHandler):
     def __init__(self, queue, plugin_path) -> None:
-        super().__init__(regexes=[r"^.*?dist\/index\.js$", r"^.*?main\.py$"])
+        super().__init__(regexes=[r'^.*?dist\/index\.js$', r'^.*?main\.py$'])
         self.logger = getLogger("file-watcher")
         self.plugin_path = plugin_path
         self.queue = queue
@@ -32,9 +32,7 @@ class FileChangeHandler(RegexMatchingEventHandler):
             return
         plugin_dir = Path(path.relpath(src_path, self.plugin_path)).parts[0]
         if exists(path.join(self.plugin_path, plugin_dir, "plugin.json")):
-            self.queue.put_nowait(
-                (path.join(self.plugin_path, plugin_dir, "main.py"), plugin_dir, True)
-            )
+            self.queue.put_nowait((path.join(self.plugin_path, plugin_dir, "main.py"), plugin_dir, True))
 
     def on_created(self, event):
         src_path = event.src_path
@@ -64,7 +62,6 @@ class FileChangeHandler(RegexMatchingEventHandler):
         self.logger.debug(f"file modified: {src_path}")
         self.maybe_reload(src_path)
 
-
 class Loader:
     def __init__(self, server_instance, plugin_path, loop, live_reload=False) -> None:
         self.loop = loop
@@ -84,30 +81,18 @@ class Loader:
             self.loop.create_task(self.handle_reloads())
             self.loop.create_task(self.enable_reload_wait())
 
-        server_instance.add_routes(
-            [
-                web.get("/frontend/{path:.*}", self.handle_frontend_assets),
-                web.get("/plugins", self.get_plugins),
-                web.get(
-                    "/plugins/{plugin_name}/frontend_bundle",
-                    self.handle_frontend_bundle,
-                ),
-                web.post(
-                    "/plugins/{plugin_name}/methods/{method_name}",
-                    self.handle_plugin_method_call,
-                ),
-                web.get(
-                    "/plugins/{plugin_name}/assets/{path:.*}",
-                    self.handle_plugin_frontend_assets,
-                ),
-                # The following is legacy plugin code.
-                web.get("/plugins/load_main/{name}", self.load_plugin_main_view),
-                web.get(
-                    "/plugins/plugin_resource/{name}/{path:.+}", self.handle_sub_route
-                ),
-                web.get("/steam_resource/{path:.+}", self.get_steam_resource),
-            ]
-        )
+        server_instance.add_routes([
+            web.get("/frontend/{path:.*}", self.handle_frontend_assets),
+            web.get("/plugins", self.get_plugins),
+            web.get("/plugins/{plugin_name}/frontend_bundle", self.handle_frontend_bundle),
+            web.post("/plugins/{plugin_name}/methods/{method_name}", self.handle_plugin_method_call),
+            web.get("/plugins/{plugin_name}/assets/{path:.*}", self.handle_plugin_frontend_assets),
+
+            # The following is legacy plugin code.
+            web.get("/plugins/load_main/{name}", self.load_plugin_main_view),
+            web.get("/plugins/plugin_resource/{name}/{path:.+}", self.handle_sub_route),
+            web.get("/steam_resource/{path:.+}", self.get_steam_resource)
+        ])
 
     async def enable_reload_wait(self):
         if self.live_reload:
@@ -122,63 +107,36 @@ class Loader:
 
     async def get_plugins(self, request):
         plugins = list(self.plugins.values())
-        return web.json_response(
-            [
-                {
-                    "name": str(i) if not i.legacy else "$LEGACY_" + str(i),
-                    "version": i.version,
-                }
-                for i in plugins
-            ]
-        )
+        return web.json_response([{"name": str(i) if not i.legacy else "$LEGACY_"+str(i), "version": i.version} for i in plugins])
 
     def handle_plugin_frontend_assets(self, request):
         plugin = self.plugins[request.match_info["plugin_name"]]
-        file = path.join(
-            self.plugin_path,
-            plugin.plugin_directory,
-            "dist/assets",
-            request.match_info["path"],
-        )
+        file = path.join(self.plugin_path, plugin.plugin_directory, "dist/assets", request.match_info["path"])
 
         return web.FileResponse(file, headers={"Cache-Control": "no-cache"})
 
     def handle_frontend_bundle(self, request):
         plugin = self.plugins[request.match_info["plugin_name"]]
 
-        with open(
-            path.join(self.plugin_path, plugin.plugin_directory, "dist/index.js"),
-            "r",
-            encoding="utf-8",
-        ) as bundle:
-            return web.Response(
-                text=bundle.read(), content_type="application/javascript"
-            )
+        with open(path.join(self.plugin_path, plugin.plugin_directory, "dist/index.js"), "r", encoding="utf-8") as bundle:
+            return web.Response(text=bundle.read(), content_type="application/javascript")
 
     def import_plugin(self, file, plugin_directory, refresh=False, batch=False):
         try:
             plugin = PluginWrapper(file, plugin_directory, self.plugin_path)
             if plugin.name in self.plugins:
-                if "debug" not in plugin.flags and refresh:
-                    self.logger.info(
-                        f"Plugin {plugin.name} is already loaded and has requested to"
-                        " not be re-loaded"
-                    )
-                    return
-                else:
-                    self.plugins[plugin.name].stop()
-                    self.plugins.pop(plugin.name, None)
+                    if not "debug" in plugin.flags and refresh:
+                        self.logger.info(f"Plugin {plugin.name} is already loaded and has requested to not be re-loaded")
+                        return
+                    else:
+                        self.plugins[plugin.name].stop()
+                        self.plugins.pop(plugin.name, None)
             if plugin.passive:
                 self.logger.info(f"Plugin {plugin.name} is passive")
             self.plugins[plugin.name] = plugin.start()
             self.logger.info(f"Loaded {plugin.name}")
             if not batch:
-                self.loop.create_task(
-                    self.dispatch_plugin(
-                        plugin.name if not plugin.legacy else "$LEGACY_" + plugin.name,
-                        plugin.version,
-                    )
-                )
+                self.loop.create_task(self.dispatch_plugin(plugin.name if not plugin.legacy else "$LEGACY_" + plugin.name, plugin.version))
         except Exception as e:
             self.logger.error(f"Could not load {file}. {e}")
             print_exc()
@@ -190,20 +148,10 @@ class Loader:
     def import_plugins(self):
         self.logger.info(f"import plugins from {self.plugin_path}")
 
-        directories = [
-            i
-            for i in listdir(self.plugin_path)
-            if path.isdir(path.join(self.plugin_path, i))
-            and path.isfile(path.join(self.plugin_path, i, "plugin.json"))
-        ]
+        directories = [i for i in listdir(self.plugin_path) if path.isdir(path.join(self.plugin_path, i)) and path.isfile(path.join(self.plugin_path, i, "plugin.json"))]
         for directory in directories:
             self.logger.info(f"found plugin: {directory}")
-            self.import_plugin(
-                path.join(self.plugin_path, directory, "main.py"),
-                directory,
-                False,
-                True,
-            )
+            self.import_plugin(path.join(self.plugin_path, directory, "main.py"), directory, False, True)
 
     async def handle_reloads(self):
         while True:
@@ -220,10 +168,10 @@ class Loader:
         except JSONDecodeError:
             args = {}
         try:
-            if method_name.startswith("_"):
-                raise RuntimeError("Tried to call private method")
-            res["result"] = await plugin.execute_method(method_name, args)
-            res["success"] = True
+          if method_name.startswith("_"):
+              raise RuntimeError("Tried to call private method")
+          res["result"] = await plugin.execute_method(method_name, args)
+          res["success"] = True
         except Exception as e:
             res["result"] = str(e)
             res["success"] = False
@@ -236,14 +184,9 @@ class Loader:
     can introduce it more smoothly and give people the chance to sample the new features even
     without plugin support. They will be removed once legacy plugins are no longer relevant.
     """
-
     async def load_plugin_main_view(self, request):
         plugin = self.plugins[request.match_info["name"]]
-        with open(
-            path.join(self.plugin_path, plugin.plugin_directory, plugin.main_view_html),
-            "r",
-            encoding="utf-8",
-        ) as template:
+        with open(path.join(self.plugin_path, plugin.plugin_directory, plugin.main_view_html), "r", encoding="utf-8") as template:
             template_data = template.read()
             ret = f"""
             <script src="/legacy/library.js"></script>
@@ -267,11 +210,6 @@ class Loader:
     async def get_steam_resource(self, request):
         tab = await get_tab("SP")
         try:
-            return web.Response(
-                text=await tab.get_steam_resource(
-                    f"https://steamloopback.host/{request.match_info['path']}"
-                ),
-                content_type="text/html",
-            )
+            return web.Response(text=await tab.get_steam_resource(f"https://steamloopback.host/{request.match_info['path']}"), content_type="text/html")
         except Exception as e:
             return web.Response(text=str(e), status=400)

backend/main.py

@@ -1,45 +1,45 @@
 # Change PyInstaller files permissions
 import sys
 from subprocess import call
-
-if hasattr(sys, "_MEIPASS"):
-    call(["chmod", "-R", "755", sys._MEIPASS])
+if hasattr(sys, '_MEIPASS'):
+    call(['chmod', '-R', '755', sys._MEIPASS])
 # Full imports
 from asyncio import new_event_loop, set_event_loop, sleep
-from logging import basicConfig, getLogger
-from os import getenv, path
+from json import dumps, loads
+from logging import DEBUG, INFO, basicConfig, getLogger
+from os import getenv, chmod, path
 from traceback import format_exc
 
 import aiohttp_cors
-
 # Partial imports
-from aiohttp import client_exceptions
+from aiohttp import client_exceptions, WSMsgType
 from aiohttp.web import Application, Response, get, run_app, static
 from aiohttp_jinja2 import setup as jinja_setup
 
 # local modules
 from browser import PluginBrowser
-from helpers import (
-    REMOTE_DEBUGGER_UNIT,
-    csrf_middleware,
-    get_csrf_token,
-    get_homebrew_path,
-    get_user,
-    get_user_group,
-    stop_systemd_unit,
-    start_systemd_unit,
-)
-from injector import get_gamepadui_tab, Tab, close_old_tabs
+from helpers import (REMOTE_DEBUGGER_UNIT, csrf_middleware, get_csrf_token,
+                     get_home_path, get_homebrew_path, get_user,
+                     get_user_group, set_user, set_user_group,
+                     stop_systemd_unit, start_systemd_unit)
+from injector import get_gamepadui_tab, Tab, get_tabs
 from loader import Loader
 from settings import SettingsManager
 from updater import Updater
 from utilities import Utilities
 
+# Ensure USER and GROUP vars are set first.
+# TODO: This isn't the best way to do this but supports the current
+# implementation. All the config load and environment setting eventually be
+# moved into init or a config/loader method.
+set_user()
+set_user_group()
 USER = get_user()
 GROUP = get_user_group()
-HOMEBREW_PATH = get_homebrew_path()
+HOME_PATH = "/home/"+USER
+HOMEBREW_PATH = HOME_PATH+"/homebrew"
 CONFIG = {
-    "plugin_path": getenv("PLUGIN_PATH", path.join(HOMEBREW_PATH, "plugins")),
+    "plugin_path": getenv("PLUGIN_PATH", HOMEBREW_PATH+"/plugins"),
     "chown_plugin_path": getenv("CHOWN_PLUGIN_PATH", "1") == "1",
     "server_host": getenv("SERVER_HOST", "127.0.0.1"),
     "server_port": int(getenv("SERVER_PORT", "1337")),
@@ -50,45 +50,32 @@ CONFIG = {
 }
 
 basicConfig(
-    level=CONFIG["log_level"], format="[%(module)s][%(levelname)s]: %(message)s"
+    level=CONFIG["log_level"],
+    format="[%(module)s][%(levelname)s]: %(message)s"
 )
 
 logger = getLogger("Main")
 
-
-def chown_plugin_dir():
-    code_chown = call(["chown", "-R", USER + ":" + GROUP, CONFIG["plugin_path"]])
+async def chown_plugin_dir():
+    code_chown = call(["chown", "-R", USER+":"+GROUP, CONFIG["plugin_path"]])
     code_chmod = call(["chmod", "-R", "555", CONFIG["plugin_path"]])
     if code_chown != 0 or code_chmod != 0:
-        logger.error(
-            f"chown/chmod exited with a non-zero exit code (chown: {code_chown}, chmod:"
-            f" {code_chmod})"
-        )
-
-
-if CONFIG["chown_plugin_path"] is True:
-    chown_plugin_dir()
-
+        logger.error(f"chown/chmod exited with a non-zero exit code (chown: {code_chown}, chmod: {code_chmod})")
 
 class PluginManager:
     def __init__(self, loop) -> None:
         self.loop = loop
         self.web_app = Application()
         self.web_app.middlewares.append(csrf_middleware)
-        self.cors = aiohttp_cors.setup(
-            self.web_app,
-            defaults={
-                "https://steamloopback.host": aiohttp_cors.ResourceOptions(
-                    expose_headers="*", allow_headers="*", allow_credentials=True
-                )
-            },
-        )
-        self.plugin_loader = Loader(
-            self.web_app, CONFIG["plugin_path"], self.loop, CONFIG["live_reload"]
-        )
-        self.plugin_browser = PluginBrowser(
-            CONFIG["plugin_path"], self.plugin_loader.plugins, self.plugin_loader
-        )
+        self.cors = aiohttp_cors.setup(self.web_app, defaults={
+            "https://steamloopback.host": aiohttp_cors.ResourceOptions(
+                expose_headers="*",
+                allow_headers="*",
+                allow_credentials=True
+            )
+        })
+        self.plugin_loader = Loader(self.web_app, CONFIG["plugin_path"], self.loop, CONFIG["live_reload"])
+        self.plugin_browser = PluginBrowser(CONFIG["plugin_path"], self.plugin_loader.plugins, self.plugin_loader)
         self.settings = SettingsManager("loader", path.join(HOMEBREW_PATH, "settings"))
         self.utilities = Utilities(self)
         self.updater = Updater(self)
@@ -100,6 +87,8 @@ class PluginManager:
                 self.loop.create_task(start_systemd_unit(REMOTE_DEBUGGER_UNIT))
             else:
                 self.loop.create_task(stop_systemd_unit(REMOTE_DEBUGGER_UNIT))
+            if CONFIG["chown_plugin_path"] == True:
+                chown_plugin_dir()
             self.loop.create_task(self.loader_reinjector())
             self.loop.create_task(self.load_plugins())
 
@@ -110,12 +99,8 @@ class PluginManager:
 
         for route in list(self.web_app.router.routes()):
             self.cors.add(route)
-        self.web_app.add_routes(
-            [static("/static", path.join(path.dirname(__file__), "static"))]
-        )
-        self.web_app.add_routes(
-            [static("/legacy", path.join(path.dirname(__file__), "legacy"))]
-        )
+        self.web_app.add_routes([static("/static", path.join(path.dirname(__file__), 'static'))])
+        self.web_app.add_routes([static("/legacy", path.join(path.dirname(__file__), 'legacy'))])
 
     def exception_handler(self, loop, context):
         if context["message"] == "Unclosed connection":
@@ -139,10 +124,7 @@ class PluginManager:
             while not tab:
                 try:
                     tab = await get_gamepadui_tab()
-                except (
-                    client_exceptions.ClientConnectorError,
-                    client_exceptions.ServerDisconnectedError,
-                ):
+                except (client_exceptions.ClientConnectorError, client_exceptions.ServerDisconnectedError):
                     if not dc:
                         logger.debug("Couldn't connect to debugger, waiting...")
                         dc = True
@@ -173,7 +155,7 @@ class PluginManager:
                 # This is because of https://github.com/aio-libs/aiohttp/blob/3ee7091b40a1bc58a8d7846e7878a77640e96996/aiohttp/client_ws.py#L321
                 logger.info("CEF has disconnected...")
                 # At this point the loop starts again and we connect to the freshly started Steam client once it is ready.
-            except Exception:
+            except Exception as e:
                 logger.error("Exception while reading page events " + format_exc())
                 await tab.close_websocket()
                 pass
@@ -188,30 +170,19 @@ class PluginManager:
         try:
             if first:
                 if await tab.has_global_var("deckyHasLoaded", False):
-                    await close_old_tabs()
-            await tab.evaluate_js(
-                "try{if (window.deckyHasLoaded){setTimeout(() => location.reload(),"
-                " 100)}else{window.deckyHasLoaded ="
-                " true;(async()=>{try{while(!window.SP_REACT){await new Promise(r =>"
-                " setTimeout(r, 10))};await"
-                " import('http://localhost:1337/frontend/index.js')}catch(e){console.error(e)};})();}}catch(e){console.error(e)}",
-                False,
-                False,
-                False,
-            )
-        except Exception:
+                    tabs = await get_tabs()
+                    for t in tabs:
+                        if not t.title or (t.title != "Steam" and t.title != "SP"):
+                            logger.debug("Closing tab: " + getattr(t, "title", "Untitled"))
+                            await t.close()
+                            await sleep(0.5)
+            await tab.evaluate_js("try{if (window.deckyHasLoaded){setTimeout(() => location.reload(), 100)}else{window.deckyHasLoaded = true;(async()=>{try{while(!window.SP_REACT){await new Promise(r => setTimeout(r, 10))};await import('http://localhost:1337/frontend/index.js')}catch(e){console.error(e)};})();}}catch(e){console.error(e)}", False, False, False)
+        except:
             logger.info("Failed to inject JavaScript into tab\n" + format_exc())
             pass
 
     def run(self):
-        return run_app(
-            self.web_app,
-            host=CONFIG["server_host"],
-            port=CONFIG["server_port"],
-            loop=self.loop,
-            access_log=None,
-        )
-
+        return run_app(self.web_app, host=CONFIG["server_host"], port=CONFIG["server_port"], loop=self.loop, access_log=None)
 
 if __name__ == "__main__":
     loop = new_event_loop()

backend/plugin.py

@@ -1,34 +1,24 @@
 import multiprocessing
-from asyncio import (
-    Lock,
-    get_event_loop,
-    new_event_loop,
-    open_unix_connection,
-    set_event_loop,
-    sleep,
-    start_unix_server,
-    IncompleteReadError,
-    LimitOverrunError,
-)
+from asyncio import (Lock, get_event_loop, new_event_loop,
+                     open_unix_connection, set_event_loop, sleep,
+                     start_unix_server, IncompleteReadError, LimitOverrunError)
+from concurrent.futures import ProcessPoolExecutor
 from importlib.util import module_from_spec, spec_from_file_location
 from json import dumps, load, loads
 from logging import getLogger
 from traceback import format_exc
-from os import path, setgid, setuid, environ
+from os import path, setgid, setuid
 from signal import SIGINT, signal
 from sys import exit
 from time import time
-import helpers
 
 multiprocessing.set_start_method("fork")
 
-BUFFER_LIMIT = 2**20  # 1 MiB
-
+BUFFER_LIMIT = 2 ** 20  # 1 MiB
 
 class PluginWrapper:
     def __init__(self, file, plugin_directory, plugin_path) -> None:
         self.file = file
-        self.plugin_path = plugin_path
         self.plugin_directory = plugin_directory
         self.reader = None
         self.writer = None
@@ -37,23 +27,12 @@ class PluginWrapper:
 
         self.version = None
 
-        json = load(
-            open(
-                path.join(plugin_path, plugin_directory, "plugin.json"),
-                "r",
-                encoding="utf-8",
-            )
-        )
+        json = load(open(path.join(plugin_path, plugin_directory, "plugin.json"), "r", encoding="utf-8"))
         if path.isfile(path.join(plugin_path, plugin_directory, "package.json")):
-            package_json = load(
-                open(
-                    path.join(plugin_path, plugin_directory, "package.json"),
-                    "r",
-                    encoding="utf-8",
-                )
-            )
+            package_json = load(open(path.join(plugin_path, plugin_directory, "package.json"), "r", encoding="utf-8"))
             self.version = package_json["version"]
 
+
         self.legacy = False
         self.main_view_html = json["main_view_html"] if "main_view_html" in json else ""
         self.tile_view_html = json["tile_view_html"] if "tile_view_html" in json else ""
@@ -77,34 +56,8 @@ class PluginWrapper:
             set_event_loop(new_event_loop())
             if self.passive:
                 return
-            setgid(0 if "root" in self.flags else helpers.get_user_group_id())
-            setuid(0 if "root" in self.flags else helpers.get_user_id())
-            # export a bunch of environment variables to help plugin developers
-            environ["HOME"] = helpers.get_home_path(
-                "root" if "root" in self.flags else helpers.get_user()
-            )
-            environ["USER"] = "root" if "root" in self.flags else helpers.get_user()
-            environ["DECKY_VERSION"] = helpers.get_loader_version()
-            environ["DECKY_USER"] = helpers.get_user()
-            environ["DECKY_HOME"] = helpers.get_homebrew_path()
-            environ["DECKY_PLUGIN_SETTINGS_DIR"] = path.join(
-                environ["DECKY_HOME"], "settings", self.plugin_directory
-            )
-            helpers.mkdir_as_user(environ["DECKY_PLUGIN_SETTINGS_DIR"])
-            environ["DECKY_PLUGIN_RUNTIME_DIR"] = path.join(
-                environ["DECKY_HOME"], "data", self.plugin_directory
-            )
-            helpers.mkdir_as_user(environ["DECKY_PLUGIN_RUNTIME_DIR"])
-            environ["DECKY_PLUGIN_LOG_DIR"] = path.join(
-                environ["DECKY_HOME"], "logs", self.plugin_directory
-            )
-            helpers.mkdir_as_user(environ["DECKY_PLUGIN_LOG_DIR"])
-            environ["DECKY_PLUGIN_DIR"] = path.join(
-                self.plugin_path, self.plugin_directory
-            )
-            environ["DECKY_PLUGIN_NAME"] = self.name
-            environ["DECKY_PLUGIN_VERSION"] = self.version
-            environ["DECKY_PLUGIN_AUTHOR"] = self.author
+            setgid(0 if "root" in self.flags else 1000)
+            setuid(0 if "root" in self.flags else 1000)
             spec = spec_from_file_location("_", self.file)
             module = module_from_spec(spec)
             spec.loader.exec_module(module)
@@ -114,32 +67,21 @@ class PluginWrapper:
                 get_event_loop().create_task(self.Plugin._main(self.Plugin))
             get_event_loop().create_task(self._setup_socket())
             get_event_loop().run_forever()
-        except Exception:
+        except:
             self.log.error("Failed to start " + self.name + "!\n" + format_exc())
             exit(0)
 
     async def _unload(self):
         try:
-            self.log.info(
-                "Attempting to unload with plugin "
-                + self.name
-                + '\'s "_unload" function.\n'
-            )
+            self.log.info("Attempting to unload " + self.name + "\n")
             if hasattr(self.Plugin, "_unload"):
                 await self.Plugin._unload(self.Plugin)
-                self.log.info("Unloaded " + self.name + "\n")
-            else:
-                self.log.info(
-                    'Could not find "_unload" in ' + self.name + "'s main.py" + "\n"
-                )
-        except Exception:
+        except:
             self.log.error("Failed to unload " + self.name + "!\n" + format_exc())
             exit(0)
 
     async def _setup_socket(self):
-        self.socket = await start_unix_server(
-            self._listen_for_method_call, path=self.socket_addr, limit=BUFFER_LIMIT
-        )
+        self.socket = await start_unix_server(self._listen_for_method_call, path=self.socket_addr, limit=BUFFER_LIMIT)
 
     async def _listen_for_method_call(self, reader, writer):
         while True:
@@ -157,7 +99,6 @@ class PluginWrapper:
                     break
             data = loads(line.decode("utf-8"))
             if "stop" in data:
-                self.log.info("Calling Loader unload function.")
                 await self._unload()
                 get_event_loop().stop()
                 while get_event_loop().is_running():
@@ -166,14 +107,12 @@ class PluginWrapper:
                 return
             d = {"res": None, "success": True}
             try:
-                d["res"] = await getattr(self.Plugin, data["method"])(
-                    self.Plugin, **data["args"]
-                )
+                d["res"] = await getattr(self.Plugin, data["method"])(self.Plugin, **data["args"])
             except Exception as e:
                 d["res"] = str(e)
                 d["success"] = False
             finally:
-                writer.write((dumps(d, ensure_ascii=False) + "\n").encode("utf-8"))
+                writer.write((dumps(d, ensure_ascii=False)+"\n").encode("utf-8"))
                 await writer.drain()
 
     async def _open_socket_if_not_exists(self):
@@ -181,11 +120,9 @@ class PluginWrapper:
             retries = 0
             while retries < 10:
                 try:
-                    self.reader, self.writer = await open_unix_connection(
-                        self.socket_addr, limit=BUFFER_LIMIT
-                    )
+                    self.reader, self.writer = await open_unix_connection(self.socket_addr, limit=BUFFER_LIMIT)
                     return True
-                except Exception:
+                except:
                     await sleep(2)
                     retries += 1
             return False
@@ -201,32 +138,20 @@ class PluginWrapper:
     def stop(self):
         if self.passive:
             return
-
         async def _(self):
             if await self._open_socket_if_not_exists():
-                self.writer.write(
-                    (dumps({"stop": True}, ensure_ascii=False) + "\n").encode("utf-8")
-                )
+                self.writer.write((dumps({ "stop": True }, ensure_ascii=False)+"\n").encode("utf-8"))
                 await self.writer.drain()
                 self.writer.close()
-
         get_event_loop().create_task(_(self))
 
     async def execute_method(self, method_name, kwargs):
         if self.passive:
-            raise RuntimeError(
-                "This plugin is passive (aka does not implement main.py)"
-            )
+            raise RuntimeError("This plugin is passive (aka does not implement main.py)")
         async with self.method_call_lock:
             if await self._open_socket_if_not_exists():
                 self.writer.write(
-                    (
-                        dumps(
-                            {"method": method_name, "args": kwargs}, ensure_ascii=False
-                        )
-                        + "\n"
-                    ).encode("utf-8")
-                )
+                    (dumps({ "method": method_name, "args": kwargs }, ensure_ascii=False) + "\n").encode("utf-8"))
                 await self.writer.drain()
                 line = bytearray()
                 while True:

backend/pyproject.toml

@@ -1,15 +0,0 @@
-[flake8]
-max-line-length = 88
-
-[tool.ruff]
-ignore = [
-    # Ignore line length check and let Black handle it
-    "E501",
-
-    # Ignore SyntaxError due to ruff not supporting pattern matching
-    # https://github.com/charliermarsh/ruff/issues/282
-    "E999",
-]
-
-# Assume Python 3.10.
-target-version = "py310"

backend/settings.py

@@ -2,44 +2,41 @@ from json import dump, load
 from os import mkdir, path, listdir, rename
 from shutil import chown
 
-from helpers import (
-    get_homebrew_path,
-    get_user,
-    get_user_group,
-    get_user_owner,
-)
+from helpers import get_home_path, get_homebrew_path, get_user, set_user, get_user_owner
 
 
 class SettingsManager:
-    def __init__(self, name, settings_directory=None) -> None:
+    def __init__(self, name, settings_directory = None) -> None:
+        set_user()
         USER = get_user()
-        GROUP = get_user_group()
-        wrong_dir = get_homebrew_path()
-        if settings_directory is None:
+        wrong_dir = get_homebrew_path(get_home_path(USER))
+        if settings_directory == None:
             settings_directory = path.join(wrong_dir, "settings")
 
         self.path = path.join(settings_directory, name + ".json")
 
-        # Create the folder with the correct permission
+        #Create the folder with the correct permission
         if not path.exists(settings_directory):
             mkdir(settings_directory)
-            chown(settings_directory, USER, GROUP)
+            chown(settings_directory, USER, USER)
 
-        # Copy all old settings file in the root directory to the correct folder
+        #Copy all old settings file in the root directory to the correct folder
         for file in listdir(wrong_dir):
             if file.endswith(".json"):
-                rename(path.join(wrong_dir, file), path.join(settings_directory, file))
+                rename(path.join(wrong_dir,file),
+                       path.join(settings_directory, file)) 
                 self.path = path.join(settings_directory, name + ".json")
 
-        # If the owner of the settings directory is not the user, then set it as the user:
+
+        #If the owner of the settings directory is not the user, then set it as the user:
         if get_user_owner(settings_directory) != USER:
-            chown(settings_directory, USER, GROUP)
+            chown(settings_directory, USER, USER)
 
         self.settings = {}
 
         try:
             open(self.path, "x", encoding="utf-8")
-        except FileExistsError:
+        except FileExistsError as e:
             self.read()
             pass
 

backend/updater.py

@@ -16,7 +16,6 @@ from settings import SettingsManager
 
 logger = getLogger("Updater")
 
-
 class Updater:
     def __init__(self, context) -> None:
         self.context = context
@@ -27,12 +26,14 @@ class Updater:
             "get_version": self.get_version,
             "do_update": self.do_update,
             "do_restart": self.do_restart,
-            "check_for_updates": self.check_for_updates,
+            "check_for_updates": self.check_for_updates
         }
         self.remoteVer = None
         self.allRemoteVers = None
         try:
-            self.localVer = helpers.get_loader_version()
+            logger.info(getcwd())
+            with open(path.join(getcwd(), ".loader.version"), "r", encoding="utf-8") as version_file:
+                self.localVer = version_file.readline().replace("\n", "")
         except:
             self.localVer = False
 
@@ -40,14 +41,12 @@ class Updater:
             self.currentBranch = self.get_branch(self.context.settings)
         except:
             self.currentBranch = 0
-            logger.error(
-                'Current branch could not be determined, defaulting to "Stable"'
-            )
+            logger.error("Current branch could not be determined, defaulting to \"Stable\"")
 
         if context:
-            context.web_app.add_routes(
-                [web.post("/updater/{method_name}", self._handle_server_method_call)]
-            )
+            context.web_app.add_routes([
+                web.post("/updater/{method_name}", self._handle_server_method_call)
+            ])
             context.loop.create_task(self.version_reloader())
 
     async def _handle_server_method_call(self, request):
@@ -92,10 +91,7 @@ class Updater:
             case 1 | 2:
                 url = "https://raw.githubusercontent.com/SteamDeckHomebrew/decky-loader/main/dist/plugin_loader-prerelease.service"
             case _:
-                logger.error(
-                    "You have an invalid branch set... Defaulting to prerelease"
-                    " service, please send the logs to the devs!"
-                )
+                logger.error("You have an invalid branch set... Defaulting to prerelease service, please send the logs to the devs!")
                 url = "https://raw.githubusercontent.com/SteamDeckHomebrew/decky-loader/main/dist/plugin_loader-prerelease.service"
         return str(url)
 
@@ -105,58 +101,31 @@ class Updater:
                 "current": self.localVer,
                 "remote": self.remoteVer,
                 "all": self.allRemoteVers,
-                "updatable": self.localVer != None,
+                "updatable": self.localVer != None
             }
         else:
-            return {
-                "current": "unknown",
-                "remote": self.remoteVer,
-                "all": self.allRemoteVers,
-                "updatable": False,
-            }
+            return {"current": "unknown", "remote": self.remoteVer, "all": self.allRemoteVers, "updatable": False}
 
     async def check_for_updates(self):
         logger.debug("checking for updates")
         selectedBranch = self.get_branch(self.context.settings)
         async with ClientSession() as web:
-            async with web.request(
-                "GET",
-                "https://api.github.com/repos/SteamDeckHomebrew/decky-loader/releases",
-                ssl=helpers.get_ssl_context(),
-            ) as res:
+            async with web.request("GET", "https://api.github.com/repos/SteamDeckHomebrew/decky-loader/releases", ssl=helpers.get_ssl_context()) as res:
                 remoteVersions = await res.json()
         self.allRemoteVers = remoteVersions
         logger.debug("determining release type to find, branch is %i" % selectedBranch)
         if selectedBranch == 0:
             logger.debug("release type: release")
-            self.remoteVer = next(
-                filter(
-                    lambda ver: ver["tag_name"].startswith("v")
-                    and not ver["prerelease"]
-                    and ver["tag_name"],
-                    remoteVersions,
-                ),
-                None,
-            )
+            self.remoteVer = next(filter(lambda ver: ver["tag_name"].startswith("v") and not ver["prerelease"] and ver["tag_name"], remoteVersions), None)
         elif selectedBranch == 1:
             logger.debug("release type: pre-release")
-            self.remoteVer = next(
-                filter(
-                    lambda ver: ver["prerelease"]
-                    and ver["tag_name"].startswith("v")
-                    and ver["tag_name"].find("-pre"),
-                    remoteVersions,
-                ),
-                None,
-            )
+            self.remoteVer = next(filter(lambda ver: ver["prerelease"] and ver["tag_name"].startswith("v") and ver["tag_name"].find("-pre"), remoteVersions), None)
         else:
             logger.error("release type: NOT FOUND")
             raise ValueError("no valid branch found")
         logger.info("Updated remote version information")
         tab = await get_gamepadui_tab()
-        await tab.evaluate_js(
-            f"window.DeckyPluginLoader.notifyUpdates()", False, True, False
-        )
+        await tab.evaluate_js(f"window.DeckyPluginLoader.notifyUpdates()", False, True, False)
         return await self.get_version()
 
     async def version_reloader(self):
@@ -166,7 +135,7 @@ class Updater:
                 await self.check_for_updates()
             except:
                 pass
-            await sleep(60 * 60 * 6)  # 6 hours
+            await sleep(60 * 60 * 6) # 6 hours
 
     async def do_update(self):
         logger.debug("Starting update.")
@@ -180,9 +149,7 @@ class Updater:
         async with ClientSession() as web:
             logger.debug("Downloading systemd service")
             # download the relevant systemd service depending upon branch
-            async with web.request(
-                "GET", service_url, ssl=helpers.get_ssl_context(), allow_redirects=True
-            ) as res:
+            async with web.request("GET", service_url, ssl=helpers.get_ssl_context(), allow_redirects=True) as res:
                 logger.debug("Downloading service file")
                 data = await res.content.read()
             logger.debug(str(data))
@@ -192,33 +159,22 @@ class Updater:
                     out.write(data)
             except Exception as e:
                 logger.error(f"Error at %s", exc_info=e)
-            with open(
-                path.join(getcwd(), "plugin_loader.service"), "r", encoding="utf-8"
-            ) as service_file:
+            with open(path.join(getcwd(), "plugin_loader.service"), "r", encoding="utf-8") as service_file:
                 service_data = service_file.read()
-            service_data = service_data.replace(
-                "${HOMEBREW_FOLDER}", helpers.get_homebrew_path()
-            )
-            with open(
-                path.join(getcwd(), "plugin_loader.service"), "w", encoding="utf-8"
-            ) as service_file:
-                service_file.write(service_data)
-
+            service_data = service_data.replace("${HOMEBREW_FOLDER}", "/home/"+helpers.get_user()+"/homebrew")
+            with open(path.join(getcwd(), "plugin_loader.service"), "w", encoding="utf-8") as service_file:
+                    service_file.write(service_data)
+                    
             logger.debug("Saved service file")
             logger.debug("Copying service file over current file.")
             shutil.copy(service_file_path, "/etc/systemd/system/plugin_loader.service")
             if not os.path.exists(path.join(getcwd(), ".systemd")):
                 os.mkdir(path.join(getcwd(), ".systemd"))
-            shutil.move(
-                service_file_path,
-                path.join(getcwd(), ".systemd") + "/plugin_loader.service",
-            )
-
+            shutil.move(service_file_path, path.join(getcwd(), ".systemd")+"/plugin_loader.service")
+            
             logger.debug("Downloading binary")
-            async with web.request(
-                "GET", download_url, ssl=helpers.get_ssl_context(), allow_redirects=True
-            ) as res:
-                total = int(res.headers.get("content-length", 0))
+            async with web.request("GET", download_url, ssl=helpers.get_ssl_context(), allow_redirects=True) as res:
+                total = int(res.headers.get('content-length', 0))
                 # we need to not delete the binary until we have downloaded the new binary!
                 try:
                     remove(path.join(getcwd(), "PluginLoader"))
@@ -232,22 +188,13 @@ class Updater:
                         raw += len(c)
                         new_progress = round((raw / total) * 100)
                         if progress != new_progress:
-                            self.context.loop.create_task(
-                                tab.evaluate_js(
-                                    f"window.DeckyUpdater.updateProgress({new_progress})",
-                                    False,
-                                    False,
-                                    False,
-                                )
-                            )
+                            self.context.loop.create_task(tab.evaluate_js(f"window.DeckyUpdater.updateProgress({new_progress})", False, False, False))
                             progress = new_progress
 
-            with open(
-                path.join(getcwd(), ".loader.version"), "w", encoding="utf-8"
-            ) as out:
+            with open(path.join(getcwd(), ".loader.version"), "w", encoding="utf-8") as out:
                 out.write(version)
 
-            call(["chmod", "+x", path.join(getcwd(), "PluginLoader")])
+            call(['chmod', '+x', path.join(getcwd(), "PluginLoader")])
             logger.info("Updated loader installation.")
             await tab.evaluate_js("window.DeckyUpdater.finish()", False, False)
             await self.do_restart()

backend/utilities.py

@@ -3,12 +3,13 @@ import os
 from json.decoder import JSONDecodeError
 from traceback import format_exc
 
-from asyncio import start_server, gather, open_connection
+from asyncio import sleep, start_server, gather, open_connection
 from aiohttp import ClientSession, web
 
 from logging import getLogger
-from injector import inject_to_tab, get_gamepadui_tab, close_old_tabs
+from injector import inject_to_tab, get_gamepadui_tab
 import helpers
+import subprocess
 
 
 class Utilities:
@@ -30,7 +31,7 @@ class Utilities:
             "get_setting": self.get_setting,
             "filepicker_ls": self.filepicker_ls,
             "disable_rdt": self.disable_rdt,
-            "enable_rdt": self.enable_rdt,
+            "enable_rdt": self.enable_rdt
         }
 
         self.logger = getLogger("Utilities")
@@ -40,9 +41,9 @@ class Utilities:
         self.rdt_proxy_task = None
 
         if context:
-            context.web_app.add_routes(
-                [web.post("/methods/{method_name}", self._handle_server_method_call)]
-            )
+            context.web_app.add_routes([
+                web.post("/methods/{method_name}", self._handle_server_method_call)
+            ])
 
     async def _handle_server_method_call(self, request):
         method_name = request.match_info["method_name"]
@@ -60,11 +61,12 @@ class Utilities:
             res["success"] = False
         return web.json_response(res)
 
-    async def install_plugin(
-        self, artifact="", name="No name", version="dev", hash=False
-    ):
+    async def install_plugin(self, artifact="", name="No name", version="dev", hash=False):
         return await self.context.plugin_browser.request_plugin_install(
-            artifact=artifact, name=name, version=version, hash=hash
+            artifact=artifact,
+            name=name,
+            version=version,
+            hash=hash
         )
 
     async def confirm_plugin_install(self, request_id):
@@ -78,11 +80,13 @@ class Utilities:
 
     async def http_request(self, method="", url="", **kwargs):
         async with ClientSession() as web:
-            res = await web.request(
-                method, url, ssl=helpers.get_ssl_context(), **kwargs
-            )
+            res = await web.request(method, url, ssl=helpers.get_ssl_context(), **kwargs)
             text = await res.text()
-        return {"status": res.status, "headers": dict(res.headers), "body": text}
+        return {
+            "status": res.status,
+            "headers": dict(res.headers),
+            "body": text
+        }
 
     async def ping(self, **kwargs):
         return "pong"
@@ -91,18 +95,26 @@ class Utilities:
         try:
             result = await inject_to_tab(tab, code, run_async)
             if "exceptionDetails" in result["result"]:
-                return {"success": False, "result": result["result"]}
+                return {
+                    "success": False,
+                    "result": result["result"]
+                }
 
-            return {"success": True, "result": result["result"]["result"].get("value")}
+            return {
+                "success": True,
+                "result": result["result"]["result"].get("value")
+            }
         except Exception as e:
-            return {"success": False, "result": e}
+            return {
+              "success": False,
+              "result": e
+            }
 
     async def inject_css_into_tab(self, tab, style):
         try:
             css_id = str(uuid.uuid4())
 
-            result = await inject_to_tab(
-                tab,
+            result = await inject_to_tab(tab,
                 f"""
                 (function() {{
                     const style = document.createElement('style');
@@ -110,21 +122,27 @@ class Utilities:
                     document.head.append(style);
                     style.textContent = `{style}`;
                 }})()
-                """,
-                False,
-            )
+                """, False)
 
             if "exceptionDetails" in result["result"]:
-                return {"success": False, "result": result["result"]}
+                return {
+                    "success": False,
+                    "result": result["result"]
+                }
 
-            return {"success": True, "result": css_id}
+            return {
+                "success": True,
+                "result": css_id
+            }
         except Exception as e:
-            return {"success": False, "result": e}
+            return {
+                "success": False,
+                "result": e
+            }
 
     async def remove_css_from_tab(self, tab, css_id):
         try:
-            result = await inject_to_tab(
-                tab,
+            result = await inject_to_tab(tab,
                 f"""
                 (function() {{
                     let style = document.getElementById("{css_id}");
@@ -132,16 +150,22 @@ class Utilities:
                     if (style.nodeName.toLowerCase() == 'style')
                         style.parentNode.removeChild(style);
                 }})()
-                """,
-                False,
-            )
+                """, False)
 
             if "exceptionDetails" in result["result"]:
-                return {"success": False, "result": result}
+                return {
+                    "success": False,
+                    "result": result
+                }
 
-            return {"success": True}
+            return {
+                "success": True
+            }
         except Exception as e:
-            return {"success": False, "result": e}
+            return {
+                "success": False,
+                "result": e
+            }
 
     async def get_setting(self, key, default):
         return self.context.settings.getSetting(key, default)
@@ -163,7 +187,7 @@ class Utilities:
         #         return os.path.getmtime(os.path.join(path, file))
         #     return 0
         # file_names = sorted(os.listdir(path), key=sorter, reverse=True) # TODO provide more sort options
-        file_names = sorted(os.listdir(path))  # Alphabetical
+        file_names = sorted(os.listdir(path)) # Alphabetical
 
         files = []
 
@@ -172,15 +196,16 @@ class Utilities:
             is_dir = os.path.isdir(full_path)
 
             if is_dir or include_files:
-                files.append(
-                    {
-                        "isdir": is_dir,
-                        "name": file,
-                        "realpath": os.path.realpath(full_path),
-                    }
-                )
+                files.append({
+                    "isdir": is_dir,
+                    "name": file,
+                    "realpath": os.path.realpath(full_path)
+                })
 
-        return {"realpath": os.path.realpath(path), "files": files}
+        return {
+            "realpath": os.path.realpath(path),
+            "files": files
+        }
 
     # Based on https://stackoverflow.com/a/46422554/13174603
     def start_rdt_proxy(self, ip, port):
@@ -190,10 +215,10 @@ class Utilities:
                     writer.write(await reader.read(2048))
             finally:
                 writer.close()
-
         async def handle_client(local_reader, local_writer):
             try:
-                remote_reader, remote_writer = await open_connection(ip, port)
+                remote_reader, remote_writer = await open_connection(
+                    ip, port)
                 pipe1 = pipe(local_reader, remote_writer)
                 pipe2 = pipe(remote_reader, local_writer)
                 await gather(pipe1, pipe2)
@@ -208,56 +233,34 @@ class Utilities:
             self.rdt_proxy_server.close()
             self.rdt_proxy_task.cancel()
 
-    async def _enable_rdt(self):
+    async def enable_rdt(self):
         # TODO un-hardcode port
         try:
             self.stop_rdt_proxy()
             ip = self.context.settings.getSetting("developer.rdt.ip", None)
 
-            if ip is not None:
+            if ip != None:
                 self.logger.info("Connecting to React DevTools at " + ip)
                 async with ClientSession() as web:
-                    res = await web.request(
-                        "GET", "http://" + ip + ":8097", ssl=helpers.get_ssl_context()
-                    )
-                    script = (
-                        """
-                    if (!window.deckyHasConnectedRDT) {
-                        window.deckyHasConnectedRDT = true;
-                        // This fixes the overlay when hovering over an element in RDT
-                        Object.defineProperty(window, '__REACT_DEVTOOLS_TARGET_WINDOW__', {
-                            enumerable: true,
-                            configurable: true,
-                            get: function() {
-                                return FocusNavController?.m_ActiveContext?.ActiveWindow || window;
-                            }
-                        });
-                    """
-                        + await res.text()
-                        + "\n}"
-                    )
+                    res = await web.request("GET", "http://" + ip + ":8097", ssl=helpers.get_ssl_context())
                 if res.status != 200:
                     self.logger.error("Failed to connect to React DevTools at " + ip)
                     return False
                 self.start_rdt_proxy(ip, 8097)
+                script = "if(!window.deckyHasConnectedRDT){window.deckyHasConnectedRDT=true;\n" + await res.text() + "\n}"
                 self.logger.info("Connected to React DevTools, loading script")
                 tab = await get_gamepadui_tab()
                 # RDT needs to load before React itself to work.
-                await close_old_tabs()
                 result = await tab.reload_and_evaluate(script)
                 self.logger.info(result)
-
+                        
         except Exception:
             self.logger.error("Failed to connect to React DevTools")
             self.logger.error(format_exc())
 
-    async def enable_rdt(self):
-        self.context.loop.create_task(self._enable_rdt())
-
     async def disable_rdt(self):
         self.logger.info("Disabling React DevTools")
         tab = await get_gamepadui_tab()
         self.rdt_script_id = None
-        await close_old_tabs()
-        await tab.evaluate_js("location.reload();", False, True, False)
+        await tab.evaluate_js("SteamClient.User.StartRestart();", False, True, False)
         self.logger.info("React DevTools disabled")

dist/install_prerelease.sh

@@ -11,12 +11,10 @@ HOMEBREW_FOLDER="${USER_DIR}/homebrew"
 rm -rf "${HOMEBREW_FOLDER}/services"
 sudo -u $SUDO_USER mkdir -p "${HOMEBREW_FOLDER}/services"
 sudo -u $SUDO_USER mkdir -p "${HOMEBREW_FOLDER}/plugins"
-touch "${USER_DIR}/.steam/steam/.cef-enable-remote-debugging"
 
 # Download latest release and install it
 RELEASE=$(curl -s 'https://api.github.com/repos/SteamDeckHomebrew/decky-loader/releases' | jq -r "first(.[] | select(.prerelease == "true"))")
-VERSION=$(jq -r '.tag_name' <<< ${RELEASE} )
-DOWNLOADURL=$(jq -r '.assets[].browser_download_url | select(endswith("PluginLoader"))' <<< ${RELEASE})
+read VERSION DOWNLOADURL < <(echo $(jq -r '.tag_name, .assets[].browser_download_url' <<< ${RELEASE}))
 
 printf "Installing version %s...\n" "${VERSION}"
 curl -L $DOWNLOADURL --output ${HOMEBREW_FOLDER}/services/PluginLoader

dist/install_release.sh

@@ -11,12 +11,10 @@ HOMEBREW_FOLDER="${USER_DIR}/homebrew"
 rm -rf "${HOMEBREW_FOLDER}/services"
 sudo -u $SUDO_USER mkdir -p "${HOMEBREW_FOLDER}/services"
 sudo -u $SUDO_USER mkdir -p "${HOMEBREW_FOLDER}/plugins"
-touch "${USER_DIR}/.steam/steam/.cef-enable-remote-debugging"
 
 # Download latest release and install it
 RELEASE=$(curl -s 'https://api.github.com/repos/SteamDeckHomebrew/decky-loader/releases' | jq -r "first(.[] | select(.prerelease == "false"))")
-VERSION=$(jq -r '.tag_name' <<< ${RELEASE} )
-DOWNLOADURL=$(jq -r '.assets[].browser_download_url | select(endswith("PluginLoader"))' <<< ${RELEASE})
+read VERSION DOWNLOADURL < <(echo $(jq -r '.tag_name, .assets[].browser_download_url' <<< ${RELEASE}))
 
 printf "Installing version %s...\n" "${VERSION}"
 curl -L $DOWNLOADURL --output ${HOMEBREW_FOLDER}/services/PluginLoader

frontend/index.d.ts

@@ -1,2 +0,0 @@
-declare module '*.png';
-declare module '*.jpg';

frontend/package.json

@@ -12,7 +12,6 @@
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^21.1.0",
-    "@rollup/plugin-image": "^3.0.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
@@ -42,7 +41,7 @@
     }
   },
   "dependencies": {
-    "decky-frontend-lib": "^3.18.10",
+    "decky-frontend-lib": "^3.18.4",
     "react-file-icon": "^1.2.0",
     "react-icons": "^4.4.0",
     "react-markdown": "^8.0.3",

frontend/pnpm-lock.yaml

@@ -2,7 +2,6 @@ lockfileVersion: 5.4
 
 specifiers:
   '@rollup/plugin-commonjs': ^21.1.0
-  '@rollup/plugin-image': ^3.0.1
   '@rollup/plugin-json': ^4.1.0
   '@rollup/plugin-node-resolve': ^13.3.0
   '@rollup/plugin-replace': ^4.0.0
@@ -11,7 +10,7 @@ specifiers:
   '@types/react-file-icon': ^1.0.1
   '@types/react-router': 5.1.18
   '@types/webpack': ^5.28.0
-  decky-frontend-lib: ^3.18.10
+  decky-frontend-lib: ^3.18.4
   husky: ^8.0.1
   import-sort-style-module: ^6.0.0
   inquirer: ^8.2.4
@@ -31,7 +30,7 @@ specifiers:
   typescript: ^4.7.4
 
 dependencies:
-  decky-frontend-lib: 3.18.10
+  decky-frontend-lib: 3.18.4
   react-file-icon: 1.2.0_wcqkhtmu7mswc6yz4uyexck3ty
   react-icons: 4.4.0_react@16.14.0
   react-markdown: 8.0.3_vshvapmxg47tngu7tvrsqpq55u
@@ -39,7 +38,6 @@ dependencies:
 
 devDependencies:
   '@rollup/plugin-commonjs': 21.1.0_rollup@2.76.0
-  '@rollup/plugin-image': 3.0.1_rollup@2.76.0
   '@rollup/plugin-json': 4.1.0_rollup@2.76.0
   '@rollup/plugin-node-resolve': 13.3.0_rollup@2.76.0
   '@rollup/plugin-replace': 4.0.0_rollup@2.76.0
@@ -341,20 +339,6 @@ packages:
       rollup: 2.76.0
     dev: true
 
-  /@rollup/plugin-image/3.0.1_rollup@2.76.0:
-    resolution: {integrity: sha512-F50Sko4Xcc576x7HG9f3MvJKKnBfSmqfVFWJkJgyIEkI8YxZxux28lDbuy0+GsAK6BFl9Gn+TRXOUgHHJbFh3w==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      '@rollup/pluginutils': 5.0.2_rollup@2.76.0
-      mini-svg-data-uri: 1.4.4
-      rollup: 2.76.0
-    dev: true
-
   /@rollup/plugin-inject/4.0.4_rollup@2.76.0:
     resolution: {integrity: sha512-4pbcU4J/nS+zuHk+c+OL3WtmEQhqxlZ9uqfjQMQDOHOPld7PsCd8k5LWs8h5wjwJN7MgnAn768F2sDxEP4eNFQ==}
     peerDependencies:
@@ -438,21 +422,6 @@ packages:
       picomatch: 2.3.1
     dev: true
 
-  /@rollup/pluginutils/5.0.2_rollup@2.76.0:
-    resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      '@types/estree': 1.0.0
-      estree-walker: 2.0.2
-      picomatch: 2.3.1
-      rollup: 2.76.0
-    dev: true
-
   /@types/debug/4.1.7:
     resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==}
     dependencies:
@@ -975,8 +944,8 @@ packages:
     dependencies:
       ms: 2.1.2
 
-  /decky-frontend-lib/3.18.10:
-    resolution: {integrity: sha512-2mgbA3sSkuwQR/FnmhXVrcW6LyTS95IuL6muJAmQCruhBvXapDtjk1TcgxqMZxFZwGD1IPnemPYxHZll6IgnZw==}
+  /decky-frontend-lib/3.18.4:
+    resolution: {integrity: sha512-i3TAe3RJtT1TK0rJgW9Ek5jxMWZRCYLDvqHDylGVieUvuyI7c8X+cogz30pP4cqeGOaA1d/MxBEbhlpD3JhVvg==}
     dev: false
 
   /decode-named-character-reference/1.0.2:
@@ -1967,11 +1936,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /mini-svg-data-uri/1.4.4:
-    resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==}
-    hasBin: true
-    dev: true
-
   /minimatch/3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:

frontend/rollup.config.js

@@ -1,5 +1,4 @@
 import commonjs from '@rollup/plugin-commonjs';
-import image from '@rollup/plugin-image';
 import json from '@rollup/plugin-json';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
@@ -30,7 +29,6 @@ export default defineConfig({
       preventAssignment: false,
       'process.env.NODE_ENV': JSON.stringify('production'),
     }),
-    image(),
   ],
   preserveEntrySignatures: false,
   output: {

frontend/src/components/DeckyGlobalComponentsState.tsx

@@ -14,13 +14,13 @@ export class DeckyGlobalComponentsState {
     return { components: this._components };
   }
 
-  addComponent(path: string, component: FC) {
-    this._components.set(path, component);
+  addComponent(name: string, component: FC) {
+    this._components.set(name, component);
     this.notifyUpdate();
   }
 
-  removeComponent(path: string) {
-    this._components.delete(path);
+  removeComponent(name: string) {
+    this._components.delete(name);
     this.notifyUpdate();
   }
 
@@ -30,8 +30,8 @@ export class DeckyGlobalComponentsState {
 }
 
 interface DeckyGlobalComponentsContext extends PublicDeckyGlobalComponentsState {
-  addComponent(path: string, component: FC): void;
-  removeComponent(path: string): void;
+  addComponent(name: string, component: FC): void;
+  removeComponent(name: string): void;
 }
 
 const DeckyGlobalComponentsContext = createContext<DeckyGlobalComponentsContext>(null as any);

frontend/src/components/DeckyIcon.tsx

@@ -1,37 +0,0 @@
-export default function DeckyIcon() {
-  return (
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 456" width="512" height="456">
-      <g>
-        <path
-          style={{ fill: 'none' }}
-          d="M154.33,72.51v49.79c11.78-0.17,23.48,2,34.42,6.39c10.93,4.39,20.89,10.91,29.28,19.18
-          c8.39,8.27,15.06,18.13,19.61,29c4.55,10.87,6.89,22.54,6.89,34.32c0,11.78-2.34,23.45-6.89,34.32
-          c-4.55,10.87-11.21,20.73-19.61,29c-8.39,8.27-18.35,14.79-29.28,19.18c-10.94,4.39-22.63,6.56-34.42,6.39v49.77
-          c36.78,0,72.05-14.61,98.05-40.62c26-26.01,40.61-61.28,40.61-98.05c0-36.78-14.61-72.05-40.61-98.05
-          C226.38,87.12,191.11,72.51,154.33,72.51z"
-        />
-
-        <ellipse
-          transform="matrix(0.982 -0.1891 0.1891 0.982 -37.1795 32.9988)"
-          style={{ fill: 'none' }}
-          cx="154.33"
-          cy="211.33"
-          rx="69.33"
-          ry="69.33"
-        />
-        <path style={{ fill: 'none' }} d="M430,97h-52v187h52c7.18,0,13-5.82,13-13V110C443,102.82,437.18,97,430,97z" />
-        <path
-          style={{ fill: 'currentColor' }}
-          d="M432,27h-54V0H0v361c0,52.47,42.53,95,95,95h188c52.47,0,95-42.53,95-95v-7h54c44.18,0,80-35.82,80-80V107
-          C512,62.82,476.18,27,432,27z M85,211.33c0-38.29,31.04-69.33,69.33-69.33c38.29,0,69.33,31.04,69.33,69.33
-          c0,38.29-31.04,69.33-69.33,69.33C116.04,280.67,85,249.62,85,211.33z M252.39,309.23c-26.01,26-61.28,40.62-98.05,40.62v-49.77
-          c11.78,0.17,23.48-2,34.42-6.39c10.93-4.39,20.89-10.91,29.28-19.18c8.39-8.27,15.06-18.13,19.61-29
-          c4.55-10.87,6.89-22.53,6.89-34.32c0-11.78-2.34-23.45-6.89-34.32c-4.55-10.87-11.21-20.73-19.61-29
-          c-8.39-8.27-18.35-14.79-29.28-19.18c-10.94-4.39-22.63-6.56-34.42-6.39V72.51c36.78,0,72.05,14.61,98.05,40.61
-          c26,26.01,40.61,61.28,40.61,98.05C293,247.96,278.39,283.23,252.39,309.23z M443,271c0,7.18-5.82,13-13,13h-52V97h52
-          c7.18,0,13,5.82,13,13V271z"
-        />
-      </g>
-    </svg>
-  );
-}

frontend/src/components/DeckyMenuState.tsx

@@ -0,0 +1,147 @@
+import { CustomMainMenuItem, ItemPatch, OverlayPatch } from 'decky-frontend-lib';
+import { FC, ReactNode, createContext, useContext, useEffect, useState } from 'react';
+
+interface PublicDeckyMenuState {
+  items: Set<CustomMainMenuItem>;
+  itemPatches: Map<string, Set<ItemPatch>>;
+  overlayPatches: Set<OverlayPatch>;
+  overlayComponents: Set<ReactNode>;
+}
+
+export class DeckyMenuState {
+  private _items = new Set<CustomMainMenuItem>();
+  private _itemPatches = new Map<string, Set<ItemPatch>>();
+  private _overlayPatches = new Set<OverlayPatch>();
+  private _overlayComponents = new Set<ReactNode>();
+
+  public eventBus = new EventTarget();
+
+  publicState(): PublicDeckyMenuState {
+    return {
+      items: this._items,
+      itemPatches: this._itemPatches,
+      overlayPatches: this._overlayPatches,
+      overlayComponents: this._overlayComponents,
+    };
+  }
+
+  addItem(item: CustomMainMenuItem) {
+    this._items.add(item);
+    this.notifyUpdate();
+    return item;
+  }
+
+  addPatch(path: string, patch: ItemPatch) {
+    let patchList = this._itemPatches.get(path);
+    if (!patchList) {
+      patchList = new Set();
+      this._itemPatches.set(path, patchList);
+    }
+    patchList.add(patch);
+    this.notifyUpdate();
+    return patch;
+  }
+
+  addOverlayPatch(patch: OverlayPatch) {
+    this._overlayPatches.add(patch);
+    this.notifyUpdate();
+    return patch;
+  }
+
+  addOverlayComponent(component: ReactNode) {
+    this._overlayComponents.add(component);
+    this.notifyUpdate();
+    return component;
+  }
+
+  removePatch(path: string, patch: ItemPatch) {
+    const patchList = this._itemPatches.get(path);
+    patchList?.delete(patch);
+    if (patchList?.size == 0) {
+      this._itemPatches.delete(path);
+    }
+    this.notifyUpdate();
+  }
+
+  removeItem(item: CustomMainMenuItem) {
+    this._items.delete(item);
+    this.notifyUpdate();
+    return item;
+  }
+
+  removeOverlayPatch(patch: OverlayPatch) {
+    this._overlayPatches.delete(patch);
+    this.notifyUpdate();
+  }
+
+  removeOverlayComponent(component: ReactNode) {
+    this._overlayComponents.delete(component);
+    this.notifyUpdate();
+  }
+
+  private notifyUpdate() {
+    this.eventBus.dispatchEvent(new Event('update'));
+  }
+}
+
+interface DeckyMenuStateContext extends PublicDeckyMenuState {
+  addItem: DeckyMenuState['addItem'];
+  addPatch: DeckyMenuState['addPatch'];
+  addOverlayPatch: DeckyMenuState['addOverlayPatch'];
+  addOverlayComponent: DeckyMenuState['addOverlayComponent'];
+  removePatch: DeckyMenuState['removePatch'];
+  removeOverlayPatch: DeckyMenuState['removeOverlayPatch'];
+  removeOverlayComponent: DeckyMenuState['removeOverlayComponent'];
+  removeItem: DeckyMenuState['removeItem'];
+}
+
+const DeckyMenuStateContext = createContext<DeckyMenuStateContext>(null as any);
+
+export const useDeckyMenuState = () => useContext(DeckyMenuStateContext);
+
+interface Props {
+  deckyMenuState: DeckyMenuState;
+}
+
+export const DeckyMenuStateContextProvider: FC<Props> = ({ children, deckyMenuState }) => {
+  const [publicDeckyMenuState, setPublicDeckyMenuState] = useState<PublicDeckyMenuState>({
+    ...deckyMenuState.publicState(),
+  });
+
+  useEffect(() => {
+    function onUpdate() {
+      setPublicDeckyMenuState({ ...deckyMenuState.publicState() });
+    }
+
+    deckyMenuState.eventBus.addEventListener('update', onUpdate);
+
+    return () => deckyMenuState.eventBus.removeEventListener('update', onUpdate);
+  }, []);
+
+  const addItem = deckyMenuState.addItem.bind(deckyMenuState);
+  const addPatch = deckyMenuState.addPatch.bind(deckyMenuState);
+  const addOverlayPatch = deckyMenuState.addOverlayPatch.bind(deckyMenuState);
+  const addOverlayComponent = deckyMenuState.addOverlayComponent.bind(deckyMenuState);
+  const removePatch = deckyMenuState.removePatch.bind(deckyMenuState);
+  const removeOverlayPatch = deckyMenuState.removeOverlayPatch.bind(deckyMenuState);
+  const removeOverlayComponent = deckyMenuState.removeOverlayComponent.bind(deckyMenuState);
+  const removeItem = deckyMenuState.removeItem.bind(deckyMenuState);
+
+  return (
+    <DeckyMenuStateContext.Provider
+      value={{
+        ...publicDeckyMenuState,
+        addItem,
+        addPatch,
+        addOverlayPatch,
+        addOverlayComponent,
+        removePatch,
+        removeOverlayPatch,
+        removeOverlayComponent,
+        removeItem,
+      }}
+    >
+      {children}
+    </DeckyMenuStateContext.Provider>
+  );
+};

frontend/src/components/TitleView.tsx

@@ -1,7 +1,6 @@
 import { DialogButton, Focusable, Router, staticClasses } from 'decky-frontend-lib';
 import { CSSProperties, VFC } from 'react';
-import { BsGearFill } from 'react-icons/bs';
-import { FaArrowLeft, FaStore } from 'react-icons/fa';
+import { FaArrowLeft, FaCog, FaStore } from 'react-icons/fa';
 
 import { useDeckyState } from './DeckyState';
 
@@ -27,6 +26,12 @@ const TitleView: VFC = () => {
   if (activePlugin === null) {
     return (
       <Focusable style={titleStyles} className={staticClasses.Title}>
+        <DialogButton
+          style={{ height: '28px', width: '40px', minWidth: 0, padding: '10px 12px' }}
+          onClick={onSettingsClick}
+        >
+          <FaCog style={{ marginTop: '-4px', display: 'block' }} />
+        </DialogButton>
         <div style={{ marginRight: 'auto', flex: 0.9 }}>Decky</div>
         <DialogButton
           style={{ height: '28px', width: '40px', minWidth: 0, padding: '10px 12px' }}
@@ -34,12 +39,6 @@ const TitleView: VFC = () => {
         >
           <FaStore style={{ marginTop: '-4px', display: 'block' }} />
         </DialogButton>
-        <DialogButton
-          style={{ height: '28px', width: '40px', minWidth: 0, padding: '10px 12px' }}
-          onClick={onSettingsClick}
-        >
-          <BsGearFill style={{ marginTop: '-4px', display: 'block' }} />
-        </DialogButton>
       </Focusable>
     );
   }

frontend/src/components/modals/PluginInstallModal.tsx

@@ -1,4 +1,4 @@
-import { ConfirmModal, Navigation, QuickAccessTab } from 'decky-frontend-lib';
+import { ConfirmModal, Navigation, QuickAccessTab, Spinner, staticClasses } from 'decky-frontend-lib';
 import { FC, useState } from 'react';
 
 interface PluginInstallModalProps {
@@ -26,14 +26,15 @@ const PluginInstallModal: FC<PluginInstallModalProps> = ({ artifact, version, ha
       onCancel={async () => {
         await onCancel();
       }}
-      strTitle={`Install ${artifact}`}
-      strOKButtonText={loading ? 'Installing' : 'Install'}
     >
-      {hash == 'False' ? (
-        <h3 style={{ color: 'red' }}>!!!!NO HASH PROVIDED!!!!</h3>
-      ) : (
-        `Are you sure you want to install ${artifact} ${version}?`
-      )}
+      <div className={staticClasses.Title} style={{ flexDirection: 'column' }}>
+        {hash == 'False' ? <h3 style={{ color: 'red' }}>!!!!NO HASH PROVIDED!!!!</h3> : null}
+        <div style={{ flexDirection: 'row' }}>
+          {loading && <Spinner style={{ width: '20px' }} />} {loading ? 'Installing' : 'Install'} {artifact}
+          {version ? ' version ' + version : null}
+          {!loading && '?'}
+        </div>
+      </div>
     </ConfirmModal>
   );
 };

frontend/src/components/settings/index.tsx

@@ -1,9 +1,7 @@
 import { SidebarNavigation } from 'decky-frontend-lib';
 import { lazy } from 'react';
-import { FaCode, FaPlug } from 'react-icons/fa';
 
 import { useSetting } from '../../utils/hooks/useSetting';
-import DeckyIcon from '../DeckyIcon';
 import WithSuspense from '../WithSuspense';
 import GeneralSettings from './pages/general';
 import PluginList from './pages/plugin_list';
@@ -15,18 +13,19 @@ export default function SettingsPage() {
 
   const pages = [
     {
-      title: 'Decky',
+      title: 'General',
       content: <GeneralSettings isDeveloper={isDeveloper} setIsDeveloper={setIsDeveloper} />,
       route: '/decky/settings/general',
-      icon: <DeckyIcon />,
     },
     {
       title: 'Plugins',
       content: <PluginList />,
       route: '/decky/settings/plugins',
-      icon: <FaPlug />,
     },
-    {
+  ];
+
+  if (isDeveloper)
+    pages.push({
       title: 'Developer',
       content: (
         <WithSuspense>
@@ -34,10 +33,7 @@ export default function SettingsPage() {
         </WithSuspense>
       ),
       route: '/decky/settings/developer',
-      icon: <FaCode />,
-      visible: isDeveloper,
-    },
-  ];
+    });
 
-  return <SidebarNavigation pages={pages} />;
+  return <SidebarNavigation title="Decky Settings" showTitle pages={pages} />;
 }

frontend/src/components/settings/pages/developer/index.tsx

@@ -1,10 +1,9 @@
-import { DialogBody, Field, TextField, Toggle } from 'decky-frontend-lib';
+import { Field, Focusable, TextField, Toggle } from 'decky-frontend-lib';
 import { useRef } from 'react';
 import { FaReact, FaSteamSymbol } from 'react-icons/fa';
 
 import { setShouldConnectToReactDevTools, setShowValveInternal } from '../../../../developer';
 import { useSetting } from '../../../../utils/hooks/useSetting';
-import RemoteDebuggingSettings from '../general/RemoteDebugging';
 
 export default function DeveloperSettings() {
   const [enableValveInternal, setEnableValveInternal] = useSetting<boolean>('developer.valve_internal', false);
@@ -13,8 +12,7 @@ export default function DeveloperSettings() {
   const textRef = useRef<HTMLDivElement>(null);
 
   return (
-    <DialogBody>
-      <RemoteDebuggingSettings />
+    <>
       <Field
         label="Enable Valve Internal"
         description={
@@ -32,33 +30,55 @@ export default function DeveloperSettings() {
             setShowValveInternal(toggleValue);
           }}
         />
-      </Field>
-      <Field
-        label="Enable React DevTools"
-        description={
-          <>
-            <span style={{ whiteSpace: 'pre-line' }}>
-              Enables connection to a computer running React DevTools. Changing this setting will reload Steam. Set the
-              IP address before enabling.
-            </span>
-            <br />
-            <br />
-            <div ref={textRef}>
-              <TextField label={'IP'} value={reactDevtoolsIP} onChange={(e) => setReactDevtoolsIP(e?.target.value)} />
-            </div>
-          </>
+      </Field>{' '}
+      <Focusable
+        onTouchEnd={
+          reactDevtoolsIP == ''
+            ? () => {
+                (textRef.current?.childNodes[0] as HTMLInputElement)?.focus();
+              }
+            : undefined
+        }
+        onClick={
+          reactDevtoolsIP == ''
+            ? () => {
+                (textRef.current?.childNodes[0] as HTMLInputElement)?.focus();
+              }
+            : undefined
+        }
+        onOKButton={
+          reactDevtoolsIP == ''
+            ? () => {
+                (textRef.current?.childNodes[0] as HTMLInputElement)?.focus();
+              }
+            : undefined
         }
-        icon={<FaReact style={{ display: 'block' }} />}
       >
-        <Toggle
-          value={reactDevtoolsEnabled}
-          disabled={reactDevtoolsIP == ''}
-          onChange={(toggleValue) => {
-            setReactDevtoolsEnabled(toggleValue);
-            setShouldConnectToReactDevTools(toggleValue);
-          }}
-        />
-      </Field>
-    </DialogBody>
+        <Field
+          label="Enable React DevTools"
+          description={
+            <>
+              <span style={{ whiteSpace: 'pre-line' }}>
+                Enables connection to a computer running React DevTools. Changing this setting will reload Steam. Set
+                the IP address before enabling.
+              </span>
+              <div ref={textRef}>
+                <TextField label={'IP'} value={reactDevtoolsIP} onChange={(e) => setReactDevtoolsIP(e?.target.value)} />
+              </div>
+            </>
+          }
+          icon={<FaReact style={{ display: 'block' }} />}
+        >
+          <Toggle
+            value={reactDevtoolsEnabled}
+            disabled={reactDevtoolsIP == ''}
+            onChange={(toggleValue) => {
+              setReactDevtoolsEnabled(toggleValue);
+              setShouldConnectToReactDevTools(toggleValue);
+            }}
+          />
+        </Field>
+      </Focusable>
+    </>
   );
 }

frontend/src/components/settings/pages/general/BranchSelect.tsx

@@ -19,7 +19,7 @@ const BranchSelect: FunctionComponent<{}> = () => {
   return (
     // Returns numerical values from 0 to 2 (with current branch setup as of 8/28/22)
     // 0 being stable, 1 being pre-release and 2 being nightly
-    <Field label="Decky Update Channel" childrenContainerWidth={'fixed'}>
+    <Field label="Update Channel">
       <Dropdown
         rgOptions={Object.values(UpdateBranch)
           .filter((branch) => typeof branch == 'string')

frontend/src/components/settings/pages/general/RemoteDebugging.tsx

@@ -1,5 +1,5 @@
 import { Field, Toggle } from 'decky-frontend-lib';
-import { FaChrome } from 'react-icons/fa';
+import { FaBug } from 'react-icons/fa';
 
 import { useSetting } from '../../../../utils/hooks/useSetting';
 
@@ -11,10 +11,10 @@ export default function RemoteDebuggingSettings() {
       label="Allow Remote CEF Debugging"
       description={
         <span style={{ whiteSpace: 'pre-line' }}>
-          Allows unauthenticated access to the CEF debugger to anyone in your network.
+          Allow unauthenticated access to the CEF debugger to anyone in your network
         </span>
       }
-      icon={<FaChrome style={{ display: 'block' }} />}
+      icon={<FaBug style={{ display: 'block' }} />}
     >
       <Toggle
         value={allowRemoteDebugging || false}

frontend/src/components/settings/pages/general/StoreSelect.tsx

@@ -16,7 +16,7 @@ const StoreSelect: FunctionComponent<{}> = () => {
   // 0 being Default, 1 being Testing and 2 being Custom
   return (
     <>
-      <Field label="Plugin Store Channel" childrenContainerWidth={'fixed'}>
+      <Field label="Store Channel">
         <Dropdown
           rgOptions={Object.values(Store)
             .filter((store) => typeof store == 'string')

frontend/src/components/settings/pages/general/Updater.tsx

@@ -11,7 +11,7 @@ import {
 import { useCallback } from 'react';
 import { Suspense, lazy } from 'react';
 import { useEffect, useState } from 'react';
-import { FaExclamation } from 'react-icons/fa';
+import { FaArrowDown } from 'react-icons/fa';
 
 import { VerInfo, callUpdaterMethod, finishUpdate } from '../../../../updater';
 import { findSP } from '../../../../utils/windows';
@@ -95,21 +95,21 @@ export default function UpdaterSettings() {
       <Field
         onOptionsActionDescription={versionInfo?.all ? 'Patch Notes' : undefined}
         onOptionsButton={versionInfo?.all ? showPatchNotes : undefined}
-        label="Decky Updates"
+        label="Updates"
         description={
-          checkingForUpdates || versionInfo?.remote?.tag_name != versionInfo?.current || !versionInfo?.remote ? (
-            ''
-          ) : (
-            <span>Up to date: running {versionInfo?.current}</span>
+          versionInfo && (
+            <span style={{ whiteSpace: 'pre-line' }}>{`Current version: ${versionInfo.current}\n${
+              versionInfo.updatable ? `Latest version: ${versionInfo.remote?.tag_name}` : ''
+            }`}</span>
           )
         }
         icon={
-          versionInfo?.remote &&
-          versionInfo?.remote?.tag_name != versionInfo?.current && (
-            <FaExclamation color="var(--gpColor-Yellow)" style={{ display: 'block' }} />
+          !versionInfo ? (
+            <Spinner style={{ width: '1em', height: 20, display: 'block' }} />
+          ) : (
+            <FaArrowDown style={{ display: 'block' }} />
           )
         }
-        childrenContainerWidth={'fixed'}
       >
         {updateProgress == -1 && !isLoaderUpdating ? (
           <DialogButton
@@ -144,7 +144,7 @@ export default function UpdaterSettings() {
           />
         )}
       </Field>
-      {versionInfo?.remote && versionInfo?.remote?.tag_name != versionInfo?.current && (
+      {versionInfo?.remote && (
         <InlinePatchNotes
           title={versionInfo?.remote.name}
           date={new Intl.RelativeTimeFormat('en-US', {

frontend/src/components/settings/pages/general/index.tsx

@@ -1,17 +1,10 @@
-import {
-  DialogBody,
-  DialogButton,
-  DialogControlsSection,
-  DialogControlsSectionHeader,
-  Field,
-  TextField,
-  Toggle,
-} from 'decky-frontend-lib';
+import { DialogButton, Field, TextField, Toggle } from 'decky-frontend-lib';
 import { useState } from 'react';
+import { FaShapes, FaTools } from 'react-icons/fa';
 
 import { installFromURL } from '../../../../store';
-import { useDeckyState } from '../../../DeckyState';
 import BranchSelect from './BranchSelect';
+import RemoteDebuggingSettings from './RemoteDebugging';
 import StoreSelect from './StoreSelect';
 import UpdaterSettings from './Updater';
 
@@ -23,44 +16,34 @@ export default function GeneralSettings({
   setIsDeveloper: (val: boolean) => void;
 }) {
   const [pluginURL, setPluginURL] = useState('');
-  const { versionInfo } = useDeckyState();
 
   return (
-    <DialogBody>
-      <DialogControlsSection>
-        <DialogControlsSectionHeader>Updates</DialogControlsSectionHeader>
-        <UpdaterSettings />
-      </DialogControlsSection>
-      <DialogControlsSection>
-        <DialogControlsSectionHeader>Beta Participation</DialogControlsSectionHeader>
-        <BranchSelect />
-        <StoreSelect />
-      </DialogControlsSection>
-      <DialogControlsSection>
-        <DialogControlsSectionHeader>Other</DialogControlsSectionHeader>
-        <Field label="Enable Developer Mode">
-          <Toggle
-            value={isDeveloper}
-            onChange={(toggleValue) => {
-              setIsDeveloper(toggleValue);
-            }}
-          />
-        </Field>
-        <Field
-          label="Install plugin from URL"
-          description={<TextField label={'URL'} value={pluginURL} onChange={(e) => setPluginURL(e?.target.value)} />}
-        >
-          <DialogButton disabled={pluginURL.length == 0} onClick={() => installFromURL(pluginURL)}>
-            Install
-          </DialogButton>
-        </Field>
-      </DialogControlsSection>
-      <DialogControlsSection>
-        <DialogControlsSectionHeader>About</DialogControlsSectionHeader>
-        <Field label="Decky Version" focusable={true}>
-          <div style={{ color: 'var(--gpSystemLighterGrey)' }}>{versionInfo?.current}</div>
-        </Field>
-      </DialogControlsSection>
-    </DialogBody>
+    <div>
+      <UpdaterSettings />
+      <BranchSelect />
+      <StoreSelect />
+      <RemoteDebuggingSettings />
+      <Field
+        label="Developer mode"
+        description={<span style={{ whiteSpace: 'pre-line' }}>Enables Decky's developer settings.</span>}
+        icon={<FaTools style={{ display: 'block' }} />}
+      >
+        <Toggle
+          value={isDeveloper}
+          onChange={(toggleValue) => {
+            setIsDeveloper(toggleValue);
+          }}
+        />
+      </Field>
+      <Field
+        label="Manual plugin install"
+        description={<TextField label={'URL'} value={pluginURL} onChange={(e) => setPluginURL(e?.target.value)} />}
+        icon={<FaShapes style={{ display: 'block' }} />}
+      >
+        <DialogButton disabled={pluginURL.length == 0} onClick={() => installFromURL(pluginURL)}>
+          Install
+        </DialogButton>
+      </Field>
+    </div>
   );
 }

frontend/src/components/settings/pages/plugin_list/index.tsx

@@ -1,12 +1,4 @@
-import {
-  DialogBody,
-  DialogButton,
-  DialogControlsSection,
-  Focusable,
-  Menu,
-  MenuItem,
-  showContextMenu,
-} from 'decky-frontend-lib';
+import { DialogButton, Focusable, Menu, MenuItem, showContextMenu } from 'decky-frontend-lib';
 import { useEffect } from 'react';
 import { FaDownload, FaEllipsisH } from 'react-icons/fa';
 
@@ -29,52 +21,46 @@ export default function PluginList() {
   }
 
   return (
-    <DialogBody>
-      <DialogControlsSection>
-        <ul style={{ listStyleType: 'none', padding: '0' }}>
-          {plugins.map(({ name, version }) => {
-            const update = updates?.get(name);
-            return (
-              <li style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', paddingBottom: '10px' }}>
-                <span>
-                  {name} <span style={{ opacity: '50%' }}>{'(' + version + ')'}</span>
-                </span>
-                <Focusable style={{ marginLeft: 'auto', boxShadow: 'none', display: 'flex', justifyContent: 'right' }}>
-                  {update && (
-                    <DialogButton
-                      style={{ height: '40px', minWidth: '60px', marginRight: '10px' }}
-                      onClick={() => requestPluginInstall(name, update)}
-                    >
-                      <div style={{ display: 'flex', flexDirection: 'row' }}>
-                        Update to {update.name}
-                        <FaDownload style={{ paddingLeft: '2rem' }} />
-                      </div>
-                    </DialogButton>
-                  )}
-                  <DialogButton
-                    style={{ height: '40px', width: '40px', padding: '10px 12px', minWidth: '40px' }}
-                    onClick={(e: MouseEvent) =>
-                      showContextMenu(
-                        <Menu label="Plugin Actions">
-                          <MenuItem onSelected={() => window.DeckyPluginLoader.importPlugin(name, version)}>
-                            Reload
-                          </MenuItem>
-                          <MenuItem onSelected={() => window.DeckyPluginLoader.uninstallPlugin(name)}>
-                            Uninstall
-                          </MenuItem>
-                        </Menu>,
-                        e.currentTarget ?? window,
-                      )
-                    }
-                  >
-                    <FaEllipsisH />
-                  </DialogButton>
-                </Focusable>
-              </li>
-            );
-          })}
-        </ul>
-      </DialogControlsSection>
-    </DialogBody>
+    <ul style={{ listStyleType: 'none' }}>
+      {plugins.map(({ name, version }) => {
+        const update = updates?.get(name);
+        return (
+          <li style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', paddingBottom: '10px' }}>
+            <span>
+              {name} {version}
+            </span>
+            <Focusable style={{ marginLeft: 'auto', boxShadow: 'none', display: 'flex', justifyContent: 'right' }}>
+              {update && (
+                <DialogButton
+                  style={{ height: '40px', minWidth: '60px', marginRight: '10px' }}
+                  onClick={() => requestPluginInstall(name, update)}
+                >
+                  <div style={{ display: 'flex', flexDirection: 'row' }}>
+                    Update to {update.name}
+                    <FaDownload style={{ paddingLeft: '2rem' }} />
+                  </div>
+                </DialogButton>
+              )}
+              <DialogButton
+                style={{ height: '40px', width: '40px', padding: '10px 12px', minWidth: '40px' }}
+                onClick={(e: MouseEvent) =>
+                  showContextMenu(
+                    <Menu label="Plugin Actions">
+                      <MenuItem onSelected={() => window.DeckyPluginLoader.importPlugin(name, version)}>
+                        Reload
+                      </MenuItem>
+                      <MenuItem onSelected={() => window.DeckyPluginLoader.uninstallPlugin(name)}>Uninstall</MenuItem>
+                    </Menu>,
+                    e.currentTarget ?? window,
+                  )
+                }
+              >
+                <FaEllipsisH />
+              </DialogButton>
+            </Focusable>
+          </li>
+        );
+      })}
+    </ul>
   );
 }

frontend/src/components/store/PluginCard.tsx

@@ -1,12 +1,15 @@
 import {
-  ButtonItem,
+  DialogButton,
   Dropdown,
   Focusable,
-  PanelSectionRow,
+  Navigation,
+  QuickAccessTab,
   SingleDropdownOption,
   SuspensefulImage,
+  joinClassNames,
+  staticClasses,
 } from 'decky-frontend-lib';
-import { FC, useState } from 'react';
+import { FC, useRef, useState } from 'react';
 
 import { StorePlugin, StorePluginVersion, requestPluginInstall } from '../../store';
 
@@ -16,162 +19,168 @@ interface PluginCardProps {
 
 const PluginCard: FC<PluginCardProps> = ({ plugin }) => {
   const [selectedOption, setSelectedOption] = useState<number>(0);
-  const root: boolean = plugin.tags.some((tag) => tag === 'root');
-
+  const buttonRef = useRef<HTMLDivElement>(null);
+  const containerRef = useRef<HTMLDivElement>(null);
   return (
     <div
-      className="deckyStoreCard"
       style={{
-        marginLeft: '20px',
-        marginRight: '20px',
-        marginBottom: '20px',
-        display: 'flex',
-        alignItems: 'center',
+        padding: '30px',
+        paddingTop: '10px',
+        paddingBottom: '10px',
       }}
     >
-      <div
-        className="deckyStoreCardImageContainer"
-        style={{
-          width: '320px',
-          height: '200px',
-          position: 'relative',
+      {/* TODO: abstract this messy focus hackiness into a custom component in lib */}
+      <Focusable
+        className="deckyStoreCard"
+        ref={containerRef}
+        onActivate={(_: CustomEvent) => {
+          buttonRef.current!.focus();
+        }}
+        onCancel={(_: CustomEvent) => {
+          if (containerRef.current!.querySelectorAll('* :focus').length === 0) {
+            Navigation.NavigateBack();
+            setTimeout(() => Navigation.OpenQuickAccessMenu(QuickAccessTab.Decky), 1000);
+          } else {
+            containerRef.current!.focus();
+          }
         }}
-      >
-        <SuspensefulImage
-          className="deckyStoreCardImage"
-          suspenseHeight="200px"
-          suspenseWidth="320px"
-          style={{
-            width: '320px',
-            height: '200px',
-            objectFit: 'cover',
-          }}
-          src={plugin.image_url}
-        />
-      </div>
-      <div
-        className="deckyStoreCardInfo"
         style={{
-          width: 'calc(100% - 320px)', // The calc is here so that the info section doesn't expand into the image
           display: 'flex',
           flexDirection: 'column',
-          height: '100%',
-          marginLeft: '1em',
-          justifyContent: 'center',
+          background: '#ACB2C924',
+          height: 'unset',
+          marginBottom: 'unset',
+          // boxShadow: var(--gpShadow-Medium);
+          scrollSnapAlign: 'start',
+          boxSizing: 'border-box',
         }}
       >
-        <span
-          className="deckyStoreCardTitle"
-          style={{
-            fontSize: '1.25em',
-            fontWeight: 'bold',
-            whiteSpace: 'nowrap',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
-            width: '90%',
-          }}
-        >
-          {plugin.name}
-        </span>
-        <span
-          className="deckyStoreCardAuthor"
-          style={{
-            marginRight: 'auto',
-            fontSize: '1em',
-          }}
-        >
-          {plugin.author}
-        </span>
-        <span
-          className="deckyStoreCardDescription"
-          style={{
-            fontSize: '13px',
-            color: '#969696',
-            WebkitLineClamp: root ? '2' : '3',
-            WebkitBoxOrient: 'vertical',
-            overflow: 'hidden',
-            display: '-webkit-box',
-          }}
-        >
-          {plugin.description ? (
-            plugin.description
-          ) : (
-            <span>
-              <i style={{ color: '#666' }}>No description provided.</i>
-            </span>
-          )}
-        </span>
-        {root && (
-          <span
-            className="deckyStoreCardDescription deckyStoreCardDescriptionRoot"
-            style={{
-              fontSize: '13px',
-              color: '#fee75c',
-            }}
+        <div className="deckyStoreCardHeader" style={{ display: 'flex', alignItems: 'center' }}>
+          <div
+            style={{ fontSize: '18pt', padding: '10px' }}
+            className={joinClassNames(staticClasses.Text)}
+            // onClick={() => Router.NavigateToExternalWeb('https://github.com/' + plugin.artifact)}
           >
-            <i>This plugin has full access to your Steam Deck.</i>{' '}
-            <a
-              className="deckyStoreCardDescriptionRootLink"
-              href="https://deckbrew.xyz/root"
-              target="_blank"
+            {plugin.name}
+          </div>
+        </div>
+        <div
+          style={{
+            display: 'flex',
+            flexDirection: 'row',
+          }}
+          className="deckyStoreCardBody"
+        >
+          <SuspensefulImage
+            className="deckyStoreCardImage"
+            suspenseWidth="256px"
+            style={{
+              width: 'auto',
+              height: '160px',
+            }}
+            src={plugin.image_url}
+          />
+          <div
+            style={{
+              display: 'flex',
+              flexDirection: 'column',
+            }}
+            className="deckyStoreCardInfo"
+          >
+            <p
+              className={joinClassNames(staticClasses.PanelSectionRow)}
+              style={{ marginTop: '0px', marginLeft: '16px' }}
+            >
+              <span style={{ paddingLeft: '0px' }}>Author: {plugin.author}</span>
+            </p>
+            <p
+              className={joinClassNames(staticClasses.PanelSectionRow)}
               style={{
-                color: '#fee75c',
-                textDecoration: 'none',
+                marginLeft: '16px',
+                marginTop: '0px',
+                marginBottom: '0px',
+                marginRight: '16px',
               }}
             >
-              deckbrew.xyz/root
-            </a>
-          </span>
-        )}
+              <span style={{ paddingLeft: '0px' }}>{plugin.description}</span>
+            </p>
+            <p
+              className={joinClassNames('deckyStoreCardTagsContainer', staticClasses.PanelSectionRow)}
+              style={{
+                padding: '0 16px',
+                display: 'flex',
+                flexWrap: 'wrap',
+                gap: '5px 10px',
+              }}
+            >
+              <span style={{ padding: '5px 0' }}>Tags:</span>
+              {plugin.tags.map((tag: string) => (
+                <span
+                  className="deckyStoreCardTag"
+                  style={{
+                    padding: '5px',
+                    borderRadius: '5px',
+                    background: tag == 'root' ? '#842029' : '#ACB2C947',
+                  }}
+                >
+                  {tag == 'root' ? 'Requires root' : tag}
+                </span>
+              ))}
+            </p>
+          </div>
+        </div>
         <div
-          className="deckyStoreCardButtonRow"
+          className="deckyStoreCardActionsContainer"
           style={{
-            marginTop: '1em',
             width: '100%',
-            overflow: 'hidden',
+            alignSelf: 'flex-end',
+            display: 'flex',
+            flexDirection: 'row',
           }}
         >
-          <PanelSectionRow>
-            <Focusable style={{ display: 'flex', maxWidth: '100%' }}>
-              <div
-                className="deckyStoreCardInstallContainer"
-                style={{
-                  paddingTop: '0px',
-                  paddingBottom: '0px',
-                  width: '40%',
-                }}
+          <Focusable
+            className="deckyStoreCardActions"
+            style={{
+              display: 'flex',
+              flexDirection: 'row',
+              width: '100%',
+            }}
+          >
+            <div
+              className="deckyStoreCardInstallButtonContainer"
+              style={{
+                flex: '1',
+              }}
+            >
+              <DialogButton
+                className="deckyStoreCardInstallButton"
+                ref={buttonRef}
+                onClick={() => requestPluginInstall(plugin.name, plugin.versions[selectedOption])}
               >
-                <ButtonItem
-                  bottomSeparator="none"
-                  layout="below"
-                  onClick={() => requestPluginInstall(plugin.name, plugin.versions[selectedOption])}
-                >
-                  <span className="deckyStoreCardInstallText">Install</span>
-                </ButtonItem>
-              </div>
-              <div
-                className="deckyStoreCardVersionContainer"
-                style={{
-                  marginLeft: '5%',
-                  width: '30%',
-                }}
-              >
-                <Dropdown
-                  rgOptions={
-                    plugin.versions.map((version: StorePluginVersion, index) => ({
-                      data: index,
-                      label: version.name,
-                    })) as SingleDropdownOption[]
-                  }
-                  menuLabel="Plugin Version"
-                  selectedOption={selectedOption}
-                  onChange={({ data }) => setSelectedOption(data)}
-                />
-              </div>
-            </Focusable>
-          </PanelSectionRow>
+                Install
+              </DialogButton>
+            </div>
+            <div
+              className="deckyStoreCardVersionDropdownContainer"
+              style={{
+                flex: '0.2',
+              }}
+            >
+              <Dropdown
+                rgOptions={
+                  plugin.versions.map((version: StorePluginVersion, index) => ({
+                    data: index,
+                    label: version.name,
+                  })) as SingleDropdownOption[]
+                }
+                strDefaultLabel={'Select a version'}
+                selectedOption={selectedOption}
+                onChange={({ data }) => setSelectedOption(data)}
+              />
+            </div>
+          </Focusable>
         </div>
-      </div>
+      </Focusable>
     </div>
   );
 };

frontend/src/components/store/Store.tsx

@@ -1,16 +1,6 @@
-import {
-  Dropdown,
-  DropdownOption,
-  Focusable,
-  PanelSectionRow,
-  SteamSpinner,
-  Tabs,
-  TextField,
-  findModule,
-} from 'decky-frontend-lib';
-import { FC, useEffect, useMemo, useState } from 'react';
+import { SteamSpinner } from 'decky-frontend-lib';
+import { FC, useEffect, useState } from 'react';
 
-import logo from '../../../assets/plugin_store.png';
 import Logger from '../../logger';
 import { StorePlugin, getPluginList } from '../../store';
 import PluginCard from './PluginCard';
@@ -18,12 +8,7 @@ import PluginCard from './PluginCard';
 const logger = new Logger('FilePicker');
 
 const StorePage: FC<{}> = () => {
-  const [currentTabRoute, setCurrentTabRoute] = useState<string>('browse');
   const [data, setData] = useState<StorePlugin[] | null>(null);
-  const { TabCount } = findModule((m) => {
-    if (m?.TabCount && m?.TabTitle) return true;
-    return false;
-  });
 
   useEffect(() => {
     (async () => {
@@ -34,12 +19,19 @@ const StorePage: FC<{}> = () => {
   }, []);
 
   return (
-    <>
+    <div
+      style={{
+        marginTop: '40px',
+        height: 'calc( 100% - 40px )',
+        overflowY: 'scroll',
+      }}
+    >
       <div
         style={{
-          marginTop: '40px',
-          height: 'calc( 100% - 40px )',
-          background: '#0005',
+          display: 'flex',
+          flexWrap: 'nowrap',
+          flexDirection: 'column',
+          height: '100%',
         }}
       >
         {!data ? (
@@ -47,193 +39,13 @@ const StorePage: FC<{}> = () => {
             <SteamSpinner />
           </div>
         ) : (
-          <Tabs
-            activeTab={currentTabRoute}
-            onShowTab={(tabId: string) => {
-              setCurrentTabRoute(tabId);
-            }}
-            tabs={[
-              {
-                title: 'Browse',
-                content: <BrowseTab children={{ data: data }} />,
-                id: 'browse',
-                renderTabAddon: () => <span className={TabCount}>{data.length}</span>,
-              },
-              {
-                title: 'About',
-                content: <AboutTab />,
-                id: 'about',
-              },
-            ]}
-          />
+          <div>
+            {data.map((plugin: StorePlugin) => (
+              <PluginCard plugin={plugin} />
+            ))}
+          </div>
         )}
       </div>
-    </>
-  );
-};
-
-const BrowseTab: FC<{ children: { data: StorePlugin[] } }> = (data) => {
-  const sortOptions = useMemo(
-    (): DropdownOption[] => [
-      { data: 1, label: 'Alphabetical (A to Z)' },
-      { data: 2, label: 'Alphabetical (Z to A)' },
-    ],
-    [],
-  );
-
-  // const filterOptions = useMemo((): DropdownOption[] => [{ data: 1, label: 'All' }], []);
-
-  const [selectedSort, setSort] = useState<number>(sortOptions[0].data);
-  // const [selectedFilter, setFilter] = useState<number>(filterOptions[0].data);
-  const [searchFieldValue, setSearchValue] = useState<string>('');
-
-  return (
-    <>
-      <style>{`
-              .deckyStoreCardInstallContainer > .Panel {
-                padding: 0;
-              }
-            `}</style>
-      {/* This should be used once filtering is added
-
-      <PanelSectionRow>
-        <Focusable style={{ display: 'flex', maxWidth: '100%' }}>
-          <div
-            style={{
-              display: 'flex',
-              flexDirection: 'column',
-              width: '47.5%',
-            }}
-          >
-            <span className="DialogLabel">Sort</span>
-            <Dropdown
-              menuLabel="Sort"
-              rgOptions={sortOptions}
-              strDefaultLabel="Last Updated (Newest)"
-              selectedOption={selectedSort}
-              onChange={(e) => setSort(e.data)}
-            />
-          </div>
-          <div
-            style={{
-              display: 'flex',
-              flexDirection: 'column',
-              width: '47.5%',
-              marginLeft: 'auto',
-            }}
-          >
-            <span className="DialogLabel">Filter</span>
-            <Dropdown
-              menuLabel="Filter"
-              rgOptions={filterOptions}
-              strDefaultLabel="All"
-              selectedOption={selectedFilter}
-              onChange={(e) => setFilter(e.data)}
-            />
-          </div>
-        </Focusable>
-      </PanelSectionRow>
-      <div style={{ justifyContent: 'center', display: 'flex' }}>
-        <Focusable style={{ display: 'flex', alignItems: 'center', width: '96%' }}>
-          <div style={{ width: '100%' }}>
-            <TextField label="Search" value={searchFieldValue} onChange={(e) => setSearchValue(e.target.value)} />
-          </div>
-        </Focusable>
-      </div>
-      */}
-      <PanelSectionRow>
-        <Focusable style={{ display: 'flex', maxWidth: '100%' }}>
-          <div
-            style={{
-              display: 'flex',
-              flexDirection: 'column',
-              minWidth: '100%',
-              maxWidth: '100%',
-            }}
-          >
-            <span className="DialogLabel">Sort</span>
-            <Dropdown
-              menuLabel="Sort"
-              rgOptions={sortOptions}
-              strDefaultLabel="Last Updated (Newest)"
-              selectedOption={selectedSort}
-              onChange={(e) => setSort(e.data)}
-            />
-          </div>
-        </Focusable>
-      </PanelSectionRow>
-      <div style={{ justifyContent: 'center', display: 'flex' }}>
-        <Focusable style={{ display: 'flex', alignItems: 'center', width: '96%' }}>
-          <div style={{ width: '100%' }}>
-            <TextField label="Search" value={searchFieldValue} onChange={(e) => setSearchValue(e.target.value)} />
-          </div>
-        </Focusable>
-      </div>
-      <div>
-        {data.children.data
-          .filter((plugin: StorePlugin) => {
-            return (
-              plugin.name.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
-              plugin.description.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
-              plugin.author.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
-              plugin.tags.some((tag: string) => tag.toLowerCase().includes(searchFieldValue.toLowerCase()))
-            );
-          })
-          .sort((a, b) => {
-            if (selectedSort % 2 === 1) return a.name.localeCompare(b.name);
-            else return b.name.localeCompare(a.name);
-          })
-          .map((plugin: StorePlugin) => (
-            <PluginCard plugin={plugin} />
-          ))}
-      </div>
-    </>
-  );
-};
-
-const AboutTab: FC<{}> = () => {
-  return (
-    <div
-      style={{
-        display: 'flex',
-        flexDirection: 'column',
-      }}
-    >
-      <style>{`
-              .deckyStoreAboutHeader {
-                font-size: 24px;
-                font-weight: 600;
-                margin-top: 20px;
-              }
-            `}</style>
-      <img
-        src={logo}
-        style={{
-          width: '256px',
-          height: 'auto',
-          alignSelf: 'center',
-        }}
-      />
-      <span className="deckyStoreAboutHeader">Testing</span>
-      <span>
-        Please consider testing new plugins to help the Decky Loader team!{' '}
-        <a
-          href="https://deckbrew.xyz/testing"
-          target="_blank"
-          style={{
-            textDecoration: 'none',
-          }}
-        >
-          deckbrew.xyz/testing
-        </a>
-      </span>
-      <span className="deckyStoreAboutHeader">Contributing</span>
-      <span>
-        If you would like to contribute to the Decky Plugin Store, check the SteamDeckHomebrew/decky-plugin-template
-        repository on GitHub. Information on development and distribution is available in the README.
-      </span>
-      <span className="deckyStoreAboutHeader">Source Code</span>
-      <span>All plugin source code is available on SteamDeckHomebrew/decky-plugin-database repository on GitHub.</span>
     </div>
   );
 };

frontend/src/index.tsx

@@ -1,5 +1,3 @@
-import { Navigation, Router, sleep } from 'decky-frontend-lib';
-
 import PluginLoader from './plugin-loader';
 import { DeckyUpdater } from './updater';
 
@@ -16,23 +14,6 @@ declare global {
   }
 }
 
-(async () => {
-  try {
-    if (!Router.NavigateToAppProperties || !Router.NavigateToLibraryTab || !Router.NavigateToInvites) {
-      while (!Navigation.NavigateToAppProperties) await sleep(100);
-      const shims = {
-        NavigateToAppProperties: Navigation.NavigateToAppProperties,
-        NavigateToInvites: Navigation.NavigateToInvites,
-        NavigateToLibraryTab: Navigation.NavigateToLibraryTab,
-      };
-      (Router as unknown as any).deckyShim = true;
-      Object.assign(Router, shims);
-    }
-  } catch (e) {
-    console.error('[DECKY]: Error initializing Navigation interface shims', e);
-  }
-})();
-
 (async () => {
   window.deckyAuthToken = await fetch('http://127.0.0.1:1337/auth/token').then((r) => r.text());
 

frontend/src/menu-hook.tsx

@@ -0,0 +1,235 @@
+import {
+  CustomMainMenuItem,
+  ItemPatch,
+  MainMenuItem,
+  OverlayPatch,
+  afterPatch,
+  findInReactTree,
+  sleep,
+} from 'decky-frontend-lib';
+import { FC } from 'react';
+import { ReactNode, cloneElement, createElement } from 'react';
+
+import { DeckyMenuState, DeckyMenuStateContextProvider, useDeckyMenuState } from './components/DeckyMenuState';
+import Logger from './logger';
+
+declare global {
+  interface Window {
+    __MENU_HOOK_INSTANCE: any;
+  }
+}
+
+class MenuHook extends Logger {
+  private menuRenderer?: any;
+  private originalRenderer?: any;
+  private menuState: DeckyMenuState = new DeckyMenuState();
+
+  constructor() {
+    super('MenuHook');
+
+    this.log('Initialized');
+    window.__MENU_HOOK_INSTANCE?.deinit?.();
+    window.__MENU_HOOK_INSTANCE = this;
+  }
+
+  init() {
+    const tree = (document.getElementById('root') as any)._reactRootContainer._internalRoot.current;
+    let outerMenuRoot: any;
+    const findMenuRoot = (currentNode: any, iters: number): any => {
+      if (iters >= 60) {
+        // currently 54
+        return null;
+      }
+      if (currentNode?.memoizedProps?.navID == 'MainNavMenuContainer') {
+        this.log(`Menu root was found in ${iters} recursion cycles`);
+        return currentNode;
+      }
+      if (currentNode.child) {
+        let node = findMenuRoot(currentNode.child, iters + 1);
+        if (node !== null) return node;
+      }
+      if (currentNode.sibling) {
+        let node = findMenuRoot(currentNode.sibling, iters + 1);
+        if (node !== null) return node;
+      }
+      return null;
+    };
+
+    (async () => {
+      outerMenuRoot = findMenuRoot(tree, 0);
+      while (!outerMenuRoot) {
+        this.error(
+          'Failed to find Menu root node, reattempting in 5 seconds. A developer may need to increase the recursion limit.',
+        );
+        await sleep(5000);
+        outerMenuRoot = findMenuRoot(tree, 0);
+      }
+      this.log('found outermenuroot', outerMenuRoot);
+      const menuRenderer = outerMenuRoot.return;
+      this.menuRenderer = menuRenderer;
+      this.originalRenderer = menuRenderer.type;
+      let toReplace = new Map<string, ReactNode>();
+      let alreadyPatched = new Map<string, { total: number; node: ReactNode }>();
+
+      let patchedInnerMenu: any;
+      let overlayComponentManager: any;
+
+      const DeckyOverlayComponentManager = () => {
+        const { overlayComponents } = useDeckyMenuState();
+
+        return <>{overlayComponents.values()}</>;
+      };
+
+      const DeckyInnerMenuWrapper = (props: { innerProps: any }) => {
+        const { overlayPatches } = useDeckyMenuState();
+
+        const rendererRet = this.originalRenderer(props.innerProps);
+
+        // Find the first array of children, this contains [mainmenu, overlay]
+        const childArray = findInReactTree(rendererRet, (x) => x?.[0]?.type);
+
+        // Insert the overlay components manager
+        if (!overlayComponentManager) {
+          overlayComponentManager = <DeckyOverlayComponentManager />;
+        }
+
+        childArray.push(overlayComponentManager);
+
+        // This must be cached in patchedInnerMenu to prevent re-renders
+        if (patchedInnerMenu) {
+          childArray[0].type = patchedInnerMenu;
+        } else {
+          afterPatch(childArray[0], 'type', (_, ret) => {
+            const { itemPatches, items } = useDeckyMenuState();
+
+            const itemList = ret.props.children;
+
+            // Add custom menu items
+            if (items.size > 0) {
+              const button = findInReactTree(ret.props.children, (x) =>
+                x?.type?.toString()?.includes('exactRouteMatch:'),
+              );
+
+              const MenuItemComponent: FC<MainMenuItem> = button.type;
+
+              items.forEach((item) => {
+                let realIndex = 0; // there are some non-item things in the array
+                let count = 0;
+                itemList.forEach((i: any) => {
+                  if (count == item.index) return;
+                  if (i?.type == MenuItemComponent) count++;
+                  realIndex++;
+                });
+                itemList.splice(realIndex, 0, createElement(MenuItemComponent, item));
+              });
+            }
+
+            // Apply and revert patches
+            itemList.forEach((item: { props: MainMenuItem }, index: number) => {
+              if (!item?.props?.route) return;
+              const replaced = toReplace.get(item?.props?.route as string);
+              if (replaced) {
+                itemList[index] = replaced;
+                toReplace.delete(item?.props.route as string);
+              }
+              if (item?.props?.route && (itemPatches.has(item.props.route as string) || itemPatches.has('*'))) {
+                if (
+                  item?.props?.route && 
+                  alreadyPatched.has(item.props.route) &&
+                  alreadyPatched.get(item.props.route)?.total ==
+                    (itemPatches.get(item.props.route)?.size || 0) + (itemPatches.get('*')?.size || 0)
+                ) {
+                  const patched = alreadyPatched.get(item.props.route);
+                  this.debug('found already patched', patched);
+                  itemList[index] = patched?.node;
+                  return;
+                }
+                toReplace.set(item?.props?.route as string, itemList[index]);
+                itemPatches.get(item.props.route as string)?.forEach((patch) => {
+                  const oType = itemList[index].type;
+                  itemList[index] = patch({
+                    ...cloneElement(itemList[index]),
+                    type: (props: any) => createElement(oType, props),
+                  });
+                });
+                itemPatches.get('*')?.forEach((patch) => {
+                  const oType = itemList[index].type;
+                  itemList[index] = patch({
+                    ...cloneElement(itemList[index]),
+                    type: (props: any) => createElement(oType, props),
+                  });
+                });
+                alreadyPatched.set(item.props.route, {
+                  total: (itemPatches.get(item.props.route)?.size || 0) + (itemPatches.get('*')?.size || 0),
+                  node: itemList[index],
+                });
+              }
+            });
+
+            return ret;
+          });
+          patchedInnerMenu = childArray[0].type;
+        }
+
+        // Apply patches to the overlay
+        if (childArray[1]) {
+          overlayPatches.forEach((patch) => (childArray[1] = patch(childArray[1])));
+        }
+
+        return rendererRet;
+      };
+
+      const DeckyOuterMenuWrapper = (props: any) => {
+        return (
+          <DeckyMenuStateContextProvider deckyMenuState={this.menuState}>
+            <DeckyInnerMenuWrapper innerProps={props} />
+          </DeckyMenuStateContextProvider>
+        );
+      };
+      menuRenderer.type = DeckyOuterMenuWrapper;
+      if (menuRenderer.alternate) {
+        menuRenderer.alternate.type = menuRenderer.type;
+      }
+      this.log('Finished initial injection');
+    })();
+  }
+
+  deinit() {
+    this.menuRenderer.type = this.originalRenderer;
+    this.menuRenderer.alternate.type = this.menuRenderer.type;
+  }
+
+  addItem(item: CustomMainMenuItem) {
+    return this.menuState.addItem(item);
+  }
+
+  addPatch(path: string, patch: ItemPatch) {
+    return this.menuState.addPatch(path, patch);
+  }
+
+  addOverlayPatch(patch: OverlayPatch) {
+    return this.menuState.addOverlayPatch(patch);
+  }
+
+  addOverlayComponent(component: ReactNode) {
+    return this.menuState.addOverlayComponent(component);
+  }
+
+  removePatch(path: string, patch: ItemPatch) {
+    return this.menuState.removePatch(path, patch);
+  }
+
+  removeItem(item: CustomMainMenuItem) {
+    return this.menuState.removeItem(item);
+  }
+
+  removeOverlayPatch(patch: OverlayPatch) {
+    return this.menuState.removeOverlayPatch(patch);
+  }
+
+  removeOverlayComponent(component: ReactNode) {
+    return this.menuState.removeOverlayComponent(component);
+  }
+}
+
+export default MenuHook;

frontend/src/plugin-loader.tsx

@@ -1,4 +1,4 @@
-import { ConfirmModal, ModalRoot, Patch, QuickAccessTab, Router, showModal, sleep } from 'decky-frontend-lib';
+import { ConfirmModal, ModalRoot, QuickAccessTab, Router, showModal, sleep, staticClasses } from 'decky-frontend-lib';
 import { FC, lazy } from 'react';
 import { FaCog, FaExclamationCircle, FaPlug } from 'react-icons/fa';
 
@@ -10,6 +10,7 @@ import NotificationBadge from './components/NotificationBadge';
 import PluginView from './components/PluginView';
 import WithSuspense from './components/WithSuspense';
 import Logger from './logger';
+import MenuHook from './menu-hook';
 import { Plugin } from './plugin';
 import RouterHook from './router-hook';
 import { deinitSteamFixes, initSteamFixes } from './steamfixes';
@@ -28,6 +29,7 @@ const FilePicker = lazy(() => import('./components/modals/filepicker'));
 class PluginLoader extends Logger {
   private plugins: Plugin[] = [];
   private tabsHook: TabsHook | OldTabsHook = document.title == 'SP' ? new OldTabsHook() : new TabsHook();
+  private menuHook: MenuHook = new MenuHook();
   // private windowHook: WindowHook = new WindowHook();
   private routerHook: RouterHook = new RouterHook();
   public toaster: Toaster = new Toaster();
@@ -37,11 +39,10 @@ class PluginLoader extends Logger {
   // stores a list of plugin names which requested to be reloaded
   private pluginReloadQueue: { name: string; version?: string }[] = [];
 
-  private focusWorkaroundPatch?: Patch;
-
   constructor() {
     super(PluginLoader.name);
     this.tabsHook.init();
+    this.menuHook.init();
     this.log('Initialized');
 
     const TabBadge = () => {
@@ -146,10 +147,10 @@ class PluginLoader extends Logger {
         onCancel={() => {
           // do nothing
         }}
-        strTitle={`Uninstall ${name}`}
-        strOKButtonText={'Uninstall'}
       >
-        Are you sure you want to uninstall {name}?
+        <div className={staticClasses.Title} style={{ flexDirection: 'column' }}>
+          Uninstall {name}?
+        </div>
       </ConfirmModal>,
     );
   }
@@ -176,11 +177,9 @@ class PluginLoader extends Logger {
     this.routerHook.removeRoute('/decky/settings');
     deinitSteamFixes();
     deinitFilepickerPatches();
-    this.focusWorkaroundPatch?.unpatch();
   }
 
   public unloadPlugin(name: string) {
-    console.log('Plugin List: ', this.plugins);
     const plugin = this.plugins.find((plugin) => plugin.name === name || plugin.name === name.replace('$LEGACY_', ''));
     plugin?.onDismount?.();
     this.plugins = this.plugins.filter((p) => p !== plugin);
@@ -314,6 +313,7 @@ class PluginLoader extends Logger {
 
   createPluginAPI(pluginName: string) {
     return {
+      menuHook: this.menuHook,
       routerHook: this.routerHook,
       toaster: this.toaster,
       callServerMethod: this.callServerMethod,
@@ -336,7 +336,6 @@ class PluginLoader extends Logger {
       fetchNoCors(url: string, request: any = {}) {
         let args = { method: 'POST', headers: {} };
         const req = { ...args, ...request, url, data: request.body };
-        req?.body && delete req.body;
         return this.callServerMethod('http_request', req);
       },
       executeInTab(tab: string, runAsync: boolean, code: string) {

frontend/src/router-hook.tsx

@@ -120,6 +120,8 @@ class RouterHook extends Logger {
       return <>{renderedComponents}</>;
     };
 
+    let globalComponents: any;
+
     this.wrapperPatch = afterPatch(this.gamepadWrapper, 'render', (_: any, ret: any) => {
       if (ret?.props?.children?.props?.children?.length == 5 || ret?.props?.children?.props?.children?.length == 4) {
         const idx = ret?.props?.children?.props?.children?.length == 4 ? 1 : 2;
@@ -143,11 +145,17 @@ class RouterHook extends Logger {
             this.memoizedRouter = memo(this.router.type);
             this.memoizedRouter.isDeckyRouter = true;
           }
-          ret.props.children.props.children.push(
-            <DeckyGlobalComponentsStateContextProvider deckyGlobalComponentsState={this.globalComponentsState}>
-              <DeckyGlobalComponentsWrapper />
-            </DeckyGlobalComponentsStateContextProvider>,
-          );
+
+          if (!globalComponents) {
+            globalComponents = (
+              <DeckyGlobalComponentsStateContextProvider deckyGlobalComponentsState={this.globalComponentsState}>
+                <DeckyGlobalComponentsWrapper />
+              </DeckyGlobalComponentsStateContextProvider>
+            );
+          }
+
+          ret.props.children.props.children.push(globalComponents);
+
           ret.props.children.props.children[idx].props.children[0].type = this.memoizedRouter;
         }
       }

frontend/tsconfig.json

@@ -18,6 +18,6 @@
     "allowSyntheticDefaultImports": true,
     "skipLibCheck": true
   },
-  "include": ["src", "index.d.ts"],
+  "include": ["src"],
   "exclude": ["node_modules"]
 }

requirements.txt

@@ -2,4 +2,4 @@ aiohttp==3.8.1
 aiohttp-jinja2==1.5.0
 aiohttp_cors==0.7.0
 watchdog==2.1.7
-certifi==2022.12.7
+certifi==2022.6.15