Switch from Pyro5 to rpyc

Author: Core447

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '1.0.5'
+VERSION = '2.0.0'
 DESCRIPTION = 'Base for StreamController plugins'
 LONG_DESCRIPTION = 'This package contains the base for StreamController plugins.'
 
@@ -14,7 +14,7 @@
         description=DESCRIPTION,
         long_description=LONG_DESCRIPTION,
         packages=find_packages(),
-        install_requires=["Pyro5", "loguru"],
+        install_requires=["rpyc", "loguru"],
         keywords=['python', 'StreamController', "plugin"],
         classifiers= [
             "Development Status :: 4 - Beta",

streamcontroller_plugin_tools/BackendBase.py

@@ -1,96 +1,52 @@
 import argparse
-import Pyro5.api
 import threading
-import time
 import sys
-import os
 from loguru import logger as log
 
 log.remove(0)
 log.add(sys.stderr, level="TRACE")
 
-@Pyro5.api.expose
-class BackendBase:
+import rpyc
+from rpyc.utils.server import ThreadedServer
+from rpyc.core.protocol import Connection
+import argparse
+
+class BackendBase(rpyc.Service):
     def __init__(self):
-        self.daemon:Pyro5.api.Daemon = None
-        log.trace("Init Pyro...")
-        self.init_pyro5()
-        log.trace("Pyro init done")
+        self.frontend_connection: Connection = None
+        self.frontend = None
+        self.server: ThreadedServer = None
 
-        self._frontend:Pyro5.api.Proxy = None
         self.connect_to_frontend()
-        log.trace("Connected to frontend")
+        self.start_server()
         self.register_to_frontend()
-        log.trace("Registered to frontend")
-
-        self.ping = True
-        threading.Thread(target=self.ping_thread, daemon=True, name="ping_thread").start()
-        log.trace("Ping thread started")
-
-        self.loop = True
-        self.request_loop_thread = threading.Thread(
-            target=self.daemon.requestLoop,
-            kwargs={"loopCondition": lambda: self.loop}
-        )
-
-        self.request_loop_thread.start()
-        log.trace("Request loop thread started")
 
     def connect_to_frontend(self):
-        args = self.get_args()
-        log.info(f"Connecting to {args.uri}")
-        self.frontend = Pyro5.api.Proxy(args.uri)
+        port = self.get_args().port
+        self.frontend_connection = rpyc.connect("localhost", port)
+        self.frontend = self.frontend_connection.root
+
+    def start_server(self):
+        self.server = ThreadedServer(self, port=0, protocol_config={"allow_public_attrs": True})
+        # self.server.start()
+        threading.Thread(target=self.server.start, name="server_start", daemon=False).start()
+        log.success("Started server")
 
     def register_to_frontend(self):
-        uri = self.daemon.register(self)
-        self.frontend.register_backend(backend_uri=uri)
+        self.frontend.register_backend(port=self.server.port)
 
-    def init_pyro5(self):
-        self.daemon = Pyro5.api.Daemon()
-        # threading.Thread(target=self.daemon.requestLoop, daemon=True).start()
+    def on_disconnect(self, conn):
+        log.info("Connection closed")
+        if self.server is not None:
+            self.server.close()
+        if self.frontend_connection is not None:
+            self.frontend_connection.close()
 
     def get_args(self):
         parser = argparse.ArgumentParser(prog="BackendBase")
-        parser.add_argument("--uri", type=str)
+        parser.add_argument("--port", type=str)
         args = parser.parse_args()
-        if args.uri is None:
+        if args.port is None:
             parser.print_help()
-            exit()
-        return args
-    
-    @property
-    def frontend(self):
-        # Transfer ownership
-        if self._frontend is not None:
-            self._frontend._pyroClaimOwnership()
-        return self._frontend
-
-    @frontend.setter
-    def frontend(self, value):
-        self._frontend = value
-    
-    def ping_thread(self):
-        while self.ping:
-            time.sleep(5)
-            try:
-                self.frontend.ping()
-                log.trace("Pinged frontend")
-            except Pyro5.errors.ConnectionClosedError:
-                log.error("Failed to ping frontend")
-                self.on_connection_lost()
-                return
-
-    def on_connection_lost(self):
-        self.loop = False
-        self.ping = False
-        log.info("on_connection_lost triggered")
-        # join all threads
-        self.daemon.shutdown()
-        log.trace("shutdown daemon done")
-        self.daemon.close()
-        log.trace("close daemon done")
-        # for t in threading.enumerate():
-            # if t is not threading.current_thread():
-                # t.join()
-        log.success("Backend stopped. Have a nice day!")
-        sys.exit(0)
+            sys.exit()
+        return args