ring-client-api 13.0.0-beta.4 → 13.0.0-beta.6

package/lib/api.js

@@ -202,23 +202,33 @@ class RingApi extends subscribed_1.Subscribed {
                     }
                 }
                 const notification = messageData;
-                if (!('android_config' in notification)) {
-                    // This is not a v2 ding style notification, so we can't process it
-                    (0, util_1.logInfo)('Received push notification in unknown format');
-                    (0, util_1.logInfo)(JSON.stringify(message));
-                    return;
+                if ('android_config' in notification) {
+                    const deviceId = notification.data?.device?.id;
+                    if (deviceId) {
+                        sendToDevice(deviceId, notification);
+                    }
+                    const eventCategory = notification.android_config.category;
+                    if (eventCategory !== ring_types_1.PushNotificationAction.Ding &&
+                        eventCategory !== ring_types_1.PushNotificationAction.Motion &&
+                        eventCategory !== ring_types_1.PushNotificationAction.IntercomDing) {
+                        (0, util_1.logDebug)('Received v2 push notification with unknown category: ' +
+                            eventCategory);
+                        (0, util_1.logDebug)(JSON.stringify(message));
+                    }
                 }
-                const deviceId = notification.data?.device?.id;
-                if (deviceId) {
-                    sendToDevice(deviceId, notification);
+                else if ('data' in notification &&
+                    'gcmData' in notification.data &&
+                    'alarm_meta' in notification.data.gcmData) {
+                    const deviceId = notification.data.gcmData.alarm_meta.device_zid;
+                    if (deviceId) {
+                        sendToDevice(deviceId, notification);
+                    }
                 }
-                const eventCategory = notification.android_config.category;
-                if (eventCategory !== ring_types_1.PushNotificationAction.Ding &&
-                    eventCategory !== ring_types_1.PushNotificationAction.Motion &&
-                    eventCategory !== ring_types_1.PushNotificationAction.IntercomDing) {
-                    (0, util_1.logInfo)('Received push notification with unknown category: ' +
-                        eventCategory);
-                    (0, util_1.logInfo)(JSON.stringify(message));
+                else {
+                    // This is not a v1 or v2 style notification, so we can't process it
+                    (0, util_1.logDebug)('Received push notification in unknown format');
+                    (0, util_1.logDebug)(JSON.stringify(message));
+                    return;
                 }
             }
             catch (e) {

package/lib/device-data.js

@@ -39,11 +39,11 @@ function stripSensitiveFields(input) {
             else {
                 const data = input[key];
                 if (key.length === 36) {
-                    input[key.substr(0, 13) + '-uuid'] = data;
+                    input[key.slice(0, 13) + '-uuid'] = data;
                     delete input[key];
                 }
                 if (typeof data === 'string' && data.length === 36) {
-                    input[key] = data.substr(0, 13) + '-uuid';
+                    input[key] = data.slice(0, 13) + '-uuid';
                 }
                 stripSensitiveFields(data);
             }

package/lib/ring-camera.d.ts

@@ -1,4 +1,4 @@
-import { CameraData, CameraDeviceSettingsData, CameraEventOptions, CameraEventResponse, CameraHealth, HistoryOptions, PeriodicFootageResponse, PushNotificationDingV2, VideoSearchResponse, OnvifCameraData, RingCameraKind } from './ring-types';
+import { CameraData, CameraDeviceSettingsData, CameraEventOptions, CameraEventResponse, CameraHealth, HistoryOptions, PeriodicFootageResponse, PushNotificationDingV2, VideoSearchResponse, OnvifCameraData, RingCameraKind, PushNotification } from './ring-types';
 import { RingRestClient } from './rest-client';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { DeepPartial } from './util';
@@ -61,7 +61,7 @@ export declare class RingCamera extends Subscribed {
     private createStreamingConnection;
     startLiveCall(options?: StreamingConnectionOptions): Promise<StreamingSession>;
     private removeDingById;
-    processPushNotification(notification: PushNotificationDingV2): void;
+    processPushNotification(notification: PushNotification): void;
     getEvents(options?: CameraEventOptions): Promise<CameraEventResponse & import("./rest-client").ExtendedResponse>;
     videoSearch({ dateFrom, dateTo, order }?: {
         dateFrom: number;

package/lib/ring-camera.js

@@ -79,8 +79,13 @@ class RingCamera extends subscribed_1.Subscribed {
         this.onActiveNotifications = new rxjs_1.BehaviorSubject([]);
         this.onDoorbellPressed = this.onNewNotification.pipe((0, operators_1.filter)((notification) => notification.android_config.category === ring_types_1.PushNotificationAction.Ding), (0, operators_1.share)());
         this.onMotionDetected = this.onActiveNotifications.pipe((0, operators_1.map)((notifications) => notifications.some((notification) => notification.android_config.category ===
-            ring_types_1.PushNotificationAction.Motion)), (0, operators_1.distinctUntilChanged)(), (0, operators_1.publishReplay)(1), (0, operators_1.refCount)());
-        this.onMotionStarted = this.onMotionDetected.pipe((0, operators_1.filter)((currentlyDetected) => currentlyDetected), (0, operators_1.mapTo)(null), // no value needed, event is what matters
+            ring_types_1.PushNotificationAction.Motion)), (0, operators_1.distinctUntilChanged)(), (0, operators_1.share)({
+            connector: () => new rxjs_1.ReplaySubject(1),
+            resetOnError: false,
+            resetOnComplete: false,
+            resetOnRefCountZero: false,
+        }));
+        this.onMotionStarted = this.onMotionDetected.pipe((0, operators_1.filter)((currentlyDetected) => currentlyDetected), (0, operators_1.map)(() => null), // no value needed, event is what matters
         (0, operators_1.share)());
         this.lastSnapshotTimestamp = 0;
         this.lastSnapshotTimestampLocal = 0;
@@ -265,7 +270,9 @@ class RingCamera extends subscribed_1.Subscribed {
         this.onActiveNotifications.next(otherDings);
     }
     processPushNotification(notification) {
-        if (!('ding' in notification.data?.event)) {
+        if (!('android_config' in notification) ||
+            !('event' in notification.data) ||
+            !('ding' in notification.data?.event)) {
             // only process ding/motion notifications
             return;
         }

package/lib/ring-intercom.d.ts

@@ -1,4 +1,4 @@
-import { IntercomHandsetAudioData, PushNotificationDingV2, PushNotificationIntercomUnlockV2 } from './ring-types';
+import { IntercomHandsetAudioData, PushNotification } from './ring-types';
 import { RingRestClient } from './rest-client';
 import { BehaviorSubject, Subject } from 'rxjs';
 export declare class RingIntercom {
@@ -22,5 +22,5 @@ export declare class RingIntercom {
     private doorbotUrl;
     subscribeToDingEvents(): Promise<void & import("./rest-client").ExtendedResponse>;
     unsubscribeFromDingEvents(): Promise<void & import("./rest-client").ExtendedResponse>;
-    processPushNotification(notification: PushNotificationDingV2 | PushNotificationIntercomUnlockV2): void;
+    processPushNotification(notification: PushNotification): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ring-client-api",
-  "version": "13.0.0-beta.4",
+  "version": "13.0.0-beta.6",
   "description": "Unofficial API for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/index.js",
   "exports": {
@@ -17,7 +17,7 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@eneris/push-receiver": "^4.1.4",
+    "@eneris/push-receiver": "4.1.3",
     "@homebridge/camera-utils": "^2.2.6",
     "@types/socket.io-client": "1.4.36",
     "colors": "1.4.0",