Add WS subscription command for MQTT (#21696)

* Add WS subscription command for MQTT

* Add test

* Add check for connected

* Rename event_listeners to subscriptions
This commit is contained in:
Paulus Schoutsen authored and GitHub committed 2019-03-10 20:07:09 -07:00
1 parent fc85b3fc5f
commit 429bbc05dc
6 files changed
+90 -17

No files matched your search

@@ -14,6 +14,7 @@ ActiveConnection = connection.ActiveConnection
BASE_COMMAND_MESSAGE_SCHEMA = messages.BASE_COMMAND_MESSAGE_SCHEMA
error_message = messages.error_message
result_message = messages.result_message
event_message = messages.event_message
async_response = decorators.async_response
require_admin = decorators.require_admin
ws_require_user = decorators.ws_require_user
@@ -24,15 +24,6 @@ def async_register_commands(hass):
async_reg(handle_ping)
def event_message(iden, event):
"""Return an event message."""
return {
'id': iden,
'type': 'event',
'event': event.as_dict(),
}
def pong_message(iden):
"""Return a pong message."""
return {
@@ -59,9 +50,11 @@ def handle_subscribe_events(hass, connection, msg):
if event.event_type == EVENT_TIME_CHANGED:
return
connection.send_message(event_message(msg['id'], event))
connection.send_message(messages.event_message(
msg['id'], event.as_dict()
))
connection.event_listeners[msg['id']] = hass.bus.async_listen(
connection.subscriptions[msg['id']] = hass.bus.async_listen(
msg['event_type'], forward_events)
connection.send_message(messages.result_message(msg['id']))
@@ -79,8 +72,8 @@ def handle_unsubscribe_events(hass, connection, msg):
"""
subscription = msg['subscription']
if subscription in connection.event_listeners:
connection.event_listeners.pop(subscription)()
if subscription in connection.subscriptions:
connection.subscriptions.pop(subscription)()
connection.send_message(messages.result_message(msg['id']))
else:
connection.send_message(messages.error_message(
@@ -21,7 +21,7 @@ class ActiveConnection:
else:
self.refresh_token_id = None
self.event_listeners = {}
self.subscriptions = {}
self.last_id = 0
def context(self, msg):
@@ -82,7 +82,7 @@ class ActiveConnection:
@callback
def async_close(self):
"""Close down connection."""
for unsub in self.event_listeners.values():
for unsub in self.subscriptions.values():
unsub()
@callback
@@ -40,3 +40,12 @@ def error_message(iden, code, message):
'message': message,
},
}
def event_message(iden, event):
"""Return an event message."""
return {
'id': iden,
'type': 'event',
'event': event,
}