Skip to content

Matter Camera: Prevent duplicate zones in triggeredZones report #3008

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

Open
ctowns wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Matter Camera: Prevent duplicate zones in triggeredZones report #3008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 26 additions & 8 deletions drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_handlers/event_handlers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,46 @@

local camera_fields = require "sub_drivers.camera.camera_utils.fields"
local capabilities = require "st.capabilities"
local switch_utils = require "switch_utils.utils"

local CameraEventHandlers = {}

local function has_triggered_zone(triggered_zones, zone_id)
for _, zone in ipairs(triggered_zones or {}) do
if zone.zoneId == zone_id then
return true
end
end
return false
end

function CameraEventHandlers.zone_triggered_handler(driver, device, ib, response)
local triggered_zones = device:get_field(camera_fields.TRIGGERED_ZONES) or {}
if not switch_utils.tbl_contains(triggered_zones, ib.data.elements.zone.value) then
Copy link
Copy Markdown
Contributor

@hcarter-775 hcarter-775 May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit but could be cool. Maybe leave the generic tbl_contains but expand that fn to optionally take a key to compare.

like

function tbl_contains(array, element, match_key)

where in this case match_key would be zoneId.

table.insert(triggered_zones, {zoneId = ib.data.elements.zone.value})
local zone_id = ib.data.elements.zone.value
if not has_triggered_zone(triggered_zones, zone_id) then
table.insert(triggered_zones, { zoneId = zone_id })
device:set_field(camera_fields.TRIGGERED_ZONES, triggered_zones)
device:emit_event_for_endpoint(ib, capabilities.zoneManagement.triggeredZones(triggered_zones))
end
end

function CameraEventHandlers.zone_stopped_handler(driver, device, ib, response)
local triggered_zones = device:get_field(camera_fields.TRIGGERED_ZONES) or {}
for i, v in pairs(triggered_zones) do
if v.zoneId == ib.data.elements.zone.value then
table.remove(triggered_zones, i)
device:set_field(camera_fields.TRIGGERED_ZONES, triggered_zones)
device:emit_event_for_endpoint(ib, capabilities.zoneManagement.triggeredZones(triggered_zones))
local zone_id = ib.data.elements.zone.value
local updated_triggered_zones = {}
local zone_removed = false

for _, zone in ipairs(triggered_zones) do
if zone.zoneId ~= zone_id then
table.insert(updated_triggered_zones, zone)
else
zone_removed = true
end
end

if zone_removed then
device:set_field(camera_fields.TRIGGERED_ZONES, updated_triggered_zones)
device:emit_event_for_endpoint(ib, capabilities.zoneManagement.triggeredZones(updated_triggered_zones))
end
end

return CameraEventHandlers
41 changes: 41 additions & 0 deletions drivers/SmartThings/matter-switch/src/test/test_matter_camera.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1471,6 +1471,47 @@ test.register_coroutine_test(
}
)

test.register_coroutine_test(
"Duplicate ZoneTriggered events should not duplicate triggeredZones state",
function()
update_device_profile()
test.wait_for_events()

test.socket.matter:__queue_receive({
mock_device.id,
clusters.ZoneManagement.events.ZoneTriggered:build_test_event_report(mock_device, CAMERA_EP, {
zone = 2,
reason = clusters.ZoneManagement.types.ZoneEventTriggeredReasonEnum.MOTION
})
})
test.socket.capability:__expect_send(
mock_device:generate_test_message("main", capabilities.zoneManagement.triggeredZones({{zoneId = 2}}))
)

test.socket.matter:__queue_receive({
mock_device.id,
clusters.ZoneManagement.events.ZoneTriggered:build_test_event_report(mock_device, CAMERA_EP, {
zone = 2,
reason = clusters.ZoneManagement.types.ZoneEventTriggeredReasonEnum.MOTION
})
})

test.socket.matter:__queue_receive({
mock_device.id,
clusters.ZoneManagement.events.ZoneStopped:build_test_event_report(mock_device, CAMERA_EP, {
zone = 2,
reason = clusters.ZoneManagement.types.ZoneEventStoppedReasonEnum.ACTION_STOPPED
})
})
test.socket.capability:__expect_send(
mock_device:generate_test_message("main", capabilities.zoneManagement.triggeredZones({}))
)
end,
{
min_api_version = 17
}
)

test.register_coroutine_test(
"Button events should generate appropriate events",
function()
Expand Down
Loading