BUGFIX:

- ServiceBus: remote settings update did not work anymore
- ModManager: remote calls did not work anymore

Author: karel26

services/modmanager/service.py

@@ -379,9 +379,11 @@ def backup(p, names) -> list[str]:
         return True
 
     @proxy
-    async def install_package(self, server: Server, folder: Folder, package_name: str, version: str,
+    async def install_package(self, server: Server, folder: Union[Folder, str], package_name: str, version: str,
                               repo: Optional[str] = None) -> bool:
         self.log.info(f"Installing package {package_name}_v{version} ...")
+        if isinstance(folder, str):
+            folder = Folder(folder)
         config = self.get_config()
         path = os.path.expandvars(config[folder.value])
         if folder == Folder.SavedGames:
@@ -435,7 +437,10 @@ async def do_uninstall(self, reference: Union[Server, Node], folder: Folder, pac
         return True
 
     @proxy
-    async def uninstall_package(self, server: Server, folder: Folder, package_name: str, version: str) -> bool:
+    async def uninstall_package(self, server: Server, folder: Union[Folder, str], package_name: str,
+                                version: str) -> bool:
+        if isinstance(folder, str):
+            folder = Folder(folder)
         if folder == Folder.RootFolder:
             return await self.uninstall_root_package(server.node, package_name, version)
         self.log.info(f"Uninstalling package {package_name}_v{version} ...")

services/servicebus/service.py

@@ -16,6 +16,7 @@
 from core.data.impl.serverimpl import ServerImpl
 from datetime import datetime, timedelta, timezone
 from enum import Enum
+from functools import reduce
 from psycopg.rows import dict_row
 from psycopg.types.json import Json
 from queue import Queue
@@ -626,7 +627,7 @@ async def handle_agent(self, data: dict):
     async def rpc(self, obj: object, data: dict) -> Optional[dict]:
         if 'method' in data:
             method_name = data['method']
-            func = getattr(obj, method_name, None)
+            func = reduce(lambda attr, part: getattr(attr, part, None), method_name.split('.'), obj)
             if not func:
                 raise ValueError(f"Call to non-existing function {method_name}()")