fix(developer): add back valve internal on beta

look i was tired when writing yesterday's fix okay

.github/workflows/build-win.yml

@@ -44,10 +44,10 @@ jobs:
       run: pnpm run build
 
     - name: Build Python Backend 🛠️
-      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/src/legacy;/src/legacy" --add-data "./plugin/*;/" --hidden-import=sqlite3 ./backend/main.py
+      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/src/legacy;/src/legacy" --add-data "./plugin;/plugin" --hidden-import=logging.handlers --hidden-import=sqlite3 ./backend/main.py
 
     - name: Build Python Backend (noconsole) 🛠️
-      run: pyinstaller --noconfirm --noconsole --onefile --name "PluginLoader_noconsole" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/src/legacy;/src/legacy" --add-data "./plugin/*;/" --hidden-import=sqlite3 ./backend/main.py
+      run: pyinstaller --noconfirm --noconsole --onefile --name "PluginLoader_noconsole" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/src/legacy;/src/legacy" --add-data "./plugin;/plugin" --hidden-import=logging.handlers --hidden-import=sqlite3 ./backend/main.py
         
     - name: Upload package artifact ⬆️
       uses: actions/upload-artifact@v3

.github/workflows/build.yml

@@ -87,7 +87,7 @@ jobs:
       run: pnpm run build
 
     - name: Build Python Backend 🛠️
-      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/static --add-data ./backend/locales:/locales --add-data ./backend/src/legacy:/src/legacy --add-data ./plugin/*:/ --hidden-import=sqlite3 ./backend/main.py
+      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/static --add-data ./backend/locales:/locales --add-data ./backend/src/legacy:/src/legacy --add-data ./plugin:/plugin --hidden-import=logging.handlers --hidden-import=sqlite3 ./backend/main.py
         
     - name: Upload package artifact ⬆️
       if: ${{ !env.ACT }}

backend/requirements.txt

@@ -1,4 +1,4 @@
-aiohttp==3.8.4
+aiohttp==3.8.5
 aiohttp-jinja2==1.5.1
 aiohttp_cors==0.7.0
 watchdog==2.1.7

backend/src/browser.py

@@ -186,6 +186,18 @@ class PluginBrowser:
                 else:
                     logger.fatal(f"Could not fetch from URL. {await res.text()}")
 
+            storeUrl = ""
+            match self.settings.getSetting("store", 0):
+                case 0: storeUrl = "https://plugins.deckbrew.xyz/plugins" # default
+                case 1: storeUrl = "https://testing.deckbrew.xyz/plugins" # testing
+                case 2: storeUrl = self.settings.getSetting("store-url", "https://plugins.deckbrew.xyz/plugins")  # custom
+                case _: storeUrl = "https://plugins.deckbrew.xyz/plugins"
+            logger.info(f"Incrementing installs for {name} from URL {storeUrl} (version {version})")
+            async with ClientSession() as client:
+                res = await client.post(storeUrl+f"/{name}/versions/{version}/increment?isUpdate={isInstalled}", ssl=get_ssl_context())
+                if res.status != 200:
+                    logger.error(f"Server did not accept install count increment request. code: {res.status}")
+
         # Check to make sure we got the file
         if res_zip is None:
             logger.fatal(f"Could not fetch {artifact}")

backend/src/localplatformlinux.py

@@ -58,8 +58,22 @@ def chown(path : str,  user : UserType = UserType.HOST_USER, recursive : bool =
 def chmod(path : str, permissions : int, recursive : bool = True) -> bool:
     if _get_effective_user_id() != 0:
         return True
-    result = call(["chmod", "-R", str(permissions), path] if recursive else ["chmod", str(permissions), path])
-    return result == 0
+
+    try:
+        octal_permissions = int(str(permissions), 8)
+
+        if recursive:
+            for root, dirs, files in os.walk(path):  
+                for d in dirs:  
+                    os.chmod(os.path.join(root, d), octal_permissions)
+                for d in files:
+                    os.chmod(os.path.join(root, d), octal_permissions)
+
+        os.chmod(path, octal_permissions)
+    except:
+        return False
+
+    return True
 
 def folder_owner(path : str) -> UserType|None:
     user_owner = _get_user_owner(path)
@@ -125,11 +139,19 @@ async def service_restart(service_name : str) -> bool:
     return res.returncode == 0
 
 async def service_stop(service_name : str) -> bool:
+    if not await service_active(service_name):
+        # Service isn't running. pretend we stopped it
+        return True
+
     cmd = ["systemctl", "stop", service_name]
     res = run(cmd, stdout=PIPE, stderr=STDOUT)
     return res.returncode == 0
 
 async def service_start(service_name : str) -> bool:
+    if await service_active(service_name):
+        # Service is running. pretend we started it
+        return True
+
     cmd = ["systemctl", "start", service_name]
     res = run(cmd, stdout=PIPE, stderr=STDOUT)
     return res.returncode == 0

backend/src/main.py

@@ -182,7 +182,7 @@ def main():
         logger.warning(f"decky is running as an unprivileged user, this is not officially supported and may cause issues")
 
     # Append the loader's plugin path to the recognized python paths
-    sys.path.append(path.join(path.dirname(__file__), "plugin"))
+    sys.path.append(path.join(path.dirname(__file__), "..", "plugin"))
 
     # Append the system and user python paths
     sys.path.extend(get_system_pythonpaths())

backend/src/plugin.py

@@ -7,7 +7,7 @@ from logging import getLogger
 from traceback import format_exc
 from os import path, environ
 from signal import SIGINT, signal
-from sys import exit, path as syspath
+from sys import exit, path as syspath, modules as sysmodules
 from typing import Any, Dict
 from .localsocket import LocalSocket
 from .localplatform import setgid, setuid, get_username, get_home_path
@@ -78,6 +78,11 @@ class PluginWrapper:
 
             # append the plugin's `py_modules` to the recognized python paths
             syspath.append(path.join(environ["DECKY_PLUGIN_DIR"], "py_modules"))
+            
+            #TODO: FIX IN A LESS CURSED WAY
+            keys = [key.replace("src.", "") for key in sysmodules if key.startswith("src.")]
+            for key in keys:
+                sysmodules[key] = sysmodules["src"].__dict__[key]
 
             spec = spec_from_file_location("_", self.file)
             assert spec is not None

contrib/deck.sh

@@ -1,335 +0,0 @@
-#!/bin/bash
-
-## Before using this script, enable sshd on the deck and setup an sshd key between the deck and your dev in sshd_config.
-## This script defaults to port 22 unless otherwise specified, and cannot run without a sudo password or LAN IP.
-## You will need to specify the path to the ssh key if using key connection exclusively.
-
-## TODO: document latest changes to wiki
-
-## Pre-parse arugments for ease of use
-CLONEFOLDER=${1:-""}
-INSTALLFOLDER=${2:-""}
-DECKIP=${3:-""}
-SSHPORT=${4:-""}
-PASSWORD=${5:-""}
-SSHKEYLOC=${6:-""}
-LOADERBRANCH=${7:-""}
-LIBRARYBRANCH=${8:-""}
-TEMPLATEBRANCH=${9:-""}
-LATEST=${10:-""}
-
-## gather options into an array 
-OPTIONSARRAY=("$CLONEFOLDER" "$INSTALLFOLDER" "$DECKIP" "$SSHPORT" "$PASSWORD" "$SSHKEYLOC" "$LOADERBRANCH" "$LIBRARYBRANCH" "$TEMPLATEBRANCH" "$LATEST")
-
-## iterate through options array to check their presence
-count=0
-for OPTION in ${OPTIONSARRAY[@]}; do
-    ! [[ "$OPTION" == "" ]] && count=$(($count+1))
-    # printf "OPTION=$OPTION\n"
-done
-
-setfolder() {
-    if [[ "$2" == "clone" ]]; then
-        local ACTION="clone"
-        local DEFAULT="git"
-    elif [[ "$2" == "install" ]]; then
-        local ACTION="install"
-        local DEFAULT="dev"
-    fi
-    
-    if [[ "$ACTION" == "clone" ]]; then
-        printf "Enter the directory in /home/user/ to ${ACTION} to.\n"
-        printf "The ${ACTION} directory would be: ${HOME}/${DEFAULT}\n"
-        read -p "Enter your ${ACTION} directory: " CLONEFOLDER
-        if ! [[ "$CLONEFOLDER" =~ ^[[:alnum:]]+$ ]]; then
-            printf "Folder name not provided. Using default, '${DEFAULT}'.\n"
-            CLONEFOLDER="${DEFAULT}"
-        fi
-    elif [[ "$ACTION" == "install" ]]; then
-        printf "Enter the directory in /home/deck/homebrew to ${ACTION} pluginloader to.\n"
-        printf "The ${ACTION} directory would be: /home/deck/homebrew/${DEFAULT}/pluginloader\n"
-        printf "It is highly recommended that you use the default folder path seen above, just press enter at the next prompt.\n"
-        read -p "Enter your ${ACTION} directory: " INSTALLFOLDER
-        if ! [[ "$INSTALLFOLDER" =~ ^[[:alnum:]]+$ ]]; then
-            printf "Folder name not provided. Using default, '${DEFAULT}'.\n"
-            INSTALLFOLDER="${DEFAULT}"
-        fi
-    else
-        printf "Folder type could not be determined, exiting\n"
-        exit 1
-    fi
-}
-
-checkdeckip() {
-    ### check that ip is provided
-    if [[ "$1" == "" ]]; then
-        printf "An ip address must be provided, exiting.\n"
-        exit 1
-    fi
-
-    ### check to make sure it's a potentially valid ipv4 address
-    if ! [[ $1 =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-        printf "A valid ip address must be provided, exiting.\n"
-        exit 1
-    fi
-}
-
-checksshport() {
-    ### check to make sure a port was specified
-    if [[ "$1" == "" ]]; then
-        printf "ssh port not provided. Using default, '22'.\n"
-        SSHPORT="22"
-    fi
-
-    ### check for valid ssh port
-    if [[ $1 -le 0 ]]; then
-        printf "A valid ssh port must be provided, exiting.\n"
-        exit 1
-    fi
-}
-
-checksshkey() {
-    ### check if ssh key is present at location provided
-    if [[ "$1" == "" ]]; then
-        SSHKEYLOC="$HOME/.ssh/id_rsa"
-        printf "ssh key was not provided. Defaulting to $SSHKEYLOC if it exists.\n"
-    fi
-
-    ### check if sshkey is present at location
-    if ! [[ -e "$1" ]]; then
-        SSHKEYLOC=""
-        printf "ssh key does not exist. This script will use password authentication.\n"
-    fi
-}
-
-checkpassword() {
-    ### check to make sure a password for 'deck' was specified
-    if [[ "$1" == "" ]]; then
-        printf "Remote deck user password was not provided, exiting.\n"
-        exit 1
-    fi
-}
-
-clonefromto() {
-    # printf "repo=$1\n"
-    # printf "outdir=$2\n"
-    # printf "branch=$3\n"
-    printf "Repository: $1\n"
-    git clone $1 $2 &> '/dev/null'
-    CODE=$?
-    # printf "CODE=${CODE}"
-    if [[ $CODE -eq 128 ]]; then
-        cd $2
-        git fetch --all &> '/dev/null'
-    fi
-    if [[ -z $3 ]]; then
-        printf "Enter the desired branch for repository "$1" :\n"
-        local OUT="$(git branch -r | sed '/\/HEAD/d')"
-        # $OUT="$($OUT > )"
-        printf "$OUT\nbranch: "
-        read BRANCH
-    else
-        printf "on branch: $3\n"
-        BRANCH="$3"
-    fi
-    if ! [[ -z ${BRANCH} ]]; then
-        git checkout $BRANCH &> '/dev/null'
-    fi
-    if [[ ${LATEST} == "true" ]]; then
-        git pull --all
-    elif [[ ${LATEST} == "true" ]]; then
-        printf "Assuming user not pulling latest commits.\n"
-    else
-        printf "Pull latest commits? (y/N): "
-        read PULL
-        case ${PULL:0:1} in
-            y|Y )
-                printf "Pulling latest commits.\n"
-                git pull --all
-            ;;
-            * )
-                printf "Not pulling latest commits.\n"
-            ;;
-        esac
-        if ! [[ "$PULL" =~ ^[[:alnum:]]+$ ]]; then
-            printf "Assuming user not pulling latest commits.\n"
-        fi
-    fi
-}
-
-pnpmtransbundle() {
-    cd $1
-    if [[ "$2" == "library" ]]; then
-        npm install --quiet &> '/dev/null'
-        npm run build --quiet &> '/dev/null'
-        sudo npm link --quiet &> '/dev/null'
-    elif [[ "$2" == "frontend" ]]; then
-        pnpm i &> '/dev/null'
-        pnpm run build &> '/dev/null'
-    elif [[ "$2" == "template" ]]; then
-        pnpm i &> '/dev/null'
-        pnpm run build &> '/dev/null'
-    fi
-}
-
-if ! [[ $count -gt 9 ]] ; then
-    printf "Installing Steam Deck Plugin Loader contributor/developer (for Steam Deck)...\n"
-
-    printf "THIS SCRIPT ASSUMES YOU ARE RUNNING IT ON A PC, NOT THE DECK!
-    Not planning to contribute to or develop for PluginLoader?
-    If so, you should not be using this script.\n
-    If you have a release/nightly installed this script will disable it.\n"
-
-    printf "This script requires you to have nodejs installed. (If nodejs doesn't bundle npm on your OS/distro, then npm is required as well).\n"
-fi
-
-if ! [[ $count -gt 0 ]] ; then
-    read -p "Press any key to continue"
-fi
-
-printf "\n"
-
-## User chooses preffered clone & install directories
-
-if [[ "$CLONEFOLDER" == "" ]]; then
-    setfolder "$CLONEFOLDER" "clone"
-fi
-
-if [[ "$INSTALLFOLDER" == "" ]]; then
-    setfolder "$INSTALLFOLDER" "install"
-fi
-
-CLONEDIR="$HOME/$CLONEFOLDER"
-INSTALLDIR="/home/deck/homebrew/$INSTALLFOLDER"
-
-## Input ip address, port, password and sshkey
-
-### DECKIP already been parsed?
-if [[ "$DECKIP" == "" ]]; then
-    ### get ip address of deck from user
-    read -p "Enter the ip address of your Steam Deck: " DECKIP
-fi
-
-### validate DECKIP
-checkdeckip "$DECKIP"
-
-### SSHPORT already been parsed?
-if [[ "$SSHPORT" == "" ]]; then
-    ### get ssh port from user
-    read -p "Enter the ssh port of your Steam Deck: " SSHPORT
-fi
-
-### validate SSHPORT
-checksshport "$SSHPORT"
-
-### PASSWORD already been parsed?
-if [[ "$PASSWORD" == "" ]]; then
-    ### prompt the user for their deck's password
-    printf "Enter the password for the Steam Deck user 'deck' : "
-    read -s PASSWORD
-    printf "\n"
-fi
-
-### validate PASSWORD
-checkpassword "$PASSWORD"
-
-### SSHKEYLOC already been parsed?
-if [[ "$SSHKEYLOC" == "" ]]; then
-    ### prompt the user for their ssh key
-    read -p "Enter the directory for your ssh key, for ease of connection : " SSHKEYLOC
-fi
-
-### validate SSHKEYLOC
-checksshkey "$SSHKEYLOC"
-
-if [[ "$SSHKEYLOC" == "" ]]; then
-    IDENINVOC=""
-else
-    IDENINVOC="-i ${SSHKEYLOC}"
-fi
-
-## Create folder structure
-
-printf "Cloning git repositories.\n"
-
-mkdir -p ${CLONEDIR} &> '/dev/null'
-
-### remove folders just in case
-# rm -r ${CLONEDIR}/pluginloader
-# rm -r ${CLONEDIR}/pluginlibrary
-# rm -r ${CLONEDIR}/plugintemplate
-
-clonefromto "https://github.com/SteamDeckHomebrew/PluginLoader" ${CLONEDIR}/pluginloader "$LOADERBRANCH"
-
-clonefromto "https://github.com/SteamDeckHomebrew/decky-frontend-lib" ${CLONEDIR}/pluginlibrary "$LIBRARYBRANCH"
-
-clonefromto "https://github.com/SteamDeckHomebrew/decky-plugin-template" ${CLONEDIR}/plugintemplate "$TEMPLATEBRANCH"
-
-## install python dependencies to deck
-
-printf "\nInstalling python dependencies.\n"
-
-rsync -azp --rsh="ssh -p $SSHPORT $IDENINVOC" ${CLONEDIR}/pluginloader/requirements.txt deck@${DECKIP}:${INSTALLDIR}/pluginloader/requirements.txt &> '/dev/null'
-
-ssh deck@${DECKIP} -p ${SSHPORT} ${IDENINVOC} "python -m ensurepip && python -m pip install --upgrade pip && python -m pip install --upgrade setuptools && python -m pip install -r $INSTALLDIR/pluginloader/requirements.txt" &> '/dev/null'
-
-## Transpile and bundle typescript
-
-[ "$UID" -eq 0 ] || printf "Input password to proceed with install.\n"
-
-sudo npm install -g pnpm &> '/dev/null'
-
-type pnpm &> '/dev/null'
-
-PNPMLIVES=$?
-
-if ! [[ "$PNPMLIVES" -eq 0 ]]; then
-    printf "pnpm does not appear to be installed, exiting.\n"
-    exit 1
-fi
-
-printf "Transpiling and bundling typescript.\n"
-
-pnpmtransbundle ${CLONEDIR}/pluginlibrary/ "library"
-
-pnpmtransbundle ${CLONEDIR}/pluginloader/frontend "frontend"
-
-pnpmtransbundle ${CLONEDIR}/plugintemplate "template"
-
-## Transfer relevant files to deck
-
-printf "Copying relevant files to install directory\n\n"
-
-ssh deck@${DECKIP} -p ${SSHPORT} ${IDENINVOC} "mkdir -p $INSTALLDIR/pluginloader && mkdir -p $INSTALLDIR/plugins" &> '/dev/null'
-
-### copy files for PluginLoader
-rsync -avzp --rsh="ssh -p $SSHPORT $IDENINVOC" --exclude='.git/' --exclude='.github/' --exclude='.vscode/' --exclude='frontend/' --exclude='dist/' --exclude='contrib/' --exclude='*.log' --exclude='requirements.txt' --exclude='backend/__pycache__/' --exclude='.gitignore' --delete ${CLONEDIR}/pluginloader/* deck@${DECKIP}:${INSTALLDIR}/pluginloader &> '/dev/null'
-
-if ! [[ $? -eq 0 ]]; then
-    printf "Error occurred when copying $CLONEDIR/pluginloader/ to $INSTALLDIR/pluginloader/\n"
-    printf "Check that your Steam Deck is active, ssh is enabled and running and is accepting connections.\n"
-    exit 1
-fi
-
-### copy files for plugin template
-rsync -avzp --rsh="ssh -p $SSHPORT $IDENINVOC" --exclude='.git/' --exclude='.github/' --exclude='.vscode/' --exclude='node_modules/' --exclude='src/' --exclude='*.log' --exclude='.gitignore' --exclude='pnpm-lock.yaml' --exclude='package.json' --exclude='rollup.config.js' --exclude='tsconfig.json' --delete ${CLONEDIR}/plugintemplate deck@${DECKIP}:${INSTALLDIR}/plugins &> '/dev/null'
-if ! [[ $? -eq 0 ]]; then
-    printf "Error occurred when copying $CLONEDIR/plugintemplate to $INSTALLDIR/plugins\n"
-    exit 1
-fi
-
-## TODO: direct contributors to wiki for this info?
-
-printf "Run these commands to deploy your local changes to the deck:\n"
-printf "'rsync -avzp --mkpath --rsh=""\"ssh -p $SSHPORT $IDENINVOC\""" --exclude='.git/' --exclude='.github/' --exclude='.vscode/' --exclude='frontend/' --exclude='dist/' --exclude='contrib/' --exclude='*.log' --exclude='requirements.txt' --exclude='backend/__pycache__/' --exclude='.gitignore' --delete $CLONEDIR/pluginloader/* deck@$DECKIP:$INSTALLDIR/pluginloader/'\n"
-printf "'rsync -avzp --mkpath --rsh=""\"ssh -p $SSHPORT $IDENINVOC\""" --exclude='.git/' --exclude='.github/' --exclude='.vscode/' --exclude='node_modules/' --exclude='src/' --exclude='*.log' --exclude='.gitignore' --exclude='package-lock.json' --delete $CLONEDIR/pluginname deck@$DECKIP:$INSTALLDIR/plugins'\n\n"
-
-printf "Run in console or in a script this command to run your development version:\n'ssh deck@$DECKIP -p $SSHPORT $IDENINVOC 'export PLUGIN_PATH=$INSTALLDIR/plugins; export CHOWN_PLUGIN_PATH=0; echo 'steam' | sudo -SE python3 $INSTALLDIR/pluginloader/backend/main.py'\n"
-
-## Disable Releases versions if they exist
-
-### ssh into deck and disable PluginLoader release/nightly service
-printf "Connecting via ssh to disable any PluginLoader release versions.\n"
-printf "Script will exit after this. All done!\n"
-
-ssh deck@${DECKIP} -p ${SSHPORT} ${IDENINVOC} "printf $PASSWORD | sudo -S systemctl disable --now plugin_loader; echo $?" &> '/dev/null'

contrib/nodeck.sh

@@ -1,168 +0,0 @@
-#!/bin/bash
-
-## Pre-parse arugments for ease of use
-CLONEFOLDER=${1:-""}
-LOADERBRANCH=${2:-""}
-LIBRARYBRANCH=${3:-""}
-TEMPLATEBRANCH=${4:-""}
-LATEST=${5:-""}
-
-## gather options into an array 
-OPTIONSARRAY=("$CLONEFOLDER" "$LOADERBRANCH" "$LIBRARYBRANCH" "$TEMPLATEBRANCH" "$LATEST")
-
-## iterate through options array to check their presence
-count=0
-for OPTION in ${OPTIONSARRAY[@]}; do
-    ! [[ "$OPTION" == "" ]] && count=$(($count+1))
-    # printf "OPTION=$OPTION\n"
-done
-
-clonefromto() {
-    # printf "repo=$1\n"
-    # printf "outdir=$2\n"
-    # printf "branch=$3\n"
-    printf "Repository: $1\n"
-    git clone $1 $2 &> '/dev/null'
-    CODE=$?
-    # printf "CODE=${CODE}"
-    if [[ $CODE -eq 128 ]]; then
-        cd $2
-        git fetch --all &> '/dev/null'
-    fi
-    if [[ -z $3 ]]; then
-        printf "Enter the desired branch for repository "$1" :\n"
-        local OUT="$(git branch -r | sed '/\/HEAD/d')"
-        # $OUT="$($OUT > )"
-        printf "$OUT\nbranch: "
-        read BRANCH
-    else
-        printf "on branch: $3\n"
-        BRANCH="$3"
-    fi
-    if ! [[ -z ${BRANCH} ]]; then
-        git checkout $BRANCH &> '/dev/null'
-    fi
-    if [[ ${LATEST} == "true" ]]; then
-        git pull --all
-    elif [[ ${LATEST} == "true" ]]; then
-        printf "Assuming user not pulling latest commits.\n"
-    else
-        printf "Pull latest commits? (y/N): "
-        read PULL
-        case ${PULL:0:1} in
-            y|Y )
-                printf "Pulling latest commits.\n"
-                git pull --all
-            ;;
-            * )
-                printf "Not pulling latest commits.\n"
-            ;;
-        esac
-        if ! [[ "$PULL" =~ ^[[:alnum:]]+$ ]]; then
-            printf "Assuming user not pulling latest commits.\n"
-        fi
-    fi
-}
-
-pnpmtransbundle() {
-    cd $1
-    if [[ "$2" == "library" ]]; then
-        npm install --quiet &> '/dev/null'
-        npm run build --quiet &> '/dev/null'
-        sudo npm link --quiet &> '/dev/null'
-    elif [[ "$2" == "frontend" ]]; then
-        pnpm i &> '/dev/null'
-        pnpm run build &> '/dev/null'
-    elif [[ "$2" == "template" ]]; then
-        pnpm i &> '/dev/null'
-        pnpm run build &> '/dev/null'
-    fi
-}
-
-
-if ! [[ $count -gt 4 ]] ; then
-    printf "Installing Steam Deck Plugin Loader contributor/developer (no Steam Deck)..."
-
-    printf "\nTHIS SCRIPT ASSUMES YOU ARE RUNNING IT ON A PC, NOT THE DECK!
-    Not planning to contribute to or develop for PluginLoader?
-    Then you should not be using this script.\n"
-
-    printf "\nThis script requires you to have nodejs installed. (If nodejs doesn't bundle npm on your OS/distro, then npm is required as well).\n"
-fi
-
-if ! [[ $count -gt 0 ]] ; then
-    read -p "Press any key to continue"
-fi
-
-printf "\n"
-
-if [[ "$CLONEFOLDER" == "" ]]; then
-    printf "Enter the directory in /home/user/ to clone to.\n"
-    printf "The clone directory would be: ${HOME}/git \n"
-    read -p "Enter your clone directory: " CLONEFOLDER
-    if ! [[ "$CLONEFOLDER" =~ ^[[:alnum:]]+$ ]]; then
-        printf "Folder name not provided. Using default, '${DEFAULT}'.\n"
-        CLONEFOLDER="${DEFAULT}"
-    fi
-fi
-
-CLONEDIR="$HOME/$CLONEFOLDER"
-
-## Create folder structure
-
-printf "Cloning git repositories.\n"
-
-mkdir -p ${CLONEDIR} &> '/dev/null'
-
-### remove folders just in case
-# rm -r ${CLONEDIR}/pluginloader
-# rm -r ${CLONEDIR}/pluginlibrary
-# rm -r ${CLONEDIR}/plugintemplate
-
-clonefromto "https://github.com/SteamDeckHomebrew/PluginLoader" ${CLONEDIR}/pluginloader "$LOADERBRANCH"
-
-clonefromto "https://github.com/SteamDeckHomebrew/decky-frontend-lib" ${CLONEDIR}/pluginlibrary "$LIBRARYBRANCH"
-
-clonefromto "https://github.com/SteamDeckHomebrew/decky-plugin-template" ${CLONEDIR}/plugintemplate "$TEMPLATEBRANCH"
-
-## install python dependencies (maybe use venv?)
-
-python -m pip install -r ${CLONEDIR}/pluginloader/requirements.txt &> '/dev/null'
-
-## Transpile and bundle typescript
-
-[ "$UID" -eq 0 ] || printf "Input password to proceed with install.\n"
-
-type npm &> '/dev/null'
-
-NPMLIVES=$?
-
-if ! [[ "$PNPMLIVES" -eq 0 ]]; then
-    printf "npm does not appear to be installed, exiting.\n"
-    exit 1
-fi
-
-sudo npm install -g pnpm &> '/dev/null'
-
-type pnpm &> '/dev/null'
-
-PNPMLIVES=$?
-
-if ! [[ "$PNPMLIVES" -eq 0 ]]; then
-    printf "pnpm does not appear to be installed, exiting.\n"
-    exit 1
-fi
-
-printf "Transpiling and bundling typescript.\n"
-
-pnpmtransbundle ${CLONEDIR}/pluginlibrary/ "library"
-
-pnpmtransbundle ${CLONEDIR}/pluginloader/frontend "frontend"
-
-pnpmtransbundle ${CLONEDIR}/plugintemplate "template"
-
-printf "Plugin Loader is located at '${CLONEDIR}/pluginloader/'.\n"
-
-printf "Run in console or in a script these commands to run your development version:\n'export PLUGIN_PATH=${CLONEDIR}/plugins; export CHOWN_PLUGIN_PATH=0; sudo -E python3 ${CLONEDIR}/pluginloader/backend/main.py'\n"
-
-printf "All done!\n"

frontend/package.json

@@ -44,7 +44,7 @@
     }
   },
   "dependencies": {
-    "decky-frontend-lib": "3.21.1",
+    "decky-frontend-lib": "3.24.1",
     "filesize": "^10.0.7",
     "i18next": "^23.2.1",
     "i18next-http-backend": "^2.2.1",

frontend/pnpm-lock.yaml

@@ -6,8 +6,8 @@ settings:
 
 dependencies:
   decky-frontend-lib:
-    specifier: 3.21.1
-    version: 3.21.1
+    specifier: 3.24.1
+    version: 3.24.1
   filesize:
     specifier: ^10.0.7
     version: 10.0.7
@@ -1482,8 +1482,8 @@ packages:
     dependencies:
       ms: 2.1.2
 
-  /decky-frontend-lib@3.21.1:
-    resolution: {integrity: sha512-30605ET9qqZ6St6I9WmMmLGgSrTIdMwo7xy85+lRaF1miUd2icOGEJjwnbVcZDdkal+1fJ3tNEDXlchVfG4TrA==}
+  /decky-frontend-lib@3.24.1:
+    resolution: {integrity: sha512-VGxLTPetxx/pQVC+t8odTHrwQAh7uy4bO2Od2gGWSTfmUUoxtAcEtiXGyE9mKsoD6t7QNHrGvgXn78sf2i/IeQ==}
     dev: false
 
   /decode-named-character-reference@1.0.2:
@@ -1852,8 +1852,8 @@ packages:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
     dev: true
 
-  /fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+  /fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
@@ -3477,7 +3477,7 @@ packages:
     engines: {node: '>=10.0.0'}
     hasBin: true
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     dev: true
 
   /rsvp@3.2.1:

frontend/src/components/PluginView.tsx

@@ -1,12 +1,4 @@
-import {
-  ButtonItem,
-  Focusable,
-  PanelSection,
-  PanelSectionRow,
-  joinClassNames,
-  scrollClasses,
-  staticClasses,
-} from 'decky-frontend-lib';
+import { ButtonItem, Focusable, PanelSection, PanelSectionRow } from 'decky-frontend-lib';
 import { VFC, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { FaEyeSlash } from 'react-icons/fa';
@@ -36,10 +28,7 @@ const PluginView: VFC = () => {
     return (
       <Focusable onCancelButton={closeActivePlugin}>
         <TitleView />
-        <div
-          className={joinClassNames(staticClasses.TabGroupPanel, scrollClasses.ScrollPanel, scrollClasses.ScrollY)}
-          style={{ height: '100%' }}
-        >
+        <div style={{ height: '100%', paddingTop: '16px' }}>
           {(visible || activePlugin.alwaysRender) && activePlugin.content}
         </div>
       </Focusable>
@@ -48,7 +37,11 @@ const PluginView: VFC = () => {
   return (
     <>
       <TitleView />
-      <div className={joinClassNames(staticClasses.TabGroupPanel, scrollClasses.ScrollPanel, scrollClasses.ScrollY)}>
+      <div
+        style={{
+          paddingTop: '16px',
+        }}
+      >
         <PanelSection>
           {pluginList
             .filter((p) => p.content)

frontend/src/components/TitleView.tsx

@@ -10,6 +10,8 @@ const titleStyles: CSSProperties = {
   display: 'flex',
   paddingTop: '3px',
   paddingRight: '16px',
+  position: 'sticky',
+  top: '0px',
 };
 
 const TitleView: VFC = () => {

frontend/src/developer.tsx

@@ -1,4 +1,4 @@
-import { findModuleChild, sleep } from 'decky-frontend-lib';
+import { sleep } from 'decky-frontend-lib';
 import { FaReact } from 'react-icons/fa';
 
 import Logger from './logger';
@@ -9,32 +9,30 @@ const logger = new Logger('DeveloperMode');
 
 let removeSettingsObserver: () => void = () => {};
 
-export async function setShowValveInternal(show: boolean) {
-  let settingsMod: any;
-  while (!settingsMod) {
-    settingsMod = findModuleChild((m) => {
-      if (typeof m !== 'object') return undefined;
-      for (let prop in m) {
-        if (typeof m[prop]?.settings?.bIsValveEmail !== 'undefined') return m[prop];
-      }
-    });
-    if (!settingsMod) {
-      logger.debug('[ValveInternal] waiting for settingsMod');
-      await sleep(1000);
-    }
+declare global {
+  interface Window {
+    settingsStore: any;
   }
+}
 
+export async function setShowValveInternal(show: boolean) {
   if (show) {
-    removeSettingsObserver = settingsMod[
-      Object.getOwnPropertySymbols(settingsMod).find((x) => x.toString() == 'Symbol(mobx administration)') as any
-    ].observe((e: any) => {
+    const mobx =
+      window.settingsStore[
+        Object.getOwnPropertySymbols(window.settingsStore).find(
+          (x) => x.toString() == 'Symbol(mobx administration)',
+        ) as any
+      ];
+
+    removeSettingsObserver = (mobx.observe_ || mobx.observe).call(mobx, (e: any) => {
       e.newValue.bIsValveEmail = true;
     });
-    settingsMod.m_Settings.bIsValveEmail = true;
+
+    window.settingsStore.m_Settings.bIsValveEmail = true;
     logger.log('Enabled Valve Internal menu');
   } else {
     removeSettingsObserver();
-    settingsMod.m_Settings.bIsValveEmail = false;
+    window.settingsStore.m_Settings.bIsValveEmail = false;
     logger.log('Disabled Valve Internal menu');
   }
 }

frontend/src/tabs-hook.old.tsx

@@ -1,5 +1,5 @@
 // TabsHook for versions before the Desktop merge
-import { Patch, afterPatch, sleep } from 'decky-frontend-lib';
+import { Patch, afterPatch, getReactRoot, sleep } from 'decky-frontend-lib';
 import { memo } from 'react';
 
 import NewTabsHook from './tabs-hook';
@@ -35,7 +35,7 @@ class TabsHook extends NewTabsHook {
 
   init() {
     const self = this;
-    const tree = (document.getElementById('root') as any)._reactRootContainer._internalRoot.current;
+    const tree = getReactRoot(document.getElementById('root') as any);
     let scrollRoot: any;
     async function findScrollRoot(currentNode: any, iters: number): Promise<any> {
       if (iters >= 30) {

frontend/src/tabs-hook.tsx

@@ -1,5 +1,5 @@
 // TabsHook for versions after the Desktop merge
-import { Patch, QuickAccessTab, afterPatch, findInReactTree, sleep } from 'decky-frontend-lib';
+import { Patch, QuickAccessTab, afterPatch, findInReactTree, getReactRoot, sleep } from 'decky-frontend-lib';
 
 import { QuickAccessVisibleStateProvider } from './components/QuickAccessVisibleState';
 import Logger from './logger';
@@ -32,11 +32,11 @@ class TabsHook extends Logger {
   }
 
   init() {
-    const tree = (document.getElementById('root') as any)._reactRootContainer._internalRoot.current;
+    const tree = getReactRoot(document.getElementById('root') as any);
     let qAMRoot: any;
     const findQAMRoot = (currentNode: any, iters: number): any => {
-      if (iters >= 65) {
-        // currently 45
+      if (iters >= 80) {
+        // currently 67
         return null;
       }
       if (

frontend/src/toaster.tsx

@@ -1,4 +1,13 @@
-import { Module, Patch, ToastData, afterPatch, findInReactTree, findModuleChild, sleep } from 'decky-frontend-lib';
+import {
+  Module,
+  Patch,
+  ToastData,
+  afterPatch,
+  findInReactTree,
+  findModuleChild,
+  getReactRoot,
+  sleep,
+} from 'decky-frontend-lib';
 import { ReactNode } from 'react';
 
 import Toast from './components/Toast';
@@ -38,10 +47,10 @@ class Toaster extends Logger {
     //   </DeckyToasterStateContextProvider>
     // ));
     let instance: any;
-    const tree = (document.getElementById('root') as any)._reactRootContainer._internalRoot.current;
+    const tree = getReactRoot(document.getElementById('root') as any);
     const findToasterRoot = (currentNode: any, iters: number): any => {
-      if (iters >= 65) {
-        // currently 65
+      if (iters >= 80) {
+        // currently 66
         return null;
       }
       if (