2020-06-19 12:15:36 +02:00
|
|
|
# Klippy WebHooks registration and server connection
|
|
|
|
#
|
|
|
|
# Copyright (C) 2020 Eric Callahan <arksine.code@gmail.com>
|
|
|
|
#
|
|
|
|
# This file may be distributed under the terms of the GNU GPLv3 license
|
|
|
|
import logging
|
|
|
|
import socket
|
2020-08-08 12:12:01 +02:00
|
|
|
import os
|
2020-08-09 14:35:15 +02:00
|
|
|
import sys
|
2020-06-19 12:15:36 +02:00
|
|
|
import errno
|
|
|
|
import json
|
|
|
|
import homing
|
|
|
|
|
|
|
|
# Json decodes strings as unicode types in Python 2.x. This doesn't
|
|
|
|
# play well with some parts of Klipper (particuarly displays), so we
|
|
|
|
# need to create an object hook. This solution borrowed from:
|
|
|
|
#
|
|
|
|
# https://stackoverflow.com/questions/956867/
|
|
|
|
#
|
|
|
|
def byteify(data, ignore_dicts=False):
|
|
|
|
if isinstance(data, unicode):
|
|
|
|
return data.encode('utf-8')
|
|
|
|
if isinstance(data, list):
|
|
|
|
return [byteify(i, True) for i in data]
|
|
|
|
if isinstance(data, dict) and not ignore_dicts:
|
|
|
|
return {byteify(k, True): byteify(v, True)
|
|
|
|
for k, v in data.items()}
|
|
|
|
return data
|
|
|
|
|
|
|
|
def json_loads_byteified(data):
|
|
|
|
return byteify(
|
|
|
|
json.loads(data, object_hook=byteify), True)
|
|
|
|
|
|
|
|
class WebRequestError(homing.CommandError):
|
|
|
|
def __init__(self, message,):
|
|
|
|
Exception.__init__(self, message)
|
|
|
|
|
|
|
|
def to_dict(self):
|
|
|
|
return {
|
|
|
|
'error': 'WebRequestError',
|
|
|
|
'message': self.message}
|
|
|
|
|
|
|
|
class Sentinel:
|
|
|
|
pass
|
|
|
|
|
|
|
|
class WebRequest:
|
|
|
|
error = WebRequestError
|
|
|
|
def __init__(self, base_request):
|
|
|
|
self.id = base_request['id']
|
|
|
|
self.path = base_request['path']
|
|
|
|
self.method = base_request['method']
|
|
|
|
self.args = base_request['args']
|
|
|
|
self.response = None
|
|
|
|
|
|
|
|
def get(self, item, default=Sentinel):
|
|
|
|
if item not in self.args:
|
|
|
|
if default == Sentinel:
|
|
|
|
raise WebRequestError("Invalid Argument [%s]" % item)
|
|
|
|
return default
|
|
|
|
return self.args[item]
|
|
|
|
|
|
|
|
def get_int(self, item):
|
|
|
|
return int(self.get(item))
|
|
|
|
|
|
|
|
def get_float(self, item):
|
|
|
|
return float(self.get(item))
|
|
|
|
|
|
|
|
def get_args(self):
|
|
|
|
return self.args
|
|
|
|
|
|
|
|
def get_path(self):
|
|
|
|
return self.path
|
|
|
|
|
|
|
|
def get_method(self):
|
|
|
|
return self.method
|
|
|
|
|
|
|
|
def set_error(self, error):
|
|
|
|
self.response = error.to_dict()
|
|
|
|
|
|
|
|
def send(self, data):
|
|
|
|
if self.response is not None:
|
|
|
|
raise WebRequestError("Multiple calls to send not allowed")
|
|
|
|
self.response = data
|
|
|
|
|
|
|
|
def finish(self):
|
|
|
|
if self.response is None:
|
|
|
|
# No error was set and the user never executed
|
|
|
|
# send, default response is "ok"
|
|
|
|
self.response = "ok"
|
|
|
|
return {"request_id": self.id, "response": self.response}
|
|
|
|
|
2020-08-08 12:12:01 +02:00
|
|
|
class ServerSocket:
|
2020-06-19 12:15:36 +02:00
|
|
|
def __init__(self, webhooks, printer):
|
|
|
|
self.printer = printer
|
|
|
|
self.webhooks = webhooks
|
|
|
|
self.reactor = printer.get_reactor()
|
2020-08-08 12:12:01 +02:00
|
|
|
self.sock = self.fd_handle = None
|
|
|
|
self.clients = {}
|
2020-08-11 22:26:07 +02:00
|
|
|
start_args = printer.get_start_args()
|
|
|
|
server_address = start_args.get('apiserver')
|
|
|
|
is_fileinput = (start_args.get('debuginput') is not None)
|
|
|
|
if not server_address or is_fileinput:
|
|
|
|
# Do not enable server
|
2020-06-19 12:15:36 +02:00
|
|
|
return
|
2020-08-11 22:26:07 +02:00
|
|
|
self._remove_socket_file(server_address)
|
2020-08-08 12:12:01 +02:00
|
|
|
self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
|
|
|
|
self.sock.setblocking(0)
|
2020-08-11 22:26:07 +02:00
|
|
|
self.sock.bind(server_address)
|
2020-08-08 12:12:01 +02:00
|
|
|
self.sock.listen(1)
|
|
|
|
self.fd_handle = self.reactor.register_fd(
|
|
|
|
self.sock.fileno(), self._handle_accept)
|
|
|
|
printer.register_event_handler(
|
|
|
|
'klippy:disconnect', self._handle_disconnect)
|
|
|
|
|
|
|
|
def _handle_accept(self, eventtime):
|
2020-06-19 12:15:36 +02:00
|
|
|
try:
|
2020-08-08 12:12:01 +02:00
|
|
|
sock, addr = self.sock.accept()
|
2020-06-19 12:15:36 +02:00
|
|
|
except socket.error:
|
|
|
|
return
|
2020-08-08 12:12:01 +02:00
|
|
|
sock.setblocking(0)
|
|
|
|
client = ClientConnection(self, sock)
|
|
|
|
self.clients[client.uid] = client
|
|
|
|
|
|
|
|
def _handle_disconnect(self):
|
|
|
|
for client in list(self.clients.values()):
|
|
|
|
client.close()
|
|
|
|
if self.sock is not None:
|
|
|
|
self.reactor.unregister_fd(self.fd_handle)
|
|
|
|
try:
|
|
|
|
self.sock.close()
|
|
|
|
except socket.error:
|
|
|
|
pass
|
|
|
|
|
|
|
|
def _remove_socket_file(self, file_path):
|
|
|
|
try:
|
|
|
|
os.remove(file_path)
|
|
|
|
except OSError:
|
|
|
|
if os.path.exists(file_path):
|
|
|
|
logging.exception(
|
|
|
|
"webhooks: Unable to delete socket file '%s'"
|
|
|
|
% (file_path))
|
|
|
|
raise
|
|
|
|
|
|
|
|
def pop_client(self, client_id):
|
|
|
|
self.clients.pop(client_id, None)
|
|
|
|
|
|
|
|
def send_all_clients(self, data):
|
|
|
|
for client in self.clients.values():
|
|
|
|
client.send(data)
|
|
|
|
|
|
|
|
class ClientConnection:
|
|
|
|
def __init__(self, server, sock):
|
|
|
|
self.printer = server.printer
|
|
|
|
self.webhooks = server.webhooks
|
|
|
|
self.reactor = server.reactor
|
|
|
|
self.server = server
|
|
|
|
self.uid = id(self)
|
|
|
|
self.sock = sock
|
2020-06-23 13:53:30 +02:00
|
|
|
self.fd_handle = self.reactor.register_fd(
|
2020-08-08 12:12:01 +02:00
|
|
|
self.sock.fileno(), self.process_received)
|
2020-08-08 21:04:55 +02:00
|
|
|
self.partial_data = self.send_buffer = ""
|
|
|
|
self.is_sending_data = False
|
2020-08-08 12:12:01 +02:00
|
|
|
logging.info(
|
|
|
|
"webhooks: New connection established")
|
2020-06-19 12:15:36 +02:00
|
|
|
|
2020-08-08 12:12:01 +02:00
|
|
|
def close(self):
|
|
|
|
if self.fd_handle is not None:
|
|
|
|
logging.info("webhooks: Client connection closed")
|
2020-06-23 13:53:30 +02:00
|
|
|
self.reactor.unregister_fd(self.fd_handle)
|
2020-08-08 12:12:01 +02:00
|
|
|
self.fd_handle = None
|
2020-06-19 12:15:36 +02:00
|
|
|
try:
|
2020-08-08 12:12:01 +02:00
|
|
|
self.sock.close()
|
2020-06-19 12:15:36 +02:00
|
|
|
except socket.error:
|
|
|
|
pass
|
2020-08-08 12:12:01 +02:00
|
|
|
self.server.pop_client(self.uid)
|
2020-06-19 12:15:36 +02:00
|
|
|
|
|
|
|
def process_received(self, eventtime):
|
|
|
|
try:
|
2020-08-08 12:12:01 +02:00
|
|
|
data = self.sock.recv(4096)
|
2020-06-19 12:15:36 +02:00
|
|
|
except socket.error as e:
|
|
|
|
# If bad file descriptor allow connection to be
|
|
|
|
# closed by the data check
|
|
|
|
if e.errno == errno.EBADF:
|
|
|
|
data = ''
|
|
|
|
else:
|
|
|
|
return
|
|
|
|
if data == '':
|
|
|
|
# Socket Closed
|
2020-08-08 12:12:01 +02:00
|
|
|
self.close()
|
2020-06-19 12:15:36 +02:00
|
|
|
return
|
|
|
|
requests = data.split('\x03')
|
|
|
|
requests[0] = self.partial_data + requests[0]
|
|
|
|
self.partial_data = requests.pop()
|
|
|
|
for req in requests:
|
|
|
|
logging.debug(
|
2020-08-08 12:12:01 +02:00
|
|
|
"webhooks: Request received: %s" % (req))
|
2020-06-19 12:15:36 +02:00
|
|
|
try:
|
2020-07-06 11:50:16 +02:00
|
|
|
web_request = WebRequest(json_loads_byteified(req))
|
2020-06-19 12:15:36 +02:00
|
|
|
except Exception:
|
|
|
|
logging.exception(
|
2020-08-08 12:12:01 +02:00
|
|
|
"webhooks: Error decoding Server Request %s"
|
2020-06-19 12:15:36 +02:00
|
|
|
% (req))
|
2020-07-06 11:50:16 +02:00
|
|
|
continue
|
|
|
|
self.reactor.register_callback(
|
2020-07-13 21:27:26 +02:00
|
|
|
lambda e, s=self, wr=web_request: s._process_request(wr))
|
2020-06-19 12:15:36 +02:00
|
|
|
|
2020-07-06 11:50:16 +02:00
|
|
|
def _process_request(self, web_request):
|
2020-06-19 12:15:36 +02:00
|
|
|
try:
|
|
|
|
func = self.webhooks.get_callback(
|
|
|
|
web_request.get_path())
|
|
|
|
func(web_request)
|
|
|
|
except homing.CommandError as e:
|
|
|
|
web_request.set_error(WebRequestError(e.message))
|
|
|
|
except Exception as e:
|
|
|
|
msg = "Internal Error on WebRequest: %s" % (web_request.get_path())
|
|
|
|
logging.exception(msg)
|
|
|
|
web_request.set_error(WebRequestError(e.message))
|
|
|
|
self.printer.invoke_shutdown(msg)
|
|
|
|
result = web_request.finish()
|
|
|
|
logging.debug(
|
2020-08-08 12:12:01 +02:00
|
|
|
"webhooks: Sending response - %s" % (str(result)))
|
2020-06-19 12:15:36 +02:00
|
|
|
self.send({'method': "response", 'params': result})
|
|
|
|
|
|
|
|
def send(self, data):
|
2020-08-08 21:04:55 +02:00
|
|
|
self.send_buffer += json.dumps(data) + "\x03"
|
|
|
|
if not self.is_sending_data:
|
|
|
|
self.is_sending_data = True
|
|
|
|
self.reactor.register_callback(self._do_send)
|
|
|
|
|
|
|
|
def _do_send(self, eventtime):
|
|
|
|
retries = 10
|
|
|
|
while self.send_buffer:
|
|
|
|
try:
|
|
|
|
sent = self.sock.send(self.send_buffer)
|
|
|
|
except socket.error as e:
|
|
|
|
if e.errno == errno.EBADF or e.errno == errno.EPIPE \
|
|
|
|
or not retries:
|
|
|
|
sent = 0
|
2020-06-19 12:15:36 +02:00
|
|
|
else:
|
2020-08-08 21:04:55 +02:00
|
|
|
retries -= 1
|
|
|
|
waketime = self.reactor.monotonic() + .001
|
|
|
|
self.reactor.pause(waketime)
|
|
|
|
continue
|
|
|
|
retries = 10
|
|
|
|
if sent > 0:
|
|
|
|
self.send_buffer = self.send_buffer[sent:]
|
|
|
|
else:
|
|
|
|
logging.info(
|
|
|
|
"webhooks: Error sending server data, closing socket")
|
|
|
|
self.close()
|
|
|
|
break
|
|
|
|
self.is_sending_data = False
|
2020-06-19 12:15:36 +02:00
|
|
|
|
|
|
|
class WebHooks:
|
|
|
|
def __init__(self, printer):
|
|
|
|
self.printer = printer
|
|
|
|
self._endpoints = {"list_endpoints": self._handle_list_endpoints}
|
|
|
|
self._static_paths = []
|
|
|
|
self.register_endpoint("info", self._handle_info_request)
|
|
|
|
self.register_endpoint("emergency_stop", self._handle_estop_request)
|
|
|
|
start_args = printer.get_start_args()
|
|
|
|
log_file = start_args.get('log_file')
|
2020-08-09 14:35:15 +02:00
|
|
|
cfg_file = start_args.get('config_file')
|
|
|
|
klipper_path = os.path.normpath(os.path.join(
|
|
|
|
os.path.dirname(__file__), ".."))
|
2020-06-19 12:15:36 +02:00
|
|
|
if log_file is not None:
|
|
|
|
self.register_static_path("klippy.log", log_file)
|
2020-08-09 14:35:15 +02:00
|
|
|
self.register_static_path("printer.cfg", cfg_file)
|
|
|
|
self.register_static_path("klippy_env", sys.executable)
|
|
|
|
self.register_static_path("klipper_path", klipper_path)
|
2020-08-08 12:12:01 +02:00
|
|
|
self.sconn = ServerSocket(self, printer)
|
2020-08-05 00:01:15 +02:00
|
|
|
StatusHandler(self)
|
2020-06-19 12:15:36 +02:00
|
|
|
|
2020-08-09 14:35:15 +02:00
|
|
|
# Register Events
|
|
|
|
printer.register_event_handler(
|
|
|
|
"klippy:connect", self._handle_connect)
|
|
|
|
printer.register_event_handler(
|
|
|
|
"klippy:shutdown", self._notify_shutdown)
|
|
|
|
|
|
|
|
def _handle_connect(self):
|
|
|
|
gcode = self.printer.lookup_object('gcode')
|
|
|
|
gcode.register_output_handler(self._process_gcode_response)
|
|
|
|
|
|
|
|
def _notify_shutdown(self):
|
|
|
|
self.call_remote_method("set_klippy_shutdown")
|
|
|
|
|
|
|
|
def _process_gcode_response(self, gc_response):
|
|
|
|
self.call_remote_method(
|
|
|
|
"process_gcode_response", response=gc_response)
|
|
|
|
|
2020-06-19 12:15:36 +02:00
|
|
|
def register_endpoint(self, path, callback):
|
|
|
|
if path in self._endpoints:
|
|
|
|
raise WebRequestError("Path already registered to an endpoint")
|
|
|
|
self._endpoints[path] = callback
|
|
|
|
|
|
|
|
def register_static_path(self, resource_id, file_path):
|
|
|
|
static_path_info = {
|
|
|
|
'resource_id': resource_id, 'file_path': file_path}
|
|
|
|
self._static_paths.append(static_path_info)
|
|
|
|
|
|
|
|
def _handle_list_endpoints(self, web_request):
|
|
|
|
web_request.send({
|
|
|
|
'hooks': self._endpoints.keys(),
|
|
|
|
'static_paths': self._static_paths})
|
|
|
|
|
|
|
|
def _handle_info_request(self, web_request):
|
|
|
|
if web_request.get_method() != 'GET':
|
|
|
|
raise web_request.error("Invalid Request Method")
|
|
|
|
start_args = self.printer.get_start_args()
|
2020-06-23 13:56:50 +02:00
|
|
|
state_message, msg_type = self.printer.get_state_message()
|
2020-06-19 12:15:36 +02:00
|
|
|
version = start_args['software_version']
|
|
|
|
cpu_info = start_args['cpu_info']
|
2020-06-23 13:56:50 +02:00
|
|
|
error = msg_type == "error"
|
2020-06-19 12:15:36 +02:00
|
|
|
web_request.send(
|
|
|
|
{'cpu': cpu_info, 'version': version,
|
|
|
|
'hostname': socket.gethostname(),
|
2020-06-23 13:56:50 +02:00
|
|
|
'is_ready': msg_type == "ready",
|
2020-06-19 12:15:36 +02:00
|
|
|
'error_detected': error,
|
|
|
|
'message': state_message})
|
|
|
|
|
|
|
|
def _handle_estop_request(self, web_request):
|
|
|
|
if web_request.get_method() != 'POST':
|
|
|
|
raise web_request.error("Invalid Request Method")
|
2020-08-04 22:03:20 +02:00
|
|
|
self.printer.invoke_shutdown("Shutdown due to webhooks request")
|
2020-06-19 12:15:36 +02:00
|
|
|
|
|
|
|
def get_connection(self):
|
|
|
|
return self.sconn
|
|
|
|
|
|
|
|
def get_callback(self, path):
|
|
|
|
cb = self._endpoints.get(path, None)
|
|
|
|
if cb is None:
|
|
|
|
msg = "webhooks: No registered callback for path '%s'" % (path)
|
|
|
|
logging.info(msg)
|
|
|
|
raise WebRequestError(msg)
|
|
|
|
return cb
|
2020-08-04 22:00:23 +02:00
|
|
|
|
2020-08-04 23:18:36 +02:00
|
|
|
def call_remote_method(self, method, **kwargs):
|
2020-08-08 12:12:01 +02:00
|
|
|
self.sconn.send_all_clients({'method': method, 'params': kwargs})
|
2020-08-04 23:18:36 +02:00
|
|
|
|
|
|
|
def _action_call_remote_method(self, method, **kwargs):
|
|
|
|
self.call_remote_method(method, **kwargs)
|
|
|
|
return ""
|
|
|
|
|
|
|
|
def get_status(self, eventtime=0.):
|
|
|
|
return {
|
|
|
|
"action_call_remote_method": self._action_call_remote_method
|
|
|
|
}
|
|
|
|
|
2020-08-05 00:01:15 +02:00
|
|
|
SUBSCRIPTION_REFRESH_TIME = .25
|
|
|
|
|
|
|
|
class StatusHandler:
|
|
|
|
def __init__(self, webhooks):
|
|
|
|
self.printer = webhooks.printer
|
|
|
|
self.webhooks = webhooks
|
|
|
|
self.ready = self.timer_started = False
|
|
|
|
self.reactor = self.printer.get_reactor()
|
|
|
|
self.available_objects = {}
|
|
|
|
self.subscriptions = {}
|
|
|
|
self.subscription_timer = self.reactor.register_timer(
|
|
|
|
self._batch_subscription_handler, self.reactor.NEVER)
|
|
|
|
|
|
|
|
# Register events
|
|
|
|
self.printer.register_event_handler(
|
|
|
|
"klippy:ready", self._handle_ready)
|
|
|
|
self.printer.register_event_handler(
|
|
|
|
"gcode:request_restart", self._handle_restart)
|
|
|
|
|
|
|
|
# Register webhooks
|
|
|
|
webhooks.register_endpoint(
|
|
|
|
"objects/list",
|
|
|
|
self._handle_object_request)
|
|
|
|
webhooks.register_endpoint(
|
|
|
|
"objects/status",
|
|
|
|
self._handle_status_request)
|
|
|
|
webhooks.register_endpoint(
|
|
|
|
"objects/subscription",
|
|
|
|
self._handle_subscription_request)
|
|
|
|
|
|
|
|
def _handle_ready(self):
|
|
|
|
eventtime = self.reactor.monotonic()
|
|
|
|
self.available_objects = {}
|
|
|
|
objs = self.printer.lookup_objects()
|
|
|
|
status_objs = {n: o for n, o in objs if hasattr(o, "get_status")}
|
|
|
|
for name, obj in status_objs.items():
|
|
|
|
attrs = obj.get_status(eventtime)
|
|
|
|
self.available_objects[name] = attrs.keys()
|
|
|
|
self.ready = True
|
|
|
|
|
|
|
|
def _handle_restart(self, eventtime):
|
|
|
|
self.ready = False
|
|
|
|
self.reactor.update_timer(self.subscription_timer, self.reactor.NEVER)
|
|
|
|
|
|
|
|
def _batch_subscription_handler(self, eventtime):
|
|
|
|
status = self._process_status_request(self.subscriptions, eventtime)
|
|
|
|
self.webhooks.call_remote_method(
|
|
|
|
"process_status_update", status=status)
|
|
|
|
return eventtime + SUBSCRIPTION_REFRESH_TIME
|
|
|
|
|
|
|
|
def _process_status_request(self, requested_objects, eventtime):
|
|
|
|
result = {}
|
|
|
|
if self.ready:
|
|
|
|
for name, req_items in requested_objects.items():
|
|
|
|
obj = self.printer.lookup_object(name, None)
|
|
|
|
if obj is not None and name in self.available_objects:
|
|
|
|
status = obj.get_status(eventtime)
|
|
|
|
if not req_items:
|
|
|
|
# return all items excluding callables
|
|
|
|
result[name] = {k: v for k, v in status.items()
|
|
|
|
if not callable(v)}
|
|
|
|
else:
|
|
|
|
# return requested items excluding callables
|
|
|
|
result[name] = {k: v for k, v in status.items()
|
|
|
|
if k in req_items and not callable(v)}
|
|
|
|
else:
|
|
|
|
result = {"status": "Klippy Not Ready"}
|
|
|
|
return result
|
|
|
|
|
|
|
|
def _handle_object_request(self, web_request):
|
|
|
|
if web_request.get_method() != 'GET':
|
|
|
|
raise web_request.error("Invalid Request Method")
|
|
|
|
web_request.send(dict(self.available_objects))
|
|
|
|
|
|
|
|
def _handle_status_request(self, web_request):
|
|
|
|
if web_request.get_method() != 'GET':
|
|
|
|
raise web_request.error("Invalid Request Method")
|
|
|
|
args = web_request.get_args()
|
|
|
|
eventtime = self.reactor.monotonic()
|
|
|
|
result = self._process_status_request(args, eventtime)
|
|
|
|
web_request.send(result)
|
|
|
|
|
|
|
|
def _handle_subscription_request(self, web_request):
|
|
|
|
method = web_request.get_method()
|
|
|
|
if method == 'POST':
|
|
|
|
# add a subscription
|
|
|
|
args = web_request.get_args()
|
|
|
|
if args:
|
|
|
|
self.add_subscripton(args)
|
|
|
|
else:
|
|
|
|
raise web_request.error("Invalid argument")
|
|
|
|
else:
|
|
|
|
# get subscription info
|
|
|
|
result = dict(self.subscriptions)
|
|
|
|
web_request.send(result)
|
|
|
|
|
|
|
|
def add_subscripton(self, new_sub):
|
|
|
|
if not new_sub:
|
|
|
|
return
|
|
|
|
for obj_name, req_items in new_sub.items():
|
|
|
|
if obj_name not in self.available_objects:
|
|
|
|
logging.info(
|
|
|
|
"webhooks: Object {%s} not available for subscription"
|
|
|
|
% (obj_name))
|
|
|
|
continue
|
|
|
|
# validate requested items
|
|
|
|
if req_items:
|
|
|
|
avail_items = set(self.available_objects[obj_name])
|
|
|
|
invalid_items = set(req_items) - avail_items
|
|
|
|
if invalid_items:
|
|
|
|
logging.info(
|
|
|
|
"webhooks: Removed invalid items [%s] from "
|
|
|
|
"subscription request %s" %
|
|
|
|
(", ".join(invalid_items), obj_name))
|
|
|
|
req_items = list(set(req_items) - invalid_items)
|
|
|
|
if not req_items:
|
|
|
|
# No valid items remaining
|
|
|
|
continue
|
|
|
|
# Add or update subscription
|
|
|
|
existing_items = self.subscriptions.get(obj_name, None)
|
|
|
|
if existing_items is not None:
|
|
|
|
if req_items == [] or existing_items == []:
|
|
|
|
# Subscribe to all items
|
|
|
|
self.subscriptions[obj_name] = []
|
|
|
|
else:
|
|
|
|
req_items = list(set(req_items) | set(existing_items))
|
|
|
|
self.subscriptions[obj_name] = req_items
|
|
|
|
else:
|
|
|
|
self.subscriptions[obj_name] = req_items
|
|
|
|
if not self.timer_started:
|
|
|
|
self.reactor.update_timer(self.subscription_timer, self.reactor.NOW)
|
|
|
|
self.timer_started = True
|
|
|
|
|
2020-08-04 22:00:23 +02:00
|
|
|
def add_early_printer_objects(printer):
|
|
|
|
printer.add_object('webhooks', WebHooks(printer))
|