All good, code was not modified to accomodate ints

.github/workflows/build.yml

@@ -84,49 +84,6 @@ jobs:
       with:
         path: ./dist/PluginLoader
 
-  build-win:
-    name: Build PluginLoader for Win
-    runs-on: windows-2022
-
-    steps:
-    - name: Checkout 🧰
-      uses: actions/checkout@v3
-
-    - name: Set up NodeJS 18 💎
-      uses: actions/setup-node@v3
-      with:
-        node-version: 18
-      
-    - name: Set up Python 3.10.2 🐍
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10.2"
-        
-    - name: Install Python dependencies ⬇️
-      run: |
-        python -m pip install --upgrade pip
-        pip install pyinstaller==5.5
-        pip install -r requirements.txt
-
-    - name: Install JS dependencies ⬇️
-      working-directory: ./frontend
-      run: |
-        npm i -g pnpm
-        pnpm i --frozen-lockfile
-
-    - name: Build JS Frontend 🛠️
-      working-directory: ./frontend
-      run: pnpm run build
-
-    - name: Build Python Backend 🛠️
-      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data "./backend/static;/static" --add-data "./backend/legacy;/legacy" --add-data "./plugin;/plugin" ./backend/main.py
-        
-    - name: Upload package artifact ⬆️
-      uses: actions/upload-artifact@v3
-      with:
-        name: PluginLoader Win
-        path: ./dist/PluginLoader.exe
-
   release:
     name: Release stable version of the package
     if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'release' }}

.github/workflows/edit-check.yml

@@ -16,31 +16,21 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
       
-    - name: Get changed files
-      id: changed-files
-      uses: tj-actions/changed-files@v35.6.3
-      with:
-        separator: ","
-        files: |
-          plugin/*
-          
     - name: Is stub changed
       id: changed-stub
       run: |
         STUB_CHANGED="false"
         PATHS=(plugin plugin/decky_plugin.pyi)
-        SHA=${{ github.sha }}
-        SHA_PREV=HEAD^
-        FILES=$(git diff $SHA_PREV..$SHA --name-only -- ${PATHS[@]} | jq -Rsc 'split("\n")[:-1] | join (",")')
+        SHA="${{ github.sha }}"
+        SHA_PREV=$(git rev-list --parents -n 1 $SHA)
+        FILES=$(git diff $SHA_PREV --name-only -- ${PATHS[@]} | jq -Rsc 'split("\n")[:-1] | join (",")')
         if [[ "$FILES" == *"plugin/decky_plugin.pyi"* ]]; then
-          $STUB_CHANGED="true"
+          STUB_CHANGED="true"
           echo "Stub has changed, pushing updated stub"
         else
           echo "Stub has not changed, exiting."
-          echo "has_changed=$STUB_CHANGED" >> $GITHUB_OUTPUT
           exit 0
         fi
-        echo "has_changed=$STUB_CHANGED" >> $GITHUB_OUTPUT
 
     - name: Push updated stub
       if: steps.changed-stub.outputs.has_changed == true

.vscode/defsettings.json

@@ -4,4 +4,4 @@
     "deckpass"  : "ssap",
     "deckkey"   : "-i ${env:HOME}/.ssh/id_rsa",
     "deckdir"   : "/home/deck"
-}
+}

README.md

@@ -3,7 +3,7 @@
   <br>
   Decky Loader
   <br>
-  <a name="download button" href="https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/decky_installer.desktop"><img src="./docs/images/download_button.svg"  alt="Download decky" width="350px" style="padding-top: 15px;"></a>
+  <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">
@@ -33,28 +33,29 @@ For more information about Decky Loader as well as documentation and development
 
 ### 🤔 Common Issues
 
+- 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.
-- Sometimes Decky will disappear on SteamOS updates. This can easily be fixed by just re-running the installer and installing the stable branch again. If this doesn't work, try installing the prerelease instead. If that doesn't work, then [check the existing issues](https://github.com/SteamDeckHomebrew/decky-loader/issues) and if there isn't one then you can [file a new issue](https://github.com/SteamDeckHomebrew/decky-loader/issues/new?assignees=&labels=bug&template=bug_report.yml&title=%5BBUG%5D+%3Ctitle%3E).
+- 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. 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. (KDE connect is preinstalled on the steam deck)
+   - Many Bluetooth keyboard and mouse apps are available for iOS and Android.
    - The Steam Link app is available on [Windows](https://media.steampowered.com/steamlink/windows/latest/SteamLink.zip), [macOS](https://apps.apple.com/us/app/steam-link/id1246969117), and [Linux](https://flathub.org/apps/details/com.valvesoftware.SteamLink). It works well as a remote desktop substitute.
    - 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. Download the [installer file](https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/decky_installer.desktop).
-1. Drag the file onto your desktop and double click it to run it.
-1. Either type your admin password or allow Decky to temporarily set your admin password to `Decky!` (this password will be removed after the installer finishes)
+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.
    - **Latest Release**  
      Intended for most users. This is the latest stable version of Decky Loader.  
    - **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://wiki.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).
 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.
@@ -65,7 +66,7 @@ We are sorry to see you go! If you are considering uninstalling because you are
 
 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`.
+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.
 
 ## 🚀 Getting Started

backend/browser.py

@@ -12,12 +12,12 @@ from io import BytesIO
 from logging import getLogger
 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
-from localplatform import chown, chmod
 
 # Local modules
-from helpers import get_ssl_context, 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")
@@ -30,11 +30,10 @@ class PluginInstallContext:
         self.hash = hash
 
 class PluginBrowser:
-    def __init__(self, plugin_path, plugins, loader, settings) -> None:
+    def __init__(self, plugin_path, plugins, loader) -> None:
         self.plugin_path = plugin_path
         self.plugins = plugins
         self.loader = loader
-        self.settings = settings
         self.install_requests = {}
 
     def _unzip_to_plugin_dir(self, zip, name, hash):
@@ -44,9 +43,10 @@ class PluginBrowser:
         zip_file = ZipFile(zip)
         zip_file.extractall(self.plugin_path)
         plugin_dir = path.join(self.plugin_path, self.find_plugin_folder(name))
-
-        if not chown(plugin_dir) or not chmod(plugin_dir, 555):
-            logger.error(f"chown/chmod exited with a non-zero exit code")
+        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}, chmod: {code_chmod})")
             return False
         return True
     
@@ -61,14 +61,14 @@ class PluginBrowser:
                     packageJson = json.load(f)
                     if "remote_binary" in packageJson and len(packageJson["remote_binary"]) > 0:
                         # create bin directory if needed.
-                        chmod(pluginBasePath, 777)
+                        rc=call(["chmod", "-R", "777", pluginBasePath])
                         if access(pluginBasePath, W_OK):
                             
                             if not path.exists(pluginBinPath):
                                 mkdir(pluginBinPath)
                             
                             if not access(pluginBinPath, W_OK):
-                                chmod(pluginBinPath, 777)
+                                rc=call(["chmod", "-R", "777", pluginBinPath])
 
                         rv = True
                         for remoteBinary in packageJson["remote_binary"]:
@@ -80,8 +80,8 @@ class PluginBrowser:
                                 rv = False
                                 raise Exception(f"Error Downloading Remote Binary {binName}@{binURL} with hash {binHash} to {path.join(pluginBinPath, binName)}")
 
-                        chown(self.plugin_path)
-                        chmod(pluginBasePath, 555)
+                        code_chown = call(["chown", "-R", get_user()+":"+get_user_group(), self.plugin_path])
+                        rc=call(["chmod", "-R", "555", pluginBasePath])
                     else:
                         rv = True
                         logger.debug(f"No Remote Binaries to Download")
@@ -118,16 +118,12 @@ class PluginBrowser:
             # plugins_snapshot = self.plugins.copy()
             # snapshot_string = pformat(plugins_snapshot)
             # logger.debug("current plugins: %s", snapshot_string)
-            if name in self.plugins:
+            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)
-                current_plugin_order = self.settings.getSetting("pluginOrder")
-                current_plugin_order.remove(name)
-                self.settings.setSetting("pluginOrder", current_plugin_order)
-                logger.debug("Plugin %s was removed from the pluginOrder setting", name)
             logger.debug("removing files %s" % str(name))
             rmtree(plugin_dir)
         except FileNotFoundError:
@@ -139,10 +135,6 @@ class PluginBrowser:
             self.loader.watcher.disabled = False
 
     async def _install(self, artifact, name, version, hash):
-        # Will be set later in code
-        res_zip = None
-
-        # Check if plugin is installed
         isInstalled = False
         if self.loader.watcher:
             self.loader.watcher.disabled = True
@@ -152,62 +144,42 @@ class PluginBrowser:
                 isInstalled = True
         except:
             logger.error(f"Failed to determine if {name} is already installed, continuing anyway.")
-
-        # Check if the file is a local file or a URL
-        if artifact.startswith("file://"):
-            logger.info(f"Installing {name} from local ZIP file (Version: {version})")
-            res_zip = BytesIO(open(artifact[7:], "rb").read())
-        else:
-            logger.info(f"Installing {name} from URL (Version: {version})")
-            async with ClientSession() as client:
-                logger.debug(f"Fetching {artifact}")
-                res = await client.get(artifact, ssl=get_ssl_context())
-                if res.status == 200:
-                    logger.debug("Got 200. Reading...")
-                    data = await res.read()
-                    logger.debug(f"Read {len(data)} bytes")
-                    res_zip = BytesIO(data)
+        logger.info(f"Installing {name} (Version: {version})")
+        async with ClientSession() as client:
+            logger.debug(f"Fetching {artifact}")
+            res = await client.get(artifact, ssl=get_ssl_context())
+            if res.status == 200:
+                logger.debug("Got 200. Reading...")
+                data = await res.read()
+                logger.debug(f"Read {len(data)} bytes")
+                res_zip = BytesIO(data)
+                if isInstalled:
+                    try:
+                        logger.debug("Uninstalling existing plugin...")
+                        await self.uninstall_plugin(name)
+                    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_folder = self.find_plugin_folder(name)
+                    plugin_dir = path.join(self.plugin_path, plugin_folder)
+                    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_folder)
+                    else:
+                        logger.fatal(f"Failed Downloading Remote Binaries")
                 else:
-                    logger.fatal(f"Could not fetch from URL. {await res.text()}")
-
-        # Check to make sure we got the file
-        if res_zip is None:
-            logger.fatal(f"Could not fetch {artifact}")
-            return
-        
-        # If plugin is installed, uninstall it
-        if isInstalled:
-            try:
-                logger.debug("Uninstalling existing plugin...")
-                await self.uninstall_plugin(name)
-            except:
-                logger.error(f"Plugin {name} could not be uninstalled.")
-
-        # Install the plugin
-        logger.debug("Unzipping...")
-        ret = self._unzip_to_plugin_dir(res_zip, name, hash)
-        if ret:
-            plugin_folder = self.find_plugin_folder(name)
-            plugin_dir = path.join(self.plugin_path, plugin_folder)
-            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)
-                
-                current_plugin_order = self.settings.getSetting("pluginOrder")
-                current_plugin_order.append(name)
-                self.settings.setSetting("pluginOrder", current_plugin_order)
-                logger.debug("Plugin %s was added to the pluginOrder setting", name)
-                self.loader.import_plugin(path.join(plugin_dir, "main.py"), plugin_folder)
+                    self.log.fatal(f"SHA-256 Mismatch!!!! {name} (Version: {version})")
+                if self.loader.watcher:
+                    self.loader.watcher.disabled = False
             else:
-                logger.fatal(f"Failed Downloading Remote Binaries")
-        else:
-            self.log.fatal(f"SHA-256 Mismatch!!!! {name} (Version: {version})")
-        if self.loader.watcher:
-            self.loader.watcher.disabled = False
+                logger.fatal(f"Could not fetch from URL. {await res.text()}")
 
     async def request_plugin_install(self, artifact, name, version, hash):
         request_id = str(time())

backend/customtypes.py

@@ -1,6 +0,0 @@
-from enum import Enum
-
-class UserType(Enum):
-    HOST_USER = 1
-    EFFECTIVE_USER = 2
-    ROOT = 3

backend/helpers.py

@@ -1,18 +1,19 @@
+import grp
+import pwd
 import re
 import ssl
+import subprocess
 import uuid
 import os
 import sys
-import subprocess
+from subprocess import check_output
+from time import sleep
 from hashlib import sha256
 from io import BytesIO
 
 import certifi
 from aiohttp.web import Response, middleware
 from aiohttp import ClientSession
-import localplatform
-from customtypes import UserType
-from logging import getLogger
 
 REMOTE_DEBUGGER_UNIT = "steam-web-debug-portforward.service"
 
@@ -22,7 +23,6 @@ ssl_ctx = ssl.create_default_context(cafile=certifi.where())
 
 assets_regex = re.compile("^/plugins/.*/assets/.*")
 frontend_regex = re.compile("^/frontend/.*")
-logger = getLogger("Main")
 
 def get_ssl_context():
     return ssl_ctx
@@ -36,41 +36,97 @@ async def csrf_middleware(request, handler):
         return await handler(request)
     return Response(text='Forbidden', status='403')
 
-# Get the default homebrew path unless a home_path is specified. home_path argument is deprecated
+# Deprecated
+def set_user():
+    pass
+
+# 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
+def get_user() -> str:
+    return pwd.getpwuid(get_user_id()).pw_name
+
+# 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.
+def get_user_owner(file_path) -> str:
+    return pwd.getpwuid(os.stat(file_path).st_uid).pw_name
+
+# Get the user group of the given file path.
+def get_user_group(file_path) -> str:
+    return grp.getgrgid(os.stat(file_path).st_gid).gr_name
+
+# 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
+def get_user_group() -> str:
+    return grp.getgrgid(get_user_group_id()).gr_name
+
+# Get the default home path unless a user is specified
+def get_home_path(username = None) -> str:
+    if username == 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:
-    return localplatform.get_unprivileged_path()
+    if home_path == 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)
-    localplatform.chown(path)
+    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:
     try:
         with open(os.path.join(os.getcwd(), ".loader.version"), "r", encoding="utf-8") as version_file:
             return version_file.readline().strip()
-    except Exception as e:
-        logger.warn(f"Failed to execute get_loader_version(): {str(e)}")
+    except:
         return "unknown"
 
 # returns the appropriate system python paths
 def get_system_pythonpaths() -> list[str]:
-    extra_args = {}
-
-    if localplatform.ON_LINUX:
-        # run as normal normal user to also include user python paths
-        extra_args["user"] = localplatform.localplatform._get_user_id()
-        extra_args["env"] = {}
-
-    try:
-        proc = subprocess.run(["python3" if localplatform.ON_LINUX else "python", "-c", "import sys; print('\\n'.join(x for x in sys.path if x))"],
-                              capture_output=True, **extra_args)
-        return [x.strip() for x in proc.stdout.decode().strip().split("\n")]
-    except Exception as e:
-        logger.warn(f"Failed to execute get_system_pythonpaths(): {str(e)}")
-        return []
+    # run as normal normal user to also include user python paths
+    proc = subprocess.run(["python3", "-c", "import sys; print(':'.join(x for x in sys.path if x))"],
+                          user=get_user_id(), env={}, capture_output=True)
+    return proc.stdout.decode().strip().split(":")
 
 # Download Remote Binaries to local Plugin
 async def download_remote_binary_to_path(url, binHash, path) -> bool:
@@ -96,67 +152,16 @@ async def download_remote_binary_to_path(url, binHash, path) -> bool:
 
     return rv
 
-# Deprecated
-def set_user():
-    pass
-
-# Deprecated
-def set_user_group() -> str:
-    return get_user_group()
-
-#########
-# Below is legacy code, provided for backwards compatibility. This will break on windows
-#########
-
-# Get the user id hosting the plugin loader
-def get_user_id() -> int:
-    return localplatform.localplatform._get_user_id()
-
-# Get the user hosting the plugin loader
-def get_user() -> str:
-    return localplatform.localplatform._get_user()
-
-# Get the effective user id of the running process
-def get_effective_user_id() -> int:
-    return localplatform.localplatform._get_effective_user_id()
-
-# Get the effective user of the running process
-def get_effective_user() -> str:
-    return localplatform.localplatform._get_effective_user()
-
-# Get the effective user group id of the running process
-def get_effective_user_group_id() -> int:
-    return localplatform.localplatform._get_effective_user_group_id()
-
-# Get the effective user group of the running process
-def get_effective_user_group() -> str:
-    return localplatform.localplatform._get_effective_user_group()
-
-# Get the user owner of the given file path.
-def get_user_owner(file_path) -> str:
-    return localplatform.localplatform._get_user_owner(file_path)
-
-# Get the user group of the given file path.
-def get_user_group(file_path) -> str:
-    return localplatform.localplatform._get_user_group(file_path)
-
-# Get the group id of the user hosting the plugin loader
-def get_user_group_id() -> int:
-    return localplatform.localplatform._get_user_group_id()
-
-# Get the group of the user hosting the plugin loader
-def get_user_group() -> str:
-    return localplatform.localplatform._get_user_group()
-
-# Get the default home path unless a user is specified
-def get_home_path(username = None) -> str:
-    return localplatform.get_home_path(UserType.ROOT if username == "root" else UserType.HOST_USER)
-
 async def is_systemd_unit_active(unit_name: str) -> bool:
-    return await localplatform.service_active(unit_name)
+    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) -> bool:
-    return await localplatform.service_stop(unit_name)
+async def stop_systemd_unit(unit_name: str) -> subprocess.CompletedProcess:
+    cmd = ["systemctl", "stop", unit_name]
 
-async def start_systemd_unit(unit_name: str) -> bool:
-    return await localplatform.service_start(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]
+
+    return subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

backend/injector.py

@@ -111,7 +111,7 @@ class Tab:
             "method": "Page.disable",
         }, False)
 
-    async def refresh(self, manage_socket=True):
+    async def refresh(self):
         try:
             if manage_socket:
                 await self.open_websocket()
@@ -394,11 +394,8 @@ async def get_tab_lambda(test) -> Tab:
         raise ValueError(f"Tab not found by lambda")
     return tab
 
-SHARED_CTX_NAMES = ["SharedJSContext", "Steam Shared Context presented by Valve™", "Steam", "SP"]
-DO_NOT_CLOSE_URL = "Valve Steam Gamepad/default" # Steam Big Picture Mode tab
-
 def tab_is_gamepadui(t: Tab) -> bool:
-    return "https://steamloopback.host/routes/" in t.url and t.title in SHARED_CTX_NAMES
+    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()
@@ -415,7 +412,7 @@ async def inject_to_tab(tab_name, js, run_async=False):
 async def close_old_tabs():
     tabs = await get_tabs()
     for t in tabs:
-        if not t.title or (t.title not in SHARED_CTX_NAMES and DO_NOT_CLOSE_URL not in t.url):
+        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)
+            await sleep(0.5)

backend/loader.py

@@ -13,6 +13,7 @@ from watchdog.observers import Observer
 from injector import get_tab, get_gamepadui_tab
 from plugin import PluginWrapper
 
+
 class FileChangeHandler(RegexMatchingEventHandler):
     def __init__(self, queue, plugin_path) -> None:
         super().__init__(regexes=[r'^.*?dist\/index\.js$', r'^.*?main\.py$'])

backend/localplatform.py

@@ -1,40 +0,0 @@
-import platform, os
-
-ON_WINDOWS = platform.system() == "Windows"
-ON_LINUX = not ON_WINDOWS
-
-if ON_WINDOWS:
-    from localplatformwin import *
-    import localplatformwin as localplatform
-else:
-    from localplatformlinux import *
-    import localplatformlinux as localplatform
-
-def get_privileged_path() -> str:
-    '''Get path accessible by elevated user. Holds plugins, decky loader and decky loader configs'''
-    return localplatform.get_privileged_path()
-
-def get_unprivileged_path() -> str:
-    '''Get path accessible by non-elevated user. Holds plugin configuration, plugin data and plugin logs. Externally referred to as the 'Homebrew' directory'''
-    return localplatform.get_unprivileged_path()
-
-def get_unprivileged_user() -> str:
-    '''Get user that should own files made in unprivileged path'''
-    return localplatform.get_unprivileged_user()
-
-def get_chown_plugin_path() -> bool:
-    return os.getenv("CHOWN_PLUGIN_PATH", "1") == "1"
-
-def get_server_host() -> str:
-    return os.getenv("SERVER_HOST", "127.0.0.1")
-
-def get_server_port() -> int:
-    return int(os.getenv("SERVER_PORT", "1337"))
-
-def get_live_reload() -> bool:
-    os.getenv("LIVE_RELOAD", "1") == "1"
-
-def get_log_level() -> int:
-    return {"CRITICAL": 50, "ERROR": 40, "WARNING": 30, "INFO": 20, "DEBUG": 10}[
-        os.getenv("LOG_LEVEL", "INFO")
-    ]

backend/localplatformlinux.py

@@ -1,194 +0,0 @@
-import os, pwd, grp, sys, logging
-from subprocess import call, run, DEVNULL, PIPE, STDOUT
-from customtypes import UserType
-
-logger = logging.getLogger("localplatform")
-
-# Get the user id hosting the plugin loader
-def _get_user_id() -> int:
-    return pwd.getpwnam(_get_user()).pw_uid
-
-# Get the user hosting the plugin loader
-def _get_user() -> str:
-    return get_unprivileged_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.
-def _get_user_owner(file_path) -> str:
-    return pwd.getpwuid(os.stat(file_path).st_uid).pw_name
-
-# Get the user group of the given file path.
-def _get_user_group(file_path) -> str:
-    return grp.getgrgid(os.stat(file_path).st_gid).gr_name
-
-# 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
-def _get_user_group() -> str:
-    return grp.getgrgid(_get_user_group_id()).gr_name
-
-def chown(path : str,  user : UserType = UserType.HOST_USER, recursive : bool = True) -> bool:
-    user_str = ""
-
-    if user == UserType.HOST_USER:
-        user_str = _get_user()+":"+_get_user_group()
-    elif user == UserType.EFFECTIVE_USER:
-        user_str = _get_effective_user()+":"+_get_effective_user_group()
-    elif user == UserType.ROOT:
-        user_str = "root:root"
-    else:
-        raise Exception("Unknown User Type")
-
-    result = call(["chown", "-R", user_str, path] if recursive else ["chown", user_str, path])
-    return result == 0
-
-def chmod(path : str, permissions : int, recursive : bool = True) -> bool:
-    result = call(["chmod", "-R", str(permissions), path] if recursive else ["chmod", str(permissions), path])
-    return result == 0
-
-def folder_owner(path : str) -> UserType|None:
-    user_owner = _get_user_owner(path)
-
-    if (user_owner == _get_user()):
-        return UserType.HOST_USER
-
-    elif (user_owner == _get_effective_user()):
-        return UserType.EFFECTIVE_USER
-
-    else:
-        return None 
-
-def get_home_path(user : UserType = UserType.HOST_USER) -> str:
-    user_name = "root"
-
-    if user == UserType.HOST_USER:
-        user_name = _get_user()
-    elif user == UserType.EFFECTIVE_USER:
-        user_name = _get_effective_user()
-    elif user == UserType.ROOT:
-        pass
-    else:
-        raise Exception("Unknown User Type")
-
-    return pwd.getpwnam(user_name).pw_dir
-
-def get_username() -> str:
-    return _get_user()
-
-def setgid(user : UserType = UserType.HOST_USER):
-    user_id = 0
-
-    if user == UserType.HOST_USER:
-        user_id = _get_user_group_id()
-    elif user == UserType.ROOT:
-        pass
-    else:
-        raise Exception("Unknown user type")
-    
-    os.setgid(user_id)
-
-def setuid(user : UserType = UserType.HOST_USER):
-    user_id = 0
-
-    if user == UserType.HOST_USER:
-        user_id = _get_user_id()
-    elif user == UserType.ROOT:
-        pass
-    else:
-        raise Exception("Unknown user type")
-    
-    os.setuid(user_id)
-
-async def service_active(service_name : str) -> bool:
-    res = run(["systemctl", "is-active", service_name], stdout=DEVNULL, stderr=DEVNULL)
-    return res.returncode == 0
-
-async def service_restart(service_name : str) -> bool:
-    call(["systemctl", "daemon-reload"])
-    cmd = ["systemctl", "restart", service_name]
-    res = run(cmd, stdout=PIPE, stderr=STDOUT)
-    return res.returncode == 0
-
-async def service_stop(service_name : str) -> bool:
-    cmd = ["systemctl", "stop", service_name]
-    res = run(cmd, stdout=PIPE, stderr=STDOUT)
-    return res.returncode == 0
-
-async def service_start(service_name : str) -> bool:
-    cmd = ["systemctl", "start", service_name]
-    res = run(cmd, stdout=PIPE, stderr=STDOUT)
-    return res.returncode == 0
-
-def get_privileged_path() -> str:
-    path = os.getenv("PRIVILEGED_PATH")
-
-    if path == None:
-        path = get_unprivileged_path()
-
-    return path
-
-def _parent_dir(path : str) -> str:
-    if path == None:
-        return None
-
-    if path.endswith('/'):
-        path = path[:-1]
-    
-    return os.path.dirname(path)
-
-def get_unprivileged_path() -> str:
-    path = os.getenv("UNPRIVILEGED_PATH")
-    
-    if path == None:
-        path = _parent_dir(os.getenv("PLUGIN_PATH"))
-    
-    if path == None:
-        logger.debug("Unprivileged path is not properly configured. Making something up!")
-        # Expected path of loader binary is /home/deck/homebrew/service/PluginLoader
-        path = _parent_dir(_parent_dir(os.path.realpath(sys.argv[0])))
-
-        if not os.path.exists(path):
-            path = None
-
-    if path == None:
-        logger.warn("Unprivileged path is not properly configured. Defaulting to /home/deck/homebrew")
-        path = "/home/deck/homebrew" # We give up
-    
-    return path
-
-
-def get_unprivileged_user() -> str:
-    user = os.getenv("UNPRIVILEGED_USER")
-
-    if user == None:
-        # Lets hope we can extract it from the unprivileged dir
-        dir = os.path.realpath(get_unprivileged_path())
-
-        pws = sorted(pwd.getpwall(), reverse=True, key=lambda pw: len(pw.pw_dir))
-        for pw in pws:
-            if dir.startswith(os.path.realpath(pw.pw_dir)):
-                user = pw.pw_name
-                break
-    
-    if user == None:
-        logger.warn("Unprivileged user is not properly configured. Defaulting to 'deck'")
-        user = 'deck'
-
-    return user

backend/localplatformwin.py

@@ -1,53 +0,0 @@
-from customtypes import UserType
-import os, sys
-
-def chown(path : str,  user : UserType = UserType.HOST_USER, recursive : bool = True) -> bool:
-    return True # Stubbed
-
-def chmod(path : str, permissions : int, recursive : bool = True) -> bool:
-    return True # Stubbed
-
-def folder_owner(path : str) -> UserType|None:
-    return UserType.HOST_USER # Stubbed
-
-def get_home_path(user : UserType = UserType.HOST_USER) -> str:
-    return os.path.expanduser("~") # Mostly stubbed
-
-def setgid(user : UserType = UserType.HOST_USER):
-    pass # Stubbed
-
-def setuid(user : UserType = UserType.HOST_USER):
-    pass # Stubbed
-
-async def service_active(service_name : str) -> bool:
-    return True # Stubbed
-
-async def service_stop(service_name : str) -> bool:
-    return True # Stubbed
-
-async def service_start(service_name : str) -> bool:
-    return True # Stubbed
-
-async def service_restart(service_name : str) -> bool:
-    if service_name == "plugin_loader":
-        sys.exit(42)
-
-    return True # Stubbed
-
-def get_username() -> str:
-    return os.getlogin()
-
-def get_privileged_path() -> str:
-    '''On windows, privileged_path is equal to unprivileged_path'''
-    return get_unprivileged_path()
-
-def get_unprivileged_path() -> str:
-    path = os.getenv("UNPRIVILEGED_PATH")
-
-    if path == None:
-        path = os.getenv("PRIVILEGED_PATH", os.path.join(os.path.expanduser("~"), "homebrew"))
-
-    return path
-
-def get_unprivileged_user() -> str:
-    return os.getenv("UNPRIVILEGED_USER", os.getlogin())

backend/localsocket.py

@@ -1,132 +0,0 @@
-import asyncio, time, random
-from localplatform import ON_WINDOWS
-
-BUFFER_LIMIT = 2 ** 20  # 1 MiB
-
-class UnixSocket:
-    def __init__(self, on_new_message):
-        '''
-        on_new_message takes 1 string argument.
-        It's return value gets used, if not None, to write data to the socket.
-        Method should be async
-        '''
-        self.socket_addr = f"/tmp/plugin_socket_{time.time()}"
-        self.on_new_message = on_new_message
-        self.socket = None
-        self.reader = None
-        self.writer = None
-
-    async def setup_server(self):
-        self.socket = await asyncio.start_unix_server(self._listen_for_method_call, path=self.socket_addr, limit=BUFFER_LIMIT)
-    
-    async def _open_socket_if_not_exists(self):
-        if not self.reader:
-            retries = 0
-            while retries < 10:
-                try:
-                    self.reader, self.writer = await asyncio.open_unix_connection(self.socket_addr, limit=BUFFER_LIMIT)
-                    return True
-                except:
-                    await asyncio.sleep(2)
-                    retries += 1
-            return False
-        else:
-            return True
-
-    async def get_socket_connection(self):
-        if not await self._open_socket_if_not_exists():
-            return None, None
-        
-        return self.reader, self.writer
-    
-    async def close_socket_connection(self):
-        if self.writer != None:
-            self.writer.close()
-
-        self.reader = None
-
-    async def read_single_line(self) -> str|None:
-        reader, writer = await self.get_socket_connection()
-
-        if self.reader == None:
-            return None
-
-        return await self._read_single_line(reader)
-
-    async def write_single_line(self, message : str):
-        reader, writer = await self.get_socket_connection()
-
-        if self.writer == None:
-            return;
-
-        await self._write_single_line(writer, message)
-
-    async def _read_single_line(self, reader) -> str:
-        line = bytearray()
-        while True:
-            try:
-                line.extend(await reader.readuntil())
-            except asyncio.LimitOverrunError:
-                line.extend(await reader.read(reader._limit))
-                continue
-            except asyncio.IncompleteReadError as err:
-                line.extend(err.partial)
-                break
-            else:
-                break
-
-        return line.decode("utf-8")
-    
-    async def _write_single_line(self, writer, message : str):
-        if not message.endswith("\n"):
-            message += "\n"
-
-        writer.write(message.encode("utf-8"))
-        await writer.drain()
-
-    async def _listen_for_method_call(self, reader, writer):
-        while True:
-            line = await self._read_single_line(reader)
-
-            try:
-                res = await self.on_new_message(line)
-            except Exception as e:
-                return
-
-            if res != None:
-                await self._write_single_line(writer, res)
-            
-class PortSocket (UnixSocket):
-    def __init__(self, on_new_message):
-        '''
-        on_new_message takes 1 string argument.
-        It's return value gets used, if not None, to write data to the socket.
-        Method should be async
-        '''
-        super().__init__(on_new_message)
-        self.host = "127.0.0.1"
-        self.port = random.sample(range(40000, 60000), 1)[0]
-    
-    async def setup_server(self):
-        self.socket = await asyncio.start_server(self._listen_for_method_call, host=self.host, port=self.port, limit=BUFFER_LIMIT)
-    
-    async def _open_socket_if_not_exists(self):
-        if not self.reader:
-            retries = 0
-            while retries < 10:
-                try:
-                    self.reader, self.writer = await asyncio.open_connection(host=self.host, port=self.port, limit=BUFFER_LIMIT)
-                    return True
-                except:
-                    await asyncio.sleep(2)
-                    retries += 1
-            return False
-        else:
-            return True
-
-if ON_WINDOWS:
-    class LocalSocket (PortSocket): 
-        pass
-else:
-    class LocalSocket (UnixSocket):
-        pass

backend/main.py

@@ -1,19 +1,14 @@
 # Change PyInstaller files permissions
 import sys
-from localplatform import (chmod, chown, service_stop, service_start,
-                            ON_WINDOWS, get_log_level, get_live_reload, 
-                            get_server_port, get_server_host, get_chown_plugin_path,
-                            get_unprivileged_user, get_unprivileged_path, 
-                            get_privileged_path)
+from subprocess import call
 if hasattr(sys, '_MEIPASS'):
-    chmod(sys._MEIPASS, 755)
+    call(['chmod', '-R', '755', sys._MEIPASS])
 # Full imports
 from asyncio import new_event_loop, set_event_loop, sleep
 from json import dumps, loads
 from logging import DEBUG, INFO, basicConfig, getLogger
-from os import getenv, path
+from os import getenv, chmod, path
 from traceback import format_exc
-import multiprocessing
 
 import aiohttp_cors
 # Partial imports
@@ -24,32 +19,42 @@ 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,
-                     mkdir_as_user, get_system_pythonpaths)
-                     
+                     get_home_path, get_homebrew_path, get_user, get_user_group,
+                     stop_systemd_unit, start_systemd_unit)
 from injector import get_gamepadui_tab, Tab, get_tabs, close_old_tabs
 from loader import Loader
 from settings import SettingsManager
 from updater import Updater
 from utilities import Utilities
-from customtypes import UserType
 
+USER = get_user()
+GROUP = get_user_group()
+HOMEBREW_PATH = get_homebrew_path()
+CONFIG = {
+    "plugin_path": getenv("PLUGIN_PATH", path.join(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")),
+    "live_reload": getenv("LIVE_RELOAD", "1") == "1",
+    "log_level": {"CRITICAL": 50, "ERROR": 40, "WARNING": 30, "INFO": 20, "DEBUG": 10}[
+        getenv("LOG_LEVEL", "INFO")
+    ],
+}
 
 basicConfig(
-    level=get_log_level(),
+    level=CONFIG["log_level"],
     format="[%(module)s][%(levelname)s]: %(message)s"
 )
 
 logger = getLogger("Main")
-plugin_path = path.join(get_privileged_path(), "plugins")
 
 def chown_plugin_dir():
-    if not path.exists(plugin_path): # For safety, create the folder before attempting to do anything with it
-        mkdir_as_user(plugin_path)
+    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: {code_chmod})")
 
-    if not chown(plugin_path, UserType.HOST_USER) or not chmod(plugin_path, 555):
-        logger.error(f"chown/chmod exited with a non-zero exit code")
-
-if get_chown_plugin_path() == True:
+if CONFIG["chown_plugin_path"] == True:
     chown_plugin_dir()
 
 class PluginManager:
@@ -64,9 +69,9 @@ class PluginManager:
                 allow_credentials=True
             )
         })
-        self.plugin_loader = Loader(self.web_app, plugin_path, self.loop, get_live_reload())
-        self.settings = SettingsManager("loader", path.join(get_privileged_path(), "settings"))
-        self.plugin_browser = PluginBrowser(plugin_path, self.plugin_loader.plugins, self.plugin_loader, self.settings) 
+        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)
 
@@ -74,9 +79,9 @@ class PluginManager:
 
         async def startup(_):
             if self.settings.getSetting("cef_forward", False):
-                self.loop.create_task(service_start(REMOTE_DEBUGGER_UNIT))
+                self.loop.create_task(start_systemd_unit(REMOTE_DEBUGGER_UNIT))
             else:
-                self.loop.create_task(service_stop(REMOTE_DEBUGGER_UNIT))
+                self.loop.create_task(stop_systemd_unit(REMOTE_DEBUGGER_UNIT))
             self.loop.create_task(self.loader_reinjector())
             self.loop.create_task(self.load_plugins())
 
@@ -103,9 +108,6 @@ class PluginManager:
         logger.debug("Loading plugins")
         self.plugin_loader.import_plugins()
         # await inject_to_tab("SP", "window.syncDeckyPlugins();")
-        if self.settings.getSetting("pluginOrder", None) == None:
-          self.settings.setSetting("pluginOrder", list(self.plugin_loader.plugins.keys()))
-          logger.debug("Did not find pluginOrder setting, set it to default")
 
     async def loader_reinjector(self):
         while True:
@@ -168,23 +170,9 @@ class PluginManager:
             pass
 
     def run(self):
-        return run_app(self.web_app, host=get_server_host(), port=get_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__":
-    if ON_WINDOWS:
-        # Fix windows/flask not recognising that .js means 'application/javascript'
-        import mimetypes
-        mimetypes.add_type('application/javascript', '.js')
-
-        # Required for multiprocessing support in frozen files
-        multiprocessing.freeze_support()
-
-    # Append the loader's plugin path to the recognized python paths
-    sys.path.append(path.join(path.dirname(__file__), "plugin"))
-
-    # Append the system and user python paths
-    sys.path.extend(get_system_pythonpaths())
-
     loop = new_event_loop()
     set_event_loop(loop)
     PluginManager(loop).run()

backend/plugin.py

@@ -1,27 +1,32 @@
 import multiprocessing
 from asyncio import (Lock, get_event_loop, new_event_loop,
-                     set_event_loop, sleep)
+                     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, environ
+from os import path, setgid, setuid, environ
 from signal import SIGINT, signal
 from sys import exit, path as syspath
 from time import time
-from localsocket import LocalSocket
-from localplatform import setgid, setuid, get_username, get_home_path
-from customtypes import UserType
 import helpers
+from updater import Updater
+
+multiprocessing.set_start_method("fork")
+
+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
+        self.socket_addr = f"/tmp/plugin_socket_{time()}"
         self.method_call_lock = Lock()
-        self.socket = LocalSocket(self._on_new_message)
 
         self.version = None
 
@@ -30,6 +35,7 @@ class PluginWrapper:
             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 ""
@@ -53,13 +59,15 @@ class PluginWrapper:
             set_event_loop(new_event_loop())
             if self.passive:
                 return
-            setgid(UserType.ROOT if "root" in self.flags else UserType.HOST_USER)
-            setuid(UserType.ROOT if "root" in self.flags else UserType.HOST_USER)
+            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"] = get_home_path(UserType.ROOT if "root" in self.flags else UserType.HOST_USER)
-            environ["USER"] = "root" if "root" in self.flags else get_username()
+            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["USER_ID"] = "0" if "root" in self.flags else helpers.get_user_id()
             environ["DECKY_VERSION"] = helpers.get_loader_version()
-            environ["DECKY_USER"] = get_username()
+            environ["DECKY_USER"] = str(helpers.get_user())
+            environ["DECKY_USER_ID"] = str(helpers.get_user_id())
             environ["DECKY_USER_HOME"] = helpers.get_home_path()
             environ["DECKY_HOME"] = helpers.get_homebrew_path()
             environ["DECKY_PLUGIN_SETTINGS_DIR"] = path.join(environ["DECKY_HOME"], "settings", self.plugin_directory)
@@ -72,10 +80,12 @@ class PluginWrapper:
             environ["DECKY_PLUGIN_NAME"] = self.name
             environ["DECKY_PLUGIN_VERSION"] = self.version
             environ["DECKY_PLUGIN_AUTHOR"] = self.author
-
+            # append the loader's plugin path to the recognized python paths
+            syspath.append(path.realpath(path.join(path.dirname(__file__), "plugin")))
             # append the plugin's `py_modules` to the recognized python paths
             syspath.append(path.join(environ["DECKY_PLUGIN_DIR"], "py_modules"))
-
+            # append the system and user python paths
+            syspath.extend(helpers.get_system_pythonpaths())
             spec = spec_from_file_location("_", self.file)
             module = module_from_spec(spec)
             spec.loader.exec_module(module)
@@ -85,7 +95,7 @@ class PluginWrapper:
                 get_event_loop().run_until_complete(self.Plugin._migration(self.Plugin))
             if hasattr(self.Plugin, "_main"):
                 get_event_loop().create_task(self.Plugin._main(self.Plugin))
-            get_event_loop().create_task(self.socket.setup_server())
+            get_event_loop().create_task(self._setup_socket())
             get_event_loop().run_forever()
         except:
             self.log.error("Failed to start " + self.name + "!\n" + format_exc())
@@ -103,26 +113,55 @@ class PluginWrapper:
             self.log.error("Failed to unload " + self.name + "!\n" + format_exc())
             exit(0)
 
-    async def _on_new_message(self, message : str) -> str|None:
-        data = loads(message)
+    async def _setup_socket(self):
+        self.socket = await start_unix_server(self._listen_for_method_call, path=self.socket_addr, limit=BUFFER_LIMIT)
 
-        if "stop" in data:
-            self.log.info("Calling Loader unload function.")
-            await self._unload()
-            get_event_loop().stop()
-            while get_event_loop().is_running():
-                await sleep(0)
-            get_event_loop().close()
-            raise Exception("Closing message listener")
+    async def _listen_for_method_call(self, reader, writer):
+        while True:
+            line = bytearray()
+            while True:
+                try:
+                    line.extend(await reader.readuntil())
+                except LimitOverrunError:
+                    line.extend(await reader.read(reader._limit))
+                    continue
+                except IncompleteReadError as err:
+                    line.extend(err.partial)
+                    break
+                else:
+                    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():
+                    await sleep(0)
+                get_event_loop().close()
+                return
+            d = {"res": None, "success": True}
+            try:
+                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"))
+                await writer.drain()
 
-        d = {"res": None, "success": True}
-        try:
-            d["res"] = await getattr(self.Plugin, data["method"])(self.Plugin, **data["args"])
-        except Exception as e:
-            d["res"] = str(e)
-            d["success"] = False
-        finally:
-            return dumps(d, ensure_ascii=False)
+    async def _open_socket_if_not_exists(self):
+        if not self.reader:
+            retries = 0
+            while retries < 10:
+                try:
+                    self.reader, self.writer = await open_unix_connection(self.socket_addr, limit=BUFFER_LIMIT)
+                    return True
+                except:
+                    await sleep(2)
+                    retries += 1
+            return False
+        else:
+            return True
 
     def start(self):
         if self.passive:
@@ -133,24 +172,34 @@ class PluginWrapper:
     def stop(self):
         if self.passive:
             return
-
         async def _(self):
-            await self.socket.write_single_line(dumps({ "stop": True }, ensure_ascii=False))
-            await self.socket.close_socket_connection()
-            
+            if await self._open_socket_if_not_exists():
+                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)")
         async with self.method_call_lock:
-            reader, writer = await self.socket.get_socket_connection()
-
-            await self.socket.write_single_line(dumps({ "method": method_name, "args": kwargs }, ensure_ascii=False))
-
-            line = await self.socket.read_single_line()
-            if line != None:
-                res = loads(line)
+            if await self._open_socket_if_not_exists():
+                self.writer.write(
+                    (dumps({ "method": method_name, "args": kwargs }, ensure_ascii=False) + "\n").encode("utf-8"))
+                await self.writer.drain()
+                line = bytearray()
+                while True:
+                    try:
+                        line.extend(await self.reader.readuntil())
+                    except LimitOverrunError:
+                        line.extend(await self.reader.read(self.reader._limit))
+                        continue
+                    except IncompleteReadError as err:
+                        line.extend(err.partial)
+                        break
+                    else:
+                        break
+                res = loads(line.decode("utf-8"))
                 if not res["success"]:
                     raise Exception(res["res"])
-                return res["res"]
+                return res["res"]

backend/settings.py

@@ -1,13 +1,14 @@
 from json import dump, load
 from os import mkdir, path, listdir, rename
-from localplatform import chown, folder_owner, get_chown_plugin_path
-from customtypes import UserType
+from shutil import chown
 
-from helpers import get_homebrew_path
+from helpers import get_home_path, get_homebrew_path, get_user, get_user_group, get_user_owner
 
 
 class SettingsManager:
     def __init__(self, name, settings_directory = None) -> None:
+        USER = get_user()
+        GROUP = get_user_group()
         wrong_dir = get_homebrew_path()
         if settings_directory == None:
             settings_directory = path.join(wrong_dir, "settings")
@@ -17,6 +18,7 @@ class SettingsManager:
         #Create the folder with the correct permission
         if not path.exists(settings_directory):
             mkdir(settings_directory)
+            chown(settings_directory, USER, GROUP)
 
         #Copy all old settings file in the root directory to the correct folder
         for file in listdir(wrong_dir):
@@ -27,9 +29,8 @@ class SettingsManager:
 
 
         #If the owner of the settings directory is not the user, then set it as the user:
-        expected_user = UserType.HOST_USER if get_chown_plugin_path() else UserType.ROOT
-        if folder_owner(settings_directory) != expected_user:
-            chown(settings_directory, expected_user, False)
+        if get_user_owner(settings_directory) != USER:
+            chown(settings_directory, USER, GROUP)
 
         self.settings = {}
 
@@ -51,7 +52,7 @@ class SettingsManager:
         with open(self.path, "w+", encoding="utf-8") as file:
             dump(self.settings, file, indent=4, ensure_ascii=False)
 
-    def getSetting(self, key, default=None):
+    def getSetting(self, key, default):
         return self.settings.get(key, default)
 
     def setSetting(self, key, value):

backend/updater.py

@@ -6,7 +6,7 @@ from ensurepip import version
 from json.decoder import JSONDecodeError
 from logging import getLogger
 from os import getcwd, path, remove
-from localplatform import chmod, service_restart, ON_LINUX
+from subprocess import call
 
 from aiohttp import ClientSession, web
 
@@ -104,15 +104,6 @@ class Updater:
         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:
                 remoteVersions = await res.json()
-                if selectedBranch == 0:
-                    logger.debug("release type: release")
-                    remoteVersions = list(filter(lambda ver: ver["tag_name"].startswith("v") and not ver["prerelease"] and not ver["tag_name"].find("-pre") > 0 and ver["tag_name"], remoteVersions))
-                elif selectedBranch == 1:
-                    logger.debug("release type: pre-release")
-                    remoteVersions = list(filter(lambda ver:ver["tag_name"].startswith("v"), remoteVersions))
-                else:
-                    logger.error("release type: NOT FOUND")
-                    raise ValueError("no valid branch found")
         self.allRemoteVers = remoteVersions
         logger.debug("determining release type to find, branch is %i" % selectedBranch)
         if selectedBranch == 0:
@@ -141,54 +132,47 @@ class Updater:
     async def do_update(self):
         logger.debug("Starting update.")
         version = self.remoteVer["tag_name"]
-        download_url = None
-        download_filename = "PluginLoader" if ON_LINUX else "PluginLoader.exe"
-        download_temp_filename = download_filename + ".new"
-
-        for x in self.remoteVer["assets"]:
-            if x["name"] == download_filename:
-                download_url = x["browser_download_url"]
-                break
-        
-        if download_url == None:
-            raise Exception("Download url not found")
-
+        download_url = self.remoteVer["assets"][0]["browser_download_url"]
         service_url = self.get_service_url()
         logger.debug("Retrieved service URL")
 
         tab = await get_gamepadui_tab()
         await tab.open_websocket()
         async with ClientSession() as web:
-            if ON_LINUX:
-                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:
-                    logger.debug("Downloading service file")
-                    data = await res.content.read()
-                logger.debug(str(data))
-                service_file_path = path.join(getcwd(), "plugin_loader.service")
-                try:
-                    with open(path.join(getcwd(), "plugin_loader.service"), "wb") as out:
-                        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:
-                    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)
+            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:
+                logger.debug("Downloading service file")
+                data = await res.content.read()
+            logger.debug(str(data))
+            service_file_path = path.join(getcwd(), "plugin_loader.service")
+            try:
+                with open(path.join(getcwd(), "plugin_loader.service"), "wb") as out:
+                    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:
+                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)
                     
-                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")
+            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")
             
             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))
-                with open(path.join(getcwd(), download_temp_filename), "wb") as out:
+                # we need to not delete the binary until we have downloaded the new binary!
+                try:
+                    remove(path.join(getcwd(), "PluginLoader"))
+                except:
+                    pass
+                with open(path.join(getcwd(), "PluginLoader"), "wb") as out:
                     progress = 0
                     raw = 0
                     async for c in res.content.iter_chunked(512):
@@ -202,15 +186,12 @@ class Updater:
             with open(path.join(getcwd(), ".loader.version"), "w", encoding="utf-8") as out:
                 out.write(version)
 
-            if ON_LINUX:
-                remove(path.join(getcwd(), download_filename))
-                shutil.move(path.join(getcwd(), download_temp_filename), path.join(getcwd(), download_filename))
-                chmod(path.join(getcwd(), download_filename), 777, False)
-
+            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()
             await tab.close_websocket()
 
     async def do_restart(self):
-        await service_restart("plugin_loader")
+        call(["systemctl", "daemon-reload"])
+        call(["systemctl", "restart", "plugin_loader"])

backend/utilities.py

@@ -10,7 +10,7 @@ from logging import getLogger
 from injector import inject_to_tab, get_gamepadui_tab, close_old_tabs
 import helpers
 import subprocess
-from localplatform import service_stop, service_start
+
 
 class Utilities:
     def __init__(self, context) -> None:
@@ -174,11 +174,11 @@ class Utilities:
         return self.context.settings.setSetting(key, value)
 
     async def allow_remote_debugging(self):
-        await service_start(helpers.REMOTE_DEBUGGER_UNIT)
+        await helpers.start_systemd_unit(helpers.REMOTE_DEBUGGER_UNIT)
         return True
 
     async def disallow_remote_debugging(self):
-        await service_stop(helpers.REMOTE_DEBUGGER_UNIT)
+        await helpers.stop_systemd_unit(helpers.REMOTE_DEBUGGER_UNIT)
         return True
 
     async def filepicker_ls(self, path, include_files=True):

dist/plugin_loader-prerelease.service

@@ -9,8 +9,7 @@ Restart=always
 ExecStart=${HOMEBREW_FOLDER}/services/PluginLoader
 WorkingDirectory=${HOMEBREW_FOLDER}/services
 KillSignal=SIGKILL
-Environment=UNPRIVILEGED_PATH=${HOMEBREW_FOLDER}
-Environment=PRIVILEGED_PATH=${HOMEBREW_FOLDER}
+Environment=PLUGIN_PATH=${HOMEBREW_FOLDER}/plugins
 Environment=LOG_LEVEL=DEBUG
 [Install]
 WantedBy=multi-user.target

dist/plugin_loader-release.service

@@ -9,8 +9,7 @@ Restart=always
 ExecStart=${HOMEBREW_FOLDER}/services/PluginLoader
 WorkingDirectory=${HOMEBREW_FOLDER}/services
 KillSignal=SIGKILL
-Environment=UNPRIVILEGED_PATH=${HOMEBREW_FOLDER}
-Environment=PRIVILEGED_PATH=${HOMEBREW_FOLDER}
+Environment=PLUGIN_PATH=${HOMEBREW_FOLDER}/plugins
 Environment=LOG_LEVEL=INFO
 [Install]
 WantedBy=multi-user.target

docs/images/download_button.svg

@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="81.700577mm"
-   height="24.334814mm"
-   viewBox="0 0 81.700577 24.334814"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   sodipodi:docname="download.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:showpageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:deskcolor="#505050"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="3.659624"
-     inkscape:cx="115.44902"
-     inkscape:cy="59.295709"
-     inkscape:window-width="1827"
-     inkscape:window-height="1233"
-     inkscape:window-x="69"
-     inkscape:window-y="38"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4494">
-      <stop
-         style="stop-color:#009fff;stop-opacity:1;"
-         offset="0"
-         id="stop4490" />
-      <stop
-         style="stop-color:#ff1965;stop-opacity:1;"
-         offset="0.79417855"
-         id="stop4498" />
-      <stop
-         style="stop-color:#b9b500;stop-opacity:1;"
-         offset="1"
-         id="stop4492" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4494"
-       id="linearGradient4496"
-       x1="49.131042"
-       y1="118.6573"
-       x2="150.29259"
-       y2="138.74957"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       gradientTransform="matrix(1.0500324,0,0,1,-1.6155884,24.621921)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4494"
-       id="linearGradient13802"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0500324,0,0,1,-1.6155884,24.621921)"
-       x1="49.131042"
-       y1="118.6573"
-       x2="150.29259"
-       y2="138.74957"
-       spreadMethod="pad" />
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-64.149712,-136.3326)">
-    <rect
-       style="mix-blend-mode:normal;fill:url(#linearGradient13802);fill-opacity:1;stroke:none;stroke-width:0.271121"
-       id="rect111"
-       width="81.700577"
-       height="24.334814"
-       x="64.149712"
-       y="136.3326"
-       ry="8.1781616" />
-    <text
-       xml:space="preserve"
-       style="font-size:3.175px;fill:#000000;stroke:none;stroke-width:0.264583"
-       x="66.364288"
-       y="124.84658"
-       id="text10382"><tspan
-         sodipodi:role="line"
-         id="tspan10380"
-         style="stroke-width:0.264583"
-         x="66.364288"
-         y="124.84658" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.1694px;font-family:sans-serif;-inkscape-font-specification:sans-serif;white-space:pre;inline-size:82.6483;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="67.732498"
-       y="126.05277"
-       id="text10440"
-       transform="translate(1.088576,28.135753)"><tspan
-         x="67.732498"
-         y="126.05277"
-         id="tspan13872">Download</tspan></text>
-    <rect
-       style="mix-blend-mode:normal;fill:url(#linearGradient4496);fill-opacity:1;stroke:none;stroke-width:0.271121"
-       id="rect13792"
-       width="81.700577"
-       height="24.334814"
-       x="64.149712"
-       y="136.3326"
-       ry="8.1781616" />
-    <text
-       xml:space="preserve"
-       style="font-size:3.175px;fill:#000000;stroke:none;stroke-width:0.264583"
-       x="66.364288"
-       y="124.84658"
-       id="text13796"><tspan
-         sodipodi:role="line"
-         id="tspan13794"
-         style="stroke-width:0.264583"
-         x="66.364288"
-         y="124.84658" /></text>
-    <g
-       aria-label="Download"
-       transform="translate(1.088576,28.135753)"
-       id="text13800"
-       style="font-size:15.1694px;-inkscape-font-specification:sans-serif;white-space:pre;inline-size:82.6483;display:inline;fill:#ffffff;stroke-width:0.264583">
-      <path
-         d="m 77.880751,120.53111 q 0,2.74566 -1.501771,4.14125 -1.486601,1.38041 -4.156416,1.38041 h -3.01871 v -10.83095 h 3.337268 q 1.638295,0 2.836678,0.60678 1.198382,0.60677 1.850666,1.78999 0.652285,1.16804 0.652285,2.91252 z m -1.441093,0.0455 q 0,-2.16923 -1.077028,-3.17041 -1.061858,-1.01635 -3.01871,-1.01635 H 70.5691 v 8.49487 h 1.471432 q 4.399126,0 4.399126,-4.30811 z"
-         id="path13828" />
-      <path
-         d="m 87.164417,121.9722 q 0,2.01753 -1.03152,3.1249 -1.01635,1.10737 -2.760831,1.10737 -1.077027,0 -1.926513,-0.48542 -0.834317,-0.50059 -1.319738,-1.4411 -0.485421,-0.95567 -0.485421,-2.30575 0,-2.01753 1.01635,-3.10972 1.01635,-1.0922 2.760831,-1.0922 1.107366,0 1.941683,0.50059 0.849486,0.48542 1.319738,1.42592 0.485421,0.92534 0.485421,2.27541 z m -6.143608,0 q 0,1.4411 0.561268,2.29058 0.576437,0.83432 1.820328,0.83432 1.228722,0 1.805159,-0.83432 0.576437,-0.84948 0.576437,-2.29058 0,-1.44109 -0.576437,-2.26024 -0.576437,-0.81914 -1.820328,-0.81914 -1.243891,0 -1.805159,0.81914 -0.561268,0.81915 -0.561268,2.26024 z"
-         id="path13830" />
-      <path
-         d="m 94.218174,121.45644 q -0.197202,-0.62194 -0.348896,-1.21355 -0.136525,-0.60677 -0.212372,-0.9405 h -0.06068 q -0.06068,0.33373 -0.197203,0.9405 -0.136524,0.59161 -0.348896,1.22872 l -1.456262,4.56599 h -1.51694 l -2.229902,-8.1308 h 1.380415 l 1.122536,4.33845 q 0.166863,0.65229 0.318557,1.31974 0.151694,0.66745 0.212372,1.10737 h 0.06068 q 0.06068,-0.25788 0.136525,-0.63712 0.09102,-0.37923 0.197202,-0.78881 0.106186,-0.42474 0.212372,-0.75847 l 1.441093,-4.58116 h 1.456262 l 1.395585,4.58116 q 0.166864,0.51576 0.318558,1.12254 0.166863,0.60678 0.227541,1.04669 h 0.06068 q 0.04551,-0.37924 0.197202,-1.04669 0.166864,-0.66745 0.348897,-1.36525 l 1.137705,-4.33845 h 1.365246 l -2.260241,8.1308 h -1.562448 z"
-         id="path13832" />
-      <path
-         d="m 104.8064,117.77028 q 1.45627,0 2.19957,0.71296 0.7433,0.69779 0.7433,2.27541 v 5.29412 h -1.31974 v -5.2031 q 0,-1.95685 -1.82033,-1.95685 -1.35007,0 -1.86583,0.75847 -0.51576,0.75847 -0.51576,2.18439 v 4.21709 h -1.33491 v -8.1308 h 1.07703 l 0.1972,1.10737 h 0.0759 q 0.3944,-0.63711 1.09219,-0.9405 0.69779,-0.31856 1.47143,-0.31856 z"
-         id="path13834" />
-      <path
-         d="m 111.6023,126.05277 h -1.33491 v -11.52874 h 1.33491 z"
-         id="path13836" />
-      <path
-         d="m 121.25003,121.9722 q 0,2.01753 -1.03152,3.1249 -1.01635,1.10737 -2.76084,1.10737 -1.07702,0 -1.92651,-0.48542 -0.83432,-0.50059 -1.31974,-1.4411 -0.48542,-0.95567 -0.48542,-2.30575 0,-2.01753 1.01635,-3.10972 1.01635,-1.0922 2.76083,-1.0922 1.10737,0 1.94169,0.50059 0.84948,0.48542 1.31973,1.42592 0.48543,0.92534 0.48543,2.27541 z m -6.14361,0 q 0,1.4411 0.56127,2.29058 0.57643,0.83432 1.82032,0.83432 1.22873,0 1.80516,-0.83432 0.57644,-0.84948 0.57644,-2.29058 0,-1.44109 -0.57644,-2.26024 -0.57643,-0.81914 -1.82033,-0.81914 -1.24389,0 -1.80515,0.81914 -0.56127,0.81915 -0.56127,2.26024 z"
-         id="path13838" />
-      <path
-         d="m 126.43796,117.78545 q 1.4866,0 2.19956,0.65228 0.71296,0.65229 0.71296,2.07821 v 5.53683 h -0.97084 l -0.25788,-1.15287 h -0.0607 q -0.53093,0.66745 -1.12253,0.98601 -0.57644,0.31856 -1.60796,0.31856 -1.10737,0 -1.8355,-0.57644 -0.72813,-0.59161 -0.72813,-1.8355 0,-1.21355 0.95567,-1.86583 0.95567,-0.66746 2.94287,-0.72814 l 1.38041,-0.0455 v -0.48542 q 0,-1.01635 -0.43991,-1.41076 -0.43991,-0.3944 -1.24389,-0.3944 -0.63712,0 -1.21355,0.1972 -0.57644,0.18203 -1.07703,0.42474 l -0.40957,-1.00118 q 0.53092,-0.28822 1.25906,-0.48542 0.72813,-0.21237 1.51694,-0.21237 z m 0.3944,4.33845 q -1.51694,0.0607 -2.10855,0.48542 -0.57643,0.42474 -0.57643,1.19838 0,0.68262 0.40957,1.00118 0.42474,0.31856 1.07703,0.31856 1.03152,0 1.71414,-0.56127 0.68262,-0.57644 0.68262,-1.75965 v -0.72813 z"
-         id="path13840" />
-      <path
-         d="m 134.7508,126.20447 q -1.51694,0 -2.42711,-1.04669 -0.91016,-1.06186 -0.91016,-3.15524 0,-2.09337 0.91016,-3.15523 0.92534,-1.07703 2.44228,-1.07703 0.9405,0 1.53211,0.3489 0.60677,0.34889 0.98601,0.84948 h 0.091 q -0.0152,-0.1972 -0.0607,-0.57643 -0.0303,-0.39441 -0.0303,-0.62195 v -3.24625 h 1.3349 v 11.52874 h -1.07702 l -0.19721,-1.09219 h -0.0607 q -0.36407,0.51576 -0.97084,0.87982 -0.60678,0.36407 -1.56245,0.36407 z m 0.21237,-1.10737 q 1.2894,0 1.80516,-0.69779 0.53093,-0.71296 0.53093,-2.13889 v -0.24271 q 0,-1.51694 -0.50059,-2.32092 -0.50059,-0.81914 -1.85067,-0.81914 -1.07703,0 -1.62313,0.86465 -0.53093,0.84949 -0.53093,2.29058 0,1.45626 0.53093,2.26024 0.5461,0.80398 1.6383,0.80398 z"
-         id="path13842" />
-    </g>
-  </g>
-</svg>

frontend/package.json

@@ -12,28 +12,28 @@
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^21.1.0",
-    "@rollup/plugin-image": "^3.0.2",
+    "@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",
-    "@rollup/plugin-typescript": "^8.5.0",
+    "@rollup/plugin-typescript": "^8.3.3",
     "@types/react": "16.14.0",
     "@types/react-file-icon": "^1.0.1",
     "@types/react-router": "5.1.18",
-    "@types/webpack": "^5.28.1",
-    "husky": "^8.0.3",
+    "@types/webpack": "^5.28.0",
+    "husky": "^8.0.1",
     "import-sort-style-module": "^6.0.0",
-    "inquirer": "^8.2.5",
-    "prettier": "^2.8.7",
+    "inquirer": "^8.2.4",
+    "prettier": "^2.7.1",
     "prettier-plugin-import-sort": "^0.0.7",
     "react": "16.14.0",
     "react-dom": "16.14.0",
-    "rollup": "^2.79.1",
+    "rollup": "^2.76.0",
     "rollup-plugin-delete": "^2.0.0",
     "rollup-plugin-external-globals": "^0.6.1",
     "rollup-plugin-polyfill-node": "^0.10.2",
-    "tslib": "^2.5.0",
-    "typescript": "^4.9.5"
+    "tslib": "^2.4.0",
+    "typescript": "^4.7.4"
   },
   "importSort": {
     ".js, .jsx, .ts, .tsx": {
@@ -42,10 +42,10 @@
     }
   },
   "dependencies": {
-    "decky-frontend-lib": "3.20.6",
-    "react-file-icon": "^1.3.0",
-    "react-icons": "^4.8.0",
-    "react-markdown": "^8.0.6",
+    "decky-frontend-lib": "^3.19.1",
+    "react-file-icon": "^1.2.0",
+    "react-icons": "^4.4.0",
+    "react-markdown": "^8.0.3",
     "remark-gfm": "^3.0.1"
   }
 }

frontend/src/components/DeckyState.tsx

@@ -6,7 +6,6 @@ import { VerInfo } from '../updater';
 
 interface PublicDeckyState {
   plugins: Plugin[];
-  pluginOrder: string[];
   activePlugin: Plugin | null;
   updates: PluginUpdateMapping | null;
   hasLoaderUpdate?: boolean;
@@ -16,7 +15,6 @@ interface PublicDeckyState {
 
 export class DeckyState {
   private _plugins: Plugin[] = [];
-  private _pluginOrder: string[] = [];
   private _activePlugin: Plugin | null = null;
   private _updates: PluginUpdateMapping | null = null;
   private _hasLoaderUpdate: boolean = false;
@@ -28,7 +26,6 @@ export class DeckyState {
   publicState(): PublicDeckyState {
     return {
       plugins: this._plugins,
-      pluginOrder: this._pluginOrder,
       activePlugin: this._activePlugin,
       updates: this._updates,
       hasLoaderUpdate: this._hasLoaderUpdate,
@@ -47,11 +44,6 @@ export class DeckyState {
     this.notifyUpdate();
   }
 
-  setPluginOrder(pluginOrder: string[]) {
-    this._pluginOrder = pluginOrder;
-    this.notifyUpdate();
-  }
-
   setActivePlugin(name: string) {
     this._activePlugin = this._plugins.find((plugin) => plugin.name === name) ?? null;
     this.notifyUpdate();
@@ -86,7 +78,6 @@ interface DeckyStateContext extends PublicDeckyState {
   setVersionInfo(versionInfo: VerInfo): void;
   setIsLoaderUpdating(hasUpdate: boolean): void;
   setActivePlugin(name: string): void;
-  setPluginOrder(pluginOrder: string[]): void;
   closeActivePlugin(): void;
 }
 
@@ -115,18 +106,10 @@ export const DeckyStateContextProvider: FC<Props> = ({ children, deckyState }) =
   const setVersionInfo = (versionInfo: VerInfo) => deckyState.setVersionInfo(versionInfo);
   const setActivePlugin = (name: string) => deckyState.setActivePlugin(name);
   const closeActivePlugin = () => deckyState.closeActivePlugin();
-  const setPluginOrder = (pluginOrder: string[]) => deckyState.setPluginOrder(pluginOrder);
 
   return (
     <DeckyStateContext.Provider
-      value={{
-        ...publicDeckyState,
-        setIsLoaderUpdating,
-        setVersionInfo,
-        setActivePlugin,
-        closeActivePlugin,
-        setPluginOrder,
-      }}
+      value={{ ...publicDeckyState, setIsLoaderUpdating, setVersionInfo, setActivePlugin, closeActivePlugin }}
     >
       {children}
     </DeckyStateContext.Provider>

frontend/src/components/PluginView.tsx

@@ -7,27 +7,17 @@ import {
   scrollClasses,
   staticClasses,
 } from 'decky-frontend-lib';
-import { VFC, useEffect, useState } from 'react';
+import { VFC } from 'react';
 
-import { Plugin } from '../plugin';
 import { useDeckyState } from './DeckyState';
 import NotificationBadge from './NotificationBadge';
 import { useQuickAccessVisible } from './QuickAccessVisibleState';
 import TitleView from './TitleView';
 
 const PluginView: VFC = () => {
-  const { plugins, updates, activePlugin, pluginOrder, setActivePlugin, closeActivePlugin } = useDeckyState();
+  const { plugins, updates, activePlugin, setActivePlugin, closeActivePlugin } = useDeckyState();
   const visible = useQuickAccessVisible();
 
-  const [pluginList, setPluginList] = useState<Plugin[]>(
-    plugins.sort((a, b) => pluginOrder.indexOf(a.name) - pluginOrder.indexOf(b.name)),
-  );
-
-  useEffect(() => {
-    setPluginList(plugins.sort((a, b) => pluginOrder.indexOf(a.name) - pluginOrder.indexOf(b.name)));
-    console.log('updating PluginView after changes');
-  }, [plugins, pluginOrder]);
-
   if (activePlugin) {
     return (
       <Focusable onCancelButton={closeActivePlugin}>
@@ -46,7 +36,7 @@ const PluginView: VFC = () => {
       <TitleView />
       <div className={joinClassNames(staticClasses.TabGroupPanel, scrollClasses.ScrollPanel, scrollClasses.ScrollY)}>
         <PanelSection>
-          {pluginList
+          {plugins
             .filter((p) => p.content)
             .map(({ name, icon }) => (
               <PanelSectionRow key={name}>

frontend/src/components/modals/PluginInstallModal.tsx

@@ -29,10 +29,10 @@ const PluginInstallModal: FC<PluginInstallModalProps> = ({ artifact, version, ha
       strTitle={`Install ${artifact}`}
       strOKButtonText={loading ? 'Installing' : 'Install'}
     >
-      Are you sure you want to install {artifact}
-      {version ? ` ${version}` : ''}?
-      {hash == 'False' && (
-        <span style={{ color: 'red' }}> This plugin does not have a hash, you are installing it at your own risk.</span>
+      {hash == 'False' ? (
+        <h3 style={{ color: 'red' }}>!!!!NO HASH PROVIDED!!!!</h3>
+      ) : (
+        `Are you sure you want to install ${artifact} ${version}?`
       )}
     </ConfirmModal>
   );

frontend/src/components/modals/filepicker/index.tsx

@@ -134,15 +134,7 @@ const FilePicker: FunctionComponent<FilePickerProps> = ({
                         )}
                       </div>
                     )}
-                    <span
-                      style={{
-                        textOverflow: 'ellipsis',
-                        overflow: 'hidden',
-                        textAlign: 'left',
-                      }}
-                    >
-                      {file.name}
-                    </span>
+                    {file.name}
                   </div>
                 </DialogButton>
               );

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

@@ -1,109 +1,64 @@
-import {
-  DialogBody,
-  DialogButton,
-  DialogControlsSection,
-  DialogControlsSectionHeader,
-  Field,
-  TextField,
-  Toggle,
-} from 'decky-frontend-lib';
-import { useRef, useState } from 'react';
-import { FaFileArchive, FaLink, FaReact, FaSteamSymbol } from 'react-icons/fa';
+import { DialogBody, Field, TextField, Toggle } from 'decky-frontend-lib';
+import { useRef } from 'react';
+import { FaReact, FaSteamSymbol } from 'react-icons/fa';
 
 import { setShouldConnectToReactDevTools, setShowValveInternal } from '../../../../developer';
-import { installFromURL } from '../../../../store';
 import { useSetting } from '../../../../utils/hooks/useSetting';
 import RemoteDebuggingSettings from '../general/RemoteDebugging';
 
-const installFromZip = () => {
-  window.DeckyPluginLoader.openFilePicker('/home/deck', true).then((val) => {
-    const url = `file://${val.path}`;
-    console.log(`Installing plugin locally from ${url}`);
-
-    if (url.endsWith('.zip')) {
-      installFromURL(url);
-    } else {
-      window.DeckyPluginLoader.toaster.toast({
-        title: 'Decky',
-        body: `Installation failed! Only ZIP files are supported.`,
-        onClick: installFromZip,
-      });
-    }
-  });
-};
-
 export default function DeveloperSettings() {
   const [enableValveInternal, setEnableValveInternal] = useSetting<boolean>('developer.valve_internal', false);
   const [reactDevtoolsEnabled, setReactDevtoolsEnabled] = useSetting<boolean>('developer.rdt.enabled', false);
   const [reactDevtoolsIP, setReactDevtoolsIP] = useSetting<string>('developer.rdt.ip', '');
-  const [pluginURL, setPluginURL] = useState('');
   const textRef = useRef<HTMLDivElement>(null);
 
   return (
     <DialogBody>
-      <DialogControlsSection>
-        <DialogControlsSectionHeader>Third-Party Plugins</DialogControlsSectionHeader>
-        <Field label="Install Plugin from ZIP File" icon={<FaFileArchive style={{ display: 'block' }} />}>
-          <DialogButton onClick={installFromZip}>Browse</DialogButton>
-        </Field>
-        <Field
-          label="Install Plugin from URL"
-          description={<TextField label={'URL'} value={pluginURL} onChange={(e) => setPluginURL(e?.target.value)} />}
-          icon={<FaLink style={{ display: 'block' }} />}
-        >
-          <DialogButton disabled={pluginURL.length == 0} onClick={() => installFromURL(pluginURL)}>
-            Install
-          </DialogButton>
-        </Field>
-      </DialogControlsSection>
-      <DialogControlsSection>
-        <DialogControlsSectionHeader>Other</DialogControlsSectionHeader>
-        <RemoteDebuggingSettings />
-        <Field
-          label="Enable Valve Internal"
-          description={
+      <RemoteDebuggingSettings />
+      <Field
+        label="Enable Valve Internal"
+        description={
+          <span style={{ whiteSpace: 'pre-line' }}>
+            Enables the Valve internal developer menu.{' '}
+            <span style={{ color: 'red' }}>Do not touch anything in this menu unless you know what it does.</span>
+          </span>
+        }
+        icon={<FaSteamSymbol style={{ display: 'block' }} />}
+      >
+        <Toggle
+          value={enableValveInternal}
+          onChange={(toggleValue) => {
+            setEnableValveInternal(toggleValue);
+            setShowValveInternal(toggleValue);
+          }}
+        />
+      </Field>
+      <Field
+        label="Enable React DevTools"
+        description={
+          <>
             <span style={{ whiteSpace: 'pre-line' }}>
-              Enables the Valve internal developer menu.{' '}
-              <span style={{ color: 'red' }}>Do not touch anything in this menu unless you know what it does.</span>
+              Enables connection to a computer running React DevTools. Changing this setting will reload Steam. Set the
+              IP address before enabling.
             </span>
-          }
-          icon={<FaSteamSymbol style={{ display: 'block' }} />}
-        >
-          <Toggle
-            value={enableValveInternal}
-            onChange={(toggleValue) => {
-              setEnableValveInternal(toggleValue);
-              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>
-            </>
-          }
-          icon={<FaReact style={{ display: 'block' }} />}
-        >
-          <Toggle
-            value={reactDevtoolsEnabled}
-            // disabled={reactDevtoolsIP == ''}
-            onChange={(toggleValue) => {
-              setReactDevtoolsEnabled(toggleValue);
-              setShouldConnectToReactDevTools(toggleValue);
-            }}
-          />
-        </Field>
-      </DialogControlsSection>
+            <br />
+            <br />
+            <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>
     </DialogBody>
   );
 }

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

@@ -39,7 +39,7 @@ function PatchNotesModal({ versionInfo, closeModal }: { versionInfo: VerInfo | n
               }}
             >
               <div>
-                <h1>{versionInfo?.all?.[id]?.name || 'Invalid Update Name'}</h1>
+                <h1>{versionInfo?.all?.[id]?.name}</h1>
                 {versionInfo?.all?.[id]?.body ? (
                   <WithSuspense>
                     <MarkdownRenderer onDismiss={closeModal}>{versionInfo.all[id].body}</MarkdownRenderer>

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

@@ -1,5 +1,15 @@
-import { DialogBody, DialogControlsSection, DialogControlsSectionHeader, Field, Toggle } from 'decky-frontend-lib';
+import {
+  DialogBody,
+  DialogButton,
+  DialogControlsSection,
+  DialogControlsSectionHeader,
+  Field,
+  TextField,
+  Toggle,
+} from 'decky-frontend-lib';
+import { useState } from 'react';
 
+import { installFromURL } from '../../../../store';
 import { useDeckyState } from '../../../DeckyState';
 import BranchSelect from './BranchSelect';
 import StoreSelect from './StoreSelect';
@@ -12,6 +22,7 @@ export default function GeneralSettings({
   isDeveloper: boolean;
   setIsDeveloper: (val: boolean) => void;
 }) {
+  const [pluginURL, setPluginURL] = useState('');
   const { versionInfo } = useDeckyState();
 
   return (
@@ -35,6 +46,14 @@ export default function GeneralSettings({
             }}
           />
         </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>

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

@@ -2,116 +2,24 @@ import {
   DialogBody,
   DialogButton,
   DialogControlsSection,
-  GamepadEvent,
+  Focusable,
   Menu,
   MenuItem,
-  ReorderableEntry,
-  ReorderableList,
   showContextMenu,
 } from 'decky-frontend-lib';
-import { useEffect, useState } from 'react';
-import { FaDownload, FaEllipsisH, FaRecycle } from 'react-icons/fa';
+import { useEffect } from 'react';
+import { FaDownload, FaEllipsisH } from 'react-icons/fa';
 
-import { StorePluginVersion, getPluginList, requestPluginInstall } from '../../../../store';
-import { useSetting } from '../../../../utils/hooks/useSetting';
+import { requestPluginInstall } from '../../../../store';
 import { useDeckyState } from '../../../DeckyState';
 
-function labelToName(pluginLabel: string, pluginVersion?: string): string {
-  return pluginVersion ? pluginLabel.substring(0, pluginLabel.indexOf(` - ${pluginVersion}`)) : pluginLabel;
-}
-
-async function reinstallPlugin(pluginName: string, currentVersion?: string) {
-  const serverData = await getPluginList();
-  const remotePlugin = serverData?.find((x) => x.name == pluginName);
-  if (remotePlugin && remotePlugin.versions?.length > 0) {
-    const currentVersionData = remotePlugin.versions.find((version) => version.name == currentVersion);
-    if (currentVersionData) requestPluginInstall(pluginName, currentVersionData);
-  }
-}
-
-function PluginInteractables(props: { entry: ReorderableEntry<PluginData> }) {
-  const data = props.entry.data;
-  let pluginName = labelToName(props.entry.label, data?.version);
-
-  const showCtxMenu = (e: MouseEvent | GamepadEvent) => {
-    showContextMenu(
-      <Menu label="Plugin Actions">
-        <MenuItem onSelected={() => window.DeckyPluginLoader.importPlugin(pluginName, data?.version)}>Reload</MenuItem>
-        <MenuItem onSelected={() => window.DeckyPluginLoader.uninstallPlugin(pluginName)}>Uninstall</MenuItem>
-      </Menu>,
-      e.currentTarget ?? window,
-    );
-  };
-
-  return (
-    <>
-      {data?.update ? (
-        <DialogButton
-          style={{ height: '40px', minWidth: '60px', marginRight: '10px' }}
-          onClick={() => requestPluginInstall(pluginName, data?.update as StorePluginVersion)}
-          onOKButton={() => requestPluginInstall(pluginName, data?.update as StorePluginVersion)}
-        >
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            Update to {data?.update?.name}
-            <FaDownload style={{ paddingLeft: '2rem' }} />
-          </div>
-        </DialogButton>
-      ) : (
-        <DialogButton
-          style={{ height: '40px', minWidth: '60px', marginRight: '10px' }}
-          onClick={() => reinstallPlugin(pluginName, data?.version)}
-          onOKButton={() => reinstallPlugin(pluginName, data?.version)}
-        >
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            Reinstall
-            <FaRecycle style={{ paddingLeft: '5.3rem' }} />
-          </div>
-        </DialogButton>
-      )}
-      <DialogButton
-        style={{ height: '40px', width: '40px', padding: '10px 12px', minWidth: '40px' }}
-        onClick={showCtxMenu}
-        onOKButton={showCtxMenu}
-      >
-        <FaEllipsisH />
-      </DialogButton>
-    </>
-  );
-}
-
-type PluginData = {
-  update?: StorePluginVersion;
-  version?: string;
-};
-
 export default function PluginList() {
-  const { plugins, updates, pluginOrder, setPluginOrder } = useDeckyState();
-  const [_, setPluginOrderSetting] = useSetting<string[]>(
-    'pluginOrder',
-    plugins.map((plugin) => plugin.name),
-  );
+  const { plugins, updates } = useDeckyState();
 
   useEffect(() => {
     window.DeckyPluginLoader.checkPluginUpdates();
   }, []);
 
-  const [pluginEntries, setPluginEntries] = useState<ReorderableEntry<PluginData>[]>([]);
-
-  useEffect(() => {
-    setPluginEntries(
-      plugins.map((plugin) => {
-        return {
-          label: plugin.version ? `${plugin.name} - ${plugin.version}` : plugin.name,
-          data: {
-            update: updates?.get(plugin.name),
-            version: plugin.version,
-          },
-          position: pluginOrder.indexOf(plugin.name),
-        };
-      }),
-    );
-  }, [plugins, updates]);
-
   if (plugins.length === 0) {
     return (
       <div>
@@ -120,17 +28,52 @@ export default function PluginList() {
     );
   }
 
-  function onSave(entries: ReorderableEntry<PluginData>[]) {
-    const newOrder = entries.map((entry) => labelToName(entry.label, entry?.data?.version));
-    console.log(newOrder);
-    setPluginOrder(newOrder);
-    setPluginOrderSetting(newOrder);
-  }
-
   return (
     <DialogBody>
       <DialogControlsSection>
-        <ReorderableList<PluginData> entries={pluginEntries} onSave={onSave} interactables={PluginInteractables} />
+        <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>
   );

frontend/src/index.tsx

@@ -56,7 +56,6 @@ declare global {
       if (!window.DeckyPluginLoader.hasPlugin(plugin.name))
         window.DeckyPluginLoader?.importPlugin(plugin.name, plugin.version);
     }
-
     window.DeckyPluginLoader.checkPluginUpdates();
   };
 

frontend/src/plugin-loader.tsx

@@ -169,12 +169,6 @@ class PluginLoader extends Logger {
     getSetting('developer.enabled', false).then((val) => {
       if (val) import('./developer').then((developer) => developer.startup());
     });
-
-    //* Grab and set plugin order
-    getSetting<string[]>('pluginOrder', []).then((pluginOrder) => {
-      console.log(pluginOrder);
-      this.deckyState.setPluginOrder(pluginOrder);
-    });
   }
 
   public deinit() {

plugin/decky_plugin.py

@@ -38,6 +38,14 @@ It would be `root` if `root` was specified in the plugin's flags otherwise the u
 e.g.: `deck`
 """
 
+USER_ID: int = int(os.getenv("USER_ID", default="-1"))
+"""
+The effective UID running the process.
+Environment variable: `USER_ID`.
+It would be `0` if `root` was specified in the plugin's flags otherwise the id of the user whose home decky resides in.
+e.g.: `1000`
+"""
+
 DECKY_VERSION: str = os.getenv("DECKY_VERSION", default="")
 """
 The version of the decky loader.
@@ -52,6 +60,13 @@ Environment variable: `DECKY_USER`.
 e.g.: `deck`
 """
 
+DECKY_USER_ID: int = int(os.getenv("DECKY_USER_ID", default="-1"))
+"""
+The UID of the user whose home decky resides in.
+Environment variable: `DECKY_USER_ID`.
+e.g.: `1000`
+"""
+
 DECKY_USER_HOME: str = os.getenv("DECKY_USER_HOME", default="")
 """
 The home of the user where decky resides in.

plugin/decky_plugin.pyi

@@ -36,6 +36,14 @@ It would be `root` if `root` was specified in the plugin's flags otherwise the u
 e.g.: `deck`
 """
 
+USER_ID: int
+"""
+The effective UID running the process.
+Environment variable: `UID`.
+It would be `0` if `root` was specified in the plugin's flags otherwise the id of the user whose home decky resides in.
+e.g.: `1000`
+"""
+
 DECKY_VERSION: str
 """
 The version of the decky loader.
@@ -50,6 +58,13 @@ Environment variable: `DECKY_USER`.
 e.g.: `deck`
 """
 
+DECKY_USER_ID: int
+"""
+The UID of the user whose home decky resides in.
+Environment variable: `DECKY_USER_ID`.
+e.g.: `1000`
+"""
+
 DECKY_USER_HOME: str
 """
 The home of the user where decky resides in.