Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 13 additions & 4 deletions ring_doorbell/listen/eventlistener.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,18 +320,27 @@ def _get_ring_event(self, msg_data: dict) -> RingEvent | None:
event_kind = PUSH_NOTIFICATION_KINDS.get(event_category, "Unknown")
device = data["device"]
event = data["event"]
event_id = int(event["ding"]["id"])
created_at = event["ding"]["created_at"]
ding = event["ding"]
event_id = ding.get("id")
if event_id is None:
event_id = event.get("eventito", {}).get("timestamp")
if event_id is None:
_logger.debug(
"Unexpected Ring event without an id. Full message is:\n%s",
json.dumps(msg_data),
)
return None
created_at = ding["created_at"]
create_seconds = parse_datetime(created_at).timestamp()
return RingEvent(
event_id,
int(event_id),
device["id"],
device_name=device.get("name"),
device_kind=device.get("kind"),
kind=event_kind,
now=create_seconds,
expires_in=DEFAULT_LISTEN_EVENT_EXPIRES_IN,
state=event["ding"]["subtype"],
state=ding["subtype"],
)

def _get_legacy_ring_event(self, gcm_data: dict) -> RingEvent | None:
Expand Down
45 changes: 45 additions & 0 deletions tests/test_listen.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,51 @@ async def test_active_dings(auth, mocker):
await listener.stop()


async def test_modern_event_uses_eventito_timestamp_when_ding_id_missing(
auth, mocker
):
"""Test a modern event without a ding ID uses its eventito timestamp."""
ring = Ring(auth)
listener = RingEventListener(ring)
await listener.start()
callback = mocker.Mock()
listener.add_notification_callback(callback)
msg = load_alert_v2("camera_motion", 123456782)
data = json.loads(msg["data"]["data"])
data["event"]["ding"].pop("id")
data["event"]["eventito"] = {"timestamp": 1772800029955, "type": "human"}
msg["data"]["data"] = json.dumps(data)

listener._on_notification(msg, "1234567")

event = callback.call_args.args[0]
assert event.id == 1772800029955
assert event.doorbot_id == 123456782
assert event.kind == "motion"

listener._on_notification(msg, "1234568")

assert callback.call_count == 2
assert callback.call_args.args[0].is_update is True


async def test_modern_event_without_identifier_is_ignored(auth, mocker):
"""Test a modern event without any stable identifier is ignored."""
ring = Ring(auth)
listener = RingEventListener(ring)
await listener.start()
callback = mocker.Mock()
listener.add_notification_callback(callback)
msg = load_alert_v2("camera_motion", 123456782)
data = json.loads(msg["data"]["data"])
data["event"]["ding"].pop("id")
msg["data"]["data"] = json.dumps(data)

listener._on_notification(msg, "1234567")

callback.assert_not_called()


async def test_ding_expirey(auth, mocker, freezer: FrozenDateTimeFactory):
ring = Ring(auth)
listener = RingEventListener(ring)
Expand Down