Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

webhooks: Add "register_remote_method" endpoint 

This allows clients to register methods that can be called from Klipper.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-10-28 08:37:12 -04:00 committed by KevinOConnor
parent ccc8fe2fc5
commit 108b66efe9
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
klippy/webhooks.py
View File

@ -275,8 +275,11 @@ class WebHooks:
def __init__(self, printer):
self.printer = printer
self._endpoints = {"list_endpoints": self._handle_list_endpoints}
self._remote_methods = {}
self.register_endpoint("info", self._handle_info_request)
self.register_endpoint("emergency_stop", self._handle_estop_request)
self.register_endpoint("register_remote_method",
self._handle_rpc_registration)
self.sconn = ServerSocket(self, printer)
def register_endpoint(self, path, callback):
@ -305,6 +308,14 @@ class WebHooks:
def _handle_estop_request(self, web_request):
self.printer.invoke_shutdown("Shutdown due to webhooks request")
def _handle_rpc_registration(self, web_request):
template = web_request.get_dict('response_template')
method = web_request.get_str('remote_method')
new_conn = web_request.get_client_connection()
logging.info("webhooks: registering remote method '%s' "
"for connection id: %d" % (method, id(new_conn)))
self._remote_methods.setdefault(method, {})[new_conn] = template
def get_connection(self):
return self.sconn
@ -320,6 +331,24 @@ class WebHooks:
state_message, state = self.printer.get_state_message()
return {'state': state, 'state_message': state_message}
def call_remote_method(self, method, **kwargs):
if method not in self._remote_methods:
raise self.printer.command_error(
"Remote method '%s' not registered" % (method))
conn_map = self._remote_methods[method]
valid_conns = {}
for conn, template in conn_map.items():
if not conn.is_closed():
valid_conns[conn] = template
out = {'params': kwargs}
out.update(template)
conn.send(out)
if not valid_conns:
del self._remote_methods[method]
raise self.printer.command_error(
"No active connections for method '%s'" % (method))
self._remote_methods[method] = valid_conns
class GCodeHelper:
def __init__(self, printer):
self.printer = printer