chore(backend): remove unused import in plugin.py

Co-authored-by: AAGaming <aagaming@riseup.net>

backend/decky_loader/helpers.py

@@ -84,7 +84,7 @@ def get_loader_version() -> str:
 
         return version_str
     except Exception as e:
-        logger.warn(f"Failed to execute get_loader_version(): {str(e)}")
+        logger.warning(f"Failed to execute get_loader_version(): {str(e)}")
         return "unknown"
 
 user_agent = f"Decky/{get_loader_version()} (https://decky.xyz)"
@@ -102,7 +102,7 @@ def get_system_pythonpaths() -> list[str]:
         versions = [x.strip() for x in proc.stdout.decode().strip().split("\n")]
         return [x for x in versions if x and not x.isspace()]
     except Exception as e:
-        logger.warn(f"Failed to execute get_system_pythonpaths(): {str(e)}")
+        logger.warning(f"Failed to execute get_system_pythonpaths(): {str(e)}")
         return []
 
 # Download Remote Binaries to local Plugin

backend/decky_loader/injector.py

@@ -46,7 +46,7 @@ class Tab:
             async for message in self.websocket:
                 data = message.json()
                 yield data
-            logger.warn(f"The Tab {self.title} socket has been disconnected while listening for messages.")
+            logger.warning(f"The Tab {self.title} socket has been disconnected while listening for messages.")
             await self.close_websocket()
             
     async def _send_devtools_cmd(self, dc: Dict[str, Any], receive: bool = True):
@@ -381,10 +381,10 @@ async def get_tabs() -> List[Tab]:
                 na = True
             await sleep(5)
         except ClientOSError:
-            logger.warn(f"The request to {BASE_ADDRESS}/json was reset")
+            logger.warning(f"The request to {BASE_ADDRESS}/json was reset")
             await sleep(1)
         except TimeoutError:
-            logger.warn(f"The request to {BASE_ADDRESS}/json timed out")
+            logger.warning(f"The request to {BASE_ADDRESS}/json timed out")
             await sleep(1)
         else:
             break

backend/decky_loader/loader.py

@@ -104,10 +104,15 @@ class Loader:
     async def enable_reload_wait(self):
         if self.live_reload:
             await sleep(10)
-            if self.watcher:
+            if self.watcher and self.live_reload:
                 self.logger.info("Hot reload enabled")
                 self.watcher.disabled = False
 
+    async def disable_reload(self):
+        if self.watcher:
+            self.watcher.disabled = True
+            self.live_reload = False
+
     async def handle_frontend_assets(self, request: web.Request):
         file = Path(__file__).parent.joinpath("static").joinpath(request.match_info["path"])
         return web.FileResponse(file, headers={"Cache-Control": "no-cache"})

backend/decky_loader/locales/cs-CZ.json

@@ -205,6 +205,15 @@
         "testing_title": "Testování"
     },
     "Store": {
+        "download_progress_info": {
+            "download_zip": "Stahování pluginu",
+            "increment_count": "Zvyšující se počet stahování",
+            "installing_plugin": "Instalování pluginu",
+            "open_zip": "Otevírání ZIP souboru",
+            "parse_zip": "Analýza ZIP souboru",
+            "start": "Inicializace",
+            "uninstalling_previous": "Odinstalování předchozí kopie"
+        },
         "store_contrib": {
             "desc": "Pokud byste chtěli přispět do obchodu Decky Plugin Store, podívejte se na repozitář SteamDeckHomebrew/decky-plugin-template na GitHubu. Informace o vývoji a distribuci jsou k dispozici v README.",
             "label": "Přispívání"
@@ -253,7 +262,11 @@
         }
     },
     "Testing": {
-        "download": "Stáhnout"
+        "download": "Stáhnout",
+        "error": "Chyba při instalaci PR",
+        "header": "Následující verze Decky Loaderu jsou vytvořeny z otevřených Pull Requestů třetích stran. Tým Decky Loaderu neověřil jejich funkčnost ani zabezpečení a mohou být zastaralé.",
+        "loading": "Načítání Pull Requestů...",
+        "start_download_toast": "Stahování PR #{{id}}"
     },
     "TitleView": {
         "decky_store_desc": "Otevřít obchod Decky",

backend/decky_loader/locales/es-ES.json

@@ -4,7 +4,7 @@
             "label": "Canal de actualización",
             "prerelease": "Prelanzamiento",
             "stable": "Estable",
-            "testing": "Pruebas"
+            "testing": "En pruebas"
         }
     },
     "Developer": {
@@ -12,9 +12,41 @@
         "disabling": "Desactivando DevTools de React",
         "enabling": "Activando DevTools de React"
     },
+    "DropdownMultiselect": {
+        "button": {
+            "back": "Volver"
+        }
+    },
+    "FilePickerError": {
+        "errors": {
+            "file_not_found": "La ruta especificada no es válida. Por favor revísala e introdúcela correctamente.",
+            "perm_denied": "No tienes acceso a la ruta especificada. Por favor revisa si tu usuario (deck en Steam Deck) tiene el permiso correspondiente para acceder a la ruta/archivo especificado.",
+            "unknown": "Ha ocurrido un error desconocido. El error sin procesar es:{{raw_error}}"
+        }
+    },
     "FilePickerIndex": {
+        "file": {
+            "select": "Selecciona este archivo"
+        },
+        "files": {
+            "all_files": "Todos los archivos",
+            "file_type": "Tipo de archivo",
+            "show_hidden": "Mostrar archivos ocultos"
+        },
+        "filter": {
+            "created_asce": "Creado (Más antiguo)",
+            "created_desc": "Creado (Más reciente)",
+            "modified_asce": "Modificado (Más antiguo)",
+            "modified_desc": "Modificado (Más reciente)",
+            "name_asce": "Z-A",
+            "name_desc": "A-Z",
+            "size_asce": "Tamaño (Más pequeño)",
+            "size_desc": "Tamaño (Más grande)"
+        },
         "folder": {
-            "select": "Usar esta carpeta"
+            "label": "Carpeta",
+            "select": "Usar esta carpeta",
+            "show_more": "Mostrar más archivos"
         }
     },
     "MultiplePluginsInstallModal": {
@@ -44,9 +76,9 @@
         }
     },
     "PluginCard": {
-        "plugin_full_access": "Este plugin tiene acceso completo a su Steam Deck.",
+        "plugin_full_access": "Este plugin tiene acceso completo a tu Steam Deck.",
         "plugin_install": "Instalar",
-        "plugin_no_desc": "No se proporcionó una descripción.",
+        "plugin_no_desc": "No se ha proporcionado una descripción.",
         "plugin_version_label": "Versión de Plugin"
     },
     "PluginInstallModal": {
@@ -71,19 +103,26 @@
         }
     },
     "PluginListIndex": {
+        "freeze": "Congelar actualizaciones",
+        "hide": "Acceso rápido: Esconder",
         "no_plugin": "¡No hay plugins instalados!",
-        "plugin_actions": "Acciones de plugin",
+        "plugin_actions": "Acciones de Plugin",
         "reinstall": "Reinstalar",
         "reload": "Recargar",
+        "show": "Acceso rápido: Mostrar",
+        "unfreeze": "Permitir actualizaciones",
         "uninstall": "Desinstalar",
         "update_all_many": "Actualizar {{count}} plugins",
         "update_all_one": "Actualizar 1 plugin",
         "update_all_other": "Actualizar {{count}} plugins",
         "update_to": "Actualizar a {{name}}"
     },
+    "PluginListLabel": {
+        "hidden": "Escondido del menú de acceso rápido"
+    },
     "PluginLoader": {
         "decky_title": "Decky",
-        "decky_update_available": "¡Actualización {{tag_name}} disponible!",
+        "decky_update_available": "¡Actualización para {{tag_name}} disponible!",
         "error": "Error",
         "plugin_error_uninstall": "Al cargar {{name}} se ha producido una excepción como se muestra arriba. Esto suele significar que el plugin requiere una actualización para la nueva versión de SteamUI. Comprueba si hay una actualización disponible o valora eliminarlo en los ajustes de Decky, en la sección Plugins.",
         "plugin_load_error": {
@@ -100,19 +139,19 @@
         "plugin_update_other": "¡Actualizaciones disponibles para {{count}} plugins!"
     },
     "PluginView": {
-        "hidden_many": "",
-        "hidden_one": "",
-        "hidden_other": ""
+        "hidden_many": "{{count}} plugins están escondidos de esta lista",
+        "hidden_one": "1 plugin está escondido de esta lista",
+        "hidden_other": "{{count}} plugins están escondidos de esta lista"
     },
     "RemoteDebugging": {
         "remote_cef": {
-            "desc": "Permitir acceso no autenticado al CEF debugger a cualquier persona en su red",
+            "desc": "Permitir acceso no autenticado al depurador del CEF a cualquier persona en tu red",
             "label": "Permitir depuración remota del CEF"
         }
     },
     "SettingsDeveloperIndex": {
         "cef_console": {
-            "button": "Abrir consola",
+            "button": "Abrir Consola",
             "desc": "Abre la consola del CEF. Solamente es útil para propósitos de depuración. Las cosas que hagas aquí pueden ser potencialmente peligrosas y solo se debería usar si eres un desarrollador de plugins, o uno te ha dirigido aquí.",
             "label": "Consola CEF"
         },
@@ -147,6 +186,11 @@
         "developer_mode": {
             "label": "Modo desarrollador"
         },
+        "notifications": {
+            "decky_updates_label": "Actualización de Decky disponible",
+            "header": "Notificaciones",
+            "plugin_updates_label": "Actualizaciones de plugin disponibles"
+        },
         "other": {
             "header": "Otros"
         },
@@ -157,11 +201,21 @@
     "SettingsIndex": {
         "developer_title": "Desarrollador",
         "general_title": "General",
-        "plugins_title": "Plugins"
+        "plugins_title": "Plugins",
+        "testing_title": "En pruebas"
     },
     "Store": {
+        "download_progress_info": {
+            "download_zip": "Descargando plugin",
+            "increment_count": "Incrementando el contador de descargas",
+            "installing_plugin": "Instalando plugin",
+            "open_zip": "Abriendo archivo zip",
+            "parse_zip": "Analizando archivo zip",
+            "start": "Iniciando",
+            "uninstalling_previous": "Desinstalando copia previa"
+        },
         "store_contrib": {
-            "desc": "Si desea contribuir a la tienda de plugins de Decky, mira el repositorio SteamDeckHomebrew/decky-plugin-template en GitHub. Hay información acerca del desarrollo y distribución en el archivo README.",
+            "desc": "Si desea contribuir a la tienda de plugins de Decky, consulta el repositorio SteamDeckHomebrew/decky-plugin-template en GitHub. Hay información disponible acerca del desarrollo y distribución en el archivo README.",
             "label": "Contribuyendo"
         },
         "store_filter": {
@@ -173,7 +227,7 @@
         },
         "store_sort": {
             "label": "Ordenar",
-            "label_def": "Actualizado por última vez (Nuevos)"
+            "label_def": "Actualizado por última vez (Más reciente)"
         },
         "store_source": {
             "desc": "El código fuente de los plugins está disponible en el repositiorio SteamDeckHomebrew/decky-plugin-database en GitHub.",
@@ -183,9 +237,17 @@
             "about": "Información",
             "alph_asce": "Alfabéticamente (Z-A)",
             "alph_desc": "Alfabéticamente (A-Z)",
+            "date_asce": "Más antiguo primero",
+            "date_desc": "Más reciente primero",
+            "downloads_asce": "Menos descargados primero",
+            "downloads_desc": "Más descargados primero",
             "title": "Navegar"
         },
-        "store_testing_cta": "¡Por favor considera probar plugins nuevos para ayudar al equipo de Decky Loader!"
+        "store_testing_cta": "¡Por favor considera probar plugins nuevos para ayudar al equipo de Decky Loader!",
+        "store_testing_warning": {
+            "desc": "Puedes usar este canal de la tienda para probar versiones inestables de plugins. Recuerda compartir tu experiencia en GitHub con el fin de poder actualizar el plugin para todos los usuarios.",
+            "label": "Bienvenido al canal En Pruebas de la Tienda"
+        }
     },
     "StoreSelect": {
         "custom_store": {
@@ -195,10 +257,21 @@
         "store_channel": {
             "custom": "Personalizada",
             "default": "Por defecto",
-            "label": "Canál de la tienda",
-            "testing": "Pruebas"
+            "label": "Canal de la Tienda",
+            "testing": "En pruebas"
         }
     },
+    "Testing": {
+        "download": "Descargar",
+        "error": "Error instalando PR",
+        "header": "Las siguientes versiones de Decky Loader han sido compiladas de solicitudes Pull de terceros. El equipo de Decky Loader no ha verificado su funcionalidad o seguridad, y es posible que estén desactulizadas.",
+        "loading": "Cargando abrir Solicitudes de Pull...",
+        "start_download_toast": "Descargando PR #{{id}}"
+    },
+    "TitleView": {
+        "decky_store_desc": "Abrir la tienda de Decky",
+        "settings_desc": "Abrir los ajustes de Decky"
+    },
     "Updater": {
         "decky_updates": "Actualizaciones de Decky",
         "no_patch_notes_desc": "No hay notas de parche para esta versión",

backend/decky_loader/locales/ru-RU.json

@@ -205,6 +205,15 @@
         "testing_title": "Тестирование"
     },
     "Store": {
+        "download_progress_info": {
+            "download_zip": "Скачивание плагина",
+            "increment_count": "Увеличение количества загрузок",
+            "installing_plugin": "Установка плагина",
+            "open_zip": "Открытие zip файла",
+            "parse_zip": "Распаковка zip файла",
+            "start": "Инициализация",
+            "uninstalling_previous": "Удаление предыдущей копии"
+        },
         "store_contrib": {
             "desc": "Если вы хотите внести свой вклад в магазин плагинов Decky, проверьте репозиторий SteamDeckHomebrew/decky-plugin-template на GitHub. Информация о разработке и распространении доступна в README.",
             "label": "Помощь проекту"
@@ -253,7 +262,11 @@
         }
     },
     "Testing": {
-        "download": "Загрузить"
+        "download": "Загрузить",
+        "error": "Ошибка при установке PR",
+        "header": "Данные версии Decky Loader созданы на основе сторонних pull requst. Команда Decky Loader не проверяла их функциональность и безопасность, и они могут быть устаревшими.",
+        "loading": "Загрузка открытых pull requst'ов...",
+        "start_download_toast": "Загрузка PR#{{id}}"
     },
     "TitleView": {
         "decky_store_desc": "Открыть магазин Decky",

backend/decky_loader/localplatform/localplatformlinux.py

@@ -203,7 +203,7 @@ def get_unprivileged_path() -> str:
             path = None
 
     if path == None:
-        logger.warn("Unprivileged path is not properly configured. Defaulting to /home/deck/homebrew")
+        logger.warning("Unprivileged path is not properly configured. Defaulting to /home/deck/homebrew")
         path = "/home/deck/homebrew" # We give up
     
     os.makedirs(path, exist_ok=True)
@@ -225,7 +225,7 @@ def get_unprivileged_user() -> str:
                 break
     
     if user == None:
-        logger.warn("Unprivileged user is not properly configured. Defaulting to 'deck'")
+        logger.warning("Unprivileged user is not properly configured. Defaulting to 'deck'")
         user = 'deck'
 
     return user
@@ -238,7 +238,7 @@ close_cef_socket_lock = Lock()
 async def close_cef_socket():
     async with close_cef_socket_lock:
         if _get_effective_user_id() != 0:
-            logger.warn("Can't close CEF socket as Decky isn't running as root.")
+            logger.warning("Can't close CEF socket as Decky isn't running as root.")
             return
         # Look for anything listening TCP on port 8080
         lsof = run(["lsof", "-F", "-iTCP:8080", "-sTCP:LISTEN"], capture_output=True, text=True)

backend/decky_loader/localplatform/localsocket.py

@@ -7,22 +7,24 @@ from .localplatform import ON_WINDOWS
 BUFFER_LIMIT = 2 ** 20  # 1 MiB
 
 class UnixSocket:
-    def __init__(self, on_new_message: Callable[[str], Coroutine[Any, Any, Any]]):
+    def __init__(self):
         '''
         on_new_message takes 1 string argument.
         It's return value gets used, if not None, to write data to the socket.
         Method should be async
         '''
         self.socket_addr = f"/tmp/plugin_socket_{time.time()}"
-        self.on_new_message = on_new_message
+        self.on_new_message = None
         self.socket = None
         self.reader = None
         self.writer = None
         self.server_writer = None
         self.open_lock = asyncio.Lock()
+        self.active = True
 
-    async def setup_server(self):
+    async def setup_server(self, on_new_message: Callable[[str], Coroutine[Any, Any, Any]]):
         try:
+            self.on_new_message = on_new_message
             self.socket = await asyncio.start_unix_server(self._listen_for_method_call, path=self.socket_addr, limit=BUFFER_LIMIT)
         except asyncio.CancelledError:
             await self.close_socket_connection()
@@ -58,6 +60,8 @@ class UnixSocket:
         if self.socket:
             self.socket.close()
             await self.socket.wait_closed()
+        
+        self.active = False
 
     async def read_single_line(self) -> str|None:
         reader, _ = await self.get_socket_connection()
@@ -81,7 +85,7 @@ class UnixSocket:
 
     async def _read_single_line(self, reader: asyncio.StreamReader) -> str:
         line = bytearray()
-        while True:
+        while self.active:
             try:
                 line.extend(await reader.readuntil())
             except asyncio.LimitOverrunError:
@@ -91,7 +95,7 @@ class UnixSocket:
                 line.extend(err.partial)
                 break
             except asyncio.CancelledError:
-                break
+                raise
             else:
                 break
 
@@ -111,7 +115,7 @@ class UnixSocket:
 
     async def _listen_for_method_call(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
         self.server_writer = writer
-        while True:
+        while self.active and self.on_new_message:
 
             def _(task: asyncio.Task[str|None]):
                 res = task.result()
@@ -122,18 +126,19 @@ class UnixSocket:
             asyncio.create_task(self.on_new_message(line)).add_done_callback(_)
             
 class PortSocket (UnixSocket):
-    def __init__(self, on_new_message: Callable[[str], Coroutine[Any, Any, Any]]):
+    def __init__(self):
         '''
         on_new_message takes 1 string argument.
         It's return value gets used, if not None, to write data to the socket.
         Method should be async
         '''
-        super().__init__(on_new_message)
+        super().__init__()
         self.host = "127.0.0.1"
         self.port = random.sample(range(40000, 60000), 1)[0]
     
-    async def setup_server(self):
+    async def setup_server(self, on_new_message: Callable[[str], Coroutine[Any, Any, Any]]):
         try:
+            self.on_new_message = on_new_message
             self.socket = await asyncio.start_server(self._listen_for_method_call, host=self.host, port=self.port, limit=BUFFER_LIMIT)
         except asyncio.CancelledError:
             await self.close_socket_connection()

backend/decky_loader/main.py

@@ -101,10 +101,12 @@ class PluginManager:
         self.web_app.add_routes([static("/static", path.join(path.dirname(__file__), 'static'))])
 
     async def handle_crash(self):
+        if not self.reinject:
+            return
         new_time = time()
         if (new_time - self.last_webhelper_exit < 60):
             self.webhelper_crash_count += 1
-            logger.warn(f"webhelper crashed within a minute from last crash! crash count: {self.webhelper_crash_count}")
+            logger.warning(f"webhelper crashed within a minute from last crash! crash count: {self.webhelper_crash_count}")
         else:
             self.webhelper_crash_count = 0
         self.last_webhelper_exit = new_time
@@ -118,9 +120,13 @@ class PluginManager:
     async def shutdown(self, _: Application):
         try:
             logger.info(f"Shutting down...")
+            logger.info("Disabling reload...")
+            await self.plugin_loader.disable_reload()
+            logger.info("Killing plugins...")
             await self.plugin_loader.shutdown_plugins()
-            await self.ws.disconnect()
+            logger.info("Disconnecting from WS...")
             self.reinject = False
+            await self.ws.disconnect()
             if self.js_ctx_tab:
                 await self.js_ctx_tab.close_websocket()
                 self.js_ctx_tab = None
@@ -141,7 +147,7 @@ class PluginManager:
                         pass
                     logger.debug(f"Task {task} finished")
                 except:
-                    logger.warn(f"Failed to cancel task {task}:\n" + format_exc())
+                    logger.warning(f"Failed to cancel task {task}:\n" + format_exc())
                     pass
             if current:
                 tasks.remove(current)

backend/decky_loader/plugin/plugin.py

@@ -1,8 +1,10 @@
-from asyncio import CancelledError, Task, create_task, sleep
+from asyncio import CancelledError, Task, create_task, sleep, wait
 from json import dumps, load, loads
 from logging import getLogger
 from os import path
 from multiprocessing import Process
+from time import time
+from traceback import format_exc
 
 from .sandboxed_plugin import SandboxedPlugin
 from .messages import MethodCallRequest, SocketMessageType
@@ -42,8 +44,7 @@ class PluginWrapper:
 
         self.sandboxed_plugin = SandboxedPlugin(self.name, self.passive, self.flags, self.file, self.plugin_directory, self.plugin_path, self.version, self.author, self.api_version)
         self.proc: Process | None = None
-        # TODO: Maybe make LocalSocket not require on_new_message to make this cleaner
-        self._socket = LocalSocket(self.sandboxed_plugin.on_new_message)
+        self._socket = LocalSocket()
         self._listener_task: Task[Any]
         self._method_call_requests: Dict[str, MethodCallRequest] = {}
 
@@ -65,7 +66,7 @@ class PluginWrapper:
         return self.name
     
     async def _response_listener(self):
-        while True:
+        while self._socket.active:
             try:
                 line = await self._socket.read_single_line()
                 if line != None:
@@ -84,7 +85,7 @@ class PluginWrapper:
     async def execute_legacy_method(self, method_name: str, kwargs: Dict[Any, Any]):
         if not self.legacy_method_warning:
             self.legacy_method_warning = True
-            self.log.warn(f"Plugin {self.name} is using legacy method calls. This will be removed in a future release.")
+            self.log.warning(f"Plugin {self.name} is using legacy method calls. This will be removed in a future release.")
         if self.passive:
             raise RuntimeError("This plugin is passive (aka does not implement main.py)")
         
@@ -115,29 +116,40 @@ class PluginWrapper:
         return self
 
     async def stop(self, uninstall: bool = False):
-        self.log.info(f"Stopping plugin {self.name}")
-        if self.passive:
-            return
-        if hasattr(self, "_socket"):
-            await self._socket.write_single_line(dumps({ "stop": True, "uninstall": uninstall }, ensure_ascii=False))
-            await self._socket.close_socket_connection()
-        if self.proc:
-            self.proc.join()
-        await self.kill_if_still_running()
-        if hasattr(self, "_listener_task"):
-            self._listener_task.cancel()
+        try:
+            start_time = time()
+            if self.passive:
+                return
+
+            _, pending = await wait([
+                create_task(self._socket.write_single_line(dumps({ "stop": True, "uninstall": uninstall }, ensure_ascii=False)))
+            ], timeout=1)
+
+            if hasattr(self, "_listener_task"):
+                self._listener_task.cancel()
+            
+            await self.kill_if_still_running()
+
+            for pending_task in pending:
+                pending_task.cancel()
+
+            self.log.info(f"Plugin {self.name} has been stopped in {time() - start_time:.1f}s")
+        except Exception as e:
+            self.log.error(f"Error during shutdown for plugin {self.name}: {str(e)}\n{format_exc()}")
 
     async def kill_if_still_running(self):
-        time = 0
+        start_time = time()
+        sigtermed = False
         while self.proc and self.proc.is_alive():
-            await sleep(0.1)
-            time += 1
-            if time == 100:
-                self.log.warn(f"Plugin {self.name} still alive 10 seconds after stop request! Sending SIGTERM!")
+            elapsed_time = time() - start_time
+            if elapsed_time >= 5 and not sigtermed:
+                sigtermed = True
+                self.log.warning(f"Plugin {self.name} still alive 5 seconds after stop request! Sending SIGTERM!")
                 self.terminate()
-            elif time == 200:
-                self.log.warn(f"Plugin {self.name} still alive 20 seconds after stop request! Sending SIGKILL!")
+            elif elapsed_time >= 10:
+                self.log.warning(f"Plugin {self.name} still alive 10 seconds after stop request! Sending SIGKILL!")
                 self.terminate(True)
+            await sleep(0.1)
 
     def terminate(self, kill: bool = False):
         if self.proc and self.proc.is_alive():

backend/decky_loader/plugin/sandboxed_plugin.py

@@ -1,6 +1,5 @@
 import sys
 from os import path, environ
-from signal import SIG_IGN, SIGINT, SIGTERM, getsignal, signal
 from importlib.util import module_from_spec, spec_from_file_location
 from json import dumps, loads
 from logging import getLogger
@@ -19,8 +18,6 @@ from typing import List, TypeVar, Any
 
 DataType = TypeVar("DataType")
 
-original_term_handler = getsignal(SIGTERM)
-
 class SandboxedPlugin:
     def __init__(self,
                  name: str,
@@ -48,11 +45,6 @@ class SandboxedPlugin:
         self._socket = socket
 
         try:
-            # Ignore signals meant for parent Process
-            # TODO SURELY there's a better way to do this.
-            signal(SIGINT, SIG_IGN)
-            signal(SIGTERM, SIG_IGN)
-
             setproctitle(f"{self.name} ({self.file})")
             setthreadtitle(self.name)
 
@@ -120,7 +112,7 @@ class SandboxedPlugin:
                     get_event_loop().create_task(self.Plugin._main())
                 else:
                     get_event_loop().create_task(self.Plugin._main(self.Plugin))
-            get_event_loop().create_task(socket.setup_server())
+            get_event_loop().create_task(socket.setup_server(self.on_new_message))
         except:
             self.log.error("Failed to start " + self.name + "!\n" + format_exc())
             sys.exit(0)
@@ -167,8 +159,6 @@ class SandboxedPlugin:
         data = loads(message)
 
         if "stop" in data:
-            # Incase the loader needs to terminate our process soon
-            signal(SIGTERM, original_term_handler)
             self.log.info(f"Calling Loader unload function for {self.name}.")
             await self._unload()
 

backend/decky_loader/wsrouter.py

@@ -50,7 +50,7 @@ class WSRouter:
         if self.ws != None:
             await self.ws.send_json(data)
         else:
-            self.logger.warn("Dropping message as there is no connected socket: %s", data)
+            self.logger.warning("Dropping message as there is no connected socket: %s", data)
 
     def add_route(self, name: str, route: Route):
         self.routes[name] = route
@@ -69,9 +69,9 @@ class WSRouter:
         
         if instance_id != self.instance_id:
             try:
-                self.logger.warn("Ignoring %s reply from stale instance %d with args %s and response %s", route, instance_id, args, res)
+                self.logger.warning("Ignoring %s reply from stale instance %d with args %s and response %s", route, instance_id, args, res)
             except:
-                self.logger.warn("Ignoring %s reply from stale instance %d (failed to log event data)", route, instance_id)
+                self.logger.warning("Ignoring %s reply from stale instance %d (failed to log event data)", route, instance_id)
             finally:
                 return 
 

dist/install_prerelease.sh

@@ -34,10 +34,13 @@ curl -L https://raw.githubusercontent.com/SteamDeckHomebrew/decky-loader/main/di
 cat > "${HOMEBREW_FOLDER}/services/plugin_loader-backup.service" <<- EOM
 [Unit]
 Description=SteamDeck Plugin Loader
+After=network.target
 [Service]
 Type=simple
 User=root
 Restart=always
+KillMode=process
+TimeoutStopSec=45
 ExecStart=${HOMEBREW_FOLDER}/services/PluginLoader
 WorkingDirectory=${HOMEBREW_FOLDER}/services
 Environment=UNPRIVILEGED_PATH=${HOMEBREW_FOLDER}

dist/install_release.sh

@@ -34,10 +34,13 @@ curl -L https://raw.githubusercontent.com/SteamDeckHomebrew/decky-loader/main/di
 cat > "${HOMEBREW_FOLDER}/services/plugin_loader-backup.service" <<- EOM
 [Unit]
 Description=SteamDeck Plugin Loader
+After=network.target
 [Service]
 Type=simple
 User=root
 Restart=always
+KillMode=process
+TimeoutStopSec=45
 ExecStart=${HOMEBREW_FOLDER}/services/PluginLoader
 WorkingDirectory=${HOMEBREW_FOLDER}/services
 Environment=UNPRIVILEGED_PATH=${HOMEBREW_FOLDER}

dist/plugin_loader-prerelease.service

@@ -5,6 +5,7 @@ After=network.target
 Type=simple
 User=root
 Restart=always
+KillMode=process
 TimeoutStopSec=45
 ExecStart=${HOMEBREW_FOLDER}/services/PluginLoader
 WorkingDirectory=${HOMEBREW_FOLDER}/services

dist/plugin_loader-release.service

@@ -5,6 +5,7 @@ After=network.target
 Type=simple
 User=root
 Restart=always
+KillMode=process
 TimeoutStopSec=45
 ExecStart=${HOMEBREW_FOLDER}/services/PluginLoader
 WorkingDirectory=${HOMEBREW_FOLDER}/services

frontend/src/index.ts

@@ -7,7 +7,7 @@ interface Window {
 (async () => {
   // Wait for main webpack chunks to definitely be loaded
   console.time('[Decky:Boot] Waiting for main Webpack chunks...');
-  while (!window.webpackChunksteamui || window.webpackChunksteamui.length < 8) {
+  while (!window.webpackChunksteamui || window.webpackChunksteamui.length < 5) {
     await new Promise((r) => setTimeout(r, 10)); // Can't use DFL sleep here.
   }
   console.timeEnd('[Decky:Boot] Waiting for main Webpack chunks...');

frontend/src/utils/errors.ts

@@ -22,7 +22,10 @@ export function getLikelyErrorSourceFromValveError(error: ValveError): ErrorSour
 }
 
 export function getLikelyErrorSourceFromValveReactError(error: ValveReactErrorInfo): ErrorSource {
-  return getLikelyErrorSource(error?.error?.stack + '\n' + error.info.componentStack);
+  // get the first 10 lines of the componentStack to avoid matching against the decky router wrapper for any route errors deeper in the tree
+  return getLikelyErrorSource(
+    error?.error?.stack + '\n' + error.info.componentStack?.split('\n').slice(0, 8).join('\n'),
+  );
 }
 
 export function getLikelyErrorSource(error?: string): ErrorSource {