Add onDing observable to intercoms

dgreif · Dec 12, 2022 · c084848 · c084848
1 parent 836c580
commit c084848
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/.changeset/tough-melons-impress.md b/.changeset/tough-melons-impress.md
@@ -0,0 +1,5 @@
+---
+'ring-client-api': minor
+---
+
+Add onDing observable to intercoms, which will be triggered by ding push notifications
diff --git a/packages/ring-client-api/api.ts b/packages/ring-client-api/api.ts
@@ -211,15 +211,22 @@ export class RingApi extends Subscribed {
     }
   }
 
-  async registerPushReceiver(cameras: RingCamera[]) {
+  private async registerPushReceiver(
+    cameras: RingCamera[],
+    intercoms: RingIntercom[]
+  ) {
     const pushReceiver = new PushReceiver({
         logLevel: 'NONE',
         senderId: '876313859327', // for Ring android app.  703521446232 for ring-site
       }),
-      camerasById = cameras.reduce((byId, camera) => {
-        byId[camera.id] = camera
-        return byId
-      }, {} as { [id: number]: RingCamera })
+      devicesById: { [id: number]: RingCamera | RingIntercom } = {}
+
+    for (const camera of cameras) {
+      devicesById[camera.id] = camera
+    }
+    for (const intercom of intercoms) {
+      devicesById[intercom.id] = intercom
+    }
 
     pushReceiver.onCredentialsChanged(
       async ({
@@ -259,7 +266,7 @@ export class RingApi extends Subscribed {
           return
         }
 
-        camerasById[notification.ding.doorbot_id]?.processPushNotification(
+        devicesById[notification.ding.doorbot_id]?.processPushNotification(
           notification
         )
       } catch (e) {
@@ -357,7 +364,7 @@ export class RingApi extends Subscribed {
         )
 
     this.listenForDeviceUpdates(cameras, ringChimes, ringIntercoms)
-    this.registerPushReceiver(cameras).catch((e) => {
+    this.registerPushReceiver(cameras, ringIntercoms).catch((e) => {
       logError(e)
     })
 

diff --git a/packages/ring-client-api/ring-intercom.ts b/packages/ring-client-api/ring-intercom.ts
@@ -1,4 +1,8 @@
-import { IntercomHandsetAudioData } from './ring-types'
+import {
+  IntercomHandsetAudioData,
+  PushNotification,
+  PushNotificationAction,
+} from './ring-types'
 import { clientApi, commandsApi, RingRestClient } from './rest-client'
 import { BehaviorSubject, Subject } from 'rxjs'
 import { distinctUntilChanged, map } from 'rxjs/operators'
@@ -11,6 +15,7 @@ export class RingIntercom {
   onData
   onRequestUpdate = new Subject()
   onBatteryLevel
+  onDing = new Subject<void>()
 
   constructor(
     private initialData: IntercomHandsetAudioData,
@@ -96,4 +101,10 @@ export class RingIntercom {
       url: this.doorbotUrl('unsubscribe'),
     })
   }
+
+  processPushNotification(notification: PushNotification) {
+    if (notification.action === PushNotificationAction.Ding) {
+      this.onDing.next()
+    }
+  }
 }
diff --git a/packages/ring-client-api/ring-types.ts b/packages/ring-client-api/ring-types.ts
@@ -1001,6 +1001,8 @@ export enum NotificationDetectionType {
 export enum PushNotificationAction {
   Ding = 'com.ring.push.HANDLE_NEW_DING',
   Motion = 'com.ring.push.HANDLE_NEW_motion',
+  LowBattery = 'com.ring.push.LOW_BATTERY_ALERT',
+  IntercomUnlock = 'com.ring.push.INTERCOM_UNLOCK_FROM_APP',
 }
 
 export interface PushNotification {