homebridge-ring 14.2.0 → 15.0.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # homebridge-ring
 
+## 15.0.0-beta.0
+
+### Major Changes
+
+- [#1846](https://github.com/dgreif/ring/pull/1846) [`2a6371d`](https://github.com/dgreif/ring/commit/2a6371d0890e35a80bf97fb1e1ccfa2a7c283b4e) Thanks [@dgreif](https://github.com/dgreif)! - Drop Node.js 20 support and upgrade undici to 8.x. Requires Node.js 22.19.0+ (22.x), 24.x, or 26.x; earlier 22.x releases are no longer supported.
+
+### Patch Changes
+
+- [#1892](https://github.com/dgreif/ring/pull/1892) [`8c9b637`](https://github.com/dgreif/ring/commit/8c9b63740f9d1bcd30a12922325eb58ac68e4cf9) Thanks [@dgreif](https://github.com/dgreif)! - Prevent failed volume, brightness, dimmer, and fan-speed writes from crashing Homebridge. Log failures and restore the last reported Ring level without overwriting newer requests.
+
+- [#1886](https://github.com/dgreif/ring/pull/1886) [`78ae341`](https://github.com/dgreif/ring/commit/78ae341e990aa18517402a4e3809a51d3692678d) Thanks [@dgreif](https://github.com/dgreif)! - Never overwrite the stored refresh token when Ring's oauth response has no `refresh_token`. Previously, an undecodable response (for example Node.js 26 with an older undici) saved a token without `rt`, which caused permanent `invalid_grant` errors until a new token was generated
+
+- [#1871](https://github.com/dgreif/ring/pull/1871) [`c72026d`](https://github.com/dgreif/ring/commit/c72026d72c7b9ccb9ef45b4f64c6affd86d85df2) Thanks [@dgreif](https://github.com/dgreif)! - Restore the reported location mode when a HomeKit mode change fails, without overwriting newer requests. Preserve pending Home mode targets until Ring confirms them.
+
+- [#1746](https://github.com/dgreif/ring/pull/1746) [`25c6ec6`](https://github.com/dgreif/ring/commit/25c6ec63a9826f42f3f4269d0c2aad6f1e0e4185) Thanks [@kzaky](https://github.com/kzaky)! - Redact the 2FA code from the homebridge-ui server log on token exchange. Codes are short-lived and single-use, but logs are frequently pasted into bug reports, so removing the value from the log is a small defensive improvement.
+
+- [#1838](https://github.com/dgreif/ring/pull/1838) [`c78c8b3`](https://github.com/dgreif/ring/commit/c78c8b3fadb0650d210d1220d2724309aec02611) Thanks [@dgreif](https://github.com/dgreif)! - Updated dependencies
+
+- [#1840](https://github.com/dgreif/ring/pull/1840) [`5e4afd4`](https://github.com/dgreif/ring/commit/5e4afd43e88802e62bfc8acab743433d9bfaabfa) Thanks [@dgreif](https://github.com/dgreif)! - Bump werift to 0.26.0 (clears `ip` audit) and accept partial ICE candidates for Ring signaling
+- Updated dependencies [[`e368e26`](https://github.com/dgreif/ring/commit/e368e26f789f4ca2093ac015dcec4bc9ce181d62), [`003c0d0`](https://github.com/dgreif/ring/commit/003c0d0740cedd3c393ce86baf628d7e5bc26c86), [`98f0cb3`](https://github.com/dgreif/ring/commit/98f0cb3f87473c168f4cb369ae26d486030e059e), [`bb781fe`](https://github.com/dgreif/ring/commit/bb781fe5ea8616c568a6f7d8e05a0d15fd472104), [`78ae341`](https://github.com/dgreif/ring/commit/78ae341e990aa18517402a4e3809a51d3692678d), [`2a6371d`](https://github.com/dgreif/ring/commit/2a6371d0890e35a80bf97fb1e1ccfa2a7c283b4e), [`c78c8b3`](https://github.com/dgreif/ring/commit/c78c8b3fadb0650d210d1220d2724309aec02611), [`5e4afd4`](https://github.com/dgreif/ring/commit/5e4afd43e88802e62bfc8acab743433d9bfaabfa)]:
+  - ring-client-api@15.0.0-beta.0
+
+## 14.3.0
+
+### Minor Changes
+
+- [#1706](https://github.com/dgreif/ring/pull/1706) [`8381520`](https://github.com/dgreif/ring/commit/8381520f86d7d7813f670e3887b43d92542f0a41) Thanks [@copilot-swe-agent](https://github.com/apps/copilot-swe-agent)! - Add support for Ring Chime Pro nightlight
+
+- [#1705](https://github.com/dgreif/ring/pull/1705) [`5360c16`](https://github.com/dgreif/ring/commit/5360c16f91d8680a20e68b2dd28e63cc0108c241) Thanks [@copilot-swe-agent](https://github.com/apps/copilot-swe-agent)! - Block streaming from cameras based on location mode settings. This may prevent you from streaming in cases where you could previously stream in HomeKit but not the Ring app.
+
+- [#1707](https://github.com/dgreif/ring/pull/1707) [`5a8c844`](https://github.com/dgreif/ring/commit/5a8c844ffe4adc39e8a517628b26611fac36ef0a) Thanks [@copilot-swe-agent](https://github.com/apps/copilot-swe-agent)! - Add support for Kidde Ring Smoke + CO Alarm device (comp.bluejay.sensor_bluejay_wsc). Note, this has not been tested and may not be working yet.
+
+### Patch Changes
+
+- [`875f024`](https://github.com/dgreif/ring/commit/875f024c5f27c55785d7250bc78eff0fda0a4aa9) Thanks [@dgreif](https://github.com/dgreif)! - Update dependencies
+
+- Updated dependencies [[`8381520`](https://github.com/dgreif/ring/commit/8381520f86d7d7813f670e3887b43d92542f0a41), [`875f024`](https://github.com/dgreif/ring/commit/875f024c5f27c55785d7250bc78eff0fda0a4aa9), [`5360c16`](https://github.com/dgreif/ring/commit/5360c16f91d8680a20e68b2dd28e63cc0108c241), [`5a8c844`](https://github.com/dgreif/ring/commit/5a8c844ffe4adc39e8a517628b26611fac36ef0a)]:
+  - ring-client-api@14.3.0
+
 ## 14.2.0
 
 ### Minor Changes

package/lib/base-accessory.js

@@ -1,7 +1,7 @@
-import { hap } from "./hap.js";
+import { hap } from './hap.js';
 import { shareReplay, take } from 'rxjs/operators';
 import { firstValueFrom } from 'rxjs';
-import { debug } from "./config.js";
+import { debug } from './config.js';
 import { logError, logInfo } from 'ring-client-api/util';
 function isServiceInstance(serviceType) {
     return typeof serviceType === 'object';

package/lib/base-data-accessory.js

@@ -1,10 +1,10 @@
-import { BaseAccessory } from "./base-accessory.js";
-import { Subject } from 'rxjs';
+import { BaseAccessory } from './base-accessory.js';
+import { merge, Subject } from 'rxjs';
 import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators';
 import { logError } from 'ring-client-api/util';
 export class BaseDataAccessory extends BaseAccessory {
     registerCharacteristic({ characteristicType, serviceType, getValue, setValue, setValueDebounceTime = 0, name, requestUpdate, serviceSubType, }) {
-        const service = this.getService(serviceType, name, serviceSubType), characteristic = service.getCharacteristic(characteristicType), { device } = this;
+        const service = this.getService(serviceType, name, serviceSubType), characteristic = service.getCharacteristic(characteristicType), { device } = this, onValue = new Subject();
         if (requestUpdate) {
             // Only register for GET if an async request should be made to get an updated value
             characteristic.on("get" /* CharacteristicEventTypes.GET */, (callback) => {
@@ -21,10 +21,17 @@ export class BaseDataAccessory extends BaseAccessory {
         if (setValue && setValueDebounceTime) {
             const onValueToSet = new Subject();
             characteristic.on("set" /* CharacteristicEventTypes.SET */, (newValue, callback) => {
+                onValue.next(newValue);
                 onValueToSet.next(newValue);
                 callback();
             });
-            onValueToSet.pipe(debounceTime(setValueDebounceTime)).subscribe(setValue);
+            onValueToSet
+                .pipe(debounceTime(setValueDebounceTime))
+                .subscribe((value) => {
+                Promise.resolve()
+                    .then(() => setValue(value))
+                    .catch(logError);
+            });
         }
         else if (setValue) {
             characteristic.on("set" /* CharacteristicEventTypes.SET */, (newValue, callback) => {
@@ -32,14 +39,14 @@ export class BaseDataAccessory extends BaseAccessory {
                 callback();
             });
         }
-        ;
-        this.device.onData
-            .pipe(map(getValue), distinctUntilChanged())
+        merge(this.device.onData.pipe(map(getValue)), onValue)
+            .pipe(distinctUntilChanged())
             .subscribe((value) => characteristic.updateValue(value));
+        return (value) => onValue.next(value);
     }
     registerLevelCharacteristic({ characteristicType, serviceType, getValue, setValue, requestUpdate, }) {
-        let targetLevel;
-        this.registerCharacteristic({
+        let targetLevel, levelRequestId = 0;
+        const updateValue = this.registerCharacteristic({
             characteristicType,
             serviceType,
             getValue: (data) => {
@@ -49,9 +56,19 @@ export class BaseDataAccessory extends BaseAccessory {
                 }
                 return targetLevel === undefined ? newLevel : targetLevel;
             },
-            setValue: (level) => {
+            setValue: async (level) => {
+                const requestId = ++levelRequestId;
                 targetLevel = level;
-                setValue(level);
+                try {
+                    await setValue(level);
+                }
+                catch (e) {
+                    if (requestId === levelRequestId) {
+                        targetLevel = undefined;
+                        updateValue(getValue(this.device.data));
+                    }
+                    throw e;
+                }
             },
             setValueDebounceTime: 500,
             requestUpdate,

package/lib/base-device-accessory.js

@@ -1,5 +1,5 @@
-import { hap } from "./hap.js";
-import { BaseDataAccessory } from "./base-data-accessory.js";
+import { hap } from './hap.js';
+import { BaseDataAccessory } from './base-data-accessory.js';
 function getBatteryLevel({ batteryLevel, batteryStatus }) {
     if (batteryLevel !== undefined) {
         return batteryLevel;

package/lib/beam.js

@@ -1,6 +1,6 @@
 import { RingDeviceType } from 'ring-client-api';
-import { hap } from "./hap.js";
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
+import { hap } from './hap.js';
+import { BaseDeviceAccessory } from './base-device-accessory.js';
 import { logInfo } from 'ring-client-api/util';
 export class Beam extends BaseDeviceAccessory {
     isLightGroup;

package/lib/brightness-only.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 import { logInfo } from 'ring-client-api/util';
 export class BrightnessOnly extends BaseDeviceAccessory {
     device;

package/lib/camera-source.js

@@ -1,4 +1,4 @@
-import { hap } from "./hap.js";
+import { hap } from './hap.js';
 import { generateSrtpOptions, ReturnAudioTranscoder, RtpSplitter, } from '@homebridge/camera-utils';
 import { logDebug, logError, logInfo } from 'ring-client-api/util';
 import { debounceTime, delay, take } from 'rxjs/operators';

package/lib/camera.js

@@ -1,8 +1,8 @@
-import { hap } from "./hap.js";
-import { BaseDataAccessory } from "./base-data-accessory.js";
+import { hap } from './hap.js';
+import { BaseDataAccessory } from './base-data-accessory.js';
 import { filter, map, switchMap, throttleTime } from 'rxjs/operators';
-import { CameraSource } from "./camera-source.js";
-import { TargetValueTimer } from "./target-value-timer.js";
+import { CameraSource } from './camera-source.js';
+import { TargetValueTimer } from './target-value-timer.js';
 import { delay, logError, logInfo } from 'ring-client-api/util';
 import { firstValueFrom } from 'rxjs';
 export class Camera extends BaseDataAccessory {

package/lib/chime.js

@@ -1,5 +1,5 @@
-import { hap } from "./hap.js";
-import { BaseDataAccessory } from "./base-data-accessory.js";
+import { hap } from './hap.js';
+import { BaseDataAccessory } from './base-data-accessory.js';
 import { logInfo } from 'ring-client-api/util';
 const minutesFor24Hours = 24 * 60;
 export class Chime extends BaseDataAccessory {
@@ -11,7 +11,7 @@ export class Chime extends BaseDataAccessory {
         this.device = device;
         this.accessory = accessory;
         this.config = config;
-        const { Characteristic, Service } = hap, snoozeService = this.getService(Service.Switch, device.name + ' Snooze', 'snooze'), playDingService = this.getService(Service.Switch, device.name + ' Play Ding', 'play-ding'), playMotionService = this.getService(Service.Switch, device.name + ' Play Motion', 'play-motion');
+        const { Characteristic, Service } = hap, snoozeService = this.getService(Service.Switch, device.name + ' Snooze', 'snooze'), playDingService = this.getService(Service.Switch, device.name + ' Play Ding', 'play-ding'), playMotionService = this.getService(Service.Switch, device.name + ' Play Motion', 'play-motion'), hasNightlight = device.data.settings.night_light_settings !== undefined;
         // Snooze Switch
         this.registerCharacteristic({
             characteristicType: Characteristic.On,
@@ -82,6 +82,20 @@ export class Chime extends BaseDataAccessory {
             },
             requestUpdate: () => device.requestUpdate(),
         });
+        // Nightlight (if supported)
+        if (hasNightlight) {
+            const nightlightService = this.getService(Service.Lightbulb, device.name + ' Nightlight', 'nightlight');
+            this.registerCharacteristic({
+                characteristicType: Characteristic.On,
+                serviceType: nightlightService,
+                getValue: (data) => Boolean(data.settings.night_light_settings?.light_sensor_enabled),
+                setValue: (enabled) => {
+                    logInfo(`${device.name} nightlight ${enabled ? 'enabled' : 'disabled'}`);
+                    return device.setNightlightEnabled(enabled);
+                },
+                requestUpdate: () => device.requestUpdate(),
+            });
+        }
         // Accessory Information Service
         this.registerCharacteristic({
             characteristicType: Characteristic.Manufacturer,

package/lib/co-alarm.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 export class CoAlarm extends BaseDeviceAccessory {
     device;
     accessory;

package/lib/contact-sensor.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 export class ContactSensor extends BaseDeviceAccessory {
     device;
     accessory;

package/lib/fan.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 import { logInfo } from 'ring-client-api/util';
 export class Fan extends BaseDeviceAccessory {
     device;

package/lib/flood-freeze-sensor.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 import { logInfo } from 'ring-client-api/util';
 export class FloodFreezeSensor extends BaseDeviceAccessory {

package/lib/freeze-sensor.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 import { logInfo } from 'ring-client-api/util';
 export class FreezeSensor extends BaseDeviceAccessory {

package/lib/homebridge-ui/server.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { HomebridgePluginUiServer, RequestError, } from '@homebridge/plugin-ui-utils';
-import { RingRestClient } from 'ring-client-api/rest-client';
-import { controlCenterDisplayName, getSystemId } from "../config.js";
+import { InvalidAuthResponseError, RingRestClient, } from 'ring-client-api/rest-client';
+import { controlCenterDisplayName, getSystemId } from '../config.js';
 class PluginUiServer extends HomebridgePluginUiServer {
     restClient;
     constructor() {
@@ -36,12 +36,16 @@ class PluginUiServer extends HomebridgePluginUiServer {
     generateToken = async ({ email, password, code }) => {
         // use the existing restClient to avoid sending a token again
         this.restClient = this.restClient || new RingRestClient({ email, password });
-        console.log(`Getting token for ${email} with code ${code}`);
+        console.log(`Getting token for ${email}`);
         try {
             const authResponse = await this.restClient.getAuth(code);
             return { refreshToken: authResponse.refresh_token };
         }
         catch (e) {
+            if (e instanceof InvalidAuthResponseError) {
+                console.error(e);
+                throw new RequestError(e.message, e);
+            }
             console.error('Incorrect 2fa Code');
             throw new RequestError('Please check the code and try again', e);
         }

package/lib/index.js

@@ -1,5 +1,5 @@
-import { platformName, pluginName, RingPlatform } from "./ring-platform.js";
-import { setHap } from "./hap.js";
+import { platformName, pluginName, RingPlatform } from './ring-platform.js';
+import { setHap } from './hap.js';
 export default function (homebridge) {
     setHap(homebridge.hap);
     homebridge.registerPlatform(pluginName, platformName, RingPlatform, true);

package/lib/intercom.js

@@ -1,5 +1,5 @@
-import { hap } from "./hap.js";
-import { BaseDataAccessory } from "./base-data-accessory.js";
+import { hap } from './hap.js';
+import { BaseDataAccessory } from './base-data-accessory.js';
 import { logError, logInfo } from 'ring-client-api/util';
 import { map, throttleTime } from 'rxjs/operators';
 export class Intercom extends BaseDataAccessory {

package/lib/location-mode-switch.js

@@ -1,7 +1,7 @@
 import { distinctUntilChanged } from 'rxjs/operators';
-import { hap } from "./hap.js";
+import { hap } from './hap.js';
 import { logError, logInfo } from 'ring-client-api/util';
-import { BaseAccessory } from "./base-accessory.js";
+import { BaseAccessory } from './base-accessory.js';
 import { firstValueFrom, of } from 'rxjs';
 function getStateFromMode(mode) {
     const { Characteristic: { SecuritySystemCurrentState: State }, } = hap;
@@ -18,6 +18,7 @@ function getStateFromMode(mode) {
 }
 export class LocationModeSwitch extends BaseAccessory {
     targetState;
+    modeRequestId = 0;
     device;
     location;
     accessory;
@@ -36,7 +37,7 @@ export class LocationModeSwitch extends BaseAccessory {
             if (state === this.targetState) {
                 this.targetState = undefined;
             }
-            if (!this.targetState) {
+            if (this.targetState === undefined) {
                 targetState.updateValue(state);
             }
             currentState.updateValue(state);
@@ -58,28 +59,53 @@ export class LocationModeSwitch extends BaseAccessory {
                 : await getCurrentState());
         });
         targetState.on("set" /* CharacteristicEventTypes.SET */, async (state, callback) => {
-            const { Characteristic: { SecuritySystemTargetState: State }, } = hap;
+            const { Characteristic: { SecuritySystemTargetState: State }, } = hap, requestId = ++this.modeRequestId;
             callback();
-            if (state === State.NIGHT_ARM) {
-                state = State.STAY_ARM;
-                // Ring doesn't have night mode, so switch over to stay mode
-                setTimeout(() => targetState.updateValue(state), 100);
+            try {
+                const current = await getCurrentState();
+                if (requestId !== this.modeRequestId) {
+                    return;
+                }
+                if (state === State.NIGHT_ARM) {
+                    state = State.STAY_ARM;
+                    // Ring doesn't have night mode, so switch over to stay mode
+                    setTimeout(() => {
+                        if (requestId === this.modeRequestId) {
+                            targetState.updateValue(state);
+                        }
+                    }, 100);
+                }
+                if (state === current) {
+                    this.targetState = undefined;
+                    return;
+                }
+                this.targetState = state;
+                if (state === State.AWAY_ARM) {
+                    logInfo(`Setting ${this.location.name} Mode to away`);
+                    await this.location.setLocationMode('away');
+                }
+                else if (state === State.DISARM) {
+                    logInfo(`Setting ${this.location.name} Mode to disarmed`);
+                    await this.location.setLocationMode('disarmed');
+                }
+                else {
+                    logInfo(`Setting ${this.location.name} Mode to home`);
+                    await this.location.setLocationMode('home');
+                }
             }
-            if (state === (await getCurrentState())) {
-                this.targetState = undefined;
-                return;
-            }
-            this.targetState = state;
-            if (state === State.AWAY_ARM) {
-                logInfo(`Setting ${this.location.name} Mode to away`);
-                return this.location.setLocationMode('away');
-            }
-            else if (state === State.DISARM) {
-                logInfo(`Setting ${this.location.name} Mode to disarmed`);
-                return this.location.setLocationMode('disarmed');
+            catch (e) {
+                logError('Failed to set location mode for ' + location.name);
+                logError(e);
+                if (requestId !== this.modeRequestId) {
+                    return;
+                }
+                const current = await getCurrentState();
+                if (requestId === this.modeRequestId) {
+                    this.targetState = undefined;
+                    this.modeRequestId++;
+                    targetState.updateValue(current);
+                }
             }
-            logInfo(`Setting ${this.location.name} Mode to home`);
-            return this.location.setLocationMode('home');
         });
         targetState.setProps({
             validValues: [

package/lib/lock.js

@@ -1,6 +1,6 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
 import { distinctUntilChanged } from 'rxjs/operators';
-import { hap } from "./hap.js";
+import { hap } from './hap.js';
 function getCurrentState({ locked }) {
     const { Characteristic: { LockCurrentState: State }, } = hap;
     switch (locked) {

package/lib/motion-sensor.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 export class MotionSensor extends BaseDeviceAccessory {
     device;
     accessory;

package/lib/multi-level-switch.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 import { logInfo } from 'ring-client-api/util';
 export class MultiLevelSwitch extends BaseDeviceAccessory {
     device;

package/lib/outlet.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 import { logInfo } from 'ring-client-api/util';
 export class Outlet extends BaseDeviceAccessory {
     device;

package/lib/panic-buttons.js

@@ -1,5 +1,5 @@
-import { hap } from "./hap.js";
-import { BaseDataAccessory } from "./base-data-accessory.js";
+import { hap } from './hap.js';
+import { BaseDataAccessory } from './base-data-accessory.js';
 import { logInfo } from 'ring-client-api/util';
 const burglarStates = [
     'burglar-alarm',

package/lib/ring-platform.js

@@ -1,32 +1,32 @@
 import { RingApi, RingCamera, RingChime, RingDevice, RingDeviceCategory, RingDeviceType, RingIntercom, } from 'ring-client-api';
-import { hap } from "./hap.js";
-import { SecurityPanel } from "./security-panel.js";
-import { Chime } from "./chime.js";
-import { BrightnessOnly } from "./brightness-only.js";
-import { ContactSensor } from "./contact-sensor.js";
-import { MotionSensor } from "./motion-sensor.js";
-import { Lock } from "./lock.js";
-import { SmokeAlarm } from "./smoke-alarm.js";
-import { CoAlarm } from "./co-alarm.js";
-import { SmokeCoListener } from "./smoke-co-listener.js";
-import { controlCenterDisplayName, debug, getSystemId, updateHomebridgeConfig, } from "./config.js";
-import { Beam } from "./beam.js";
-import { MultiLevelSwitch } from "./multi-level-switch.js";
-import { Fan } from "./fan.js";
-import { Outlet } from "./outlet.js";
-import { Switch } from "./switch.js";
-import { Camera } from "./camera.js";
-import { PanicButtons } from "./panic-buttons.js";
+import { hap } from './hap.js';
+import { SecurityPanel } from './security-panel.js';
+import { Chime } from './chime.js';
+import { BrightnessOnly } from './brightness-only.js';
+import { ContactSensor } from './contact-sensor.js';
+import { MotionSensor } from './motion-sensor.js';
+import { Lock } from './lock.js';
+import { SmokeAlarm } from './smoke-alarm.js';
+import { CoAlarm } from './co-alarm.js';
+import { SmokeCoListener } from './smoke-co-listener.js';
+import { controlCenterDisplayName, debug, getSystemId, updateHomebridgeConfig, } from './config.js';
+import { Beam } from './beam.js';
+import { MultiLevelSwitch } from './multi-level-switch.js';
+import { Fan } from './fan.js';
+import { Outlet } from './outlet.js';
+import { Switch } from './switch.js';
+import { Camera } from './camera.js';
+import { PanicButtons } from './panic-buttons.js';
 import { logInfo, useLogger } from 'ring-client-api/util';
-import { FloodFreezeSensor } from "./flood-freeze-sensor.js";
-import { FreezeSensor } from "./freeze-sensor.js";
-import { TemperatureSensor } from "./temperature-sensor.js";
-import { WaterSensor } from "./water-sensor.js";
-import { LocationModeSwitch } from "./location-mode-switch.js";
-import { Thermostat } from "./thermostat.js";
-import { UnknownZWaveSwitchSwitch } from "./unknown-zwave-switch.js";
-import { Intercom } from "./intercom.js";
-import { Valve } from "./valve.js";
+import { FloodFreezeSensor } from './flood-freeze-sensor.js';
+import { FreezeSensor } from './freeze-sensor.js';
+import { TemperatureSensor } from './temperature-sensor.js';
+import { WaterSensor } from './water-sensor.js';
+import { LocationModeSwitch } from './location-mode-switch.js';
+import { Thermostat } from './thermostat.js';
+import { UnknownZWaveSwitchSwitch } from './unknown-zwave-switch.js';
+import { Intercom } from './intercom.js';
+import { Valve } from './valve.js';
 const ignoreHiddenDeviceTypes = [
     RingDeviceType.RingNetAdapter,
     RingDeviceType.ZigbeeAdapter,
@@ -39,7 +39,7 @@ const ignoreHiddenDeviceTypes = [
 ];
 export const platformName = 'Ring';
 export const pluginName = 'homebridge-ring';
-function getAccessoryClass(device) {
+export function getAccessoryClass(device) {
     const { deviceType } = device;
     if (device.data.status === 'disabled') {
         return null;
@@ -67,6 +67,7 @@ function getAccessoryClass(device) {
         case RingDeviceType.CoAlarm:
             return CoAlarm;
         case RingDeviceType.SmokeCoListener:
+        case RingDeviceType.KiddeSmokeCoAlarm:
             return SmokeCoListener;
         case RingDeviceType.BeamsMotionSensor:
         case RingDeviceType.BeamsSwitch:
@@ -228,8 +229,7 @@ export class RingPlatform {
                 }
                 const createHomebridgeAccessory = () => {
                     const accessory = new api.platformAccessory(displayName, uuid, isCamera
-                        ? 17 /* hap.Categories.CAMERA */
-                        : 11 /* hap.Categories.SECURITY_SYSTEM */);
+                        ? 17 /* hap.Categories.CAMERA */ : 11 /* hap.Categories.SECURITY_SYSTEM */);
                     if (isCamera) {
                         logInfo(`Configured camera ${uuid} ${deviceType} ${displayName}`);
                         externalAccessories.push(accessory);

package/lib/security-panel.js

@@ -1,6 +1,6 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
 import { allAlarmStates, RingDeviceType } from 'ring-client-api';
-import { hap } from "./hap.js";
+import { hap } from './hap.js';
 import { logError, logInfo } from 'ring-client-api/util';
 function isValidNightModeBypass(mode) {
     return mode && (mode === 'all' || mode === 'some');
@@ -45,7 +45,7 @@ export class SecurityPanel extends BaseDeviceAccessory {
                 characteristicType: Characteristic.On,
                 serviceType: Service.Switch,
                 name: this.device.name + ' Siren',
-                getValue: (data) => data.siren && data.siren.state === 'on',
+                getValue: (data) => Boolean(data.siren && data.siren.state === 'on'),
                 setValue: (value) => {
                     if (value) {
                         return this.device.location.soundSiren();

package/lib/smoke-alarm.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 export class SmokeAlarm extends BaseDeviceAccessory {
     device;
     accessory;

package/lib/smoke-co-listener.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 export class SmokeCoListener extends BaseDeviceAccessory {
     device;
     accessory;
@@ -14,7 +14,9 @@ export class SmokeCoListener extends BaseDeviceAccessory {
             characteristicType: SmokeDetected,
             serviceType: SmokeSensor,
             getValue: (data) => {
-                return data.smoke && data.smoke.alarmStatus === 'active'
+                const smokeAlarmStatus = data.smoke?.alarmStatus ??
+                    data.components?.['alarm.smoke']?.alarmStatus;
+                return smokeAlarmStatus === 'active'
                     ? SmokeDetected.SMOKE_DETECTED
                     : SmokeDetected.SMOKE_NOT_DETECTED;
             },
@@ -23,7 +25,8 @@ export class SmokeCoListener extends BaseDeviceAccessory {
             characteristicType: CarbonMonoxideDetected,
             serviceType: CarbonMonoxideSensor,
             getValue: (data) => {
-                return data.co && data.co.alarmStatus === 'active'
+                const coAlarmStatus = data.co?.alarmStatus ?? data.components?.['alarm.co']?.alarmStatus;
+                return coAlarmStatus === 'active'
                     ? CarbonMonoxideDetected.CO_LEVELS_ABNORMAL
                     : CarbonMonoxideDetected.CO_LEVELS_NORMAL;
             },

package/lib/switch.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 import { logInfo } from 'ring-client-api/util';
 export class Switch extends BaseDeviceAccessory {
     device;

package/lib/temperature-sensor.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 export class TemperatureSensor extends BaseDeviceAccessory {
     device;

package/lib/thermostat.js

@@ -2,8 +2,8 @@ import { combineLatest } from 'rxjs';
 import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
 import { RingDeviceType } from 'ring-client-api';
 import { logDebug, logError, logInfo } from 'ring-client-api/util';
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 export class Thermostat extends BaseDeviceAccessory {
     onTemperature;
     device;

package/lib/unknown-zwave-switch.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 import { logInfo } from 'ring-client-api/util';
 export class UnknownZWaveSwitchSwitch extends BaseDeviceAccessory {
     device;

package/lib/valve.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 import { logInfo } from 'ring-client-api/util';
 export class Valve extends BaseDeviceAccessory {
     device;

package/lib/water-sensor.js

@@ -1,5 +1,5 @@
-import { BaseDeviceAccessory } from "./base-device-accessory.js";
-import { hap } from "./hap.js";
+import { BaseDeviceAccessory } from './base-device-accessory.js';
+import { hap } from './hap.js';
 import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 import { logInfo } from 'ring-client-api/util';
 export class WaterSensor extends BaseDeviceAccessory {

package/package.json

@@ -1,32 +1,33 @@
 {
   "name": "homebridge-ring",
   "displayName": "Ring",
-  "version": "14.2.0",
+  "version": "15.0.0-beta.0",
   "description": "Homebridge plugin for Ring doorbells, cameras, security alarm system and smart lighting",
   "type": "module",
   "main": "lib/index.js",
   "scripts": {
-    "build": "rm -rf lib && tsc && cp -r ./homebridge-ui/public ./lib/homebridge-ui/public/",
+    "build": "rm -rf lib && tsc && cp -r ./homebridge-ui/public ./lib/homebridge-ui/public/ && rm -rf ./lib/test",
     "lint": "eslint .",
-    "dev": "concurrently -c yellow,blue --kill-others \"npm:dev:build\" \"npm:dev:run\" ",
-    "dev:build": "tsc --watch --preserveWatchOutput",
-    "dev:run": "RING_DEBUG=true node --watch ../../node_modules/.bin/homebridge -U ../../.homebridge"
+    "test": "vitest run",
+    "dev": "bash ./dev-homebridge.sh",
+    "dev:run": "npm run dev"
   },
   "dependencies": {
     "@homebridge/camera-utils": "^3.0.0",
-    "@homebridge/plugin-ui-utils": "^2.1.0",
-    "ring-client-api": "14.2.0",
-    "werift": "0.22.2"
+    "@homebridge/plugin-ui-utils": "^2.2.7",
+    "ring-client-api": "15.0.0-beta.0",
+    "werift": "0.26.0"
   },
   "devDependencies": {
-    "concurrently": "^9.2.1",
+    "@homebridge/hap-nodejs": "^2.3.0",
     "eslint-config-shared": "*",
-    "homebridge": "1.11.1",
+    "homebridge": "2.5.0",
     "tsconfig": "*",
-    "typescript": "5.9.3"
+    "typescript": "7.0.2",
+    "vitest": "^5.1.0"
   },
   "engines": {
-    "node": "^20 || ^22 || ^24",
+    "node": "^22.19.0 || ^24 || ^26",
     "homebridge": ">=1.4.0 || ^2.0.0-beta.0"
   },
   "repository": {