Skip to content

Send initial message for certain zwave_js ws subscriptions #71723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raman325 merged 3 commits into from
May 12, 2022
Merged

Send initial message for certain zwave_js ws subscriptions #71723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b57643
Send initial message for certain zwave_js ws subscriptions
raman325 May 12, 2022
a0deac7
Be consistent
raman325 May 12, 2022
f7d33b9
fix tests and bugs
raman325 May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions homeassistant/components/zwave_js/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1848,9 +1848,17 @@ def forward_finished(event: dict) -> None:
connection.subscriptions[msg["id"]] = async_cleanup

progress = node.firmware_update_progress
connection.send_result(
msg[ID], _get_firmware_update_progress_dict(progress) if progress else None
)
connection.send_result(msg[ID])
if progress:
connection.send_message(
websocket_api.event_message(
msg[ID],
{
"event": "firmware update progress",
**_get_firmware_update_progress_dict(progress),
},
)
)


class FirmwareUploadView(HomeAssistantView):
Expand Down Expand Up @@ -2011,8 +2019,16 @@ def forward_stats(event: dict) -> None:
]
connection.subscriptions[msg["id"]] = async_cleanup

connection.send_result(
msg[ID], _get_controller_statistics_dict(controller.statistics)
connection.send_result(msg[ID])
connection.send_message(
websocket_api.event_message(
msg[ID],
{
"event": "statistics updated",
"source": "controller",
**_get_controller_statistics_dict(controller.statistics),
},
)
)


Expand Down Expand Up @@ -2069,7 +2085,18 @@ def forward_stats(event: dict) -> None:
msg[DATA_UNSUBSCRIBE] = unsubs = [node.on("statistics updated", forward_stats)]
connection.subscriptions[msg["id"]] = async_cleanup

connection.send_result(msg[ID], _get_node_statistics_dict(node.statistics))
connection.send_result(msg[ID])
connection.send_message(
websocket_api.event_message(
msg[ID],
{
"event": "statistics updated",
"source": "node",
"nodeId": node.node_id,
**_get_node_statistics_dict(node.statistics),
},
)
)


@websocket_api.require_admin
Expand Down
24 changes: 21 additions & 3 deletions tests/components/zwave_js/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3477,7 +3477,14 @@ async def test_subscribe_firmware_update_status_initial_value(

msg = await ws_client.receive_json()
assert msg["success"]
assert msg["result"] == {"sent_fragments": 1, "total_fragments": 10}
assert msg["result"] is None

msg = await ws_client.receive_json()
assert msg["event"] == {
"event": "firmware update progress",
"sent_fragments": 1,
"total_fragments": 10,
}


async def test_subscribe_firmware_update_status_failures(
Expand Down Expand Up @@ -3686,7 +3693,12 @@ async def test_subscribe_controller_statistics(

msg = await ws_client.receive_json()
assert msg["success"]
assert msg["result"] == {
assert msg["result"] is None

msg = await ws_client.receive_json()
assert msg["event"] == {
"event": "statistics updated",
"source": "controller",
"messages_tx": 0,
"messages_rx": 0,
"messages_dropped_tx": 0,
Expand Down Expand Up @@ -3781,7 +3793,13 @@ async def test_subscribe_node_statistics(

msg = await ws_client.receive_json()
assert msg["success"]
assert msg["result"] == {
assert msg["result"] is None

msg = await ws_client.receive_json()
assert msg["event"] == {
"source": "node",
"event": "statistics updated",
"nodeId": multisensor_6.node_id,
"commands_tx": 0,
"commands_rx": 0,
"commands_dropped_tx": 0,
Expand Down