homebridge-ring 11.7.2 → 11.7.4

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # homebridge-ring
 
+## 11.7.4
+
+### Patch Changes
+
+- [`8d19bdc`](https://github.com/dgreif/ring/commit/8d19bdc4b1fc609561788c47c2eaffda6e48b0ef) Thanks [@dgreif](https://github.com/dgreif)! - For battery cameras, wait up to 2 seconds for snapshot to be avaliable after a montion/ding event. These events often trigger an immediate notification without the snapshot uuid, quickly followed by a similar notification including the uuid. This new wait period should more consisitently provide a snapshot image for montion/ding notifications in HomeKit
+
+- [`28b68cb`](https://github.com/dgreif/ring/commit/28b68cb20fb03c9b1f468aab0602cbf462eeb299) Thanks [@dgreif](https://github.com/dgreif)! - Clean snapshot uuid before requesting image
+
+- Updated dependencies [[`28b68cb`](https://github.com/dgreif/ring/commit/28b68cb20fb03c9b1f468aab0602cbf462eeb299)]:
+  - ring-client-api@11.7.4
+
+## 11.7.3
+
+### Patch Changes
+
+- [`ede65a3`](https://github.com/dgreif/ring/commit/ede65a3dbe92b3562a0cf973cb6225999560c2e7) Thanks [@dgreif](https://github.com/dgreif)! - Update dependencies
+
+- Updated dependencies [[`ede65a3`](https://github.com/dgreif/ring/commit/ede65a3dbe92b3562a0cf973cb6225999560c2e7)]:
+  - ring-client-api@11.7.3
+
 ## 11.7.2
 
 ### Patch Changes

package/lib/camera.js

@@ -7,6 +7,7 @@ const operators_1 = require("rxjs/operators");
 const camera_source_1 = require("./camera-source");
 const target_value_timer_1 = require("./target-value-timer");
 const util_1 = require("ring-client-api/util");
+const rxjs_1 = require("rxjs");
 class Camera extends base_data_accessory_1.BaseDataAccessory {
     constructor(device, accessory, config) {
         super();
@@ -165,7 +166,20 @@ class Camera extends base_data_accessory_1.BaseDataAccessory {
         }
     }
     async loadSnapshotForEvent(eventDescription, characteristicValue) {
-        const latestNotification = this.device.latestNotification, imageUuid = latestNotification?.ding.image_uuid;
+        let imageUuid = this.device.latestNotificationSnapshotUuid;
+        /**
+         * Battery cameras may recieve an initial notification with no image uuid,
+         * 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) {
+            await Promise.race([
+                (0, rxjs_1.firstValueFrom)(this.device.onNewNotification.pipe((0, operators_1.filter)((notification) => Boolean(notification.ding.image_uuid)))),
+                // wait up to 2 seconds for the second notification
+                (0, util_1.delay)(2000),
+            ]);
+            imageUuid = this.device.latestNotificationSnapshotUuid;
+        }
         if (this.device.operatingOnBattery && !imageUuid) {
             // battery cameras cannot fetch a new snapshot while recording is in progress
             (0, util_1.logInfo)(this.device.name + ' ' + eventDescription);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ring",
-  "version": "11.7.2",
+  "version": "11.7.4",
   "description": "Homebridge plugin for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/index.js",
   "scripts": {
@@ -13,16 +13,16 @@
   "dependencies": {
     "@homebridge/camera-utils": "^2.2.0",
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "ring-client-api": "11.7.2"
+    "ring-client-api": "11.7.4"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
-    "eslint-config-shared": "0.0.0",
+    "eslint-config-shared": "*",
     "homebridge": "1.6.0",
-    "homebridge-ui": "0.0.0",
-    "nodemon": "^2.0.20",
-    "tsconfig": "0.0.0",
-    "typescript": "4.9.5"
+    "homebridge-ui": "*",
+    "nodemon": "^2.0.22",
+    "tsconfig": "*",
+    "typescript": "5.0.2"
   },
   "engines": {
     "node": "^16 || ^18",