Skip to content

Add Wired Doorbell Plus (2nd Gen) support - #539

Open
danielcolquitt wants to merge 1 commit into
python-ring-doorbell:masterfrom
danielcolquitt:support-wired-doorbell-plus-2
Open

danielcolquitt wants to merge 1 commit into
python-ring-doorbell:masterfrom
danielcolquitt:support-wired-doorbell-plus-2

Conversation

@danielcolquitt

Copy link
Copy Markdown

Summary

  • Recognize cocoa_doorbell_v4w devices as Wired Doorbell Plus (2nd Gen) doorbells.
  • Enable ding, history, motion detection, pre-roll, video, and volume capabilities.
  • Avoid exposing unsupported battery and knock capabilities.
  • Add regression coverage for the new device mapping and capabilities.

Fixes #521

Testing

  • uv run pre-commit run --files ring_doorbell/const.py ring_doorbell/doorbot.py tests/test_ring.py --verbose
  • uv run pytest tests/ --force-enable-socket --cov=ring_doorbell --cov-report=xml --cov-report=term-missing --import-mode importlib
  • uv run docs\make.bat html

@danielcolquitt

Copy link
Copy Markdown
Author

Brief follow-up after a couple of weeks: this remains in production use against a real Wired Doorbell Plus (2nd Gen) reporting cocoa_doorbell_v4w, with the expected Home Assistant entities and capabilities working correctly.

I’m also very happy to help with, or contribute to, any broader tidy-up of the newer-device taxonomy if that would be useful, rather than treating this mapping in isolation.

Happy to adjust the PR if you’d prefer a different approach. Thanks for taking a look when you have time.

AMoo-Miki added a commit to AMoo-Miki/python-ring-cameras that referenced this pull request Oct 9, 2026
Upstream python-ring-doorbell has had no merges for months; this takes
what its open pull requests offer, adapted to this fork:

- WebRTC: _close() no longer awaits its own reader task when the stream
  closes from inside it (upstream python-ring-doorbell#548, python-ring-doorbell#534).
- New RingDoorBell.async_take_snapshot(): one request that returns a
  stored snapshot newer than max_age or captures a fresh one, via the
  endpoint ring-mqtt uses (upstream python-ring-doorbell#528). Existing snapshot methods
  are unchanged.
- Outdoor Cam Plus reports a battery from its health data when it says
  either way, so plug-in variants no longer get one; a camera whose
  battery died reports nothing and keeps it (upstream python-ring-doorbell#538, reworked).
- Device kinds: Battery Doorbell Pro 4K, Wired Doorbell Plus (2nd Gen),
  Wired Doorbell (doorbell_tahoe), Doorbell (2nd Gen) cocoa_doorbell_v3,
  Indoor Cam Plus, Spotlight Cam Pro 4K, Elite Cam 140/360 4K and
  Chime (2nd Gen) (upstream python-ring-doorbell#553, python-ring-doorbell#539, python-ring-doorbell#536, python-ring-doorbell#531, python-ring-doorbell#550).

Co-authored-by: Niels Haagsman <haagsman@gmail.com>
Co-authored-by: Adam Reeve <adam@adamreeve.com>
Co-authored-by: danielcolquitt <daniel@colquitt.xyz>
Co-authored-by: Tom Roberts <tom@tomroberts.co.uk>
Co-authored-by: ben79 <benjaminfearnley@gmail.com>
Co-authored-by: Aaron Wolen <aaron@wolen.com>
Co-authored-by: Yoan <yoan.cousin@proton.me>
AMoo-Miki added a commit to AMoo-Miki/python-ring-cameras that referenced this pull request Oct 9, 2026
Upstream python-ring-doorbell has had no merges for months; this takes what its open pull requests offer, adapted to this fork:

- WebRTC: _close() no longer awaits its own reader task when the stream closes from inside it (upstream python-ring-doorbell#548, python-ring-doorbell#534).
- New RingDoorBell.async_take_snapshot(): one request that returns a stored snapshot newer than max_age or captures a fresh one, via the endpoint ring-mqtt uses (upstream python-ring-doorbell#528). Existing snapshot methods are unchanged.
- Outdoor Cam Plus reports a battery from its health data when it says either way, so plug-in variants no longer get one; a camera whose battery died reports nothing and keeps it (upstream python-ring-doorbell#538, reworked).
- Device kinds: Battery Doorbell Pro 4K, Wired Doorbell Plus (2nd Gen), Wired Doorbell (doorbell_tahoe), Doorbell (2nd Gen) cocoa_doorbell_v3, Indoor Cam Plus, Spotlight Cam Pro 4K, Elite Cam 140/360 4K and Chime (2nd Gen) (upstream python-ring-doorbell#553, python-ring-doorbell#539, python-ring-doorbell#536, python-ring-doorbell#531, python-ring-doorbell#550).

Co-authored-by: Niels Haagsman <haagsman@gmail.com>
Co-authored-by: Adam Reeve <adam@adamreeve.com>
Co-authored-by: danielcolquitt <daniel@colquitt.xyz>
Co-authored-by: Tom Roberts <tom@tomroberts.co.uk>
Co-authored-by: ben79 <benjaminfearnley@gmail.com>
Co-authored-by: Aaron Wolen <aaron@wolen.com>
Co-authored-by: Yoan <yoan.cousin@proton.me>
AMoo-Miki added a commit to AMoo-Miki/python-ring-cameras that referenced this pull request Oct 16, 2026
Upstream python-ring-doorbell has had no merges for months; this takes what its open pull requests offer, adapted to this fork:

- WebRTC: _close() no longer awaits its own reader task when the stream closes from inside it (upstream python-ring-doorbell#548, python-ring-doorbell#534).
- New RingDoorBell.async_take_snapshot(): one request that returns a stored snapshot newer than max_age or captures a fresh one, via the endpoint ring-mqtt uses (upstream python-ring-doorbell#528). Existing snapshot methods are unchanged.
- Outdoor Cam Plus reports a battery from its health data when it says either way, so plug-in variants no longer get one; a camera whose battery died reports nothing and keeps it (upstream python-ring-doorbell#538, reworked).
- Device kinds: Battery Doorbell Pro 4K, Wired Doorbell Plus (2nd Gen), Wired Doorbell (doorbell_tahoe), Doorbell (2nd Gen) cocoa_doorbell_v3, Indoor Cam Plus, Spotlight Cam Pro 4K, Elite Cam 140/360 4K and Chime (2nd Gen) (upstream python-ring-doorbell#553, python-ring-doorbell#539, python-ring-doorbell#536, python-ring-doorbell#531, python-ring-doorbell#550).

Co-authored-by: Niels Haagsman <haagsman@gmail.com>
Co-authored-by: Adam Reeve <adam@adamreeve.com>
Co-authored-by: danielcolquitt <daniel@colquitt.xyz>
Co-authored-by: Tom Roberts <tom@tomroberts.co.uk>
Co-authored-by: ben79 <benjaminfearnley@gmail.com>
Co-authored-by: Aaron Wolen <aaron@wolen.com>
Co-authored-by: Yoan <yoan.cousin@proton.me>
AMoo-Miki added a commit to AMoo-Miki/python-ring-cameras that referenced this pull request Oct 16, 2026
Upstream python-ring-doorbell has had no merges for months; this takes what its open pull requests offer, adapted to this fork:

- WebRTC: _close() no longer awaits its own reader task when the stream closes from inside it (upstream python-ring-doorbell#548, python-ring-doorbell#534).
- New RingDoorBell.async_take_snapshot(): one request that returns a stored snapshot newer than max_age or captures a fresh one, via the endpoint ring-mqtt uses (upstream python-ring-doorbell#528). Existing snapshot methods are unchanged.
- Outdoor Cam Plus reports a battery from its health data when it says either way, so plug-in variants no longer get one; a camera whose battery died reports nothing and keeps it (upstream python-ring-doorbell#538, reworked).
- Device kinds: Battery Doorbell Pro 4K, Wired Doorbell Plus (2nd Gen), Wired Doorbell (doorbell_tahoe), Doorbell (2nd Gen) cocoa_doorbell_v3, Indoor Cam Plus, Spotlight Cam Pro 4K, Elite Cam 140/360 4K and Chime (2nd Gen) (upstream python-ring-doorbell#553, python-ring-doorbell#539, python-ring-doorbell#536, python-ring-doorbell#531, python-ring-doorbell#550).

Co-authored-by: Niels Haagsman <haagsman@gmail.com>
Co-authored-by: Adam Reeve <adam@adamreeve.com>
Co-authored-by: danielcolquitt <daniel@colquitt.xyz>
Co-authored-by: Tom Roberts <tom@tomroberts.co.uk>
Co-authored-by: ben79 <benjaminfearnley@gmail.com>
Co-authored-by: Aaron Wolen <aaron@wolen.com>
Co-authored-by: Yoan <yoan.cousin@proton.me>
AMoo-Miki added a commit to AMoo-Miki/python-ring-cameras that referenced this pull request Oct 16, 2026
Upstream python-ring-doorbell has had no merges for months; this takes what its open pull requests offer, adapted to this fork:

- WebRTC: _close() no longer awaits its own reader task when the stream closes from inside it (upstream python-ring-doorbell#548, python-ring-doorbell#534).
- New RingDoorBell.async_take_snapshot(): one request that returns a stored snapshot newer than max_age or captures a fresh one, via the endpoint ring-mqtt uses (upstream python-ring-doorbell#528). Existing snapshot methods are unchanged.
- Outdoor Cam Plus reports a battery from its health data when it says either way, so plug-in variants no longer get one; a camera whose battery died reports nothing and keeps it (upstream python-ring-doorbell#538, reworked).
- Device kinds: Battery Doorbell Pro 4K, Wired Doorbell Plus (2nd Gen), Wired Doorbell (doorbell_tahoe), Doorbell (2nd Gen) cocoa_doorbell_v3, Indoor Cam Plus, Spotlight Cam Pro 4K, Elite Cam 140/360 4K and Chime (2nd Gen) (upstream python-ring-doorbell#553, python-ring-doorbell#539, python-ring-doorbell#536, python-ring-doorbell#531, python-ring-doorbell#550).

Co-authored-by: Niels Haagsman <haagsman@gmail.com>
Co-authored-by: Adam Reeve <adam@adamreeve.com>
Co-authored-by: danielcolquitt <daniel@colquitt.xyz>
Co-authored-by: Tom Roberts <tom@tomroberts.co.uk>
Co-authored-by: ben79 <benjaminfearnley@gmail.com>
Co-authored-by: Aaron Wolen <aaron@wolen.com>
Co-authored-by: Yoan <yoan.cousin@proton.me>
@trulyshelton

Copy link
Copy Markdown

Confirming this mapping against a real cocoa_doorbell_v4w, because the user-visible impact is worse than a wrong model name.

Device data from the Ring integration diagnostics (IDs/emails stripped):

What breaks in Home Assistant 2026.10.4 (ring-doorbell 0.9.14) with the kind unmapped: the device registers as "Unknown Doorbell", has_capability() is False for ding/motion_detection/video, so HA never creates the event.<doorbell>_ding and event.<doorbell>_motion entities. Those entities are the only listeners on the integration's RingListenCoordinator, and that coordinator only starts RingEventListener once it has a listener — so there is no realtime push at all and everything falls back to the one minute polling coordinator, which is not configurable.

Measured on this doorbell from the HA recorder over 11 days / 120 events: median 62s from the event created_at to the HA state write, p90 90s, worst cases over 8 minutes, while the notification dispatch itself is sub-second. So the missing mapping costs about a minute of latency on every motion and press, not just a cosmetic model name.

The diff here matches that device data. I have not run the branch against a live install, so treat this as device-data confirmation rather than a functional test — worth checking that the pre-roll entity and the event entities both appear after the mapping lands.

I also opened #562 for the part this PR cannot cover: unmapped doorbell kinds keep ding/motion/video and log the kind once, so users are not left with a dead doorbell (and a reportable kind) while a per-model mapping like this one is pending. Both can land independently.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add support for Ring Wired Video Doorbell Plus (2nd Gen)

2 participants