add killall to flake

Co-authored-by: Party Wumpus <48649272+PartyWumpus@users.noreply.github.com>

.github/workflows/edit-check.yml

@@ -18,7 +18,7 @@ jobs:
       
     - name: Get changed files
       id: changed-files
-      uses: tj-actions/changed-files@531f5f7d163941f0c1c04e0ff4d8bb243ac4366f
+      uses: tj-actions/changed-files@v41.0.0
       with:
         separator: ","
         files: |

README.md

@@ -105,7 +105,7 @@ Please consult [the wiki page regarding development](https://wiki.deckbrew.xyz/e
 ⚠️ If you are recieving build errors due to an out of date library, you should run this command inside of your repository.
 
 ```bash
-pnpm update @decky/ui --latest
+pnpm update decky-frontend-lib --latest
 ```
 
 Source control and deploying plugins are left to each respective contributor for the cloned repos in order to keep dependencies up to date.

backend/decky_loader/browser.py

@@ -29,8 +29,6 @@ class PluginInstallType(IntEnum):
     INSTALL = 0
     REINSTALL = 1
     UPDATE = 2
-    DOWNGRADE = 3
-    OVERWRITE = 4
 
 class PluginInstallRequest(TypedDict):
     name: str
@@ -75,8 +73,6 @@ class PluginBrowser:
             packageJsonPath = path.join(pluginBasePath, 'package.json')
             pluginBinPath = path.join(pluginBasePath, 'bin')
 
-            logger.debug(f"Checking package.json at {packageJsonPath}")
-
             if access(packageJsonPath, R_OK):
                 with open(packageJsonPath, "r", encoding="utf-8") as f:
                     packageJson = json.load(f)
@@ -85,7 +81,6 @@ class PluginBrowser:
                         chmod(pluginBasePath, 777)
                         if access(pluginBasePath, W_OK):
                             if not path.exists(pluginBinPath):
-                                logger.debug(f"Creating bin directory at {pluginBinPath}")
                                 mkdir(pluginBinPath)
                             if not access(pluginBinPath, W_OK):
                                 chmod(pluginBinPath, 777)
@@ -96,7 +91,6 @@ class PluginBrowser:
                             binName = remoteBinary["name"]
                             binURL = remoteBinary["url"]
                             binHash = remoteBinary["sha256hash"]
-                            logger.info(f"Attempting to download {binName} from {binURL}")
                             if not await download_remote_binary_to_path(binURL, binHash, path.join(pluginBinPath, binName)):
                                 rv = False
                                 raise Exception(f"Error Downloading Remote Binary {binName}@{binURL} with hash {binHash} to {path.join(pluginBinPath, binName)}")
@@ -105,7 +99,7 @@ class PluginBrowser:
                         chmod(pluginBasePath, 555)
                     else:
                         rv = True
-                        logger.info(f"No Remote Binaries to Download")
+                        logger.debug(f"No Remote Binaries to Download")
 
         except Exception as e:
             rv = False
@@ -163,16 +157,8 @@ class PluginBrowser:
         # Will be set later in code
         res_zip = None
 
-        # Check if plugin was already installed before this
+        # Check if plugin is installed
         isInstalled = False
-
-        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.")
-
         # Preserve plugin order before removing plugin (uninstall alters the order and removes the plugin from the list)
         current_plugin_order = self.settings.getSetting("pluginOrder")[:]
         if self.loader.watcher:
@@ -200,7 +186,7 @@ class PluginBrowser:
                 else:
                     logger.fatal(f"Could not fetch from URL. {await res.text()}")
 
-            await self.loader.ws.emit("loader/plugin_download_info", 70, "Store.download_progress_info.increment_count")
+            await self.loader.ws.emit("loader/plugin_download_info", 80, "Store.download_progress_info.increment_count")
             storeUrl = ""
             match self.settings.getSetting("store", 0):
                 case 0: storeUrl = "https://plugins.deckbrew.xyz/plugins" # default
@@ -213,7 +199,7 @@ class PluginBrowser:
                 if res.status != 200:
                     logger.error(f"Server did not accept install count increment request. code: {res.status}")
 
-        await self.loader.ws.emit("loader/plugin_download_info", 75, "Store.download_progress_info.parse_zip")
+        await self.loader.ws.emit("loader/plugin_download_info", 85, "Store.download_progress_info.parse_zip")
         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]
@@ -227,19 +213,14 @@ class PluginBrowser:
                     return
 
                 else:
-                    plugin_json_file = plugin_json_list[0]
-                    name = sub(r"/.+$", "", plugin_json_file)
-                    try:
-                        with plugin_zip.open(plugin_json_file) as f:
-                            plugin_json_data = json.loads(f.read().decode('utf-8'))
-                            plugin_name_from_plugin_json = plugin_json_data.get('name')
-                            if plugin_name_from_plugin_json and plugin_name_from_plugin_json.strip():
-                                logger.info(f"Extracted plugin name from {plugin_json_file}: {plugin_name_from_plugin_json}")
-                                name = plugin_name_from_plugin_json
-                            else:
-                                logger.warning(f"Nonexistent or invalid 'name' key value in {plugin_json_file}. Falling back to extracting from path.")
-                    except Exception as e:
-                        logger.error(f"Failed to read or parse {plugin_json_file}: {str(e)}. Falling back to extracting from path.")
+                    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:
@@ -248,7 +229,7 @@ class PluginBrowser:
 
         # If plugin is installed, uninstall it
         if isInstalled:
-            await self.loader.ws.emit("loader/plugin_download_info", 80, "Store.download_progress_info.uninstalling_previous")
+            await self.loader.ws.emit("loader/plugin_download_info", 90, "Store.download_progress_info.uninstalling_previous")
             try:
                 logger.debug("Uninstalling existing plugin...")
                 await self.uninstall_plugin(name)
@@ -256,7 +237,7 @@ class PluginBrowser:
                 logger.error(f"Plugin {name} could not be uninstalled.")
 
 
-        await self.loader.ws.emit("loader/plugin_download_info", 90, "Store.download_progress_info.installing_plugin")
+        await self.loader.ws.emit("loader/plugin_download_info", 95, "Store.download_progress_info.installing_plugin")
         # Install the plugin
         logger.debug("Unzipping...")
         ret = self._unzip_to_plugin_dir(res_zip, name, hash)
@@ -264,7 +245,7 @@ class PluginBrowser:
             plugin_folder = self.find_plugin_folder(name)
             assert plugin_folder is not None
             plugin_dir = path.join(self.plugin_path, plugin_folder)
-            await self.loader.ws.emit("loader/plugin_download_info", 95, "Store.download_progress_info.download_remote")
+            #TODO count again from 0% to 100% quickly for this one if it does anything
             ret = await self._download_remote_binaries_for_plugin_with_name(plugin_dir)
             if ret:
                 logger.info(f"Installed {name} (Version: {version})")
@@ -279,8 +260,7 @@ class PluginBrowser:
                     logger.debug("Plugin %s was added to the pluginOrder setting", name)
                 await self.loader.import_plugin(path.join(plugin_dir, "main.py"), plugin_folder)
             else:
-                logger.error("Could not download remote binaries")
-                return
+                logger.fatal(f"Failed Downloading Remote Binaries")
         else:
             logger.fatal(f"SHA-256 Mismatch!!!! {name} (Version: {version})")
         if self.loader.watcher:
@@ -330,5 +310,5 @@ class PluginBrowser:
         if name in plugin_order:
             plugin_order.remove(name)
             self.settings.setSetting("pluginOrder", plugin_order)
-
+            
         logger.debug("Removed any settings for plugin %s", name)

backend/decky_loader/helpers.py

@@ -4,6 +4,7 @@ import uuid
 import os
 import subprocess
 from hashlib import sha256
+from io import BytesIO
 import importlib.metadata
 
 import certifi
@@ -23,7 +24,6 @@ csrf_token = str(uuid.uuid4())
 ssl_ctx = ssl.create_default_context(cafile=certifi.where())
 
 assets_regex = re.compile("^/plugins/.*/assets/.*")
-data_regex = re.compile("^/plugins/.*/data/.*")
 dist_regex = re.compile("^/plugins/.*/dist/.*")
 frontend_regex = re.compile("^/frontend/.*")
 logger = getLogger("Main")
@@ -46,7 +46,6 @@ async def csrf_middleware(request: Request, handler: Handler):
         str(request.rel_url.path) == "/fetch" or \
         str(request.rel_url.path) == "/ws" or \
         assets_regex.match(str(request.rel_url)) or \
-        data_regex.match(str(request.rel_url)) or \
         dist_regex.match(str(request.rel_url)) or \
         frontend_regex.match(str(request.rel_url)):
 
@@ -113,20 +112,19 @@ async def download_remote_binary_to_path(url: str, binHash: str, path: str) -> b
         if os.access(os.path.dirname(path), os.W_OK):
             async with ClientSession() as client:
                 res = await client.get(url, ssl=get_ssl_context())
-                if res.status == 200:
-                    logger.debug("Download attempt of URL: " + url)
-                    data = await res.read()
-                    remoteHash = sha256(data).hexdigest()
-                    if binHash == remoteHash:
-                        with open(path, 'wb') as f:
-                            f.write(data)
-                            rv = True
-                    else:
-                        raise Exception(f"Fatal Error: Hash Mismatch for remote binary {path}@{url}")
+            if res.status == 200:
+                data = BytesIO(await res.read())
+                remoteHash = sha256(data.getbuffer()).hexdigest()
+                if binHash == remoteHash:
+                    data.seek(0)
+                    with open(path, 'wb') as f:
+                        f.write(data.getbuffer())
+                        rv = True
                 else:
-                    rv = False
-    except Exception as e:
-        logger.error("Error during download " + str(e))
+                    raise Exception(f"Fatal Error: Hash Mismatch for remote binary {path}@{url}")
+            else:
+                rv = False
+    except:
         rv = False
 
     return rv

backend/decky_loader/loader.py

@@ -8,7 +8,6 @@ from typing import Any, Tuple, Dict, cast
 
 from aiohttp import web
 from os.path import exists
-from decky_loader.helpers import get_homebrew_path
 from watchdog.events import RegexMatchingEventHandler, FileSystemEvent
 from watchdog.observers import Observer
 
@@ -92,7 +91,6 @@ class Loader:
             web.get("/plugins/{plugin_name}/frontend_bundle", self.handle_frontend_bundle),
             web.get("/plugins/{plugin_name}/dist/{path:.*}", self.handle_plugin_dist),
             web.get("/plugins/{plugin_name}/assets/{path:.*}", self.handle_plugin_frontend_assets),
-            web.get("/plugins/{plugin_name}/data/{path:.*}", self.handle_plugin_frontend_assets_from_data),
         ])
 
         server_instance.ws.add_route("loader/get_plugins", self.get_plugins)
@@ -144,13 +142,6 @@ class Loader:
 
         return web.FileResponse(file, headers={"Cache-Control": "no-cache"})
 
-    async def handle_plugin_frontend_assets_from_data(self, request: web.Request):
-        plugin = self.plugins[request.match_info["plugin_name"]]
-        home = get_homebrew_path()
-        file = path.join(home, "data", plugin.plugin_directory, request.match_info["path"])
-
-        return web.FileResponse(file, headers={"Cache-Control": "no-cache"})
-
     async def handle_frontend_bundle(self, request: web.Request):
         plugin = self.plugins[request.match_info["plugin_name"]]
 
@@ -225,4 +216,4 @@ class Loader:
     async def handle_plugin_backend_reload(self, plugin_name: str):
         plugin = self.plugins[plugin_name]
 
-        await self.reload_queue.put((plugin.file, plugin.plugin_directory))
+        await self.reload_queue.put((plugin.file, plugin.plugin_directory))

backend/decky_loader/locales/cs-CZ.json

@@ -52,9 +52,7 @@
     "MultiplePluginsInstallModal": {
         "confirm": "Jste si jisti, že chcete udělat následující úpravy?",
         "description": {
-            "downgrade": "Downgradovat {{name}} na verzi {{version}}",
             "install": "Instalovat {{name}} {{version}}",
-            "overwrite": "Přepsat {{name}} verzí {{version}}",
             "reinstall": "Přeinstalovat {{name}} {{version}}",
             "update": "Aktualizovat {{name}} na {{version}}"
         },
@@ -63,18 +61,12 @@
             "loading": "Probíhá"
         },
         "title": {
-            "downgrade_few": "Downgradovat {{count}} pluginy",
-            "downgrade_one": "Downgradovat {{count}} plugin",
-            "downgrade_other": "Downgradovat {{count}} pluginů",
             "install_few": "Instalovat {{count}} pluginů",
             "install_one": "Instalovat 1 plugin",
             "install_other": "Instalovat {{count}} pluginů",
             "mixed_few": "Upravit {{count}} pluginů",
             "mixed_one": "Upravit {{count}} plugin",
             "mixed_other": "Upravit {{count}} pluginů",
-            "overwrite_few": "Přepsat {{count}} pluginy",
-            "overwrite_one": "Přepsat {{count}} plugin",
-            "overwrite_other": "Přepsat {{count}} pluginů",
             "reinstall_few": "Přeinstalovat {{count}} pluginů",
             "reinstall_one": "Přeinstalovat 1 plugin",
             "reinstall_other": "Přeinstalovat {{count}} pluginů",
@@ -84,22 +76,12 @@
         }
     },
     "PluginCard": {
-        "plugin_downgrade": "Downgrade",
         "plugin_full_access": "Tento plugin má plný přístup k vašemu Steam Decku.",
         "plugin_install": "Instalovat",
         "plugin_no_desc": "Nebyl uveden žádný popis.",
-        "plugin_overwrite": "Přepsat",
-        "plugin_reinstall": "Přeinstalovat",
-        "plugin_update": "Aktualizovat",
         "plugin_version_label": "Verze pluginu"
     },
     "PluginInstallModal": {
-        "downgrade": {
-            "button_idle": "Downgrade",
-            "button_processing": "Downgradování",
-            "desc": "Opravdu chcete downgradovat {{artifact}} na verzi {{version}}?",
-            "title": "Downgradovat {{artifact}}"
-        },
         "install": {
             "button_idle": "Instalovat",
             "button_processing": "Instalování",
@@ -107,13 +89,6 @@
             "title": "Instalovat {{artifact}}"
         },
         "no_hash": "Tento plugin nemá hash, instalujete jej na vlastní nebezpečí.",
-        "not_installed": "(nenainstalováno)",
-        "overwrite": {
-            "button_idle": "Přepsat",
-            "button_processing": "Přepisování",
-            "desc": "Opravdu chcete přepsat {{artifact}} na verzi {{version}}?",
-            "title": "Přepsat {{artifact}}"
-        },
         "reinstall": {
             "button_idle": "Přeinstalovat",
             "button_processing": "Přeinstalování",
@@ -123,7 +98,7 @@
         "update": {
             "button_idle": "Aktualizovat",
             "button_processing": "Aktualizování",
-            "desc": "Opravdu chcete aktualizovat {{artifact}} na verzi {{version}}?",
+            "desc": "Jste si jisti, že chcete aktualizovat {{artifact}} {{version}}?",
             "title": "Aktualizovat {{artifact}}"
         }
     },
@@ -231,7 +206,6 @@
     },
     "Store": {
         "download_progress_info": {
-            "download_remote": "Stahování externích knihoven",
             "download_zip": "Stahování pluginu",
             "increment_count": "Zvyšující se počet stahování",
             "installing_plugin": "Instalování pluginu",

backend/decky_loader/locales/en-US.json

@@ -52,9 +52,7 @@
     "MultiplePluginsInstallModal": {
         "confirm": "Are you sure you want to make the following modifications?",
         "description": {
-            "downgrade": "Downgrade {{name}} to {{version}}",
             "install": "Install {{name}} {{version}}",
-            "overwrite": "Overwrite {{name}} with {{version}}",
             "reinstall": "Reinstall {{name}} {{version}}",
             "update": "Update {{name}} to {{version}}"
         },
@@ -63,14 +61,10 @@
             "loading": "Working"
         },
         "title": {
-            "downgrade_one": "Downgrade 1 plugin",
-            "downgrade_other": "Downgrade {{count}} plugins",
             "install_one": "Install 1 plugin",
             "install_other": "Install {{count}} plugins",
             "mixed_one": "Modify {{count}} plugin",
             "mixed_other": "Modify {{count}} plugins",
-            "overwrite_one": "Overwrite 1 plugin",
-            "overwrite_other": "Overwrite {{count}} plugins",
             "reinstall_one": "Reinstall 1 plugin",
             "reinstall_other": "Reinstall {{count}} plugins",
             "update_one": "Update 1 plugin",
@@ -78,22 +72,12 @@
         }
     },
     "PluginCard": {
-        "plugin_downgrade": "Downgrade",
         "plugin_full_access": "This plugin has full access to your Steam Deck.",
         "plugin_install": "Install",
         "plugin_no_desc": "No description provided.",
-        "plugin_overwrite": "Overwrite",
-        "plugin_reinstall": "Reinstall",
-        "plugin_update": "Update",
         "plugin_version_label": "Plugin Version"
     },
     "PluginInstallModal": {
-        "downgrade": {
-            "button_idle": "Downgrade",
-            "button_processing": "Downgrading",
-            "desc": "Are you sure you want to downgrade {{artifact}} to version {{version}}?",
-            "title": "Downgrade {{artifact}}"
-        },
         "install": {
             "button_idle": "Install",
             "button_processing": "Installing",
@@ -101,13 +85,6 @@
             "title": "Install {{artifact}}"
         },
         "no_hash": "This plugin does not have a hash, you are installing it at your own risk.",
-        "not_installed": "(not installed)",
-        "overwrite": {
-            "button_idle": "Overwrite",
-            "button_processing": "Overwriting",
-            "desc": "Are you sure you want to overwrite {{artifact}} with version {{version}}?",
-            "title": "Overwrite {{artifact}}"
-        },
         "reinstall": {
             "button_idle": "Reinstall",
             "button_processing": "Reinstalling",
@@ -117,7 +94,7 @@
         "update": {
             "button_idle": "Update",
             "button_processing": "Updating",
-            "desc": "Are you sure you want to update {{artifact}} to version {{version}}?",
+            "desc": "Are you sure you want to update {{artifact}} {{version}}?",
             "title": "Update {{artifact}}"
         }
     },
@@ -222,7 +199,6 @@
     },
     "Store": {
         "download_progress_info": {
-            "download_remote": "Downloading any external binaries",
             "download_zip": "Downloading plugin",
             "increment_count": "Incrementing download count",
             "installing_plugin": "Installing plugin",

backend/decky_loader/locales/fr-FR.json

@@ -2,7 +2,7 @@
     "BranchSelect": {
         "update_channel": {
             "label": "Canal de mise à jour",
-            "prerelease": "Préliminaire",
+            "prerelease": "Avant-première",
             "stable": "Stable",
             "testing": "Test"
         }
@@ -52,29 +52,21 @@
     "MultiplePluginsInstallModal": {
         "confirm": "Êtes-vous sûr de vouloir apporter les modifications suivantes ?",
         "description": {
-            "downgrade": "Rétrograder {{name}} en {{version}}",
             "install": "Installer {{name}} {{version}}",
-            "overwrite": "Écraser {{name}} avec {{version}}",
             "reinstall": "Réinstaller {{name}} {{version}}",
-            "update": "Mettre à jour {{name}} en {{version}}"
+            "update": "Mettre à jour {{name}} à {{version}}"
         },
         "ok_button": {
             "idle": "Confirmer",
             "loading": "En cours"
         },
         "title": {
-            "downgrade_many": "Rétrograder {{count}} plugins",
-            "downgrade_one": "Rétrograder 1 plugin",
-            "downgrade_other": "Rétrograder {{count}} plugins",
             "install_many": "Installer {{count}} plugins",
             "install_one": "Installer 1 plugin",
             "install_other": "Installer {{count}} plugins",
             "mixed_many": "Modifier {{count}} plugins",
             "mixed_one": "Modifier {{count}} plugin",
             "mixed_other": "Modifier {{count}} plugins",
-            "overwrite_many": "Écraser {{count}} plugins",
-            "overwrite_one": "Écraser 1 plugin",
-            "overwrite_other": "Écraser {{count}} plugins",
             "reinstall_many": "Réinstaller {{count}} plugins",
             "reinstall_one": "Réinstaller 1 plugin",
             "reinstall_other": "Réinstaller {{count}} plugins",
@@ -84,22 +76,12 @@
         }
     },
     "PluginCard": {
-        "plugin_downgrade": "Rétrograder",
         "plugin_full_access": "Ce plugin a un accès complet à votre Steam Deck.",
         "plugin_install": "Installer",
         "plugin_no_desc": "Aucune description fournie.",
-        "plugin_overwrite": "Écraser",
-        "plugin_reinstall": "Réinstaller",
-        "plugin_update": "Mettre à jour",
         "plugin_version_label": "Version du plugin"
     },
     "PluginInstallModal": {
-        "downgrade": {
-            "button_idle": "Rétrograder",
-            "button_processing": "Rétrogradation",
-            "desc": "Êtes-vous sûr de vouloir rétrograder {{artifact}} vers la version {{version}} ?",
-            "title": "Rétrograder {{artifact}}"
-        },
         "install": {
             "button_idle": "Installer",
             "button_processing": "Installation en cours",
@@ -107,13 +89,6 @@
             "title": "Installer {{artifact}}"
         },
         "no_hash": "Ce plugin n'a pas de somme de contrôle, vous l'installez à vos risques et périls.",
-        "not_installed": "(non installé)",
-        "overwrite": {
-            "button_idle": "Écraser",
-            "button_processing": "Écrasement",
-            "desc": "Êtes-vous sûr de vouloir remplacer {{artifact}} par la version {{version}} ?",
-            "title": "Écraser {{artifact}}"
-        },
         "reinstall": {
             "button_idle": "Réinstaller",
             "button_processing": "Réinstallation en cours",
@@ -122,8 +97,8 @@
         },
         "update": {
             "button_idle": "Mettre à jour",
-            "button_processing": "Mise à jour en cours",
-            "desc": "Êtes-vous sûr de vouloir mettre à jour {{artifact}} vers la version {{version}} ?",
+            "button_processing": "Mise à jour",
+            "desc": "Êtes-vous sûr de vouloir mettre à jour {{artifact}} {{version}} ?",
             "title": "Mettre à jour {{artifact}}"
         }
     },
@@ -149,7 +124,7 @@
         "decky_title": "Decky",
         "decky_update_available": "Mise à jour vers {{tag_name}} disponible !",
         "error": "Erreur",
-        "plugin_error_uninstall": "Le chargement de {{name}} a provoqué une exception comme indiqué ci-dessus. Cela signifie généralement que le plugin nécessite une mise à jour pour la nouvelle version de SteamUI. Vérifiez si une mise à jour est présente ou évaluez sa suppression dans les paramètres de Decky, dans la section Plugins.",
+        "plugin_error_uninstall": "Allez sur {{name}} dans le menu de Decky si vous voulez désinstaller ce plugin.",
         "plugin_load_error": {
             "message": "Erreur lors du chargement du plugin {{name}}",
             "toast": "Erreur lors du chargement de {{name}}"
@@ -178,7 +153,7 @@
         "cef_console": {
             "button": "Ouvrir la console",
             "desc": "Ouvre la console CEF. Utile uniquement à des fins de débogage. Les éléments présentés ici sont potentiellement dangereux et ne doivent être utilisés que si vous êtes un développeur de plugins ou si vous êtes dirigé ici par un de ces développeurs.",
-            "label": "Console CEF"
+            "label": "CEF Console"
         },
         "header": "Autre",
         "react_devtools": {
@@ -196,7 +171,7 @@
         },
         "valve_internal": {
             "desc1": "Active le menu développeur interne de Valve.",
-            "desc2": "Ne touchez à rien dans ce menu à moins que vous ne sachiez ce que ça fait.",
+            "desc2": "Ne touchez à rien dans ce menu à moins que vous ne sachiez ce qu'il fait.",
             "label": "Activer Valve Internal"
         }
     },
@@ -212,9 +187,9 @@
             "label": "Mode développeur"
         },
         "notifications": {
-            "decky_updates_label": "Mise à jour de Decky disponible",
+            "decky_updates_label": "Mise à jour Decky disponible",
             "header": "Notifications",
-            "plugin_updates_label": "Mises à jour des plugins disponibles"
+            "plugin_updates_label": "Mises à jour du plugin disponibles"
         },
         "other": {
             "header": "Autre"
@@ -227,19 +202,9 @@
         "developer_title": "Développeur",
         "general_title": "Général",
         "plugins_title": "Plugins",
-        "testing_title": "Expérimentations"
+        "testing_title": "Essai"
     },
     "Store": {
-        "download_progress_info": {
-            "download_remote": "Téléchargement des binaires externes",
-            "download_zip": "Téléchargement du plugin",
-            "increment_count": "Incrémentation du nombre de téléchargements",
-            "installing_plugin": "Installation du plugin",
-            "open_zip": "Ouverture du fichier zip",
-            "parse_zip": "Analyse du fichier zip",
-            "start": "Initialisation",
-            "uninstalling_previous": "Désinstallation de la copie précédente"
-        },
         "store_contrib": {
             "desc": "Si vous souhaitez contribuer au Decky Plugin Store, consultez le dépôt SteamDeckHomebrew/decky-plugin-template sur GitHub. Des informations sur le développement et la distribution sont disponibles dans le fichier README.",
             "label": "Contributions"
@@ -272,27 +237,23 @@
         "store_testing_cta": "Pensez à tester de nouveaux plugins pour aider l'équipe Decky Loader !",
         "store_testing_warning": {
             "desc": "Vous pouvez utiliser cette chaîne de magasin pour tester des versions de plugins. Assurez-vous de laisser des commentaires sur GitHub afin que le plugin puisse être mis à jour pour tous les utilisateurs.",
-            "label": "Bienvenue sur le canal test de la boutique"
+            "label": "Bienvenue sur la chaîne du magasin de tests"
         }
     },
     "StoreSelect": {
         "custom_store": {
-            "label": "Magasin personnalisé",
+            "label": "Plugin Store personnalisé",
             "url_label": "URL"
         },
         "store_channel": {
             "custom": "Personnalisé",
             "default": "Par défaut",
-            "label": "Canal magasin",
+            "label": "Canal du Plugin Store",
             "testing": "Test"
         }
     },
     "Testing": {
-        "download": "Télécharger",
-        "error": "Erreur d'installation de la PR",
-        "header": "Les versions suivantes de Decky Loader sont construites à partir de Pull Requests ouvertes par des tiers. L'équipe de Decky Loader n'a pas vérifié leur fonctionnalité ou leur sécurité, et elles peuvent être obsolètes.",
-        "loading": "Chargement des Pull Requests ouvertes...",
-        "start_download_toast": "Téléchargement de la PR #{{id}}"
+        "download": "Télécharger"
     },
     "TitleView": {
         "decky_store_desc": "Ouvrir le magasin Decky",
@@ -303,7 +264,7 @@
         "no_patch_notes_desc": "pas de notes de mise à jour pour cette version",
         "patch_notes_desc": "Notes de mise à jour",
         "updates": {
-            "check_button": "Vérifier les mises à jour",
+            "check_button": "Chercher les mises à jour",
             "checking": "Recherche",
             "cur_version": "Version actuelle: {{ver}}",
             "install_button": "Installer la mise à jour",

backend/decky_loader/locales/it-IT.json

@@ -52,9 +52,7 @@
     "MultiplePluginsInstallModal": {
         "confirm": "Sei sicuro di voler effettuare le modifiche seguenti?",
         "description": {
-            "downgrade": "Downgrada {{name}} a versione {{version}}",
             "install": "Installa {{name}} {{version}}",
-            "overwrite": "Sovrascrive {{name}} con {{version}}",
             "reinstall": "Reinstalla {{name}} {{version}}",
             "update": "Aggiorna {{name}} alla versione {{version}}"
         },
@@ -63,18 +61,12 @@
             "loading": "Elaboro"
         },
         "title": {
-            "downgrade_many": "Downgrada {{count}} plugins",
-            "downgrade_one": "Downgrada un plugin",
-            "downgrade_other": "Downgrada {{count}} plugins",
             "install_many": "Installa {{count}} plugins",
             "install_one": "Installa un plugin",
             "install_other": "Installa {{count}} plugins",
             "mixed_many": "Modifica {{count}} plugins",
             "mixed_one": "Modifica un plugin",
             "mixed_other": "Modifica {{count}} plugins",
-            "overwrite_many": "Sovrascrivi {{count}} plugins",
-            "overwrite_one": "Sovrascrivi un plugin",
-            "overwrite_other": "Sovrascrivi {{count}} plugins",
             "reinstall_many": "Reinstalla {{count}} plugins",
             "reinstall_one": "Reinstalla un plugin",
             "reinstall_other": "Reinstalla {{count}} plugins",
@@ -84,22 +76,12 @@
         }
     },
     "PluginCard": {
-        "plugin_downgrade": "Downgrada",
         "plugin_full_access": "Questo plugin ha accesso completo al tuo Steam Deck.",
         "plugin_install": "Installa",
         "plugin_no_desc": "Nessuna descrizione fornita.",
-        "plugin_overwrite": "Sovrascrivi",
-        "plugin_reinstall": "Reinstalla",
-        "plugin_update": "Aggiorna",
         "plugin_version_label": "Versione Plugin"
     },
     "PluginInstallModal": {
-        "downgrade": {
-            "button_idle": "Downgrada",
-            "button_processing": "Downgradando",
-            "desc": "Sei sicuro di voler downgradare {{artifact}} alla versione {{version}}?",
-            "title": "Downgrada {{artifact}}"
-        },
         "install": {
             "button_idle": "Installa",
             "button_processing": "Installando",
@@ -107,13 +89,6 @@
             "title": "Installa {{artifact}}"
         },
         "no_hash": "Questo plugin non ha un hash associato, lo stai installando a tuo rischio e pericolo.",
-        "not_installed": "(non installato)",
-        "overwrite": {
-            "button_idle": "Sovrascrivi",
-            "button_processing": "Sovrascrivendo",
-            "desc": "Sei sicuro di voler sovrascrivere {{artifact}} con la versione {{version}}?",
-            "title": "Sovrascrivi {{artifact}}"
-        },
         "reinstall": {
             "button_idle": "Reinstalla",
             "button_processing": "Reinstallando",
@@ -123,7 +98,7 @@
         "update": {
             "button_idle": "Aggiorna",
             "button_processing": "Aggiornando",
-            "desc": "Sei sicuro di voler aggiornare {{artifact}} alla versione {{version}}?",
+            "desc": "Sei sicuro di voler aggiornare {{artifact}} {{version}}?",
             "title": "Aggiorna {{artifact}}"
         }
     },
@@ -231,7 +206,6 @@
     },
     "Store": {
         "download_progress_info": {
-            "download_remote": "Scaricando qualunque binario esterno",
             "download_zip": "Scarico plugin",
             "increment_count": "Incremento il numero di download",
             "installing_plugin": "Installo il plugin",

backend/decky_loader/locales/ja-JP.json

@@ -52,9 +52,7 @@
     "MultiplePluginsInstallModal": {
         "confirm": "以下の変更を加えてもよろしいですか?",
         "description": {
-            "downgrade": "ダウングレード {{name}} {{version}}",
             "install": "インストール {{name}} {{version}}",
-            "overwrite": "上書き {{name}} {{version}}",
             "reinstall": "再インストール {{name}} {{version}}",
             "update": "アップデート {{name}} {{version}}"
         },
@@ -63,31 +61,19 @@
             "loading": "作業中"
         },
         "title": {
-            "downgrade_other": "{{count}} 個のプラグインをダウングレード",
             "install_other": "{{count}} 個のプラグインをインストール",
             "mixed_other": "{{count}} 個のプラグインを修正",
-            "overwrite_other": "{{count}} 個のプラグインを上書き",
             "reinstall_other": "{{count}} 個のプラグインを再インストール",
             "update_other": "{{count}} 個のプラグインをアップデート"
         }
     },
     "PluginCard": {
-        "plugin_downgrade": "ダウングレード",
         "plugin_full_access": "このプラグインはSteam Deckの全てのアクセス権を持ちます。",
         "plugin_install": "インストール",
         "plugin_no_desc": "説明はありません。",
-        "plugin_overwrite": "上書き",
-        "plugin_reinstall": "再インストール",
-        "plugin_update": "アップデート",
         "plugin_version_label": "プラグインバージョン"
     },
     "PluginInstallModal": {
-        "downgrade": {
-            "button_idle": "ダウングレード",
-            "button_processing": "ダウングレード中",
-            "desc": "{{artifact}}をVer {{version}} にダウングレードしてもよろしいですか？",
-            "title": "{{artifact}}をダウングレード"
-        },
         "install": {
             "button_idle": "インストール",
             "button_processing": "インストール中",
@@ -95,13 +81,6 @@
             "title": "{{artifact}} をインストール"
         },
         "no_hash": "このプラグインにはハッシュがありません。ご自身の責任でインストールしてください。",
-        "not_installed": "(インストールされていません)",
-        "overwrite": {
-            "button_idle": "上書き",
-            "button_processing": "上書き中",
-            "desc": "{{artifact}}をVer {{version}} に上書きしてもよろしいですか？",
-            "title": "{{artifact}}を上書き"
-        },
         "reinstall": {
             "button_idle": "再インストール",
             "button_processing": "再インストール中",
@@ -111,7 +90,7 @@
         "update": {
             "button_idle": "アップデート",
             "button_processing": "アップデート中",
-            "desc": "{{artifact}}をVer {{version}} にアップデートしてもよろしいですか？",
+            "desc": "{{artifact}} {{version}} をアップデートしてもよろしいですか？",
             "title": "{{artifact}} をアップデート"
         }
     },
@@ -213,7 +192,6 @@
     },
     "Store": {
         "download_progress_info": {
-            "download_remote": "外部バイナリのダウンロード",
             "download_zip": "プラグインのダウンロード中",
             "increment_count": "ダウンロード数の増加",
             "installing_plugin": "プラグインのインストール中",

backend/decky_loader/locales/ka-DZ.json

@@ -1 +0,0 @@
-{}

backend/decky_loader/locales/pl-PL.json

@@ -26,7 +26,7 @@
     },
     "FilePickerIndex": {
         "file": {
-            "select": "Zaznacz ten plik"
+            "select": "Wybierz ten plik"
         },
         "files": {
             "all_files": "Wszystkie pliki",
@@ -96,9 +96,9 @@
             "title": "Reinstaluj {{artifact}}"
         },
         "update": {
-            "button_idle": "Aktualizuj",
+            "button_idle": "Aktualizacja",
             "button_processing": "Aktualizowanie",
-            "desc": "Czy na pewno chcesz zaktualizować {{artifact}} do wersji {{version}}?",
+            "desc": "Czy na pewno chcesz zaktualizować {{artifact}} {{version}}?",
             "title": "Zaktualizuj {{artifact}}"
         }
     },
@@ -122,11 +122,11 @@
     },
     "PluginLoader": {
         "decky_title": "Decky",
-        "decky_update_available": "Aktualizacja do {{tag_name}} jest dostępna!",
+        "decky_update_available": "Dostępna aktualizacja do {{tag_name}}!",
         "error": "Błąd",
         "plugin_error_uninstall": "Ładowanie {{name}} spowodowało wyjątek, jak pokazano powyżej. Zwykle oznacza to, że plugin wymaga aktualizacji do nowej wersji SteamUI. Sprawdź, czy aktualizacja jest obecna lub rozważ usunięcie go w ustawieniach Decky, w sekcji Pluginy.",
         "plugin_load_error": {
-            "message": "Błąd ładowania pluginu {{name}}",
+            "message": "Błąd ładowania plugin {{name}}",
             "toast": "Błąd ładowania {{name}}"
         },
         "plugin_uninstall": {
@@ -205,15 +205,6 @@
         "testing_title": "Testowanie"
     },
     "Store": {
-        "download_progress_info": {
-            "download_zip": "Pobieranie pluginu",
-            "increment_count": "Zwiększanie liczby pobrań",
-            "installing_plugin": "Instalowanie pluginu",
-            "open_zip": "Otwieranie pliku zip",
-            "parse_zip": "Analizowanie pliku zip",
-            "start": "Inicjalizacja",
-            "uninstalling_previous": "Odinstalowywanie poprzednich kopii"
-        },
         "store_contrib": {
             "desc": "Jeśli chcesz przyczynić się do rozwoju Decky Plugin Store, sprawdź repozytorium SteamDeckHomebrew/decky-plugin-template na GitHub. Informacje na temat rozwoju i dystrybucji są dostępne w pliku README.",
             "label": "Współtworzenie"
@@ -245,7 +236,7 @@
         },
         "store_testing_cta": "Rozważ przetestowanie nowych pluginów, aby pomóc zespołowi Decky Loader!",
         "store_testing_warning": {
-            "desc": "Możesz użyć tego kanału sklepu do testowania najnowszych wersji pluginów. Pamiętaj, aby zostawić opinię na GitHub, aby plugin mógł zostać zaktualizowany dla wszystkich użytkowników.",
+            "desc": "Możesz użyć tego kanału sklepu do testowania najnowszych wersji pluginów. Pamiętaj, aby zostawić opinię na GitHub, aby plugin mogła zostać zaktualizowana dla wszystkich użytkowników.",
             "label": "Witamy w Testowym Kanale Sklepu"
         }
     },
@@ -262,11 +253,7 @@
         }
     },
     "Testing": {
-        "download": "Pobierz",
-        "error": "Błąd instalowania PR",
-        "header": "Następujące wersje Decky Loader są zrobione z open third-party Pull Requests. Zespół Decky Loader nie zweryfikował ich działania czy bezpieczeństwa, mogą też być nie aktualne.",
-        "loading": "Ładowanie open Pull Requests...",
-        "start_download_toast": "Pobieranie PR #{{id}}"
+        "download": "Pobierz"
     },
     "TitleView": {
         "decky_store_desc": "Otwórz sklep Decky",

backend/decky_loader/locales/pt-PT.json

@@ -1,16 +1,16 @@
 {
     "BranchSelect": {
         "update_channel": {
-            "label": "Canal de atualização",
+            "label": "Canal de actualização",
             "prerelease": "Pré-lançamento",
             "stable": "Estável",
-            "testing": "Em testes"
+            "testing": "Em teste"
         }
     },
     "Developer": {
-        "5secreload": "A recarregar em 5 segundos",
-        "disabling": "Desativar React DevTools",
-        "enabling": "Ativar React DevTools"
+        "5secreload": "Vai recarregar em 5 segundos",
+        "disabling": "Desactivando React DevTools",
+        "enabling": "Activando React DevTools"
     },
     "DropdownMultiselect": {
         "button": {
@@ -19,9 +19,9 @@
     },
     "FilePickerError": {
         "errors": {
-            "file_not_found": "O caminho especificado não é válido. Por favor, verifica e insere o caminho correto.",
-            "perm_denied": "Não tens acesso ao diretório especificado. Por favor, verifica se o seu utilizador (deck na Steam Deck) tem a permissão correspondente para aceder à pasta/ficheiro especificada(o).",
-            "unknown": "Ocorreu um erro desconhecido. O erro bruto é: {{raw_error}}"
+            "file_not_found": "O caminho especificado não é válido. Por favor, verifique e insira-o corretamente.",
+            "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}}"
         }
     },
     "FilePickerIndex": {
@@ -50,11 +50,11 @@
         }
     },
     "MultiplePluginsInstallModal": {
-        "confirm": "Tens a certeza de que pretendes fazer as seguintes alterações?",
+        "confirm": "De certeza que queres fazer as seguintes alterações?",
         "description": {
             "install": "Instalar {{name}} {{version}}",
             "reinstall": "Reinstalar {{name}} {{version}}",
-            "update": "Atualizar {{name}} para {{version}}"
+            "update": "Actualizar {{name}} para {{version}}"
         },
         "ok_button": {
             "idle": "Confirmar",
@@ -70,15 +70,15 @@
             "reinstall_many": "Reinstalar {{count}} plugins",
             "reinstall_one": "Reinstalar 1 plugin",
             "reinstall_other": "Reinstalar {{count}} plugins",
-            "update_many": "Atualizar {{count}} plugins",
-            "update_one": "Atualizar 1 plugin",
-            "update_other": "Atualizar {{count}} plugins"
+            "update_many": "Actualizar {{count}} plugins",
+            "update_one": "Actualizar 1 plugin",
+            "update_other": "Actualizar {{count}} plugins"
         }
     },
     "PluginCard": {
-        "plugin_full_access": "Este plugin tem acesso total ao teu Steam Deck.",
+        "plugin_full_access": "Este plugin tem acesso total à tua Steam Deck.",
         "plugin_install": "Instalar",
-        "plugin_no_desc": "Sem descrição fornecida.",
+        "plugin_no_desc": "Não tem descrição.",
         "plugin_version_label": "Versão do plugin"
     },
     "PluginInstallModal": {
@@ -88,7 +88,7 @@
             "desc": "De certeza que queres instalar {{artifact}} {{version}}?",
             "title": "Instalar {{artifact}}"
         },
-        "no_hash": "Este plugin não tem uma hash, estás a instalá-lo por tua conta e risco.",
+        "no_hash": "Este plugin não tem um hash, estás a instalá-lo por tua conta e risco.",
         "reinstall": {
             "button_idle": "Reinstalar",
             "button_processing": "Reinstalação em curso",
@@ -96,26 +96,24 @@
             "title": "Reinstalar {{artifact}}"
         },
         "update": {
-            "button_idle": "Atualizar",
-            "button_processing": "Atualização em curso",
-            "desc": "De certeza que queres atualizar {{artifact}} {{version}}?",
-            "title": "Atualizar {{artifact}}"
+            "button_idle": "Actualizar",
+            "button_processing": "Actualização em curso",
+            "desc": "De certeza que queres actualizar {{artifact}} {{version}}?",
+            "title": "Actualizar {{artifact}}"
         }
     },
     "PluginListIndex": {
-        "freeze": "Congelar atualizações",
         "hide": "Acesso rápido: Ocultar",
         "no_plugin": "Nenhum plugin instalado!",
         "plugin_actions": "Operações de plugin",
         "reinstall": "Reinstalar",
         "reload": "Recarregar",
         "show": "Acesso rápido: Mostrar",
-        "unfreeze": "Permitir atualizações",
         "uninstall": "Desinstalar",
-        "update_all_many": "Atualizar {{count}} plugins",
-        "update_all_one": "Atualizar 1 plugin",
-        "update_all_other": "Atualizar {{count}} plugins",
-        "update_to": "Atualizar para {{name}}"
+        "update_all_many": "Actualizar {{count}} plugins",
+        "update_all_one": "Actualizar 1 plugin",
+        "update_all_other": "Actualizar {{count}} plugins",
+        "update_to": "Actualizar para {{name}}"
     },
     "PluginListLabel": {
         "hidden": "Oculto do menu de acesso rápido"
@@ -124,7 +122,7 @@
         "decky_title": "Decky",
         "decky_update_available": "Está disponível uma nova versão de {{tag_name}} !",
         "error": "Erro",
-        "plugin_error_uninstall": "Ao carregar {{name}}, ocorreu uma exceção, como pode ser verificado acima. Pode ter sido porque o plugin requer a última versão do SteamUI. Verifica se há uma atualização disponível ou desinstala o plugin nas definições do Decky.",
+        "plugin_error_uninstall": "Houve uma excepção ao carregar {{name}}, como mostrado em cima. Pode ter sido porque o plugin requere a última versão do SteamUI. Verifica se há uma actualização disponível ou desinstala o plugin nas definições do Decky.",
         "plugin_load_error": {
             "message": "Erro ao carregar o plugin {{name}}",
             "toast": "Erro ao carregar {{name}}"
@@ -135,7 +133,7 @@
             "title": "Desinstalar {{name}}"
         },
         "plugin_update_many": "{{count}} plugins têm actualizações disponíveis!",
-        "plugin_update_one": "1 plugin tem atualizações disponíveis!",
+        "plugin_update_one": "1 plugin tem actualizações disponíveis!",
         "plugin_update_other": "{{count}} plugins têm actualizações disponíveis!"
     },
     "PluginView": {
@@ -145,34 +143,34 @@
     },
     "RemoteDebugging": {
         "remote_cef": {
-            "desc": "Permitir acesso não autenticado ao depurador do CEF a qualquer pessoa na tua rede",
-            "label": "Permitir Depuração Remota do CEF"
+            "desc": "Permitir acesso não autenticado ao debugger do CEF a qualquer pessoa na tua rede",
+            "label": "Permitir debugging remoto do CEF"
         }
     },
     "SettingsDeveloperIndex": {
         "cef_console": {
             "button": "Abrir consola",
-            "desc": "Abre a Consola CEF. Apenas útil para fins de depuração. O conteúdo aqui presente pode ser perigoso e só devem ser usadas se fores um desenvolvedor de plugins ou se fores direcionado para aqui por um.",
+            "desc": "Abre a consola do CEF. Só é útil para efeitos de debugging. Pode ser perigosa e só deve ser usada se és um desenvolvedor de plugins, ou se foste aqui indicado por um desenvolvedor.",
             "label": "Consola CEF"
         },
         "header": "Outros",
         "react_devtools": {
-            "desc": "Permite a conexão a um computador a correr o React DevTools. Alterar esta definição irá recarregar o Steam. Define o endereço IP antes de ativar.",
+            "desc": "Permite a conecção a um computador que está a correr React DevTools. Mudar esta definição vai recarregar o Steam. Define o endereço de IP antes de activar.",
             "ip_label": "IP",
-            "label": "Ativar React DevTools"
+            "label": "Activar React DevTools"
         },
         "third_party_plugins": {
             "button_install": "Instalar",
             "button_zip": "Navegar",
             "header": "Plugins de terceiros",
-            "label_desc": "URL",
-            "label_url": "Instalar plugin a partir de um URL",
-            "label_zip": "Instalar plugin a partir de um ficheiro ZIP"
+            "label_desc": "URl",
+            "label_url": "Instalar plugin a partir dum URL",
+            "label_zip": "Instalar plugin a partir dum ficheiro ZIP"
         },
         "valve_internal": {
-            "desc1": "Ativa o menu interno de programador da Valve.",
-            "desc2": "Não toques em nada neste menu, a menos que saibas o que faz.",
-            "label": "Cativar menu interno da Valve"
+            "desc1": "Activa o menu interno de programador da Valve.",
+            "desc2": "Não toques em nada deste menu se não souberes a sua função.",
+            "label": "Activar menu interno da Valve"
         }
     },
     "SettingsGeneralIndex": {
@@ -195,27 +193,17 @@
             "header": "Outros"
         },
         "updates": {
-            "header": "Atualizações"
+            "header": "Actualizações"
         }
     },
     "SettingsIndex": {
         "developer_title": "Programador",
         "general_title": "Geral",
-        "plugins_title": "Plugins",
-        "testing_title": "Testes"
+        "plugins_title": "Plugins"
     },
     "Store": {
-        "download_progress_info": {
-            "download_zip": "A transferir o plugin",
-            "increment_count": "A incrementar a contagem de transferências",
-            "installing_plugin": "A instalar o plugin",
-            "open_zip": "A abrir o ficheiro zip",
-            "parse_zip": "A processar o ficheiro zip",
-            "start": "A inicializar",
-            "uninstalling_previous": "A desinstalar a cópia anterior"
-        },
         "store_contrib": {
-            "desc": "Se quiseres contribuir para a Loja de Plugins do Decky, consulta o repositório SteamDeckHomebrew/decky-plugin-template no GitHub. Encontras informações sobre desenvolvimento e distribuição no README.",
+            "desc": "Se queres contribuir com um novo plugin, vai ao repositório SteamDeckHomebrew/decky-plugin-template no GitHub. No README, podes encontrar mais informação sobre desenvolvimento e distribuição.",
             "label": "Contribuir"
         },
         "store_filter": {
@@ -227,25 +215,21 @@
         },
         "store_sort": {
             "label": "Ordenar",
-            "label_def": "Última atualização (mais recente)"
+            "label_def": "Última actualização (mais recente)"
         },
         "store_source": {
-            "desc": "Todo o código-fonte dos plugins está disponível no repositório SteamDeckHomebrew/decky-plugin-database no GitHub.",
+            "desc": "O código fonte de cada plugin está disponível no repositório SteamDeckHomebrew/decky-plugin-database no GitHub.",
             "label": "Código fonte"
         },
         "store_tabs": {
             "about": "Sobre",
             "alph_asce": "Alfabeticamente (Z-A)",
             "alph_desc": "Alfabeticamente (A-Z)",
-            "date_asce": "Mais Antigos Primeiro",
-            "date_desc": "Mais Recentes Primeiro",
-            "downloads_asce": "Menos Transferidos Primeiro",
-            "downloads_desc": "Mais Transferidos Primeiro",
             "title": "Navegar"
         },
         "store_testing_cta": "Testa novos plugins e ajuda a equipa do Decky Loader!",
         "store_testing_warning": {
-            "desc": "Podes utilizar este canal da loja para testar versões de plugins de última geração. Não te esqueças de deixar o teufeedback no GitHub para que o plugin possa ser atualizado para todos os utilizadores.",
+            "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"
         }
     },
@@ -256,35 +240,28 @@
         },
         "store_channel": {
             "custom": "Personalizada",
-            "default": "Padrão",
-            "label": "Canal da loja",
-            "testing": "Em testes"
+            "default": "Standard",
+            "label": "Canal de loja",
+            "testing": "Em teste"
         }
     },
-    "Testing": {
-        "download": "Transferir",
-        "error": "Erro ao instalar PR",
-        "header": "As seguintes versões do Decky Loader estão construidas a partir de Pull Requests de terceiros. A equipa do Decky Loader não verificou as sua funcionalidade ou segurança e as mesmas podem estar desatualizados.",
-        "loading": "A carregar Pull Requests abertos...",
-        "start_download_toast": "A descarregar PR #{{id}}"
-    },
     "TitleView": {
         "decky_store_desc": "Abrir a Loja Decky",
         "settings_desc": "Abrir as Definições Decky"
     },
     "Updater": {
-        "decky_updates": "Atualizações do Decky",
-        "no_patch_notes_desc": "sem notas de atualizações para esta versão",
-        "patch_notes_desc": "Notas de atualizações",
+        "decky_updates": "Actualizações do Decky",
+        "no_patch_notes_desc": "sem registo de alterações desta versão",
+        "patch_notes_desc": "Registo de alterações",
         "updates": {
-            "check_button": "Procurar atualizações",
-            "checking": "A verificar atualizações",
-            "cur_version": "Versão atual: {{ver}}",
-            "install_button": "Instalar Atualização",
-            "label": "Atualizações",
-            "lat_version": "Atualizado: a executar {{ver}}",
-            "reloading": "Recarregando",
-            "updating": "Atualização em curso"
+            "check_button": "Procurar actualizações",
+            "checking": "Busca de actualizações em curso",
+            "cur_version": "Versão actual: {{ver}}",
+            "install_button": "Instalar actualização",
+            "label": "Actualizações",
+            "lat_version": "Actualizado: a correr {{ver}}",
+            "reloading": "Recarregar",
+            "updating": "Actualização em curso"
         }
     }
 }

backend/decky_loader/locales/ru-RU.json

@@ -52,9 +52,7 @@
     "MultiplePluginsInstallModal": {
         "confirm": "Вы уверены, что хотите внести следующие изменения?",
         "description": {
-            "downgrade": "Откатить {{name}} до {{version}}",
             "install": "Установить {{name}} {{version}}",
-            "overwrite": "Заменить {{name}} на {{version}}",
             "reinstall": "Переустановить {{name}} {{version}}",
             "update": "Обновить с {{name}} на {{version}}"
         },
@@ -63,9 +61,6 @@
             "loading": "В процессе"
         },
         "title": {
-            "downgrade_few": "Откатить {{count}} плагинов",
-            "downgrade_many": "Откатить {{count}} плагинов",
-            "downgrade_one": "Откатить 1 плагин",
             "install_few": "Установить {{count}} плагинов",
             "install_many": "Установить {{count}} плагинов",
             "install_one": "Установить {{count}} плагин",
@@ -81,21 +76,12 @@
         }
     },
     "PluginCard": {
-        "plugin_downgrade": "Откат",
         "plugin_full_access": "Этот плагин имеет полный доступ к вашему Steam Deck.",
         "plugin_install": "Установить",
         "plugin_no_desc": "Нет описания.",
-        "plugin_overwrite": "Замена",
-        "plugin_reinstall": "Переустановка",
-        "plugin_update": "Обновление",
         "plugin_version_label": "Версия плагина"
     },
     "PluginInstallModal": {
-        "downgrade": {
-            "button_idle": "Откат",
-            "desc": "Вы уверенны, что хотите откатить {{artifact}} до версии {{version}}?",
-            "title": "Откатить {{artifact}}"
-        },
         "install": {
             "button_idle": "Установить",
             "button_processing": "Установка",
@@ -112,7 +98,7 @@
         "update": {
             "button_idle": "Обновить",
             "button_processing": "Обновление",
-            "desc": "Вы уверены, что хотите обновить {{artifact}} до версии {{version}}?",
+            "desc": "Вы уверены, что хотите обновить {{artifact}} {{version}}?",
             "title": "Обновить {{artifact}}"
         }
     },

backend/decky_loader/locales/sv-SE.json

@@ -8,9 +8,9 @@
         }
     },
     "Developer": {
-        "5secreload": "Uppdaterar om 5 sekunder",
-        "disabling": "Inaktiverar React DevTools",
-        "enabling": "Aktiverar React DevTools"
+        "5secreload": "Omladdning på 5 sekunder",
+        "disabling": "Inaktivera React DevTools",
+        "enabling": "Aktivera React DevTools"
     },
     "DropdownMultiselect": {
         "button": {
@@ -29,19 +29,19 @@
             "select": "Välj denna fil"
         },
         "files": {
-            "all_files": "Alla filer",
+            "all_files": "Alla Filer",
             "file_type": "Filtyp",
             "show_hidden": "Visa dolda filer"
         },
         "filter": {
-            "created_asce": "Skapad (äldst)",
+            "created_asce": "Skapad (Äldst)",
             "created_desc": "Skapad (nyast)",
-            "modified_asce": "Modifierad (äldst)",
+            "modified_asce": "Modifierad (Äldst)",
             "modified_desc": "Modifierad (nyaste)",
             "name_asce": "Z-A",
             "name_desc": "A-Z",
             "size_asce": "Storlek (minst)",
-            "size_desc": "Storlek (störst)"
+            "size_desc": "Storlek (Störst)"
         },
         "folder": {
             "label": "Mapp",
@@ -52,9 +52,7 @@
     "MultiplePluginsInstallModal": {
         "confirm": "Är du säker på att du vill göra följande ändringar?",
         "description": {
-            "downgrade": "Nedgradera {{name}} till {{version}}",
             "install": "Installera {{name}} {{version}}",
-            "overwrite": "Skriv över {{name}} med {{version}}",
             "reinstall": "Installera om {{name}} {{version}}",
             "update": "Uppdatera {{name}} {{version}}"
         },
@@ -63,245 +61,26 @@
             "loading": "Arbetar"
         },
         "title": {
-            "downgrade_one": "Nedgradera 1 insticksmodul",
-            "downgrade_other": "Nedgradera {{count}} insticksmoduler",
             "install_one": "Install 1 tillägg",
             "install_other": "Installerar {{count}} tillägg",
-            "mixed_one": "Ändra {{count}} insticksmodul",
-            "mixed_other": "Ändra {{count}} insticksmoduler",
-            "overwrite_one": "Skriv över 1 insticksmodul",
-            "overwrite_other": "Skriv över {{count}} insticksmoduler",
-            "reinstall_one": "Installera om 1 insticksmodul",
-            "reinstall_other": "Installera om {{count}} insticksmoduler",
-            "update_one": "Uppdatera 1 insticksmodul",
-            "update_other": "Uppdatera {{count}} insticksmoduler"
-        }
-    },
-    "PluginCard": {
-        "plugin_downgrade": "Nedgradera",
-        "plugin_full_access": "Denna insticksmodul har full åtkomst till din Steam Deck.",
-        "plugin_install": "Installera",
-        "plugin_no_desc": "Ingen beskrivning angavs.",
-        "plugin_overwrite": "Skriv över",
-        "plugin_reinstall": "Installera om",
-        "plugin_update": "Uppdatera",
-        "plugin_version_label": "Version av insticksmodul"
-    },
-    "PluginInstallModal": {
-        "downgrade": {
-            "button_idle": "Nedgradera",
-            "button_processing": "Nedgraderar",
-            "desc": "Är du säker på att du vill nedgradera {{artifact}} till version {{version}}?",
-            "title": "Nedgradera {{artifact}}"
-        },
-        "install": {
-            "button_idle": "Installera",
-            "button_processing": "Installerar",
-            "desc": "Är du säker på att du vill installera {{artifact}} {{version}}?",
-            "title": "Installera {{artifact}}"
-        },
-        "no_hash": "Denna insticksmodul har inte någon kontrollsumma. Du installerar den på egen risk.",
-        "not_installed": "(inte installerad)",
-        "overwrite": {
-            "button_idle": "Skriv över",
-            "button_processing": "Skriver över",
-            "desc": "Är du säker på att du vill skriva över {{artifact}} med version {{version}}?",
-            "title": "Skriv över {{artifact}}"
-        },
-        "reinstall": {
-            "button_idle": "Installera om",
-            "button_processing": "Installerar om",
-            "desc": "Är du säker på att du vill installera om {{artifact}} {{version}}?",
-            "title": "Installera om {{artifact}}"
-        },
-        "update": {
-            "button_idle": "Uppdatera",
-            "button_processing": "Uppdaterar",
-            "desc": "Är du säker på att du vill uppdatera {{artifact}} till version {{version}}?",
-            "title": "Uppdatera {{artifact}}"
+            "mixed_one": "",
+            "mixed_other": "",
+            "reinstall_one": "",
+            "reinstall_other": "",
+            "update_one": "",
+            "update_other": ""
         }
     },
     "PluginListIndex": {
-        "freeze": "Frys uppdateringar",
-        "hide": "Snabbåtkomst: Dölj",
-        "no_plugin": "Inga insticksmoduler installerade!",
-        "plugin_actions": "Åtgärder för insticksmodul",
-        "reinstall": "Installera om",
-        "reload": "Uppdatera",
-        "show": "Snabbåtkomst: Visa",
-        "unfreeze": "Tillåt uppdateringar",
-        "uninstall": "Avinstallera",
-        "update_all_one": "Uppdatera 1 insticksmodul",
-        "update_all_other": "Uppdatera {{count}} insticksmoduler",
-        "update_to": "Uppdatera till {{name}}"
-    },
-    "PluginListLabel": {
-        "hidden": "Dold från snabbåtkomstmenyn"
+        "update_all_one": "",
+        "update_all_other": ""
     },
     "PluginLoader": {
-        "decky_title": "Decky",
-        "decky_update_available": "Uppdatering till {{tag_name}} finns!",
-        "error": "Fel",
-        "plugin_error_uninstall": "Inläsning av {{name}} orsakade ett undantag som visas nedan. Detta betyder oftast att insticksmodulen kräver en uppdatering för den nya versionen av SteamUI. Kontrollera om en uppdatering finns eller fundera på att ta bort den i Decky-inställningarna, under insticksmoduler.",
-        "plugin_load_error": {
-            "message": "Fel vid inläsning av insticksmodulen {{name}}",
-            "toast": "Fel vid inläsning {{name}}"
-        },
-        "plugin_uninstall": {
-            "button": "Avinstallera",
-            "desc": "Är du säker på att du vill avinstallera {{name}}?",
-            "title": "Avinstallera {{name}}"
-        },
-        "plugin_update_one": "Uppdateringar tillgängliga för 1 insticksmodul!",
-        "plugin_update_other": "Uppdateringar tillgängliga för {{count}} insticksmoduler!"
+        "plugin_update_one": "",
+        "plugin_update_other": ""
     },
     "PluginView": {
-        "hidden_one": "1 insticksmodul är dold från denna lista",
-        "hidden_other": "{{count}} insticksmoduler är dolda från denna lista"
-    },
-    "RemoteDebugging": {
-        "remote_cef": {
-            "desc": "Tillåt oautentiserad åtkomst till CEF-felsökaren till vem som helst i ditt nätverk",
-            "label": "Tillåt fjärr-CEF-felsökning"
-        }
-    },
-    "SettingsDeveloperIndex": {
-        "cef_console": {
-            "button": "Öppna konsoll",
-            "desc": "Öppnar CEF-konsollen. Endast användbart för felsökningssyften. Saker här är potentiellt farliga och bör endast användas om du utvecklar insticksmoduler.",
-            "label": "CEF-konsoll"
-        },
-        "header": "Övrigt",
-        "react_devtools": {
-            "desc": "Aktiverar anslutning till en dator som kör React DevTools. Ändring av denna inställning kommer att läsa om Steam. Ställ in IP-adressen innan du aktiverar.",
-            "ip_label": "IP",
-            "label": "Aktivera React DevTools"
-        },
-        "third_party_plugins": {
-            "button_install": "Installera",
-            "button_zip": "Bläddra",
-            "header": "Insticksmoduler från tredjepart",
-            "label_desc": "URL",
-            "label_url": "Installera insticksmodul från URL",
-            "label_zip": "Installera insticksmodul från ZIP-fil"
-        },
-        "valve_internal": {
-            "desc1": "Aktiverar Valves interna utvecklarmeny.",
-            "desc2": "Rör ingenting i denna meny såvida inte du vet vad du gör.",
-            "label": "Aktivera Valves interna"
-        }
-    },
-    "SettingsGeneralIndex": {
-        "about": {
-            "decky_version": "Decky-version",
-            "header": "Om"
-        },
-        "beta": {
-            "header": "Delta i betatestning"
-        },
-        "developer_mode": {
-            "label": "Utvecklarläge"
-        },
-        "notifications": {
-            "decky_updates_label": "Uppdatering till Decky finns tillgänglig",
-            "header": "Aviseringar",
-            "plugin_updates_label": "Uppdateringar till insticksmoduler tillgängliga"
-        },
-        "other": {
-            "header": "Övrigt"
-        },
-        "updates": {
-            "header": "Uppdateringar"
-        }
-    },
-    "SettingsIndex": {
-        "developer_title": "Utvecklare",
-        "general_title": "Allmänt",
-        "plugins_title": "Insticksmoduler",
-        "testing_title": "Testning"
-    },
-    "Store": {
-        "download_progress_info": {
-            "download_remote": "Hämtar externa binärfiler",
-            "download_zip": "Hämtar insticksmodul",
-            "increment_count": "Ökar hämtningsantal",
-            "installing_plugin": "Installerar insticksmodul",
-            "open_zip": "Öppnar zip-fil",
-            "parse_zip": "Tolkar zip-fil",
-            "start": "Initierar",
-            "uninstalling_previous": "Avinstallerar tidigare kopia"
-        },
-        "store_contrib": {
-            "desc": "Om du vill bidra till Deckys insticksmoduler, titta in i förrådet SteamDeckHomebrew/decky-plugin-template på GitHub. Information om utveckling och distribution finns tillgänglig i filen README.",
-            "label": "Bidra"
-        },
-        "store_filter": {
-            "label": "Filtrera",
-            "label_def": "Alla"
-        },
-        "store_search": {
-            "label": "Sök"
-        },
-        "store_sort": {
-            "label": "Sortera",
-            "label_def": "Senast uppdaterad (Senaste)"
-        },
-        "store_source": {
-            "desc": "All källkod för insticksmoduler finns tillgänglig i förrådet SteamDeckHomebrew/decky-plugin-database på GitHub.",
-            "label": "Källkod"
-        },
-        "store_tabs": {
-            "about": "Om",
-            "alph_asce": "Alfabetisk (Z till A)",
-            "alph_desc": "Alfabetisk (A till Z)",
-            "date_asce": "Äldsta först",
-            "date_desc": "Senaste först",
-            "downloads_asce": "Minst hämtade först",
-            "downloads_desc": "Mest hämtade först",
-            "title": "Bläddra"
-        },
-        "store_testing_cta": "Överväg att testa nya insticksmoduler för att hjälpa Decky Loader-teamet!",
-        "store_testing_warning": {
-            "desc": "Du kan använda denna kanal för att testa de absolut senaste versionerna. Tänk på att ge återkoppling på GitHub så att insticksmodulen kan uppdateras för alla användare.",
-            "label": "Välkommen till testkanalen"
-        }
-    },
-    "StoreSelect": {
-        "custom_store": {
-            "label": "Anpassad affär",
-            "url_label": "URL"
-        },
-        "store_channel": {
-            "custom": "Anpassad",
-            "default": "Standard",
-            "label": "Affärskanal",
-            "testing": "Testning"
-        }
-    },
-    "Testing": {
-        "download": "Hämta",
-        "error": "Fel vid installation av PR",
-        "header": "Följande versioner av Decky Loader byggs från öppnade Pull Requests från tredjepart. Decky Loader-teamet har inte verifierat deras funktionalitet eller säkerhet och de kan vara utdaterade.",
-        "loading": "Läser in öppnade Pull Requests...",
-        "start_download_toast": "Hämtar PR #{{id}}"
-    },
-    "TitleView": {
-        "decky_store_desc": "Öppna Decky-affär",
-        "settings_desc": "Öppna Decky-inställningar"
-    },
-    "Updater": {
-        "decky_updates": "Decky-uppdateringar",
-        "no_patch_notes_desc": "inga patch-anteckningar för denna version",
-        "patch_notes_desc": "Patch-anteckningar",
-        "updates": {
-            "check_button": "Leta efter uppdateringar",
-            "checking": "Letar",
-            "cur_version": "Aktuell version: {{ver}}",
-            "install_button": "Installera uppdatering",
-            "label": "Uppdateringar",
-            "lat_version": "Uppdaterad: kör {{ver}}",
-            "reloading": "Läser om",
-            "updating": "Uppdaterar"
-        }
+        "hidden_one": "",
+        "hidden_other": ""
     }
 }

backend/decky_loader/plugin/sandboxed_plugin.py

@@ -186,7 +186,6 @@ class SandboxedPlugin:
 
         if "uninstall" in data:
             self.uninstalling = data.get("uninstall")
-            return
 
         d: SocketResponseDict = {"type": SocketMessageType.RESPONSE, "res": None, "success": True, "id": data["id"]}
         try:

backend/decky_loader/utilities.py

@@ -429,17 +429,28 @@ class Utilities:
                 async with ClientSession() as web:
                     res = await web.request("GET", "http://" + ip + ":8097", ssl=helpers.get_ssl_context())
                     script = """
-                    if (!window.deckyHasConnectedRDT) {
-                        window.deckyHasConnectedRDT = true;
-                        // This fixes the overlay when hovering over an element in RDT
-                        Object.defineProperty(window, '__REACT_DEVTOOLS_TARGET_WINDOW__', {
-                            enumerable: true,
-                            configurable: true,
-                            get: function() {
-                                return (GamepadNavTree?.m_context?.m_controller || FocusNavController)?.m_ActiveContext?.ActiveWindow || window;
-                            }
-                        });
-                    """ + await res.text() + "\n}"
+                    try {
+                        if (!window.deckyHasConnectedRDT) {
+                            window.deckyHasConnectedRDT = true;
+                            // This fixes the overlay when hovering over an element in RDT
+                            Object.defineProperty(window, '__REACT_DEVTOOLS_TARGET_WINDOW__', {
+                                enumerable: true,
+                                configurable: true,
+                                get: function() {
+                                    return window?.DFL?.findSP?.() || window;
+                                }
+                            });
+                    """ + await res.text() + """
+                    // they broke the script so we have to do this ourselves
+                    ReactDevToolsBackend.initialize({
+                        appendComponentStack: true,
+                        breakOnConsoleErrors: false,
+                        showInlineWarningsAndErrors: true,
+                        hideConsoleLogsInStrictMode: false
+                    });
+                    ReactDevToolsBackend.connectToDevTools({port: 8097, host: 'localhost', useHttps: false});
+                    } } catch(e) {console.error('RDT LOAD ERROR', e);}console.log('LOADED RDT');
+                    """
                 if res.status != 200:
                     self.logger.error("Failed to connect to React DevTools at " + ip)
                     return False
@@ -447,7 +458,10 @@ class Utilities:
                 self.logger.info("Connected to React DevTools, loading script")
                 tab = await get_gamepadui_tab()
                 # RDT needs to load before React itself to work.
-                await close_old_tabs()
+                try:
+                    await close_old_tabs()
+                except Exception:
+                    pass
                 result = await tab.reload_and_evaluate(script)
                 self.logger.info(result)
 

backend/poetry.lock

@@ -1,129 +1,100 @@
-# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.
-
-[[package]]
-name = "aiohappyeyeballs"
-version = "2.4.3"
-description = "Happy Eyeballs for asyncio"
-optional = false
-python-versions = ">=3.8"
-groups = ["main"]
-files = [
-    {file = "aiohappyeyeballs-2.4.3-py3-none-any.whl", hash = "sha256:8a7a83727b2756f394ab2895ea0765a0a8c475e3c71e98d43d76f22b4b435572"},
-    {file = "aiohappyeyeballs-2.4.3.tar.gz", hash = "sha256:75cf88a15106a5002a8eb1dab212525c00d1f4c0fa96e551c9fbe6f09a621586"},
-]
+# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
 
 [[package]]
 name = "aiohttp"
-version = "3.10.11"
+version = "3.9.5"
 description = "Async http client/server framework (asyncio)"
 optional = false
 python-versions = ">=3.8"
-groups = ["main"]
 files = [
-    {file = "aiohttp-3.10.11-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:5077b1a5f40ffa3ba1f40d537d3bec4383988ee51fbba6b74aa8fb1bc466599e"},
-    {file = "aiohttp-3.10.11-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8d6a14a4d93b5b3c2891fca94fa9d41b2322a68194422bef0dd5ec1e57d7d298"},
-    {file = "aiohttp-3.10.11-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffbfde2443696345e23a3c597049b1dd43049bb65337837574205e7368472177"},
-    {file = "aiohttp-3.10.11-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20b3d9e416774d41813bc02fdc0663379c01817b0874b932b81c7f777f67b217"},
-    {file = "aiohttp-3.10.11-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2b943011b45ee6bf74b22245c6faab736363678e910504dd7531a58c76c9015a"},
-    {file = "aiohttp-3.10.11-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48bc1d924490f0d0b3658fe5c4b081a4d56ebb58af80a6729d4bd13ea569797a"},
-    {file = "aiohttp-3.10.11-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e12eb3f4b1f72aaaf6acd27d045753b18101524f72ae071ae1c91c1cd44ef115"},
-    {file = "aiohttp-3.10.11-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f14ebc419a568c2eff3c1ed35f634435c24ead2fe19c07426af41e7adb68713a"},
-    {file = "aiohttp-3.10.11-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:72b191cdf35a518bfc7ca87d770d30941decc5aaf897ec8b484eb5cc8c7706f3"},
-    {file = "aiohttp-3.10.11-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:5ab2328a61fdc86424ee540d0aeb8b73bbcad7351fb7cf7a6546fc0bcffa0038"},
-    {file = "aiohttp-3.10.11-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:aa93063d4af05c49276cf14e419550a3f45258b6b9d1f16403e777f1addf4519"},
-    {file = "aiohttp-3.10.11-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:30283f9d0ce420363c24c5c2421e71a738a2155f10adbb1a11a4d4d6d2715cfc"},
-    {file = "aiohttp-3.10.11-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:e5358addc8044ee49143c546d2182c15b4ac3a60be01c3209374ace05af5733d"},
-    {file = "aiohttp-3.10.11-cp310-cp310-win32.whl", hash = "sha256:e1ffa713d3ea7cdcd4aea9cddccab41edf6882fa9552940344c44e59652e1120"},
-    {file = "aiohttp-3.10.11-cp310-cp310-win_amd64.whl", hash = "sha256:778cbd01f18ff78b5dd23c77eb82987ee4ba23408cbed233009fd570dda7e674"},
-    {file = "aiohttp-3.10.11-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:80ff08556c7f59a7972b1e8919f62e9c069c33566a6d28586771711e0eea4f07"},
-    {file = "aiohttp-3.10.11-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2c8f96e9ee19f04c4914e4e7a42a60861066d3e1abf05c726f38d9d0a466e695"},
-    {file = "aiohttp-3.10.11-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fb8601394d537da9221947b5d6e62b064c9a43e88a1ecd7414d21a1a6fba9c24"},
-    {file = "aiohttp-3.10.11-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2ea224cf7bc2d8856d6971cea73b1d50c9c51d36971faf1abc169a0d5f85a382"},
-    {file = "aiohttp-3.10.11-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:db9503f79e12d5d80b3efd4d01312853565c05367493379df76d2674af881caa"},
-    {file = "aiohttp-3.10.11-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0f449a50cc33f0384f633894d8d3cd020e3ccef81879c6e6245c3c375c448625"},
-    {file = "aiohttp-3.10.11-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:82052be3e6d9e0c123499127782a01a2b224b8af8c62ab46b3f6197035ad94e9"},
-    {file = "aiohttp-3.10.11-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20063c7acf1eec550c8eb098deb5ed9e1bb0521613b03bb93644b810986027ac"},
-    {file = "aiohttp-3.10.11-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:489cced07a4c11488f47aab1f00d0c572506883f877af100a38f1fedaa884c3a"},
-    {file = "aiohttp-3.10.11-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:ea9b3bab329aeaa603ed3bf605f1e2a6f36496ad7e0e1aa42025f368ee2dc07b"},
-    {file = "aiohttp-3.10.11-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:ca117819d8ad113413016cb29774b3f6d99ad23c220069789fc050267b786c16"},
-    {file = "aiohttp-3.10.11-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:2dfb612dcbe70fb7cdcf3499e8d483079b89749c857a8f6e80263b021745c730"},
-    {file = "aiohttp-3.10.11-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f9b615d3da0d60e7d53c62e22b4fd1c70f4ae5993a44687b011ea3a2e49051b8"},
-    {file = "aiohttp-3.10.11-cp311-cp311-win32.whl", hash = "sha256:29103f9099b6068bbdf44d6a3d090e0a0b2be6d3c9f16a070dd9d0d910ec08f9"},
-    {file = "aiohttp-3.10.11-cp311-cp311-win_amd64.whl", hash = "sha256:236b28ceb79532da85d59aa9b9bf873b364e27a0acb2ceaba475dc61cffb6f3f"},
-    {file = "aiohttp-3.10.11-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:7480519f70e32bfb101d71fb9a1f330fbd291655a4c1c922232a48c458c52710"},
-    {file = "aiohttp-3.10.11-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f65267266c9aeb2287a6622ee2bb39490292552f9fbf851baabc04c9f84e048d"},
-    {file = "aiohttp-3.10.11-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7400a93d629a0608dc1d6c55f1e3d6e07f7375745aaa8bd7f085571e4d1cee97"},
-    {file = "aiohttp-3.10.11-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f34b97e4b11b8d4eb2c3a4f975be626cc8af99ff479da7de49ac2c6d02d35725"},
-    {file = "aiohttp-3.10.11-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1e7b825da878464a252ccff2958838f9caa82f32a8dbc334eb9b34a026e2c636"},
-    {file = "aiohttp-3.10.11-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f9f92a344c50b9667827da308473005f34767b6a2a60d9acff56ae94f895f385"},
-    {file = "aiohttp-3.10.11-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc6f1ab987a27b83c5268a17218463c2ec08dbb754195113867a27b166cd6087"},
-    {file = "aiohttp-3.10.11-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1dc0f4ca54842173d03322793ebcf2c8cc2d34ae91cc762478e295d8e361e03f"},
-    {file = "aiohttp-3.10.11-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7ce6a51469bfaacff146e59e7fb61c9c23006495d11cc24c514a455032bcfa03"},
-    {file = "aiohttp-3.10.11-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:aad3cd91d484d065ede16f3cf15408254e2469e3f613b241a1db552c5eb7ab7d"},
-    {file = "aiohttp-3.10.11-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:f4df4b8ca97f658c880fb4b90b1d1ec528315d4030af1ec763247ebfd33d8b9a"},
-    {file = "aiohttp-3.10.11-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:2e4e18a0a2d03531edbc06c366954e40a3f8d2a88d2b936bbe78a0c75a3aab3e"},
-    {file = "aiohttp-3.10.11-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:6ce66780fa1a20e45bc753cda2a149daa6dbf1561fc1289fa0c308391c7bc0a4"},
-    {file = "aiohttp-3.10.11-cp312-cp312-win32.whl", hash = "sha256:a919c8957695ea4c0e7a3e8d16494e3477b86f33067478f43106921c2fef15bb"},
-    {file = "aiohttp-3.10.11-cp312-cp312-win_amd64.whl", hash = "sha256:b5e29706e6389a2283a91611c91bf24f218962717c8f3b4e528ef529d112ee27"},
-    {file = "aiohttp-3.10.11-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:703938e22434d7d14ec22f9f310559331f455018389222eed132808cd8f44127"},
-    {file = "aiohttp-3.10.11-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:9bc50b63648840854e00084c2b43035a62e033cb9b06d8c22b409d56eb098413"},
-    {file = "aiohttp-3.10.11-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5f0463bf8b0754bc744e1feb61590706823795041e63edf30118a6f0bf577461"},
-    {file = "aiohttp-3.10.11-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f6c6dec398ac5a87cb3a407b068e1106b20ef001c344e34154616183fe684288"},
-    {file = "aiohttp-3.10.11-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bcaf2d79104d53d4dcf934f7ce76d3d155302d07dae24dff6c9fffd217568067"},
-    {file = "aiohttp-3.10.11-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:25fd5470922091b5a9aeeb7e75be609e16b4fba81cdeaf12981393fb240dd10e"},
-    {file = "aiohttp-3.10.11-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bbde2ca67230923a42161b1f408c3992ae6e0be782dca0c44cb3206bf330dee1"},
-    {file = "aiohttp-3.10.11-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:249c8ff8d26a8b41a0f12f9df804e7c685ca35a207e2410adbd3e924217b9006"},
-    {file = "aiohttp-3.10.11-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:878ca6a931ee8c486a8f7b432b65431d095c522cbeb34892bee5be97b3481d0f"},
-    {file = "aiohttp-3.10.11-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:8663f7777ce775f0413324be0d96d9730959b2ca73d9b7e2c2c90539139cbdd6"},
-    {file = "aiohttp-3.10.11-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:6cd3f10b01f0c31481fba8d302b61603a2acb37b9d30e1d14e0f5a58b7b18a31"},
-    {file = "aiohttp-3.10.11-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:4e8d8aad9402d3aa02fdc5ca2fe68bcb9fdfe1f77b40b10410a94c7f408b664d"},
-    {file = "aiohttp-3.10.11-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:38e3c4f80196b4f6c3a85d134a534a56f52da9cb8d8e7af1b79a32eefee73a00"},
-    {file = "aiohttp-3.10.11-cp313-cp313-win32.whl", hash = "sha256:fc31820cfc3b2863c6e95e14fcf815dc7afe52480b4dc03393c4873bb5599f71"},
-    {file = "aiohttp-3.10.11-cp313-cp313-win_amd64.whl", hash = "sha256:4996ff1345704ffdd6d75fb06ed175938c133425af616142e7187f28dc75f14e"},
-    {file = "aiohttp-3.10.11-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:74baf1a7d948b3d640badeac333af581a367ab916b37e44cf90a0334157cdfd2"},
-    {file = "aiohttp-3.10.11-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:473aebc3b871646e1940c05268d451f2543a1d209f47035b594b9d4e91ce8339"},
-    {file = "aiohttp-3.10.11-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c2f746a6968c54ab2186574e15c3f14f3e7f67aef12b761e043b33b89c5b5f95"},
-    {file = "aiohttp-3.10.11-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d110cabad8360ffa0dec8f6ec60e43286e9d251e77db4763a87dcfe55b4adb92"},
-    {file = "aiohttp-3.10.11-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e0099c7d5d7afff4202a0c670e5b723f7718810000b4abcbc96b064129e64bc7"},
-    {file = "aiohttp-3.10.11-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0316e624b754dbbf8c872b62fe6dcb395ef20c70e59890dfa0de9eafccd2849d"},
-    {file = "aiohttp-3.10.11-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5a5f7ab8baf13314e6b2485965cbacb94afff1e93466ac4d06a47a81c50f9cca"},
-    {file = "aiohttp-3.10.11-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c891011e76041e6508cbfc469dd1a8ea09bc24e87e4c204e05f150c4c455a5fa"},
-    {file = "aiohttp-3.10.11-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:9208299251370ee815473270c52cd3f7069ee9ed348d941d574d1457d2c73e8b"},
-    {file = "aiohttp-3.10.11-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:459f0f32c8356e8125f45eeff0ecf2b1cb6db1551304972702f34cd9e6c44658"},
-    {file = "aiohttp-3.10.11-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:14cdc8c1810bbd4b4b9f142eeee23cda528ae4e57ea0923551a9af4820980e39"},
-    {file = "aiohttp-3.10.11-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:971aa438a29701d4b34e4943e91b5e984c3ae6ccbf80dd9efaffb01bd0b243a9"},
-    {file = "aiohttp-3.10.11-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:9a309c5de392dfe0f32ee57fa43ed8fc6ddf9985425e84bd51ed66bb16bce3a7"},
-    {file = "aiohttp-3.10.11-cp38-cp38-win32.whl", hash = "sha256:9ec1628180241d906a0840b38f162a3215114b14541f1a8711c368a8739a9be4"},
-    {file = "aiohttp-3.10.11-cp38-cp38-win_amd64.whl", hash = "sha256:9c6e0ffd52c929f985c7258f83185d17c76d4275ad22e90aa29f38e211aacbec"},
-    {file = "aiohttp-3.10.11-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:cdc493a2e5d8dc79b2df5bec9558425bcd39aff59fc949810cbd0832e294b106"},
-    {file = "aiohttp-3.10.11-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b3e70f24e7d0405be2348da9d5a7836936bf3a9b4fd210f8c37e8d48bc32eca6"},
-    {file = "aiohttp-3.10.11-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:968b8fb2a5eee2770eda9c7b5581587ef9b96fbdf8dcabc6b446d35ccc69df01"},
-    {file = "aiohttp-3.10.11-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:deef4362af9493d1382ef86732ee2e4cbc0d7c005947bd54ad1a9a16dd59298e"},
-    {file = "aiohttp-3.10.11-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:686b03196976e327412a1b094f4120778c7c4b9cff9bce8d2fdfeca386b89829"},
-    {file = "aiohttp-3.10.11-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3bf6d027d9d1d34e1c2e1645f18a6498c98d634f8e373395221121f1c258ace8"},
-    {file = "aiohttp-3.10.11-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:099fd126bf960f96d34a760e747a629c27fb3634da5d05c7ef4d35ef4ea519fc"},
-    {file = "aiohttp-3.10.11-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c73c4d3dae0b4644bc21e3de546530531d6cdc88659cdeb6579cd627d3c206aa"},
-    {file = "aiohttp-3.10.11-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:0c5580f3c51eea91559db3facd45d72e7ec970b04528b4709b1f9c2555bd6d0b"},
-    {file = "aiohttp-3.10.11-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:fdf6429f0caabfd8a30c4e2eaecb547b3c340e4730ebfe25139779b9815ba138"},
-    {file = "aiohttp-3.10.11-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:d97187de3c276263db3564bb9d9fad9e15b51ea10a371ffa5947a5ba93ad6777"},
-    {file = "aiohttp-3.10.11-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:0acafb350cfb2eba70eb5d271f55e08bd4502ec35e964e18ad3e7d34d71f7261"},
-    {file = "aiohttp-3.10.11-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:c13ed0c779911c7998a58e7848954bd4d63df3e3575f591e321b19a2aec8df9f"},
-    {file = "aiohttp-3.10.11-cp39-cp39-win32.whl", hash = "sha256:22b7c540c55909140f63ab4f54ec2c20d2635c0289cdd8006da46f3327f971b9"},
-    {file = "aiohttp-3.10.11-cp39-cp39-win_amd64.whl", hash = "sha256:7b26b1551e481012575dab8e3727b16fe7dd27eb2711d2e63ced7368756268fb"},
-    {file = "aiohttp-3.10.11.tar.gz", hash = "sha256:9dc2b8f3dcab2e39e0fa309c8da50c3b55e6f34ab25f1a71d3288f24924d33a7"},
+    {file = "aiohttp-3.9.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:fcde4c397f673fdec23e6b05ebf8d4751314fa7c24f93334bf1f1364c1c69ac7"},
+    {file = "aiohttp-3.9.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5d6b3f1fabe465e819aed2c421a6743d8debbde79b6a8600739300630a01bf2c"},
+    {file = "aiohttp-3.9.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6ae79c1bc12c34082d92bf9422764f799aee4746fd7a392db46b7fd357d4a17a"},
+    {file = "aiohttp-3.9.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4d3ebb9e1316ec74277d19c5f482f98cc65a73ccd5430540d6d11682cd857430"},
+    {file = "aiohttp-3.9.5-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:84dabd95154f43a2ea80deffec9cb44d2e301e38a0c9d331cc4aa0166fe28ae3"},
+    {file = "aiohttp-3.9.5-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c8a02fbeca6f63cb1f0475c799679057fc9268b77075ab7cf3f1c600e81dd46b"},
+    {file = "aiohttp-3.9.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c26959ca7b75ff768e2776d8055bf9582a6267e24556bb7f7bd29e677932be72"},
+    {file = "aiohttp-3.9.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:714d4e5231fed4ba2762ed489b4aec07b2b9953cf4ee31e9871caac895a839c0"},
+    {file = "aiohttp-3.9.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e7a6a8354f1b62e15d48e04350f13e726fa08b62c3d7b8401c0a1314f02e3558"},
+    {file = "aiohttp-3.9.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c413016880e03e69d166efb5a1a95d40f83d5a3a648d16486592c49ffb76d0db"},
+    {file = "aiohttp-3.9.5-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:ff84aeb864e0fac81f676be9f4685f0527b660f1efdc40dcede3c251ef1e867f"},
+    {file = "aiohttp-3.9.5-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ad7f2919d7dac062f24d6f5fe95d401597fbb015a25771f85e692d043c9d7832"},
+    {file = "aiohttp-3.9.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:702e2c7c187c1a498a4e2b03155d52658fdd6fda882d3d7fbb891a5cf108bb10"},
+    {file = "aiohttp-3.9.5-cp310-cp310-win32.whl", hash = "sha256:67c3119f5ddc7261d47163ed86d760ddf0e625cd6246b4ed852e82159617b5fb"},
+    {file = "aiohttp-3.9.5-cp310-cp310-win_amd64.whl", hash = "sha256:471f0ef53ccedec9995287f02caf0c068732f026455f07db3f01a46e49d76bbb"},
+    {file = "aiohttp-3.9.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:e0ae53e33ee7476dd3d1132f932eeb39bf6125083820049d06edcdca4381f342"},
+    {file = "aiohttp-3.9.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c088c4d70d21f8ca5c0b8b5403fe84a7bc8e024161febdd4ef04575ef35d474d"},
+    {file = "aiohttp-3.9.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:639d0042b7670222f33b0028de6b4e2fad6451462ce7df2af8aee37dcac55424"},
+    {file = "aiohttp-3.9.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f26383adb94da5e7fb388d441bf09c61e5e35f455a3217bfd790c6b6bc64b2ee"},
+    {file = "aiohttp-3.9.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:66331d00fb28dc90aa606d9a54304af76b335ae204d1836f65797d6fe27f1ca2"},
+    {file = "aiohttp-3.9.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4ff550491f5492ab5ed3533e76b8567f4b37bd2995e780a1f46bca2024223233"},
+    {file = "aiohttp-3.9.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f22eb3a6c1080d862befa0a89c380b4dafce29dc6cd56083f630073d102eb595"},
+    {file = "aiohttp-3.9.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a81b1143d42b66ffc40a441379387076243ef7b51019204fd3ec36b9f69e77d6"},
+    {file = "aiohttp-3.9.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f64fd07515dad67f24b6ea4a66ae2876c01031de91c93075b8093f07c0a2d93d"},
+    {file = "aiohttp-3.9.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:93e22add827447d2e26d67c9ac0161756007f152fdc5210277d00a85f6c92323"},
+    {file = "aiohttp-3.9.5-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:55b39c8684a46e56ef8c8d24faf02de4a2b2ac60d26cee93bc595651ff545de9"},
+    {file = "aiohttp-3.9.5-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4715a9b778f4293b9f8ae7a0a7cef9829f02ff8d6277a39d7f40565c737d3771"},
+    {file = "aiohttp-3.9.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:afc52b8d969eff14e069a710057d15ab9ac17cd4b6753042c407dcea0e40bf75"},
+    {file = "aiohttp-3.9.5-cp311-cp311-win32.whl", hash = "sha256:b3df71da99c98534be076196791adca8819761f0bf6e08e07fd7da25127150d6"},
+    {file = "aiohttp-3.9.5-cp311-cp311-win_amd64.whl", hash = "sha256:88e311d98cc0bf45b62fc46c66753a83445f5ab20038bcc1b8a1cc05666f428a"},
+    {file = "aiohttp-3.9.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:c7a4b7a6cf5b6eb11e109a9755fd4fda7d57395f8c575e166d363b9fc3ec4678"},
+    {file = "aiohttp-3.9.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:0a158704edf0abcac8ac371fbb54044f3270bdbc93e254a82b6c82be1ef08f3c"},
+    {file = "aiohttp-3.9.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d153f652a687a8e95ad367a86a61e8d53d528b0530ef382ec5aaf533140ed00f"},
+    {file = "aiohttp-3.9.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82a6a97d9771cb48ae16979c3a3a9a18b600a8505b1115cfe354dfb2054468b4"},
+    {file = "aiohttp-3.9.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:60cdbd56f4cad9f69c35eaac0fbbdf1f77b0ff9456cebd4902f3dd1cf096464c"},
+    {file = "aiohttp-3.9.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8676e8fd73141ded15ea586de0b7cda1542960a7b9ad89b2b06428e97125d4fa"},
+    {file = "aiohttp-3.9.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:da00da442a0e31f1c69d26d224e1efd3a1ca5bcbf210978a2ca7426dfcae9f58"},
+    {file = "aiohttp-3.9.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:18f634d540dd099c262e9f887c8bbacc959847cfe5da7a0e2e1cf3f14dbf2daf"},
+    {file = "aiohttp-3.9.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:320e8618eda64e19d11bdb3bd04ccc0a816c17eaecb7e4945d01deee2a22f95f"},
+    {file = "aiohttp-3.9.5-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:2faa61a904b83142747fc6a6d7ad8fccff898c849123030f8e75d5d967fd4a81"},
+    {file = "aiohttp-3.9.5-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:8c64a6dc3fe5db7b1b4d2b5cb84c4f677768bdc340611eca673afb7cf416ef5a"},
+    {file = "aiohttp-3.9.5-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:393c7aba2b55559ef7ab791c94b44f7482a07bf7640d17b341b79081f5e5cd1a"},
+    {file = "aiohttp-3.9.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:c671dc117c2c21a1ca10c116cfcd6e3e44da7fcde37bf83b2be485ab377b25da"},
+    {file = "aiohttp-3.9.5-cp312-cp312-win32.whl", hash = "sha256:5a7ee16aab26e76add4afc45e8f8206c95d1d75540f1039b84a03c3b3800dd59"},
+    {file = "aiohttp-3.9.5-cp312-cp312-win_amd64.whl", hash = "sha256:5ca51eadbd67045396bc92a4345d1790b7301c14d1848feaac1d6a6c9289e888"},
+    {file = "aiohttp-3.9.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:694d828b5c41255e54bc2dddb51a9f5150b4eefa9886e38b52605a05d96566e8"},
+    {file = "aiohttp-3.9.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0605cc2c0088fcaae79f01c913a38611ad09ba68ff482402d3410bf59039bfb8"},
+    {file = "aiohttp-3.9.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4558e5012ee03d2638c681e156461d37b7a113fe13970d438d95d10173d25f78"},
+    {file = "aiohttp-3.9.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dbc053ac75ccc63dc3a3cc547b98c7258ec35a215a92bd9f983e0aac95d3d5b"},
+    {file = "aiohttp-3.9.5-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4109adee842b90671f1b689901b948f347325045c15f46b39797ae1bf17019de"},
+    {file = "aiohttp-3.9.5-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a6ea1a5b409a85477fd8e5ee6ad8f0e40bf2844c270955e09360418cfd09abac"},
+    {file = "aiohttp-3.9.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f3c2890ca8c59ee683fd09adf32321a40fe1cf164e3387799efb2acebf090c11"},
+    {file = "aiohttp-3.9.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3916c8692dbd9d55c523374a3b8213e628424d19116ac4308e434dbf6d95bbdd"},
+    {file = "aiohttp-3.9.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8d1964eb7617907c792ca00b341b5ec3e01ae8c280825deadbbd678447b127e1"},
+    {file = "aiohttp-3.9.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d5ab8e1f6bee051a4bf6195e38a5c13e5e161cb7bad83d8854524798bd9fcd6e"},
+    {file = "aiohttp-3.9.5-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:52c27110f3862a1afbcb2af4281fc9fdc40327fa286c4625dfee247c3ba90156"},
+    {file = "aiohttp-3.9.5-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:7f64cbd44443e80094309875d4f9c71d0401e966d191c3d469cde4642bc2e031"},
+    {file = "aiohttp-3.9.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8b4f72fbb66279624bfe83fd5eb6aea0022dad8eec62b71e7bf63ee1caadeafe"},
+    {file = "aiohttp-3.9.5-cp38-cp38-win32.whl", hash = "sha256:6380c039ec52866c06d69b5c7aad5478b24ed11696f0e72f6b807cfb261453da"},
+    {file = "aiohttp-3.9.5-cp38-cp38-win_amd64.whl", hash = "sha256:da22dab31d7180f8c3ac7c7635f3bcd53808f374f6aa333fe0b0b9e14b01f91a"},
+    {file = "aiohttp-3.9.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:1732102949ff6087589408d76cd6dea656b93c896b011ecafff418c9661dc4ed"},
+    {file = "aiohttp-3.9.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c6021d296318cb6f9414b48e6a439a7f5d1f665464da507e8ff640848ee2a58a"},
+    {file = "aiohttp-3.9.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:239f975589a944eeb1bad26b8b140a59a3a320067fb3cd10b75c3092405a1372"},
+    {file = "aiohttp-3.9.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3b7b30258348082826d274504fbc7c849959f1989d86c29bc355107accec6cfb"},
+    {file = "aiohttp-3.9.5-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cd2adf5c87ff6d8b277814a28a535b59e20bfea40a101db6b3bdca7e9926bc24"},
+    {file = "aiohttp-3.9.5-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e9a3d838441bebcf5cf442700e3963f58b5c33f015341f9ea86dcd7d503c07e2"},
+    {file = "aiohttp-3.9.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e3a1ae66e3d0c17cf65c08968a5ee3180c5a95920ec2731f53343fac9bad106"},
+    {file = "aiohttp-3.9.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9c69e77370cce2d6df5d12b4e12bdcca60c47ba13d1cbbc8645dd005a20b738b"},
+    {file = "aiohttp-3.9.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0cbf56238f4bbf49dab8c2dc2e6b1b68502b1e88d335bea59b3f5b9f4c001475"},
+    {file = "aiohttp-3.9.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d1469f228cd9ffddd396d9948b8c9cd8022b6d1bf1e40c6f25b0fb90b4f893ed"},
+    {file = "aiohttp-3.9.5-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:45731330e754f5811c314901cebdf19dd776a44b31927fa4b4dbecab9e457b0c"},
+    {file = "aiohttp-3.9.5-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:3fcb4046d2904378e3aeea1df51f697b0467f2aac55d232c87ba162709478c46"},
+    {file = "aiohttp-3.9.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8cf142aa6c1a751fcb364158fd710b8a9be874b81889c2bd13aa8893197455e2"},
+    {file = "aiohttp-3.9.5-cp39-cp39-win32.whl", hash = "sha256:7b179eea70833c8dee51ec42f3b4097bd6370892fa93f510f76762105568cf09"},
+    {file = "aiohttp-3.9.5-cp39-cp39-win_amd64.whl", hash = "sha256:38d80498e2e169bc61418ff36170e0aad0cd268da8b38a17c4cf29d254a8b3f1"},
+    {file = "aiohttp-3.9.5.tar.gz", hash = "sha256:edea7d15772ceeb29db4aff55e482d4bcfb6ae160ce144f2682de02f6d693551"},
 ]
 
 [package.dependencies]
-aiohappyeyeballs = ">=2.3.0"
 aiosignal = ">=1.1.2"
-async-timeout = {version = ">=4.0,<6.0", markers = "python_version < \"3.11\""}
+async-timeout = {version = ">=4.0,<5.0", markers = "python_version < \"3.11\""}
 attrs = ">=17.3.0"
 frozenlist = ">=1.1.1"
 multidict = ">=4.5,<7.0"
-yarl = ">=1.12.0,<2.0"
+yarl = ">=1.0,<2.0"
 
 [package.extras]
-speedups = ["Brotli ; platform_python_implementation == \"CPython\"", "aiodns (>=3.2.0) ; sys_platform == \"linux\" or sys_platform == \"darwin\"", "brotlicffi ; platform_python_implementation != \"CPython\""]
+speedups = ["Brotli", "aiodns", "brotlicffi"]
 
 [[package]]
 name = "aiohttp-cors"
@@ -131,7 +102,6 @@ version = "0.7.0"
 description = "CORS support for aiohttp"
 optional = false
 python-versions = "*"
-groups = ["main"]
 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"},
@@ -146,7 +116,6 @@ version = "1.6"
 description = "jinja2 template renderer for aiohttp.web (http server for asyncio)"
 optional = false
 python-versions = ">=3.8"
-groups = ["main"]
 files = [
     {file = "aiohttp-jinja2-1.6.tar.gz", hash = "sha256:a3a7ff5264e5bca52e8ae547bbfd0761b72495230d438d05b6c0915be619b0e2"},
     {file = "aiohttp_jinja2-1.6-py3-none-any.whl", hash = "sha256:0df405ee6ad1b58e5a068a105407dc7dcc1704544c559f1938babde954f945c7"},
@@ -162,7 +131,6 @@ version = "1.3.1"
 description = "aiosignal: a list of registered asynchronous callbacks"
 optional = false
 python-versions = ">=3.7"
-groups = ["main"]
 files = [
     {file = "aiosignal-1.3.1-py3-none-any.whl", hash = "sha256:f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17"},
     {file = "aiosignal-1.3.1.tar.gz", hash = "sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc"},
@@ -177,7 +145,6 @@ version = "0.17.4"
 description = "Python graph (network) package"
 optional = false
 python-versions = "*"
-groups = ["dev"]
 files = [
     {file = "altgraph-0.17.4-py2.py3-none-any.whl", hash = "sha256:642743b4750de17e655e6711601b077bc6598dbfa3ba5fa2b2a35ce12b508dff"},
     {file = "altgraph-0.17.4.tar.gz", hash = "sha256:1b5afbb98f6c4dcadb2e2ae6ab9fa994bbb8c1d75f4fa96d340f9437ae454406"},
@@ -189,8 +156,6 @@ version = "4.0.3"
 description = "Timeout context manager for asyncio programs"
 optional = false
 python-versions = ">=3.7"
-groups = ["main"]
-markers = "python_version < \"3.11\""
 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"},
@@ -202,7 +167,6 @@ version = "23.2.0"
 description = "Classes Without Boilerplate"
 optional = false
 python-versions = ">=3.7"
-groups = ["main"]
 files = [
     {file = "attrs-23.2.0-py3-none-any.whl", hash = "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"},
     {file = "attrs-23.2.0.tar.gz", hash = "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30"},
@@ -213,8 +177,8 @@ cov = ["attrs[tests]", "coverage[toml] (>=5.3)"]
 dev = ["attrs[tests]", "pre-commit"]
 docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"]
 tests = ["attrs[tests-no-zope]", "zope-interface"]
-tests-mypy = ["mypy (>=1.6) ; platform_python_implementation == \"CPython\" and python_version >= \"3.8\"", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.8\""]
-tests-no-zope = ["attrs[tests-mypy]", "cloudpickle ; platform_python_implementation == \"CPython\"", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"]
+tests-mypy = ["mypy (>=1.6)", "pytest-mypy-plugins"]
+tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"]
 
 [[package]]
 name = "certifi"
@@ -222,7 +186,6 @@ version = "2024.7.4"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
-groups = ["main"]
 files = [
     {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
     {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
@@ -234,7 +197,6 @@ version = "1.4.1"
 description = "A list-like structure which implements collections.abc.MutableSequence"
 optional = false
 python-versions = ">=3.8"
-groups = ["main"]
 files = [
     {file = "frozenlist-1.4.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f9aa1878d1083b276b0196f2dfbe00c9b7e752475ed3b682025ff20c1c1f51ac"},
     {file = "frozenlist-1.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:29acab3f66f0f24674b7dc4736477bcd4bc3ad4b896f5f45379a67bce8b96868"},
@@ -321,7 +283,6 @@ version = "3.7"
 description = "Internationalized Domain Names in Applications (IDNA)"
 optional = false
 python-versions = ">=3.5"
-groups = ["main"]
 files = [
     {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"},
     {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"},
@@ -329,14 +290,13 @@ files = [
 
 [[package]]
 name = "jinja2"
-version = "3.1.6"
+version = "3.1.4"
 description = "A very fast and expressive template engine."
 optional = false
 python-versions = ">=3.7"
-groups = ["main"]
 files = [
-    {file = "jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67"},
-    {file = "jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d"},
+    {file = "jinja2-3.1.4-py3-none-any.whl", hash = "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"},
+    {file = "jinja2-3.1.4.tar.gz", hash = "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"},
 ]
 
 [package.dependencies]
@@ -351,8 +311,6 @@ version = "1.16.3"
 description = "Mach-O header analysis and editing"
 optional = false
 python-versions = "*"
-groups = ["dev"]
-markers = "sys_platform == \"darwin\""
 files = [
     {file = "macholib-1.16.3-py2.py3-none-any.whl", hash = "sha256:0e315d7583d38b8c77e815b1ecbdbf504a8258d8b3e17b61165c6feb60d18f2c"},
     {file = "macholib-1.16.3.tar.gz", hash = "sha256:07ae9e15e8e4cd9a788013d81f5908b3609aa76f9b1421bae9c4d7606ec86a30"},
@@ -367,7 +325,6 @@ version = "2.1.5"
 description = "Safely add untrusted strings to HTML/XML markup."
 optional = false
 python-versions = ">=3.7"
-groups = ["main"]
 files = [
     {file = "MarkupSafe-2.1.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc"},
     {file = "MarkupSafe-2.1.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5"},
@@ -437,7 +394,6 @@ version = "6.0.5"
 description = "multidict implementation"
 optional = false
 python-versions = ">=3.7"
-groups = ["main"]
 files = [
     {file = "multidict-6.0.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:228b644ae063c10e7f324ab1ab6b548bdf6f8b47f3ec234fef1093bc2735e5f9"},
     {file = "multidict-6.0.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:896ebdcf62683551312c30e20614305f53125750803b614e9e6ce74a96232604"},
@@ -537,7 +493,6 @@ version = "1.9.1"
 description = "Node.js virtual environment builder"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
-groups = ["dev"]
 files = [
     {file = "nodeenv-1.9.1-py2.py3-none-any.whl", hash = "sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9"},
     {file = "nodeenv-1.9.1.tar.gz", hash = "sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f"},
@@ -549,7 +504,6 @@ version = "24.1"
 description = "Core utilities for Python packages"
 optional = false
 python-versions = ">=3.8"
-groups = ["main", "dev"]
 files = [
     {file = "packaging-24.1-py3-none-any.whl", hash = "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"},
     {file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"},
@@ -561,128 +515,17 @@ version = "2023.2.7"
 description = "Python PE parsing module"
 optional = false
 python-versions = ">=3.6.0"
-groups = ["dev"]
-markers = "sys_platform == \"win32\""
 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 = "propcache"
-version = "0.2.0"
-description = "Accelerated property cache"
-optional = false
-python-versions = ">=3.8"
-groups = ["main"]
-files = [
-    {file = "propcache-0.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:c5869b8fd70b81835a6f187c5fdbe67917a04d7e52b6e7cc4e5fe39d55c39d58"},
-    {file = "propcache-0.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:952e0d9d07609d9c5be361f33b0d6d650cd2bae393aabb11d9b719364521984b"},
-    {file = "propcache-0.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:33ac8f098df0585c0b53009f039dfd913b38c1d2edafed0cedcc0c32a05aa110"},
-    {file = "propcache-0.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97e48e8875e6c13909c800fa344cd54cc4b2b0db1d5f911f840458a500fde2c2"},
-    {file = "propcache-0.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:388f3217649d6d59292b722d940d4d2e1e6a7003259eb835724092a1cca0203a"},
-    {file = "propcache-0.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f571aea50ba5623c308aa146eb650eebf7dbe0fd8c5d946e28343cb3b5aad577"},
-    {file = "propcache-0.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3dfafb44f7bb35c0c06eda6b2ab4bfd58f02729e7c4045e179f9a861b07c9850"},
-    {file = "propcache-0.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a3ebe9a75be7ab0b7da2464a77bb27febcb4fab46a34f9288f39d74833db7f61"},
-    {file = "propcache-0.2.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:d2f0d0f976985f85dfb5f3d685697ef769faa6b71993b46b295cdbbd6be8cc37"},
-    {file = "propcache-0.2.0-cp310-cp310-musllinux_1_2_armv7l.whl", hash = "sha256:a3dc1a4b165283bd865e8f8cb5f0c64c05001e0718ed06250d8cac9bec115b48"},
-    {file = "propcache-0.2.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:9e0f07b42d2a50c7dd2d8675d50f7343d998c64008f1da5fef888396b7f84630"},
-    {file = "propcache-0.2.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:e63e3e1e0271f374ed489ff5ee73d4b6e7c60710e1f76af5f0e1a6117cd26394"},
-    {file = "propcache-0.2.0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:56bb5c98f058a41bb58eead194b4db8c05b088c93d94d5161728515bd52b052b"},
-    {file = "propcache-0.2.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:7665f04d0c7f26ff8bb534e1c65068409bf4687aa2534faf7104d7182debb336"},
-    {file = "propcache-0.2.0-cp310-cp310-win32.whl", hash = "sha256:7cf18abf9764746b9c8704774d8b06714bcb0a63641518a3a89c7f85cc02c2ad"},
-    {file = "propcache-0.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:cfac69017ef97db2438efb854edf24f5a29fd09a536ff3a992b75990720cdc99"},
-    {file = "propcache-0.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:63f13bf09cc3336eb04a837490b8f332e0db41da66995c9fd1ba04552e516354"},
-    {file = "propcache-0.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:608cce1da6f2672a56b24a015b42db4ac612ee709f3d29f27a00c943d9e851de"},
-    {file = "propcache-0.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:466c219deee4536fbc83c08d09115249db301550625c7fef1c5563a584c9bc87"},
-    {file = "propcache-0.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fc2db02409338bf36590aa985a461b2c96fce91f8e7e0f14c50c5fcc4f229016"},
-    {file = "propcache-0.2.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a6ed8db0a556343d566a5c124ee483ae113acc9a557a807d439bcecc44e7dfbb"},
-    {file = "propcache-0.2.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:91997d9cb4a325b60d4e3f20967f8eb08dfcb32b22554d5ef78e6fd1dda743a2"},
-    {file = "propcache-0.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c7dde9e533c0a49d802b4f3f218fa9ad0a1ce21f2c2eb80d5216565202acab4"},
-    {file = "propcache-0.2.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ffcad6c564fe6b9b8916c1aefbb37a362deebf9394bd2974e9d84232e3e08504"},
-    {file = "propcache-0.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:97a58a28bcf63284e8b4d7b460cbee1edaab24634e82059c7b8c09e65284f178"},
-    {file = "propcache-0.2.0-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:945db8ee295d3af9dbdbb698cce9bbc5c59b5c3fe328bbc4387f59a8a35f998d"},
-    {file = "propcache-0.2.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:39e104da444a34830751715f45ef9fc537475ba21b7f1f5b0f4d71a3b60d7fe2"},
-    {file = "propcache-0.2.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:c5ecca8f9bab618340c8e848d340baf68bcd8ad90a8ecd7a4524a81c1764b3db"},
-    {file = "propcache-0.2.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:c436130cc779806bdf5d5fae0d848713105472b8566b75ff70048c47d3961c5b"},
-    {file = "propcache-0.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:191db28dc6dcd29d1a3e063c3be0b40688ed76434622c53a284e5427565bbd9b"},
-    {file = "propcache-0.2.0-cp311-cp311-win32.whl", hash = "sha256:5f2564ec89058ee7c7989a7b719115bdfe2a2fb8e7a4543b8d1c0cc4cf6478c1"},
-    {file = "propcache-0.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:6e2e54267980349b723cff366d1e29b138b9a60fa376664a157a342689553f71"},
-    {file = "propcache-0.2.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:2ee7606193fb267be4b2e3b32714f2d58cad27217638db98a60f9efb5efeccc2"},
-    {file = "propcache-0.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:91ee8fc02ca52e24bcb77b234f22afc03288e1dafbb1f88fe24db308910c4ac7"},
-    {file = "propcache-0.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2e900bad2a8456d00a113cad8c13343f3b1f327534e3589acc2219729237a2e8"},
-    {file = "propcache-0.2.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f52a68c21363c45297aca15561812d542f8fc683c85201df0bebe209e349f793"},
-    {file = "propcache-0.2.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1e41d67757ff4fbc8ef2af99b338bfb955010444b92929e9e55a6d4dcc3c4f09"},
-    {file = "propcache-0.2.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a64e32f8bd94c105cc27f42d3b658902b5bcc947ece3c8fe7bc1b05982f60e89"},
-    {file = "propcache-0.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:55346705687dbd7ef0d77883ab4f6fabc48232f587925bdaf95219bae072491e"},
-    {file = "propcache-0.2.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:00181262b17e517df2cd85656fcd6b4e70946fe62cd625b9d74ac9977b64d8d9"},
-    {file = "propcache-0.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6994984550eaf25dd7fc7bd1b700ff45c894149341725bb4edc67f0ffa94efa4"},
-    {file = "propcache-0.2.0-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:56295eb1e5f3aecd516d91b00cfd8bf3a13991de5a479df9e27dd569ea23959c"},
-    {file = "propcache-0.2.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:439e76255daa0f8151d3cb325f6dd4a3e93043e6403e6491813bcaaaa8733887"},
-    {file = "propcache-0.2.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:f6475a1b2ecb310c98c28d271a30df74f9dd436ee46d09236a6b750a7599ce57"},
-    {file = "propcache-0.2.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:3444cdba6628accf384e349014084b1cacd866fbb88433cd9d279d90a54e0b23"},
-    {file = "propcache-0.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:4a9d9b4d0a9b38d1c391bb4ad24aa65f306c6f01b512e10a8a34a2dc5675d348"},
-    {file = "propcache-0.2.0-cp312-cp312-win32.whl", hash = "sha256:69d3a98eebae99a420d4b28756c8ce6ea5a29291baf2dc9ff9414b42676f61d5"},
-    {file = "propcache-0.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:ad9c9b99b05f163109466638bd30ada1722abb01bbb85c739c50b6dc11f92dc3"},
-    {file = "propcache-0.2.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:ecddc221a077a8132cf7c747d5352a15ed763b674c0448d811f408bf803d9ad7"},
-    {file = "propcache-0.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:0e53cb83fdd61cbd67202735e6a6687a7b491c8742dfc39c9e01e80354956763"},
-    {file = "propcache-0.2.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:92fe151145a990c22cbccf9ae15cae8ae9eddabfc949a219c9f667877e40853d"},
-    {file = "propcache-0.2.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d6a21ef516d36909931a2967621eecb256018aeb11fc48656e3257e73e2e247a"},
-    {file = "propcache-0.2.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f88a4095e913f98988f5b338c1d4d5d07dbb0b6bad19892fd447484e483ba6b"},
-    {file = "propcache-0.2.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5a5b3bb545ead161be780ee85a2b54fdf7092815995661947812dde94a40f6fb"},
-    {file = "propcache-0.2.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67aeb72e0f482709991aa91345a831d0b707d16b0257e8ef88a2ad246a7280bf"},
-    {file = "propcache-0.2.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3c997f8c44ec9b9b0bcbf2d422cc00a1d9b9c681f56efa6ca149a941e5560da2"},
-    {file = "propcache-0.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2a66df3d4992bc1d725b9aa803e8c5a66c010c65c741ad901e260ece77f58d2f"},
-    {file = "propcache-0.2.0-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:3ebbcf2a07621f29638799828b8d8668c421bfb94c6cb04269130d8de4fb7136"},
-    {file = "propcache-0.2.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:1235c01ddaa80da8235741e80815ce381c5267f96cc49b1477fdcf8c047ef325"},
-    {file = "propcache-0.2.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3947483a381259c06921612550867b37d22e1df6d6d7e8361264b6d037595f44"},
-    {file = "propcache-0.2.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:d5bed7f9805cc29c780f3aee05de3262ee7ce1f47083cfe9f77471e9d6777e83"},
-    {file = "propcache-0.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:e4a91d44379f45f5e540971d41e4626dacd7f01004826a18cb048e7da7e96544"},
-    {file = "propcache-0.2.0-cp313-cp313-win32.whl", hash = "sha256:f902804113e032e2cdf8c71015651c97af6418363bea8d78dc0911d56c335032"},
-    {file = "propcache-0.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:8f188cfcc64fb1266f4684206c9de0e80f54622c3f22a910cbd200478aeae61e"},
-    {file = "propcache-0.2.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:53d1bd3f979ed529f0805dd35ddaca330f80a9a6d90bc0121d2ff398f8ed8861"},
-    {file = "propcache-0.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:83928404adf8fb3d26793665633ea79b7361efa0287dfbd372a7e74311d51ee6"},
-    {file = "propcache-0.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:77a86c261679ea5f3896ec060be9dc8e365788248cc1e049632a1be682442063"},
-    {file = "propcache-0.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:218db2a3c297a3768c11a34812e63b3ac1c3234c3a086def9c0fee50d35add1f"},
-    {file = "propcache-0.2.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7735e82e3498c27bcb2d17cb65d62c14f1100b71723b68362872bca7d0913d90"},
-    {file = "propcache-0.2.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:20a617c776f520c3875cf4511e0d1db847a076d720714ae35ffe0df3e440be68"},
-    {file = "propcache-0.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67b69535c870670c9f9b14a75d28baa32221d06f6b6fa6f77a0a13c5a7b0a5b9"},
-    {file = "propcache-0.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4569158070180c3855e9c0791c56be3ceeb192defa2cdf6a3f39e54319e56b89"},
-    {file = "propcache-0.2.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:db47514ffdbd91ccdc7e6f8407aac4ee94cc871b15b577c1c324236b013ddd04"},
-    {file = "propcache-0.2.0-cp38-cp38-musllinux_1_2_armv7l.whl", hash = "sha256:2a60ad3e2553a74168d275a0ef35e8c0a965448ffbc3b300ab3a5bb9956c2162"},
-    {file = "propcache-0.2.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:662dd62358bdeaca0aee5761de8727cfd6861432e3bb828dc2a693aa0471a563"},
-    {file = "propcache-0.2.0-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:25a1f88b471b3bc911d18b935ecb7115dff3a192b6fef46f0bfaf71ff4f12418"},
-    {file = "propcache-0.2.0-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:f60f0ac7005b9f5a6091009b09a419ace1610e163fa5deaba5ce3484341840e7"},
-    {file = "propcache-0.2.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:74acd6e291f885678631b7ebc85d2d4aec458dd849b8c841b57ef04047833bed"},
-    {file = "propcache-0.2.0-cp38-cp38-win32.whl", hash = "sha256:d9b6ddac6408194e934002a69bcaadbc88c10b5f38fb9307779d1c629181815d"},
-    {file = "propcache-0.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:676135dcf3262c9c5081cc8f19ad55c8a64e3f7282a21266d05544450bffc3a5"},
-    {file = "propcache-0.2.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:25c8d773a62ce0451b020c7b29a35cfbc05de8b291163a7a0f3b7904f27253e6"},
-    {file = "propcache-0.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:375a12d7556d462dc64d70475a9ee5982465fbb3d2b364f16b86ba9135793638"},
-    {file = "propcache-0.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1ec43d76b9677637a89d6ab86e1fef70d739217fefa208c65352ecf0282be957"},
-    {file = "propcache-0.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f45eec587dafd4b2d41ac189c2156461ebd0c1082d2fe7013571598abb8505d1"},
-    {file = "propcache-0.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bc092ba439d91df90aea38168e11f75c655880c12782facf5cf9c00f3d42b562"},
-    {file = "propcache-0.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fa1076244f54bb76e65e22cb6910365779d5c3d71d1f18b275f1dfc7b0d71b4d"},
-    {file = "propcache-0.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:682a7c79a2fbf40f5dbb1eb6bfe2cd865376deeac65acf9beb607505dced9e12"},
-    {file = "propcache-0.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8e40876731f99b6f3c897b66b803c9e1c07a989b366c6b5b475fafd1f7ba3fb8"},
-    {file = "propcache-0.2.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:363ea8cd3c5cb6679f1c2f5f1f9669587361c062e4899fce56758efa928728f8"},
-    {file = "propcache-0.2.0-cp39-cp39-musllinux_1_2_armv7l.whl", hash = "sha256:140fbf08ab3588b3468932974a9331aff43c0ab8a2ec2c608b6d7d1756dbb6cb"},
-    {file = "propcache-0.2.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:e70fac33e8b4ac63dfc4c956fd7d85a0b1139adcfc0d964ce288b7c527537fea"},
-    {file = "propcache-0.2.0-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:b33d7a286c0dc1a15f5fc864cc48ae92a846df287ceac2dd499926c3801054a6"},
-    {file = "propcache-0.2.0-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:f6d5749fdd33d90e34c2efb174c7e236829147a2713334d708746e94c4bde40d"},
-    {file = "propcache-0.2.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:22aa8f2272d81d9317ff5756bb108021a056805ce63dd3630e27d042c8092798"},
-    {file = "propcache-0.2.0-cp39-cp39-win32.whl", hash = "sha256:73e4b40ea0eda421b115248d7e79b59214411109a5bc47d0d48e4c73e3b8fcf9"},
-    {file = "propcache-0.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:9517d5e9e0731957468c29dbfd0f976736a0e55afaea843726e887f36fe017df"},
-    {file = "propcache-0.2.0-py3-none-any.whl", hash = "sha256:2ccc28197af5313706511fab3a8b66dcd6da067a1331372c82ea1cb74285e036"},
-    {file = "propcache-0.2.0.tar.gz", hash = "sha256:df81779732feb9d01e5d513fad0122efb3d53bbc75f61b2a4f29a020bc985e70"},
-]
-
 [[package]]
 name = "pyinstaller"
 version = "6.8.0"
 description = "PyInstaller bundles a Python application and all its dependencies into a single package."
 optional = false
 python-versions = "<3.13,>=3.8"
-groups = ["dev"]
 files = [
     {file = "pyinstaller-6.8.0-py3-none-macosx_10_13_universal2.whl", hash = "sha256:5ff6bc2784c1026f8e2f04aa3760cbed41408e108a9d4cf1dd52ee8351a3f6e1"},
     {file = "pyinstaller-6.8.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:39ac424d2ee2457d2ab11a5091436e75a0cccae207d460d180aa1fcbbafdd528"},
@@ -717,7 +560,6 @@ version = "2024.7"
 description = "Community maintained hooks for PyInstaller"
 optional = false
 python-versions = ">=3.7"
-groups = ["dev"]
 files = [
     {file = "pyinstaller_hooks_contrib-2024.7-py2.py3-none-any.whl", hash = "sha256:8bf0775771fbaf96bcd2f4dfd6f7ae6c1dd1b1efe254c7e50477b3c08e7841d8"},
     {file = "pyinstaller_hooks_contrib-2024.7.tar.gz", hash = "sha256:fd5f37dcf99bece184e40642af88be16a9b89613ecb958a8bd1136634fc9fac5"},
@@ -733,7 +575,6 @@ version = "1.1.369"
 description = "Command line wrapper for pyright"
 optional = false
 python-versions = ">=3.7"
-groups = ["dev"]
 files = [
     {file = "pyright-1.1.369-py3-none-any.whl", hash = "sha256:06d5167a8d7be62523ced0265c5d2f1e022e110caf57a25d92f50fb2d07bcda0"},
     {file = "pyright-1.1.369.tar.gz", hash = "sha256:ad290710072d021e213b98cc7a2f90ae3a48609ef5b978f749346d1a47eb9af8"},
@@ -752,8 +593,6 @@ version = "0.2.2"
 description = "A (partial) reimplementation of pywin32 using ctypes/cffi"
 optional = false
 python-versions = ">=3.6"
-groups = ["dev"]
-markers = "sys_platform == \"win32\""
 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"},
@@ -765,7 +604,6 @@ version = "1.3.3"
 description = "A Python module to customize the process title"
 optional = false
 python-versions = ">=3.7"
-groups = ["main"]
 files = [
     {file = "setproctitle-1.3.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:897a73208da48db41e687225f355ce993167079eda1260ba5e13c4e53be7f754"},
     {file = "setproctitle-1.3.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8c331e91a14ba4076f88c29c777ad6b58639530ed5b24b5564b5ed2fd7a95452"},
@@ -862,24 +700,18 @@ test = ["pytest"]
 
 [[package]]
 name = "setuptools"
-version = "78.1.1"
+version = "70.1.1"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 optional = false
-python-versions = ">=3.9"
-groups = ["dev"]
+python-versions = ">=3.8"
 files = [
-    {file = "setuptools-78.1.1-py3-none-any.whl", hash = "sha256:c3a9c4211ff4c309edb8b8c4f1cbfa7ae324c4ba9f91ff254e3d305b9fd54561"},
-    {file = "setuptools-78.1.1.tar.gz", hash = "sha256:fcc17fd9cd898242f6b4adfaca46137a9edef687f43e6f78469692a5e70d851d"},
+    {file = "setuptools-70.1.1-py3-none-any.whl", hash = "sha256:a58a8fde0541dab0419750bcc521fbdf8585f6e5cb41909df3a472ef7b81ca95"},
+    {file = "setuptools-70.1.1.tar.gz", hash = "sha256:937a48c7cdb7a21eb53cd7f9b59e525503aa8abaf3584c730dc5f7a5bec3a650"},
 ]
 
 [package.extras]
-check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\"", "ruff (>=0.8.0) ; sys_platform != \"cygwin\""]
-core = ["importlib_metadata (>=6) ; python_version < \"3.10\"", "jaraco.functools (>=4)", "jaraco.text (>=3.7)", "more_itertools", "more_itertools (>=8.8)", "packaging (>=24.2)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1) ; python_version < \"3.11\"", "wheel (>=0.43.0)"]
-cover = ["pytest-cov"]
-doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
-enabler = ["pytest-enabler (>=2.2)"]
-test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21) ; python_version >= \"3.9\" and sys_platform != \"cygwin\"", "jaraco.envs (>=2.2)", "jaraco.path (>=3.7.2)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf ; sys_platform != \"cygwin\"", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
-type = ["importlib_metadata (>=7.0.2) ; python_version < \"3.10\"", "jaraco.develop (>=7.21) ; sys_platform != \"cygwin\"", "mypy (==1.14.*)", "pytest-mypy"]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "importlib-metadata", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "mypy (==1.10.0)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.1)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy", "pytest-perf", "pytest-ruff (>=0.3.2)", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
 
 [[package]]
 name = "watchdog"
@@ -887,7 +719,6 @@ version = "4.0.1"
 description = "Filesystem events monitoring"
 optional = false
 python-versions = ">=3.8"
-groups = ["main"]
 files = [
     {file = "watchdog-4.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:da2dfdaa8006eb6a71051795856bedd97e5b03e57da96f98e375682c48850645"},
     {file = "watchdog-4.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e93f451f2dfa433d97765ca2634628b789b49ba8b504fdde5837cdcf25fdb53b"},
@@ -928,118 +759,108 @@ watchmedo = ["PyYAML (>=3.10)"]
 
 [[package]]
 name = "yarl"
-version = "1.15.2"
+version = "1.9.4"
 description = "Yet another URL library"
 optional = false
-python-versions = ">=3.8"
-groups = ["main"]
+python-versions = ">=3.7"
 files = [
-    {file = "yarl-1.15.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e4ee8b8639070ff246ad3649294336b06db37a94bdea0d09ea491603e0be73b8"},
-    {file = "yarl-1.15.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a7cf963a357c5f00cb55b1955df8bbe68d2f2f65de065160a1c26b85a1e44172"},
-    {file = "yarl-1.15.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:43ebdcc120e2ca679dba01a779333a8ea76b50547b55e812b8b92818d604662c"},
-    {file = "yarl-1.15.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3433da95b51a75692dcf6cc8117a31410447c75a9a8187888f02ad45c0a86c50"},
-    {file = "yarl-1.15.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:38d0124fa992dbacd0c48b1b755d3ee0a9f924f427f95b0ef376556a24debf01"},
-    {file = "yarl-1.15.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ded1b1803151dd0f20a8945508786d57c2f97a50289b16f2629f85433e546d47"},
-    {file = "yarl-1.15.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ace4cad790f3bf872c082366c9edd7f8f8f77afe3992b134cfc810332206884f"},
-    {file = "yarl-1.15.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c77494a2f2282d9bbbbcab7c227a4d1b4bb829875c96251f66fb5f3bae4fb053"},
-    {file = "yarl-1.15.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:b7f227ca6db5a9fda0a2b935a2ea34a7267589ffc63c8045f0e4edb8d8dcf956"},
-    {file = "yarl-1.15.2-cp310-cp310-musllinux_1_2_armv7l.whl", hash = "sha256:31561a5b4d8dbef1559b3600b045607cf804bae040f64b5f5bca77da38084a8a"},
-    {file = "yarl-1.15.2-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:3e52474256a7db9dcf3c5f4ca0b300fdea6c21cca0148c8891d03a025649d935"},
-    {file = "yarl-1.15.2-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:0e1af74a9529a1137c67c887ed9cde62cff53aa4d84a3adbec329f9ec47a3936"},
-    {file = "yarl-1.15.2-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:15c87339490100c63472a76d87fe7097a0835c705eb5ae79fd96e343473629ed"},
-    {file = "yarl-1.15.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:74abb8709ea54cc483c4fb57fb17bb66f8e0f04438cff6ded322074dbd17c7ec"},
-    {file = "yarl-1.15.2-cp310-cp310-win32.whl", hash = "sha256:ffd591e22b22f9cb48e472529db6a47203c41c2c5911ff0a52e85723196c0d75"},
-    {file = "yarl-1.15.2-cp310-cp310-win_amd64.whl", hash = "sha256:1695497bb2a02a6de60064c9f077a4ae9c25c73624e0d43e3aa9d16d983073c2"},
-    {file = "yarl-1.15.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9fcda20b2de7042cc35cf911702fa3d8311bd40055a14446c1e62403684afdc5"},
-    {file = "yarl-1.15.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0545de8c688fbbf3088f9e8b801157923be4bf8e7b03e97c2ecd4dfa39e48e0e"},
-    {file = "yarl-1.15.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fbda058a9a68bec347962595f50546a8a4a34fd7b0654a7b9697917dc2bf810d"},
-    {file = "yarl-1.15.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d1ac2bc069f4a458634c26b101c2341b18da85cb96afe0015990507efec2e417"},
-    {file = "yarl-1.15.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cd126498171f752dd85737ab1544329a4520c53eed3997f9b08aefbafb1cc53b"},
-    {file = "yarl-1.15.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3db817b4e95eb05c362e3b45dafe7144b18603e1211f4a5b36eb9522ecc62bcf"},
-    {file = "yarl-1.15.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:076b1ed2ac819933895b1a000904f62d615fe4533a5cf3e052ff9a1da560575c"},
-    {file = "yarl-1.15.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f8cfd847e6b9ecf9f2f2531c8427035f291ec286c0a4944b0a9fce58c6446046"},
-    {file = "yarl-1.15.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:32b66be100ac5739065496c74c4b7f3015cef792c3174982809274d7e51b3e04"},
-    {file = "yarl-1.15.2-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:34a2d76a1984cac04ff8b1bfc939ec9dc0914821264d4a9c8fd0ed6aa8d4cfd2"},
-    {file = "yarl-1.15.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:0afad2cd484908f472c8fe2e8ef499facee54a0a6978be0e0cff67b1254fd747"},
-    {file = "yarl-1.15.2-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:c68e820879ff39992c7f148113b46efcd6ec765a4865581f2902b3c43a5f4bbb"},
-    {file = "yarl-1.15.2-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:98f68df80ec6ca3015186b2677c208c096d646ef37bbf8b49764ab4a38183931"},
-    {file = "yarl-1.15.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:3c56ec1eacd0a5d35b8a29f468659c47f4fe61b2cab948ca756c39b7617f0aa5"},
-    {file = "yarl-1.15.2-cp311-cp311-win32.whl", hash = "sha256:eedc3f247ee7b3808ea07205f3e7d7879bc19ad3e6222195cd5fbf9988853e4d"},
-    {file = "yarl-1.15.2-cp311-cp311-win_amd64.whl", hash = "sha256:0ccaa1bc98751fbfcf53dc8dfdb90d96e98838010fc254180dd6707a6e8bb179"},
-    {file = "yarl-1.15.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:82d5161e8cb8f36ec778fd7ac4d740415d84030f5b9ef8fe4da54784a1f46c94"},
-    {file = "yarl-1.15.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fa2bea05ff0a8fb4d8124498e00e02398f06d23cdadd0fe027d84a3f7afde31e"},
-    {file = "yarl-1.15.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:99e12d2bf587b44deb74e0d6170fec37adb489964dbca656ec41a7cd8f2ff178"},
-    {file = "yarl-1.15.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:243fbbbf003754fe41b5bdf10ce1e7f80bcc70732b5b54222c124d6b4c2ab31c"},
-    {file = "yarl-1.15.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:856b7f1a7b98a8c31823285786bd566cf06226ac4f38b3ef462f593c608a9bd6"},
-    {file = "yarl-1.15.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:553dad9af802a9ad1a6525e7528152a015b85fb8dbf764ebfc755c695f488367"},
-    {file = "yarl-1.15.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:30c3ff305f6e06650a761c4393666f77384f1cc6c5c0251965d6bfa5fbc88f7f"},
-    {file = "yarl-1.15.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:353665775be69bbfc6d54c8d134bfc533e332149faeddd631b0bc79df0897f46"},
-    {file = "yarl-1.15.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f4fe99ce44128c71233d0d72152db31ca119711dfc5f2c82385ad611d8d7f897"},
-    {file = "yarl-1.15.2-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:9c1e3ff4b89cdd2e1a24c214f141e848b9e0451f08d7d4963cb4108d4d798f1f"},
-    {file = "yarl-1.15.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:711bdfae4e699a6d4f371137cbe9e740dc958530cb920eb6f43ff9551e17cfbc"},
-    {file = "yarl-1.15.2-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:4388c72174868884f76affcdd3656544c426407e0043c89b684d22fb265e04a5"},
-    {file = "yarl-1.15.2-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:f0e1844ad47c7bd5d6fa784f1d4accc5f4168b48999303a868fe0f8597bde715"},
-    {file = "yarl-1.15.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a5cafb02cf097a82d74403f7e0b6b9df3ffbfe8edf9415ea816314711764a27b"},
-    {file = "yarl-1.15.2-cp312-cp312-win32.whl", hash = "sha256:156ececdf636143f508770bf8a3a0498de64da5abd890c7dbb42ca9e3b6c05b8"},
-    {file = "yarl-1.15.2-cp312-cp312-win_amd64.whl", hash = "sha256:435aca062444a7f0c884861d2e3ea79883bd1cd19d0a381928b69ae1b85bc51d"},
-    {file = "yarl-1.15.2-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:416f2e3beaeae81e2f7a45dc711258be5bdc79c940a9a270b266c0bec038fb84"},
-    {file = "yarl-1.15.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:173563f3696124372831007e3d4b9821746964a95968628f7075d9231ac6bb33"},
-    {file = "yarl-1.15.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:9ce2e0f6123a60bd1a7f5ae3b2c49b240c12c132847f17aa990b841a417598a2"},
-    {file = "yarl-1.15.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eaea112aed589131f73d50d570a6864728bd7c0c66ef6c9154ed7b59f24da611"},
-    {file = "yarl-1.15.2-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e4ca3b9f370f218cc2a0309542cab8d0acdfd66667e7c37d04d617012485f904"},
-    {file = "yarl-1.15.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:23ec1d3c31882b2a8a69c801ef58ebf7bae2553211ebbddf04235be275a38548"},
-    {file = "yarl-1.15.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75119badf45f7183e10e348edff5a76a94dc19ba9287d94001ff05e81475967b"},
-    {file = "yarl-1.15.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:78e6fdc976ec966b99e4daa3812fac0274cc28cd2b24b0d92462e2e5ef90d368"},
-    {file = "yarl-1.15.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:8657d3f37f781d987037f9cc20bbc8b40425fa14380c87da0cb8dfce7c92d0fb"},
-    {file = "yarl-1.15.2-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:93bed8a8084544c6efe8856c362af08a23e959340c87a95687fdbe9c9f280c8b"},
-    {file = "yarl-1.15.2-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:69d5856d526802cbda768d3e6246cd0d77450fa2a4bc2ea0ea14f0d972c2894b"},
-    {file = "yarl-1.15.2-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:ccad2800dfdff34392448c4bf834be124f10a5bc102f254521d931c1c53c455a"},
-    {file = "yarl-1.15.2-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:a880372e2e5dbb9258a4e8ff43f13888039abb9dd6d515f28611c54361bc5644"},
-    {file = "yarl-1.15.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:c998d0558805860503bc3a595994895ca0f7835e00668dadc673bbf7f5fbfcbe"},
-    {file = "yarl-1.15.2-cp313-cp313-win32.whl", hash = "sha256:533a28754e7f7439f217550a497bb026c54072dbe16402b183fdbca2431935a9"},
-    {file = "yarl-1.15.2-cp313-cp313-win_amd64.whl", hash = "sha256:5838f2b79dc8f96fdc44077c9e4e2e33d7089b10788464609df788eb97d03aad"},
-    {file = "yarl-1.15.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:fbbb63bed5fcd70cd3dd23a087cd78e4675fb5a2963b8af53f945cbbca79ae16"},
-    {file = "yarl-1.15.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e2e93b88ecc8f74074012e18d679fb2e9c746f2a56f79cd5e2b1afcf2a8a786b"},
-    {file = "yarl-1.15.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:af8ff8d7dc07ce873f643de6dfbcd45dc3db2c87462e5c387267197f59e6d776"},
-    {file = "yarl-1.15.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:66f629632220a4e7858b58e4857927dd01a850a4cef2fb4044c8662787165cf7"},
-    {file = "yarl-1.15.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:833547179c31f9bec39b49601d282d6f0ea1633620701288934c5f66d88c3e50"},
-    {file = "yarl-1.15.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2aa738e0282be54eede1e3f36b81f1e46aee7ec7602aa563e81e0e8d7b67963f"},
-    {file = "yarl-1.15.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9a13a07532e8e1c4a5a3afff0ca4553da23409fad65def1b71186fb867eeae8d"},
-    {file = "yarl-1.15.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c45817e3e6972109d1a2c65091504a537e257bc3c885b4e78a95baa96df6a3f8"},
-    {file = "yarl-1.15.2-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:670eb11325ed3a6209339974b276811867defe52f4188fe18dc49855774fa9cf"},
-    {file = "yarl-1.15.2-cp38-cp38-musllinux_1_2_armv7l.whl", hash = "sha256:d417a4f6943112fae3924bae2af7112562285848d9bcee737fc4ff7cbd450e6c"},
-    {file = "yarl-1.15.2-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:bc8936d06cd53fddd4892677d65e98af514c8d78c79864f418bbf78a4a2edde4"},
-    {file = "yarl-1.15.2-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:954dde77c404084c2544e572f342aef384240b3e434e06cecc71597e95fd1ce7"},
-    {file = "yarl-1.15.2-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:5bc0df728e4def5e15a754521e8882ba5a5121bd6b5a3a0ff7efda5d6558ab3d"},
-    {file = "yarl-1.15.2-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:b71862a652f50babab4a43a487f157d26b464b1dedbcc0afda02fd64f3809d04"},
-    {file = "yarl-1.15.2-cp38-cp38-win32.whl", hash = "sha256:63eab904f8630aed5a68f2d0aeab565dcfc595dc1bf0b91b71d9ddd43dea3aea"},
-    {file = "yarl-1.15.2-cp38-cp38-win_amd64.whl", hash = "sha256:2cf441c4b6e538ba0d2591574f95d3fdd33f1efafa864faa077d9636ecc0c4e9"},
-    {file = "yarl-1.15.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:a32d58f4b521bb98b2c0aa9da407f8bd57ca81f34362bcb090e4a79e9924fefc"},
-    {file = "yarl-1.15.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:766dcc00b943c089349d4060b935c76281f6be225e39994c2ccec3a2a36ad627"},
-    {file = "yarl-1.15.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bed1b5dbf90bad3bfc19439258c97873eab453c71d8b6869c136346acfe497e7"},
-    {file = "yarl-1.15.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed20a4bdc635f36cb19e630bfc644181dd075839b6fc84cac51c0f381ac472e2"},
-    {file = "yarl-1.15.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d538df442c0d9665664ab6dd5fccd0110fa3b364914f9c85b3ef9b7b2e157980"},
-    {file = "yarl-1.15.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c6cf1d92edf936ceedc7afa61b07e9d78a27b15244aa46bbcd534c7458ee1b"},
-    {file = "yarl-1.15.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce44217ad99ffad8027d2fde0269ae368c86db66ea0571c62a000798d69401fb"},
-    {file = "yarl-1.15.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b47a6000a7e833ebfe5886b56a31cb2ff12120b1efd4578a6fcc38df16cc77bd"},
-    {file = "yarl-1.15.2-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:e52f77a0cd246086afde8815039f3e16f8d2be51786c0a39b57104c563c5cbb0"},
-    {file = "yarl-1.15.2-cp39-cp39-musllinux_1_2_armv7l.whl", hash = "sha256:f9ca0e6ce7774dc7830dc0cc4bb6b3eec769db667f230e7c770a628c1aa5681b"},
-    {file = "yarl-1.15.2-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:136f9db0f53c0206db38b8cd0c985c78ded5fd596c9a86ce5c0b92afb91c3a19"},
-    {file = "yarl-1.15.2-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:173866d9f7409c0fb514cf6e78952e65816600cb888c68b37b41147349fe0057"},
-    {file = "yarl-1.15.2-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:6e840553c9c494a35e449a987ca2c4f8372668ee954a03a9a9685075228e5036"},
-    {file = "yarl-1.15.2-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:458c0c65802d816a6b955cf3603186de79e8fdb46d4f19abaec4ef0a906f50a7"},
-    {file = "yarl-1.15.2-cp39-cp39-win32.whl", hash = "sha256:5b48388ded01f6f2429a8c55012bdbd1c2a0c3735b3e73e221649e524c34a58d"},
-    {file = "yarl-1.15.2-cp39-cp39-win_amd64.whl", hash = "sha256:81dadafb3aa124f86dc267a2168f71bbd2bfb163663661ab0038f6e4b8edb810"},
-    {file = "yarl-1.15.2-py3-none-any.whl", hash = "sha256:0d3105efab7c5c091609abacad33afff33bdff0035bece164c98bcf5a85ef90a"},
-    {file = "yarl-1.15.2.tar.gz", hash = "sha256:a39c36f4218a5bb668b4f06874d676d35a035ee668e6e7e3538835c703634b84"},
+    {file = "yarl-1.9.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a8c1df72eb746f4136fe9a2e72b0c9dc1da1cbd23b5372f94b5820ff8ae30e0e"},
+    {file = "yarl-1.9.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a3a6ed1d525bfb91b3fc9b690c5a21bb52de28c018530ad85093cc488bee2dd2"},
+    {file = "yarl-1.9.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c38c9ddb6103ceae4e4498f9c08fac9b590c5c71b0370f98714768e22ac6fa66"},
+    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d9e09c9d74f4566e905a0b8fa668c58109f7624db96a2171f21747abc7524234"},
+    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b8477c1ee4bd47c57d49621a062121c3023609f7a13b8a46953eb6c9716ca392"},
+    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d5ff2c858f5f6a42c2a8e751100f237c5e869cbde669a724f2062d4c4ef93551"},
+    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:357495293086c5b6d34ca9616a43d329317feab7917518bc97a08f9e55648455"},
+    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:54525ae423d7b7a8ee81ba189f131054defdb122cde31ff17477951464c1691c"},
+    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:801e9264d19643548651b9db361ce3287176671fb0117f96b5ac0ee1c3530d53"},
+    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e516dc8baf7b380e6c1c26792610230f37147bb754d6426462ab115a02944385"},
+    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:7d5aaac37d19b2904bb9dfe12cdb08c8443e7ba7d2852894ad448d4b8f442863"},
+    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:54beabb809ffcacbd9d28ac57b0db46e42a6e341a030293fb3185c409e626b8b"},
+    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bac8d525a8dbc2a1507ec731d2867025d11ceadcb4dd421423a5d42c56818541"},
+    {file = "yarl-1.9.4-cp310-cp310-win32.whl", hash = "sha256:7855426dfbddac81896b6e533ebefc0af2f132d4a47340cee6d22cac7190022d"},
+    {file = "yarl-1.9.4-cp310-cp310-win_amd64.whl", hash = "sha256:848cd2a1df56ddbffeb375535fb62c9d1645dde33ca4d51341378b3f5954429b"},
+    {file = "yarl-1.9.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:35a2b9396879ce32754bd457d31a51ff0a9d426fd9e0e3c33394bf4b9036b099"},
+    {file = "yarl-1.9.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4c7d56b293cc071e82532f70adcbd8b61909eec973ae9d2d1f9b233f3d943f2c"},
+    {file = "yarl-1.9.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d8a1c6c0be645c745a081c192e747c5de06e944a0d21245f4cf7c05e457c36e0"},
+    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4b3c1ffe10069f655ea2d731808e76e0f452fc6c749bea04781daf18e6039525"},
+    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:549d19c84c55d11687ddbd47eeb348a89df9cb30e1993f1b128f4685cd0ebbf8"},
+    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a7409f968456111140c1c95301cadf071bd30a81cbd7ab829169fb9e3d72eae9"},
+    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e23a6d84d9d1738dbc6e38167776107e63307dfc8ad108e580548d1f2c587f42"},
+    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d8b889777de69897406c9fb0b76cdf2fd0f31267861ae7501d93003d55f54fbe"},
+    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:03caa9507d3d3c83bca08650678e25364e1843b484f19986a527630ca376ecce"},
+    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:4e9035df8d0880b2f1c7f5031f33f69e071dfe72ee9310cfc76f7b605958ceb9"},
+    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:c0ec0ed476f77db9fb29bca17f0a8fcc7bc97ad4c6c1d8959c507decb22e8572"},
+    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:ee04010f26d5102399bd17f8df8bc38dc7ccd7701dc77f4a68c5b8d733406958"},
+    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:49a180c2e0743d5d6e0b4d1a9e5f633c62eca3f8a86ba5dd3c471060e352ca98"},
+    {file = "yarl-1.9.4-cp311-cp311-win32.whl", hash = "sha256:81eb57278deb6098a5b62e88ad8281b2ba09f2f1147c4767522353eaa6260b31"},
+    {file = "yarl-1.9.4-cp311-cp311-win_amd64.whl", hash = "sha256:d1d2532b340b692880261c15aee4dc94dd22ca5d61b9db9a8a361953d36410b1"},
+    {file = "yarl-1.9.4-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0d2454f0aef65ea81037759be5ca9947539667eecebca092733b2eb43c965a81"},
+    {file = "yarl-1.9.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:44d8ffbb9c06e5a7f529f38f53eda23e50d1ed33c6c869e01481d3fafa6b8142"},
+    {file = "yarl-1.9.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:aaaea1e536f98754a6e5c56091baa1b6ce2f2700cc4a00b0d49eca8dea471074"},
+    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3777ce5536d17989c91696db1d459574e9a9bd37660ea7ee4d3344579bb6f129"},
+    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9fc5fc1eeb029757349ad26bbc5880557389a03fa6ada41703db5e068881e5f2"},
+    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ea65804b5dc88dacd4a40279af0cdadcfe74b3e5b4c897aa0d81cf86927fee78"},
+    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aa102d6d280a5455ad6a0f9e6d769989638718e938a6a0a2ff3f4a7ff8c62cc4"},
+    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09efe4615ada057ba2d30df871d2f668af661e971dfeedf0c159927d48bbeff0"},
+    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:008d3e808d03ef28542372d01057fd09168419cdc8f848efe2804f894ae03e51"},
+    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:6f5cb257bc2ec58f437da2b37a8cd48f666db96d47b8a3115c29f316313654ff"},
+    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:992f18e0ea248ee03b5a6e8b3b4738850ae7dbb172cc41c966462801cbf62cf7"},
+    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:0e9d124c191d5b881060a9e5060627694c3bdd1fe24c5eecc8d5d7d0eb6faabc"},
+    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:3986b6f41ad22988e53d5778f91855dc0399b043fc8946d4f2e68af22ee9ff10"},
+    {file = "yarl-1.9.4-cp312-cp312-win32.whl", hash = "sha256:4b21516d181cd77ebd06ce160ef8cc2a5e9ad35fb1c5930882baff5ac865eee7"},
+    {file = "yarl-1.9.4-cp312-cp312-win_amd64.whl", hash = "sha256:a9bd00dc3bc395a662900f33f74feb3e757429e545d831eef5bb280252631984"},
+    {file = "yarl-1.9.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:63b20738b5aac74e239622d2fe30df4fca4942a86e31bf47a81a0e94c14df94f"},
+    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d7d7f7de27b8944f1fee2c26a88b4dabc2409d2fea7a9ed3df79b67277644e17"},
+    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c74018551e31269d56fab81a728f683667e7c28c04e807ba08f8c9e3bba32f14"},
+    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ca06675212f94e7a610e85ca36948bb8fc023e458dd6c63ef71abfd482481aa5"},
+    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aef935237d60a51a62b86249839b51345f47564208c6ee615ed2a40878dccdd"},
+    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2b134fd795e2322b7684155b7855cc99409d10b2e408056db2b93b51a52accc7"},
+    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d25039a474c4c72a5ad4b52495056f843a7ff07b632c1b92ea9043a3d9950f6e"},
+    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f7d6b36dd2e029b6bcb8a13cf19664c7b8e19ab3a58e0fefbb5b8461447ed5ec"},
+    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:957b4774373cf6f709359e5c8c4a0af9f6d7875db657adb0feaf8d6cb3c3964c"},
+    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:d7eeb6d22331e2fd42fce928a81c697c9ee2d51400bd1a28803965883e13cead"},
+    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:6a962e04b8f91f8c4e5917e518d17958e3bdee71fd1d8b88cdce74dd0ebbf434"},
+    {file = "yarl-1.9.4-cp37-cp37m-win32.whl", hash = "sha256:f3bc6af6e2b8f92eced34ef6a96ffb248e863af20ef4fde9448cc8c9b858b749"},
+    {file = "yarl-1.9.4-cp37-cp37m-win_amd64.whl", hash = "sha256:ad4d7a90a92e528aadf4965d685c17dacff3df282db1121136c382dc0b6014d2"},
+    {file = "yarl-1.9.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:ec61d826d80fc293ed46c9dd26995921e3a82146feacd952ef0757236fc137be"},
+    {file = "yarl-1.9.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8be9e837ea9113676e5754b43b940b50cce76d9ed7d2461df1af39a8ee674d9f"},
+    {file = "yarl-1.9.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:bef596fdaa8f26e3d66af846bbe77057237cb6e8efff8cd7cc8dff9a62278bbf"},
+    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d47552b6e52c3319fede1b60b3de120fe83bde9b7bddad11a69fb0af7db32f1"},
+    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:84fc30f71689d7fc9168b92788abc977dc8cefa806909565fc2951d02f6b7d57"},
+    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4aa9741085f635934f3a2583e16fcf62ba835719a8b2b28fb2917bb0537c1dfa"},
+    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:206a55215e6d05dbc6c98ce598a59e6fbd0c493e2de4ea6cc2f4934d5a18d130"},
+    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07574b007ee20e5c375a8fe4a0789fad26db905f9813be0f9fef5a68080de559"},
+    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:5a2e2433eb9344a163aced6a5f6c9222c0786e5a9e9cac2c89f0b28433f56e23"},
+    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6ad6d10ed9b67a382b45f29ea028f92d25bc0bc1daf6c5b801b90b5aa70fb9ec"},
+    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:6fe79f998a4052d79e1c30eeb7d6c1c1056ad33300f682465e1b4e9b5a188b78"},
+    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a825ec844298c791fd28ed14ed1bffc56a98d15b8c58a20e0e08c1f5f2bea1be"},
+    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8619d6915b3b0b34420cf9b2bb6d81ef59d984cb0fde7544e9ece32b4b3043c3"},
+    {file = "yarl-1.9.4-cp38-cp38-win32.whl", hash = "sha256:686a0c2f85f83463272ddffd4deb5e591c98aac1897d65e92319f729c320eece"},
+    {file = "yarl-1.9.4-cp38-cp38-win_amd64.whl", hash = "sha256:a00862fb23195b6b8322f7d781b0dc1d82cb3bcac346d1e38689370cc1cc398b"},
+    {file = "yarl-1.9.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:604f31d97fa493083ea21bd9b92c419012531c4e17ea6da0f65cacdcf5d0bd27"},
+    {file = "yarl-1.9.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8a854227cf581330ffa2c4824d96e52ee621dd571078a252c25e3a3b3d94a1b1"},
+    {file = "yarl-1.9.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ba6f52cbc7809cd8d74604cce9c14868306ae4aa0282016b641c661f981a6e91"},
+    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6327976c7c2f4ee6816eff196e25385ccc02cb81427952414a64811037bbc8b"},
+    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8397a3817d7dcdd14bb266283cd1d6fc7264a48c186b986f32e86d86d35fbac5"},
+    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e0381b4ce23ff92f8170080c97678040fc5b08da85e9e292292aba67fdac6c34"},
+    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:23d32a2594cb5d565d358a92e151315d1b2268bc10f4610d098f96b147370136"},
+    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ddb2a5c08a4eaaba605340fdee8fc08e406c56617566d9643ad8bf6852778fc7"},
+    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:26a1dc6285e03f3cc9e839a2da83bcbf31dcb0d004c72d0730e755b33466c30e"},
+    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:18580f672e44ce1238b82f7fb87d727c4a131f3a9d33a5e0e82b793362bf18b4"},
+    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:29e0f83f37610f173eb7e7b5562dd71467993495e568e708d99e9d1944f561ec"},
+    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:1f23e4fe1e8794f74b6027d7cf19dc25f8b63af1483d91d595d4a07eca1fb26c"},
+    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:db8e58b9d79200c76956cefd14d5c90af54416ff5353c5bfd7cbe58818e26ef0"},
+    {file = "yarl-1.9.4-cp39-cp39-win32.whl", hash = "sha256:c7224cab95645c7ab53791022ae77a4509472613e839dab722a72abe5a684575"},
+    {file = "yarl-1.9.4-cp39-cp39-win_amd64.whl", hash = "sha256:824d6c50492add5da9374875ce72db7a0733b29c2394890aef23d533106e2b15"},
+    {file = "yarl-1.9.4-py3-none-any.whl", hash = "sha256:928cecb0ef9d5a7946eb6ff58417ad2fe9375762382f1bf5c55e61645f2c43ad"},
+    {file = "yarl-1.9.4.tar.gz", hash = "sha256:566db86717cf8080b99b58b083b773a908ae40f06681e87e589a976faf8246bf"},
 ]
 
 [package.dependencies]
 idna = ">=2.0"
 multidict = ">=4.0"
-propcache = ">=0.2.0"
 
 [metadata]
-lock-version = "2.1"
+lock-version = "2.0"
 python-versions = ">=3.10,<3.13"
-content-hash = "3c9488709e61f3aa21ab47ceb9c677927ce770d8e1e327602a1a6afb09164475"
+content-hash = "81a35e932aea2fecab78f82f12cc8ab435cfcda5e1fe20acb42cb95542b4608f"

backend/pyproject.toml

@@ -16,7 +16,7 @@ include = [
 [tool.poetry.dependencies]
 python = ">=3.10,<3.13"
 
-aiohttp = "^3.10.11"
+aiohttp = "^3.9.5"
 aiohttp-jinja2 = "^1.5.1"
 aiohttp-cors = "^0.7.0"
 watchdog = "^4"

flake.nix

@@ -11,57 +11,47 @@
     };
   };
 
-  outputs =
-    {
-      self,
-      nixpkgs,
-      flake-utils,
-      poetry2nix,
-    }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
+  outputs = { self, nixpkgs, flake-utils, poetry2nix }:
+    flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
         p2n = (poetry2nix.lib.mkPoetry2Nix { inherit pkgs; });
-      in
-      {
-        devShells.default =
-          (p2n.mkPoetryEnv {
-            projectDir = self + "/backend";
-            # pyinstaller fails to compile so precompiled it is
-            overrides = p2n.overrides.withDefaults (
-              final: prev: {
-                pyinstaller = prev.pyinstaller.override { preferWheel = true; };
-                pyright = null;
-              }
-            );
-          }).env.overrideAttrs
-            (oldAttrs: {
-              shellHook = ''
-                PYTHONPATH=`which python`
-                FILE=.vscode/settings.json
-                if [ -f "$FILE" ]; then
-                  jq --arg pythonpath "$PYTHONPATH" '.["python.defaultInterpreterPath"] = $pythonpath' $FILE > "$FILE.tmp" && mv "$FILE.tmp" "$FILE"
-                else
-                  echo "{\"python.defaultInterpreterPath\": \"$PYTHONPATH\"}" > "$FILE"
-                fi
-              '';
-              UV_USE_IO_URING = 0; # work around node#48444
-              nativeBuildInputs = with pkgs; [
-                python311Packages.setuptools
-              ];
-              buildInputs = with pkgs; [
-                nodejs_22
-                nodePackages.pnpm
-                poetry
-                jq
-                # fixes local pyright not being able to see the pythonpath properly.
-                (pkgs.writeShellScriptBin "pyright" ''${pkgs.pyright}/bin/pyright --pythonpath `which python3` "$@" '')
-                (pkgs.writeShellScriptBin "pyright-langserver" ''${pkgs.pyright}/bin/pyright-langserver --pythonpath `which python3` "$@" '')
-                (pkgs.writeShellScriptBin "pyright-python" ''${pkgs.pyright}/bin/pyright-python --pythonpath `which python3` "$@" '')
-                (pkgs.writeShellScriptBin "pyright-python-langserver" ''${pkgs.pyright}/bin/pyright-python-langserver --pythonpath `which python3` "$@" '')
-              ];
-            });
-      }
-    );
+      in {
+        devShells.default = (p2n.mkPoetryEnv {
+          projectDir = self + "/backend";
+          # pyinstaller fails to compile so precompiled it is
+          overrides = p2n.overrides.withDefaults (final: prev: {
+            pyinstaller = prev.pyinstaller.override { preferWheel = true; };
+            pyright = null;
+          });
+        }).env.overrideAttrs (oldAttrs: {
+          shellHook = ''
+            PYTHONPATH=`which python`
+            FILE=.vscode/settings.json
+            if [ -f "$FILE" ]; then
+              jq --arg pythonpath "$PYTHONPATH" '.["python.defaultInterpreterPath"] = $pythonpath' $FILE > "$FILE.tmp" && mv "$FILE.tmp" "$FILE"
+            else
+              echo "{\"python.defaultInterpreterPath\": \"$PYTHONPATH\"}" > "$FILE"
+            fi
+          '';
+          UV_USE_IO_URING = 0; # work around node#48444
+          buildInputs = with pkgs; [
+            nodejs_22
+            nodePackages.pnpm
+            poetry
+            jq
+            electron_30-bin
+            killall
+            # fixes local pyright not being able to see the pythonpath properly.
+            (pkgs.writeShellScriptBin "pyright" ''
+              ${pkgs.pyright}/bin/pyright --pythonpath `which python3` "$@" '')
+            (pkgs.writeShellScriptBin "pyright-langserver" ''
+              ${pkgs.pyright}/bin/pyright-langserver --pythonpath `which python3` "$@" '')
+            (pkgs.writeShellScriptBin "pyright-python" ''
+              ${pkgs.pyright}/bin/pyright-python --pythonpath `which python3` "$@" '')
+            (pkgs.writeShellScriptBin "pyright-python-langserver" ''
+              ${pkgs.pyright}/bin/pyright-python-langserver --pythonpath `which python3` "$@" '')
+          ];
+        });
+      });
 }

frontend/.prettierrc.js

@@ -7,4 +7,4 @@ export default {
   tabWidth: 2,
   endOfLine: 'auto',
   plugins: [importSort],
-};
+}

frontend/package.json

@@ -10,7 +10,8 @@
     "lint": "prettier -c src",
     "typecheck": "tsc --noEmit",
     "format": "prettier -c src -w",
-    "localize": "i18next"
+    "localize": "i18next",
+    "react-devtools": "electron node_modules/react-devtools/app"
   },
   "devDependencies": {
     "@decky/api": "^1.1.1",
@@ -31,8 +32,9 @@
     "prettier": "^3.3.2",
     "prettier-plugin-import-sort": "^0.0.7",
     "react": "18.3.1",
+    "react-devtools": "^6.0.0",
     "react-dom": "18.3.1",
-    "rollup": "^4.22.4",
+    "rollup": "^4.18.0",
     "rollup-plugin-delete": "^2.0.0",
     "rollup-plugin-external-globals": "^0.10.0",
     "rollup-plugin-polyfill-node": "^0.13.0",
@@ -47,7 +49,7 @@
     }
   },
   "dependencies": {
-    "@decky/ui": "^4.10.2",
+    "@decky/ui": "^4.8.1",
     "compare-versions": "^6.1.1",
     "filesize": "^10.1.2",
     "i18next": "^23.11.5",

frontend/src/components/DeckyDesktopSidebar.tsx

@@ -0,0 +1,72 @@
+import { FC, useEffect, useRef, useState } from 'react';
+
+import { useDeckyState } from './DeckyState';
+import PluginView from './PluginView';
+import { QuickAccessVisibleState } from './QuickAccessVisibleState';
+
+const DeckyDesktopSidebar: FC = () => {
+  const { desktopMenuOpen, setDesktopMenuOpen } = useDeckyState();
+  const [closed, setClosed] = useState<boolean>(!desktopMenuOpen);
+  const [openAnimStart, setOpenAnimStart] = useState<boolean>(desktopMenuOpen);
+  const closedInterval = useRef<number | null>(null);
+
+  useEffect(() => {
+    const anim = requestAnimationFrame(() => setOpenAnimStart(desktopMenuOpen));
+    return () => cancelAnimationFrame(anim);
+  }, [desktopMenuOpen]);
+
+  useEffect(() => {
+    closedInterval.current && clearTimeout(closedInterval.current);
+    if (desktopMenuOpen) {
+      setClosed(false);
+    } else {
+      closedInterval.current = setTimeout(() => setClosed(true), 500);
+    }
+  }, [desktopMenuOpen]);
+  return (
+    <>
+      <div
+        className="deckyDesktopSidebarDim"
+        style={{
+          position: 'absolute',
+          height: 'calc(100% - 78px - 50px)',
+          width: '100%',
+          top: '78px',
+          left: '0px',
+          zIndex: 998,
+          background: 'rgba(0, 0, 0, 0.7)',
+          opacity: openAnimStart ? 1 : 0,
+          display: desktopMenuOpen || !closed ? 'flex' : 'none',
+          transition: 'opacity 0.4s cubic-bezier(0.65, 0, 0.35, 1)',
+        }}
+        onClick={() => setDesktopMenuOpen(false)}
+      />
+
+      <div
+        className="deckyDesktopSidebar"
+        style={{
+          position: 'absolute',
+          height: 'calc(100% - 78px - 50px)',
+          width: '350px',
+          paddingLeft: '16px',
+          top: '78px',
+          right: '0px',
+          zIndex: 999,
+          transition: 'transform 0.4s cubic-bezier(0.65, 0, 0.35, 1)',
+          transform: openAnimStart ? 'translateX(0px)' : 'translateX(366px)',
+          overflowY: 'scroll',
+          // prevents chromium border jank
+          display: desktopMenuOpen || !closed ? 'flex' : 'none',
+          flexDirection: 'column',
+          background: '#171d25',
+        }}
+      >
+        <QuickAccessVisibleState.Provider value={desktopMenuOpen || !closed}>
+          <PluginView desktop={true} />
+        </QuickAccessVisibleState.Provider>
+      </div>
+    </>
+  );
+};
+
+export default DeckyDesktopSidebar;

frontend/src/components/DeckyDesktopUI.tsx

@@ -0,0 +1,44 @@
+import { CSSProperties, FC } from 'react';
+
+import DeckyDesktopSidebar from './DeckyDesktopSidebar';
+import DeckyIcon from './DeckyIcon';
+import { useDeckyState } from './DeckyState';
+
+const DeckyDesktopUI: FC = () => {
+  const { desktopMenuOpen, setDesktopMenuOpen } = useDeckyState();
+  return (
+    <>
+      <style>
+        {`
+            .deckyDesktopIcon {
+                color: #67707b;
+            }
+            .deckyDesktopIcon:hover {
+                color: #fff;
+            }
+            `}
+      </style>
+      <DeckyIcon
+        className="deckyDesktopIcon"
+        width={24}
+        height={24}
+        onClick={() => setDesktopMenuOpen(!desktopMenuOpen)}
+        style={
+          {
+            position: 'absolute',
+            top: '36px', // nav text is 34px but 36px looks nicer to me
+            right: '10px', // <- is 16px but 10px looks nicer to me
+            width: '24px',
+            height: '24px',
+            cursor: 'pointer',
+            transition: 'color 0.3s linear',
+            '-webkit-app-region': 'no-drag',
+          } as CSSProperties
+        }
+      />
+      <DeckyDesktopSidebar />
+    </>
+  );
+};
+
+export default DeckyDesktopUI;

frontend/src/components/DeckyErrorBoundary.tsx

@@ -4,8 +4,6 @@ import { FunctionComponent, useEffect, useReducer, useState } from 'react';
 import { uninstallPlugin } from '../plugin';
 import { VerInfo, doRestart, doShutdown } from '../updater';
 import { ValveReactErrorInfo, getLikelyErrorSourceFromValveReactError } from '../utils/errors';
-import { useSetting } from '../utils/hooks/useSetting';
-import { UpdateBranch } from './settings/pages/general/BranchSelect';
 
 interface DeckyErrorBoundaryProps {
   error: ValveReactErrorInfo;
@@ -39,27 +37,6 @@ const DeckyErrorBoundary: FunctionComponent<DeckyErrorBoundaryProps> = ({ error,
     if (!shouldReportToValve) DeckyPluginLoader.errorBoundaryHook.temporarilyDisableReporting();
     DeckyPluginLoader.updateVersion().then(setVersionInfo);
   }, []);
-
-  const [selectedBranch, setSelectedBranch] = useSetting<UpdateBranch>('branch', UpdateBranch.Stable);
-  const [isChecking, setIsChecking] = useState<boolean>(false);
-  const [updateProgress, setUpdateProgress] = useState<number>(-1);
-  const [versionToUpdateTo, setSetVersionToUpdateTo] = useState<string>('');
-
-  useEffect(() => {
-    const a = DeckyBackend.addEventListener('updater/update_download_percentage', (percentage) => {
-      setUpdateProgress(percentage);
-    });
-
-    const b = DeckyBackend.addEventListener('updater/finish_download', () => {
-      setUpdateProgress(-2);
-    });
-
-    return () => {
-      DeckyBackend.removeEventListener('updater/update_download_percentage', a);
-      DeckyBackend.removeEventListener('updater/finish_download', b);
-    };
-  }, []);
-
   return (
     <>
       <style>
@@ -172,65 +149,6 @@ const DeckyErrorBoundary: FunctionComponent<DeckyErrorBoundaryProps> = ({ error,
                 </button>
               </div>
             )}
-            {
-              <div style={{ display: 'block', marginBottom: '5px' }}>
-                {updateProgress > -1
-                  ? 'Update in progress... ' + updateProgress + '%'
-                  : updateProgress == -2
-                    ? 'Update complete. Restarting...'
-                    : 'Changing your Decky Loader branch and/or \n checking for updates might help!\n'}
-                {updateProgress == -1 && (
-                  <div style={{ height: '30px' }}>
-                    <select
-                      style={{ height: '100%' }}
-                      onChange={async (e) => {
-                        const branch = parseInt(e.target.value);
-                        setSelectedBranch(branch);
-                        setSetVersionToUpdateTo('');
-                      }}
-                    >
-                      <option value="0" selected={selectedBranch == UpdateBranch.Stable}>
-                        Stable
-                      </option>
-                      <option value="1" selected={selectedBranch == UpdateBranch.Prerelease}>
-                        Pre-Release
-                      </option>
-                      <option value="2" selected={selectedBranch == UpdateBranch.Testing}>
-                        Testing
-                      </option>
-                    </select>
-                    <button
-                      style={{ height: '100%' }}
-                      disabled={updateProgress != -1 || isChecking}
-                      onClick={async () => {
-                        if (versionToUpdateTo == '') {
-                          setIsChecking(true);
-                          const versionInfo = (await DeckyBackend.callable(
-                            'updater/check_for_updates',
-                          )()) as unknown as VerInfo;
-                          setIsChecking(false);
-                          if (versionInfo?.remote && versionInfo?.remote?.tag_name != versionInfo?.current) {
-                            setSetVersionToUpdateTo(versionInfo.remote.tag_name);
-                          } else {
-                            setSetVersionToUpdateTo('');
-                          }
-                        } else {
-                          DeckyBackend.callable('updater/do_update')();
-                          setUpdateProgress(0);
-                        }
-                      }}
-                    >
-                      {' '}
-                      {isChecking
-                        ? 'Checking for updates...'
-                        : versionToUpdateTo != ''
-                          ? 'Update to ' + versionToUpdateTo
-                          : 'Check for updates'}
-                    </button>
-                  </div>
-                )}
-              </div>
-            }
             {wasCausedByPlugin && (
               <div style={{ display: 'block', marginBottom: '5px' }}>
                 {'\n'}

frontend/src/components/DeckyGlobalComponentsState.tsx

@@ -1,12 +1,17 @@
 import { FC, ReactNode, createContext, useContext, useEffect, useState } from 'react';
 
+import { UIMode } from '../enums';
+
 interface PublicDeckyGlobalComponentsState {
-  components: Map<string, FC>;
+  components: Map<UIMode, Map<string, FC>>;
 }
 
 export class DeckyGlobalComponentsState {
   // TODO a set would be better
-  private _components = new Map<string, FC>();
+  private _components = new Map<UIMode, Map<string, FC>>([
+    [UIMode.BigPicture, new Map()],
+    [UIMode.Desktop, new Map()],
+  ]);
 
   public eventBus = new EventTarget();
 
@@ -14,13 +19,19 @@ export class DeckyGlobalComponentsState {
     return { components: this._components };
   }
 
-  addComponent(path: string, component: FC) {
-    this._components.set(path, component);
+  addComponent(path: string, component: FC, uiMode: UIMode) {
+    const components = this._components.get(uiMode);
+    if (!components) throw new Error(`UI mode ${uiMode} not supported.`);
+
+    components.set(path, component);
     this.notifyUpdate();
   }
 
-  removeComponent(path: string) {
-    this._components.delete(path);
+  removeComponent(path: string, uiMode: UIMode) {
+    const components = this._components.get(uiMode);
+    if (!components) throw new Error(`UI mode ${uiMode} not supported.`);
+
+    components.delete(path);
     this.notifyUpdate();
   }
 
@@ -30,8 +41,8 @@ export class DeckyGlobalComponentsState {
 }
 
 interface DeckyGlobalComponentsContext extends PublicDeckyGlobalComponentsState {
-  addComponent(path: string, component: FC): void;
-  removeComponent(path: string): void;
+  addComponent(path: string, component: FC, uiMode: UIMode): void;
+  removeComponent(path: string, uiMode: UIMode): void;
 }
 
 const DeckyGlobalComponentsContext = createContext<DeckyGlobalComponentsContext>(null as any);

frontend/src/components/DeckyRouterState.tsx

@@ -1,6 +1,8 @@
 import { ComponentType, FC, ReactNode, createContext, useContext, useEffect, useState } from 'react';
 import type { RouteProps } from 'react-router';
 
+import { UIMode } from '../enums';
+
 export interface RouterEntry {
   props: Omit<RouteProps, 'path' | 'children'>;
   component: ComponentType;
@@ -10,12 +12,16 @@ export type RoutePatch = (route: RouteProps) => RouteProps;
 
 interface PublicDeckyRouterState {
   routes: Map<string, RouterEntry>;
-  routePatches: Map<string, Set<RoutePatch>>;
+  routePatches: Map<UIMode, Map<string, Set<RoutePatch>>>;
 }
 
 export class DeckyRouterState {
   private _routes = new Map<string, RouterEntry>();
-  private _routePatches = new Map<string, Set<RoutePatch>>();
+  // Update when support for new UIModes is added
+  private _routePatches = new Map<UIMode, Map<string, Set<RoutePatch>>>([
+    [UIMode.BigPicture, new Map()],
+    [UIMode.Desktop, new Map()],
+  ]);
 
   public eventBus = new EventTarget();
 
@@ -28,22 +34,26 @@ export class DeckyRouterState {
     this.notifyUpdate();
   }
 
-  addPatch(path: string, patch: RoutePatch) {
-    let patchList = this._routePatches.get(path);
+  addPatch(path: string, patch: RoutePatch, uiMode: UIMode) {
+    const patchesForMode = this._routePatches.get(uiMode);
+    if (!patchesForMode) throw new Error(`UI mode ${uiMode} not supported.`);
+    let patchList = patchesForMode.get(path);
     if (!patchList) {
       patchList = new Set();
-      this._routePatches.set(path, patchList);
+      patchesForMode.set(path, patchList);
     }
     patchList.add(patch);
     this.notifyUpdate();
     return patch;
   }
 
-  removePatch(path: string, patch: RoutePatch) {
-    const patchList = this._routePatches.get(path);
+  removePatch(path: string, patch: RoutePatch, uiMode: UIMode) {
+    const patchesForMode = this._routePatches.get(uiMode);
+    if (!patchesForMode) throw new Error(`UI mode ${uiMode} not supported.`);
+    const patchList = patchesForMode.get(path);
     patchList?.delete(patch);
     if (patchList?.size == 0) {
-      this._routePatches.delete(path);
+      patchesForMode.delete(path);
     }
     this.notifyUpdate();
   }
@@ -60,8 +70,8 @@ export class DeckyRouterState {
 
 interface DeckyRouterStateContext extends PublicDeckyRouterState {
   addRoute(path: string, component: RouterEntry['component'], props: RouterEntry['props']): void;
-  addPatch(path: string, patch: RoutePatch): RoutePatch;
-  removePatch(path: string, patch: RoutePatch): void;
+  addPatch(path: string, patch: RoutePatch, uiMode?: UIMode): RoutePatch;
+  removePatch(path: string, patch: RoutePatch, uiMode?: UIMode): void;
   removeRoute(path: string): void;
 }
 

frontend/src/components/DeckyState.tsx

@@ -17,6 +17,7 @@ interface PublicDeckyState {
   versionInfo: VerInfo | null;
   notificationSettings: NotificationSettings;
   userInfo: UserInfo | null;
+  desktopMenuOpen: boolean;
 }
 
 export interface UserInfo {
@@ -36,6 +37,7 @@ export class DeckyState {
   private _versionInfo: VerInfo | null = null;
   private _notificationSettings = DEFAULT_NOTIFICATION_SETTINGS;
   private _userInfo: UserInfo | null = null;
+  private _desktopMenuOpen: boolean = false;
 
   public eventBus = new EventTarget();
 
@@ -52,6 +54,7 @@ export class DeckyState {
       versionInfo: this._versionInfo,
       notificationSettings: this._notificationSettings,
       userInfo: this._userInfo,
+      desktopMenuOpen: this._desktopMenuOpen,
     };
   }
 
@@ -115,6 +118,11 @@ export class DeckyState {
     this.notifyUpdate();
   }
 
+  setDesktopMenuOpen(open: boolean) {
+    this._desktopMenuOpen = open;
+    this.notifyUpdate();
+  }
+
   private notifyUpdate() {
     this.eventBus.dispatchEvent(new Event('update'));
   }
@@ -126,19 +134,12 @@ interface DeckyStateContext extends PublicDeckyState {
   setActivePlugin(name: string): void;
   setPluginOrder(pluginOrder: string[]): void;
   closeActivePlugin(): void;
+  setDesktopMenuOpen(open: boolean): void;
 }
 
-const DeckyStateContext = createContext<DeckyStateContext | null>(null);
+const DeckyStateContext = createContext<DeckyStateContext>(null as any);
 
-export const useDeckyState = () => {
-  const deckyState = useContext(DeckyStateContext);
-
-  if (deckyState === null) {
-    throw new Error('useDeckyState needs a parent DeckyStateContext');
-  }
-
-  return deckyState;
-};
+export const useDeckyState = () => useContext(DeckyStateContext);
 
 interface Props {
   deckyState: DeckyState;
@@ -163,6 +164,7 @@ export const DeckyStateContextProvider: FC<Props> = ({ children, deckyState }) =
   const setActivePlugin = deckyState.setActivePlugin.bind(deckyState);
   const closeActivePlugin = deckyState.closeActivePlugin.bind(deckyState);
   const setPluginOrder = deckyState.setPluginOrder.bind(deckyState);
+  const setDesktopMenuOpen = deckyState.setDesktopMenuOpen.bind(deckyState);
 
   return (
     <DeckyStateContext.Provider
@@ -173,6 +175,7 @@ export const DeckyStateContextProvider: FC<Props> = ({ children, deckyState }) =
         setActivePlugin,
         closeActivePlugin,
         setPluginOrder,
+        setDesktopMenuOpen,
       }}
     >
       {children}

frontend/src/components/Markdown.tsx

@@ -1,4 +1,4 @@
-import { Focusable, Navigation, findClass, findClassByName } from '@decky/ui';
+import { Focusable, Navigation } from '@decky/ui';
 import { FunctionComponent, useRef } from 'react';
 import ReactMarkdown, { Options as ReactMarkdownOptions } from 'react-markdown';
 import remarkGfm from 'remark-gfm';
@@ -8,9 +8,6 @@ interface MarkdownProps extends ReactMarkdownOptions {
 }
 
 const Markdown: FunctionComponent<MarkdownProps> = (props) => {
-  const eventDetailsBodyClassName = findClassByName('EventDetailsBody') || undefined;
-  const eventLinkClassName = findClass('43088', 'Link');
-
   return (
     <Focusable>
       <ReactMarkdown
@@ -27,11 +24,14 @@ const Markdown: FunctionComponent<MarkdownProps> = (props) => {
                   props.onDismiss?.();
                   Navigation.NavigateToExternalWeb(aRef.current!.href);
                 }}
+                onClick={(e) => {
+                  e.preventDefault();
+                  props.onDismiss?.();
+                  Navigation.NavigateToExternalWeb(aRef.current!.href);
+                }}
                 style={{ display: 'inline' }}
-                focusClassName="steam-focus"
-                className={eventDetailsBodyClassName}
               >
-                <a ref={aRef} {...nodeProps.node.properties} className={eventLinkClassName}>
+                <a ref={aRef} {...nodeProps.node.properties}>
                   {nodeProps.children}
                 </a>
               </Focusable>

frontend/src/components/PluginView.tsx

@@ -1,32 +1,37 @@
 import { ButtonItem, ErrorBoundary, Focusable, PanelSection, PanelSectionRow } from '@decky/ui';
-import { FC, useMemo } from 'react';
+import { FC, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { FaEyeSlash } from 'react-icons/fa';
 
+import { Plugin } from '../plugin';
 import { useDeckyState } from './DeckyState';
 import NotificationBadge from './NotificationBadge';
 import { useQuickAccessVisible } from './QuickAccessVisibleState';
 import TitleView from './TitleView';
 
-const PluginView: FC = () => {
-  const { plugins, hiddenPlugins, updates, activePlugin, pluginOrder, setActivePlugin, closeActivePlugin } =
-    useDeckyState();
+interface PluginViewProps {
+  desktop?: boolean;
+}
+
+const PluginView: FC<PluginViewProps> = ({ desktop = false }) => {
+  const { hiddenPlugins } = useDeckyState();
+  const { plugins, updates, activePlugin, pluginOrder, setActivePlugin, closeActivePlugin } = useDeckyState();
   const visible = useQuickAccessVisible();
   const { t } = useTranslation();
 
-  const pluginList = useMemo(() => {
-    console.log('updating PluginView after changes');
+  const [pluginList, setPluginList] = useState<Plugin[]>(
+    plugins.sort((a, b) => pluginOrder.indexOf(a.name) - pluginOrder.indexOf(b.name)),
+  );
 
-    return [...plugins]
-      .sort((a, b) => pluginOrder.indexOf(a.name) - pluginOrder.indexOf(b.name))
-      .filter((p) => p.content)
-      .filter(({ name }) => !hiddenPlugins.includes(name));
+  useEffect(() => {
+    setPluginList(plugins.sort((a, b) => pluginOrder.indexOf(a.name) - pluginOrder.indexOf(b.name)));
+    console.log('updating PluginView after changes');
   }, [plugins, pluginOrder]);
 
   if (activePlugin) {
     return (
       <Focusable onCancelButton={closeActivePlugin}>
-        <TitleView />
+        <TitleView desktop={desktop} />
         <div style={{ height: '100%', paddingTop: '16px' }}>
           <ErrorBoundary>{(visible || activePlugin.alwaysRender) && activePlugin.content}</ErrorBoundary>
         </div>
@@ -35,24 +40,27 @@ const PluginView: FC = () => {
   }
   return (
     <>
-      <TitleView />
+      <TitleView desktop={desktop} />
       <div
         style={{
           paddingTop: '16px',
         }}
       >
         <PanelSection>
-          {pluginList.map(({ name, icon }) => (
-            <PanelSectionRow key={name}>
-              <ButtonItem layout="below" onClick={() => setActivePlugin(name)}>
-                <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
-                  {icon}
-                  <div>{name}</div>
-                  <NotificationBadge show={updates?.has(name)} style={{ top: '-5px', right: '-5px' }} />
-                </div>
-              </ButtonItem>
-            </PanelSectionRow>
-          ))}
+          {pluginList
+            .filter((p) => p.content)
+            .filter(({ name }) => !hiddenPlugins.includes(name))
+            .map(({ name, icon }) => (
+              <PanelSectionRow key={name}>
+                <ButtonItem layout="below" onClick={() => setActivePlugin(name)}>
+                  <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
+                    {icon}
+                    <div>{name}</div>
+                    <NotificationBadge show={updates?.has(name)} style={{ top: '-5px', right: '-5px' }} />
+                  </div>
+                </ButtonItem>
+              </PanelSectionRow>
+            ))}
           {hiddenPlugins.length > 0 && (
             <div style={{ display: 'flex', alignItems: 'center', gap: '10px', fontSize: '0.8rem', marginTop: '10px' }}>
               <FaEyeSlash />

frontend/src/components/QuickAccessVisibleState.tsx

@@ -1,6 +1,6 @@
 import { FC, ReactNode, createContext, useContext, useState } from 'react';
 
-const QuickAccessVisibleState = createContext<boolean>(false);
+export const QuickAccessVisibleState = createContext<boolean>(false);
 
 export const useQuickAccessVisible = () => useContext(QuickAccessVisibleState);
 

frontend/src/components/TitleView.tsx

@@ -14,18 +14,34 @@ const titleStyles: CSSProperties = {
   top: '0px',
 };
 
-const TitleView: FC = () => {
-  const { activePlugin, closeActivePlugin } = useDeckyState();
+interface TitleViewProps {
+  desktop?: boolean;
+}
+
+const TitleView: FC<TitleViewProps> = ({ desktop }) => {
+  const { activePlugin, closeActivePlugin, setDesktopMenuOpen } = useDeckyState();
   const { t } = useTranslation();
 
   const onSettingsClick = () => {
     Navigation.Navigate('/decky/settings');
     Navigation.CloseSideMenus();
+    setDesktopMenuOpen(false);
   };
 
   const onStoreClick = () => {
     Navigation.Navigate('/decky/store');
     Navigation.CloseSideMenus();
+    setDesktopMenuOpen(false);
+  };
+
+  const buttonStyles = {
+    height: '28px',
+    width: '40px',
+    minWidth: 0,
+    padding: desktop ? '' : '10px 12px',
+    display: 'flex',
+    alignItems: desktop ? 'center' : '',
+    justifyContent: desktop ? 'center' : '',
   };
 
   if (activePlugin === null) {
@@ -33,14 +49,14 @@ const TitleView: FC = () => {
       <Focusable style={titleStyles} className={staticClasses.Title}>
         <div style={{ marginRight: 'auto', flex: 0.9 }}>Decky</div>
         <DialogButton
-          style={{ height: '28px', width: '40px', minWidth: 0, padding: '10px 12px' }}
+          style={buttonStyles}
           onClick={onStoreClick}
           onOKActionDescription={t('TitleView.decky_store_desc')}
         >
           <FaStore style={{ marginTop: '-4px', display: 'block' }} />
         </DialogButton>
         <DialogButton
-          style={{ height: '28px', width: '40px', minWidth: 0, padding: '10px 12px' }}
+          style={buttonStyles}
           onClick={onSettingsClick}
           onOKActionDescription={t('TitleView.settings_desc')}
         >
@@ -52,10 +68,7 @@ const TitleView: FC = () => {
 
   return (
     <Focusable className={staticClasses.Title} style={titleStyles}>
-      <DialogButton
-        style={{ height: '28px', width: '40px', minWidth: 0, padding: '10px 12px' }}
-        onClick={closeActivePlugin}
-      >
+      <DialogButton style={buttonStyles} onClick={closeActivePlugin}>
         <FaArrowLeft style={{ marginTop: '-4px', display: 'block' }} />
       </DialogButton>
       {activePlugin?.titleView || <div style={{ flex: 0.9 }}>{activePlugin.name}</div>}

frontend/src/components/modals/MultiplePluginsInstallModal.tsx

@@ -3,7 +3,7 @@ import { FC, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { FaCheck, FaDownload } from 'react-icons/fa';
 
-import { InstallType, InstallTypeTranslationMapping } from '../../plugin';
+import { InstallType } from '../../plugin';
 
 interface MultiplePluginsInstallModalProps {
   requests: { name: string; version: string; hash: string; install_type: InstallType }[];
@@ -12,7 +12,13 @@ interface MultiplePluginsInstallModalProps {
   closeModal?(): void;
 }
 
-// IMPORTANT! Keep in sync with `t(...)` comments below
+// values are the JSON keys used in the translation file
+const InstallTypeTranslationMapping = {
+  [InstallType.INSTALL]: 'install',
+  [InstallType.REINSTALL]: 'reinstall',
+  [InstallType.UPDATE]: 'update',
+} as const satisfies Record<InstallType, string>;
+
 type TitleTranslationMapping = 'mixed' | (typeof InstallTypeTranslationMapping)[InstallType];
 
 const MultiplePluginsInstallModal: FC<MultiplePluginsInstallModalProps> = ({
@@ -64,8 +70,6 @@ const MultiplePluginsInstallModal: FC<MultiplePluginsInstallModalProps> = ({
     if (requests.every(({ install_type }) => install_type === InstallType.INSTALL)) return 'install';
     if (requests.every(({ install_type }) => install_type === InstallType.REINSTALL)) return 'reinstall';
     if (requests.every(({ install_type }) => install_type === InstallType.UPDATE)) return 'update';
-    if (requests.every(({ install_type }) => install_type === InstallType.DOWNGRADE)) return 'downgrade';
-    if (requests.every(({ install_type }) => install_type === InstallType.OVERWRITE)) return 'overwrite';
     return 'mixed';
   }, [requests]);
 
@@ -76,41 +80,23 @@ const MultiplePluginsInstallModal: FC<MultiplePluginsInstallModalProps> = ({
       onOK={async () => {
         setLoading(true);
         await onOK();
-        setTimeout(() => Navigation.OpenQuickAccessMenu(QuickAccessTab.Decky), 250);
+        setTimeout(() => {
+          Navigation.OpenQuickAccessMenu(QuickAccessTab.Decky);
+          DeckyPluginLoader.setDesktopMenuOpen(true);
+        }, 250);
         setTimeout(() => DeckyPluginLoader.checkPluginUpdates(), 1000);
       }}
       onCancel={async () => {
         await onCancel();
       }}
-      strTitle={
-        <div>
-          {
-            // IMPORTANT! These comments are not cosmetic and are needed for `extracttext` task to work
-            // t('MultiplePluginsInstallModal.title.install', { count: n })
-            // t('MultiplePluginsInstallModal.title.reinstall', { count: n })
-            // t('MultiplePluginsInstallModal.title.update', { count: n })
-            // t('MultiplePluginsInstallModal.title.downgrade', { count: n })
-            // t('MultiplePluginsInstallModal.title.overwrite', { count: n })
-            // t('MultiplePluginsInstallModal.title.mixed', { count: n })
-            t(`MultiplePluginsInstallModal.title.${installTypeGrouped}`, { count: requests.length })
-          }
-        </div>
-      }
-      strOKButtonText={
-        loading ? t('MultiplePluginsInstallModal.ok_button.loading') : t('MultiplePluginsInstallModal.ok_button.idle')
-      }
+      strTitle={<div>{t(`MultiplePluginsInstallModal.title.${installTypeGrouped}`, { count: requests.length })}</div>}
+      strOKButtonText={t(`MultiplePluginsInstallModal.ok_button.${loading ? 'loading' : 'idle'}`)}
     >
       <div>
         {t('MultiplePluginsInstallModal.confirm')}
         <ul style={{ listStyle: 'none', display: 'flex', flexDirection: 'column', gap: '4px' }}>
           {requests.map(({ name, version, install_type, hash }, i) => {
             const installTypeStr = InstallTypeTranslationMapping[install_type];
-            // IMPORTANT! These comments are not cosmetic and are needed for `extracttext` task to work
-            // t('MultiplePluginsInstallModal.description.install')
-            // t('MultiplePluginsInstallModal.description.reinstall')
-            // t('MultiplePluginsInstallModal.description.update')
-            // t('MultiplePluginsInstallModal.description.downgrade')
-            // t('MultiplePluginsInstallModal.description.overwrite')
             const description = t(`MultiplePluginsInstallModal.description.${installTypeStr}`, {
               name,
               version,

frontend/src/components/modals/PluginInstallModal.tsx

@@ -2,13 +2,13 @@ import { ConfirmModal, Navigation, ProgressBarWithInfo, QuickAccessTab } from '@
 import { FC, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { InstallType, InstallTypeTranslationMapping } from '../../plugin';
+import TranslationHelper, { TranslationClass } from '../../utils/TranslationHelper';
 
 interface PluginInstallModalProps {
   artifact: string;
   version: string;
   hash: string;
-  installType: InstallType;
+  installType: number;
   onOK(): void;
   onCancel(): void;
   closeModal?(): void;
@@ -44,8 +44,6 @@ const PluginInstallModal: FC<PluginInstallModalProps> = ({
     };
   }, []);
 
-  const installTypeTranslationKey = InstallTypeTranslationMapping[installType];
-
   return (
     <ConfirmModal
       bOKDisabled={loading}
@@ -53,7 +51,10 @@ const PluginInstallModal: FC<PluginInstallModalProps> = ({
       onOK={async () => {
         setLoading(true);
         await onOK();
-        setTimeout(() => Navigation.OpenQuickAccessMenu(QuickAccessTab.Decky), 250);
+        setTimeout(() => {
+          Navigation.OpenQuickAccessMenu(QuickAccessTab.Decky);
+          DeckyPluginLoader.setDesktopMenuOpen(true);
+        }, 250);
         setTimeout(() => DeckyPluginLoader.checkPluginUpdates(), 1000);
       }}
       onCancel={async () => {
@@ -61,15 +62,12 @@ const PluginInstallModal: FC<PluginInstallModalProps> = ({
       }}
       strTitle={
         <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', width: '100%' }}>
-          {
-            // IMPORTANT! These comments are not cosmetic and are needed for `extracttext` task to work
-            // t('PluginInstallModal.install.title')
-            // t('PluginInstallModal.reinstall.title')
-            // t('PluginInstallModal.update.title')
-            // t('PluginInstallModal.downgrade.title')
-            // t('PluginInstallModal.overwrite.title')
-            t(`PluginInstallModal.${installTypeTranslationKey}.title`, { artifact: artifact })
-          }
+          <TranslationHelper
+            transClass={TranslationClass.PLUGIN_INSTALL_MODAL}
+            transText="title"
+            i18nArgs={{ artifact: artifact }}
+            installType={installType}
+          />
           {loading && (
             <div style={{ marginLeft: 'auto' }}>
               <ProgressBarWithInfo
@@ -85,44 +83,33 @@ const PluginInstallModal: FC<PluginInstallModalProps> = ({
       strOKButtonText={
         loading ? (
           <div>
-            {
-              // IMPORTANT! These comments are not cosmetic and are needed for `extracttext` task to work
-              // t('PluginInstallModal.install.button_processing')
-              // t('PluginInstallModal.reinstall.button_processing')
-              // t('PluginInstallModal.update.button_processing')
-              // t('PluginInstallModal.downgrade.button_processing')
-              // t('PluginInstallModal.overwrite.button_processing')
-              t(`PluginInstallModal.${installTypeTranslationKey}.button_processing`)
-            }
+            <TranslationHelper
+              transClass={TranslationClass.PLUGIN_INSTALL_MODAL}
+              transText="button_processing"
+              installType={installType}
+            />
           </div>
         ) : (
           <div>
-            {
-              // IMPORTANT! These comments are not cosmetic and are needed for `extracttext` task to work
-              // t('PluginInstallModal.install.button_idle')
-              // t('PluginInstallModal.reinstall.button_idle')
-              // t('PluginInstallModal.update.button_idle')
-              // t('PluginInstallModal.downgrade.button_idle')
-              // t('PluginInstallModal.overwrite.button_idle')
-              t(`PluginInstallModal.${installTypeTranslationKey}.button_idle`)
-            }
+            <TranslationHelper
+              transClass={TranslationClass.PLUGIN_INSTALL_MODAL}
+              transText="button_idle"
+              installType={installType}
+            />
           </div>
         )
       }
     >
       <div>
-        {
-          // IMPORTANT! These comments are not cosmetic and are needed for `extracttext` task to work
-          // t('PluginInstallModal.install.desc')
-          // t('PluginInstallModal.reinstall.desc')
-          // t('PluginInstallModal.update.desc')
-          // t('PluginInstallModal.downgrade.desc')
-          // t('PluginInstallModal.overwrite.desc')
-          t(`PluginInstallModal.${installTypeTranslationKey}.desc`, {
+        <TranslationHelper
+          transClass={TranslationClass.PLUGIN_INSTALL_MODAL}
+          transText="desc"
+          i18nArgs={{
             artifact: artifact,
             version: version,
-          })
-        }
+          }}
+          installType={installType}
+        />
       </div>
       {hash == 'False' && <span style={{ color: 'red' }}>{t('PluginInstallModal.no_hash')}</span>}
     </ConfirmModal>

frontend/src/components/modals/filepicker/patches/library.ts

@@ -47,7 +47,7 @@ export default async function libraryPatch() {
     }
 
     const unlisten = History.listen(() => {
-      if ((window.SteamClient.Apps as any).PromptToChangeShortcut !== patch.patchedFunction) {
+      if (window.SteamClient.Apps.PromptToChangeShortcut !== patch.patchedFunction) {
         rePatch();
       }
     });

frontend/src/components/settings/index.tsx

@@ -53,5 +53,20 @@ export default function SettingsPage() {
     },
   ];
 
-  return <SidebarNavigation pages={pages} />;
+  return (
+    <div className="deckySettingsHeightHack">
+      <style>
+        {/* hacky fix to work around height: 720px in desktop ui */}
+        {`
+        .deckySettingsHeightHack {
+          height: 100% !important;
+        }
+        .deckySettingsHeightHack > div {
+          height: 100% !important;
+        }
+      `}
+      </style>
+      <SidebarNavigation pages={pages} />
+    </div>
+  );
 }

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

@@ -72,16 +72,7 @@ export default function DeveloperSettings() {
           }
           icon={<FaLink style={{ display: 'block' }} />}
         >
-          <DialogButton
-            disabled={pluginURL.length == 0}
-            onClick={() => {
-              if (/^https?:\/\//.test(pluginURL)) {
-                installFromURL(pluginURL);
-              } else {
-                installFromURL('https://' + pluginURL);
-              }
-            }}
-          >
+          <DialogButton disabled={pluginURL.length == 0} onClick={() => installFromURL(pluginURL)}>
             {t('SettingsDeveloperIndex.third_party_plugins.button_install')}
           </DialogButton>
         </Field>

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

@@ -1,4 +1,14 @@
-import { Carousel, DialogButton, Field, Focusable, ProgressBarWithInfo, Spinner, findSP, showModal } from '@decky/ui';
+import {
+  Carousel,
+  DialogButton,
+  Field,
+  FocusRing,
+  Focusable,
+  ProgressBarWithInfo,
+  Spinner,
+  showModal,
+  useWindowRef,
+} from '@decky/ui';
 import { Suspense, lazy, useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { FaExclamation } from 'react-icons/fa';
@@ -11,71 +21,50 @@ import WithSuspense from '../../../WithSuspense';
 const MarkdownRenderer = lazy(() => import('../../../Markdown'));
 
 function PatchNotesModal({ versionInfo, closeModal }: { versionInfo: VerInfo | null; closeModal?: () => {} }) {
-  const SP = findSP();
+  const [outerRef, win] = useWindowRef<HTMLDivElement>();
   const { t } = useTranslation();
-
+  // TODO proper desktop scrolling
   return (
-    <>
-      <style>
-        {`
-.steam-focus {
-	outline-offset: 3px;
-	outline: 2px solid rgba(255, 255, 255, 0.6);
-	animation: pulseOutline 1.2s infinite ease-in-out;
-}
-
-@keyframes pulseOutline {
-  0% {
-    outline: 2px solid rgba(255, 255, 255, 0.6);
-  }
-  50% {
-    outline: 2px solid rgba(255, 255, 255, 1);
-  }
-  100% {
-    outline: 2px solid rgba(255, 255, 255, 0.6);
-  }
-}`}
-      </style>
-
-      <Focusable onCancelButton={closeModal}>
-        <Carousel
-          fnItemRenderer={(id: number) => (
-            <Focusable
-              style={{
-                marginTop: '40px',
-                height: 'calc( 100% - 40px )',
-                overflowY: 'scroll',
-                display: 'flex',
-                justifyContent: 'center',
-                margin: '30px',
-                padding: '0 15px',
-                backgroundColor: 'rgba(37, 40, 46, 0.5)',
-              }}
-            >
-              <div>
-                <h1>{versionInfo?.all?.[id]?.name || 'Invalid Update Name'}</h1>
-                {versionInfo?.all?.[id]?.body ? (
-                  <WithSuspense>
-                    <MarkdownRenderer onDismiss={closeModal}>{versionInfo.all[id].body}</MarkdownRenderer>
-                  </WithSuspense>
-                ) : (
-                  t('Updater.no_patch_notes_desc')
-                )}
-              </div>
-            </Focusable>
-          )}
-          fnGetId={(id) => id}
-          nNumItems={versionInfo?.all?.length}
-          nHeight={SP.innerHeight - 40}
-          nItemHeight={SP.innerHeight - 40}
-          nItemMarginX={0}
-          initialColumn={0}
-          autoFocus={true}
-          fnGetColumnWidth={() => SP.innerWidth - SP.innerWidth * (10 / 100)}
-          name={t('Updater.decky_updates') as string}
-        />
-      </Focusable>
-    </>
+    <Focusable ref={outerRef} onCancelButton={closeModal}>
+      <FocusRing>
+        {win && (
+          <Carousel
+            fnItemRenderer={(id: number) => (
+              <Focusable
+                style={{
+                  marginTop: '40px',
+                  height: 'calc( 100% - 40px )',
+                  overflowY: 'scroll',
+                  display: 'flex',
+                  justifyContent: 'center',
+                  margin: '40px',
+                }}
+              >
+                <div>
+                  <h1>{versionInfo?.all?.[id]?.name || 'Invalid Update Name'}</h1>
+                  {versionInfo?.all?.[id]?.body ? (
+                    <WithSuspense>
+                      <MarkdownRenderer onDismiss={closeModal}>{versionInfo.all[id].body}</MarkdownRenderer>
+                    </WithSuspense>
+                  ) : (
+                    t('Updater.no_patch_notes_desc')
+                  )}
+                </div>
+              </Focusable>
+            )}
+            fnGetId={(id) => id}
+            nNumItems={versionInfo?.all?.length}
+            nHeight={(win?.innerHeight || 800) - 40}
+            nItemHeight={(win?.innerHeight || 800) - 40}
+            nItemMarginX={0}
+            initialColumn={0}
+            autoFocus={true}
+            fnGetColumnWidth={() => win?.innerHeight || 1280}
+            name={t('Updater.decky_updates') as string}
+          />
+        )}
+      </FocusRing>
+    </Focusable>
   );
 }
 
@@ -86,6 +75,8 @@ export default function UpdaterSettings() {
   const [updateProgress, setUpdateProgress] = useState<number>(-1);
   const [reloading, setReloading] = useState<boolean>(false);
 
+  const [windowRef, win] = useWindowRef<HTMLDivElement>();
+
   const { t } = useTranslation();
 
   useEffect(() => {
@@ -105,11 +96,12 @@ export default function UpdaterSettings() {
   }, []);
 
   const showPatchNotes = useCallback(() => {
-    showModal(<PatchNotesModal versionInfo={versionInfo} />);
-  }, [versionInfo]);
+    // TODO set width and height on desktop - needs fixing in DFL?
+    showModal(<PatchNotesModal versionInfo={versionInfo} />, win!);
+  }, [versionInfo, win]);
 
   return (
-    <>
+    <div ref={windowRef}>
       <Field
         onOptionsActionDescription={versionInfo?.all ? t('Updater.patch_notes_desc') : undefined}
         onOptionsButton={versionInfo?.all ? showPatchNotes : undefined}
@@ -178,6 +170,6 @@ export default function UpdaterSettings() {
           </Suspense>
         </InlinePatchNotes>
       )}
-    </>
+    </div>
   );
 }

frontend/src/components/store/PluginCard.tsx

@@ -1,32 +1,18 @@
 import { ButtonItem, Dropdown, Focusable, PanelSectionRow, SingleDropdownOption, SuspensefulImage } from '@decky/ui';
 import { CSSProperties, FC, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { FaArrowDown, FaArrowUp, FaCheck, FaDownload, FaRecycle } from 'react-icons/fa';
 
-import { InstallType, Plugin } from '../../plugin';
-import { StorePlugin, requestPluginInstall } from '../../store';
+import { InstallType } from '../../plugin';
+import { StorePlugin, StorePluginVersion, requestPluginInstall } from '../../store';
 import ExternalLink from '../ExternalLink';
 
 interface PluginCardProps {
-  storePlugin: StorePlugin;
-  installedPlugin: Plugin | undefined;
+  plugin: StorePlugin;
 }
 
-const PluginCard: FC<PluginCardProps> = ({ storePlugin, installedPlugin }) => {
+const PluginCard: FC<PluginCardProps> = ({ plugin }) => {
   const [selectedOption, setSelectedOption] = useState<number>(0);
-  const installedVersionIndex = storePlugin.versions.findIndex((version) => version.name === installedPlugin?.version);
-  const installType = // This assumes index in options is inverse to update order (i.e. newer updates are first)
-    installedPlugin && selectedOption < installedVersionIndex
-      ? InstallType.UPDATE
-      : installedPlugin && selectedOption === installedVersionIndex
-        ? InstallType.REINSTALL
-        : installedPlugin && selectedOption > installedVersionIndex
-          ? InstallType.DOWNGRADE
-          : installedPlugin // can happen if installed version is not in store
-            ? InstallType.OVERWRITE
-            : InstallType.INSTALL;
-
-  const root = storePlugin.tags.some((tag) => tag === 'root');
+  const root = plugin.tags.some((tag) => tag === 'root');
 
   const { t } = useTranslation();
 
@@ -57,7 +43,7 @@ const PluginCard: FC<PluginCardProps> = ({ storePlugin, installedPlugin }) => {
             height: '200px',
             objectFit: 'cover',
           }}
-          src={storePlugin.image_url}
+          src={plugin.image_url}
         />
       </div>
       <div
@@ -83,7 +69,7 @@ const PluginCard: FC<PluginCardProps> = ({ storePlugin, installedPlugin }) => {
               width: '90%',
             }}
           >
-            {storePlugin.name}
+            {plugin.name}
           </span>
           <span
             className="deckyStoreCardAuthor"
@@ -92,7 +78,7 @@ const PluginCard: FC<PluginCardProps> = ({ storePlugin, installedPlugin }) => {
               fontSize: '1em',
             }}
           >
-            {storePlugin.author}
+            {plugin.author}
           </span>
           <span
             className="deckyStoreCardDescription"
@@ -105,8 +91,8 @@ const PluginCard: FC<PluginCardProps> = ({ storePlugin, installedPlugin }) => {
               display: '-webkit-box',
             }}
           >
-            {storePlugin.description ? (
-              storePlugin.description
+            {plugin.description ? (
+              plugin.description
             ) : (
               <span>
                 <i style={{ color: '#666' }}>{t('PluginCard.plugin_no_desc')}</i>
@@ -155,49 +141,18 @@ const PluginCard: FC<PluginCardProps> = ({ storePlugin, installedPlugin }) => {
                   bottomSeparator="none"
                   layout="below"
                   onClick={() =>
-                    requestPluginInstall(storePlugin.name, storePlugin.versions[selectedOption], installType)
+                    requestPluginInstall(plugin.name, plugin.versions[selectedOption], InstallType.INSTALL)
                   }
                 >
-                  <span
-                    className="deckyStoreCardInstallText"
-                    style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', gap: '5px' }}
-                  >
-                    {installType === InstallType.UPDATE ? (
-                      <>
-                        <FaArrowUp /> {t('PluginCard.plugin_update')}
-                      </>
-                    ) : installType === InstallType.REINSTALL ? (
-                      <>
-                        <FaRecycle /> {t('PluginCard.plugin_reinstall')}
-                      </>
-                    ) : installType === InstallType.DOWNGRADE ? (
-                      <>
-                        <FaArrowDown /> {t('PluginCard.plugin_downgrade')}
-                      </>
-                    ) : installType === InstallType.OVERWRITE ? (
-                      <>
-                        <FaDownload /> {t('PluginCard.plugin_overwrite')}
-                      </>
-                    ) : (
-                      // installType === InstallType.INSTALL (also fallback)
-                      <>
-                        <FaDownload /> {t('PluginCard.plugin_install')}
-                      </>
-                    )}
-                  </span>
+                  <span className="deckyStoreCardInstallText">{t('PluginCard.plugin_install')}</span>
                 </ButtonItem>
               </div>
               <div className="deckyStoreCardVersionContainer" style={{ minWidth: '130px' }}>
                 <Dropdown
                   rgOptions={
-                    storePlugin.versions.map((version, index) => ({
+                    plugin.versions.map((version: StorePluginVersion, index) => ({
                       data: index,
-                      label: (
-                        <div style={{ display: 'flex', alignItems: 'center', gap: '5px' }}>
-                          {version.name}
-                          {installedPlugin && installedVersionIndex === index ? <FaCheck /> : null}
-                        </div>
-                      ),
+                      label: version.name,
                     })) as SingleDropdownOption[]
                   }
                   menuLabel={t('PluginCard.plugin_version_label') as string}

frontend/src/components/store/Store.tsx

@@ -14,7 +14,6 @@ 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 { useDeckyState } from '../DeckyState';
 import ExternalLink from '../ExternalLink';
 import PluginCard from './PluginCard';
 
@@ -105,8 +104,6 @@ const BrowseTab: FC<{ setPluginCount: Dispatch<SetStateAction<number | null>> }>
     })();
   }, []);
 
-  const { plugins: installedPlugins } = useDeckyState();
-
   return (
     <>
       <style>{`
@@ -238,12 +235,7 @@ const BrowseTab: FC<{ setPluginCount: Dispatch<SetStateAction<number | null>> }>
                 plugin.tags.some((tag: string) => tag.toLowerCase().includes(searchFieldValue.toLowerCase()))
               );
             })
-            .map((plugin: StorePlugin) => (
-              <PluginCard
-                storePlugin={plugin}
-                installedPlugin={installedPlugins.find((installedPlugin) => installedPlugin.name === plugin.name)}
-              />
-            ))
+            .map((plugin: StorePlugin) => <PluginCard plugin={plugin} />)
         )}
       </div>
     </>

frontend/src/enums.ts

@@ -0,0 +1,4 @@
+export enum UIMode {
+  BigPicture = 4,
+  Desktop = 7,
+}

frontend/src/errorboundary-hook.tsx

@@ -79,17 +79,9 @@ class ErrorBoundaryHook extends Logger {
         this.setState(stateClone);
         return null;
       }
-      // yoinked from valve error boundary
-      if (this.state.error && this.props.errorKey == this.state.lastErrorKey) {
+      if (this.state.error) {
         const store = Object.getPrototypeOf(this)?.constructor?.sm_ErrorReportingStore || errorReportingStore;
-
-        return void 0 !== this.props.fallback ? (
-          'function' == typeof this.props.fallback ? (
-            this.props.fallback(this.state.error.error)
-          ) : (
-            this.props.fallback
-          )
-        ) : (
+        return (
           <DeckyErrorBoundary
             error={this.state.error}
             errorKey={this.props.errorKey}

frontend/src/plugin-loader.tsx

@@ -1,6 +1,5 @@
-import { ToastNotification } from '@decky/api';
+import type { ToastNotification } from '@decky/api';
 import {
-  EUIMode,
   ModalRoot,
   Navigation,
   PanelSection,
@@ -14,6 +13,7 @@ import {
 import { FC, lazy } from 'react';
 import { FaDownload, FaExclamationCircle, FaPlug } from 'react-icons/fa';
 
+import DeckyDesktopUI from './components/DeckyDesktopUI';
 import DeckyIcon from './components/DeckyIcon';
 import { DeckyState, DeckyStateContextProvider, UserInfo, useDeckyState } from './components/DeckyState';
 import { File, FileSelectionType } from './components/modals/filepicker';
@@ -25,6 +25,7 @@ import NotificationBadge from './components/NotificationBadge';
 import PluginView from './components/PluginView';
 import { useQuickAccessVisible } from './components/QuickAccessVisibleState';
 import WithSuspense from './components/WithSuspense';
+import { UIMode } from './enums';
 import ErrorBoundaryHook from './errorboundary-hook';
 import { FrozenPluginService } from './frozen-plugins-service';
 import { HiddenPluginsService } from './hidden-plugins-service';
@@ -147,11 +148,9 @@ class PluginLoader extends Logger {
     });
 
     this.routerHook.addRoute('/decky/store', () => (
-      <DeckyStateContextProvider deckyState={this.deckyState}>
-        <WithSuspense route={true}>
-          <StorePage />
-        </WithSuspense>
-      </DeckyStateContextProvider>
+      <WithSuspense route={true}>
+        <StorePage />
+      </WithSuspense>
     ));
     this.routerHook.addRoute('/decky/settings', () => {
       return (
@@ -163,6 +162,21 @@ class PluginLoader extends Logger {
       );
     });
 
+    // needs the 1s wait or the entire app becomes drag target lol
+    sleep(1000).then(() =>
+      this.routerHook.addGlobalComponent(
+        'DeckyDesktopUI',
+        () => {
+          return (
+            <DeckyStateContextProvider deckyState={this.deckyState}>
+              <DeckyDesktopUI />
+            </DeckyStateContextProvider>
+          );
+        },
+        UIMode.Desktop,
+      ),
+    );
+
     initSteamFixes();
 
     initFilepickerPatches();
@@ -206,12 +220,12 @@ class PluginLoader extends Logger {
     let registration: any;
     const uiMode = await new Promise(
       (r) =>
-        (registration = SteamClient.UI.RegisterForUIModeChanged((mode: EUIMode) => {
+        (registration = SteamClient.UI.RegisterForUIModeChanged((mode: UIMode) => {
           r(mode);
           registration.unregister();
         })),
     );
-    if (uiMode == EUIMode.GamePad) {
+    if (uiMode == UIMode.BigPicture) {
       // wait for SP window to exist before loading plugins
       while (!findSP()) {
         await sleep(100);
@@ -365,6 +379,7 @@ class PluginLoader extends Logger {
   public deinit() {
     this.routerHook.removeRoute('/decky/store');
     this.routerHook.removeRoute('/decky/settings');
+    this.routerHook.removeGlobalComponent('DeckyDesktopUI', UIMode.Desktop);
     deinitSteamFixes();
     deinitFilepickerPatches();
     this.routerHook.deinit();
@@ -630,8 +645,8 @@ class PluginLoader extends Logger {
     // Things will break *very* badly if plugin code touches this outside of @decky/api, so lets make that clear.
     window.__DECKY_SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED_deckyLoaderAPIInit = {
       connect: (version: number, pluginName: string) => {
-        if (version < 1 || version > 2) {
-          console.warn(`Plugin ${pluginName} requested unsupported api version ${version}.`);
+        if (version < 1 || version > 3) {
+          console.warn(`Plugin ${pluginName} requested unsupported API version ${version}.`);
         }
 
         const eventListeners: listenerMap = new Map();
@@ -674,12 +689,20 @@ class PluginLoader extends Logger {
           _version: 1,
         } as any;
 
+        // adds useQuickAccessVisible
         if (version >= 2) {
           backendAPI._version = 2;
           backendAPI.useQuickAccessVisible = useQuickAccessVisible;
         }
 
-        this.debug(`${pluginName} connected to loader API.`);
+        // adds uiMode param to route patching and global component functions. no functional changes, but we should warn anyway.
+        if (version >= 3) {
+          backendAPI._version = 3;
+        }
+
+        this.debug(
+          `${pluginName} connected to loader API version ${backendAPI._version} (requested version ${version}).`,
+        );
         return backendAPI;
       },
     };
@@ -736,6 +759,10 @@ class PluginLoader extends Logger {
 
     return pluginAPI;
   }
+
+  public setDesktopMenuOpen(open: boolean) {
+    this.deckyState.setDesktopMenuOpen(open);
+  }
 }
 
 export default PluginLoader;

frontend/src/plugin.ts

@@ -18,20 +18,8 @@ export enum InstallType {
   INSTALL,
   REINSTALL,
   UPDATE,
-  DOWNGRADE,
-  OVERWRITE,
 }
 
-// values are the JSON keys used in the translation file
-// IMPORTANT! keep in sync with `t(...)` comments where this is used
-export const InstallTypeTranslationMapping = {
-  [InstallType.INSTALL]: 'install',
-  [InstallType.REINSTALL]: 'reinstall',
-  [InstallType.UPDATE]: 'update',
-  [InstallType.DOWNGRADE]: 'downgrade',
-  [InstallType.OVERWRITE]: 'overwrite',
-} as const satisfies Record<InstallType, string>;
-
 type installPluginArgs = [
   artifact: string,
   name?: string,

frontend/src/router-hook.tsx

@@ -1,5 +1,4 @@
 import {
-  EUIMode,
   ErrorBoundary,
   Patch,
   afterPatch,
@@ -7,7 +6,9 @@ import {
   findInTree,
   findModuleByExport,
   getReactRoot,
+  injectFCTrampoline,
   sleep,
+  wrapReactType,
 } from '@decky/ui';
 import { FC, ReactElement, ReactNode, cloneElement, createElement } from 'react';
 import type { Route } from 'react-router';
@@ -24,6 +25,7 @@ import {
   RouterEntry,
   useDeckyRouterState,
 } from './components/DeckyRouterState';
+import { UIMode } from './enums';
 import Logger from './logger';
 
 declare global {
@@ -37,8 +39,13 @@ const isPatched = Symbol('is patched');
 class RouterHook extends Logger {
   private routerState: DeckyRouterState = new DeckyRouterState();
   private globalComponentsState: DeckyGlobalComponentsState = new DeckyGlobalComponentsState();
-  private renderedComponents: ReactElement[] = [];
+  private renderedComponents = new Map<UIMode, ReactElement[]>([
+    [UIMode.BigPicture, []],
+    [UIMode.Desktop, []],
+  ]);
   private Route: any;
+  private DesktopRoute: any;
+  private wrappedDesktopLibraryMemo?: any;
   private DeckyGamepadRouterWrapper = this.gamepadRouterWrapper.bind(this);
   private DeckyDesktopRouterWrapper = this.desktopRouterWrapper.bind(this);
   private DeckyGlobalComponentsWrapper = this.globalComponentsWrapper.bind(this);
@@ -72,21 +79,36 @@ class RouterHook extends Logger {
       this.error('Failed to find router stack module');
     }
 
-    this.modeChangeRegistration = SteamClient.UI.RegisterForUIModeChanged((mode: EUIMode) => {
+    const routerModule = findModuleByExport((e) => e?.displayName == 'Router');
+    if (routerModule) {
+      this.DesktopRoute = Object.values(routerModule).find(
+        (e) =>
+          typeof e == 'function' &&
+          e?.prototype?.render?.toString()?.includes('props.computedMatch') &&
+          e?.prototype?.render?.toString()?.includes('.Children.count('),
+      );
+      if (!this.DesktopRoute) {
+        this.error('Failed to find DesktopRoute component');
+      }
+    } else {
+      this.error('Failed to find router module, desktop routes will not work');
+    }
+
+    this.modeChangeRegistration = SteamClient.UI.RegisterForUIModeChanged((mode: UIMode) => {
       this.debug(`UI mode changed to ${mode}`);
       if (this.patchedModes.has(mode)) return;
       this.patchedModes.add(mode);
       this.debug(`Patching router for UI mode ${mode}`);
       switch (mode) {
-        case EUIMode.GamePad:
+        case UIMode.BigPicture:
           this.debug('Patching gamepad router');
           this.patchGamepadRouter();
           break;
         // Not fully implemented yet
-        // case UIMode.Desktop:
-        //   this.debug("Patching desktop router");
-        //   this.patchDesktopRouter();
-        //   break;
+        case UIMode.Desktop:
+          this.debug('Patching desktop router');
+          this.patchDesktopRouter();
+          break;
         default:
           this.warn(`Router patch not implemented for UI mode ${mode}`);
           break;
@@ -105,7 +127,7 @@ class RouterHook extends Logger {
     await this.waitForUnlock();
     let routerNode = findRouterNode();
     while (!routerNode) {
-      this.warn('Failed to find Router node, reattempting in 5 seconds.');
+      this.warn('Failed to find GamepadUI Router node, reattempting in 5 seconds.');
       await sleep(5000);
       await this.waitForUnlock();
       routerNode = findRouterNode();
@@ -126,50 +148,34 @@ class RouterHook extends Logger {
     }
   }
 
-  // Currently unused
-  // @ts-expect-error 6133
   private async patchDesktopRouter() {
     const root = getReactRoot(document.getElementById('root') as any);
     const findRouterNode = () =>
-      findInReactTree(root, (node) => node?.elementType?.type?.toString?.()?.includes('bShowDesktopUIContent:'));
+      findInReactTree(root, (node) => {
+        const typeStr = node?.elementType?.toString?.();
+        return (
+          typeStr &&
+          typeStr?.includes('.IsMainDesktopWindow') &&
+          typeStr?.includes('.IN_STEAMUI_SHARED_CONTEXT') &&
+          typeStr?.includes('.ContentFrame') &&
+          typeStr?.includes('.Console()')
+        );
+      });
     let routerNode = findRouterNode();
     while (!routerNode) {
-      this.warn('Failed to find Router node, reattempting in 5 seconds.');
+      this.warn('Failed to find DesktopUI Router node, reattempting in 5 seconds.');
       await sleep(5000);
       routerNode = findRouterNode();
     }
     if (routerNode) {
-      // this.debug("desktop router node", routerNode);
       // Patch the component globally
-      this.desktopRouterPatch = afterPatch(routerNode.elementType, 'type', this.handleDesktopRouterRender.bind(this));
-      // Swap out the current instance
-      routerNode.type = routerNode.elementType.type;
-      if (routerNode?.alternate) {
-        routerNode.alternate.type = routerNode.type;
-      }
+      const patchedRenderer = injectFCTrampoline(routerNode.elementType);
+      this.desktopRouterPatch = afterPatch(patchedRenderer, 'component', this.handleDesktopRouterRender.bind(this));
       // Force a full rerender via our custom error boundary
       const errorBoundaryNode = findInTree(routerNode, (e) => e?.stateNode?._deckyForceRerender, {
         walkable: ['return'],
       });
       errorBoundaryNode?.stateNode?._deckyForceRerender?.();
-      // this.debug("desktop router node", routerNode);
-      // // Patch the component globally
-      // this.desktopRouterPatch = afterPatch(routerNode.type.prototype, 'render', this.handleDesktopRouterRender.bind(this));
-      // const stateNodeClone = { render: routerNode.stateNode.render } as any;
-      // // Patch the current instance. render is readonly so we have to do this.
-      // Object.assign(stateNodeClone, routerNode.stateNode);
-      // Object.setPrototypeOf(stateNodeClone, Object.getPrototypeOf(routerNode.stateNode));
-      // this.desktopRouterFirstInstancePatch = afterPatch(stateNodeClone, 'render', this.handleDesktopRouterRender.bind(this));
-      // routerNode.stateNode = stateNodeClone;
-      // // Swap out the current instance
-      // if (routerNode?.alternate) {
-      //   routerNode.alternate.type = routerNode.type;
-      //   routerNode.alternate.stateNode = routerNode.stateNode;
-      // }
-      // routerNode.stateNode.forceUpdate();
-      // Force a full rerender via our custom error boundary
-      // const errorBoundaryNode = findInTree(routerNode, e => e?.stateNode?._deckyForceRerender, { walkable: ["return"] });
-      // errorBoundaryNode?.stateNode?._deckyForceRerender?.();
     }
   }
 
@@ -193,10 +199,18 @@ class RouterHook extends Logger {
     const returnVal = (
       <>
         <DeckyRouterStateContextProvider deckyRouterState={this.routerState}>
+          <style>
+            {`
+              .deckyDesktopDialogPaddingHack + * .DialogContent_InnerWidth {
+                max-width: unset !important;
+              }
+            `}
+          </style>
+          <div className="deckyDesktopDialogPaddingHack" />
           <DeckyDesktopRouterWrapper>{ret}</DeckyDesktopRouterWrapper>
         </DeckyRouterStateContextProvider>
         <DeckyGlobalComponentsStateContextProvider deckyGlobalComponentsState={this.globalComponentsState}>
-          <DeckyGlobalComponentsWrapper />
+          <DeckyGlobalComponentsWrapper uiMode={UIMode.Desktop} />
         </DeckyGlobalComponentsStateContextProvider>
       </>
     );
@@ -216,7 +230,7 @@ class RouterHook extends Logger {
           <DeckyGamepadRouterWrapper>{ret}</DeckyGamepadRouterWrapper>
         </DeckyRouterStateContextProvider>
         <DeckyGlobalComponentsStateContextProvider deckyGlobalComponentsState={this.globalComponentsState}>
-          <DeckyGlobalComponentsWrapper />
+          <DeckyGlobalComponentsWrapper uiMode={UIMode.BigPicture} />
         </DeckyGlobalComponentsStateContextProvider>
       </>
     );
@@ -224,13 +238,21 @@ class RouterHook extends Logger {
     return returnVal;
   }
 
-  private globalComponentsWrapper() {
+  private globalComponentsWrapper({ uiMode }: { uiMode: UIMode }) {
     const { components } = useDeckyGlobalComponentsState();
-    if (this.renderedComponents.length != components.size) {
-      this.debug('Rerendering global components');
-      this.renderedComponents = Array.from(components.values()).map((GComponent) => <GComponent />);
+    const componentsForMode = components.get(uiMode);
+    if (!componentsForMode) {
+      this.warn(`Couldn't find global components map for uimode ${uiMode}`);
+      return null;
     }
-    return <>{this.renderedComponents}</>;
+    if (!this.renderedComponents.has(uiMode) || this.renderedComponents.get(uiMode)?.length != componentsForMode.size) {
+      this.debug('Rerendering global components for uiMode', uiMode);
+      this.renderedComponents.set(
+        uiMode,
+        Array.from(componentsForMode.values()).map((GComponent) => <GComponent />),
+      );
+    }
+    return <>{this.renderedComponents.get(uiMode)}</>;
   }
 
   private gamepadRouterWrapper({ children }: { children: ReactElement }) {
@@ -244,8 +266,8 @@ class RouterHook extends Logger {
     }
     const mainRouteList = children.props.children[0].props.children;
     const ingameRouteList = children.props.children[1].props.children; // /appoverlay and /apprunning
-    this.processList(mainRouteList, routes, routePatches, true);
-    this.processList(ingameRouteList, null, routePatches, false);
+    this.processList(mainRouteList, routes, routePatches.get(UIMode.BigPicture), true, this.Route);
+    this.processList(ingameRouteList, null, routePatches.get(UIMode.BigPicture), false, this.Route);
 
     this.debug('Rerendered gamepadui routes list');
     return children;
@@ -253,22 +275,38 @@ class RouterHook extends Logger {
 
   private desktopRouterWrapper({ children }: { children: ReactElement }) {
     // Used to store the new replicated routes we create to allow routes to be unpatched.
-    this.debug('desktop router wrapper render', children);
     const { routes, routePatches } = useDeckyRouterState();
-    const routeList = findInReactTree(
+    const mainRouteList = findInReactTree(
       children,
-      (node) => node?.length > 2 && node?.find((elem: any) => elem?.props?.path == '/library/home'),
+      (node) => node?.length > 2 && node?.find((elem: any) => elem?.props?.path == '/console'),
     );
-    if (!routeList) {
+    if (!mainRouteList) {
       this.debug('routerWrapper wrong component?', children);
       return children;
     }
-    const library = children.props.children[1].props.children.props;
-    if (!Array.isArray(library.children)) {
-      library.children = [library.children];
+    this.processList(mainRouteList, routes, routePatches.get(UIMode.Desktop), true, this.DesktopRoute);
+    const libraryRouteWrapper = mainRouteList.find(
+      (r: any) => r?.props && 'cm' in r.props && 'bShowDesktopUIContent' in r.props,
+    );
+    if (!this.wrappedDesktopLibraryMemo) {
+      wrapReactType(libraryRouteWrapper);
+      afterPatch(libraryRouteWrapper.type, 'type', (_, ret) => {
+        const { routePatches } = useDeckyRouterState();
+        const libraryRouteList = findInReactTree(
+          ret,
+          (node) => node?.length > 1 && node?.find((elem: any) => elem?.props?.path == '/library/downloads'),
+        );
+        if (!libraryRouteList) {
+          this.warn('failed to find library route list', ret);
+          return ret;
+        }
+        this.processList(libraryRouteList, null, routePatches.get(UIMode.Desktop), false, this.DesktopRoute);
+        return ret;
+      });
+      this.wrappedDesktopLibraryMemo = libraryRouteWrapper.type;
+    } else {
+      libraryRouteWrapper.type = this.wrappedDesktopLibraryMemo;
     }
-    this.debug('library', library);
-    this.processList(library.children, routes, routePatches, true);
 
     this.debug('Rerendered desktop routes list');
     return children;
@@ -276,11 +314,11 @@ class RouterHook extends Logger {
 
   private processList(
     routeList: any[],
-    routes: Map<string, RouterEntry> | null,
-    routePatches: Map<string, Set<RoutePatch>>,
+    routes: Map<string, RouterEntry> | null | undefined,
+    routePatches: Map<string, Set<RoutePatch>> | null | undefined,
     save: boolean,
+    RouteComponent: any,
   ) {
-    const Route = this.Route;
     this.debug('Route list: ', routeList);
     if (save) this.routes = routeList;
     let routerIndex = routeList.length;
@@ -290,59 +328,60 @@ class RouterHook extends Logger {
         const newRouterArray: (ReactElement | JSX.Element)[] = [];
         routes.forEach(({ component, props }, path) => {
           newRouterArray.push(
-            <Route path={path} {...props}>
+            <RouteComponent path={path} {...props}>
               <ErrorBoundary>{createElement(component)}</ErrorBoundary>
-            </Route>,
+            </RouteComponent>,
           );
         });
         routeList[routerIndex] = newRouterArray;
       }
     }
-    routeList.forEach((route: Route, index: number) => {
-      const replaced = this.toReplace.get(route?.props?.path as string);
-      if (replaced) {
-        routeList[index].props.children = replaced;
-        this.toReplace.delete(route?.props?.path as string);
-      }
-      if (route?.props?.path && routePatches.has(route.props.path as string)) {
-        this.toReplace.set(
-          route?.props?.path as string,
-          // @ts-ignore
-          routeList[index].props.children,
-        );
-        routePatches.get(route.props.path as string)?.forEach((patch) => {
-          const oType = routeList[index].props.children.type;
-          routeList[index].props.children = patch({
-            ...routeList[index].props,
-            children: {
-              ...cloneElement(routeList[index].props.children),
-              type: routeList[index].props.children[isPatched] ? oType : (props) => createElement(oType, props),
-            },
-          }).children;
-          routeList[index].props.children[isPatched] = true;
-        });
-      }
-    });
+    routePatches &&
+      routeList.forEach((route: Route, index: number) => {
+        const replaced = this.toReplace.get(route?.props?.path as string);
+        if (replaced) {
+          routeList[index].props.children = replaced;
+          this.toReplace.delete(route?.props?.path as string);
+        }
+        if (route?.props?.path && routePatches.has(route.props.path as string)) {
+          this.toReplace.set(
+            route?.props?.path as string,
+            // @ts-ignore
+            routeList[index].props.children,
+          );
+          routePatches.get(route.props.path as string)?.forEach((patch) => {
+            const oType = routeList[index].props.children.type;
+            routeList[index].props.children = patch({
+              ...routeList[index].props,
+              children: {
+                ...cloneElement(routeList[index].props.children),
+                type: routeList[index].props.children[isPatched] ? oType : (props) => createElement(oType, props),
+              },
+            }).children;
+            routeList[index].props.children[isPatched] = true;
+          });
+        }
+      });
   }
 
   addRoute(path: string, component: RouterEntry['component'], props: RouterEntry['props'] = {}) {
     this.routerState.addRoute(path, component, props);
   }
 
-  addPatch(path: string, patch: RoutePatch) {
-    return this.routerState.addPatch(path, patch);
+  addPatch(path: string, patch: RoutePatch, uiMode: UIMode = UIMode.BigPicture) {
+    return this.routerState.addPatch(path, patch, uiMode);
   }
 
-  addGlobalComponent(name: string, component: FC) {
-    this.globalComponentsState.addComponent(name, component);
+  addGlobalComponent(name: string, component: FC, uiMode: UIMode = UIMode.BigPicture) {
+    this.globalComponentsState.addComponent(name, component, uiMode);
   }
 
-  removeGlobalComponent(name: string) {
-    this.globalComponentsState.removeComponent(name);
+  removeGlobalComponent(name: string, uiMode: UIMode = UIMode.BigPicture) {
+    this.globalComponentsState.removeComponent(name, uiMode);
   }
 
-  removePatch(path: string, patch: RoutePatch) {
-    this.routerState.removePatch(path, patch);
+  removePatch(path: string, patch: RoutePatch, uiMode: UIMode = UIMode.BigPicture) {
+    this.routerState.removePatch(path, patch, uiMode);
   }
 
   removeRoute(path: string) {

frontend/src/store.tsx

@@ -68,6 +68,27 @@ export async function getPluginList(
     await setSetting('store', Store.Default);
     store = Store.Default;
   }
+  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,
+        },
+      }).then((r) => r.json());
+  }
   switch (+store) {
     case Store.Default:
       storeURL = 'https://plugins.deckbrew.xyz/plugins';

frontend/src/toaster.tsx

@@ -64,7 +64,7 @@ class Toaster extends Logger {
       nNotificationID: window.NotificationStore.m_nNextTestNotificationID++,
       bNewIndicator: toast.showNewIndicator,
       rtCreated: Date.now(),
-      eType: toast.eType || 31,
+      eType: toast.eType || 13,
       eSource: 1, // Client
       nToastDurationMS: toast.duration || (toast.duration = 5e3),
       data: toast,

frontend/src/utils/TranslationHelper.tsx

@@ -2,9 +2,11 @@ import { FC } from 'react';
 import { Translation } from 'react-i18next';
 
 import Logger from '../logger';
+import { InstallType } from '../plugin';
 
 export enum TranslationClass {
   PLUGIN_LOADER = 'PluginLoader',
+  PLUGIN_INSTALL_MODAL = 'PluginInstallModal',
   DEVELOPER = 'Developer',
 }
 
@@ -17,7 +19,7 @@ interface TranslationHelperProps {
 
 const logger = new Logger('TranslationHelper');
 
-const TranslationHelper: FC<TranslationHelperProps> = ({ transClass, transText, i18nArgs = null }) => {
+const TranslationHelper: FC<TranslationHelperProps> = ({ transClass, transText, i18nArgs = null, installType = 0 }) => {
   return (
     <Translation>
       {(t, {}) => {
@@ -26,6 +28,21 @@ const TranslationHelper: FC<TranslationHelperProps> = ({ transClass, transText,
             return i18nArgs
               ? t(TranslationClass.PLUGIN_LOADER + '.' + transText, i18nArgs)
               : t(TranslationClass.PLUGIN_LOADER + '.' + transText);
+          case TranslationClass.PLUGIN_INSTALL_MODAL:
+            switch (installType) {
+              case InstallType.INSTALL:
+                return i18nArgs
+                  ? t(TranslationClass.PLUGIN_INSTALL_MODAL + '.install.' + transText, i18nArgs)
+                  : t(TranslationClass.PLUGIN_INSTALL_MODAL + '.install.' + transText);
+              case InstallType.REINSTALL:
+                return i18nArgs
+                  ? t(TranslationClass.PLUGIN_INSTALL_MODAL + '.reinstall.' + transText, i18nArgs)
+                  : t(TranslationClass.PLUGIN_INSTALL_MODAL + '.reinstall.' + transText);
+              case InstallType.UPDATE:
+                return i18nArgs
+                  ? t(TranslationClass.PLUGIN_INSTALL_MODAL + '.update.' + transText, i18nArgs)
+                  : t(TranslationClass.PLUGIN_INSTALL_MODAL + '.update.' + transText);
+            }
           case TranslationClass.DEVELOPER:
             return i18nArgs
               ? t(TranslationClass.DEVELOPER + '.' + transText, i18nArgs)

scripts/deckdebug.sh

@@ -2,13 +2,6 @@
 # Usage: deckdebug.sh DECKIP:8081
 # Dependencies: websocat jq curl chromium
 
-if [ "$#" -ne 1 ]; then
-    echo "Error: Missing or incorrect argument." >&2
-    echo "Usage: deckdebug.sh DECKIP:8081" >&2
-    exit 1
-fi
-
-
 # https://jackson.dev/post/a-portable-nix-shell-shebang/
 if [ -z "$INSIDE_NIX_RANDOMSTRING" ] && command -v nix &> /dev/null; then
   # If the user has nix, relaunch in nix shell with dependencies added
@@ -20,16 +13,6 @@ if [ -z "$INSIDE_NIX_RANDOMSTRING" ] && command -v nix &> /dev/null; then
   exit $?
 fi
 
-required_dependencies=(websocat jq curl chromium)
-
-# Check if the dependencies are installed
-for cmd in "${required_dependencies[@]}"; do
-    if ! command -v "$cmd" &> /dev/null; then
-        echo "Error: '$cmd' is not installed. Please install it and try again." >&2
-        exit 1
-    fi
-done
-
 chromium --remote-debugging-port=9222 &
 sleep 2
 
@@ -58,4 +41,4 @@ while :; do
     fi
 
     sleep 5
-done
+done

scripts/tasks.sh

@@ -1,120 +0,0 @@
-#!/usr/bin/env bash
-# ./script/task.sh: Run a VSCode task from tasks.json including its dependencies.
-#
-# Usage: ./scripts/task.sh TASK_LABEL
-#
-# This script looks for .vscode/tasks.json in your workspace folder (or current directory)
-# and executes the command associated with the given task label.
-#
-# It also handles the "dependsOn" field recursively.
-#
-# Requirements: jq sed
-
-# https://jackson.dev/post/a-portable-nix-shell-shebang/
-if [ -z "$INSIDE_NIX_RANDOMSTRING" ] && command -v nix &> /dev/null; then
-  # If the user has nix, relaunch in nix shell with dependencies added
-  INSIDE_NIX_RANDOMSTRING=1 nix shell \
-      nixpkgs#jq \
-      nixpkgs#gnused \
-      --command "$0" "$@"
-  exit $?
-fi
-
-required_dependencies=(jq sed)
-
-# Check if the dependencies are installed
-for cmd in "${required_dependencies[@]}"; do
-    if ! command -v "$cmd" &> /dev/null; then
-        echo "Error: '$cmd' is not installed. Please install it and try again." >&2
-        exit 1
-    fi
-done
-
-
-set -euo pipefail
-
-# Use WORKSPACE_FOLDER if set; otherwise, assume current directory.
-WORKSPACE_FOLDER="${WORKSPACE_FOLDER:-$(pwd)}"
-TASKS_FILE="$WORKSPACE_FOLDER/.vscode/tasks.json"
-
-if [ ! -f "$TASKS_FILE" ]; then
-  echo "Error: tasks.json not found at $TASKS_FILE" >&2
-  exit 1
-fi
-
-if [ $# -lt 1 ]; then
-  echo "Usage: $0 TASK_LABEL" >&2
-  exit 1
-fi
-
-# Remove comment lines (lines starting with //) from the tasks file to be compliant with the JSON format.
-TASKS_JSON=$(sed '/^[[:space:]]*\/\//d' "$TASKS_FILE")
-
-TASK_LABEL="$1"
-shift
-
-# run_task recursively looks up the task by label,
-# runs any dependencies first, then executes its command.
-run_task() {
-  local label="$1"
-  echo "Looking up task: $label"
-
-  # Get the task object from the cleaned JSON.
-  local task
-  task=$(echo "$TASKS_JSON" | jq --arg label "$label" -r '.tasks[] | select(.label == $label)')
-  if [ -z "$task" ]; then
-    echo "Error: Task with label '$label' not found in $TASKS_FILE" >&2
-    exit 1
-  fi
-
-  # If the task has dependencies, run them first.
-  local depends
-  depends=$(echo "$task" | jq -r '.dependsOn? // empty')
-  if [ -n "$depends" ] && [ "$depends" != "null" ]; then
-    # "dependsOn" can be an array or a string.
-    if echo "$depends" | jq -e 'if type=="array" then . else empty end' >/dev/null; then
-      for dep in $(echo "$depends" | jq -r '.[]'); do
-        run_task "$dep"
-      done
-    else
-      run_task "$depends"
-    fi
-  fi
-
-  # Check if the task has either a command or script.
-  local has_command has_script
-  has_command=$(echo "$task" | jq -r 'has("command")')
-  has_script=$(echo "$task" | jq -r 'has("script")')
-  if [[ "$has_command" != "true" && "$has_script" != "true" ]]; then
-    echo "Task '$label' has no command or script; skipping execution."
-    return
-  fi
-
-  # Determine the command to run:
-  local cmd=""
-  if echo "$task" | jq 'has("command")' | grep -q "true"; then
-    cmd=$(echo "$task" | jq -r '.command')
-  elif echo "$task" | jq 'has("script")' | grep -q "true"; then
-    local script
-    script=$(echo "$task" | jq -r '.script')
-    local path
-    path=$(echo "$task" | jq -r '.path // empty')
-    if [ -n "$path" ]; then
-      cmd="cd $path && npm run $script"
-    else
-      cmd="npm run $script"
-    fi
-  else
-    echo "Error: Task '$label' does not have a command or script." >&2
-    exit 1
-  fi
-
-  # Substitute ${workspaceFolder} with the actual folder path.
-  cmd="${cmd//\$\{workspaceFolder\}/$WORKSPACE_FOLDER}"
-
-  echo "Running task '$label': $cmd"
-  # Run the task in a subshell so that directory changes don't persist.
-  ( eval "$cmd" )
-}
-
-run_task "$TASK_LABEL"