ring-client-api 13.0.0-beta.3 → 13.0.0-beta.5

package/lib/api.js

@@ -123,14 +123,15 @@ class RingApi extends subscribed_1.Subscribed {
         }
     }
     async registerPushReceiver(cameras, intercoms) {
-        const credentials = this.restClient._internalOnly_pushNotificationCredentials, pushReceiver = new push_receiver_1.default({
+        const credentials = this.restClient._internalOnly_pushNotificationCredentials?.config &&
+            this.restClient._internalOnly_pushNotificationCredentials, pushReceiver = new push_receiver_1.default({
             firebase: {
                 apiKey: 'AIzaSyCv-hdFBmmdBBJadNy-TFwB-xN_H5m3Bk8',
                 projectId: 'ring-17770',
                 messagingSenderId: '876313859327', // for Ring android app.  703521446232 for ring-site
                 appId: '1:876313859327:android:e10ec6ddb3c81f39',
             },
-            credentials: credentials?.config ? credentials : undefined,
+            credentials,
             debug: false,
         }), devicesById = {}, sendToDevice = (id, notification) => {
             devicesById[id]?.processPushNotification(notification);
@@ -224,8 +225,10 @@ class RingApi extends subscribed_1.Subscribed {
                 (0, util_1.logError)(e);
             }
         });
-        // If we already have credentials, use them immediately
-        if (credentials) {
+        // If we already have credentials and they haven't been changed during registration, use them immediately
+        if (credentials &&
+            credentials?.fcm?.token ===
+                this.restClient._internalOnly_pushNotificationCredentials?.fcm?.token) {
             onPushNotificationToken.next(credentials.fcm.token);
         }
     }

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.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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ring-client-api",
-  "version": "13.0.0-beta.3",
+  "version": "13.0.0-beta.5",
   "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",