Merge branch 'main' into aa/type-cleanup-py

fix uninstall bug
fix bad type on store.tsx
2026-07-01 15:29:54 +00:00 · 2023-10-22 19:58:05 -04:00 · 2023-10-17 18:59:13 +03:00 · 2023-10-17 16:53:13 +03:00 · 2023-10-17 16:50:13 +03:00 · 2023-10-17 16:46:53 +03:00
34 changed files with 713 additions and 796 deletions
@@ -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;/plugin" --hidden-import=logging.handlers --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/*;/" --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;/plugin" --hidden-import=logging.handlers --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/*;/" --hidden-import=sqlite3 ./backend/main.py
        
    - name: Upload package artifact ⬆️
      uses: actions/upload-artifact@v3
@@ -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:/plugin --hidden-import=logging.handlers --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/*:/ --hidden-import=sqlite3 ./backend/main.py
        
    - name: Upload package artifact ⬆️
      if: ${{ !env.ACT }}
@@ -18,7 +18,7 @@ jobs:
      
    - name: Get changed files
      id: changed-files
-      uses: tj-actions/changed-files@v41.0.0
+      uses: tj-actions/changed-files@v35.6.3
      with:
        separator: ","
        files: |
@@ -38,7 +38,7 @@
            "type": "shell",
            "group": "none",
            "detail": "Check for local runs, create a plugins folder",
-            "command": "rsync -azp --rsh='ssh -p ${config:deckport} ${config:deckkey}' backend/requirements.txt deck@${config:deckip}:${config:deckdir}/homebrew/dev/pluginloader/backend/requirements.txt && ssh deck@${config:deckip} -p ${config:deckport} ${config:deckkey} 'python -m ensurepip && python -m pip install --upgrade --break-system-packages pip && python -m pip install --break-system-packages --upgrade setuptools && python -m pip install --break-system-packages -r ${config:deckdir}/homebrew/dev/pluginloader/backend/requirements.txt'",
+            "command": "rsync -azp --rsh='ssh -p ${config:deckport} ${config:deckkey}' requirements.txt deck@${config:deckip}:${config:deckdir}/homebrew/dev/pluginloader/requirements.txt && ssh deck@${config:deckip} -p ${config:deckport} ${config:deckkey} 'python -m ensurepip && python -m pip install --upgrade pip && python -m pip install --upgrade setuptools && python -m pip install -r ${config:deckdir}/homebrew/dev/pluginloader/requirements.txt'",
            "problemMatcher": []
        },
        {
@@ -105,7 +105,7 @@
            "detail": "Deploy dev PluginLoader to deck",
            "type": "shell",
            "group": "none",
-            "command": "rsync -azp --delete --rsh='ssh -p ${config:deckport} ${config:deckkey}' --exclude='.git/' --exclude='.github/' --exclude='.vscode/' --exclude='frontend/' --exclude='dist/' --exclude='contrib/' --exclude='*.log' --exclude='requirements.txt' --exclude='**/__pycache__/' --exclude='.gitignore' . deck@${config:deckip}:${config:deckdir}/homebrew/dev/pluginloader",
+            "command": "rsync -azp --delete --rsh='ssh -p ${config:deckport} ${config:deckkey}' --exclude='.git/' --exclude='.github/' --exclude='.vscode/' --exclude='frontend/' --exclude='dist/' --exclude='contrib/' --exclude='*.log' --exclude='requirements.txt' --exclude='backend/__pycache__/' --exclude='.gitignore' . deck@${config:deckip}:${config:deckdir}/homebrew/dev/pluginloader",
            "problemMatcher": []
        },
        // RUN
@@ -26,10 +26,10 @@ cd ..

 if [[ "$type" == "release" ]]; then
    printf "release!\n"
-    act workflow_dispatch -e act/release.json --artifact-server-path act/artifacts --container-architecture linux/amd64 --platform ubuntu-22.04=catthehacker/ubuntu:act-22.04
+    act workflow_dispatch -e act/release.json --artifact-server-path act/artifacts --container-architecture linux/amd64
 elif [[ "$type" == "prerelease" ]]; then
    printf "prerelease!\n"
-    act workflow_dispatch -e act/prerelease.json --artifact-server-path act/artifacts --container-architecture linux/amd64 --platform ubuntu-22.04=catthehacker/ubuntu:act-22.04
+    act workflow_dispatch -e act/prerelease.json --artifact-server-path act/artifacts --container-architecture linux/amd64
 else
    printf "Release type unspecified/badly specified.\n"
    printf "Options: 'release' or 'prerelease'\n"
@@ -192,8 +192,7 @@
  "SettingsIndex": {
    "developer_title": "Developer",
    "general_title": "General",
-    "plugins_title": "Plugins",
-    "testing_title": "Testing"
+    "plugins_title": "Plugins"
  },
  "Store": {
    "store_contrib": {
@@ -219,10 +218,6 @@
      "about": "About",
      "alph_asce": "Alphabetical (Z to A)",
      "alph_desc": "Alphabetical (A to Z)",
-      "date_asce": "Oldest First",
-      "date_desc": "Newest First",
-      "downloads_asce": "Least Downloaded First",
-      "downloads_desc": "Most Downloaded First",
      "title": "Browse"
    },
    "store_testing_cta": "Please consider testing new plugins to help the Decky Loader team!",
@@ -261,8 +256,5 @@
      "reloading": "Reloading",
      "updating": "Updating"
    }
-      },
-    "Testing": {
-        "download": "Download"
-    }
+  }
 }
@@ -1,253 +0,0 @@
-{
-    "BranchSelect": {
-        "update_channel": {
-            "stable": "安定",
-            "testing": "テスト",
-            "label": "アップデートチャンネル",
-            "prerelease": "プレリリース"
-        }
-    },
-    "DropdownMultiselect": {
-        "button": {
-            "back": "戻る"
-        }
-    },
-    "FilePickerIndex": {
-        "file": {
-            "select": "ファイルを選択"
-        },
-        "files": {
-            "all_files": "すべてのファイル",
-            "file_type": "ファイルタイプ",
-            "show_hidden": "非表示ファイルを表示する"
-        },
-        "filter": {
-            "name_asce": "Z-A",
-            "name_desc": "A-Z",
-            "size_asce": "サイズ(小さい順)",
-            "size_desc": "サイズ(大きい順)",
-            "created_asce": "作成日(古い順)",
-            "created_desc": "作成日(新しい順)",
-            "modified_asce": "更新日(古い順)",
-            "modified_desc": "更新日(新しい順)"
-        },
-        "folder": {
-            "label": "フォルダ",
-            "select": "このフォルダを使用",
-            "show_more": "その他のファイルを表示"
-        }
-    },
-    "MultiplePluginsInstallModal": {
-        "description": {
-            "install": "インストール {{name}} {{version}}",
-            "reinstall": "再インストール {{name}} {{version}}",
-            "update": "アップデート {{name}} {{version}}"
-        },
-        "ok_button": {
-            "idle": "確認",
-            "loading": "作業中"
-        },
-        "title": {
-            "install_other": "{{count}} 個のプラグインをインストール",
-            "mixed_other": "{{count}} 個のプラグインを修正",
-            "update_other": "{{count}} 個のプラグインをアップデート",
-            "reinstall_other": "{{count}} 個のプラグインを再インストール"
-        },
-        "confirm": "以下の変更を加えてもよろしいですか?"
-    },
-    "Developer": {
-        "enabling": "React DevToolsを有効",
-        "disabling": "React DevToolsを無効",
-        "5secreload": "5秒以内に再読み込みされます"
-    },
-    "PluginInstallModal": {
-        "install": {
-            "button_idle": "インストール",
-            "title": "{{artifact}} をインストール",
-            "button_processing": "インストール中",
-            "desc": "{{artifact}} {{version}} をインストールしてもよろしいですか？"
-        },
-        "no_hash": "このプラグインにはハッシュがありません。ご自身の責任でインストールしてください。",
-        "reinstall": {
-            "button_idle": "再インストール",
-            "button_processing": "再インストール中",
-            "desc": "{{artifact}} {{version}} を再インストールしてもよろしいですか?",
-            "title": "{{artifact}} を再インストール"
-        },
-        "update": {
-            "button_idle": "アップデート",
-            "title": "{{artifact}} をアップデート",
-            "desc": "{{artifact}} {{version}} をアップデートしてもよろしいですか？",
-            "button_processing": "アップデート中"
-        }
-    },
-    "PluginListIndex": {
-        "hide": "クイックアクセス: 非表示",
-        "no_plugin": "プラグインがインストールされていません!",
-        "reinstall": "再インストール",
-        "reload": "再読み込み",
-        "uninstall": "アンインストール",
-        "plugin_actions": "プラグインアクション",
-        "update_all_other": "{{count}} 個のプラグインをアップデート",
-        "show": "クイックアクセス: 表示",
-        "update_to": "{{name}} を更新"
-    },
-    "PluginListLabel": {
-        "hidden": "クイックアクセスメニューから非表示にします"
-    },
-    "PluginLoader": {
-        "error": "エラー",
-        "plugin_load_error": {
-            "message": "プラグイン {{name}} の読み込みエラー",
-            "toast": "{{name}} の読み込みエラー"
-        },
-        "plugin_uninstall": {
-            "button": "アンインストール",
-            "desc": "{{name}} をアンインストールしてもよろしいですか?",
-            "title": "{{name}} をアンインストール"
-        },
-        "decky_title": "Decky",
-        "decky_update_available": "{{tag_name}} のアップデートが利用可能です!",
-        "plugin_update_other": "{{count}} 個のプラグインのアップデートが利用可能です!",
-        "plugin_error_uninstall": "{{name}} プラグインを読み込む際に上記のような例外が発生しました。 これは通常、SteamUIの最新バージョンに合ったプラグインのアップデートが必要な場合に発生します。Decky設定のプラグインセクションでアップデートがあるかどうかを確認するか、アンインストールをお試しください。"
-    },
-    "SettingsDeveloperIndex": {
-        "cef_console": {
-            "button": "コンソールを開く",
-            "label": "CEFコンソール",
-            "desc": "CEFコンソールを開きます。デバッグ目的でのみ使用してください。これらの項目は危険な可能性があるので、プラグイン開発者であるか、開発者のガイドに従う場合のみ使用する必要があります。"
-        },
-        "react_devtools": {
-            "ip_label": "IP",
-            "label": "React DevTools を有効化",
-            "desc": "React DevToolsを実行しているコンピューターへの接続を有効にします。この設定を変更すると、Steam が再ロードされます。有効にする前にIPアドレスを設定してください。"
-        },
-        "third_party_plugins": {
-            "button_install": "インストール",
-            "button_zip": "ブラウズ",
-            "header": "サードパーティプラグイン",
-            "label_desc": "URL",
-            "label_url": "URLからプラグインをインストール",
-            "label_zip": "ZIPファイルからプラグインをインストール"
-        },
-        "valve_internal": {
-            "desc1": "Valveの内部開発者メニューを有効にします。",
-            "desc2": "このメニューの機能が分からない場合、このメニューには触れないでください。",
-            "label": "Valve Internalを有効"
-        },
-        "header": "その他"
-    },
-    "PluginView": {
-        "hidden_other": "{{count}} 個のプラグインがこのリストから非表示になります"
-    },
-    "SettingsGeneralIndex": {
-        "about": {
-            "decky_version": "Deckyバージョン",
-            "header": "情報"
-        },
-        "developer_mode": {
-            "label": "開発者モード"
-        },
-        "notifications": {
-            "header": "通知",
-            "plugin_updates_label": "プラグインのアップデートが利用可能な場合に通知",
-            "decky_updates_label": "Deckyのアップデートが利用可能な場合に通知"
-        },
-        "beta": {
-            "header": "ベータ版への参加"
-        },
-        "other": {
-            "header": "その他"
-        },
-        "updates": {
-            "header": "アップデート"
-        }
-    },
-    "SettingsIndex": {
-        "developer_title": "開発者",
-        "plugins_title": "プラグイン",
-        "general_title": "一般"
-    },
-    "Store": {
-        "store_filter": {
-            "label": "フィルター",
-            "label_def": "すべて"
-        },
-        "store_search": {
-            "label": "検索"
-        },
-        "store_sort": {
-            "label": "並べ替え",
-            "label_def": "直近のアップデート(新しい順)"
-        },
-        "store_source": {
-            "desc": "すべてのプラグインのソース コードは、GitHubのSteamDeckHomebrew/decky-plugin-databaseリポジトリで入手できます。",
-            "label": "ソースコード"
-        },
-        "store_tabs": {
-            "alph_asce": "アルファベット(Z to A)",
-            "alph_desc": "アルファベット(A to Z)",
-            "title": "閲覧",
-            "about": "概要"
-        },
-        "store_testing_warning": {
-            "label": "テストストア チャンネルへようこそ",
-            "desc": "このストアチャンネルを使用して、最先端のプラグイン バージョンをテストできます。 すべてのユーザーがプラグインを更新できるように、必ずGitHubにフィードバックを残してください。"
-        },
-        "store_contrib": {
-            "desc": "Decky Plugin Storeに貢献したい場合は、GitHubのSteamDeckHomebrew/decky-plugin-templateリポジトリを確認してください。 開発と配布に関する情報は README で入手できます。",
-            "label": "貢献"
-        },
-        "store_testing_cta": "Decky Loaderチームを支援するために、新しいプラグインのテストを検討してください!"
-    },
-    "StoreSelect": {
-        "custom_store": {
-            "label": "カスタムストア",
-            "url_label": "URL"
-        },
-        "store_channel": {
-            "custom": "カスタム",
-            "default": "デフォルト",
-            "label": "ストアチャンネル",
-            "testing": "テスト"
-        }
-    },
-    "TitleView": {
-        "decky_store_desc": "Deckyストアを開く",
-        "settings_desc": "Decky設定を開く"
-    },
-    "Updater": {
-        "decky_updates": "Deckyアップデート",
-        "no_patch_notes_desc": "このバージョンのパッチノートはありません",
-        "patch_notes_desc": "パッチノート",
-        "updates": {
-            "check_button": "アップデートを確認",
-            "checking": "確認中",
-            "cur_version": "現在のバージョン: {{ver}}",
-            "install_button": "アップデートをインストール",
-            "label": "アップデート",
-            "lat_version": "アップデート: {{ver}} を実行中",
-            "reloading": "再読み込み中",
-            "updating": "アップデート中"
-        }
-    },
-    "FilePickerError": {
-        "errors": {
-            "file_not_found": "指定されたパスは無効です。 内容をご確認の上、正しく入力し直してください。",
-            "unknown": "不明なエラーが発生しました。 エラー内容は次のとおりです: {{raw_error}}",
-            "perm_denied": "選択したパスへのアクセス権がありません。選択したフォルダ/ファイルのアクセス権がユーザー(Steam Deckのdeckユーザー)に合わせて正しく設定されていることを確認してください。"
-        }
-    },
-    "PluginCard": {
-        "plugin_version_label": "プラグインバージョン",
-        "plugin_no_desc": "説明はありません。",
-        "plugin_full_access": "このプラグインはSteam Deckの全てのアクセス権を持ちます。",
-        "plugin_install": "インストール"
-    },
-    "RemoteDebugging": {
-        "remote_cef": {
-            "label": "リモート CEF デバッグを許可する",
-            "desc": "ネットワーク上のすべてのユーザーにCEFデバッガへの非認証アクセスを許可します"
-        }
-    }
-}
@@ -210,11 +210,7 @@
            "title": "Navegar",
            "alph_asce": "Alfabética (Z - A)"
        },
-        "store_testing_cta": "Por favor, considere testar os novos plugins para ajudar o time do Decky Loader!",
-        "store_testing_warning": {
-            "desc": "Você pode usar este canal da loja para testar versões avançadas do plugin. Certifique-se de deixar feedback no GitHub para que o plugin possa ser atualizado para todos os usuários.",
-            "label": "Bem-vindo ao Canal de Testes da Loja"
-        }
+        "store_testing_cta": "Por favor, considere testar os novos plugins para ajudar o time do Decky Loader!"
    },
    "StoreSelect": {
        "custom_store": {
@@ -259,9 +255,5 @@
            "unknown": "Ocorreu um erro desconhecido. O erro completo é: {{raw_error}}",
            "perm_denied": "Você não tem acesso à este diretório. Por favor, verifiquei se seu usuário (deck no Steam Deck) tem as permissões necessárias para acessar este arquivo/pasta."
        }
-    },
-    "TitleView": {
-        "decky_store_desc": "Abrir Loja Decky",
-        "settings_desc": "Abrir Definições Decky"
    }
 }
@@ -1,27 +1,7 @@
 {
    "FilePickerIndex": {
        "folder": {
-            "select": "Usar esta pasta",
-            "label": "Pasta",
-            "show_more": "Mostrar mais ficheiros"
-        },
-        "file": {
-            "select": "Selecionar este ficheiro"
-        },
-        "filter": {
-            "size_desc": "Tamanho (maior)",
-            "created_asce": "Criado (mais antigo)",
-            "created_desc": "Criado (mais recente)",
-            "modified_asce": "Modificado (mais antigo)",
-            "modified_desc": "Modificado (mais recente)",
-            "name_asce": "Z-A",
-            "name_desc": "A-Z",
-            "size_asce": "Tamanho (mais pequeno)"
-        },
-        "files": {
-            "file_type": "Tipo de ficheiro",
-            "show_hidden": "Mostrar ficheiros ocultos",
-            "all_files": "Todos os ficheiros"
+            "select": "Usar esta pasta"
        }
    },
    "PluginView": {
@@ -177,11 +157,6 @@
        },
        "updates": {
            "header": "Actualizações"
-        },
-        "notifications": {
-            "decky_updates_label": "Atualização Decky disponível",
-            "header": "Notificações",
-            "plugin_updates_label": "Atualizações de plugins disponíveis"
        }
    },
    "SettingsIndex": {
@@ -215,11 +190,7 @@
            "alph_desc": "Alfabeticamente (A-Z)",
            "title": "Navegar"
        },
-        "store_testing_cta": "Testa novos plugins e ajuda a equipa do Decky Loader!",
-        "store_testing_warning": {
-            "desc": "Pode usar esta versão da loja para testar versões experimentais de plugins. Certifique-se de deixar feedback no GitHub para que o plugin possa ser atualizado para todos os utilizadores.",
-            "label": "Bem-vindo ao Canal de Testes da Loja"
-        }
+        "store_testing_cta": "Testa novos plugins e ajuda a equipa do Decky Loader!"
    },
    "StoreSelect": {
        "custom_store": {
@@ -247,21 +218,5 @@
            "reloading": "Recarregar",
            "install_button": "Instalar actualização"
        }
-    },
-    "FilePickerError": {
-        "errors": {
-            "perm_denied": "Não tem acesso ao diretório especificado. Por favor, verifique se o seu utilizador (deck na Steam Deck) possui as permissões correspondentes para aceder à pasta/ficheiro especificado.",
-            "unknown": "Ocorreu um erro desconhecido. O erro é: {{raw_error}}",
-            "file_not_found": "O caminho especificado não é válido. Por favor, verifique e insira-o corretamente."
-        }
-    },
-    "TitleView": {
-        "decky_store_desc": "Abrir a Loja Decky",
-        "settings_desc": "Abrir as Definições Decky"
-    },
-    "DropdownMultiselect": {
-        "button": {
-            "back": "Voltar"
-        }
    }
 }
@@ -1,4 +1,4 @@
-aiohttp==3.9.0
+aiohttp==3.8.4
 aiohttp-jinja2==1.5.1
 aiohttp_cors==0.7.0
 watchdog==2.1.7
@@ -10,7 +10,6 @@ from hashlib import sha256
 from io import BytesIO
 from logging import getLogger
 from os import R_OK, W_OK, path, listdir, access, mkdir
-from re import sub
 from shutil import rmtree
 from time import time
 from zipfile import ZipFile
@@ -163,6 +162,12 @@ class PluginBrowser:
        current_plugin_order = self.settings.getSetting("pluginOrder")[:]
        if self.loader.watcher:
            self.loader.watcher.disabled = True
+        try:
+            pluginFolderPath = self.find_plugin_folder(name)
+            if pluginFolderPath:
+                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://"):
@@ -181,40 +186,6 @@ 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}")
-
-        if res_zip and version == "dev":
-            with ZipFile(res_zip) as plugin_zip:
-                plugin_json_list = [file for file in plugin_zip.namelist() if file.endswith("/plugin.json") and file.count("/") == 1]
-
-                if len(plugin_json_list) == 0:
-                    logger.fatal("No plugin.json found in plugin ZIP")
-                    return
-
-                elif len(plugin_json_list) > 1:
-                    logger.fatal("Multiple plugin.json found in plugin ZIP")
-                    return
-
-                else:
-                    name = sub(r"/.+$", "", plugin_json_list[0])
-
-        try:
-            pluginFolderPath = self.find_plugin_folder(name)
-            if pluginFolderPath:
-                isInstalled = True
-        except:
-            logger.error(f"Failed to determine if {name} is already installed, continuing anyway.")
-
        # Check to make sure we got the file
        if res_zip is None:
            logger.fatal(f"Could not fetch {artifact}")
@@ -412,7 +412,7 @@ async def get_tab_lambda(test: Callable[[Tab], bool]) -> Tab:

 SHARED_CTX_NAMES = ["SharedJSContext", "Steam Shared Context presented by Valve™", "Steam", "SP"]
 CLOSEABLE_URLS = ["about:blank", "data:text/html,%3Cbody%3E%3C%2Fbody%3E"] # Closing anything other than these *really* likes to crash Steam
-DO_NOT_CLOSE_URLS = ["Valve Steam Gamepad/default", "Valve%20Steam%20Gamepad/default"] # Steam Big Picture Mode tab
+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
@@ -432,7 +432,7 @@ async def inject_to_tab(tab_name: str, js: str, run_async: bool = 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 any(url in t.url for url in CLOSEABLE_URLS) and not any(url in t.url for url in DO_NOT_CLOSE_URLS)):
+        if not t.title or (t.title not in SHARED_CTX_NAMES and any(url in t.url for url in CLOSEABLE_URLS) and DO_NOT_CLOSE_URL not in t.url):
            logger.debug("Closing tab: " + getattr(t, "title", "Untitled"))
            await t.close()
            await sleep(0.5)
@@ -58,22 +58,8 @@ 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
-
-    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
+    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)
@@ -139,19 +125,11 @@ 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
@@ -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())
@@ -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, modules as sysmodules
+from sys import exit, path as syspath
 from typing import Any, Dict
 from .localsocket import LocalSocket
 from .localplatform import setgid, setuid, get_username, get_home_path
@@ -78,11 +78,6 @@ 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
@@ -1,29 +1,20 @@
 from __future__ import annotations
+import os
+import shutil
 from asyncio import sleep
 from json.decoder import JSONDecodeError
 from logging import getLogger
-import os
 from os import getcwd, path, remove
-import shutil
-from typing import List, TYPE_CHECKING, TypedDict
-import zipfile
+from typing import TYPE_CHECKING, List, TypedDict
+if TYPE_CHECKING:
+    from .main import PluginManager
+from .localplatform import chmod, service_restart, ON_LINUX, get_keep_systemd_service, get_selinux

 from aiohttp import ClientSession, web

 from . import helpers
 from .injector import get_gamepadui_tab
-from .localplatform import (
-    ON_LINUX,
-    ON_WINDOWS,
-    chmod,
-    get_keep_systemd_service,
-    get_selinux,
-    service_restart,
-)
 from .settings import SettingsManager
-if TYPE_CHECKING:
-    from .main import PluginManager
-

 logger = getLogger("Updater")

@@ -34,12 +25,6 @@ class RemoteVer(TypedDict):
    tag_name: str
    prerelease: bool
    assets: List[RemoteVerAsset]
-class TestingVersion(TypedDict):
-    id: int
-    name: str
-    link: str
-    head_sha: str
-

 class Updater:
    def __init__(self, context: PluginManager) -> None:
@@ -51,9 +36,7 @@ class Updater:
            "get_version": self.get_version,
            "do_update": self.do_update,
            "do_restart": self.do_restart,
-            "check_for_updates": self.check_for_updates,
-            "get_testing_versions": self.get_testing_versions,
-            "download_testing_version": self.download_testing_version
+            "check_for_updates": self.check_for_updates
        }
        self.remoteVer: RemoteVer | None = None
        self.allRemoteVers: List[RemoteVer] = []
@@ -167,53 +150,6 @@ class Updater:
                pass
            await sleep(60 * 60 * 6) # 6 hours

-    async def download_decky_binary(self, download_url: str, version: str, is_zip: bool = False):
-        download_filename = "PluginLoader" if ON_LINUX else "PluginLoader.exe"
-        download_temp_filename = download_filename + ".new"
-        tab = await get_gamepadui_tab()
-        await tab.open_websocket()
-
-        async with ClientSession() as web:
-            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:
-                    progress = 0
-                    raw = 0
-                    async for c in res.content.iter_chunked(512):
-                        out.write(c)
-                        if total != 0:
-                            raw += len(c)
-                            new_progress = round((raw / total) * 100)
-                            if progress != new_progress:
-                                self.context.loop.create_task(tab.evaluate_js(f"window.DeckyUpdater.updateProgress({new_progress})", False, False, False))
-                                progress = new_progress
-
-        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))
-            if (is_zip):
-                with zipfile.ZipFile(path.join(getcwd(), download_temp_filename), 'r') as file:
-                    file.getinfo(download_filename).filename = download_filename + ".unzipped"
-                    file.extract(download_filename)
-                remove(path.join(getcwd(), download_temp_filename))
-                shutil.move(path.join(getcwd(), download_filename + ".unzipped"), path.join(getcwd(), download_filename))
-            else:
-                shutil.move(path.join(getcwd(), download_temp_filename), path.join(getcwd(), download_filename))
-            
-            chmod(path.join(getcwd(), download_filename), 777, False)
-            if get_selinux():
-                from asyncio.subprocess import create_subprocess_exec
-                process = await create_subprocess_exec("chcon", "-t", "bin_t", path.join(getcwd(), download_filename))
-                logger.info(f"Setting the executable flag with chcon returned {await process.wait()}")
-
-        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_update(self):
        logger.debug("Starting update.")
        try:
@@ -225,6 +161,7 @@ class Updater:
        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:
@@ -237,6 +174,8 @@ class Updater:
        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 and not get_keep_systemd_service():
                logger.debug("Downloading systemd service")
@@ -264,49 +203,36 @@ class Updater:
                    os.mkdir(path.join(getcwd(), ".systemd"))
                shutil.move(service_file_path, path.join(getcwd(), ".systemd")+"/plugin_loader.service")
            
-        await self.download_decky_binary(download_url, version)
+            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:
+                    progress = 0
+                    raw = 0
+                    async for c in res.content.iter_chunked(512):
+                        out.write(c)
+                        raw += len(c)
+                        new_progress = round((raw / total) * 100)
+                        if progress != new_progress:
+                            self.context.loop.create_task(tab.evaluate_js(f"window.DeckyUpdater.updateProgress({new_progress})", False, False, False))
+                            progress = new_progress
+
+            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)
+                if get_selinux():
+                    from asyncio.subprocess import create_subprocess_exec
+                    process = await create_subprocess_exec("chcon", "-t", "bin_t", path.join(getcwd(), download_filename))
+                    logger.info(f"Setting the executable flag with chcon returned {await process.wait()}")
+
+            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")
-
-    async def get_testing_versions(self) -> List[TestingVersion]:
-        result: List[TestingVersion] = []
-        async with ClientSession() as web:
-            async with web.request("GET", "https://api.github.com/repos/SteamDeckHomebrew/decky-loader/pulls", 
-                    headers={'X-GitHub-Api-Version': '2022-11-28'}, params={'state':'open'}, ssl=helpers.get_ssl_context()) as res:
-                open_prs = await res.json()
-                for pr in open_prs:
-                    result.append({
-                        "id": int(pr['number']),
-                        "name": pr['title'],
-                        "link":  pr['html_url'],
-                        "head_sha": pr['head']['sha'],
-                    })
-        return result
-
-    async def download_testing_version(self, pr_id: int, sha_id: str):
-        down_id = ''
-        #Get all the associated workflow run for the given sha_id code hash
-        async with ClientSession() as web:
-            async with web.request("GET", "https://api.github.com/repos/SteamDeckHomebrew/decky-loader/actions/runs", 
-                    headers={'X-GitHub-Api-Version': '2022-11-28'}, params={'event':'pull_request', 'head_sha': sha_id}, ssl=helpers.get_ssl_context()) as res:
-                works = await res.json()
-        #Iterate over the workflow_run to get the two builds if they exists
-        for work in works['workflow_runs']:
-            if ON_WINDOWS and work['name'] == 'Builder Win':
-                down_id=work['id']
-                break
-            elif ON_LINUX and work['name'] == 'Builder':
-                down_id=work['id']
-                break
-        if down_id != '':
-            async with ClientSession() as web:
-                async with web.request("GET", f"https://api.github.com/repos/SteamDeckHomebrew/decky-loader/actions/runs/{down_id}/artifacts",
-                        headers={'X-GitHub-Api-Version': '2022-11-28'}, ssl=helpers.get_ssl_context()) as res:
-                    jresp = await res.json()
-                    #If the request found at least one artifact to download...
-                    if int(jresp['total_count']) != 0:
-                        # this assumes that the artifact we want is the first one!
-                        down_link = f"https://nightly.link/SteamDeckHomebrew/decky-loader/actions/artifacts/{jresp['artifacts'][0]['id']}.zip"
-                        #Then fetch it and restart itself
-                        await self.download_decky_binary(down_link, f'PR-{pr_id}' , True)
@@ -238,7 +238,7 @@ class Utilities:
                elif include_files:
                    # Handle requested extensions if present
                    if len(include_ext) == 0 or 'all_files' in include_ext \
-                        or splitext(file.name)[1].lstrip('.').upper() in (ext.upper() for ext in include_ext):
+                        or splitext(file.name)[1].lstrip('.') in include_ext:
                        if (is_hidden and include_hidden) or not is_hidden:
                            files.append({"file": file, "filest": filest, "is_dir": False})
        # Filter logic
@@ -0,0 +1,335 @@
+#!/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'
@@ -0,0 +1,168 @@
+#!/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"
@@ -25,7 +25,7 @@
    "i18next-parser": "^8.0.0",
    "import-sort-style-module": "^6.0.0",
    "inquirer": "^8.2.5",
-    "prettier": "^3.2.5",
+    "prettier": "^2.8.8",
    "prettier-plugin-import-sort": "^0.0.7",
    "react": "16.14.0",
    "react-dom": "16.14.0",
@@ -44,7 +44,7 @@
    }
  },
  "dependencies": {
-    "decky-frontend-lib": "3.24.5",
+    "decky-frontend-lib": "3.21.1",
    "filesize": "^10.0.7",
    "i18next": "^23.2.1",
    "i18next-http-backend": "^2.2.1",
@@ -6,8 +6,8 @@ settings:

 dependencies:
  decky-frontend-lib:
-    specifier: 3.24.5
-    version: 3.24.5
+    specifier: 3.21.1
+    version: 3.21.1
  filesize:
    specifier: ^10.0.7
    version: 10.0.7
@@ -77,11 +77,11 @@ devDependencies:
    specifier: ^8.2.5
    version: 8.2.5
  prettier:
-    specifier: ^3.2.5
-    version: 3.2.5
+    specifier: ^2.8.8
+    version: 2.8.8
  prettier-plugin-import-sort:
    specifier: ^0.0.7
-    version: 0.0.7(prettier@3.2.5)
+    version: 0.0.7(prettier@2.8.8)
  react:
    specifier: 16.14.0
    version: 16.14.0
@@ -1482,8 +1482,8 @@ packages:
    dependencies:
      ms: 2.1.2

-  /decky-frontend-lib@3.24.5:
-    resolution: {integrity: sha512-eYlbKDOOcIBPI0b76Rqvlryq2ym/QNiry4xf2pFrXmBa1f95dflqbQAb2gTq9uHEa5gFmeV4lUcMPGJ3M14Xqw==}
+  /decky-frontend-lib@3.21.1:
+    resolution: {integrity: sha512-30605ET9qqZ6St6I9WmMmLGgSrTIdMwo7xy85+lRaF1miUd2icOGEJjwnbVcZDdkal+1fJ3tNEDXlchVfG4TrA==}
    dev: false

  /decode-named-character-reference@1.0.2:
@@ -1852,8 +1852,8 @@ packages:
    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
    dev: true

-  /fsevents@2.3.3:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+  /fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
    os: [darwin]
    requiresBuild: true
@@ -3108,7 +3108,7 @@ packages:
    engines: {node: '>=8.6'}
    dev: true

-  /prettier-plugin-import-sort@0.0.7(prettier@3.2.5):
+  /prettier-plugin-import-sort@0.0.7(prettier@2.8.8):
    resolution: {integrity: sha512-O0KlUSq+lwvh+UiN3wZDT6wWkf7TNxTVv2/XXE5KqpRNbFJq3nRg2ftzBYFFO8QGpdWIrOB0uCTCtFjIxmVKQw==}
    peerDependencies:
      prettier: '>= 2.0'
@@ -3117,14 +3117,14 @@ packages:
      import-sort-config: 6.0.0
      import-sort-parser-babylon: 6.0.0
      import-sort-parser-typescript: 6.0.0
-      prettier: 3.2.5
+      prettier: 2.8.8
    transitivePeerDependencies:
      - supports-color
    dev: true

-  /prettier@3.2.5:
-    resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
-    engines: {node: '>=14'}
+  /prettier@2.8.8:
+    resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
+    engines: {node: '>=10.13.0'}
    hasBin: true
    dev: true

@@ -3200,7 +3200,6 @@ packages:
      prop-types: 15.8.1
      react: 16.14.0
      scheduler: 0.19.1
-    bundledDependencies: false

  /react-file-icon@1.3.0(react-dom@16.14.0)(react@16.14.0):
    resolution: {integrity: sha512-wxl/WwSX5twQKVXloPHbS71iZQUKO84KgZ44Kh7vYZGu1qH2kagx+RSTNfk/+IHtXfjPWPNIHPGi2Y8S94N1CQ==}
@@ -3284,7 +3283,6 @@ packages:
      loose-envify: 1.4.0
      object-assign: 4.1.1
      prop-types: 15.8.1
-    bundledDependencies: false

  /readable-stream@2.3.8:
    resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
@@ -3479,7 +3477,7 @@ packages:
    engines: {node: '>=10.0.0'}
    hasBin: true
    optionalDependencies:
-      fsevents: 2.3.3
+      fsevents: 2.3.2
    dev: true

  /rsvp@3.2.1:
@@ -30,14 +30,11 @@ const DeckyToaster: FC<DeckyToasterProps> = () => {
    // not actually node but TS is shit
    let interval: NodeJS.Timer | null;
    if (renderedToast) {
-      interval = setTimeout(
-        () => {
-          interval = null;
-          console.log('clear toast', renderedToast.data);
-          removeToast(renderedToast.data);
-        },
-        (renderedToast.data.duration || 5e3) + 1000,
-      );
+      interval = setTimeout(() => {
+        interval = null;
+        console.log('clear toast', renderedToast.data);
+        removeToast(renderedToast.data);
+      }, (renderedToast.data.duration || 5e3) + 1000);
      console.log('set int', interval);
    }
    return () => {
@@ -1,4 +1,12 @@
-import { ButtonItem, Focusable, PanelSection, PanelSectionRow } from 'decky-frontend-lib';
+import {
+  ButtonItem,
+  Focusable,
+  PanelSection,
+  PanelSectionRow,
+  joinClassNames,
+  scrollClasses,
+  staticClasses,
+} from 'decky-frontend-lib';
 import { VFC, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { FaEyeSlash } from 'react-icons/fa';
@@ -28,7 +36,10 @@ const PluginView: VFC = () => {
    return (
      <Focusable onCancelButton={closeActivePlugin}>
        <TitleView />
-        <div style={{ height: '100%', paddingTop: '16px' }}>
+        <div
+          className={joinClassNames(staticClasses.TabGroupPanel, scrollClasses.ScrollPanel, scrollClasses.ScrollY)}
+          style={{ height: '100%' }}
+        >
          {(visible || activePlugin.alwaysRender) && activePlugin.content}
        </div>
      </Focusable>
@@ -37,11 +48,7 @@ const PluginView: VFC = () => {
  return (
    <>
      <TitleView />
-      <div
-        style={{
-          paddingTop: '16px',
-        }}
-      >
+      <div className={joinClassNames(staticClasses.TabGroupPanel, scrollClasses.ScrollPanel, scrollClasses.ScrollY)}>
        <PanelSection>
          {pluginList
            .filter((p) => p.content)
@@ -10,8 +10,6 @@ const titleStyles: CSSProperties = {
  display: 'flex',
  paddingTop: '3px',
  paddingRight: '16px',
-  position: 'sticky',
-  top: '0px',
 };

 const TitleView: VFC = () => {
@@ -1,7 +1,7 @@
 import { SidebarNavigation } from 'decky-frontend-lib';
 import { lazy } from 'react';
 import { useTranslation } from 'react-i18next';
-import { FaCode, FaFlask, FaPlug } from 'react-icons/fa';
+import { FaCode, FaPlug } from 'react-icons/fa';

 import { useSetting } from '../../utils/hooks/useSetting';
 import DeckyIcon from '../DeckyIcon';
@@ -10,7 +10,6 @@ import GeneralSettings from './pages/general';
 import PluginList from './pages/plugin_list';

 const DeveloperSettings = lazy(() => import('./pages/developer'));
-const TestingMenu = lazy(() => import('./pages/testing'));

 export default function SettingsPage() {
  const [isDeveloper, setIsDeveloper] = useSetting<boolean>('developer.enabled', false);
@@ -40,17 +39,6 @@ export default function SettingsPage() {
      icon: <FaCode />,
      visible: isDeveloper,
    },
-    {
-      title: t('SettingsIndex.testing_title'),
-      content: (
-        <WithSuspense>
-          <TestingMenu />
-        </WithSuspense>
-      ),
-      route: '/decky/settings/testing',
-      icon: <FaFlask />,
-      visible: isDeveloper,
-    },
  ];

  return <SidebarNavigation pages={pages} />;
@@ -8,15 +8,10 @@ import { useSetting } from '../../../../utils/hooks/useSetting';

 const logger = new Logger('BranchSelect');

-export enum UpdateBranch {
-  Stable,
-  Prerelease,
-  Testing,
-}
-
-enum LessUpdateBranch {
+enum UpdateBranch {
  Stable,
  Prerelease,
+  // Testing,
 }

 const BranchSelect: FunctionComponent<{}> = () => {
@@ -29,11 +24,11 @@ const BranchSelect: FunctionComponent<{}> = () => {
  const [selectedBranch, setSelectedBranch] = useSetting<UpdateBranch>('branch', UpdateBranch.Stable);

  return (
-    // Returns numerical values from 0 to 2 (with current branch setup as of 6/16/23)
-    // 0 being stable, 1 being pre-release and 2 being testing (not a branch!)
+    // Returns numerical values from 0 to 2 (with current branch setup as of 8/28/22)
+    // 0 being stable, 1 being pre-release and 2 being nightly
    <Field label={t('BranchSelect.update_channel.label')} childrenContainerWidth={'fixed'}>
      <Dropdown
-        rgOptions={Object.values(selectedBranch == UpdateBranch.Testing ? UpdateBranch : LessUpdateBranch)
+        rgOptions={Object.values(UpdateBranch)
          .filter((branch) => typeof branch == 'number')
          .map((branch) => ({
            label: tBranches[branch as number],
@@ -135,8 +135,8 @@ export default function UpdaterSettings() {
            {checkingForUpdates
              ? t('Updater.updates.checking')
              : !versionInfo?.remote || versionInfo?.remote?.tag_name == versionInfo?.current
-                ? t('Updater.updates.check_button')
-                : t('Updater.updates.install_button')}
+              ? t('Updater.updates.check_button')
+              : t('Updater.updates.install_button')}
          </DialogButton>
        ) : (
          <ProgressBarWithInfo
@@ -1,87 +0,0 @@
-import { DialogBody, DialogButton, DialogControlsSection, Focusable, Navigation } from 'decky-frontend-lib';
-import { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { FaDownload, FaInfo } from 'react-icons/fa';
-
-import { callUpdaterMethod } from '../../../../updater';
-import { setSetting } from '../../../../utils/settings';
-import { UpdateBranch } from '../general/BranchSelect';
-
-interface TestingVersion {
-  id: number;
-  name: string;
-  link: string;
-  head_sha: string;
-}
-
-export default function TestingVersionList() {
-  const { t } = useTranslation();
-  const [testingVersions, setTestingVersions] = useState<TestingVersion[]>([]);
-
-  useEffect(() => {
-    (async () => {
-      setTestingVersions((await callUpdaterMethod('get_testing_versions')).result);
-    })();
-  }, []);
-
-  if (testingVersions.length === 0) {
-    return (
-      <div>
-        <p>No open PRs found</p>
-      </div>
-    );
-  }
-
-  return (
-    <DialogBody>
-      <DialogControlsSection>
-        <ul style={{ listStyleType: 'none', padding: '0' }}>
-          {testingVersions.map((version) => {
-            return (
-              <li style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', paddingBottom: '10px' }}>
-                <span>
-                  {version.name} <span style={{ opacity: '50%' }}>{'#' + version.id}</span>
-                </span>
-                <Focusable style={{ height: '40px', marginLeft: 'auto', display: 'flex' }}>
-                  <DialogButton
-                    style={{ height: '40px', minWidth: '60px', marginRight: '10px' }}
-                    onClick={() => {
-                      callUpdaterMethod('download_testing_version', { pr_id: version.id, sha_id: version.head_sha });
-                      setSetting('branch', UpdateBranch.Testing);
-                    }}
-                  >
-                    <div
-                      style={{
-                        display: 'flex',
-                        minWidth: '150px',
-                        justifyContent: 'space-between',
-                        alignItems: 'center',
-                      }}
-                    >
-                      {t('Testing.download')}
-                      <FaDownload style={{ paddingLeft: '1rem' }} />
-                    </div>
-                  </DialogButton>
-                  <DialogButton
-                    style={{
-                      height: '40px',
-                      width: '40px',
-                      padding: '10px 12px',
-                      minWidth: '40px',
-                      display: 'flex',
-                      flexDirection: 'column',
-                      justifyContent: 'center',
-                    }}
-                    onClick={() => Navigation.NavigateToExternalWeb(version.link)}
-                  >
-                    <FaInfo />
-                  </DialogButton>
-                </Focusable>
-              </li>
-            );
-          })}
-        </ul>
-      </DialogControlsSection>
-    </DialogBody>
-  );
-}
@@ -8,19 +8,20 @@ import {
  TextField,
  findModule,
 } from 'decky-frontend-lib';
-import { Dispatch, FC, SetStateAction, useEffect, useMemo, useState } from 'react';
+import { FC, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';

 import logo from '../../../assets/plugin_store.png';
 import Logger from '../../logger';
-import { SortDirections, SortOptions, Store, StorePlugin, getPluginList, getStore } from '../../store';
+import { Store, StorePlugin, getPluginList, getStore } from '../../store';
 import PluginCard from './PluginCard';

 const logger = new Logger('Store');

 const StorePage: FC<{}> = () => {
  const [currentTabRoute, setCurrentTabRoute] = useState<string>('browse');
-  const [pluginCount, setPluginCount] = useState<number | null>(null);
+  const [data, setData] = useState<StorePlugin[] | null>(null);
+  const [isTesting, setIsTesting] = useState<boolean>(false);
  const { TabCount } = findModule((m) => {
    if (m?.TabCount && m?.TabTitle) return true;
    return false;
@@ -28,6 +29,17 @@ const StorePage: FC<{}> = () => {

  const { t } = useTranslation();

+  useEffect(() => {
+    (async () => {
+      const res = await getPluginList();
+      logger.log('got data!', res);
+      setData(res);
+      const storeRes = await getStore();
+      logger.log(`store is ${storeRes}, isTesting is ${storeRes === Store.Testing}`);
+      setIsTesting(storeRes === Store.Testing);
+    })();
+  }, []);
+
  return (
    <>
      <div
@@ -37,71 +49,52 @@ const StorePage: FC<{}> = () => {
          background: '#0005',
        }}
      >
-        <Tabs
-          activeTab={currentTabRoute}
-          onShowTab={(tabId: string) => {
-            setCurrentTabRoute(tabId);
-          }}
-          tabs={[
-            {
-              title: t('Store.store_tabs.title'),
-              content: <BrowseTab setPluginCount={setPluginCount} />,
-              id: 'browse',
-              renderTabAddon: () => <span className={TabCount}>{pluginCount}</span>,
-            },
-            {
-              title: t('Store.store_tabs.about'),
-              content: <AboutTab />,
-              id: 'about',
-            },
-          ]}
-        />
+        {!data ? (
+          <div style={{ height: '100%' }}>
+            <SteamSpinner />
+          </div>
+        ) : (
+          <Tabs
+            activeTab={currentTabRoute}
+            onShowTab={(tabId: string) => {
+              setCurrentTabRoute(tabId);
+            }}
+            tabs={[
+              {
+                title: t('Store.store_tabs.title'),
+                content: <BrowseTab children={{ data: data, isTesting: isTesting }} />,
+                id: 'browse',
+                renderTabAddon: () => <span className={TabCount}>{data.length}</span>,
+              },
+              {
+                title: t('Store.store_tabs.about'),
+                content: <AboutTab />,
+                id: 'about',
+              },
+            ]}
+          />
+        )}
      </div>
    </>
  );
 };

-const BrowseTab: FC<{ setPluginCount: Dispatch<SetStateAction<number | null>> }> = ({ setPluginCount }) => {
+const BrowseTab: FC<{ children: { data: StorePlugin[]; isTesting: boolean } }> = (data) => {
  const { t } = useTranslation();

-  const dropdownSortOptions = useMemo(
+  const sortOptions = useMemo(
    (): DropdownOption[] => [
-      // ascending and descending order are the wrong way around for the alphabetical sort
-      // this is because it was initially done incorrectly for i18n and 'fixing' it would
-      // make all the translations incorrect
-      { data: [SortOptions.name, SortDirections.ascending], label: t('Store.store_tabs.alph_desc') },
-      { data: [SortOptions.name, SortDirections.descending], label: t('Store.store_tabs.alph_asce') },
-      { data: [SortOptions.date, SortDirections.ascending], label: t('Store.store_tabs.date_asce') },
-      { data: [SortOptions.date, SortDirections.descending], label: t('Store.store_tabs.date_desc') },
-      { data: [SortOptions.downloads, SortDirections.descending], label: t('Store.store_tabs.downloads_desc') },
-      { data: [SortOptions.downloads, SortDirections.ascending], label: t('Store.store_tabs.downloads_asce') },
+      { data: 1, label: t('Store.store_tabs.alph_desc') },
+      { data: 2, label: t('Store.store_tabs.alph_asce') },
    ],
    [],
  );

  // const filterOptions = useMemo((): DropdownOption[] => [{ data: 1, label: 'All' }], []);
-  const [selectedSort, setSort] = useState<[SortOptions, SortDirections]>(dropdownSortOptions[0].data);
+
+  const [selectedSort, setSort] = useState<number>(sortOptions[0].data);
  // const [selectedFilter, setFilter] = useState<number>(filterOptions[0].data);
  const [searchFieldValue, setSearchValue] = useState<string>('');
-  const [pluginList, setPluginList] = useState<StorePlugin[] | null>(null);
-  const [isTesting, setIsTesting] = useState<boolean>(false);
-
-  useEffect(() => {
-    (async () => {
-      const res = await getPluginList(selectedSort[0], selectedSort[1]);
-      logger.log('got data!', res);
-      setPluginList(res);
-      setPluginCount(res.length);
-    })();
-  }, [selectedSort]);
-
-  useEffect(() => {
-    (async () => {
-      const storeRes = await getStore();
-      logger.log(`store is ${storeRes}, isTesting is ${storeRes === Store.Testing}`);
-      setIsTesting(storeRes === Store.Testing);
-    })();
-  }, []);

  return (
    <>
@@ -124,7 +117,7 @@ const BrowseTab: FC<{ setPluginCount: Dispatch<SetStateAction<number | null>> }>
            <span className="DialogLabel">{t("Store.store_sort.label")}</span>
            <Dropdown
              menuLabel={t("Store.store_sort.label") as string}
-              rgOptions={dropdownSortOptions}
+              rgOptions={sortOptions}
              strDefaultLabel={t("Store.store_sort.label_def") as string}
              selectedOption={selectedSort}
              onChange={(e) => setSort(e.data)}
@@ -170,7 +163,7 @@ const BrowseTab: FC<{ setPluginCount: Dispatch<SetStateAction<number | null>> }>
            <span className="DialogLabel">{t('Store.store_sort.label')}</span>
            <Dropdown
              menuLabel={t('Store.store_sort.label') as string}
-              rgOptions={dropdownSortOptions}
+              rgOptions={sortOptions}
              strDefaultLabel={t('Store.store_sort.label_def') as string}
              selectedOption={selectedSort}
              onChange={(e) => setSort(e.data)}
@@ -189,7 +182,7 @@ const BrowseTab: FC<{ setPluginCount: Dispatch<SetStateAction<number | null>> }>
          </div>
        </Focusable>
      </div>
-      {isTesting && (
+      {data.children.isTesting && (
        <div
          style={{
            alignItems: 'center',
@@ -220,22 +213,22 @@ const BrowseTab: FC<{ setPluginCount: Dispatch<SetStateAction<number | null>> }>
        </div>
      )}
      <div>
-        {!pluginList ? (
-          <div style={{ height: '100%' }}>
-            <SteamSpinner />
-          </div>
-        ) : (
-          pluginList
-            .filter((plugin: StorePlugin) => {
-              return (
-                plugin.name.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
-                plugin.description.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
-                plugin.author.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
-                plugin.tags.some((tag: string) => tag.toLowerCase().includes(searchFieldValue.toLowerCase()))
-              );
-            })
-            .map((plugin: StorePlugin) => <PluginCard plugin={plugin} />)
-        )}
+        {data.children.data
+          .filter((plugin: StorePlugin) => {
+            return (
+              plugin.name.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
+              plugin.description.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
+              plugin.author.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
+              plugin.tags.some((tag: string) => tag.toLowerCase().includes(searchFieldValue.toLowerCase()))
+            );
+          })
+          .sort((a, b) => {
+            if (selectedSort % 2 === 1) return a.name.localeCompare(b.name);
+            else return b.name.localeCompare(a.name);
+          })
+          .map((plugin: StorePlugin) => (
+            <PluginCard plugin={plugin} />
+          ))}
      </div>
    </>
  );
@@ -1,4 +1,4 @@
-import { sleep } from 'decky-frontend-lib';
+import { findModuleChild, sleep } from 'decky-frontend-lib';
 import { FaReact } from 'react-icons/fa';

 import Logger from './logger';
@@ -9,30 +9,32 @@ const logger = new Logger('DeveloperMode');

 let removeSettingsObserver: () => void = () => {};

-declare global {
-  interface Window {
-    settingsStore: any;
-  }
-}
-
 export async function setShowValveInternal(show: boolean) {
-  if (show) {
-    const mobx =
-      window.settingsStore[
-        Object.getOwnPropertySymbols(window.settingsStore).find(
-          (x) => x.toString() == 'Symbol(mobx administration)',
-        ) as any
-      ];
+  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);
+    }
+  }

-    removeSettingsObserver = (mobx.observe_ || mobx.observe).call(mobx, (e: any) => {
+  if (show) {
+    removeSettingsObserver = settingsMod[
+      Object.getOwnPropertySymbols(settingsMod).find((x) => x.toString() == 'Symbol(mobx administration)') as any
+    ].observe((e: any) => {
      e.newValue.bIsValveEmail = true;
    });
-
-    window.settingsStore.m_Settings.bIsValveEmail = true;
+    settingsMod.m_Settings.bIsValveEmail = true;
    logger.log('Enabled Valve Internal menu');
  } else {
    removeSettingsObserver();
-    window.settingsStore.m_Settings.bIsValveEmail = false;
+    settingsMod.m_Settings.bIsValveEmail = false;
    logger.log('Disabled Valve Internal menu');
  }
 }
@@ -7,17 +7,6 @@ export enum Store {
  Custom,
 }

-export enum SortOptions {
-  name = 'name',
-  date = 'date',
-  downloads = 'downloads',
-}
-
-export enum SortDirections {
-  ascending = 'asc',
-  descending = 'desc',
-}
-
 export interface StorePluginVersion {
  name: string;
  hash: string;
@@ -47,20 +36,11 @@ export async function getStore(): Promise<Store> {
  return await getSetting<Store>('store', Store.Default);
 }

-export async function getPluginList(
-  sort_by: SortOptions | null = null,
-  sort_direction: SortDirections | null = null,
-): Promise<StorePlugin[]> {
+export async function getPluginList(): Promise<StorePlugin[]> {
  let version = await window.DeckyPluginLoader.updateVersion();
  let store = await getSetting<Store | null>('store', null);

  let customURL = await getSetting<string>('store-url', 'https://plugins.deckbrew.xyz/plugins');
-
-  let query: URLSearchParams | string = new URLSearchParams();
-  sort_by && query.set('sort_by', sort_by);
-  sort_direction && query.set('sort_direction', sort_direction);
-  query = '?' + String(query);
-
  let storeURL;
  if (store === null) {
    console.log('Could not get store, using Default.');
@@ -82,7 +62,7 @@ export async function getPluginList(
      storeURL = 'https://plugins.deckbrew.xyz/plugins';
      break;
  }
-  return fetch(storeURL + query, {
+  return fetch(storeURL, {
    method: 'GET',
    headers: {
      'X-Decky-Version': version.current,
@@ -1,5 +1,5 @@
 // TabsHook for versions before the Desktop merge
-import { Patch, afterPatch, getReactRoot, sleep } from 'decky-frontend-lib';
+import { Patch, afterPatch, 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 = getReactRoot(document.getElementById('root') as any);
+    const tree = (document.getElementById('root') as any)._reactRootContainer._internalRoot.current;
    let scrollRoot: any;
    async function findScrollRoot(currentNode: any, iters: number): Promise<any> {
      if (iters >= 30) {
@@ -1,5 +1,5 @@
 // TabsHook for versions after the Desktop merge
-import { Patch, QuickAccessTab, afterPatch, findInReactTree, getReactRoot, sleep } from 'decky-frontend-lib';
+import { Patch, QuickAccessTab, afterPatch, findInReactTree, 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 = getReactRoot(document.getElementById('root') as any);
+    const tree = (document.getElementById('root') as any)._reactRootContainer._internalRoot.current;
    let qAMRoot: any;
    const findQAMRoot = (currentNode: any, iters: number): any => {
-      if (iters >= 80) {
-        // currently 67
+      if (iters >= 65) {
+        // currently 45
        return null;
      }
      if (
@@ -1,13 +1,4 @@
-import {
-  Module,
-  Patch,
-  ToastData,
-  afterPatch,
-  findInReactTree,
-  findModuleChild,
-  getReactRoot,
-  sleep,
-} from 'decky-frontend-lib';
+import { Module, Patch, ToastData, afterPatch, findInReactTree, findModuleChild, sleep } from 'decky-frontend-lib';
 import { ReactNode } from 'react';

 import Toast from './components/Toast';
@@ -47,17 +38,16 @@ class Toaster extends Logger {
    //   </DeckyToasterStateContextProvider>
    // ));
    let instance: any;
-    const tree = getReactRoot(document.getElementById('root') as any);
+    const tree = (document.getElementById('root') as any)._reactRootContainer._internalRoot.current;
    const findToasterRoot = (currentNode: any, iters: number): any => {
-      if (iters >= 80) {
-        // currently 66
+      if (iters >= 65) {
+        // currently 65
        return null;
      }
      if (
        currentNode?.memoizedProps?.className?.startsWith?.('gamepadtoasts_GamepadToastPlaceholder') ||
        currentNode?.memoizedProps?.className?.startsWith?.('toastmanager_ToastPlaceholder') ||
-        currentNode?.memoizedProps?.className?.startsWith?.('toastmanager_ToastPopup') ||
-        currentNode?.memoizedProps?.className?.startsWith?.('gamepadtoasts_GamepadToastPopup')
+        currentNode?.memoizedProps?.className?.startsWith?.('toastmanager_ToastPopup')
      ) {
        this.log(`Toaster root was found in ${iters} recursion cycles`);
        return currentNode;
@@ -81,10 +71,7 @@ class Toaster extends Logger {
      instance = findToasterRoot(tree, 0);
    }
    this.node = instance.return;
-    this.rNode = findInReactTree(
-      this.node.return.return,
-      (node) => node?.stateNode && node.type?.InstallErrorReportingStore,
-    );
+    this.rNode = this.node.return;
    let toast: any;
    let renderedToast: ReactNode = null;
    let innerPatched: any;
Author	SHA1	Message	Date
AAGaming	064c897c86	Merge branch 'main' into aa/type-cleanup-py	2023-10-22 19:58:05 -04:00
marios8543	e0592f0959	fix uninstall bug	2023-10-17 18:59:13 +03:00
marios8543	0736a6f995	fix bad type on store.tsx	2023-10-17 16:53:13 +03:00
marios	d454a404a0	Merge branch 'main' into aa/type-cleanup-py	2023-10-17 16:50:13 +03:00
marios8543	ffbc79d919	fix bad type on store.tsx	2023-10-17 16:46:53 +03:00
Party Wumpus	a2312256b3	fix typo this is what i get for commiting to main 😔	2023-10-17 16:42:39 +03:00
Party Wumpus	2cdb49168c	fix logical error when no store was set	2023-10-17 16:42:39 +03:00
marios8543	944e0e6e07	Fix decky_plugin on windows CI	2023-10-17 16:39:45 +03:00
marios8543	4a17474133	fix decky_plugin path in pyinstaller	2023-10-11 23:46:26 +03:00
AAGaming	ade7cb7640	fix paths	2023-09-30 13:15:35 -04:00
AAGaming	e8cbeb1805	oops	2023-09-30 12:46:48 -04:00
AAGaming	4b89fc1f9d	fix broken import	2023-09-30 12:43:35 -04:00
AAGaming	00e10be93f	fix ci (hopefully, because act wont work)	2023-09-30 12:42:02 -04:00
AAGaming	b7043655b3	speed up stupid make	2023-09-30 12:36:17 -04:00
WerWolv	75ae7dfe69	Moved locales folder and requirements.txt	2023-09-26 14:58:27 +02:00
WerWolv	a0d50baaca	Moved main.py	2023-09-26 14:55:09 +02:00
WerWolv	0c2079fa85	Moved backend entirely into the backend folder	2023-09-26 14:54:52 +02:00
AAGaming	3960d28b06	with, not env	2023-09-25 13:37:28 -04:00
AAGaming	2d68809c1b	run lint and typecheck on PRs	2023-09-25 13:37:15 -04:00
AAGaming	b81c41f667	remove quotes on some types	2023-09-25 13:28:15 -04:00
AAGaming	e22cc6269d	make ci title consistent	2023-09-25 13:24:31 -04:00
AAGaming	300885f724	move type checking to other workflow, fix TS errors, add TSC checking	2023-09-25 13:23:38 -04:00
AAGaming	5838ddca56	add pyright ci	2023-09-25 13:09:33 -04:00
AAGaming	f6401f4995	move to module imports	2023-09-25 13:06:46 -04:00
marios8543	75fbc7524f	type hints on main,plugin,updater,utilites.localsocket	2023-09-25 11:27:36 -04:00
AAGaming	ecc5f5c2fa	begin adding static types to backend code	2023-09-25 11:27:36 -04:00
AAGaming	ae399b8c0e	remove useless main.py imports	2023-09-25 11:27:36 -04:00