From 16a53e6918a6514941095692a2ea588ca5274413 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 11 Aug 2020 21:21:41 -0400 Subject: webhooks: Require a subscription to receive gcode output Add a new "gcode/subscribe_output" webhook endpoint to subscribe to gcode output. Only client connections that subscribe to the gcode output will receive that output. This also moves all the gcode webhooks from gcode.py to webhooks.py and arranges for gcode.py to be initialized prior to webhooks.py. Signed-off-by: Kevin O'Connor --- klippy/gcode.py | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'klippy/gcode.py') diff --git a/klippy/gcode.py b/klippy/gcode.py index 91e78ffa..9bacfbfa 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -78,16 +78,6 @@ class GCodeParser: self._handle_disconnect) printer.register_event_handler("extruder:activate_extruder", self._handle_activate_extruder) - # Register webhooks - webhooks = self.printer.lookup_object('webhooks') - webhooks.register_endpoint( - "gcode/help", self._handle_remote_help) - webhooks.register_endpoint( - "gcode/script", self._handle_remote_script) - webhooks.register_endpoint( - "gcode/restart", self._handle_remote_restart) - webhooks.register_endpoint( - "gcode/firmware_restart", self._handle_remote_firmware_restart) # Command handling self.is_printer_ready = False self.mutex = printer.get_reactor().mutex() @@ -158,6 +148,8 @@ class GCodeParser: "mux command %s %s %s already registered (%s)" % ( cmd, key, value, prev_values)) prev_values[value] = func + def get_command_help(self): + return dict(self.gcode_help) def register_output_handler(self, cb): self.output_callbacks.append(cb) def set_move_transform(self, transform, force=False): @@ -617,15 +609,6 @@ class GCodeParser: if cmd in self.gcode_help: cmdhelp.append("%-10s: %s" % (cmd, self.gcode_help[cmd])) gcmd.respond_info("\n".join(cmdhelp), log=False) - # Webhooks - def _handle_remote_help(self, web_request): - web_request.send(dict(self.gcode_help)) - def _handle_remote_restart(self, web_request): - self.run_script('restart') - def _handle_remote_firmware_restart(self, web_request): - self.run_script('firmware_restart') - def _handle_remote_script(self, web_request): - self.run_script(web_request.get('script')) # Support reading gcode from a pseudo-tty interface class GCodeIO: -- cgit v1.2.3-70-g09d2