diff options
| author | Party Wumpus <48649272+PartyWumpus@users.noreply.github.com> | 2024-04-09 15:44:38 +0100 |
|---|---|---|
| committer | PartyWumpus <48649272+PartyWumpus@users.noreply.github.com> | 2024-04-09 15:54:48 +0100 |
| commit | f9ff518e6d6368f65ead7634f459498b183081f2 (patch) | |
| tree | 4af2f6e8d3b8da6b01e4565518f416ab9af15d03 /backend/decky_loader/plugin | |
| parent | de9d2144a604506bf9499078147b7c0c899ccb65 (diff) | |
| download | decky-loader-f9ff518e6d6368f65ead7634f459498b183081f2.tar.gz decky-loader-f9ff518e6d6368f65ead7634f459498b183081f2.zip | |
attempt to add plugin events to the plugin frontend api.
unable to test right now though
Diffstat (limited to 'backend/decky_loader/plugin')
| -rw-r--r-- | backend/decky_loader/plugin/imports/decky.py | 5 | ||||
| -rw-r--r-- | backend/decky_loader/plugin/imports/decky.pyi | 5 | ||||
| -rw-r--r-- | backend/decky_loader/plugin/plugin.py | 2 | ||||
| -rw-r--r-- | backend/decky_loader/plugin/sandboxed_plugin.py | 6 |
4 files changed, 8 insertions, 10 deletions
diff --git a/backend/decky_loader/plugin/imports/decky.py b/backend/decky_loader/plugin/imports/decky.py index 9a784ec4..6c5173de 100644 --- a/backend/decky_loader/plugin/imports/decky.py +++ b/backend/decky_loader/plugin/imports/decky.py @@ -19,7 +19,7 @@ import subprocess import logging import time -from typing import TypeVar, Type +from typing import Any """ Constants @@ -213,9 +213,8 @@ logger.setLevel(logging.INFO) """ Event handling """ -DataType = TypeVar("DataType") # TODO better docstring im lazy -async def emit(event: str, data: DataType | None = None, data_type: Type[DataType] | None = None) -> None: +async def emit(event: str, *args: Any) -> None: """ Send an event to the frontend. """ diff --git a/backend/decky_loader/plugin/imports/decky.pyi b/backend/decky_loader/plugin/imports/decky.pyi index 7a0dfa6a..50a0f66c 100644 --- a/backend/decky_loader/plugin/imports/decky.pyi +++ b/backend/decky_loader/plugin/imports/decky.pyi @@ -16,7 +16,7 @@ __version__ = '0.1.0' import logging -from typing import TypeVar, Type +from typing import Any """ Constants @@ -177,9 +177,8 @@ logger: logging.Logger """ Event handling """ -DataType = TypeVar("DataType") # TODO better docstring im lazy -async def emit(event: str, data: DataType | None = None, data_type: Type[DataType] | None = None) -> None: +async def emit(event: str, *args: Any) -> None: """ Send an event to the frontend. """
\ No newline at end of file diff --git a/backend/decky_loader/plugin/plugin.py b/backend/decky_loader/plugin/plugin.py index cad323f4..02d80470 100644 --- a/backend/decky_loader/plugin/plugin.py +++ b/backend/decky_loader/plugin/plugin.py @@ -59,7 +59,7 @@ class PluginWrapper: if line != None: res = loads(line) if res["type"] == SocketMessageType.EVENT.value: - create_task(self.emitted_event_callback(res["event"], res["data"])) + create_task(self.emitted_event_callback(res["event"], res["args"])) elif res["type"] == SocketMessageType.RESPONSE.value: self._method_call_requests.pop(res["id"]).set_result(res) except: diff --git a/backend/decky_loader/plugin/sandboxed_plugin.py b/backend/decky_loader/plugin/sandboxed_plugin.py index b49dcf41..98706a33 100644 --- a/backend/decky_loader/plugin/sandboxed_plugin.py +++ b/backend/decky_loader/plugin/sandboxed_plugin.py @@ -14,7 +14,7 @@ from ..localplatform.localplatform import setgid, setuid, get_username, get_home from ..enums import UserType from .. import helpers -from typing import List, TypeVar, Type +from typing import List, TypeVar, Any DataType = TypeVar("DataType") @@ -83,11 +83,11 @@ class SandboxedPlugin: sysmodules[key.replace("decky_loader.", "")] = sysmodules[key] from .imports import decky - async def emit(event: str, data: DataType | None = None, data_type: Type[DataType] | None = None) -> None: + async def emit(event: str, *args: Any) -> None: await self._socket.write_single_line_server(dumps({ "type": SocketMessageType.EVENT, "event": event, - "data": data + "args": args })) # copy the docstring over so we don't have to duplicate it emit.__doc__ = decky.emit.__doc__ |
