From 446662cc60652a893868d3e725f5df1e256118ea Mon Sep 17 00:00:00 2001 From: Kevin F Date: Fri, 2 Dec 2022 21:40:33 +0000 Subject: [PATCH] Fix RPC plugin server binding incorrectly to TCP and doubling up JSON encoding --- static-data/official-plugins/rpc/main.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/static-data/official-plugins/rpc/main.py b/static-data/official-plugins/rpc/main.py index 0ac9952e..b713f48d 100644 --- a/static-data/official-plugins/rpc/main.py +++ b/static-data/official-plugins/rpc/main.py @@ -58,7 +58,6 @@ plugin_apis['rpc.add_module_to_api'] = add_module_to_api class OnionrRPC(object): @cherrypy.expose - @cherrypy.tools.json_out() def rpc(self): # Dispatcher is dictionary {: callable} data = cherrypy.request.body.read().decode('utf-8') @@ -75,9 +74,9 @@ def rpc_client(*args, **kwargs): *args, **kwargs) else: return requests.post( - f'http://{config.get("rpc.bind_host")}/rpc:{config.get("rpc.bind_port")}', + f'http://{config.get("rpc.bind_host")}:{config.get("rpc.bind_port")}/rpc', *args, **kwargs) - + def on_beforecmdparsing(api, data=None): plugin_apis['rpc.rpc_client'] = rpc_client