From 6522ebf0cad1723a278144b6c5d8557cd47e52d6 Mon Sep 17 00:00:00 2001
From: AAGaming <aagaming@riseup.net>
Date: Sat, 30 Dec 2023 00:46:59 -0500
Subject: Implement legacy & modern plugin method calls over WS

This version builds fine and runs all of the 14 plugins I have installed perfectly, so we're really close to having this done.
---
 backend/decky_loader/plugin/sandboxed_plugin.py | 32 ++++++++++++++++---------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'backend/decky_loader/plugin/sandboxed_plugin.py')

diff --git a/backend/decky_loader/plugin/sandboxed_plugin.py b/backend/decky_loader/plugin/sandboxed_plugin.py
index 1c3c5bd2..d07cdc97 100644
--- a/backend/decky_loader/plugin/sandboxed_plugin.py
+++ b/backend/decky_loader/plugin/sandboxed_plugin.py
@@ -77,17 +77,28 @@ class SandboxedPlugin:
             keys = [key for key in sysmodules if key.startswith("decky_loader.")]
             for key in keys:
                 sysmodules[key.replace("decky_loader.", "")] = sysmodules[key]
+            
+            from .imports import decky
+            async def emit_message(message: Dict[Any, Any]):
+                await self._socket.write_single_line_server(dumps({
+                    "id": "0",
+                    "payload": message
+                }))
+            # copy the docstring over so we don't have to duplicate it
+            emit_message.__doc__ = decky.emit_message.__doc__
+            decky.emit_message = emit_message
+            sysmodules["decky"] = decky
+            # provided for compatibility
+            sysmodules["decky_plugin"] = decky
 
             spec = spec_from_file_location("_", self.file)
             assert spec is not None
             module = module_from_spec(spec)
             assert spec.loader is not None
             spec.loader.exec_module(module)
+            # TODO fix self weirdness once plugin.json versioning is done. need this before WS release!
             self.Plugin = module.Plugin
 
-            setattr(self.Plugin, "emit_message", self.emit_message)
-            #TODO: Find how to put emit_message on global namespace so it doesn't pollute Plugin
-
             if hasattr(self.Plugin, "_migration"):
                 get_event_loop().run_until_complete(self.Plugin._migration(self.Plugin))
             if hasattr(self.Plugin, "_main"):
@@ -124,15 +135,14 @@ class SandboxedPlugin:
 
         d: SocketResponseDict = {"res": None, "success": True, "id": data["id"]}
         try:
-            d["res"] = await getattr(self.Plugin, data["method"])(self.Plugin, **data["args"])
+            if data["legacy"]:
+                # Legacy kwargs
+                d["res"] = await getattr(self.Plugin, data["method"])(self.Plugin, **data["args"])
+            else:
+                # New args
+                d["res"] = await getattr(self.Plugin, data["method"])(self.Plugin, *data["args"])
         except Exception as e:
             d["res"] = str(e)
             d["success"] = False
         finally:
-            return dumps(d, ensure_ascii=False)
-        
-    async def emit_message(self, message: Dict[Any, Any]):
-        await self._socket.write_single_line_server(dumps({
-            "id": "0",
-            "payload": message
-        }))
\ No newline at end of file
+            return dumps(d, ensure_ascii=False)
\ No newline at end of file
-- 
cgit v1.2.3