Packaging rework (#531)

* fix: get rid of title view jank on latest beta

* Count the number of installs for each plugin (#557)

* Bump aiohttp from 3.8.4 to 3.8.5 in /backend (#558)

* fix: include Decky version in request for index.js

This avoids the If-Modified-Since logic in aiohttp and ensures Steam doesn't cache old JS,
even if the timestamps are normalized.

* fix: clean up shellcheck warnings in act runner script

* fix: gitignore settings/

* fix: ensure state directories exist when running without the installer

* feat: determine root directory correctly when running from in-tree

* fix: fix typo in CI script

* refactor: build a proper Python package with poetry

* refactor: move decky_plugin under the poetry structure

There's no need to special case it anymore, just treat it like any other Python module.

* sandboxed_plugin: better fix, attempt 2

---------

Co-authored-by: AAGaming <aagaming@riseup.net>
Co-authored-by: Party Wumpus <48649272+PartyWumpus@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -42,7 +42,7 @@ body:
       label: SteamOS version
 #      description: Can be found with `uname -a`
 #      placeholder: "Linux steamdeck 5.13.0-valve36-1-neptune #1 SMP PREEMPT Mon, 19 Dec 2022 23:39:41 +0000 x86_64 GNU/Linux"
-      placeholder: "SteamOS 3.5.7 Stable"
+      placeholder: "SteamOS 3.4.3 Stable"
     validations:
       required: true
 
@@ -67,18 +67,8 @@ body:
 
   - type: textarea
     attributes:
-      label: Backend Logs
+      label: Logs
       description: Please reboot your deck (if possible) when attempting to recreate the issue, then run ``cd ~ && journalctl -b0  -u plugin_loader.service > deckylog.txt``. This will save the log file to ``~`` aka ``/home/deck``. Please upload the file here
       placeholder: deckylog.txt
     validations:
       required: true
-
-  - type: textarea
-    attributes:
-      label: Frontend Logs
-      description: Please copy from your deck ~/.steam/steam/logs/cef_log.txt and ~/.steam/steam/logs/cef_log.previous.txt. Make sure to scrub your Steam username as it may appear in these logs.
-      placeholder: cef_log.txt
-    validations:
-      required: true
-
-      

.github/workflows/build-win.yml

@@ -25,13 +25,15 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: "3.11.4"
+
+    - name: Install Poetry
+      uses: snok/install-poetry@v1
+      with:
+        virtualenvs-create: false
         
     - name: Install Python dependencies ⬇️
       working-directory: ./backend
-      run: |
-        python -m pip install --upgrade pip
-        pip install pyinstaller==5.13.0
-        pip install -r requirements.txt
+      run: C:\Users\runneradmin\.local\bin\poetry install --no-interaction
 
     - name: Install JS dependencies ⬇️
       working-directory: ./frontend
@@ -44,16 +46,18 @@ 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
+      working-directory: ./backend
+      run: C:\Users\runneradmin\.local\bin\poetry run pyinstaller pyinstaller.spec
 
     - 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
-        
+      working-directory: ./backend
+      run: $env:DECKY_NOCONSOLE = 1; C:\Users\runneradmin\.local\bin\poetry run pyinstaller pyinstaller.spec
+
     - name: Upload package artifact ⬆️
       uses: actions/upload-artifact@v3
       with:
         name: PluginLoader Win
         path: |
-          ./dist/PluginLoader.exe
-          ./dist/PluginLoader_noconsole.exe
+          ./backend/dist/PluginLoader.exe
+          ./backend/dist/PluginLoader_noconsole.exe
     

.github/workflows/build.yml

@@ -69,12 +69,14 @@ jobs:
         sudo cp /usr/lib/libsqlite3.so.0.8.6 /usr/lib/x86_64-linux-gnu/ &&
         rm -r /tmp/sqlite-autoconf-3420000
 
+    - name: Install Poetry
+      uses: snok/install-poetry@v1
+      with:
+        virtualenvs-create: false
+
     - name: Install Python dependencies ⬇️
       working-directory: ./backend
-      run: |
-        python -m pip install --upgrade pip
-        pip install pyinstaller==5.13.0
-        pip install -r requirements.txt
+      run: poetry install --no-interaction
 
     - name: Install JS dependencies ⬇️
       working-directory: ./frontend
@@ -87,20 +89,21 @@ 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
-        
+      working-directory: ./backend
+      run: pyinstaller pyinstaller.spec
+
     - name: Upload package artifact ⬆️
       if: ${{ !env.ACT }}
       uses: actions/upload-artifact@v3
       with:
         name: PluginLoader
-        path: ./dist/PluginLoader
+        path: ./backend/dist/PluginLoader
 
     - name: Download package artifact locally
       if: ${{ env.ACT }}
       uses: actions/upload-artifact@v3
       with:
-        path: ./dist/PluginLoader
+        path: ./backend/dist/PluginLoader
 
   release:
     name: Release stable version of the package
@@ -177,7 +180,7 @@ jobs:
       with:
         name: Release ${{ steps.ready_tag.outputs.tag_name }}
         tag_name: ${{ steps.ready_tag.outputs.tag_name }}
-        files: ./dist/PluginLoader
+        files: ./backend/dist/PluginLoader
         prerelease: false
         generate_release_notes: true
   
@@ -264,6 +267,6 @@ jobs:
       with:
         name: Prerelease ${{ steps.ready_tag.outputs.tag_name }}
         tag_name: ${{ steps.ready_tag.outputs.tag_name }}
-        files: ./dist/PluginLoader
+        files: ./backend/dist/PluginLoader
         prerelease: true
         generate_release_notes: true

.github/workflows/edit-check.yml

@@ -18,22 +18,22 @@ 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: |
-          plugin/*
+          backend/decky_plugin.pyi
           
     - name: Is stub changed
       id: changed-stub
       run: |
         STUB_CHANGED="false"
-        PATHS=(plugin plugin/decky_plugin.pyi)
+        PATHS=(backend backend/decky_plugin.pyi)
         SHA=${{ github.sha }}
         SHA_PREV=HEAD^
         FILES=$(git diff $SHA_PREV..$SHA --name-only -- ${PATHS[@]} | jq -Rsc 'split("\n")[:-1] | join (",")')
-        if [[ "$FILES" == *"plugin/decky_plugin.pyi"* ]]; then
-          $STUB_CHANGED="true"
+        if [[ "$FILES" == *"backend/decky_plugin.pyi"* ]]; then
+          STUB_CHANGED="true"
           echo "Stub has changed, pushing updated stub"
         else
           echo "Stub has not changed, exiting."
@@ -48,7 +48,7 @@ jobs:
       env:
         API_TOKEN_GITHUB: ${{ secrets.GITHUB_TOKEN }}
       with:
-        source_file: 'plugin/decky_plugin.pyi'
+        source_file: 'backend/decky_plugin.pyi'
         destination_repo: 'SteamDeckHomebrew/decky-plugin-template'
         user_email: '11465594+TrainDoctor@users.noreply.github.com'
         user_name: 'TrainDoctor'

.github/workflows/typecheck.yml

@@ -10,13 +10,21 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2 # Check out the repository first.
+      - uses: actions/checkout@v3 # Check out the repository first.
 
-      - name: Install Python dependencies
+      - name: Set up Python 3.10.6 🐍
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10.6"
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: false
+
+      - name: Install Python dependencies ⬇️
         working-directory: backend
-        run: |
-          python -m pip install --upgrade pip
-          [ -f requirements.txt ] && pip install -r requirements.txt
+        run: poetry install --no-interaction
 
       - name: Install TypeScript dependencies
         working-directory: frontend

.gitignore

@@ -29,7 +29,7 @@ MANIFEST
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
-*.spec
+backend/dist/
 
 # Installer logs
 pip-log.txt
@@ -161,4 +161,6 @@ backend/static
 # plugins folder for local launches
 plugins/*
 act/.directory
-act/artifacts/*
+act/artifacts/*
+bin/act
+settings/

.vscode/tasks.json

@@ -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}' pyproject.toml poetry.lock deck@${config:deckip}:${config:deckdir}/homebrew/dev/pluginloader && ssh deck@${config:deckip} -p ${config:deckport} ${config:deckkey} 'python -m ensurepip && python -m pip install --upgrade poetry && cd ${config:deckdir}/homebrew/dev/pluginloader/backend && python -m poetry install'",
             "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='backend/decky_loader/__pycache__/' --exclude='.gitignore' . deck@${config:deckip}:${config:deckdir}/homebrew/dev/pluginloader",
             "problemMatcher": []
         },
         // RUN
@@ -185,6 +185,14 @@
                 "runpydeck"
             ],
             "problemMatcher": []
+        },
+        {
+            "label": "act",
+            "type": "shell",
+            "group": "none",
+            "detail": "Run the act thing",
+            "command": "./act/run-act.sh release",
+            "problemMatcher": []
         }
     ]
 }

act/run-act.sh

@@ -1,44 +1,47 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -eo pipefail
 
 type=$1
 # bump=$2
 
 oldartifactsdir="old"
 
-parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
-cd "$parent_path"
+parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" || exit ; pwd -P )
+cd "$parent_path" || exit
 
-artifactfolders=$(find artifacts/ -maxdepth 1 -mindepth 1 -type d)
-if [[ ${#artifactfolders[@]} > 0 ]]; then
-    for i in ${artifactfolders[@]}; do
-        foldername=$(dirname $i)
-        subfoldername=$(basename $i)
-        out=$foldername/$oldartifactsdir/$subfoldername-$(date +'%s')
-        if [[ ! "$subfoldername" =~ "$oldartifactsdir" ]]; then
-            mkdir -p $out
-            mv $i $out
-            printf "Moved "${foldername}"/"${subfoldername}" to "${out}" \n"
-        fi
-    done
-fi
+for i in artifacts/*; do
+    if [[ ! -d "$i" ]]; then
+        continue;
+    fi
+    subfoldername=$(basename "$i")
+
+    if [[ "$subfoldername" == "$oldartifactsdir" ]]; then
+        continue;
+    fi
+
+    out=artifacts/$oldartifactsdir/$subfoldername-$(date +'%s')
+    mkdir -p "$out"
+    mv "$i" "$out"
+    echo "Moved artifacts/${subfoldername} to ${out}"
+done
 
 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"
 fi
 
-cd act/artifacts
+cd act/artifacts || exit
 
 if [[ -d "1" ]]; then
-    cd "1/artifact"
+    cd "1/artifact" || exit
     cp "PluginLoader.gz__" "PluginLoader.gz"
     gzip -d "PluginLoader.gz"
     chmod +x PluginLoader

backend/decky_loader/browser.py

@@ -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
@@ -18,7 +17,7 @@ from enum import IntEnum
 from typing import Dict, List, TypedDict
 
 # Local modules
-from .localplatform import chown, chmod
+from .localplatform.localplatform import chown, chmod
 from .loader import Loader, Plugins
 from .helpers import get_ssl_context, download_remote_binary_to_path
 from .settings import SettingsManager
@@ -138,7 +137,7 @@ class PluginBrowser:
             # logger.debug("current plugins: %s", snapshot_string)
             if name in self.plugins:
                 logger.debug("Plugin %s was found", name)
-                self.plugins[name].stop(uninstall=True)
+                self.plugins[name].stop()
                 logger.debug("Plugin %s was stopped", name)
                 del self.plugins[name]
                 logger.debug("Plugin %s was removed from the dictionary", name)
@@ -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://"):
@@ -193,28 +198,6 @@ class PluginBrowser:
                 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}")
@@ -289,16 +272,12 @@ class PluginBrowser:
         Args:
             name (string): The name of the plugin
         """
-        frozen_plugins = self.settings.getSetting("frozenPlugins", [])
-        if name in frozen_plugins:
-            frozen_plugins.remove(name)
-            self.settings.setSetting("frozenPlugins", frozen_plugins)
-
         hidden_plugins = self.settings.getSetting("hiddenPlugins", [])
         if name in hidden_plugins:
             hidden_plugins.remove(name)
             self.settings.setSetting("hiddenPlugins", hidden_plugins)
 
+
         plugin_order = self.settings.getSetting("pluginOrder", [])
 
         if name in plugin_order:

backend/decky_loader/helpers.py

@@ -10,7 +10,7 @@ import certifi
 from aiohttp.web import Request, Response, middleware
 from aiohttp.typedefs import Handler
 from aiohttp import ClientSession
-from . import localplatform
+from .localplatform import localplatform
 from .customtypes import UserType
 from logging import getLogger
 
@@ -32,7 +32,7 @@ def get_csrf_token():
 
 @middleware
 async def csrf_middleware(request: Request, handler: Handler):
-    if str(request.method) == "OPTIONS" or request.headers.get('Authentication') == csrf_token or str(request.rel_url) == "/auth/token" or str(request.rel_url).startswith("/plugins/load_main/") or str(request.rel_url).startswith("/static/") or str(request.rel_url).startswith("/legacy/") or str(request.rel_url).startswith("/steam_resource/") or str(request.rel_url).startswith("/frontend/") or assets_regex.match(str(request.rel_url)) or frontend_regex.match(str(request.rel_url)):
+    if str(request.method) == "OPTIONS" or request.headers.get('Authentication') == csrf_token or str(request.rel_url) == "/auth/token" or str(request.rel_url).startswith("/plugins/load_main/") or str(request.rel_url).startswith("/static/") or str(request.rel_url).startswith("/steam_resource/") or str(request.rel_url).startswith("/frontend/") or assets_regex.match(str(request.rel_url)) or frontend_regex.match(str(request.rel_url)):
         return await handler(request)
     return Response(text='Forbidden', status=403)
 

backend/decky_loader/injector.py

@@ -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)

backend/decky_loader/loader.py

@@ -16,12 +16,16 @@ from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from .main import PluginManager
 
-from .injector import get_tab, get_gamepadui_tab
-from .plugin import PluginWrapper
+from .injector import get_gamepadui_tab
+from .plugin.plugin import PluginWrapper
 
 Plugins = dict[str, PluginWrapper]
 ReloadQueue = Queue[Tuple[str, str, bool | None] | Tuple[str, str]]
 
+#TODO: Remove placeholder method
+async def log_plugin_emitted_message(message: Any):
+    getLogger().debug(f"EMITTED MESSAGE: " + str(message))
+
 class FileChangeHandler(RegexMatchingEventHandler):
     def __init__(self, queue: ReloadQueue, plugin_path: str) -> None:
         super().__init__(regexes=[r'^.*?dist\/index\.js$', r'^.*?main\.py$']) # type: ignore
@@ -91,12 +95,7 @@ class Loader:
             web.get("/plugins/{plugin_name}/frontend_bundle", self.handle_frontend_bundle),
             web.post("/plugins/{plugin_name}/methods/{method_name}", self.handle_plugin_method_call),
             web.get("/plugins/{plugin_name}/assets/{path:.*}", self.handle_plugin_frontend_assets),
-            web.post("/plugins/{plugin_name}/reload", self.handle_backend_reload_request),
-
-            # The following is legacy plugin code.
-            web.get("/plugins/load_main/{name}", self.load_plugin_main_view),
-            web.get("/plugins/plugin_resource/{name}/{path:.+}", self.handle_sub_route),
-            web.get("/steam_resource/{path:.+}", self.get_steam_resource)
+            web.post("/plugins/{plugin_name}/reload", self.handle_backend_reload_request)
         ])
 
     async def enable_reload_wait(self):
@@ -107,13 +106,12 @@ class Loader:
                 self.watcher.disabled = False
 
     async def handle_frontend_assets(self, request: web.Request):
-        file = path.join(path.dirname(__file__), "..", "static", request.match_info["path"])
-
+        file = Path(__file__).parents[1].joinpath("static").joinpath(request.match_info["path"])
         return web.FileResponse(file, headers={"Cache-Control": "no-cache"})
 
     async def handle_frontend_locales(self, request: web.Request):
         req_lang = request.match_info["path"]
-        file = path.join(path.dirname(__file__), "..", "locales", req_lang)
+        file = Path(__file__).parents[1].joinpath("locales").joinpath(req_lang)
         if exists(file):
             return web.FileResponse(file, headers={"Cache-Control": "no-cache", "Content-Type": "application/json"})
         else:
@@ -122,7 +120,7 @@ class Loader:
 
     async def get_plugins(self, request: web.Request):
         plugins = list(self.plugins.values())
-        return web.json_response([{"name": str(i) if not i.legacy else "$LEGACY_"+str(i), "version": i.version} for i in plugins])
+        return web.json_response([{"name": str(i), "version": i.version} for i in plugins])
 
     async def handle_plugin_frontend_assets(self, request: web.Request):
         plugin = self.plugins[request.match_info["plugin_name"]]
@@ -149,9 +147,10 @@ class Loader:
             if plugin.passive:
                 self.logger.info(f"Plugin {plugin.name} is passive")
             self.plugins[plugin.name] = plugin.start()
+            self.plugins[plugin.name].set_emitted_message_callback(log_plugin_emitted_message)
             self.logger.info(f"Loaded {plugin.name}")
             if not batch:
-                self.loop.create_task(self.dispatch_plugin(plugin.name if not plugin.legacy else "$LEGACY_" + plugin.name, plugin.version))
+                self.loop.create_task(self.dispatch_plugin(plugin.name, plugin.version))
         except Exception as e:
             self.logger.error(f"Could not load {file}. {e}")
             print_exc()
@@ -192,43 +191,6 @@ class Loader:
             res["success"] = False
         return web.json_response(res)
 
-    """
-    The following methods are used to load legacy plugins, which are considered deprecated.
-    I made the choice to re-add them so that the first iteration/version of the react loader
-    can work as a drop-in replacement for the stable branch of the PluginLoader, so that we
-    can introduce it more smoothly and give people the chance to sample the new features even
-    without plugin support. They will be removed once legacy plugins are no longer relevant.
-    """
-    async def load_plugin_main_view(self, request: web.Request):
-        plugin = self.plugins[request.match_info["name"]]
-        with open(path.join(self.plugin_path, plugin.plugin_directory, plugin.main_view_html), "r", encoding="utf-8") as template:
-            template_data = template.read()
-            ret = f"""
-            <script src="/legacy/library.js"></script>
-            <script>window.plugin_name = '{plugin.name}' </script>
-            <base href="http://127.0.0.1:1337/plugins/plugin_resource/{plugin.name}/">
-            {template_data}
-            """
-            return web.Response(text=ret, content_type="text/html")
-
-    async def handle_sub_route(self, request: web.Request):
-        plugin = self.plugins[request.match_info["name"]]
-        route_path = request.match_info["path"]
-        self.logger.info(path)
-        ret = ""
-        file_path = path.join(self.plugin_path, plugin.plugin_directory, route_path)
-        with open(file_path, "r", encoding="utf-8") as resource_data:
-            ret = resource_data.read()
-
-        return web.Response(text=ret)
-
-    async def get_steam_resource(self, request: web.Request):
-        tab = await get_tab("SP")
-        try:
-            return web.Response(text=await tab.get_steam_resource(f"https://steamloopback.host/{request.match_info['path']}"), content_type="text/html")
-        except Exception as e:
-            return web.Response(text=str(e), status=400)
-
     async def handle_backend_reload_request(self, request: web.Request):
         plugin_name : str = request.match_info["plugin_name"]
         plugin = self.plugins[plugin_name]

backend/decky_loader/localplatform/localplatformlinux.py

@@ -1,6 +1,6 @@
 import os, pwd, grp, sys, logging
 from subprocess import call, run, DEVNULL, PIPE, STDOUT
-from .customtypes import UserType
+from ..customtypes import UserType
 
 logger = logging.getLogger("localplatform")
 
@@ -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,35 +125,23 @@ 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
 
-async def restart_webhelper() -> bool:
-    logger.info("Restarting steamwebhelper")
-    # TODO move to pkill
-    res = run(["killall", "-s", "SIGTERM", "steamwebhelper"], stdout=DEVNULL, stderr=DEVNULL)
-    return res.returncode == 0
-
 def get_privileged_path() -> str:
     path = os.getenv("PRIVILEGED_PATH")
 
     if path == None:
         path = get_unprivileged_path()
 
+    os.makedirs(path, exist_ok=True)
+
     return path
 
 def _parent_dir(path : str | None) -> str | None:
@@ -187,8 +161,13 @@ def get_unprivileged_path() -> str:
     
     if path == None:
         logger.debug("Unprivileged path is not properly configured. Making something up!")
-        # Expected path of loader binary is /home/deck/homebrew/service/PluginLoader
-        path = _parent_dir(_parent_dir(os.path.realpath(sys.argv[0])))
+
+        if hasattr(sys, 'frozen'):
+            # Expected path of loader binary is /home/deck/homebrew/service/PluginLoader
+            path = _parent_dir(_parent_dir(os.path.realpath(sys.argv[0])))
+        else:
+            # Expected path of this file is $src_root/backend/src/localplatformlinux.py
+            path = _parent_dir(_parent_dir(_parent_dir(__file__)))
 
         if path != None and not os.path.exists(path):
             path = None
@@ -197,6 +176,8 @@ def get_unprivileged_path() -> str:
         logger.warn("Unprivileged path is not properly configured. Defaulting to /home/deck/homebrew")
         path = "/home/deck/homebrew" # We give up
     
+    os.makedirs(path, exist_ok=True)
+
     return path
 
 

backend/decky_loader/localplatform/localplatformwin.py

@@ -1,4 +1,4 @@
-from .customtypes import UserType
+from ..customtypes import UserType
 import os, sys
 
 def chown(path : str,  user : UserType = UserType.HOST_USER, recursive : bool = True) -> bool:
@@ -47,6 +47,8 @@ def get_unprivileged_path() -> str:
     if path == None:
         path = os.getenv("PRIVILEGED_PATH", os.path.join(os.path.expanduser("~"), "homebrew"))
 
+    os.makedirs(path, exist_ok=True)
+
     return path
 
 def get_unprivileged_user() -> str:

backend/decky_loader/localplatform/localsocket.py

@@ -1,5 +1,5 @@
 import asyncio, time
-from typing import Awaitable, Callable
+from typing import Any, Callable, Coroutine
 import random
 
 from .localplatform import ON_WINDOWS
@@ -7,7 +7,7 @@ from .localplatform import ON_WINDOWS
 BUFFER_LIMIT = 2 ** 20  # 1 MiB
 
 class UnixSocket:
-    def __init__(self, on_new_message: Callable[[str], Awaitable[str|None]]):
+    def __init__(self, on_new_message: Callable[[str], Coroutine[Any, Any, Any]]):
         '''
         on_new_message takes 1 string argument.
         It's return value gets used, if not None, to write data to the socket.
@@ -18,6 +18,7 @@ class UnixSocket:
         self.socket = None
         self.reader = None
         self.writer = None
+        self.server_writer = None
 
     async def setup_server(self):
         self.socket = await asyncio.start_unix_server(self._listen_for_method_call, path=self.socket_addr, limit=BUFFER_LIMIT)
@@ -90,21 +91,26 @@ class UnixSocket:
 
         writer.write(message.encode("utf-8"))
         await writer.drain()
+    
+    async def write_single_line_server(self, message: str):
+        if self.server_writer is None:
+            return
+        await self._write_single_line(self.server_writer, message)
 
     async def _listen_for_method_call(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
+        self.server_writer = writer
         while True:
+
+            def _(task: asyncio.Task[str|None]):
+                res = task.result()
+                if res is not None:
+                    asyncio.create_task(self._write_single_line(writer, res))
+
             line = await self._read_single_line(reader)
-
-            try:
-                res = await self.on_new_message(line)
-            except Exception:
-                return
-
-            if res != None:
-                await self._write_single_line(writer, res)
+            asyncio.create_task(self.on_new_message(line)).add_done_callback(_)
             
 class PortSocket (UnixSocket):
-    def __init__(self, on_new_message: Callable[[str], Awaitable[str|None]]):
+    def __init__(self, on_new_message: Callable[[str], Coroutine[Any, Any, Any]]):
         '''
         on_new_message takes 1 string argument.
         It's return value gets used, if not None, to write data to the socket.

backend/decky_loader/main.py

@@ -1,10 +1,10 @@
 # Change PyInstaller files permissions
 import sys
 from typing import Dict
-from .localplatform import (chmod, chown, service_stop, service_start,
-                            ON_WINDOWS, ON_LINUX, get_log_level, get_live_reload, 
+from .localplatform.localplatform import (chmod, chown, service_stop, service_start,
+                            ON_WINDOWS, get_log_level, get_live_reload, 
                             get_server_port, get_server_host, get_chown_plugin_path,
-                            get_privileged_path, restart_webhelper)
+                            get_privileged_path)
 if hasattr(sys, '_MEIPASS'):
     chmod(sys._MEIPASS, 755) # type: ignore
 # Full imports
@@ -22,7 +22,7 @@ from aiohttp_jinja2 import setup as jinja_setup
 
 # local modules
 from .browser import PluginBrowser
-from .helpers import (REMOTE_DEBUGGER_UNIT, csrf_middleware, get_csrf_token,
+from .helpers import (REMOTE_DEBUGGER_UNIT, csrf_middleware, get_csrf_token, get_loader_version,
                      mkdir_as_user, get_system_pythonpaths, get_effective_user_id)
                      
 from .injector import get_gamepadui_tab, Tab, close_old_tabs
@@ -87,7 +87,6 @@ class PluginManager:
         for route in list(self.web_app.router.routes()):
             self.cors.add(route) # type: ignore
         self.web_app.add_routes([static("/static", path.join(path.dirname(__file__), '..', 'static'))])
-        self.web_app.add_routes([static("/legacy", path.join(path.dirname(__file__), 'legacy'))])
 
     def exception_handler(self, loop: AbstractEventLoop, context: Dict[str, str]):
         if context["message"] == "Unclosed connection":
@@ -158,10 +157,10 @@ class PluginManager:
     async def inject_javascript(self, tab: Tab, first: bool=False, request: Request|None=None):
         logger.info("Loading Decky frontend!")
         try:
-            # if first:
-            if ON_LINUX and await tab.has_global_var("deckyHasLoaded", False):
-                await restart_webhelper()
-            await tab.evaluate_js("try{if (window.deckyHasLoaded){setTimeout(() => SteamClient.Browser.RestartJSContext(), 100)}else{window.deckyHasLoaded = true;(async()=>{try{while(!window.webpackChunksteamui){await new Promise(r => setTimeout(r, 10))};await import('http://localhost:1337/frontend/index.js')}catch(e){console.error(e)};})();}}catch(e){console.error(e)}", False, False, False)
+            if first:
+                if await tab.has_global_var("deckyHasLoaded", False):
+                    await close_old_tabs()
+            await tab.evaluate_js("try{if (window.deckyHasLoaded){setTimeout(() => location.reload(), 100)}else{window.deckyHasLoaded = true;(async()=>{try{while(!window.SP_REACT){await new Promise(r => setTimeout(r, 10))};await import('http://localhost:1337/frontend/index.js?v=%s')}catch(e){console.error(e)};})();}}catch(e){console.error(e)}" % (get_loader_version(), ), False, False, False)
         except:
             logger.info("Failed to inject JavaScript into tab\n" + format_exc())
             pass
@@ -181,9 +180,6 @@ def main():
       if get_effective_user_id() != 0:
         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"))
-
     # Append the system and user python paths
     sys.path.extend(get_system_pythonpaths())
 

backend/decky_loader/plugin/method_call_request.py

@@ -0,0 +1,29 @@
+from typing import Any, TypedDict
+from uuid import uuid4
+from asyncio import Event
+
+class SocketResponseDict(TypedDict):
+    id: str
+    success: bool
+    res: Any
+
+class MethodCallResponse:
+    def __init__(self, success: bool, result: Any) -> None:
+        self.success = success
+        self.result = result
+
+class MethodCallRequest:
+    def __init__(self) -> None:
+        self.id = str(uuid4())
+        self.event = Event()
+        self.response: MethodCallResponse
+    
+    def set_result(self, dc: SocketResponseDict):
+        self.response = MethodCallResponse(dc["success"], dc["res"])
+        self.event.set()
+    
+    async def wait_for_result(self):
+        await self.event.wait()
+        if not self.response.success:
+            raise Exception(self.response.result)
+        return self.response.result

backend/decky_loader/plugin/plugin.py

@@ -0,0 +1,84 @@
+from asyncio import Task, create_task
+from json import dumps, load, loads
+from logging import getLogger
+from os import path
+from multiprocessing import Process
+
+from .sandboxed_plugin import SandboxedPlugin
+from .method_call_request import MethodCallRequest
+from ..localplatform.localsocket import LocalSocket
+
+from typing import Any, Callable, Coroutine, Dict
+
+class PluginWrapper:
+    def __init__(self, file: str, plugin_directory: str, plugin_path: str) -> None:
+        self.file = file
+        self.plugin_path = plugin_path
+        self.plugin_directory = plugin_directory
+
+        self.version = None
+
+        json = load(open(path.join(plugin_path, plugin_directory, "plugin.json"), "r", encoding="utf-8"))
+        if path.isfile(path.join(plugin_path, plugin_directory, "package.json")):
+            package_json = load(open(path.join(plugin_path, plugin_directory, "package.json"), "r", encoding="utf-8"))
+            self.version = package_json["version"]
+
+        self.name = json["name"]
+        self.author = json["author"]
+        self.flags = json["flags"]
+        
+        self.passive = not path.isfile(self.file)
+
+        self.log = getLogger("plugin")
+
+        self.sandboxed_plugin = SandboxedPlugin(self.name, self.passive, self.flags, self.file, self.plugin_directory, self.plugin_path, self.version, self.author)
+        #TODO: Maybe make LocalSocket not require on_new_message to make this cleaner
+        self._socket = LocalSocket(self.sandboxed_plugin.on_new_message)
+        self._listener_task: Task[Any]
+        self._method_call_requests: Dict[str, MethodCallRequest] = {}
+
+        self.emitted_message_callback: Callable[[Dict[Any, Any]], Coroutine[Any, Any, Any]]
+
+    def __str__(self) -> str:
+        return self.name
+    
+    async def _response_listener(self):
+        while True:
+            try:
+                line = await self._socket.read_single_line()
+                if line != None:
+                    res = loads(line)
+                    if res["id"] == "0":
+                        create_task(self.emitted_message_callback(res["payload"]))
+                    else:
+                        self._method_call_requests.pop(res["id"]).set_result(res)
+            except:
+                pass
+
+    def set_emitted_message_callback(self, callback: Callable[[Dict[Any, Any]], Coroutine[Any, Any, Any]]):
+        self.emitted_message_callback = callback
+
+    async def execute_method(self, method_name: str, kwargs: Dict[Any, Any]):
+        if self.passive:
+            raise RuntimeError("This plugin is passive (aka does not implement main.py)")
+        
+        request = MethodCallRequest()
+        await self._socket.get_socket_connection()
+        await self._socket.write_single_line(dumps({ "method": method_name, "args": kwargs, "id": request.id }, ensure_ascii=False))
+        self._method_call_requests[request.id] = request
+
+        return await request.wait_for_result()
+    
+    def start(self):
+        if self.passive:
+            return self
+        Process(target=self.sandboxed_plugin.initialize, args=[self._socket]).start()
+        self._listener_task = create_task(self._response_listener())
+        return self
+
+    def stop(self):
+        self._listener_task.cancel()
+        async def _(self: PluginWrapper):
+            await self._socket.write_single_line(dumps({ "stop": True }, ensure_ascii=False))
+            await self._socket.close_socket_connection()
+        create_task(_(self))

backend/decky_loader/plugin/sandboxed_plugin.py

@@ -1,51 +1,45 @@
-import multiprocessing
-from asyncio import (Lock, get_event_loop, new_event_loop,
-                     set_event_loop, sleep)
-from importlib.util import module_from_spec, spec_from_file_location
-from json import dumps, load, loads
-from logging import getLogger
-from traceback import format_exc
 from os import path, environ
 from signal import SIGINT, signal
+from importlib.util import module_from_spec, spec_from_file_location
+from json import dumps, loads
+from logging import getLogger
 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
-from .customtypes import UserType
-from . import helpers
+from traceback import format_exc
+from asyncio import (get_event_loop, new_event_loop,
+                     set_event_loop, sleep)
 
-class PluginWrapper:
-    def __init__(self, file: str, plugin_directory: str, plugin_path: str) -> None:
+from .method_call_request import SocketResponseDict
+from ..localplatform.localsocket import LocalSocket
+from ..localplatform.localplatform import setgid, setuid, get_username, get_home_path
+from ..customtypes import UserType
+from .. import helpers
+
+from typing import Any, Dict, List
+
+class SandboxedPlugin:
+    def __init__(self,
+                 name: str,
+                 passive: bool,
+                 flags: List[str],
+                 file: str,
+                 plugin_directory: str,
+                 plugin_path: str,
+                 version: str|None,
+                 author: str) -> None:
+        self.name = name
+        self.passive = passive
+        self.flags = flags
         self.file = file
         self.plugin_path = plugin_path
         self.plugin_directory = plugin_directory
-        self.method_call_lock = Lock()
-        self.socket: LocalSocket = LocalSocket(self._on_new_message)
-
-        self.version = None
-
-        json = load(open(path.join(plugin_path, plugin_directory, "plugin.json"), "r", encoding="utf-8"))
-        if path.isfile(path.join(plugin_path, plugin_directory, "package.json")):
-            package_json = load(open(path.join(plugin_path, plugin_directory, "package.json"), "r", encoding="utf-8"))
-            self.version = package_json["version"]
-
-        self.legacy = False
-        self.main_view_html = json["main_view_html"] if "main_view_html" in json else ""
-        self.tile_view_html = json["tile_view_html"] if "tile_view_html" in json else ""
-        self.legacy = self.main_view_html or self.tile_view_html
-
-        self.name = json["name"]
-        self.author = json["author"]
-        self.flags = json["flags"]
+        self.version = version
+        self.author = author
 
         self.log = getLogger("plugin")
 
-        self.passive = not path.isfile(self.file)
+    def initialize(self, socket: LocalSocket):
+        self._socket = socket
 
-    def __str__(self) -> str:
-        return self.name
-
-    def _init(self):
         try:
             signal(SIGINT, lambda s, f: exit(0))
 
@@ -78,11 +72,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.")]
+            keys = [key for key in sysmodules if key.startswith("decky_loader.")]
             for key in keys:
-                sysmodules[key] = sysmodules["src"].__dict__[key]
+                sysmodules[key.replace("decky_loader.", "")] = sysmodules[key]
 
             spec = spec_from_file_location("_", self.file)
             assert spec is not None
@@ -91,11 +85,14 @@ class PluginWrapper:
             spec.loader.exec_module(module)
             self.Plugin = module.Plugin
 
+            setattr(self.Plugin, "emit_message", self.emit_message)
+            #TODO: Find how to put emit_message on global namespace so it doesn't pollute Plugin
+
             if hasattr(self.Plugin, "_migration"):
                 get_event_loop().run_until_complete(self.Plugin._migration(self.Plugin))
             if hasattr(self.Plugin, "_main"):
                 get_event_loop().create_task(self.Plugin._main(self.Plugin))
-            get_event_loop().create_task(self.socket.setup_server())
+            get_event_loop().create_task(socket.setup_server())
             get_event_loop().run_forever()
         except:
             self.log.error("Failed to start " + self.name + "!\n" + format_exc())
@@ -113,37 +110,19 @@ class PluginWrapper:
             self.log.error("Failed to unload " + self.name + "!\n" + format_exc())
             exit(0)
 
-    async def _uninstall(self):
-        try:
-            self.log.info("Attempting to uninstall with plugin " + self.name + "'s \"_uninstall\" function.\n")
-            if hasattr(self.Plugin, "_uninstall"):
-                await self.Plugin._uninstall(self.Plugin)
-                self.log.info("Uninstalled " + self.name + "\n")
-            else:
-                self.log.info("Could not find \"_uninstall\" in " + self.name + "'s main.py" + "\n")
-        except:
-            self.log.error("Failed to uninstall " + self.name + "!\n" + format_exc())
-            exit(0)
-
-    async def _on_new_message(self, message : str) -> str|None:
+    async def on_new_message(self, message : str) -> str|None:
         data = loads(message)
 
         if "stop" in data:
             self.log.info("Calling Loader unload function.")
             await self._unload()
-
-            if data.get('uninstall'):
-                self.log.info("Calling Loader uninstall function.")
-                await self._uninstall()
-
             get_event_loop().stop()
             while get_event_loop().is_running():
                 await sleep(0)
             get_event_loop().close()
             raise Exception("Closing message listener")
 
-        # TODO there is definitely a better way to type this
-        d: Dict[str, Any] = {"res": None, "success": True}
+        d: SocketResponseDict = {"res": None, "success": True, "id": data["id"]}
         try:
             d["res"] = await getattr(self.Plugin, data["method"])(self.Plugin, **data["args"])
         except Exception as e:
@@ -151,35 +130,9 @@ class PluginWrapper:
             d["success"] = False
         finally:
             return dumps(d, ensure_ascii=False)
-
-    def start(self):
-        if self.passive:
-            return self
-        multiprocessing.Process(target=self._init).start()
-        return self
-
-    def stop(self, uninstall: bool = False):
-        if self.passive:
-            return
-
-        async def _(self: PluginWrapper):
-            await self.socket.write_single_line(dumps({ "stop": True, "uninstall": uninstall }, ensure_ascii=False))
-            await self.socket.close_socket_connection()
-            
-        get_event_loop().create_task(_(self))
-
-    async def execute_method(self, method_name: str, kwargs: Dict[Any, Any]):
-        if self.passive:
-            raise RuntimeError("This plugin is passive (aka does not implement main.py)")
-        async with self.method_call_lock:
-            # reader, writer =
-            await self.socket.get_socket_connection()
-
-            await self.socket.write_single_line(dumps({ "method": method_name, "args": kwargs }, ensure_ascii=False))
-
-            line = await self.socket.read_single_line()
-            if line != None:
-                res = loads(line)
-                if not res["success"]:
-                    raise Exception(res["res"])
-                return res["res"]
+        
+    async def emit_message(self, message: Dict[Any, Any]):
+        await self._socket.write_single_line_server(dumps({
+            "id": "0",
+            "payload": message
+        }))

backend/decky_loader/settings.py

@@ -1,7 +1,7 @@
 from json import dump, load
 from os import mkdir, path, listdir, rename
 from typing import Any, Dict
-from .localplatform import chown, folder_owner, get_chown_plugin_path
+from .localplatform.localplatform import chown, folder_owner, get_chown_plugin_path
 from .customtypes import UserType
 
 from .helpers import get_homebrew_path

backend/decky_loader/updater.py

@@ -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.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)

backend/decky_loader/utilities.py

@@ -18,9 +18,9 @@ from .browser import PluginInstallRequest, PluginInstallType
 if TYPE_CHECKING:
     from .main import PluginManager
 from .injector import inject_to_tab, get_gamepadui_tab, close_old_tabs, get_tab
-from .localplatform import ON_WINDOWS
+from .localplatform.localplatform import ON_WINDOWS
 from . import helpers
-from .localplatform import service_stop, service_start, get_home_path, get_username
+from .localplatform.localplatform import service_stop, service_start, get_home_path, get_username
 
 class FilePickerObj(TypedDict):
     file: Path
@@ -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
@@ -360,7 +360,7 @@ class Utilities:
         tab = await get_gamepadui_tab()
         self.rdt_script_id = None
         await close_old_tabs()
-        await tab.evaluate_js("SteamClient.Browser.RestartJSContext();", False, True, False)
+        await tab.evaluate_js("location.reload();", False, True, False)
         self.logger.info("React DevTools disabled")
 
     async def get_user_info(self) -> Dict[str, str]:

backend/locales/en-US.json

@@ -1,270 +1,260 @@
 {
-    "BranchSelect": {
-        "update_channel": {
-            "label": "Update Channel",
-            "prerelease": "Prerelease",
-            "stable": "Stable",
-            "testing": "Testing"
-        }
-    },
-    "Developer": {
-        "5secreload": "Reloading in 5 seconds",
-        "disabling": "Disabling React DevTools",
-        "enabling": "Enabling React DevTools"
-    },
-    "DropdownMultiselect": {
-        "button": {
-            "back": "Back"
-        }
-    },
-    "FilePickerError": {
-        "errors": {
-            "file_not_found": "The path specified is not valid. Please check it and reenter it correctly.",
-            "perm_denied": "You do not have access to the specified directory. Please check if your user (deck on Steam Deck) has the corresponding permission to access the specified folder/file.",
-            "unknown": "An unknown error occurred. The raw error is: {{raw_error}}"
-        }
-    },
-    "FilePickerIndex": {
-        "file": {
-            "select": "Select this file"
-        },
-        "files": {
-            "all_files": "All Files",
-            "file_type": "File Type",
-            "show_hidden": "Show Hidden Files"
-        },
-        "filter": {
-            "created_asce": "Created (Oldest)",
-            "created_desc": "Created (Newest)",
-            "modified_asce": "Modified (Oldest)",
-            "modified_desc": "Modified (Newest)",
-            "name_asce": "Z-A",
-            "name_desc": "A-Z",
-            "size_asce": "Size (Smallest)",
-            "size_desc": "Size (Largest)"
-        },
-        "folder": {
-            "label": "Folder",
-            "select": "Use this folder",
-            "show_more": "Show more files"
-        }
-    },
-    "MultiplePluginsInstallModal": {
-        "confirm": "Are you sure you want to make the following modifications?",
-        "description": {
-            "install": "Install {{name}} {{version}}",
-            "reinstall": "Reinstall {{name}} {{version}}",
-            "update": "Update {{name}} to {{version}}"
-        },
-        "ok_button": {
-            "idle": "Confirm",
-            "loading": "Working"
-        },
-        "title": {
-            "install_one": "Install 1 plugin",
-            "install_other": "Install {{count}} plugins",
-            "mixed_one": "Modify {{count}} plugin",
-            "mixed_other": "Modify {{count}} plugins",
-            "reinstall_one": "Reinstall 1 plugin",
-            "reinstall_other": "Reinstall {{count}} plugins",
-            "update_one": "Update 1 plugin",
-            "update_other": "Update {{count}} plugins"
-        }
-    },
-    "PluginCard": {
-        "plugin_full_access": "This plugin has full access to your Steam Deck.",
-        "plugin_install": "Install",
-        "plugin_no_desc": "No description provided.",
-        "plugin_version_label": "Plugin Version"
-    },
-    "PluginInstallModal": {
-        "install": {
-            "button_idle": "Install",
-            "button_processing": "Installing",
-            "desc": "Are you sure you want to install {{artifact}} {{version}}?",
-            "title": "Install {{artifact}}"
-        },
-        "no_hash": "This plugin does not have a hash, you are installing it at your own risk.",
-        "reinstall": {
-            "button_idle": "Reinstall",
-            "button_processing": "Reinstalling",
-            "desc": "Are you sure you want to reinstall {{artifact}} {{version}}?",
-            "title": "Reinstall {{artifact}}"
-        },
-        "update": {
-            "button_idle": "Update",
-            "button_processing": "Updating",
-            "desc": "Are you sure you want to update {{artifact}} {{version}}?",
-            "title": "Update {{artifact}}"
-        }
-    },
-    "PluginListIndex": {
-        "freeze": "Freeze updates",
-        "hide": "Quick access: Hide",
-        "no_plugin": "No plugins installed!",
-        "plugin_actions": "Plugin Actions",
-        "reinstall": "Reinstall",
-        "reload": "Reload",
-        "show": "Quick access: Show",
-        "unfreeze": "Allow updates",
-        "uninstall": "Uninstall",
-        "update_all_one": "Update 1 plugin",
-        "update_all_other": "Update {{count}} plugins",
-        "update_to": "Update to {{name}}"
-    },
-    "PluginListLabel": {
-        "hidden": "Hidden from the quick access menu"
-    },
-    "PluginLoader": {
-        "decky_title": "Decky",
-        "decky_update_available": "Update to {{tag_name}} available!",
-        "error": "Error",
-        "plugin_error_uninstall": "Loading {{name}} caused an exception as shown above. This usually means that the plugin requires an update for the new version of SteamUI. Check if an update is present or evaluate its removal in the Decky settings, in the Plugins section.",
-        "plugin_load_error": {
-            "message": "Error loading plugin {{name}}",
-            "toast": "Error loading {{name}}"
-        },
-        "plugin_uninstall": {
-            "button": "Uninstall",
-            "desc": "Are you sure you want to uninstall {{name}}?",
-            "title": "Uninstall {{name}}"
-        },
-        "plugin_update_one": "Updates available for 1 plugin!",
-        "plugin_update_other": "Updates available for {{count}} plugins!"
-    },
-    "PluginView": {
-        "hidden_one": "1 plugin is hidden from this list",
-        "hidden_other": "{{count}} plugins are hidden from this list"
-    },
-    "RemoteDebugging": {
-        "remote_cef": {
-            "desc": "Allow unauthenticated access to the CEF debugger to anyone in your network",
-            "label": "Allow Remote CEF Debugging"
-        }
-    },
-    "SettingsDeveloperIndex": {
-        "cef_console": {
-            "button": "Open Console",
-            "desc": "Opens the CEF Console. Only useful for debugging purposes. Stuff here is potentially dangerous and should only be used if you are a plugin dev, or are directed here by one.",
-            "label": "CEF Console"
-        },
-        "header": "Other",
-        "react_devtools": {
-            "desc": "Enables connection to a computer running React DevTools. Changing this setting will reload Steam. Set the IP address before enabling.",
-            "ip_label": "IP",
-            "label": "Enable React DevTools"
-        },
-        "third_party_plugins": {
-            "button_install": "Install",
-            "button_zip": "Browse",
-            "header": "Third-Party Plugins",
-            "label_desc": "URL",
-            "label_url": "Install Plugin from URL",
-            "label_zip": "Install Plugin from ZIP File"
-        },
-        "valve_internal": {
-            "desc1": "Enables the Valve internal developer menu.",
-            "desc2": "Do not touch anything in this menu unless you know what it does.",
-            "label": "Enable Valve Internal"
-        }
-    },
-    "SettingsGeneralIndex": {
-        "about": {
-            "decky_version": "Decky Version",
-            "header": "About"
-        },
-        "beta": {
-            "header": "Beta participation"
-        },
-        "developer_mode": {
-            "label": "Developer mode"
-        },
-        "notifications": {
-            "decky_updates_label": "Decky update available",
-            "header": "Notifications",
-            "plugin_updates_label": "Plugin updates available"
-        },
-        "other": {
-            "header": "Other"
-        },
-        "updates": {
-            "header": "Updates"
-        }
-    },
-    "SettingsIndex": {
-        "developer_title": "Developer",
-        "general_title": "General",
-        "plugins_title": "Plugins",
-        "testing_title": "Testing"
-    },
-    "Store": {
-        "store_contrib": {
-            "desc": "If you would like to contribute to the Decky Plugin Store, check the SteamDeckHomebrew/decky-plugin-template repository on GitHub. Information on development and distribution is available in the README.",
-            "label": "Contributing"
-        },
-        "store_filter": {
-            "label": "Filter",
-            "label_def": "All"
-        },
-        "store_search": {
-            "label": "Search"
-        },
-        "store_sort": {
-            "label": "Sort",
-            "label_def": "Last Updated (Newest)"
-        },
-        "store_source": {
-            "desc": "All plugin source code is available on SteamDeckHomebrew/decky-plugin-database repository on GitHub.",
-            "label": "Source Code"
-        },
-        "store_tabs": {
-            "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!",
-        "store_testing_warning": {
-            "desc": "You can use this store channel to test bleeding-edge plugin versions. Be sure to leave feedback on GitHub so the plugin can be updated for all users.",
-            "label": "Welcome to the Testing Store Channel"
-        }
-    },
-    "StoreSelect": {
-        "custom_store": {
-            "label": "Custom Store",
-            "url_label": "URL"
-        },
-        "store_channel": {
-            "custom": "Custom",
-            "default": "Default",
-            "label": "Store Channel",
-            "testing": "Testing"
-        }
-    },
-    "TitleView": {
-        "decky_store_desc": "Open Decky Store",
-        "settings_desc": "Open Decky Settings"
-    },
-    "Updater": {
-        "decky_updates": "Decky Updates",
-        "no_patch_notes_desc": "no patch notes for this version",
-        "patch_notes_desc": "Patch Notes",
-        "updates": {
-            "check_button": "Check For Updates",
-            "checking": "Checking",
-            "cur_version": "Current version: {{ver}}",
-            "install_button": "Install Update",
-            "label": "Updates",
-            "lat_version": "Up to date: running {{ver}}",
-            "reloading": "Reloading",
-            "updating": "Updating"
-        }
-    },
-    "Testing": {
-        "download": "Download"
+  "BranchSelect": {
+    "update_channel": {
+      "label": "Update Channel",
+      "prerelease": "Prerelease",
+      "stable": "Stable",
+      "testing": "Testing"
     }
+  },
+  "Developer": {
+    "5secreload": "Reloading in 5 seconds",
+    "disabling": "Disabling React DevTools",
+    "enabling": "Enabling React DevTools"
+  },
+  "DropdownMultiselect": {
+    "button": {
+      "back": "Back"
+    }
+  },
+  "FilePickerError": {
+    "errors": {
+      "file_not_found": "The path specified is not valid. Please check it and reenter it correctly.",
+      "perm_denied": "You do not have access to the specified directory. Please check if your user (deck on Steam Deck) has the corresponding permission to access the specified folder/file.",
+      "unknown": "An unknown error occurred. The raw error is: {{raw_error}}"
+    }
+  },
+  "FilePickerIndex": {
+    "file": {
+      "select": "Select this file"
+    },
+    "files": {
+      "all_files": "All Files",
+      "file_type": "File Type",
+      "show_hidden": "Show Hidden Files"
+    },
+    "filter": {
+      "created_asce": "Created (Oldest)",
+      "created_desc": "Created (Newest)",
+      "modified_asce": "Modified (Oldest)",
+      "modified_desc": "Modified (Newest)",
+      "name_asce": "Z-A",
+      "name_desc": "A-Z",
+      "size_asce": "Size (Smallest)",
+      "size_desc": "Size (Largest)"
+    },
+    "folder": {
+      "label": "Folder",
+      "select": "Use this folder",
+      "show_more": "Show more files"
+    }
+  },
+  "MultiplePluginsInstallModal": {
+    "confirm": "Are you sure you want to make the following modifications?",
+    "description": {
+      "install": "Install {{name}} {{version}}",
+      "reinstall": "Reinstall {{name}} {{version}}",
+      "update": "Update {{name}} to {{version}}"
+    },
+    "ok_button": {
+      "idle": "Confirm",
+      "loading": "Working"
+    },
+    "title": {
+      "install_one": "Install 1 plugin",
+      "install_other": "Install {{count}} plugins",
+      "mixed_one": "Modify {{count}} plugin",
+      "mixed_other": "Modify {{count}} plugins",
+      "reinstall_one": "Reinstall 1 plugin",
+      "reinstall_other": "Reinstall {{count}} plugins",
+      "update_one": "Update 1 plugin",
+      "update_other": "Update {{count}} plugins"
+    }
+  },
+  "PluginCard": {
+    "plugin_full_access": "This plugin has full access to your Steam Deck.",
+    "plugin_install": "Install",
+    "plugin_no_desc": "No description provided.",
+    "plugin_version_label": "Plugin Version"
+  },
+  "PluginInstallModal": {
+    "install": {
+      "button_idle": "Install",
+      "button_processing": "Installing",
+      "desc": "Are you sure you want to install {{artifact}} {{version}}?",
+      "title": "Install {{artifact}}"
+    },
+    "no_hash": "This plugin does not have a hash, you are installing it at your own risk.",
+    "reinstall": {
+      "button_idle": "Reinstall",
+      "button_processing": "Reinstalling",
+      "desc": "Are you sure you want to reinstall {{artifact}} {{version}}?",
+      "title": "Reinstall {{artifact}}"
+    },
+    "update": {
+      "button_idle": "Update",
+      "button_processing": "Updating",
+      "desc": "Are you sure you want to update {{artifact}} {{version}}?",
+      "title": "Update {{artifact}}"
+    }
+  },
+  "PluginListIndex": {
+    "hide": "Quick access: Hide",
+    "no_plugin": "No plugins installed!",
+    "plugin_actions": "Plugin Actions",
+    "reinstall": "Reinstall",
+    "reload": "Reload",
+    "show": "Quick access: Show",
+    "uninstall": "Uninstall",
+    "update_all_one": "Update 1 plugin",
+    "update_all_other": "Update {{count}} plugins",
+    "update_to": "Update to {{name}}"
+  },
+  "PluginListLabel": {
+    "hidden": "Hidden from the quick access menu"
+  },
+  "PluginLoader": {
+    "decky_title": "Decky",
+    "decky_update_available": "Update to {{tag_name}} available!",
+    "error": "Error",
+    "plugin_error_uninstall": "Loading {{name}} caused an exception as shown above. This usually means that the plugin requires an update for the new version of SteamUI. Check if an update is present or evaluate its removal in the Decky settings, in the Plugins section.",
+    "plugin_load_error": {
+      "message": "Error loading plugin {{name}}",
+      "toast": "Error loading {{name}}"
+    },
+    "plugin_uninstall": {
+      "button": "Uninstall",
+      "desc": "Are you sure you want to uninstall {{name}}?",
+      "title": "Uninstall {{name}}"
+    },
+    "plugin_update_one": "Updates available for 1 plugin!",
+    "plugin_update_other": "Updates available for {{count}} plugins!"
+  },
+  "PluginView": {
+    "hidden_one": "1 plugin is hidden from this list",
+    "hidden_other": "{{count}} plugins are hidden from this list"
+  },
+  "RemoteDebugging": {
+    "remote_cef": {
+      "desc": "Allow unauthenticated access to the CEF debugger to anyone in your network",
+      "label": "Allow Remote CEF Debugging"
+    }
+  },
+  "SettingsDeveloperIndex": {
+    "cef_console": {
+      "button": "Open Console",
+      "desc": "Opens the CEF Console. Only useful for debugging purposes. Stuff here is potentially dangerous and should only be used if you are a plugin dev, or are directed here by one.",
+      "label": "CEF Console"
+    },
+    "header": "Other",
+    "react_devtools": {
+      "desc": "Enables connection to a computer running React DevTools. Changing this setting will reload Steam. Set the IP address before enabling.",
+      "ip_label": "IP",
+      "label": "Enable React DevTools"
+    },
+    "third_party_plugins": {
+      "button_install": "Install",
+      "button_zip": "Browse",
+      "header": "Third-Party Plugins",
+      "label_desc": "URL",
+      "label_url": "Install Plugin from URL",
+      "label_zip": "Install Plugin from ZIP File"
+    },
+    "valve_internal": {
+      "desc1": "Enables the Valve internal developer menu.",
+      "desc2": "Do not touch anything in this menu unless you know what it does.",
+      "label": "Enable Valve Internal"
+    }
+  },
+  "SettingsGeneralIndex": {
+    "about": {
+      "decky_version": "Decky Version",
+      "header": "About"
+    },
+    "beta": {
+      "header": "Beta participation"
+    },
+    "developer_mode": {
+      "label": "Developer mode"
+    },
+    "notifications": {
+      "decky_updates_label": "Decky update available",
+      "header": "Notifications",
+      "plugin_updates_label": "Plugin updates available"
+    },
+    "other": {
+      "header": "Other"
+    },
+    "updates": {
+      "header": "Updates"
+    }
+  },
+  "SettingsIndex": {
+    "developer_title": "Developer",
+    "general_title": "General",
+    "plugins_title": "Plugins"
+  },
+  "Store": {
+    "store_contrib": {
+      "desc": "If you would like to contribute to the Decky Plugin Store, check the SteamDeckHomebrew/decky-plugin-template repository on GitHub. Information on development and distribution is available in the README.",
+      "label": "Contributing"
+    },
+    "store_filter": {
+      "label": "Filter",
+      "label_def": "All"
+    },
+    "store_search": {
+      "label": "Search"
+    },
+    "store_sort": {
+      "label": "Sort",
+      "label_def": "Last Updated (Newest)"
+    },
+    "store_source": {
+      "desc": "All plugin source code is available on SteamDeckHomebrew/decky-plugin-database repository on GitHub.",
+      "label": "Source Code"
+    },
+    "store_tabs": {
+      "about": "About",
+      "alph_asce": "Alphabetical (Z to A)",
+      "alph_desc": "Alphabetical (A to Z)",
+      "title": "Browse"
+    },
+    "store_testing_cta": "Please consider testing new plugins to help the Decky Loader team!",
+    "store_testing_warning": {
+      "desc": "You can use this store channel to test bleeding-edge plugin versions. Be sure to leave feedback on GitHub so the plugin can be updated for all users.",
+      "label": "Welcome to the Testing Store Channel"
+    }
+  },
+  "StoreSelect": {
+    "custom_store": {
+      "label": "Custom Store",
+      "url_label": "URL"
+    },
+    "store_channel": {
+      "custom": "Custom",
+      "default": "Default",
+      "label": "Store Channel",
+      "testing": "Testing"
+    }
+  },
+  "TitleView": {
+    "decky_store_desc": "Open Decky Store",
+    "settings_desc": "Open Decky Settings"
+  },
+  "Updater": {
+    "decky_updates": "Decky Updates",
+    "no_patch_notes_desc": "no patch notes for this version",
+    "patch_notes_desc": "Patch Notes",
+    "updates": {
+      "check_button": "Check For Updates",
+      "checking": "Checking",
+      "cur_version": "Current version: {{ver}}",
+      "install_button": "Install Update",
+      "label": "Updates",
+      "lat_version": "Up to date: running {{ver}}",
+      "reloading": "Reloading",
+      "updating": "Updating"
+    }
+  }
 }

backend/locales/fr-FR.json

@@ -56,32 +56,12 @@
     },
     "Developer": {
         "5secreload": "Rechargement dans 5 secondes",
-        "disabling": "Désactivation des React DevTools",
-        "enabling": "Activation des React DevTools"
+        "disabling": "Désactivation",
+        "enabling": "Activation"
     },
     "FilePickerIndex": {
         "folder": {
-            "select": "Utiliser ce dossier",
-            "label": "Dossier",
-            "show_more": "Afficher plus de fichiers"
-        },
-        "files": {
-            "show_hidden": "Afficher les fichiers cachés",
-            "all_files": "Tout les fichiers",
-            "file_type": "Type de fichier"
-        },
-        "file": {
-            "select": "Sélectionner ce fichier"
-        },
-        "filter": {
-            "created_desc": "Création (Plus récent)",
-            "modified_asce": "Modifié (Plus vieux)",
-            "modified_desc": "Modifié (Plus récent)",
-            "created_asce": "Création (Plus vieux)",
-            "name_asce": "Z-A",
-            "name_desc": "A-Z",
-            "size_asce": "Taille (Plus petit)",
-            "size_desc": "Taille (Plus grand)"
+            "select": "Utiliser ce dossier"
         }
     },
     "PluginCard": {
@@ -118,11 +98,9 @@
         "uninstall": "Désinstaller",
         "update_to": "Mettre à jour vers {{name}}",
         "no_plugin": "Aucun plugin installé !",
-        "update_all_one": "Mettre à jour 1 plugin",
-        "update_all_many": "Mettre à jour {{count}} plugins",
-        "update_all_other": "Mettre à jour {{count}} plugins",
-        "show": "Accès Rapide : Afficher",
-        "hide": "Accès rapide : Cacher"
+        "update_all_one": "",
+        "update_all_many": "",
+        "update_all_other": ""
     },
     "PluginLoader": {
         "decky_title": "Decky",
@@ -138,9 +116,9 @@
             "title": "Désinstaller {{name}}",
             "desc": "Êtes-vous sûr.e de vouloir désinstaller {{name}} ?"
         },
-        "plugin_update_one": "Mise à jour disponible pour 1 plugin !",
-        "plugin_update_many": "Mises à jour disponible pour {{count}} plugins !",
-        "plugin_update_other": "Mises à jour disponible pour {{count}} plugins !"
+        "plugin_update_one": "",
+        "plugin_update_many": "",
+        "plugin_update_other": ""
     },
     "RemoteDebugging": {
         "remote_cef": {
@@ -206,43 +184,18 @@
     },
     "MultiplePluginsInstallModal": {
         "title": {
-            "reinstall_one": "Réinstaller 1 plugin",
-            "reinstall_many": "Réinstaller {{count}} plugins",
-            "reinstall_other": "Réinstaller {{count}} plugins",
-            "install_one": "Installer 1 plugin",
-            "install_many": "Installer {{count}} plugins",
-            "install_other": "Installer {{count}} plugins",
-            "mixed_one": "Modifier {{count}} plugin",
-            "mixed_many": "Modifier {{count}} plugins",
-            "mixed_other": "Modifier {{count}} plugins",
-            "update_one": "Mettre à jour 1 plugin",
-            "update_many": "Mettre à jour {{count}} plugins",
-            "update_other": "Mettre à jour {{count}} plugins"
-        },
-        "confirm": "Êtes-vous sûr de vouloir apporter les modifications suivantes ?",
-        "description": {
-            "install": "Installer {{name}} {{version}}",
-            "update": "Mettre à jour {{name}} à {{version}}",
-            "reinstall": "Réinstaller {{name}} {{version}}"
-        },
-        "ok_button": {
-            "idle": "Confirmer",
-            "loading": "En cours"
-        }
-    },
-    "PluginListLabel": {
-        "hidden": "Caché du menu d'accès rapide"
-    },
-    "FilePickerError": {
-        "errors": {
-            "perm_denied": "Vous n'avez pas accès au dossier spécifié. Veuillez vérifier que votre utilisateur (deck sur un Steam Deck) possède les permissions requises pour accéder au dossier/fichier spécifié.",
-            "file_not_found": "Le chemin spécifié n'est pas valide. Veuillez vérifier et essayer à nouveau.",
-            "unknown": "Une erreur inconnue est survenue. L'erreur est : {{raw_error}}"
-        }
-    },
-    "DropdownMultiselect": {
-        "button": {
-            "back": "Retour"
+            "reinstall_one": "",
+            "reinstall_many": "",
+            "reinstall_other": "",
+            "install_one": "",
+            "install_many": "",
+            "install_other": "",
+            "mixed_one": "",
+            "mixed_many": "",
+            "mixed_other": "",
+            "update_one": "",
+            "update_many": "",
+            "update_other": ""
         }
     }
 }

backend/locales/it-IT.json

@@ -113,9 +113,7 @@
         "update_all_one": "Aggiorna un plugin",
         "update_all_many": "Aggiorna {{count}} plugins",
         "update_all_other": "Aggiorna {{count}} plugins",
-        "update_to": "Aggiorna a {{name}}",
-        "unfreeze": "Permetti aggiornamenti",
-        "freeze": "Congela aggiornamenti"
+        "update_to": "Aggiorna a {{name}}"
     },
     "PluginListLabel": {
         "hidden": "Nascosto dal menu di accesso rapido"
@@ -201,8 +199,7 @@
     "SettingsIndex": {
         "developer_title": "Sviluppatore",
         "general_title": "Generali",
-        "plugins_title": "Plugins",
-        "testing_title": "Testing"
+        "plugins_title": "Plugins"
     },
     "Store": {
         "store_contrib": {
@@ -228,11 +225,7 @@
             "about": "Riguardo a",
             "alph_asce": "Alfabetico (Z a A)",
             "alph_desc": "Alfabetico (A a Z)",
-            "title": "Sfoglia",
-            "date_desc": "Per più recente",
-            "date_asce": "Per più vecchio",
-            "downloads_desc": "Per più scaricato",
-            "downloads_asce": "Per meno scaricato"
+            "title": "Sfoglia"
         },
         "store_testing_cta": "Valuta la possibilità di testare nuovi plugin per aiutare il team di Decky Loader!",
         "store_testing_warning": {
@@ -270,8 +263,5 @@
     "TitleView": {
         "settings_desc": "Apri le impostazioni di Decky",
         "decky_store_desc": "Apri lo store di Decky"
-    },
-    "Testing": {
-        "download": "Scarica"
     }
 }

backend/locales/ja-JP.json

@@ -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デバッガへの非認証アクセスを許可します"
-        }
-    }
-}

backend/locales/nl-NL.json

@@ -1,16 +1,16 @@
 {
     "BranchSelect": {
         "update_channel": {
-            "prerelease": "Prerelease",
+            "prerelease": "Vooruitgave",
             "stable": "Stabiel",
-            "label": "Updatekanaal",
-            "testing": "Testing"
+            "label": "Update Kanaal",
+            "testing": "Test"
         }
     },
     "Developer": {
-        "5secreload": "Bezig met herstarten in 5 seconden",
-        "disabling": "Bezig met uitschakelen van React DevTools",
-        "enabling": "Bezig met inschakelen van React DevTools"
+        "5secreload": "Herlaad in 5 seconden",
+        "disabling": "Uitschakelen React DevTools",
+        "enabling": "Inschakelen React DevTools"
     },
     "DropdownMultiselect": {
         "button": {
@@ -19,34 +19,30 @@
     },
     "FilePickerError": {
         "errors": {
-            "unknown": "Er is een onbekende fout opgetreden. De foutmelding is: {{raw_error}}",
-            "file_not_found": "Het opgegeven pad is niet geldig. Controleer het en voer het opnieuw correct in.",
-            "perm_denied": "U heeft geen toegang tot de opgegeven map. Controleer of uw gebruiker (deck op Steam Deck) de juiste permissies heeft om toegang te krijgen tot de opgegeven map/het opgegeven bestand."
+            "unknown": "Een onbekende fout is opgetreden. De ruwe fout is: {{raw_error}}",
+            "file_not_found": "Het opgegeven pad is niet geldig. Controleer het en voer het opnieuw correct in."
         }
     },
     "FilePickerIndex": {
         "files": {
             "all_files": "Alle bestanden",
             "file_type": "Bestandstype",
-            "show_hidden": "Verborgen bestanden tonen"
+            "show_hidden": "Toon verborgen bestanden"
         },
         "filter": {
-            "created_desc": "Aanmaakdatum (nieuwste)",
-            "modified_asce": "Gewijzigd op (oudste)",
-            "modified_desc": "Gewijzigd op (nieuwste)",
-            "name_asce": "Naam (Z-A)",
-            "name_desc": "Naam (A-Z)",
-            "size_asce": "Grootte (kleinste)",
-            "size_desc": "Grootte (grootste)",
-            "created_asce": "Aanmaakdatum (oudste)"
+            "created_desc": "Gecreëerd ( Nieuwste)",
+            "modified_asce": "Veranderd (Oudste)",
+            "modified_desc": "Veranderd (Nieuwste)",
+            "name_asce": "Z-A",
+            "name_desc": "A-Z",
+            "size_asce": "Grootte (Kleinste)",
+            "size_desc": "Grootte (Grootste)",
+            "created_asce": "Gecreëerd (Oudste)"
         },
         "folder": {
             "label": "Map",
-            "select": "Deze map gebruiken",
-            "show_more": "Meer bestanden tonen"
-        },
-        "file": {
-            "select": "Dit bestand selecteren"
+            "select": "Gebruik deze map",
+            "show_more": "Toon meer bestanden"
         }
     },
     "PluginView": {
@@ -54,13 +50,13 @@
         "hidden_other": "{{count}} plug-ins zijn verborgen in deze lijst"
     },
     "PluginListLabel": {
-        "hidden": "Verborgen in snelle toegang"
+        "hidden": "Verborgen in het snelmenu"
     },
     "PluginCard": {
         "plugin_install": "Installeren",
         "plugin_no_desc": "Geen beschrijving gegeven.",
-        "plugin_version_label": "Plug-inversie",
-        "plugin_full_access": "Deze plug-in heeft volledige toegang tot uw Steam Deck."
+        "plugin_version_label": "Plugin Versie",
+        "plugin_full_access": "Deze plug-in heeft volledige toegang tot je Steam Deck."
     },
     "PluginInstallModal": {
         "install": {
@@ -69,59 +65,59 @@
             "title": "Installeer {{artifact}}",
             "desc": "Weet je zeker dat je {{artifact}} {{version}} wilt installeren?"
         },
-        "no_hash": "Deze plug-in heeft geen hash, je installeert deze op eigen risico.",
+        "no_hash": "Deze plug-in heeft geen hash, u installeert deze op eigen risico.",
         "reinstall": {
-            "button_idle": "Opnieuw installeren",
-            "button_processing": "Bezig met opnieuw te installeren",
+            "button_idle": "Herinstalleren",
+            "button_processing": "Bezig te herinstalleren",
             "desc": "Weet je zeker dat je {{artifact}} {{version}} opnieuw wilt installeren?",
             "title": "Installeer {{artifact}} opnieuw"
         },
         "update": {
-            "button_idle": "Bijwerken",
-            "button_processing": "Bezig met bijwerken",
+            "button_idle": "Update",
+            "button_processing": "Bezig met updaten",
             "title": "{{artifact}} bijwerken",
-            "desc": "Weet je zeker dat je {{artifact}} {{version}} wilt bijwerken?"
+            "desc": "Weet je zeker dat je {{artifact}} {{version}} wilt updaten?"
         }
     },
     "MultiplePluginsInstallModal": {
         "title": {
-            "mixed_one": "Wijzig 1 plug-in",
-            "mixed_other": "Wijzig {{count}} plug-ins",
-            "update_one": "Werk 1 plug-in bij",
-            "update_other": "Werk {{count}} plug-ins bij",
-            "install_one": "Installeer 1 plug-in",
-            "install_other": "Installeer {{count}} plug-ins",
-            "reinstall_one": "Installeer 1 plug-in opnieuw",
-            "reinstall_other": "Installeer {{count}} plug-ins opnieuw"
+            "mixed_one": "Wijzig {{count}} plug-in",
+            "mixed_other": "Pas {{count}} plug-ins aan",
+            "update_one": "1 plugin bijwerken",
+            "update_other": "{{count}} plug-ins bijwerken",
+            "install_one": "Installeer 1 plugin",
+            "install_other": "Installeer {{count}} plugins",
+            "reinstall_one": "1 plugin opnieuw installeren",
+            "reinstall_other": "{{count}} plugins opnieuw installeren"
         },
         "ok_button": {
             "idle": "Bevestigen",
-            "loading": "Bezig"
+            "loading": "Werkend"
         },
-        "confirm": "Weet je zeker dat je de volgende wijzigingen wilt aanbrengen?",
+        "confirm": "Weet u zeker dat u de volgende wijzigingen wilt aanbrengen?",
         "description": {
             "install": "Installeer {{name}} {{version}}",
-            "update": "Werk {{name}} bij naar {{version}}",
-            "reinstall": "Installeer {{name}} {{version}} opnieuw"
+            "update": "Update {{name}} naar {{version}}",
+            "reinstall": "Installeer opnieuw {{name}} {{version}}"
         }
     },
     "PluginListIndex": {
-        "no_plugin": "Geen plug-ins geïnstalleerd!",
-        "plugin_actions": "Plug-inacties",
-        "reload": "Herstarten",
+        "no_plugin": "Geen plugins geïnstalleerd!",
+        "plugin_actions": "Plugin Acties",
+        "reload": "Herladen",
         "uninstall": "Verwijderen",
-        "update_to": "Bijwerken naar {{name}}",
-        "hide": "Verberg in snelle toegang",
-        "update_all_one": "Werk 1 plug-in bij",
-        "update_all_other": "Werk {{count}} plug-ins bij",
+        "update_to": "Update naar {{name}}",
+        "hide": "Snelle toegang: Verberg",
+        "update_all_one": "Update 1 plugin",
+        "update_all_other": "Update {{count}} plugins",
         "reinstall": "Opnieuw installeren",
-        "show": "Toon in snelle toegang"
+        "show": "Snelle toegang: Toon"
     },
     "PluginLoader": {
         "decky_title": "Decky",
         "error": "Fout",
         "plugin_load_error": {
-            "message": "Fout bij het laden van plug-in {{name}}",
+            "message": "Fout bij het laden van plugin {{name}}",
             "toast": "Fout bij het laden van {{name}}"
         },
         "plugin_uninstall": {
@@ -129,70 +125,65 @@
             "desc": "Weet je zeker dat je {{name}} wilt verwijderen?",
             "title": "Verwijder {{name}}"
         },
-        "plugin_update_one": "Updates beschikbaar voor 1 plug-in!",
-        "plugin_update_other": "Updates beschikbaar voor {{count}} plug-ins!",
+        "plugin_update_one": "Updates beschikbaar voor 1 plugin!",
+        "plugin_update_other": "Updates beschikbaar voor {{count}} plugins!",
         "decky_update_available": "Update naar {{tag_name}} beschikbaar!",
-        "plugin_error_uninstall": "Het laden van {{name}} veroorzaakte een fout zoals hierboven weergegeven. Dit betekent meestal dat de plug-in moet worden bijgewerkt voor de nieuwe versie van SteamUI. Controleer of er een update aanwezig is of evalueer de verwijdering ervan in de Decky-instellingen, in het gedeelte Plug-ins."
+        "plugin_error_uninstall": "Het laden van {{name}} veroorzaakte een uitzondering zoals hierboven weergegeven. Dit betekent meestal dat de plug-in een update vereist voor de nieuwe versie van SteamUI. Controleer of er een update aanwezig is of evalueer de verwijdering ervan in de Decky-instellingen, in het gedeelte Plug-ins."
     },
     "RemoteDebugging": {
         "remote_cef": {
-            "desc": "Sta ongeauthenticeerde toegang tot de CEF-debugger toe aan iedereen in uw netwerk",
-            "label": "Externe CEF-debugging toestaan"
+            "desc": "Sta ongeauthenticeerde toegang tot de CEF-foutopsporing toe aan iedereen in uw netwerk",
+            "label": "Externe CEF-foutopsporing toestaan"
         }
     },
     "SettingsDeveloperIndex": {
         "cef_console": {
             "button": "Console openen",
-            "label": "CEF-console",
-            "desc": "Opent de CEF-console. Alleen nuttig voor foutopsporingsdoeleinden. Dingen hier zijn potentieel gevaarlijk en mogen alleen worden gebruikt als je een ontwikkelaar van plug-ins bent, of hier door een ontwikkelaar naartoe wordt geleid."
+            "label": "CEF Bedieningsscherm",
+            "desc": "Opent de CEF-console. Alleen nuttig voor foutopsporingsdoeleinden. Dingen hier zijn potentieel gevaarlijk en mogen alleen worden gebruikt als u een ontwikkelaar van plug-ins bent, of hier door een ontwikkelaar naartoe wordt geleid."
         },
-        "header": "Overige",
+        "header": "Andere",
         "react_devtools": {
-            "ip_label": "IP-adres",
-            "label": "React DevTools inschakelen",
-            "desc": "Maakt verbinding met een computer met React DevTools mogelijk. Als je deze instelling wijzigt, wordt Steam opnieuw geladen. Stel het IP-adres in voordat je het inschakelt."
+            "ip_label": "IP",
+            "label": "Aanzetten React DevTools",
+            "desc": "Maakt verbinding met een computer met React DevTools mogelijk. Als je deze instelling wijzigt, wordt Steam opnieuw geladen. Stel het IP-adres in voordat u het inschakelt."
         },
         "third_party_plugins": {
             "header": "Plug-ins van derden",
             "label_desc": "URL",
-            "label_url": "Installeer plug-in via een URL",
-            "label_zip": "Installeer plug-in via een ZIP-bestand",
+            "label_url": "Installeer Plugin van URL",
+            "label_zip": "Installeer Plugin van Zip bestand",
             "button_install": "Installeren",
             "button_zip": "Bladeren"
         },
         "valve_internal": {
             "desc1": "Schakelt het interne ontwikkelaarsmenu van Valve in.",
-            "desc2": "Pas niets in dit menu aan, tenzij je weet wat het doet.",
+            "desc2": "Raak niets in dit menu aan tenzij u weet wat het doet.",
             "label": "Valve Internal inschakelen"
         }
     },
     "SettingsGeneralIndex": {
         "about": {
-            "decky_version": "Decky-versie",
+            "decky_version": "Decky versie",
             "header": "Over"
         },
         "beta": {
-            "header": "Beta-deelname"
+            "header": "Beta deelname"
         },
         "developer_mode": {
-            "label": "Ontwikkelaarsmodus"
+            "label": "Ontwikkelaars modus"
         },
         "other": {
             "header": "Overige"
         },
         "updates": {
-            "header": "Updates"
-        },
-        "notifications": {
-            "decky_updates_label": "Wanneer er een Decky-update beschikbaar is",
-            "header": "Meldingen",
-            "plugin_updates_label": "Wanneer er plug-in-updates beschikbaar zijn"
+            "header": "Nieuwe Versies"
         }
     },
     "SettingsIndex": {
         "developer_title": "Ontwikkelaar",
         "general_title": "Algemeen",
-        "plugins_title": "Plug-ins"
+        "plugins_title": "Plugins"
     },
     "Store": {
         "store_filter": {
@@ -200,14 +191,14 @@
             "label_def": "Alles"
         },
         "store_search": {
-            "label": "Zoeken"
+            "label": "Zoek"
         },
         "store_sort": {
             "label": "Sorteren",
-            "label_def": "Laatst bijgewerkt (nieuwste)"
+            "label_def": "Laatste Geupdate (Nieuwste)"
         },
         "store_source": {
-            "label": "Broncode",
+            "label": "Bron Code",
             "desc": "Alle broncode van de plug-in is beschikbaar in de SteamDeckHomebrew/decky-plugin-database-repository op GitHub."
         },
         "store_tabs": {
@@ -216,45 +207,37 @@
             "alph_desc": "Alfabetisch (A naar Z)",
             "title": "Bladeren"
         },
-        "store_testing_cta": "Overweeg om nieuwe plug-ins te testen om het Decky Loader-team te helpen!",
+        "store_testing_cta": "Overweeg alsjeblieft om nieuwe plug-ins te testen om het Decky Loader-team te helpen!",
         "store_contrib": {
-            "desc": "Als je wilt bijdragen aan de Decky Plugin Store, kijk dan in de SteamDeckHomebrew/decky-plugin-template repository op GitHub. Informatie over ontwikkeling en distributie is beschikbaar in de README.",
-            "label": "Bijdragen"
-        },
-        "store_testing_warning": {
-            "label": "Welkom bij het Testing-winkelkanaal",
-            "desc": "Je kunt dit winkelkanaal gebruiken om nog in ontwikkeling zijnde plug-inversies te testen. Zorg ervoor dat je feedback geeft op GitHub, zodat de plug-in voor alle gebruikers kan worden bijgewerkt."
+            "desc": "Als je wilt bijdragen aan de Decky Plugin winkel, kijk dan in de SteamDeckHomebrew/decky-plugin-template repository op GitHub. Informatie over ontwikkeling en distributie is beschikbaar in de README.",
+            "label": "Bijdragende"
         }
     },
     "StoreSelect": {
         "custom_store": {
-            "label": "Aangepaste winkel",
+            "label": "Aangepassingen winkel",
             "url_label": "URL"
         },
         "store_channel": {
-            "custom": "Aangepast",
+            "custom": "Aanpassingen",
             "default": "Standaard",
-            "label": "Winkelkanaal",
-            "testing": "Testing"
+            "label": "Winkel Kanaal",
+            "testing": "Testen"
         }
     },
     "Updater": {
-        "patch_notes_desc": "Patch-opmerkingen",
+        "patch_notes_desc": "Correctie opmerkingen",
         "updates": {
-            "check_button": "Op updates controleren",
-            "checking": "Bezig met controleren op updates",
+            "check_button": "Controleer op updates",
+            "checking": "Controleren",
             "cur_version": "Huidige versie: {{ver}}",
-            "install_button": "Bijwerken",
-            "label": "Updates",
-            "lat_version": "Bijwerkt: versie {{ver}}",
-            "reloading": "Bezig met herstarten",
-            "updating": "Bezig met bijwerken"
+            "install_button": "Installeer Update",
+            "label": "Update",
+            "lat_version": "Up-to-date: loopt {{ver}}",
+            "reloading": "Herstarten",
+            "updating": "Aan het updaten"
         },
-        "decky_updates": "Decky-updates",
-        "no_patch_notes_desc": "geen patch-opmerkingen voor deze versie"
-    },
-    "TitleView": {
-        "decky_store_desc": "Decky Store openen",
-        "settings_desc": "Decky-instellingen openen"
+        "decky_updates": "Decky Nieuwe Versies",
+        "no_patch_notes_desc": "geen correctie-opmerkingen voor deze versie"
     }
 }

backend/locales/pl-PL.json

@@ -113,9 +113,7 @@
         "reinstall": "Reinstalacja",
         "show": "Szybki dostęp: Pokaż",
         "uninstall": "Odinstaluj",
-        "update_to": "Zaktualizuj do {{name}}",
-        "unfreeze": "Odblokuj aktualizacje",
-        "freeze": "Zablokuj aktualizacje"
+        "update_to": "Zaktualizuj do {{name}}"
     },
     "PluginLoader": {
         "decky_title": "Decky",
@@ -201,8 +199,7 @@
     "SettingsIndex": {
         "developer_title": "Deweloper",
         "general_title": "Ogólne",
-        "plugins_title": "Pluginy",
-        "testing_title": "Testowanie"
+        "plugins_title": "Pluginy"
     },
     "Store": {
         "store_contrib": {
@@ -228,11 +225,7 @@
             "alph_asce": "Alfabetycznie (od Z do A)",
             "alph_desc": "Alfabetycznie (od A do Z)",
             "title": "Przeglądaj",
-            "about": "Informacje",
-            "date_desc": "Od najnowszych",
-            "downloads_desc": "Najwięcej pobrań",
-            "downloads_asce": "Najmniej pobrań",
-            "date_asce": "Od najstarszych"
+            "about": "Informacje"
         },
         "store_testing_cta": "Rozważ przetestowanie nowych pluginów, aby pomóc zespołowi Decky Loader!",
         "store_testing_warning": {
@@ -270,8 +263,5 @@
     "TitleView": {
         "settings_desc": "Otwórz ustawienia Decky",
         "decky_store_desc": "Otwórz sklep Decky"
-    },
-    "Testing": {
-        "download": "Pobierz"
     }
 }

backend/locales/pt-BR.json

@@ -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"
     }
 }

backend/locales/pt-PT.json

@@ -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"
-        }
     }
 }

backend/main.py

@@ -1,4 +1,4 @@
-# This file is needed to make the relative imports in src/ work properly.
+# This file is needed to make the relative imports in decky_loader/ work properly.
 if __name__ == "__main__":
-    from src.main import main
+    from decky_loader.main import main
     main()

backend/poetry.lock

@@ -0,0 +1,802 @@
+# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
+
+[[package]]
+name = "aiohttp"
+version = "3.8.6"
+description = "Async http client/server framework (asyncio)"
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "aiohttp-3.8.6-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:41d55fc043954cddbbd82503d9cc3f4814a40bcef30b3569bc7b5e34130718c1"},
+    {file = "aiohttp-3.8.6-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1d84166673694841d8953f0a8d0c90e1087739d24632fe86b1a08819168b4566"},
+    {file = "aiohttp-3.8.6-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:253bf92b744b3170eb4c4ca2fa58f9c4b87aeb1df42f71d4e78815e6e8b73c9e"},
+    {file = "aiohttp-3.8.6-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3fd194939b1f764d6bb05490987bfe104287bbf51b8d862261ccf66f48fb4096"},
+    {file = "aiohttp-3.8.6-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6c5f938d199a6fdbdc10bbb9447496561c3a9a565b43be564648d81e1102ac22"},
+    {file = "aiohttp-3.8.6-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2817b2f66ca82ee699acd90e05c95e79bbf1dc986abb62b61ec8aaf851e81c93"},
+    {file = "aiohttp-3.8.6-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0fa375b3d34e71ccccf172cab401cd94a72de7a8cc01847a7b3386204093bb47"},
+    {file = "aiohttp-3.8.6-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9de50a199b7710fa2904be5a4a9b51af587ab24c8e540a7243ab737b45844543"},
+    {file = "aiohttp-3.8.6-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e1d8cb0b56b3587c5c01de3bf2f600f186da7e7b5f7353d1bf26a8ddca57f965"},
+    {file = "aiohttp-3.8.6-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8e31e9db1bee8b4f407b77fd2507337a0a80665ad7b6c749d08df595d88f1cf5"},
+    {file = "aiohttp-3.8.6-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:7bc88fc494b1f0311d67f29fee6fd636606f4697e8cc793a2d912ac5b19aa38d"},
+    {file = "aiohttp-3.8.6-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ec00c3305788e04bf6d29d42e504560e159ccaf0be30c09203b468a6c1ccd3b2"},
+    {file = "aiohttp-3.8.6-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ad1407db8f2f49329729564f71685557157bfa42b48f4b93e53721a16eb813ed"},
+    {file = "aiohttp-3.8.6-cp310-cp310-win32.whl", hash = "sha256:ccc360e87341ad47c777f5723f68adbb52b37ab450c8bc3ca9ca1f3e849e5fe2"},
+    {file = "aiohttp-3.8.6-cp310-cp310-win_amd64.whl", hash = "sha256:93c15c8e48e5e7b89d5cb4613479d144fda8344e2d886cf694fd36db4cc86865"},
+    {file = "aiohttp-3.8.6-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:6e2f9cc8e5328f829f6e1fb74a0a3a939b14e67e80832975e01929e320386b34"},
+    {file = "aiohttp-3.8.6-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e6a00ffcc173e765e200ceefb06399ba09c06db97f401f920513a10c803604ca"},
+    {file = "aiohttp-3.8.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:41bdc2ba359032e36c0e9de5a3bd00d6fb7ea558a6ce6b70acedf0da86458321"},
+    {file = "aiohttp-3.8.6-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:14cd52ccf40006c7a6cd34a0f8663734e5363fd981807173faf3a017e202fec9"},
+    {file = "aiohttp-3.8.6-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2d5b785c792802e7b275c420d84f3397668e9d49ab1cb52bd916b3b3ffcf09ad"},
+    {file = "aiohttp-3.8.6-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1bed815f3dc3d915c5c1e556c397c8667826fbc1b935d95b0ad680787896a358"},
+    {file = "aiohttp-3.8.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:96603a562b546632441926cd1293cfcb5b69f0b4159e6077f7c7dbdfb686af4d"},
+    {file = "aiohttp-3.8.6-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d76e8b13161a202d14c9584590c4df4d068c9567c99506497bdd67eaedf36403"},
+    {file = "aiohttp-3.8.6-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e3f1e3f1a1751bb62b4a1b7f4e435afcdade6c17a4fd9b9d43607cebd242924a"},
+    {file = "aiohttp-3.8.6-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:76b36b3124f0223903609944a3c8bf28a599b2cc0ce0be60b45211c8e9be97f8"},
+    {file = "aiohttp-3.8.6-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:a2ece4af1f3c967a4390c284797ab595a9f1bc1130ef8b01828915a05a6ae684"},
+    {file = "aiohttp-3.8.6-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:16d330b3b9db87c3883e565340d292638a878236418b23cc8b9b11a054aaa887"},
+    {file = "aiohttp-3.8.6-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:42c89579f82e49db436b69c938ab3e1559e5a4409eb8639eb4143989bc390f2f"},
+    {file = "aiohttp-3.8.6-cp311-cp311-win32.whl", hash = "sha256:efd2fcf7e7b9d7ab16e6b7d54205beded0a9c8566cb30f09c1abe42b4e22bdcb"},
+    {file = "aiohttp-3.8.6-cp311-cp311-win_amd64.whl", hash = "sha256:3b2ab182fc28e7a81f6c70bfbd829045d9480063f5ab06f6e601a3eddbbd49a0"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:fdee8405931b0615220e5ddf8cd7edd8592c606a8e4ca2a00704883c396e4479"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d25036d161c4fe2225d1abff2bd52c34ed0b1099f02c208cd34d8c05729882f0"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d791245a894be071d5ab04bbb4850534261a7d4fd363b094a7b9963e8cdbd31"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0cccd1de239afa866e4ce5c789b3032442f19c261c7d8a01183fd956b1935349"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f13f60d78224f0dace220d8ab4ef1dbc37115eeeab8c06804fec11bec2bbd07"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8a9b5a0606faca4f6cc0d338359d6fa137104c337f489cd135bb7fbdbccb1e39"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:13da35c9ceb847732bf5c6c5781dcf4780e14392e5d3b3c689f6d22f8e15ae31"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:4d4cbe4ffa9d05f46a28252efc5941e0462792930caa370a6efaf491f412bc66"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:229852e147f44da0241954fc6cb910ba074e597f06789c867cb7fb0621e0ba7a"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:713103a8bdde61d13490adf47171a1039fd880113981e55401a0f7b42c37d071"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:45ad816b2c8e3b60b510f30dbd37fe74fd4a772248a52bb021f6fd65dff809b6"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-win32.whl", hash = "sha256:2b8d4e166e600dcfbff51919c7a3789ff6ca8b3ecce16e1d9c96d95dd569eb4c"},
+    {file = "aiohttp-3.8.6-cp36-cp36m-win_amd64.whl", hash = "sha256:0912ed87fee967940aacc5306d3aa8ba3a459fcd12add0b407081fbefc931e53"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e2a988a0c673c2e12084f5e6ba3392d76c75ddb8ebc6c7e9ead68248101cd446"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebf3fd9f141700b510d4b190094db0ce37ac6361a6806c153c161dc6c041ccda"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3161ce82ab85acd267c8f4b14aa226047a6bee1e4e6adb74b798bd42c6ae1f80"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d95fc1bf33a9a81469aa760617b5971331cdd74370d1214f0b3109272c0e1e3c"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c43ecfef7deaf0617cee936836518e7424ee12cb709883f2c9a1adda63cc460"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca80e1b90a05a4f476547f904992ae81eda5c2c85c66ee4195bb8f9c5fb47f28"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:90c72ebb7cb3a08a7f40061079817133f502a160561d0675b0a6adf231382c92"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bb54c54510e47a8c7c8e63454a6acc817519337b2b78606c4e840871a3e15349"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:de6a1c9f6803b90e20869e6b99c2c18cef5cc691363954c93cb9adeb26d9f3ae"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:a3628b6c7b880b181a3ae0a0683698513874df63783fd89de99b7b7539e3e8a8"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:fc37e9aef10a696a5a4474802930079ccfc14d9f9c10b4662169671ff034b7df"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-win32.whl", hash = "sha256:f8ef51e459eb2ad8e7a66c1d6440c808485840ad55ecc3cafefadea47d1b1ba2"},
+    {file = "aiohttp-3.8.6-cp37-cp37m-win_amd64.whl", hash = "sha256:b2fe42e523be344124c6c8ef32a011444e869dc5f883c591ed87f84339de5976"},
+    {file = "aiohttp-3.8.6-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:9e2ee0ac5a1f5c7dd3197de309adfb99ac4617ff02b0603fd1e65b07dc772e4b"},
+    {file = "aiohttp-3.8.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:01770d8c04bd8db568abb636c1fdd4f7140b284b8b3e0b4584f070180c1e5c62"},
+    {file = "aiohttp-3.8.6-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3c68330a59506254b556b99a91857428cab98b2f84061260a67865f7f52899f5"},
+    {file = "aiohttp-3.8.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:89341b2c19fb5eac30c341133ae2cc3544d40d9b1892749cdd25892bbc6ac951"},
+    {file = "aiohttp-3.8.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:71783b0b6455ac8f34b5ec99d83e686892c50498d5d00b8e56d47f41b38fbe04"},
+    {file = "aiohttp-3.8.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f628dbf3c91e12f4d6c8b3f092069567d8eb17814aebba3d7d60c149391aee3a"},
+    {file = "aiohttp-3.8.6-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b04691bc6601ef47c88f0255043df6f570ada1a9ebef99c34bd0b72866c217ae"},
+    {file = "aiohttp-3.8.6-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7ee912f7e78287516df155f69da575a0ba33b02dd7c1d6614dbc9463f43066e3"},
+    {file = "aiohttp-3.8.6-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9c19b26acdd08dd239e0d3669a3dddafd600902e37881f13fbd8a53943079dbc"},
+    {file = "aiohttp-3.8.6-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:99c5ac4ad492b4a19fc132306cd57075c28446ec2ed970973bbf036bcda1bcc6"},
+    {file = "aiohttp-3.8.6-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:f0f03211fd14a6a0aed2997d4b1c013d49fb7b50eeb9ffdf5e51f23cfe2c77fa"},
+    {file = "aiohttp-3.8.6-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:8d399dade330c53b4106160f75f55407e9ae7505263ea86f2ccca6bfcbdb4921"},
+    {file = "aiohttp-3.8.6-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ec4fd86658c6a8964d75426517dc01cbf840bbf32d055ce64a9e63a40fd7b771"},
+    {file = "aiohttp-3.8.6-cp38-cp38-win32.whl", hash = "sha256:33164093be11fcef3ce2571a0dccd9041c9a93fa3bde86569d7b03120d276c6f"},
+    {file = "aiohttp-3.8.6-cp38-cp38-win_amd64.whl", hash = "sha256:bdf70bfe5a1414ba9afb9d49f0c912dc524cf60141102f3a11143ba3d291870f"},
+    {file = "aiohttp-3.8.6-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:d52d5dc7c6682b720280f9d9db41d36ebe4791622c842e258c9206232251ab2b"},
+    {file = "aiohttp-3.8.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4ac39027011414dbd3d87f7edb31680e1f430834c8cef029f11c66dad0670aa5"},
+    {file = "aiohttp-3.8.6-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3f5c7ce535a1d2429a634310e308fb7d718905487257060e5d4598e29dc17f0b"},
+    {file = "aiohttp-3.8.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b30e963f9e0d52c28f284d554a9469af073030030cef8693106d918b2ca92f54"},
+    {file = "aiohttp-3.8.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:918810ef188f84152af6b938254911055a72e0f935b5fbc4c1a4ed0b0584aed1"},
+    {file = "aiohttp-3.8.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:002f23e6ea8d3dd8d149e569fd580c999232b5fbc601c48d55398fbc2e582e8c"},
+    {file = "aiohttp-3.8.6-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4fcf3eabd3fd1a5e6092d1242295fa37d0354b2eb2077e6eb670accad78e40e1"},
+    {file = "aiohttp-3.8.6-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:255ba9d6d5ff1a382bb9a578cd563605aa69bec845680e21c44afc2670607a95"},
+    {file = "aiohttp-3.8.6-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d67f8baed00870aa390ea2590798766256f31dc5ed3ecc737debb6e97e2ede78"},
+    {file = "aiohttp-3.8.6-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:86f20cee0f0a317c76573b627b954c412ea766d6ada1a9fcf1b805763ae7feeb"},
+    {file = "aiohttp-3.8.6-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:39a312d0e991690ccc1a61f1e9e42daa519dcc34ad03eb6f826d94c1190190dd"},
+    {file = "aiohttp-3.8.6-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:e827d48cf802de06d9c935088c2924e3c7e7533377d66b6f31ed175c1620e05e"},
+    {file = "aiohttp-3.8.6-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bd111d7fc5591ddf377a408ed9067045259ff2770f37e2d94e6478d0f3fc0c17"},
+    {file = "aiohttp-3.8.6-cp39-cp39-win32.whl", hash = "sha256:caf486ac1e689dda3502567eb89ffe02876546599bbf915ec94b1fa424eeffd4"},
+    {file = "aiohttp-3.8.6-cp39-cp39-win_amd64.whl", hash = "sha256:3f0e27e5b733803333bb2371249f41cf42bae8884863e8e8965ec69bebe53132"},
+    {file = "aiohttp-3.8.6.tar.gz", hash = "sha256:b0cf2a4501bff9330a8a5248b4ce951851e415bdcce9dc158e76cfd55e15085c"},
+]
+
+[package.dependencies]
+aiosignal = ">=1.1.2"
+async-timeout = ">=4.0.0a3,<5.0"
+attrs = ">=17.3.0"
+charset-normalizer = ">=2.0,<4.0"
+frozenlist = ">=1.1.1"
+multidict = ">=4.5,<7.0"
+yarl = ">=1.0,<2.0"
+
+[package.extras]
+speedups = ["Brotli", "aiodns", "cchardet"]
+
+[[package]]
+name = "aiohttp-cors"
+version = "0.7.0"
+description = "CORS support for aiohttp"
+optional = false
+python-versions = "*"
+files = [
+    {file = "aiohttp-cors-0.7.0.tar.gz", hash = "sha256:4d39c6d7100fd9764ed1caf8cebf0eb01bf5e3f24e2e073fda6234bc48b19f5d"},
+    {file = "aiohttp_cors-0.7.0-py3-none-any.whl", hash = "sha256:0451ba59fdf6909d0e2cd21e4c0a43752bc0703d33fc78ae94d9d9321710193e"},
+]
+
+[package.dependencies]
+aiohttp = ">=1.1"
+
+[[package]]
+name = "aiohttp-jinja2"
+version = "1.5.1"
+description = "jinja2 template renderer for aiohttp.web (http server for asyncio)"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "aiohttp-jinja2-1.5.1.tar.gz", hash = "sha256:8d149b2a57d91f794b33a394ea5bc66b567f38c74a5a6a9477afc2450f105c01"},
+    {file = "aiohttp_jinja2-1.5.1-py3-none-any.whl", hash = "sha256:45cf00b80ab4dcc19515df13a929826eeb9698e76a3bcfd99112418751f5a061"},
+]
+
+[package.dependencies]
+aiohttp = ">=3.6.3"
+jinja2 = ">=3.0.0"
+
+[[package]]
+name = "aiosignal"
+version = "1.3.1"
+description = "aiosignal: a list of registered asynchronous callbacks"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "aiosignal-1.3.1-py3-none-any.whl", hash = "sha256:f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17"},
+    {file = "aiosignal-1.3.1.tar.gz", hash = "sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc"},
+]
+
+[package.dependencies]
+frozenlist = ">=1.1.0"
+
+[[package]]
+name = "altgraph"
+version = "0.17.4"
+description = "Python graph (network) package"
+optional = false
+python-versions = "*"
+files = [
+    {file = "altgraph-0.17.4-py2.py3-none-any.whl", hash = "sha256:642743b4750de17e655e6711601b077bc6598dbfa3ba5fa2b2a35ce12b508dff"},
+    {file = "altgraph-0.17.4.tar.gz", hash = "sha256:1b5afbb98f6c4dcadb2e2ae6ab9fa994bbb8c1d75f4fa96d340f9437ae454406"},
+]
+
+[[package]]
+name = "async-timeout"
+version = "4.0.3"
+description = "Timeout context manager for asyncio programs"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "async-timeout-4.0.3.tar.gz", hash = "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f"},
+    {file = "async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"},
+]
+
+[[package]]
+name = "attrs"
+version = "23.1.0"
+description = "Classes Without Boilerplate"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"},
+    {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"},
+]
+
+[package.extras]
+cov = ["attrs[tests]", "coverage[toml] (>=5.3)"]
+dev = ["attrs[docs,tests]", "pre-commit"]
+docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"]
+tests = ["attrs[tests-no-zope]", "zope-interface"]
+tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
+
+[[package]]
+name = "certifi"
+version = "2023.7.22"
+description = "Python package for providing Mozilla's CA Bundle."
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"},
+    {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"},
+]
+
+[[package]]
+name = "charset-normalizer"
+version = "3.3.2"
+description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
+optional = false
+python-versions = ">=3.7.0"
+files = [
+    {file = "charset-normalizer-3.3.2.tar.gz", hash = "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-win32.whl", hash = "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-win32.whl", hash = "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-win32.whl", hash = "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-win32.whl", hash = "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-win32.whl", hash = "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-win32.whl", hash = "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d"},
+    {file = "charset_normalizer-3.3.2-py3-none-any.whl", hash = "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc"},
+]
+
+[[package]]
+name = "frozenlist"
+version = "1.4.0"
+description = "A list-like structure which implements collections.abc.MutableSequence"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "frozenlist-1.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:764226ceef3125e53ea2cb275000e309c0aa5464d43bd72abd661e27fffc26ab"},
+    {file = "frozenlist-1.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d6484756b12f40003c6128bfcc3fa9f0d49a687e171186c2d85ec82e3758c559"},
+    {file = "frozenlist-1.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9ac08e601308e41eb533f232dbf6b7e4cea762f9f84f6357136eed926c15d12c"},
+    {file = "frozenlist-1.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d081f13b095d74b67d550de04df1c756831f3b83dc9881c38985834387487f1b"},
+    {file = "frozenlist-1.4.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:71932b597f9895f011f47f17d6428252fc728ba2ae6024e13c3398a087c2cdea"},
+    {file = "frozenlist-1.4.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:981b9ab5a0a3178ff413bca62526bb784249421c24ad7381e39d67981be2c326"},
+    {file = "frozenlist-1.4.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e41f3de4df3e80de75845d3e743b3f1c4c8613c3997a912dbf0229fc61a8b963"},
+    {file = "frozenlist-1.4.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6918d49b1f90821e93069682c06ffde41829c346c66b721e65a5c62b4bab0300"},
+    {file = "frozenlist-1.4.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0e5c8764c7829343d919cc2dfc587a8db01c4f70a4ebbc49abde5d4b158b007b"},
+    {file = "frozenlist-1.4.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8d0edd6b1c7fb94922bf569c9b092ee187a83f03fb1a63076e7774b60f9481a8"},
+    {file = "frozenlist-1.4.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e29cda763f752553fa14c68fb2195150bfab22b352572cb36c43c47bedba70eb"},
+    {file = "frozenlist-1.4.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:0c7c1b47859ee2cac3846fde1c1dc0f15da6cec5a0e5c72d101e0f83dcb67ff9"},
+    {file = "frozenlist-1.4.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:901289d524fdd571be1c7be054f48b1f88ce8dddcbdf1ec698b27d4b8b9e5d62"},
+    {file = "frozenlist-1.4.0-cp310-cp310-win32.whl", hash = "sha256:1a0848b52815006ea6596c395f87449f693dc419061cc21e970f139d466dc0a0"},
+    {file = "frozenlist-1.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:b206646d176a007466358aa21d85cd8600a415c67c9bd15403336c331a10d956"},
+    {file = "frozenlist-1.4.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:de343e75f40e972bae1ef6090267f8260c1446a1695e77096db6cfa25e759a95"},
+    {file = "frozenlist-1.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ad2a9eb6d9839ae241701d0918f54c51365a51407fd80f6b8289e2dfca977cc3"},
+    {file = "frozenlist-1.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:bd7bd3b3830247580de99c99ea2a01416dfc3c34471ca1298bccabf86d0ff4dc"},
+    {file = "frozenlist-1.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bdf1847068c362f16b353163391210269e4f0569a3c166bc6a9f74ccbfc7e839"},
+    {file = "frozenlist-1.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:38461d02d66de17455072c9ba981d35f1d2a73024bee7790ac2f9e361ef1cd0c"},
+    {file = "frozenlist-1.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d5a32087d720c608f42caed0ef36d2b3ea61a9d09ee59a5142d6070da9041b8f"},
+    {file = "frozenlist-1.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dd65632acaf0d47608190a71bfe46b209719bf2beb59507db08ccdbe712f969b"},
+    {file = "frozenlist-1.4.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:261b9f5d17cac914531331ff1b1d452125bf5daa05faf73b71d935485b0c510b"},
+    {file = "frozenlist-1.4.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:b89ac9768b82205936771f8d2eb3ce88503b1556324c9f903e7156669f521472"},
+    {file = "frozenlist-1.4.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:008eb8b31b3ea6896da16c38c1b136cb9fec9e249e77f6211d479db79a4eaf01"},
+    {file = "frozenlist-1.4.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:e74b0506fa5aa5598ac6a975a12aa8928cbb58e1f5ac8360792ef15de1aa848f"},
+    {file = "frozenlist-1.4.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:490132667476f6781b4c9458298b0c1cddf237488abd228b0b3650e5ecba7467"},
+    {file = "frozenlist-1.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:76d4711f6f6d08551a7e9ef28c722f4a50dd0fc204c56b4bcd95c6cc05ce6fbb"},
+    {file = "frozenlist-1.4.0-cp311-cp311-win32.whl", hash = "sha256:a02eb8ab2b8f200179b5f62b59757685ae9987996ae549ccf30f983f40602431"},
+    {file = "frozenlist-1.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:515e1abc578dd3b275d6a5114030b1330ba044ffba03f94091842852f806f1c1"},
+    {file = "frozenlist-1.4.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:f0ed05f5079c708fe74bf9027e95125334b6978bf07fd5ab923e9e55e5fbb9d3"},
+    {file = "frozenlist-1.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ca265542ca427bf97aed183c1676e2a9c66942e822b14dc6e5f42e038f92a503"},
+    {file = "frozenlist-1.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:491e014f5c43656da08958808588cc6c016847b4360e327a62cb308c791bd2d9"},
+    {file = "frozenlist-1.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:17ae5cd0f333f94f2e03aaf140bb762c64783935cc764ff9c82dff626089bebf"},
+    {file = "frozenlist-1.4.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1e78fb68cf9c1a6aa4a9a12e960a5c9dfbdb89b3695197aa7064705662515de2"},
+    {file = "frozenlist-1.4.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d5655a942f5f5d2c9ed93d72148226d75369b4f6952680211972a33e59b1dfdc"},
+    {file = "frozenlist-1.4.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c11b0746f5d946fecf750428a95f3e9ebe792c1ee3b1e96eeba145dc631a9672"},
+    {file = "frozenlist-1.4.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e66d2a64d44d50d2543405fb183a21f76b3b5fd16f130f5c99187c3fb4e64919"},
+    {file = "frozenlist-1.4.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:88f7bc0fcca81f985f78dd0fa68d2c75abf8272b1f5c323ea4a01a4d7a614efc"},
+    {file = "frozenlist-1.4.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:5833593c25ac59ede40ed4de6d67eb42928cca97f26feea219f21d0ed0959b79"},
+    {file = "frozenlist-1.4.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:fec520865f42e5c7f050c2a79038897b1c7d1595e907a9e08e3353293ffc948e"},
+    {file = "frozenlist-1.4.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:b826d97e4276750beca7c8f0f1a4938892697a6bcd8ec8217b3312dad6982781"},
+    {file = "frozenlist-1.4.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ceb6ec0a10c65540421e20ebd29083c50e6d1143278746a4ef6bcf6153171eb8"},
+    {file = "frozenlist-1.4.0-cp38-cp38-win32.whl", hash = "sha256:2b8bcf994563466db019fab287ff390fffbfdb4f905fc77bc1c1d604b1c689cc"},
+    {file = "frozenlist-1.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:a6c8097e01886188e5be3e6b14e94ab365f384736aa1fca6a0b9e35bd4a30bc7"},
+    {file = "frozenlist-1.4.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:6c38721585f285203e4b4132a352eb3daa19121a035f3182e08e437cface44bf"},
+    {file = "frozenlist-1.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a0c6da9aee33ff0b1a451e867da0c1f47408112b3391dd43133838339e410963"},
+    {file = "frozenlist-1.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:93ea75c050c5bb3d98016b4ba2497851eadf0ac154d88a67d7a6816206f6fa7f"},
+    {file = "frozenlist-1.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f61e2dc5ad442c52b4887f1fdc112f97caeff4d9e6ebe78879364ac59f1663e1"},
+    {file = "frozenlist-1.4.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aa384489fefeb62321b238e64c07ef48398fe80f9e1e6afeff22e140e0850eef"},
+    {file = "frozenlist-1.4.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:10ff5faaa22786315ef57097a279b833ecab1a0bfb07d604c9cbb1c4cdc2ed87"},
+    {file = "frozenlist-1.4.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:007df07a6e3eb3e33e9a1fe6a9db7af152bbd8a185f9aaa6ece10a3529e3e1c6"},
+    {file = "frozenlist-1.4.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7f4f399d28478d1f604c2ff9119907af9726aed73680e5ed1ca634d377abb087"},
+    {file = "frozenlist-1.4.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c5374b80521d3d3f2ec5572e05adc94601985cc526fb276d0c8574a6d749f1b3"},
+    {file = "frozenlist-1.4.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ce31ae3e19f3c902de379cf1323d90c649425b86de7bbdf82871b8a2a0615f3d"},
+    {file = "frozenlist-1.4.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:7211ef110a9194b6042449431e08c4d80c0481e5891e58d429df5899690511c2"},
+    {file = "frozenlist-1.4.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:556de4430ce324c836789fa4560ca62d1591d2538b8ceb0b4f68fb7b2384a27a"},
+    {file = "frozenlist-1.4.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:7645a8e814a3ee34a89c4a372011dcd817964ce8cb273c8ed6119d706e9613e3"},
+    {file = "frozenlist-1.4.0-cp39-cp39-win32.whl", hash = "sha256:19488c57c12d4e8095a922f328df3f179c820c212940a498623ed39160bc3c2f"},
+    {file = "frozenlist-1.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:6221d84d463fb110bdd7619b69cb43878a11d51cbb9394ae3105d082d5199167"},
+    {file = "frozenlist-1.4.0.tar.gz", hash = "sha256:09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251"},
+]
+
+[[package]]
+name = "idna"
+version = "3.4"
+description = "Internationalized Domain Names in Applications (IDNA)"
+optional = false
+python-versions = ">=3.5"
+files = [
+    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
+    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+]
+
+[[package]]
+name = "jinja2"
+version = "3.1.2"
+description = "A very fast and expressive template engine."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
+
+[package.dependencies]
+MarkupSafe = ">=2.0"
+
+[package.extras]
+i18n = ["Babel (>=2.7)"]
+
+[[package]]
+name = "macholib"
+version = "1.16.3"
+description = "Mach-O header analysis and editing"
+optional = false
+python-versions = "*"
+files = [
+    {file = "macholib-1.16.3-py2.py3-none-any.whl", hash = "sha256:0e315d7583d38b8c77e815b1ecbdbf504a8258d8b3e17b61165c6feb60d18f2c"},
+    {file = "macholib-1.16.3.tar.gz", hash = "sha256:07ae9e15e8e4cd9a788013d81f5908b3609aa76f9b1421bae9c4d7606ec86a30"},
+]
+
+[package.dependencies]
+altgraph = ">=0.17"
+
+[[package]]
+name = "markupsafe"
+version = "2.1.3"
+description = "Safely add untrusted strings to HTML/XML markup."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-win32.whl", hash = "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-win_amd64.whl", hash = "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-win32.whl", hash = "sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-win_amd64.whl", hash = "sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-win32.whl", hash = "sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-win_amd64.whl", hash = "sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-win32.whl", hash = "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-win_amd64.whl", hash = "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba"},
+    {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"},
+]
+
+[[package]]
+name = "multidict"
+version = "6.0.4"
+description = "multidict implementation"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "multidict-6.0.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b1a97283e0c85772d613878028fec909f003993e1007eafa715b24b377cb9b8"},
+    {file = "multidict-6.0.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:eeb6dcc05e911516ae3d1f207d4b0520d07f54484c49dfc294d6e7d63b734171"},
+    {file = "multidict-6.0.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d6d635d5209b82a3492508cf5b365f3446afb65ae7ebd755e70e18f287b0adf7"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c048099e4c9e9d615545e2001d3d8a4380bd403e1a0578734e0d31703d1b0c0b"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ea20853c6dbbb53ed34cb4d080382169b6f4554d394015f1bef35e881bf83547"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:16d232d4e5396c2efbbf4f6d4df89bfa905eb0d4dc5b3549d872ab898451f569"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:36c63aaa167f6c6b04ef2c85704e93af16c11d20de1d133e39de6a0e84582a93"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:64bdf1086b6043bf519869678f5f2757f473dee970d7abf6da91ec00acb9cb98"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:43644e38f42e3af682690876cff722d301ac585c5b9e1eacc013b7a3f7b696a0"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7582a1d1030e15422262de9f58711774e02fa80df0d1578995c76214f6954988"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:ddff9c4e225a63a5afab9dd15590432c22e8057e1a9a13d28ed128ecf047bbdc"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ee2a1ece51b9b9e7752e742cfb661d2a29e7bcdba2d27e66e28a99f1890e4fa0"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a2e4369eb3d47d2034032a26c7a80fcb21a2cb22e1173d761a162f11e562caa5"},
+    {file = "multidict-6.0.4-cp310-cp310-win32.whl", hash = "sha256:574b7eae1ab267e5f8285f0fe881f17efe4b98c39a40858247720935b893bba8"},
+    {file = "multidict-6.0.4-cp310-cp310-win_amd64.whl", hash = "sha256:4dcbb0906e38440fa3e325df2359ac6cb043df8e58c965bb45f4e406ecb162cc"},
+    {file = "multidict-6.0.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0dfad7a5a1e39c53ed00d2dd0c2e36aed4650936dc18fd9a1826a5ae1cad6f03"},
+    {file = "multidict-6.0.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:64da238a09d6039e3bd39bb3aee9c21a5e34f28bfa5aa22518581f910ff94af3"},
+    {file = "multidict-6.0.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ff959bee35038c4624250473988b24f846cbeb2c6639de3602c073f10410ceba"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:01a3a55bd90018c9c080fbb0b9f4891db37d148a0a18722b42f94694f8b6d4c9"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c5cb09abb18c1ea940fb99360ea0396f34d46566f157122c92dfa069d3e0e982"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:666daae833559deb2d609afa4490b85830ab0dfca811a98b70a205621a6109fe"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:11bdf3f5e1518b24530b8241529d2050014c884cf18b6fc69c0c2b30ca248710"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7d18748f2d30f94f498e852c67d61261c643b349b9d2a581131725595c45ec6c"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:458f37be2d9e4c95e2d8866a851663cbc76e865b78395090786f6cd9b3bbf4f4"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:b1a2eeedcead3a41694130495593a559a668f382eee0727352b9a41e1c45759a"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7d6ae9d593ef8641544d6263c7fa6408cc90370c8cb2bbb65f8d43e5b0351d9c"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:5979b5632c3e3534e42ca6ff856bb24b2e3071b37861c2c727ce220d80eee9ed"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:dcfe792765fab89c365123c81046ad4103fcabbc4f56d1c1997e6715e8015461"},
+    {file = "multidict-6.0.4-cp311-cp311-win32.whl", hash = "sha256:3601a3cece3819534b11d4efc1eb76047488fddd0c85a3948099d5da4d504636"},
+    {file = "multidict-6.0.4-cp311-cp311-win_amd64.whl", hash = "sha256:81a4f0b34bd92df3da93315c6a59034df95866014ac08535fc819f043bfd51f0"},
+    {file = "multidict-6.0.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:67040058f37a2a51ed8ea8f6b0e6ee5bd78ca67f169ce6122f3e2ec80dfe9b78"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:853888594621e6604c978ce2a0444a1e6e70c8d253ab65ba11657659dcc9100f"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:39ff62e7d0f26c248b15e364517a72932a611a9b75f35b45be078d81bdb86603"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:af048912e045a2dc732847d33821a9d84ba553f5c5f028adbd364dd4765092ac"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1e8b901e607795ec06c9e42530788c45ac21ef3aaa11dbd0c69de543bfb79a9"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:62501642008a8b9871ddfccbf83e4222cf8ac0d5aeedf73da36153ef2ec222d2"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:99b76c052e9f1bc0721f7541e5e8c05db3941eb9ebe7b8553c625ef88d6eefde"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:509eac6cf09c794aa27bcacfd4d62c885cce62bef7b2c3e8b2e49d365b5003fe"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:21a12c4eb6ddc9952c415f24eef97e3e55ba3af61f67c7bc388dcdec1404a067"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:5cad9430ab3e2e4fa4a2ef4450f548768400a2ac635841bc2a56a2052cdbeb87"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:ab55edc2e84460694295f401215f4a58597f8f7c9466faec545093045476327d"},
+    {file = "multidict-6.0.4-cp37-cp37m-win32.whl", hash = "sha256:5a4dcf02b908c3b8b17a45fb0f15b695bf117a67b76b7ad18b73cf8e92608775"},
+    {file = "multidict-6.0.4-cp37-cp37m-win_amd64.whl", hash = "sha256:6ed5f161328b7df384d71b07317f4d8656434e34591f20552c7bcef27b0ab88e"},
+    {file = "multidict-6.0.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5fc1b16f586f049820c5c5b17bb4ee7583092fa0d1c4e28b5239181ff9532e0c"},
+    {file = "multidict-6.0.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1502e24330eb681bdaa3eb70d6358e818e8e8f908a22a1851dfd4e15bc2f8161"},
+    {file = "multidict-6.0.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b692f419760c0e65d060959df05f2a531945af31fda0c8a3b3195d4efd06de11"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45e1ecb0379bfaab5eef059f50115b54571acfbe422a14f668fc8c27ba410e7e"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ddd3915998d93fbcd2566ddf9cf62cdb35c9e093075f862935573d265cf8f65d"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:59d43b61c59d82f2effb39a93c48b845efe23a3852d201ed2d24ba830d0b4cf2"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc8e1d0c705233c5dd0c5e6460fbad7827d5d36f310a0fadfd45cc3029762258"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d6aa0418fcc838522256761b3415822626f866758ee0bc6632c9486b179d0b52"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6748717bb10339c4760c1e63da040f5f29f5ed6e59d76daee30305894069a660"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:4d1a3d7ef5e96b1c9e92f973e43aa5e5b96c659c9bc3124acbbd81b0b9c8a951"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:4372381634485bec7e46718edc71528024fcdc6f835baefe517b34a33c731d60"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:fc35cb4676846ef752816d5be2193a1e8367b4c1397b74a565a9d0389c433a1d"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:4b9d9e4e2b37daddb5c23ea33a3417901fa7c7b3dee2d855f63ee67a0b21e5b1"},
+    {file = "multidict-6.0.4-cp38-cp38-win32.whl", hash = "sha256:e41b7e2b59679edfa309e8db64fdf22399eec4b0b24694e1b2104fb789207779"},
+    {file = "multidict-6.0.4-cp38-cp38-win_amd64.whl", hash = "sha256:d6c254ba6e45d8e72739281ebc46ea5eb5f101234f3ce171f0e9f5cc86991480"},
+    {file = "multidict-6.0.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:16ab77bbeb596e14212e7bab8429f24c1579234a3a462105cda4a66904998664"},
+    {file = "multidict-6.0.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bc779e9e6f7fda81b3f9aa58e3a6091d49ad528b11ed19f6621408806204ad35"},
+    {file = "multidict-6.0.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4ceef517eca3e03c1cceb22030a3e39cb399ac86bff4e426d4fc6ae49052cc60"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:281af09f488903fde97923c7744bb001a9b23b039a909460d0f14edc7bf59706"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:52f2dffc8acaba9a2f27174c41c9e57f60b907bb9f096b36b1a1f3be71c6284d"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b41156839806aecb3641f3208c0dafd3ac7775b9c4c422d82ee2a45c34ba81ca"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5e3fc56f88cc98ef8139255cf8cd63eb2c586531e43310ff859d6bb3a6b51f1"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8316a77808c501004802f9beebde51c9f857054a0c871bd6da8280e718444449"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f70b98cd94886b49d91170ef23ec5c0e8ebb6f242d734ed7ed677b24d50c82cf"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:bf6774e60d67a9efe02b3616fee22441d86fab4c6d335f9d2051d19d90a40063"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e69924bfcdda39b722ef4d9aa762b2dd38e4632b3641b1d9a57ca9cd18f2f83a"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:6b181d8c23da913d4ff585afd1155a0e1194c0b50c54fcfe286f70cdaf2b7176"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:52509b5be062d9eafc8170e53026fbc54cf3b32759a23d07fd935fb04fc22d95"},
+    {file = "multidict-6.0.4-cp39-cp39-win32.whl", hash = "sha256:27c523fbfbdfd19c6867af7346332b62b586eed663887392cff78d614f9ec313"},
+    {file = "multidict-6.0.4-cp39-cp39-win_amd64.whl", hash = "sha256:33029f5734336aa0d4c0384525da0387ef89148dc7191aae00ca5fb23d7aafc2"},
+    {file = "multidict-6.0.4.tar.gz", hash = "sha256:3666906492efb76453c0e7b97f2cf459b0682e7402c0489a95484965dbc1da49"},
+]
+
+[[package]]
+name = "nodeenv"
+version = "1.8.0"
+description = "Node.js virtual environment builder"
+optional = false
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
+files = [
+    {file = "nodeenv-1.8.0-py2.py3-none-any.whl", hash = "sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec"},
+    {file = "nodeenv-1.8.0.tar.gz", hash = "sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2"},
+]
+
+[package.dependencies]
+setuptools = "*"
+
+[[package]]
+name = "pefile"
+version = "2023.2.7"
+description = "Python PE parsing module"
+optional = false
+python-versions = ">=3.6.0"
+files = [
+    {file = "pefile-2023.2.7-py3-none-any.whl", hash = "sha256:da185cd2af68c08a6cd4481f7325ed600a88f6a813bad9dea07ab3ef73d8d8d6"},
+    {file = "pefile-2023.2.7.tar.gz", hash = "sha256:82e6114004b3d6911c77c3953e3838654b04511b8b66e8583db70c65998017dc"},
+]
+
+[[package]]
+name = "pyinstaller"
+version = "5.13.2"
+description = "PyInstaller bundles a Python application and all its dependencies into a single package."
+optional = false
+python-versions = "<3.13,>=3.7"
+files = [
+    {file = "pyinstaller-5.13.2-py3-none-macosx_10_13_universal2.whl", hash = "sha256:16cbd66b59a37f4ee59373a003608d15df180a0d9eb1a29ff3bfbfae64b23d0f"},
+    {file = "pyinstaller-5.13.2-py3-none-manylinux2014_aarch64.whl", hash = "sha256:8f6dd0e797ae7efdd79226f78f35eb6a4981db16c13325e962a83395c0ec7420"},
+    {file = "pyinstaller-5.13.2-py3-none-manylinux2014_i686.whl", hash = "sha256:65133ed89467edb2862036b35d7c5ebd381670412e1e4361215e289c786dd4e6"},
+    {file = "pyinstaller-5.13.2-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:7d51734423685ab2a4324ab2981d9781b203dcae42839161a9ee98bfeaabdade"},
+    {file = "pyinstaller-5.13.2-py3-none-manylinux2014_s390x.whl", hash = "sha256:2c2fe9c52cb4577a3ac39626b84cf16cf30c2792f785502661286184f162ae0d"},
+    {file = "pyinstaller-5.13.2-py3-none-manylinux2014_x86_64.whl", hash = "sha256:c63ef6133eefe36c4b2f4daf4cfea3d6412ece2ca218f77aaf967e52a95ac9b8"},
+    {file = "pyinstaller-5.13.2-py3-none-musllinux_1_1_aarch64.whl", hash = "sha256:aadafb6f213549a5906829bb252e586e2cf72a7fbdb5731810695e6516f0ab30"},
+    {file = "pyinstaller-5.13.2-py3-none-musllinux_1_1_x86_64.whl", hash = "sha256:b2e1c7f5cceb5e9800927ddd51acf9cc78fbaa9e79e822c48b0ee52d9ce3c892"},
+    {file = "pyinstaller-5.13.2-py3-none-win32.whl", hash = "sha256:421cd24f26144f19b66d3868b49ed673176765f92fa9f7914cd2158d25b6d17e"},
+    {file = "pyinstaller-5.13.2-py3-none-win_amd64.whl", hash = "sha256:ddcc2b36052a70052479a9e5da1af067b4496f43686ca3cdda99f8367d0627e4"},
+    {file = "pyinstaller-5.13.2-py3-none-win_arm64.whl", hash = "sha256:27cd64e7cc6b74c5b1066cbf47d75f940b71356166031deb9778a2579bb874c6"},
+    {file = "pyinstaller-5.13.2.tar.gz", hash = "sha256:c8e5d3489c3a7cc5f8401c2d1f48a70e588f9967e391c3b06ddac1f685f8d5d2"},
+]
+
+[package.dependencies]
+altgraph = "*"
+macholib = {version = ">=1.8", markers = "sys_platform == \"darwin\""}
+pefile = {version = ">=2022.5.30", markers = "sys_platform == \"win32\""}
+pyinstaller-hooks-contrib = ">=2021.4"
+pywin32-ctypes = {version = ">=0.2.1", markers = "sys_platform == \"win32\""}
+setuptools = ">=42.0.0"
+
+[package.extras]
+encryption = ["tinyaes (>=1.0.0)"]
+hook-testing = ["execnet (>=1.5.0)", "psutil", "pytest (>=2.7.3)"]
+
+[[package]]
+name = "pyinstaller-hooks-contrib"
+version = "2023.10"
+description = "Community maintained hooks for PyInstaller"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pyinstaller-hooks-contrib-2023.10.tar.gz", hash = "sha256:4b4a998036abb713774cb26534ca06b7e6e09e4c628196017a10deb11a48747f"},
+    {file = "pyinstaller_hooks_contrib-2023.10-py2.py3-none-any.whl", hash = "sha256:6dc1786a8f452941245d5bb85893e2a33632ebdcbc4c23eea41f2ee08281b0c0"},
+]
+
+[[package]]
+name = "pyright"
+version = "1.1.335"
+description = "Command line wrapper for pyright"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pyright-1.1.335-py3-none-any.whl", hash = "sha256:1149d99d5cea3997010a5ac39611534e0426125d5090913ae5cb1e0e2c9fbca3"},
+    {file = "pyright-1.1.335.tar.gz", hash = "sha256:12c09c1644b223515cc342f7d383e55eefeedd730d7875e39a2cf338c2d99be4"},
+]
+
+[package.dependencies]
+nodeenv = ">=1.6.0"
+
+[package.extras]
+all = ["twine (>=3.4.1)"]
+dev = ["twine (>=3.4.1)"]
+
+[[package]]
+name = "pywin32-ctypes"
+version = "0.2.2"
+description = "A (partial) reimplementation of pywin32 using ctypes/cffi"
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "pywin32-ctypes-0.2.2.tar.gz", hash = "sha256:3426e063bdd5fd4df74a14fa3cf80a0b42845a87e1d1e81f6549f9daec593a60"},
+    {file = "pywin32_ctypes-0.2.2-py3-none-any.whl", hash = "sha256:bf490a1a709baf35d688fe0ecf980ed4de11d2b3e37b51e5442587a75d9957e7"},
+]
+
+[[package]]
+name = "setuptools"
+version = "68.2.2"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "setuptools-68.2.2-py3-none-any.whl", hash = "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"},
+    {file = "setuptools-68.2.2.tar.gz", hash = "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"},
+]
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.1)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
+
+[[package]]
+name = "watchdog"
+version = "2.3.1"
+description = "Filesystem events monitoring"
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "watchdog-2.3.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d1f1200d4ec53b88bf04ab636f9133cb703eb19768a39351cee649de21a33697"},
+    {file = "watchdog-2.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:564e7739abd4bd348aeafbf71cc006b6c0ccda3160c7053c4a53b67d14091d42"},
+    {file = "watchdog-2.3.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:95ad708a9454050a46f741ba5e2f3468655ea22da1114e4c40b8cbdaca572565"},
+    {file = "watchdog-2.3.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a073c91a6ef0dda488087669586768195c3080c66866144880f03445ca23ef16"},
+    {file = "watchdog-2.3.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:aa8b028750b43e80eea9946d01925168eeadb488dfdef1d82be4b1e28067f375"},
+    {file = "watchdog-2.3.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:964fd236cd443933268ae49b59706569c8b741073dbfd7ca705492bae9d39aab"},
+    {file = "watchdog-2.3.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:91fd146d723392b3e6eb1ac21f122fcce149a194a2ba0a82c5e4d0ee29cd954c"},
+    {file = "watchdog-2.3.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:efe3252137392a471a2174d721e1037a0e6a5da7beb72a021e662b7000a9903f"},
+    {file = "watchdog-2.3.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:85bf2263290591b7c5fa01140601b64c831be88084de41efbcba6ea289874f44"},
+    {file = "watchdog-2.3.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8f2df370cd8e4e18499dd0bfdef476431bcc396108b97195d9448d90924e3131"},
+    {file = "watchdog-2.3.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ea5d86d1bcf4a9d24610aa2f6f25492f441960cf04aed2bd9a97db439b643a7b"},
+    {file = "watchdog-2.3.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:6f5d0f7eac86807275eba40b577c671b306f6f335ba63a5c5a348da151aba0fc"},
+    {file = "watchdog-2.3.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5b848c71ef2b15d0ef02f69da8cc120d335cec0ed82a3fa7779e27a5a8527225"},
+    {file = "watchdog-2.3.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0d9878be36d2b9271e3abaa6f4f051b363ff54dbbe7e7df1af3c920e4311ee43"},
+    {file = "watchdog-2.3.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:4cd61f98cb37143206818cb1786d2438626aa78d682a8f2ecee239055a9771d5"},
+    {file = "watchdog-2.3.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:3d2dbcf1acd96e7a9c9aefed201c47c8e311075105d94ce5e899f118155709fd"},
+    {file = "watchdog-2.3.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:03f342a9432fe08107defbe8e405a2cb922c5d00c4c6c168c68b633c64ce6190"},
+    {file = "watchdog-2.3.1-py3-none-manylinux2014_aarch64.whl", hash = "sha256:7a596f9415a378d0339681efc08d2249e48975daae391d58f2e22a3673b977cf"},
+    {file = "watchdog-2.3.1-py3-none-manylinux2014_armv7l.whl", hash = "sha256:0e1dd6d449267cc7d6935d7fe27ee0426af6ee16578eed93bacb1be9ff824d2d"},
+    {file = "watchdog-2.3.1-py3-none-manylinux2014_i686.whl", hash = "sha256:7a1876f660e32027a1a46f8a0fa5747ad4fcf86cb451860eae61a26e102c8c79"},
+    {file = "watchdog-2.3.1-py3-none-manylinux2014_ppc64.whl", hash = "sha256:2caf77ae137935c1466f8cefd4a3aec7017b6969f425d086e6a528241cba7256"},
+    {file = "watchdog-2.3.1-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:53f3e95081280898d9e4fc51c5c69017715929e4eea1ab45801d5e903dd518ad"},
+    {file = "watchdog-2.3.1-py3-none-manylinux2014_s390x.whl", hash = "sha256:9da7acb9af7e4a272089bd2af0171d23e0d6271385c51d4d9bde91fe918c53ed"},
+    {file = "watchdog-2.3.1-py3-none-manylinux2014_x86_64.whl", hash = "sha256:8a4d484e846dcd75e96b96d80d80445302621be40e293bfdf34a631cab3b33dc"},
+    {file = "watchdog-2.3.1-py3-none-win32.whl", hash = "sha256:a74155398434937ac2780fd257c045954de5b11b5c52fc844e2199ce3eecf4cf"},
+    {file = "watchdog-2.3.1-py3-none-win_amd64.whl", hash = "sha256:5defe4f0918a2a1a4afbe4dbb967f743ac3a93d546ea4674567806375b024adb"},
+    {file = "watchdog-2.3.1-py3-none-win_ia64.whl", hash = "sha256:4109cccf214b7e3462e8403ab1e5b17b302ecce6c103eb2fc3afa534a7f27b96"},
+    {file = "watchdog-2.3.1.tar.gz", hash = "sha256:d9f9ed26ed22a9d331820a8432c3680707ea8b54121ddcc9dc7d9f2ceeb36906"},
+]
+
+[package.extras]
+watchmedo = ["PyYAML (>=3.10)"]
+
+[[package]]
+name = "yarl"
+version = "1.9.2"
+description = "Yet another URL library"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "yarl-1.9.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:8c2ad583743d16ddbdf6bb14b5cd76bf43b0d0006e918809d5d4ddf7bde8dd82"},
+    {file = "yarl-1.9.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:82aa6264b36c50acfb2424ad5ca537a2060ab6de158a5bd2a72a032cc75b9eb8"},
+    {file = "yarl-1.9.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c0c77533b5ed4bcc38e943178ccae29b9bcf48ffd1063f5821192f23a1bd27b9"},
+    {file = "yarl-1.9.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee4afac41415d52d53a9833ebae7e32b344be72835bbb589018c9e938045a560"},
+    {file = "yarl-1.9.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9bf345c3a4f5ba7f766430f97f9cc1320786f19584acc7086491f45524a551ac"},
+    {file = "yarl-1.9.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2a96c19c52ff442a808c105901d0bdfd2e28575b3d5f82e2f5fd67e20dc5f4ea"},
+    {file = "yarl-1.9.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:891c0e3ec5ec881541f6c5113d8df0315ce5440e244a716b95f2525b7b9f3608"},
+    {file = "yarl-1.9.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c3a53ba34a636a256d767c086ceb111358876e1fb6b50dfc4d3f4951d40133d5"},
+    {file = "yarl-1.9.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:566185e8ebc0898b11f8026447eacd02e46226716229cea8db37496c8cdd26e0"},
+    {file = "yarl-1.9.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:2b0738fb871812722a0ac2154be1f049c6223b9f6f22eec352996b69775b36d4"},
+    {file = "yarl-1.9.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:32f1d071b3f362c80f1a7d322bfd7b2d11e33d2adf395cc1dd4df36c9c243095"},
+    {file = "yarl-1.9.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:e9fdc7ac0d42bc3ea78818557fab03af6181e076a2944f43c38684b4b6bed8e3"},
+    {file = "yarl-1.9.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:56ff08ab5df8429901ebdc5d15941b59f6253393cb5da07b4170beefcf1b2528"},
+    {file = "yarl-1.9.2-cp310-cp310-win32.whl", hash = "sha256:8ea48e0a2f931064469bdabca50c2f578b565fc446f302a79ba6cc0ee7f384d3"},
+    {file = "yarl-1.9.2-cp310-cp310-win_amd64.whl", hash = "sha256:50f33040f3836e912ed16d212f6cc1efb3231a8a60526a407aeb66c1c1956dde"},
+    {file = "yarl-1.9.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:646d663eb2232d7909e6601f1a9107e66f9791f290a1b3dc7057818fe44fc2b6"},
+    {file = "yarl-1.9.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:aff634b15beff8902d1f918012fc2a42e0dbae6f469fce134c8a0dc51ca423bb"},
+    {file = "yarl-1.9.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a83503934c6273806aed765035716216cc9ab4e0364f7f066227e1aaea90b8d0"},
+    {file = "yarl-1.9.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b25322201585c69abc7b0e89e72790469f7dad90d26754717f3310bfe30331c2"},
+    {file = "yarl-1.9.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:22a94666751778629f1ec4280b08eb11815783c63f52092a5953faf73be24191"},
+    {file = "yarl-1.9.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ec53a0ea2a80c5cd1ab397925f94bff59222aa3cf9c6da938ce05c9ec20428d"},
+    {file = "yarl-1.9.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:159d81f22d7a43e6eabc36d7194cb53f2f15f498dbbfa8edc8a3239350f59fe7"},
+    {file = "yarl-1.9.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:832b7e711027c114d79dffb92576acd1bd2decc467dec60e1cac96912602d0e6"},
+    {file = "yarl-1.9.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:95d2ecefbcf4e744ea952d073c6922e72ee650ffc79028eb1e320e732898d7e8"},
+    {file = "yarl-1.9.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:d4e2c6d555e77b37288eaf45b8f60f0737c9efa3452c6c44626a5455aeb250b9"},
+    {file = "yarl-1.9.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:783185c75c12a017cc345015ea359cc801c3b29a2966c2655cd12b233bf5a2be"},
+    {file = "yarl-1.9.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:b8cc1863402472f16c600e3e93d542b7e7542a540f95c30afd472e8e549fc3f7"},
+    {file = "yarl-1.9.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:822b30a0f22e588b32d3120f6d41e4ed021806418b4c9f0bc3048b8c8cb3f92a"},
+    {file = "yarl-1.9.2-cp311-cp311-win32.whl", hash = "sha256:a60347f234c2212a9f0361955007fcf4033a75bf600a33c88a0a8e91af77c0e8"},
+    {file = "yarl-1.9.2-cp311-cp311-win_amd64.whl", hash = "sha256:be6b3fdec5c62f2a67cb3f8c6dbf56bbf3f61c0f046f84645cd1ca73532ea051"},
+    {file = "yarl-1.9.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:38a3928ae37558bc1b559f67410df446d1fbfa87318b124bf5032c31e3447b74"},
+    {file = "yarl-1.9.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ac9bb4c5ce3975aeac288cfcb5061ce60e0d14d92209e780c93954076c7c4367"},
+    {file = "yarl-1.9.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3da8a678ca8b96c8606bbb8bfacd99a12ad5dd288bc6f7979baddd62f71c63ef"},
+    {file = "yarl-1.9.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:13414591ff516e04fcdee8dc051c13fd3db13b673c7a4cb1350e6b2ad9639ad3"},
+    {file = "yarl-1.9.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf74d08542c3a9ea97bb8f343d4fcbd4d8f91bba5ec9d5d7f792dbe727f88938"},
+    {file = "yarl-1.9.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6e7221580dc1db478464cfeef9b03b95c5852cc22894e418562997df0d074ccc"},
+    {file = "yarl-1.9.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:494053246b119b041960ddcd20fd76224149cfea8ed8777b687358727911dd33"},
+    {file = "yarl-1.9.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:52a25809fcbecfc63ac9ba0c0fb586f90837f5425edfd1ec9f3372b119585e45"},
+    {file = "yarl-1.9.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:e65610c5792870d45d7b68c677681376fcf9cc1c289f23e8e8b39c1485384185"},
+    {file = "yarl-1.9.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:1b1bba902cba32cdec51fca038fd53f8beee88b77efc373968d1ed021024cc04"},
+    {file = "yarl-1.9.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:662e6016409828ee910f5d9602a2729a8a57d74b163c89a837de3fea050c7582"},
+    {file = "yarl-1.9.2-cp37-cp37m-win32.whl", hash = "sha256:f364d3480bffd3aa566e886587eaca7c8c04d74f6e8933f3f2c996b7f09bee1b"},
+    {file = "yarl-1.9.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6a5883464143ab3ae9ba68daae8e7c5c95b969462bbe42e2464d60e7e2698368"},
+    {file = "yarl-1.9.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5610f80cf43b6202e2c33ba3ec2ee0a2884f8f423c8f4f62906731d876ef4fac"},
+    {file = "yarl-1.9.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b9a4e67ad7b646cd6f0938c7ebfd60e481b7410f574c560e455e938d2da8e0f4"},
+    {file = "yarl-1.9.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:83fcc480d7549ccebe9415d96d9263e2d4226798c37ebd18c930fce43dfb9574"},
+    {file = "yarl-1.9.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5fcd436ea16fee7d4207c045b1e340020e58a2597301cfbcfdbe5abd2356c2fb"},
+    {file = "yarl-1.9.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:84e0b1599334b1e1478db01b756e55937d4614f8654311eb26012091be109d59"},
+    {file = "yarl-1.9.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3458a24e4ea3fd8930e934c129b676c27452e4ebda80fbe47b56d8c6c7a63a9e"},
+    {file = "yarl-1.9.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:838162460b3a08987546e881a2bfa573960bb559dfa739e7800ceeec92e64417"},
+    {file = "yarl-1.9.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f4e2d08f07a3d7d3e12549052eb5ad3eab1c349c53ac51c209a0e5991bbada78"},
+    {file = "yarl-1.9.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:de119f56f3c5f0e2fb4dee508531a32b069a5f2c6e827b272d1e0ff5ac040333"},
+    {file = "yarl-1.9.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:149ddea5abf329752ea5051b61bd6c1d979e13fbf122d3a1f9f0c8be6cb6f63c"},
+    {file = "yarl-1.9.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:674ca19cbee4a82c9f54e0d1eee28116e63bc6fd1e96c43031d11cbab8b2afd5"},
+    {file = "yarl-1.9.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:9b3152f2f5677b997ae6c804b73da05a39daa6a9e85a512e0e6823d81cdad7cc"},
+    {file = "yarl-1.9.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5415d5a4b080dc9612b1b63cba008db84e908b95848369aa1da3686ae27b6d2b"},
+    {file = "yarl-1.9.2-cp38-cp38-win32.whl", hash = "sha256:f7a3d8146575e08c29ed1cd287068e6d02f1c7bdff8970db96683b9591b86ee7"},
+    {file = "yarl-1.9.2-cp38-cp38-win_amd64.whl", hash = "sha256:63c48f6cef34e6319a74c727376e95626f84ea091f92c0250a98e53e62c77c72"},
+    {file = "yarl-1.9.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:75df5ef94c3fdc393c6b19d80e6ef1ecc9ae2f4263c09cacb178d871c02a5ba9"},
+    {file = "yarl-1.9.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c027a6e96ef77d401d8d5a5c8d6bc478e8042f1e448272e8d9752cb0aff8b5c8"},
+    {file = "yarl-1.9.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f3b078dbe227f79be488ffcfc7a9edb3409d018e0952cf13f15fd6512847f3f7"},
+    {file = "yarl-1.9.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:59723a029760079b7d991a401386390c4be5bfec1e7dd83e25a6a0881859e716"},
+    {file = "yarl-1.9.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b03917871bf859a81ccb180c9a2e6c1e04d2f6a51d953e6a5cdd70c93d4e5a2a"},
+    {file = "yarl-1.9.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c1012fa63eb6c032f3ce5d2171c267992ae0c00b9e164efe4d73db818465fac3"},
+    {file = "yarl-1.9.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a74dcbfe780e62f4b5a062714576f16c2f3493a0394e555ab141bf0d746bb955"},
+    {file = "yarl-1.9.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8c56986609b057b4839968ba901944af91b8e92f1725d1a2d77cbac6972b9ed1"},
+    {file = "yarl-1.9.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:2c315df3293cd521033533d242d15eab26583360b58f7ee5d9565f15fee1bef4"},
+    {file = "yarl-1.9.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:b7232f8dfbd225d57340e441d8caf8652a6acd06b389ea2d3222b8bc89cbfca6"},
+    {file = "yarl-1.9.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:53338749febd28935d55b41bf0bcc79d634881195a39f6b2f767870b72514caf"},
+    {file = "yarl-1.9.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:066c163aec9d3d073dc9ffe5dd3ad05069bcb03fcaab8d221290ba99f9f69ee3"},
+    {file = "yarl-1.9.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8288d7cd28f8119b07dd49b7230d6b4562f9b61ee9a4ab02221060d21136be80"},
+    {file = "yarl-1.9.2-cp39-cp39-win32.whl", hash = "sha256:b124e2a6d223b65ba8768d5706d103280914d61f5cae3afbc50fc3dfcc016623"},
+    {file = "yarl-1.9.2-cp39-cp39-win_amd64.whl", hash = "sha256:61016e7d582bc46a5378ffdd02cd0314fb8ba52f40f9cf4d9a5e7dbef88dee18"},
+    {file = "yarl-1.9.2.tar.gz", hash = "sha256:04ab9d4b9f587c06d801c2abfe9317b77cdf996c65a90d5e84ecc45010823571"},
+]
+
+[package.dependencies]
+idna = ">=2.0"
+multidict = ">=4.0"
+
+[metadata]
+lock-version = "2.0"
+python-versions = ">=3.10,<3.13"
+content-hash = "acc0fcc8adcba521e2bb9f6eba2d3b047b1fe045d0019c0766ed7dc3fc804253"

backend/pyinstaller.spec

@@ -0,0 +1,30 @@
+import os
+from PyInstaller.building.build_main import Analysis
+from PyInstaller.building.api import EXE, PYZ
+from PyInstaller.utils.hooks import copy_metadata
+
+a = Analysis(
+    ['main.py'],
+    datas=[
+        ('locales', 'locales'),
+        ('static', 'static'),
+    ] + copy_metadata('decky_loader'),
+    hiddenimports=['logging.handlers', 'sqlite3', 'decky_plugin'],
+)
+pyz = PYZ(a.pure, a.zipped_data)
+
+noconsole = bool(os.getenv('DECKY_NOCONSOLE'))
+name = "PluginLoader"
+if noconsole:
+    name += "_noconsole"
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    name=name,
+    upx=True,
+    console=not noconsole,
+)

backend/pyproject.toml

@@ -0,0 +1,36 @@
+[tool.poetry]
+name = "decky-loader"
+version = "0.0.0"  # the real version will be autogenerated
+description = "A plugin loader for the Steam Deck"
+license = "GPLv2"
+readme = "../README.md"
+authors = []
+packages = [
+    {include = "decky_loader"},
+    {include = "decky_plugin.py"},
+    {include = "decky_plugin.pyi"},
+]
+include = ["decky_loader/static/*"]
+
+[tool.poetry.dependencies]
+python = ">=3.10,<3.13"
+
+aiohttp = "^3.8.5"
+aiohttp-jinja2 = "^1.5.1"
+aiohttp-cors = "^0.7.0"
+watchdog = "^2.1.7"
+certifi = "*"
+
+[tool.poetry.group.dev.dependencies]
+pyinstaller = "^5.13.0"
+pyright = "^1.1.335"
+
+[tool.poetry.scripts]
+decky-loader = 'decky_loader.main:main'
+
+[tool.pyright]
+strict = ["*"]
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

backend/pyrightconfig.json

@@ -1,3 +0,0 @@
-{
-    "strict": ["*"]
-}

backend/requirements.txt

@@ -1,5 +0,0 @@
-aiohttp==3.9.0
-aiohttp-jinja2==1.5.1
-aiohttp_cors==0.7.0
-watchdog==2.1.7
-certifi==2023.7.22

backend/src/legacy/library.js

@@ -1,84 +0,0 @@
-class PluginEventTarget extends EventTarget { }
-method_call_ev_target = new PluginEventTarget();
-
-window.addEventListener("message", function(evt) {
-    let ev = new Event(evt.data.call_id);
-    ev.data = evt.data.result;
-    method_call_ev_target.dispatchEvent(ev);
-}, false);
-
-async function call_server_method(method_name, arg_object={}) {
-    const token = await fetch("http://127.0.0.1:1337/auth/token").then(r => r.text());
-    const response = await fetch(`http://127.0.0.1:1337/methods/${method_name}`, {
-      method: 'POST',
-      credentials: "include",
-      headers: {
-        'Content-Type': 'application/json',
-        Authentication: token
-      },
-      body: JSON.stringify(arg_object),
-    });
-
-    const dta = await response.json();
-    if (!dta.success) throw dta.result;
-    return dta.result;
-}
-
-// Source: https://stackoverflow.com/a/2117523 Thanks!
-function uuidv4() {
-    return ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c =>
-        (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
-    );
-}
-
-async function fetch_nocors(url, request={}) {
-    let args = { method: "POST", headers: {}, body: "" };
-    request = {...args, ...request};
-    request.url = url;
-    request.data = request.body;
-    delete request.body; //maintain api-compatibility with fetch
-    return await call_server_method("http_request", request);
-}
-
-async function call_plugin_method(method_name, arg_object={}) {
-    if (plugin_name == undefined) 
-        throw new Error("Plugin methods can only be called from inside plugins (duh)");
-    const token = await fetch("http://127.0.0.1:1337/auth/token").then(r => r.text());
-    const response = await fetch(`http://127.0.0.1:1337/plugins/${plugin_name}/methods/${method_name}`, {
-        method: 'POST',
-        credentials: "include",
-        headers: {
-            'Content-Type': 'application/json',
-            Authentication: token
-        },
-        body: JSON.stringify({
-            args: arg_object,
-        }),
-    });
-
-    const dta = await response.json();
-    if (!dta.success) throw dta.result;
-    return dta.result;
-}
-
-async function execute_in_tab(tab, run_async, code) {
-    return await call_server_method("execute_in_tab", {
-        'tab': tab,
-        'run_async': run_async,
-        'code': code
-    });
-}
-
-async function inject_css_into_tab(tab, style) {
-    return await call_server_method("inject_css_into_tab", {
-        'tab': tab,
-        'style': style
-    });
-}
-
-async function remove_css_from_tab(tab, css_id) {
-    return await call_server_method("remove_css_from_tab", {
-        'tab': tab,
-        'css_id': css_id
-    });
-}

frontend/package.json

@@ -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.25.0",
+    "decky-frontend-lib": "3.21.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.25.0
-    version: 3.25.0
+    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.25.0:
-    resolution: {integrity: sha512-2lBoHS2AIRmuluq/bGdHBz+uyToQE7k3K/vDq1MQbDZ4eC+8CGDuh2T8yZOj3D0yjGP2MdikNNAWPA9Z5l2qDg==}
+  /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
 
@@ -3477,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:

frontend/src/components/DeckyState.tsx

@@ -8,7 +8,6 @@ import { VerInfo } from '../updater';
 interface PublicDeckyState {
   plugins: Plugin[];
   pluginOrder: string[];
-  frozenPlugins: string[];
   hiddenPlugins: string[];
   activePlugin: Plugin | null;
   updates: PluginUpdateMapping | null;
@@ -27,7 +26,6 @@ export interface UserInfo {
 export class DeckyState {
   private _plugins: Plugin[] = [];
   private _pluginOrder: string[] = [];
-  private _frozenPlugins: string[] = [];
   private _hiddenPlugins: string[] = [];
   private _activePlugin: Plugin | null = null;
   private _updates: PluginUpdateMapping | null = null;
@@ -43,7 +41,6 @@ export class DeckyState {
     return {
       plugins: this._plugins,
       pluginOrder: this._pluginOrder,
-      frozenPlugins: this._frozenPlugins,
       hiddenPlugins: this._hiddenPlugins,
       activePlugin: this._activePlugin,
       updates: this._updates,
@@ -70,11 +67,6 @@ export class DeckyState {
     this.notifyUpdate();
   }
 
-  setFrozenPlugins(frozenPlugins: string[]) {
-    this._frozenPlugins = frozenPlugins;
-    this.notifyUpdate();
-  }
-
   setHiddenPlugins(hiddenPlugins: string[]) {
     this._hiddenPlugins = hiddenPlugins;
     this.notifyUpdate();

frontend/src/components/DeckyToaster.tsx

@@ -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 () => {

frontend/src/components/LegacyPlugin.tsx

@@ -1,11 +0,0 @@
-import { VFC } from 'react';
-
-interface Props {
-  url: string;
-}
-
-const LegacyPlugin: VFC<Props> = ({ url }) => {
-  return <iframe style={{ border: 'none', width: '100%', height: '100%' }} src={url}></iframe>;
-};
-
-export default LegacyPlugin;

frontend/src/components/modals/PluginUninstallModal.tsx

@@ -15,9 +15,8 @@ const PluginUninstallModal: FC<PluginUninstallModalProps> = ({ name, title, butt
       closeModal={closeModal}
       onOK={async () => {
         await window.DeckyPluginLoader.callServerMethod('uninstall_plugin', { name });
-        // uninstalling a plugin resets the frozen and hidden setting for it server-side
+        // uninstalling a plugin resets the hidden setting for it server-side
         // we invalidate here so if you re-install it, you won't have an out-of-date hidden filter
-        await window.DeckyPluginLoader.frozenPluginsService.invalidate();
         await window.DeckyPluginLoader.hiddenPluginsService.invalidate();
       }}
       strTitle={title}

frontend/src/components/settings/index.tsx

@@ -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);
@@ -25,7 +24,7 @@ export default function SettingsPage() {
     },
     {
       title: t('SettingsIndex.plugins_title'),
-      content: <PluginList isDeveloper={isDeveloper} />,
+      content: <PluginList />,
       route: '/decky/settings/plugins',
       icon: <FaPlug />,
     },
@@ -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} />;

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

@@ -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],

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

@@ -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

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

@@ -1,34 +1,18 @@
 import { FC } from 'react';
 import { useTranslation } from 'react-i18next';
-import { FaEyeSlash, FaLock } from 'react-icons/fa';
+import { FaEyeSlash } from 'react-icons/fa';
 
 interface PluginListLabelProps {
-  frozen: boolean;
   hidden: boolean;
   name: string;
   version?: string;
 }
 
-const PluginListLabel: FC<PluginListLabelProps> = ({ name, frozen, hidden, version }) => {
+const PluginListLabel: FC<PluginListLabelProps> = ({ name, hidden, version }) => {
   const { t } = useTranslation();
   return (
     <div style={{ display: 'flex', flexDirection: 'column', gap: '6px' }}>
-      <div>
-        {name}
-        {version && (
-          <>
-            {' - '}
-            <span style={{ color: frozen ? '#67707b' : 'inherit' }}>
-              {frozen && (
-                <>
-                  <FaLock />{' '}
-                </>
-              )}
-              {version}
-            </span>
-          </>
-        )}
-      </div>
+      <div>{version ? `${name} - ${version}` : name}</div>
       {hidden && (
         <div
           style={{

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

@@ -33,16 +33,7 @@ async function reinstallPlugin(pluginName: string, currentVersion?: string) {
   }
 }
 
-type PluginTableData = PluginData & {
-  name: string;
-  frozen: boolean;
-  onFreeze(): void;
-  onUnfreeze(): void;
-  hidden: boolean;
-  onHide(): void;
-  onShow(): void;
-  isDeveloper: boolean;
-};
+type PluginTableData = PluginData & { name: string; hidden: boolean; onHide(): void; onShow(): void };
 
 function PluginInteractables(props: { entry: ReorderableEntry<PluginTableData> }) {
   const { t } = useTranslation();
@@ -52,7 +43,7 @@ function PluginInteractables(props: { entry: ReorderableEntry<PluginTableData> }
     return null;
   }
 
-  const { name, update, version, onHide, onShow, hidden, onFreeze, onUnfreeze, frozen, isDeveloper } = props.entry.data;
+  const { name, update, version, onHide, onShow, hidden } = props.entry.data;
 
   const showCtxMenu = (e: MouseEvent | GamepadEvent) => {
     showContextMenu(
@@ -93,11 +84,6 @@ function PluginInteractables(props: { entry: ReorderableEntry<PluginTableData> }
         ) : (
           <MenuItem onSelected={onHide}>{t('PluginListIndex.hide')}</MenuItem>
         )}
-        {frozen ? (
-          <MenuItem onSelected={onUnfreeze}>{t('PluginListIndex.unfreeze')}</MenuItem>
-        ) : (
-          isDeveloper && <MenuItem onSelected={onFreeze}>{t('PluginListIndex.freeze')}</MenuItem>
-        )}
       </Menu>,
       e.currentTarget ?? window,
     );
@@ -152,8 +138,8 @@ type PluginData = {
   version?: string;
 };
 
-export default function PluginList({ isDeveloper }: { isDeveloper: boolean }) {
-  const { plugins, updates, pluginOrder, setPluginOrder, frozenPlugins, hiddenPlugins } = useDeckyState();
+export default function PluginList() {
+  const { plugins, updates, pluginOrder, setPluginOrder, hiddenPlugins } = useDeckyState();
   const [_, setPluginOrderSetting] = useSetting<string[]>(
     'pluginOrder',
     plugins.map((plugin) => plugin.name),
@@ -165,27 +151,21 @@ export default function PluginList({ isDeveloper }: { isDeveloper: boolean }) {
   }, []);
 
   const [pluginEntries, setPluginEntries] = useState<ReorderableEntry<PluginTableData>[]>([]);
-  const frozenPluginsService = window.DeckyPluginLoader.frozenPluginsService;
   const hiddenPluginsService = window.DeckyPluginLoader.hiddenPluginsService;
 
   useEffect(() => {
     setPluginEntries(
       plugins.map(({ name, version }) => {
-        const frozen = frozenPlugins.includes(name);
         const hidden = hiddenPlugins.includes(name);
 
         return {
-          label: <PluginListLabel name={name} frozen={frozen} hidden={hidden} version={version} />,
+          label: <PluginListLabel name={name} hidden={hidden} version={version} />,
           position: pluginOrder.indexOf(name),
           data: {
             name,
-            frozen,
             hidden,
-            isDeveloper,
             version,
             update: updates?.get(name),
-            onFreeze: () => frozenPluginsService.update([...frozenPlugins, name]),
-            onUnfreeze: () => frozenPluginsService.update(frozenPlugins.filter((pluginName) => name !== pluginName)),
             onHide: () => hiddenPluginsService.update([...hiddenPlugins, name]),
             onShow: () => hiddenPluginsService.update(hiddenPlugins.filter((pluginName) => name !== pluginName)),
           },

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

@@ -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>
-  );
-}

frontend/src/components/store/Store.tsx

@@ -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>
     </>
   );

frontend/src/developer.tsx

@@ -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');
   }
 }

frontend/src/frozen-plugins-service.tsx

@@ -1,49 +0,0 @@
-import { DeckyState } from './components/DeckyState';
-import { PluginUpdateMapping } from './store';
-import { getSetting, setSetting } from './utils/settings';
-
-/**
- * A Service class for managing the state and actions related to the frozen plugins feature.
- *
- * It's mostly responsible for sending setting updates to the server and keeping the local state in sync.
- */
-export class FrozenPluginService {
-  constructor(private deckyState: DeckyState) {}
-
-  init() {
-    getSetting<string[]>('frozenPlugins', []).then((frozenPlugins) => {
-      this.deckyState.setFrozenPlugins(frozenPlugins);
-    });
-  }
-
-  /**
-   * Sends the new frozen plugins list to the server and persists it locally in the decky state
-   *
-   * @param frozenPlugins The new list of frozen plugins
-   */
-  async update(frozenPlugins: string[]) {
-    await setSetting('frozenPlugins', frozenPlugins);
-    this.deckyState.setFrozenPlugins(frozenPlugins);
-
-    // Remove pending updates for frozen plugins
-    const updates = this.deckyState.publicState().updates;
-
-    if (updates) {
-      const filteredUpdates = new Map() as PluginUpdateMapping;
-      updates.forEach((v, k) => {
-        if (!frozenPlugins.includes(k)) {
-          filteredUpdates.set(k, v);
-        }
-      });
-
-      this.deckyState.setUpdates(filteredUpdates);
-    }
-  }
-
-  /**
-   * Refreshes the state of frozen plugins in the local state
-   */
-  async invalidate() {
-    this.deckyState.setFrozenPlugins(await getSetting('frozenPlugins', []));
-  }
-}

frontend/src/index.ts

@@ -1,16 +1,5 @@
 // Sets up DFL, then loads start.ts which starts up the loader
-interface Window {
-  SP_REACTDOM: any;
-}
 (async () => {
-  if (!window.SP_REACT) {
-    console.debug('Setting up React globals...');
-    // deliberate partial import
-    const DFLWebpack = await import('decky-frontend-lib/dist/webpack');
-    // TODO move these finds to dfl in v4
-    window.SP_REACT = DFLWebpack.findModule((m) => m.Component && m.PureComponent && m.useLayoutEffect);
-    window.SP_REACTDOM = DFLWebpack.findModule((m) => m.createPortal && m.createRoot);
-  }
   console.debug('Setting up decky-frontend-lib...');
   window.DFL = await import('decky-frontend-lib');
   await import('./start');

frontend/src/plugin-loader.tsx

@@ -13,7 +13,6 @@ import { FC, lazy } from 'react';
 import { FaExclamationCircle, FaPlug } from 'react-icons/fa';
 
 import { DeckyState, DeckyStateContextProvider, UserInfo, useDeckyState } from './components/DeckyState';
-import LegacyPlugin from './components/LegacyPlugin';
 import { File, FileSelectionType } from './components/modals/filepicker';
 import { deinitFilepickerPatches, initFilepickerPatches } from './components/modals/filepicker/patches';
 import MultiplePluginsInstallModal from './components/modals/MultiplePluginsInstallModal';
@@ -22,7 +21,6 @@ import PluginUninstallModal from './components/modals/PluginUninstallModal';
 import NotificationBadge from './components/NotificationBadge';
 import PluginView from './components/PluginView';
 import WithSuspense from './components/WithSuspense';
-import { FrozenPluginService } from './frozen-plugins-service';
 import { HiddenPluginsService } from './hidden-plugins-service';
 import Logger from './logger';
 import { NotificationService } from './notification-service';
@@ -50,7 +48,6 @@ class PluginLoader extends Logger {
   public toaster: Toaster = new Toaster();
   private deckyState: DeckyState = new DeckyState();
 
-  public frozenPluginsService = new FrozenPluginService(this.deckyState);
   public hiddenPluginsService = new HiddenPluginsService(this.deckyState);
   public notificationService = new NotificationService(this.deckyState);
 
@@ -146,9 +143,7 @@ class PluginLoader extends Logger {
   }
 
   public async checkPluginUpdates() {
-    const frozenPlugins = this.deckyState.publicState().frozenPlugins;
-
-    const updates = await checkForUpdates(this.plugins.filter((p) => !frozenPlugins.includes(p.name)));
+    const updates = await checkForUpdates(this.plugins);
     this.deckyState.setUpdates(updates);
     return updates;
   }
@@ -228,7 +223,6 @@ class PluginLoader extends Logger {
       this.deckyState.setPluginOrder(pluginOrder);
     });
 
-    this.frozenPluginsService.init();
     this.hiddenPluginsService.init();
     this.notificationService.init();
   }
@@ -243,7 +237,7 @@ class PluginLoader extends Logger {
 
   public unloadPlugin(name: string) {
     console.log('Plugin List: ', this.plugins);
-    const plugin = this.plugins.find((plugin) => plugin.name === name || plugin.name === name.replace('$LEGACY_', ''));
+    const plugin = this.plugins.find((plugin) => plugin.name === name);
     plugin?.onDismount?.();
     this.plugins = this.plugins.filter((p) => p !== plugin);
     this.deckyState.setPlugins(this.plugins);
@@ -261,12 +255,7 @@ class PluginLoader extends Logger {
       this.log(`Trying to load ${name}`);
 
       this.unloadPlugin(name);
-
-      if (name.startsWith('$LEGACY_')) {
-        await this.importLegacyPlugin(name.replace('$LEGACY_', ''));
-      } else {
-        await this.importReactPlugin(name, version);
-      }
+      await this.importReactPlugin(name, version);
 
       this.deckyState.setPlugins(this.plugins);
       this.log(`Loaded ${name}`);
@@ -347,15 +336,6 @@ class PluginLoader extends Logger {
     } else throw new Error(`${name} frontend_bundle not OK`);
   }
 
-  private async importLegacyPlugin(name: string) {
-    const url = `http://127.0.0.1:1337/plugins/load_main/${name}`;
-    this.plugins.push({
-      name: name,
-      icon: <FaPlug />,
-      content: <LegacyPlugin url={url} />,
-    });
-  }
-
   async callServerMethod(methodName: string, args = {}) {
     const response = await fetch(`http://127.0.0.1:1337/methods/${methodName}`, {
       method: 'POST',

frontend/src/steamfixes/index.ts

@@ -1,4 +1,4 @@
-// import reloadFix from './reload';
+import reloadFix from './reload';
 import restartFix from './restart';
 let fixes: Function[] = [];
 
@@ -7,6 +7,6 @@ export function deinitSteamFixes() {
 }
 
 export async function initSteamFixes() {
-  // fixes.push(await reloadFix());
+  fixes.push(await reloadFix());
   fixes.push(await restartFix());
 }

frontend/src/store.tsx

@@ -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,10 @@ 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.');
@@ -81,8 +60,29 @@ export async function getPluginList(
       console.error('Somehow you ended up without a standard URL, using the default URL.');
       storeURL = 'https://plugins.deckbrew.xyz/plugins';
       break;
+      return fetch(storeURL, {
+        method: 'GET',
+        headers: {
+          'X-Decky-Version': version.current,
+        },
+      }).then((r) => r.json());
   }
-  return fetch(storeURL + query, {
+  switch (+store) {
+    case Store.Default:
+      storeURL = 'https://plugins.deckbrew.xyz/plugins';
+      break;
+    case Store.Testing:
+      storeURL = 'https://testing.deckbrew.xyz/plugins';
+      break;
+    case Store.Custom:
+      storeURL = customURL;
+      break;
+    default:
+      console.error('Somehow you ended up without a standard URL, using the default URL.');
+      storeURL = 'https://plugins.deckbrew.xyz/plugins';
+      break;
+  }
+  return fetch(storeURL, {
     method: 'GET',
     headers: {
       'X-Decky-Version': version.current,

frontend/src/tabs-hook.old.tsx

@@ -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) {

frontend/src/tabs-hook.tsx

@@ -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,16 +32,15 @@ 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 (
-        (typeof currentNode?.memoizedProps?.visible == 'boolean' ||
-          typeof currentNode?.memoizedProps?.active == 'boolean') &&
+        typeof currentNode?.memoizedProps?.visible == 'boolean' &&
         currentNode?.type?.toString()?.includes('QuickAccessMenuBrowserView')
       ) {
         this.log(`QAM root was found in ${iters} recursion cycles`);

frontend/src/toaster.tsx

@@ -1,14 +1,4 @@
-import {
-  Module,
-  Patch,
-  ToastData,
-  afterPatch,
-  findClass,
-  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';
@@ -48,21 +38,16 @@ class Toaster extends Logger {
     //   </DeckyToasterStateContextProvider>
     // ));
     let instance: any;
-    const tree = getReactRoot(document.getElementById('root') as any);
-    const toasterClass1 = findClass('GamepadToastPlaceholder');
-    const toasterClass2 = findClass('ToastPlaceholder');
-    const toasterClass3 = findClass('ToastPopup');
-    const toasterClass4 = findClass('GamepadToastPopup');
+    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?.(toasterClass1) ||
-        currentNode?.memoizedProps?.className?.startsWith?.(toasterClass2) ||
-        currentNode?.memoizedProps?.className?.startsWith?.(toasterClass3) ||
-        currentNode?.memoizedProps?.className?.startsWith?.(toasterClass4)
+        currentNode?.memoizedProps?.className?.startsWith?.('gamepadtoasts_GamepadToastPlaceholder') ||
+        currentNode?.memoizedProps?.className?.startsWith?.('toastmanager_ToastPlaceholder') ||
+        currentNode?.memoizedProps?.className?.startsWith?.('toastmanager_ToastPopup')
       ) {
         this.log(`Toaster root was found in ${iters} recursion cycles`);
         return currentNode;
@@ -86,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;