homebridge-ring 11.7.0-beta.4 → 11.7.0-beta.6

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # homebridge-ring
 
+## 11.7.0-beta.6
+
+### Minor Changes
+
+- [`d49548f`](https://github.com/dgreif/ring/commit/d49548f9d563d2faf094899f9d120689ac4083f3) Thanks [@dgreif](https://github.com/dgreif)! - Detect unlock notification from intercom
+
+### Patch Changes
+
+- Updated dependencies [[`d49548f`](https://github.com/dgreif/ring/commit/d49548f9d563d2faf094899f9d120689ac4083f3)]:
+  - ring-client-api@11.7.0-beta.6
+
+## 11.7.0-beta.5
+
+### Minor Changes
+
+- [`f59e357`](https://github.com/dgreif/ring/commit/f59e35713fb82595a4f25f4226c660fb635896ed) Thanks [@dgreif](https://github.com/dgreif)! - Add true doorbell service for intercoms. This can trigger Homepods to chime when the intercom doorbell is pressed
+
+### Patch Changes
+
+- Updated dependencies []:
+  - ring-client-api@11.7.0-beta.5
+
 ## 11.7.0-beta.4
 
 ### Minor Changes

package/README.md

@@ -216,6 +216,7 @@ Note: Although homebridge has support for HomeKit Secure Video (HKSV), I will no
 Intercom support is still experimental. See [this issue](https://github.com/dgreif/ring/issues/1083) for more details
 
 - Unlock door
+- Doorbell which can cause Homepods to chime when the intercom doorbell is pressed
 - Programmable switch which is trigged when the intercom doorbell is pressed
 
 ### Alarm/Location Modes

package/lib/intercom.js

@@ -12,7 +12,29 @@ class Intercom extends base_data_accessory_1.BaseDataAccessory {
         this.accessory = accessory;
         this.config = config;
         this.unlocking = false;
-        const { Characteristic, Service } = hap_1.hap, lockService = this.getService(Service.LockMechanism), { LockCurrentState, LockTargetState, ProgrammableSwitchEvent } = Characteristic, programableSwitchService = this.getService(Service.StatelessProgrammableSwitch), onDoorbellPressed = device.onDing.pipe((0, operators_1.throttleTime)(15000), (0, operators_1.map)(() => ProgrammableSwitchEvent.SINGLE_PRESS));
+        const { Characteristic, Service } = hap_1.hap, lockService = this.getService(Service.LockMechanism), { LockCurrentState, LockTargetState, ProgrammableSwitchEvent } = Characteristic, programableSwitchService = this.getService(Service.StatelessProgrammableSwitch), onDoorbellPressed = device.onDing.pipe((0, operators_1.throttleTime)(15000), (0, operators_1.map)(() => ProgrammableSwitchEvent.SINGLE_PRESS)), syncLockState = () => {
+            const state = this.getLockState();
+            lockService
+                .getCharacteristic(Characteristic.LockCurrentState)
+                .updateValue(state);
+            lockService
+                .getCharacteristic(Characteristic.LockTargetState)
+                .updateValue(state);
+        }, markAsUnlocked = () => {
+            // Mark the lock as unlocked, wait 5 seconds, then mark it as locked again
+            clearTimeout(this.unlockTimeout);
+            this.unlocking = true;
+            // Update current state to reflect that the lock is unlocked
+            syncLockState();
+            // Leave the door in an "unlocked" state for 5 seconds
+            // After that, set the lock back to "locked" for both current and target state
+            this.unlockTimeout = setTimeout(() => {
+                this.unlocking = false;
+                syncLockState();
+            }, 5000);
+        };
+        // Subscribe to unlock events coming from push notifications, which will catch an unlock from the Ring app
+        device.onUnlocked.subscribe(markAsUnlocked);
         // Lock Service
         this.registerCharacteristic({
             characteristicType: LockCurrentState,
@@ -33,21 +55,7 @@ class Intercom extends base_data_accessory_1.BaseDataAccessory {
                         this.unlocking = false;
                     });
                     (0, util_1.logInfo)(`Unlock response: ${JSON.stringify(response)}`);
-                    // Update current state to reflect that the lock is unlocked
-                    lockService
-                        .getCharacteristic(Characteristic.LockCurrentState)
-                        .updateValue(this.getLockState());
-                    // Leave the door in an "unlocked" state for 5 seconds
-                    // After that, set the lock back to "locked" for both current and target state
-                    this.unlockTimeout = setTimeout(() => {
-                        this.unlocking = false;
-                        lockService
-                            .getCharacteristic(Characteristic.LockCurrentState)
-                            .updateValue(this.getLockState());
-                        lockService
-                            .getCharacteristic(Characteristic.LockTargetState)
-                            .updateValue(this.getLockState());
-                    }, 5000);
+                    markAsUnlocked();
                 }
                 else {
                     // If the user locks the door from the home app, we can't do anything but set the states back to "locked"
@@ -60,7 +68,12 @@ class Intercom extends base_data_accessory_1.BaseDataAccessory {
         });
         lockService.setPrimaryService(true);
         // Doorbell Service
-        // Note, the real DoorbellService doesn't work without a camera, so we just expose a single press programmable switch
+        this.registerObservableCharacteristic({
+            characteristicType: ProgrammableSwitchEvent,
+            serviceType: Service.Doorbell,
+            onValue: onDoorbellPressed,
+        });
+        // Programmable Switch Service
         this.registerObservableCharacteristic({
             characteristicType: ProgrammableSwitchEvent,
             serviceType: programableSwitchService,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ring",
-  "version": "11.7.0-beta.4",
+  "version": "11.7.0-beta.6",
   "description": "Homebridge plugin for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/index.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "dependencies": {
     "@homebridge/camera-utils": "^2.2.0",
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "ring-client-api": "11.7.0-beta.4"
+    "ring-client-api": "11.7.0-beta.6"
   },
   "devDependencies": {
     "concurrently": "^7.5.0",