From 597a1b5933019b63c4f4aad5afea748077edf0f4 Mon Sep 17 00:00:00 2001 From: Benjamin Braatz Date: Tue, 27 Jul 2021 03:46:39 +0200 Subject: [PATCH] Optional name and MAC in connection. --- controlpi_plugins/wsserver.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/controlpi_plugins/wsserver.py b/controlpi_plugins/wsserver.py index 17e7c29..0114f8c 100644 --- a/controlpi_plugins/wsserver.py +++ b/controlpi_plugins/wsserver.py @@ -66,7 +66,8 @@ class Connection: {'event': 'connection closed'})) self._bus.unregister(self._name) - self._name = message['name'] + if 'name' in message: + self._name = message['name'] sends = [] sends.append(MessageTemplate({'event': {'const': @@ -78,12 +79,13 @@ class Connection: sends.append(template) self._bus.register(self._name, 'WSServer', sends, message['down filter'], self._receive) - await self._bus.send(Message(self._name, - {'event': - 'connection opened', - 'address': self._address, - 'port': self._port, - 'mac': message['mac']})) + open_message = Message(self._name) + open_message['event'] = 'connection opened' + open_message['address'] = self._address + open_message['port'] = self._port + if 'mac' in message: + open_message['mac'] = message['mac'] + await self._bus.send(open_message) else: await self._bus.send(Message(self._name, message)) except ConnectionClosed: -- 2.34.1