Add event handler

2 files changed, 6 insertions, 13 deletions

diff --git a/backend/decky_loader/updater.py b/backend/decky_loader/updater.py
index eadd49af..5ead49b4 100644
--- a/backend/decky_loader/updater.py
+++ b/backend/decky_loader/updater.py
@@ -189,7 +189,7 @@ class Updater:
                         raw += len(c)
                         new_progress = round((raw / total) * 100)
                         if progress != new_progress:
-                            self.context.loop.create_task(tab.evaluate_js(f"window.DeckyUpdater.updateProgress({new_progress})", False, False, False))
+                            self.context.loop.create_task(self.context.ws.emit("frontend/update_download_percentage", new_progress))
                             progress = new_progress
 
             if ON_LINUX:
@@ -202,7 +202,7 @@ class Updater:
                     logger.info(f"Setting the executable flag with chcon returned {await process.wait()}")
 
             logger.info("Updated loader installation.")
-            await tab.evaluate_js("window.DeckyUpdater.finish()", False, False)
+            await self.context.ws.emit("frontend/finish_download")
             await self.do_restart()
             await tab.close_websocket()
 
diff --git a/backend/decky_loader/wsrouter.py b/backend/decky_loader/wsrouter.py
index 8b145dc3..4874e967 100644
--- a/backend/decky_loader/wsrouter.py
+++ b/backend/decky_loader/wsrouter.py
@@ -7,9 +7,7 @@ from aiohttp.web import Application, WebSocketResponse, Request, Response, get
 
 from enum import IntEnum
 
-from typing import Callable, Coroutine, Dict, Any, cast, TypeVar, Type
-
-from dataclasses import asdict, is_dataclass
+from typing import Callable, Coroutine, Dict, Any, cast, TypeVar
 
 from traceback import format_exc
 
@@ -127,11 +125,6 @@ class WSRouter:
         self.logger.debug('Websocket connection closed')
         return ws
 
-    # DataType defaults to None so that if a plugin opts in to strict pyright checking and attempts to pass data witbout specifying the type (or any), the type check fails
-    async def emit(self, event: str, data: DataType | None = None, data_type: Type[DataType] | None = None):
-        self.logger.debug('Firing frontend event %s with args %s', data)
-        sent_data: Dict[Any, Any] | None = cast(Dict[Any, Any], data)
-        if is_dataclass(data):
-            sent_data = asdict(data) # type: ignore Argument of type "DataclassInstance | type[DataclassInstance]" cannot be assigned to parameter "obj" of type "DataclassInstance" in function "asdict"
-
-        await self.write({ "type": MessageType.EVENT.value, "event": event, "data": sent_data })
+    async def emit(self, event: str, *args: Any):
+        self.logger.debug(f'Firing frontend event {event} with args {args}')
+        await self.write({ "type": MessageType.EVENT.value, "event": event, "args": args })