Avoid snapshot while recording on doorbell_graham_cracker

Closes #1280 Closes #1556
dgreif · Jan 12, 2025 · c4daf65 · c4daf65
1 parent 9a9cbeb
commit c4daf65
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/.changeset/blue-months-divide.md b/.changeset/blue-months-divide.md
@@ -0,0 +1,6 @@
+---
+'homebridge-ring': minor
+'ring-client-api': minor
+---
+
+Avoid snapshots while recording for doorbell_graham_cracker. This should allow notifications to work on these devices in homebridge.
diff --git a/packages/homebridge-ring/camera.ts b/packages/homebridge-ring/camera.ts
@@ -222,7 +222,7 @@ export class Camera extends BaseDataAccessory<RingCamera> {
      * followed shortly by a second notification with the image uuid. We need to
      * wait for the second notification before we can load the snapshot.
      */
-    if (this.device.operatingOnBattery && !imageUuid) {
+    if (!this.cameraSource.canTakeSnapshotWhileRecording && !imageUuid) {
       await Promise.race([
         firstValueFrom(
           this.device.onNewNotification.pipe(
@@ -233,12 +233,12 @@ export class Camera extends BaseDataAccessory<RingCamera> {
         delay(2000),
       ])
       imageUuid = this.device.latestNotificationSnapshotUuid
-    }
 
-    if (this.device.operatingOnBattery && !imageUuid) {
-      // battery cameras cannot fetch a new snapshot while recording is in progress
-      logInfo(this.device.name + ' ' + eventDescription)
-      return characteristicValue
+      if (!imageUuid) {
+        // did not receive an image uuid and one can't be taken while recording. Proceed without a snapshot
+        logInfo(this.device.name + ' ' + eventDescription)
+        return characteristicValue
+      }
     }
 
     logInfo(

diff --git a/packages/ring-client-api/ring-camera.ts b/packages/ring-client-api/ring-camera.ts
@@ -1,4 +1,4 @@
-import type { SocketTicketResponse, RingCameraKind } from './ring-types.ts'
+import { SocketTicketResponse, RingCameraKind } from './ring-types.ts'
 import {
   type CameraData,
   type CameraDeviceSettingsData,
@@ -123,6 +123,10 @@ export function cleanSnapshotUuid(uuid?: string | null) {
   return uuid.replace(/:.*$/, '')
 }
 
+const wiredModelsWithNoSnapshotDuringRecording = new Set([
+  RingCameraKind.doorbell_graham_cracker,
+])
+
 export class RingCamera extends Subscribed {
   id
   deviceType
@@ -279,6 +283,15 @@ export class RingCamera extends Subscribed {
     return this.hasBattery && this.data.settings.power_mode !== 'wired'
   }
 
+  get canTakeSnapshotWhileRecording() {
+    return (
+      !this.operatingOnBattery &&
+      !wiredModelsWithNoSnapshotDuringRecording.has(
+        this.data.kind as RingCameraKind,
+      )
+    )
+  }
+
   get isOffline() {
     return this.data.alerts.connection === 'offline'
   }
@@ -568,7 +581,7 @@ export class RingCamera extends Subscribed {
             },
       ),
       delay(maxSnapshotRefreshSeconds * 1000).then(() => {
-        const extraMessageForBatteryCam = this.operatingOnBattery
+        const extraMessageForBatteryCam = !this.canTakeSnapshotWhileRecording
           ? '.  This is normal behavior since this camera is unable to capture snapshots while streaming'
           : ''
         throw new Error(