Skip to content

Emit OnOffClientClusterHandler attribute_updated events first #642

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
TheJulianJES merged 2 commits into from
Feb 3, 2026
Merged

Emit OnOffClientClusterHandler attribute_updated events first #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
352a7de
Reorder `attribute_updated` events in `OnOffClientClusterHandler`
TheJulianJES Feb 2, 2026
b0915b0
Update cluster handler tests
TheJulianJES Feb 2, 2026
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
3 changes: 2 additions & 1 deletion tests/test_cluster_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,8 +1242,8 @@ async def test_zha_send_event_from_quirk(zha_gateway: Gateway):
on_off_ch.cluster_command(1, OnOff.ServerCommandDefs.on.id, [])

assert on_off_ch.emit_zha_event.call_count == 2
# attribute_updated is emitted first, then the cluster command is forwarded
assert on_off_ch.emit_zha_event.mock_calls == [
call("on", []),
call(
"attribute_updated",
{
Expand All @@ -1253,6 +1253,7 @@ async def test_zha_send_event_from_quirk(zha_gateway: Gateway):
"value": t.Bool.true,
},
),
call("on", []),
]
on_off_ch.emit_zha_event.reset_mock()

Expand Down
7 changes: 4 additions & 3 deletions zha/zigbee/cluster_handlers/general.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,11 +552,9 @@ def on_off(self) -> bool | None:

def cluster_command(self, tsn, command_id, args):
"""Handle commands received to this cluster."""
# for emitting ZHA event
super().cluster_command(tsn, command_id, args)

cmd = parse_and_log_command(self, tsn, command_id, args)

# Process cluster commands, so attribute_updated events fire first
if cmd in (
OnOff.ServerCommandDefs.off.name,
OnOff.ServerCommandDefs.off_with_effect.name,
Expand Down Expand Up @@ -588,6 +586,9 @@ def cluster_command(self, tsn, command_id, args):
OnOff.AttributeDefs.on_off.id, not bool(self.on_off)
)

# Emit ZHA event with cluster command
super().cluster_command(tsn, command_id, args)

def set_to_off(self, *_):
"""Set the state to off."""
self._off_listener = None
Expand Down
Loading