diff options
| -rw-r--r-- | backend/decky_loader/injector.py | 12 | ||||
| -rw-r--r-- | backend/decky_loader/instrumentation.py | 1 | ||||
| -rw-r--r-- | backend/decky_loader/utilities.py | 8 | ||||
| -rw-r--r-- | backend/decky_loader/wsrouter.py | 6 |
4 files changed, 13 insertions, 14 deletions
diff --git a/backend/decky_loader/injector.py b/backend/decky_loader/injector.py index b7361286..8aa3bf29 100644 --- a/backend/decky_loader/injector.py +++ b/backend/decky_loader/injector.py @@ -2,7 +2,7 @@ from asyncio import sleep from logging import getLogger -from typing import Any, Callable, List, TypedDict, Dict +from typing import Any, AsyncGenerator, Callable, List, Set, TypedDict, Dict from aiohttp import ClientSession, ClientTimeout from aiohttp.client_exceptions import ClientConnectorError, ClientOSError @@ -28,7 +28,7 @@ class Tab: self.id: str = res["id"] self.url: str = res["url"] self.ws_url: str = res["webSocketDebuggerUrl"] - self.queues = set() + self.queues: Set[Queue[Any]] = set() self.reader = None self.websocket = None @@ -57,12 +57,12 @@ class Tab: q.put_nowait(None) await self.close_websocket() - async def listen_for_message(self): + async def listen_for_message(self) -> AsyncGenerator[Any]: if self.websocket: if not self.reader or self.reader.done(): self.reader = create_task(self.message_reader()) - q = Queue() + q: Queue[Any] = Queue() self.queues.add(q) try: while (data := await q.get()) is not None: @@ -318,7 +318,7 @@ class Tab: return res["result"]["result"]["value"] - async def inject_css(self, style: str, manage_socket: bool = True): + async def inject_css(self, style: str, manage_socket: bool = True) -> Any: try: css_id = str(uuid.uuid4()) @@ -350,7 +350,7 @@ class Tab: "result": e } - async def remove_css(self, css_id: str, manage_socket: bool = True): + async def remove_css(self, css_id: str, manage_socket: bool = True) -> Any: try: result = await self.evaluate_js( f""" diff --git a/backend/decky_loader/instrumentation.py b/backend/decky_loader/instrumentation.py index 55b3e1a5..3605a69c 100644 --- a/backend/decky_loader/instrumentation.py +++ b/backend/decky_loader/instrumentation.py @@ -3,7 +3,6 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: from .main import PluginManager from .injector import Tab -from .wsrouter import WSRouter logger = getLogger("Instrumentation") diff --git a/backend/decky_loader/utilities.py b/backend/decky_loader/utilities.py index 7f1ac09d..49376065 100644 --- a/backend/decky_loader/utilities.py +++ b/backend/decky_loader/utilities.py @@ -215,7 +215,7 @@ class Utilities: self.logger.debug(f"Finished stream for {url}") return res - async def http_request_legacy(self, method: str, url: str, extra_opts: Any = {}, timeout: int | None = None): + async def http_request_legacy(self, method: str, url: str, extra_opts: Any = {}, timeout: int | None = None) -> Any: async with ClientSession() as web: res = await web.request(method, url, ssl=helpers.get_ssl_context(), timeout=timeout, **extra_opts) # type: ignore text = await res.text() @@ -228,7 +228,7 @@ class Utilities: async def ping(self, **kwargs: Any): return "pong" - async def execute_in_tab(self, tab: str, run_async: bool, code: str): + async def execute_in_tab(self, tab: str, run_async: bool, code: str)-> Any: try: result = await inject_to_tab(tab, code, run_async) assert result @@ -321,7 +321,7 @@ class Utilities: order_by: str = "name_desc", filter_for: str | None = None, page: int = 1, - max: int = 1000): + max: int = 1000) -> Any: if path == None: path = get_home_path() @@ -382,7 +382,7 @@ class Utilities: folders.sort(key=lambda x: x['file'].name.casefold(), reverse = rev) #Constructing the final file list, folders first - all = [{ + all: List[Any] = [{ "isdir": x['is_dir'], "name": str(x['file'].name), "realpath": str(x['file']), diff --git a/backend/decky_loader/wsrouter.py b/backend/decky_loader/wsrouter.py index 106993b9..66bcc0ff 100644 --- a/backend/decky_loader/wsrouter.py +++ b/backend/decky_loader/wsrouter.py @@ -67,9 +67,8 @@ class WSRouter: async def _call_route(self, route: str, args: ..., call_id: int): try: - self.logger.debug("CALL ROUTE %s", route); res = await self.routes[route](*args) - message = {"type": MessageType.REPLY.value, "id": call_id, "result": res} + message: Any = {"type": MessageType.REPLY.value, "id": call_id, "result": res} except PluginStopped as err: message = {"type": MessageType.DISCARD.value, "id": call_id} except Exception as err: @@ -144,7 +143,8 @@ class WSRouter: self.logger.debug(f'Started PY call {data["route"]} ID {call_id}') self.loop.create_task(self._call_route(data["route"], data["args"], call_id)) else: - error = {"error":f'Route {data["route"]} does not exist.', "name": "RouteNotFoundError", "traceback": None} + # TODO type better + error: Dict[str, str | None] = {"error":f'Route {data["route"]} does not exist.', "name": "RouteNotFoundError", "traceback": None} self.loop.create_task(self.write({"type": MessageType.ERROR.value, "id": call_id, "error": error})) def handle_received_response_message(self, call_id: int): |
