diff --git a/lib/tfw/message_sender.py b/lib/tfw/message_sender.py index ab05e13..138d25d 100644 --- a/lib/tfw/message_sender.py +++ b/lib/tfw/message_sender.py @@ -7,15 +7,18 @@ from .networking.server_connector import ServerUplinkConnector class MessageSender: def __init__(self, custom_anchor=None): self.server_connector = ServerUplinkConnector() - if isinstance(custom_anchor, str): - custom_anchor = custom_anchor.encode('utf-8') - self.anchor = custom_anchor or b'message' + if isinstance(custom_anchor, bytes): + custom_anchor = custom_anchor.decode('utf-8') + self.anchor = custom_anchor or 'message' def send(self, originator, message): - response = { + data = { 'originator': originator, 'timestamp': datetime.now().isoformat(), 'message': message } - encoded_response = json.dumps(response).encode('utf-8') - self.server_connector.send(self.anchor, encoded_response) + response = { + 'anchor': self.anchor, + 'data': data + } + self.server_connector.send(*[frame.encode('utf-8') for frame in (self.anchor, json.dumps(response))])