homebridge-unifi-protect 6.19.0 → 6.21.0

package/dist/devices/protect-camera.js

@@ -1,13 +1,11 @@
+import { ProtectReservedNames, toCamelCase } from "../protect-types.js";
 import { PROTECT_HOMEKIT_IDR_INTERVAL } from "../settings.js";
 import { ProtectDevice } from "./protect-device.js";
-import { ProtectReservedNames } from "../protect-types.js";
 import { ProtectStreamingDelegate } from "../protect-stream.js";
 export class ProtectCamera extends ProtectDevice {
     hasHksv;
     isDeleted;
-    isDoorbellConfigured;
     isRinging;
-    isVideoConfigured;
     detectLicensePlate;
     rtspEntries;
     rtspQuality;
@@ -16,11 +14,9 @@ export class ProtectCamera extends ProtectDevice {
     // Create an instance.
     constructor(nvr, device, accessory) {
         super(nvr, accessory);
-        this.isDoorbellConfigured = false;
         this.hasHksv = false;
         this.isDeleted = false;
         this.isRinging = false;
-        this.isVideoConfigured = false;
         this.detectLicensePlate = [];
         this.rtspEntries = [];
         this.rtspQuality = {};
@@ -35,6 +31,7 @@ export class ProtectCamera extends ProtectDevice {
         this.hints.crop = this.hasFeature("Video.Crop");
         this.hints.hardwareDecoding = true;
         this.hints.hardwareTranscoding = this.hasFeature("Video.Transcode.Hardware");
+        this.hints.highResSnapshots = this.hasFeature("Video.HighResSnapshots");
         this.hints.ledStatus = this.ufp.featureFlags.hasLedStatus && this.hasFeature("Device.StatusLed");
         this.hints.logDoorbell = this.hasFeature("Log.Doorbell");
         this.hints.logHksv = this.hasFeature("Log.HKSV");
@@ -48,29 +45,13 @@ export class ProtectCamera extends ProtectDevice {
     }
     // Configure a camera accessory for HomeKit.
     async configureDevice() {
-        // Default to enabling motion detection.
-        let detectMotion = true;
-        // Save the motion detection switch state before we wipeout the context.
-        if ("detectMotion" in this.accessory.context) {
-            detectMotion = this.accessory.context.detectMotion;
-        }
-        // Default to disabling the dynamic bitrate setting.
-        let dynamicBitrate = false;
-        // Save the dynamic bitrate switch state before we wipeout the context.
-        if ("dynamicBitrate" in this.accessory.context) {
-            dynamicBitrate = this.accessory.context.dynamicBitrate;
-        }
-        // Default to enabling HKSV recording.
-        let hksvRecording = true;
-        // Save the HKSV recording switch state before we wipeout the context.
-        if ("hksvRecording" in this.accessory.context) {
-            hksvRecording = this.accessory.context.hksvRecording;
-        }
+        // Save our context for reference before we recreate it.
+        const savedContext = this.accessory.context;
         // Clean out the context object in case it's been polluted somehow.
         this.accessory.context = {};
-        this.accessory.context.detectMotion = detectMotion;
-        this.accessory.context.dynamicBitrate = dynamicBitrate;
-        this.accessory.context.hksvRecording = hksvRecording;
+        this.accessory.context.detectMotion = savedContext.detectMotion ?? true;
+        this.accessory.context.dynamicBitrate = savedContext.dynamicBitrate ?? false;
+        this.accessory.context.hksvRecording = savedContext.hksvRecording ?? true;
         this.accessory.context.mac = this.ufp.mac;
         this.accessory.context.nvr = this.nvr.ufp.mac;
         // Inform the user that motion detection will suck.
@@ -157,8 +138,7 @@ export class ProtectCamera extends ProtectDevice {
         //   - name change.
         //   - camera status light.
         //   - camera recording settings.
-        if (payload.state || payload.name || (payload.ledSettings && ("isEnabled" in payload.ledSettings)) ||
-            (payload.recordingSettings && ("mode" in payload.recordingSettings))) {
+        if (payload.state || payload.name || payload.ledSettings?.isEnabled || payload.recordingSettings?.mode) {
             this.updateDevice();
         }
     }
@@ -166,11 +146,11 @@ export class ProtectCamera extends ProtectDevice {
     smartMotionEventHandler(packet) {
         const payload = packet.payload;
         // We're only interested in smart motion detection events.
-        if ((packet.header.modelKey !== "event") || ((payload.type !== "smartDetectZone") && (payload.type !== "smartDetectLine")) || !payload.smartDetectTypes.length) {
+        if ((packet.header.modelKey !== "event") || !["smartDetectLine", "smartDetectZone"].includes(payload.type) || !payload.smartDetectTypes.length) {
             return;
         }
         // Process the motion event.
-        this.nvr.events.motionEventHandler(this, payload.smartDetectTypes, ("metadata" in payload) ? payload.metadata : undefined);
+        this.nvr.events.motionEventHandler(this, payload.smartDetectTypes, payload.metadata);
     }
     // Configure discrete smart motion contact sensors for HomeKit.
     configureMotionSmartSensor() {
@@ -202,30 +182,22 @@ export class ProtectCamera extends ProtectDevice {
         }
         // A utility for us to add contact sensors.
         const addSmartDetectContactSensor = (name, serviceId, errorMessage) => {
-            // See if we already have this contact sensor configured.
-            let contactService = this.accessory.getServiceById(this.hap.Service.ContactSensor, serviceId);
-            // If not, let's add it.
-            if (!contactService) {
-                contactService = new this.hap.Service.ContactSensor(name, serviceId);
-                // Something went wrong, we're done here.
-                if (!contactService) {
-                    this.log.error(errorMessage);
-                    return false;
-                }
-                contactService.addOptionalCharacteristic(this.hap.Characteristic.ConfiguredName);
-                // Finally, add it to the camera.
-                this.accessory.addService(contactService);
+            // Acquire the service.
+            const service = this.acquireService(this.hap.Service.ContactSensor, name, serviceId);
+            // Fail gracefully.
+            if (!service) {
+                this.log.error(errorMessage);
+                return false;
             }
             // Initialize the sensor.
-            contactService.updateCharacteristic(this.hap.Characteristic.ConfiguredName, name);
-            contactService.updateCharacteristic(this.hap.Characteristic.ContactSensorState, false);
+            service.updateCharacteristic(this.hap.Characteristic.ContactSensorState, false);
             return true;
         };
         let enabledContactSensors = [];
         // Add individual contact sensors for each object detection type, if needed.
         if (this.hasFeature("Motion.SmartDetect.ObjectSensors")) {
             for (const smartDetectType of this.ufp.featureFlags.smartDetectTypes) {
-                if (addSmartDetectContactSensor(this.accessoryName + " " + smartDetectType.charAt(0).toUpperCase() + smartDetectType.slice(1), ProtectReservedNames.CONTACT_MOTION_SMARTDETECT + "." + smartDetectType, "Unable to add smart motion contact sensor for " + smartDetectType + " detection.")) {
+                if (addSmartDetectContactSensor(this.accessoryName + " " + toCamelCase(smartDetectType), ProtectReservedNames.CONTACT_MOTION_SMARTDETECT + "." + smartDetectType, "Unable to add smart motion contact sensor for " + smartDetectType + " detection.")) {
                     enabledContactSensors.push(smartDetectType);
                 }
             }
@@ -248,17 +220,17 @@ export class ProtectCamera extends ProtectDevice {
     }
     // Configure a switch to manually trigger a doorbell ring event for HomeKit.
     configureDoorbellTrigger() {
-        // Find the switch service, if it exists.
-        let triggerService = this.accessory.getServiceById(this.hap.Service.Switch, ProtectReservedNames.SWITCH_DOORBELL_TRIGGER);
         // See if we have a doorbell service configured.
         let doorbellService = this.accessory.getService(this.hap.Service.Doorbell);
-        // Doorbell switches are disabled by default and primarily exist for automation purposes.
-        if (!this.hasFeature("Doorbell.Trigger")) {
-            if (triggerService) {
-                this.accessory.removeService(triggerService);
+        // Validate whether we should have this service enabled.
+        if (!this.validService(this.hap.Service.Switch, () => {
+            // Doorbell switches are disabled by default and primarily exist for automation purposes.
+            if (!this.hasFeature("Doorbell.Trigger")) {
+                return false;
             }
-            // Since we aren't enabling the doorbell trigger on this camera, remove the doorbell service if the camera
-            // isn't actually doorbell-capable hardware.
+            return true;
+        }, ProtectReservedNames.SWITCH_DOORBELL_TRIGGER)) {
+            // Since we aren't enabling the doorbell trigger on this camera, remove the doorbell service if the camera isn't actually doorbell-capable hardware.
             if (!this.ufp.featureFlags.isDoorbell && doorbellService) {
                 this.accessory.removeService(doorbellService);
             }
@@ -276,16 +248,12 @@ export class ProtectCamera extends ProtectDevice {
                 return false;
             }
         }
-        const triggerName = this.accessoryName + " Doorbell Trigger";
         // Add the switch to the camera, if needed.
+        const triggerService = this.acquireService(this.hap.Service.Switch, this.accessoryName + " Doorbell Trigger", ProtectReservedNames.SWITCH_DOORBELL_TRIGGER);
+        // Fail gracefully.
         if (!triggerService) {
-            triggerService = new this.hap.Service.Switch(triggerName, ProtectReservedNames.SWITCH_DOORBELL_TRIGGER);
-            if (!triggerService) {
-                this.log.error("Unable to add the doorbell trigger.");
-                return false;
-            }
-            triggerService.addOptionalCharacteristic(this.hap.Characteristic.ConfiguredName);
-            this.accessory.addService(triggerService);
+            this.log.error("Unable to add the doorbell trigger.");
+            return false;
         }
         // Trigger the doorbell.
         triggerService.getCharacteristic(this.hap.Characteristic.On)?.onGet(() => {
@@ -307,31 +275,21 @@ export class ProtectCamera extends ProtectDevice {
             }
         });
         // Initialize the switch.
-        triggerService.updateCharacteristic(this.hap.Characteristic.ConfiguredName, triggerName);
         triggerService.updateCharacteristic(this.hap.Characteristic.On, false);
         this.log.info("Enabling doorbell automation trigger.");
         return true;
     }
     // Configure the doorbell service for HomeKit.
     configureVideoDoorbell() {
-        // Only configure the doorbell service if we haven't configured it before.
-        if (this.isDoorbellConfigured) {
-            return true;
-        }
-        // Find the doorbell service, if it exists.
-        let doorbellService = this.accessory.getService(this.hap.Service.Doorbell);
-        // Add the doorbell service to this Protect doorbell. HomeKit requires the doorbell service to be
-        // marked as the primary service on the accessory.
-        if (!doorbellService) {
-            doorbellService = new this.hap.Service.Doorbell(this.accessoryName);
-            if (!doorbellService) {
-                this.log.error("Unable to add doorbell.");
-                return false;
-            }
-            this.accessory.addService(doorbellService);
+        // Acquire the service.
+        const service = this.acquireService(this.hap.Service.Doorbell);
+        // Fail gracefully.
+        if (!service) {
+            this.log.error("Unable to add doorbell.");
+            return false;
         }
-        doorbellService.setPrimaryService(true);
-        this.isDoorbellConfigured = true;
+        // Add the doorbell service to this Protect doorbell. HomeKit requires the doorbell service to be marked as the primary service on the accessory.
+        service.setPrimaryService(true);
         return true;
     }
     // Configure additional camera-specific characteristics for HomeKit.
@@ -414,18 +372,15 @@ export class ProtectCamera extends ProtectDevice {
         // Figure out which camera channels are RTSP-enabled, and user-enabled.
         let cameraChannels = this.ufp.channels.filter(x => x.isRtspEnabled && this.hasFeature("Video.Stream." + x.name, true));
         // Make sure we've got a HomeKit compatible IDR frame interval. If not, let's take care of that.
-        let idrChannels = cameraChannels.filter(x => x.idrInterval !== PROTECT_HOMEKIT_IDR_INTERVAL);
+        const idrChannels = cameraChannels.filter(x => x.idrInterval !== PROTECT_HOMEKIT_IDR_INTERVAL);
         if (idrChannels.length) {
-            // Edit the channel map.
-            idrChannels = idrChannels.map(x => {
-                x.idrInterval = PROTECT_HOMEKIT_IDR_INTERVAL;
-                return x;
-            });
-            this.ufp = await this.nvr.ufpApi.updateDevice(this.ufp, { channels: idrChannels }) ?? this.ufp;
+            // Edit the channel map and update the Protect controller.
+            this.ufp = await this.nvr.ufpApi.updateDevice(this.ufp, { channels: idrChannels.map(x => Object.assign(x, { idrInterval: PROTECT_HOMEKIT_IDR_INTERVAL })) }) ??
+                this.ufp;
         }
         // Set the camera and shapshot URLs.
         const cameraUrl = "rtsps://" + (this.nvr.config.overrideAddress ?? this.ufp.connectionHost) + ":" + this.nvr.ufp.ports.rtsps.toString() + "/";
-        // Filter out any package camera entries.
+        // Filter out any package camera entries. We deal with those independently in the package camera class.
         cameraChannels = cameraChannels.filter(x => x.name !== "Package Camera");
         // No RTSP streams are available that meet our criteria - we're done.
         if (!cameraChannels.length) {
@@ -478,7 +433,7 @@ export class ProtectCamera extends ProtectDevice {
                 continue;
             }
             // Find the closest RTSP match for this resolution.
-            const foundRtsp = this.findRtsp(entry[0], entry[1], rtspEntries);
+            const foundRtsp = this.findRtsp(entry[0], entry[1], { rtspEntries: rtspEntries });
             if (!foundRtsp) {
                 continue;
             }
@@ -491,9 +446,9 @@ export class ProtectCamera extends ProtectDevice {
             // Since we added resolutions to the list, resort resolutions, from high to low.
             rtspEntries.sort(this.sortByResolutions.bind(this));
         }
-        // Ensure we've got at least one entry that can be used for HomeKit Secure Video. Some Protect cameras (e.g. G3 Flex) don't have a native frame rate that
-        // maps to HomeKit's specific requirements for event recording, so we ensure there's at least one. This doesn't directly affect which stream is used to
-        // actually record something, but it does determine whether HomeKit even attempts to use the camera for HomeKit Secure Video.
+        // Ensure we've got at least one entry that can be used for HomeKit Secure Video. Some Protect cameras (e.g. G3 Flex) don't have a native frame rate that maps to
+        // HomeKit's specific requirements for event recording, so we ensure there's at least one. This doesn't directly affect which stream is used to actually record
+        // something, but it does determine whether HomeKit even attempts to use the camera for HomeKit Secure Video.
         if (![15, 24, 30].includes(rtspEntries[0].resolution[2])) {
             // Iterate through the list of RTSP entries we're providing to HomeKit and ensure we have at least one that will meet HomeKit's requirements for frame rate.
             for (let i = 0; i < rtspEntries.length; i++) {
@@ -516,8 +471,8 @@ export class ProtectCamera extends ProtectDevice {
         }
         // Publish our updated list of supported resolutions and their URLs.
         this.rtspEntries = rtspEntries;
-        // If we're already configured, we're done here.
-        if (this.isVideoConfigured) {
+        // If we've already configured the HomeKit video streaming delegate, we're done here.
+        if (this.stream) {
             return true;
         }
         // Inform users about our RTSP entry mapping, if we're debugging.
@@ -539,17 +494,20 @@ export class ProtectCamera extends ProtectDevice {
         }
         // Inform the user if we've set a streaming default.
         if (this.rtspQuality.StreamingDefault) {
-            this.log.info("Video streaming configured to use only: %s.", this.rtspQuality.StreamingDefault.charAt(0) + this.rtspQuality.StreamingDefault.slice(1).toLowerCase());
+            this.log.info("Video streaming configured to use only: %s.", toCamelCase(this.rtspQuality.StreamingDefault.toLowerCase()));
+        }
+        // Inform the user if they've selected the legacy snapshot API.
+        if (!this.hints.highResSnapshots) {
+            this.log.info("Disabling the use of higher quality snapshots.");
         }
         // Inform the user if we've set a recording default.
         if (this.rtspQuality.RecordingDefault) {
-            this.log.info("HomeKit Secure Video event recording configured to use only: %s.", this.rtspQuality.RecordingDefault.charAt(0) + this.rtspQuality.RecordingDefault.slice(1).toLowerCase());
+            this.log.info("HomeKit Secure Video event recording configured to use only: %s.", toCamelCase(this.rtspQuality.RecordingDefault.toLowerCase()));
         }
         // Configure the video stream with our resolutions.
         this.stream = new ProtectStreamingDelegate(this, this.rtspEntries.map(x => x.resolution));
         // Fire up the controller and inform HomeKit about it.
         this.accessory.configureController(this.stream.controller);
-        this.isVideoConfigured = true;
         return true;
     }
     // Configure HomeKit Secure Video support.
@@ -565,75 +523,66 @@ export class ProtectCamera extends ProtectDevice {
     }
     // Configure a switch to manually enable or disable HKSV recording for a camera.
     configureHksvRecordingSwitch() {
-        // Find the switch service, if it exists.
-        let switchService = this.accessory.getServiceById(this.hap.Service.Switch, ProtectReservedNames.SWITCH_HKSV_RECORDING);
-        // If we don't have HKSV or the HKSV recording switch enabled, disable it and we're done.
-        if (!this.hasFeature("Video.HKSV.Recording.Switch")) {
-            if (switchService) {
-                this.accessory.removeService(switchService);
+        // Validate whether we should have this service enabled.
+        if (!this.validService(this.hap.Service.Switch, () => {
+            // If we don't have HKSV or the HKSV recording switch enabled, disable it and we're done.
+            if (!this.hasFeature("Video.HKSV.Recording.Switch")) {
+                return false;
             }
+            return true;
+        }, ProtectReservedNames.SWITCH_HKSV_RECORDING)) {
             // We want to default this back to recording whenever we disable the recording switch.
             this.accessory.context.hksvRecording = true;
             return false;
         }
-        const switchName = this.accessoryName + " HKSV Recording";
-        // Add the switch to the camera, if needed.
-        if (!switchService) {
-            switchService = new this.hap.Service.Switch(switchName, ProtectReservedNames.SWITCH_HKSV_RECORDING);
-            if (!switchService) {
-                this.log.error("Unable to add the HomeKit Secure Video recording switch.");
-                return false;
-            }
-            switchService.addOptionalCharacteristic(this.hap.Characteristic.ConfiguredName);
-            this.accessory.addService(switchService);
+        // Acquire the service.
+        const service = this.acquireService(this.hap.Service.Switch, this.accessoryName + " HKSV Recording", ProtectReservedNames.SWITCH_HKSV_RECORDING);
+        // Fail gracefully.
+        if (!service) {
+            this.log.error("Unable to add HKSV recording switch.");
+            return false;
         }
         // Activate or deactivate HKSV recording.
-        switchService.getCharacteristic(this.hap.Characteristic.On)?.onGet(() => {
-            return this.accessory.context.hksvRecording;
+        service.getCharacteristic(this.hap.Characteristic.On)?.onGet(() => {
+            return this.accessory.context.hksvRecording ?? true;
         });
-        switchService.getCharacteristic(this.hap.Characteristic.On)?.onSet((value) => {
+        service.getCharacteristic(this.hap.Characteristic.On)?.onSet((value) => {
             if (this.accessory.context.hksvRecording !== value) {
-                this.log.info("HomeKit Secure Video event recording has been %s.", value === true ? "enabled" : "disabled");
+                this.log.info("HKSV event recording has been %s.", value === true ? "enabled" : "disabled");
             }
             this.accessory.context.hksvRecording = value === true;
         });
         // Initialize the switch.
-        switchService.updateCharacteristic(this.hap.Characteristic.ConfiguredName, switchName);
-        switchService.updateCharacteristic(this.hap.Characteristic.On, this.accessory.context.hksvRecording);
-        this.log.info("Enabling HomeKit Secure Video recording switch.");
+        service.updateCharacteristic(this.hap.Characteristic.On, this.accessory.context.hksvRecording);
+        this.log.info("Enabling HKSV recording switch.");
         return true;
     }
     // Configure a switch to manually enable or disable dynamic bitrate capabilities for a camera.
     configureDynamicBitrateSwitch() {
-        // Find the switch service, if it exists.
-        let switchService = this.accessory.getServiceById(this.hap.Service.Switch, ProtectReservedNames.SWITCH_DYNAMIC_BITRATE);
-        // If we don't want a dynamic bitrate switch, disable it and we're done.
-        if (!this.hasFeature("Video.DynamicBitrate.Switch")) {
-            if (switchService) {
-                this.accessory.removeService(switchService);
+        // Validate whether we should have this service enabled.
+        if (!this.validService(this.hap.Service.Switch, () => {
+            // If we don't want a dynamic bitrate switch, disable it and we're done.
+            if (!this.hasFeature("Video.DynamicBitrate.Switch")) {
+                return false;
             }
+            return true;
+        }, ProtectReservedNames.SWITCH_DYNAMIC_BITRATE)) {
             // We want to default this back to off by default whenever we disable the dynamic bitrate switch.
             this.accessory.context.dynamicBitrate = false;
             return false;
         }
-        const switchName = this.accessoryName + " Dynamic Bitrate";
-        // Add the switch to the camera, if needed.
-        if (!switchService) {
-            switchService = new this.hap.Service.Switch(switchName, ProtectReservedNames.SWITCH_DYNAMIC_BITRATE);
-            if (!switchService) {
-                this.log.error("Unable to add the dynamic bitrate switch.");
-                return false;
-            }
-            switchService.addOptionalCharacteristic(this.hap.Characteristic.ConfiguredName);
-            this.accessory.addService(switchService);
+        // Acquire the service.
+        const service = this.acquireService(this.hap.Service.Switch, this.accessoryName + " Dynamic Bitrate", ProtectReservedNames.SWITCH_DYNAMIC_BITRATE);
+        // Fail gracefully.
+        if (!service) {
+            this.log.error("Unable to add dynamic bitrate switch.");
+            return false;
         }
         // Activate or deactivate dynamic bitrate for this device.
-        switchService
-            .getCharacteristic(this.hap.Characteristic.On)
-            ?.onGet(() => {
-            return this.accessory.context.dynamicBitrate;
-        })
-            .onSet(async (value) => {
+        service.getCharacteristic(this.hap.Characteristic.On)?.onGet(() => {
+            return this.accessory.context.dynamicBitrate ?? false;
+        });
+        service.getCharacteristic(this.hap.Characteristic.On)?.onSet(async (value) => {
             if (this.accessory.context.dynamicBitrate === value) {
                 return;
             }
@@ -643,12 +592,8 @@ export class ProtectCamera extends ProtectDevice {
                 this.log.info("Dynamic streaming bitrate adjustment on the UniFi Protect controller enabled.");
                 return;
             }
-            // We're disabling dynamic bitrate for this device.
-            const updatedChannels = this.ufp.channels;
-            // Update the channels JSON.
-            for (const channel of updatedChannels) {
-                channel.bitrate = channel.maxBitrate;
-            }
+            // We're disabling dynamic bitrate for this device. Update the channels JSON to revert to the maximum bitrate we can.
+            const updatedChannels = this.ufp.channels.map(channel => ({ ...channel, bitrate: channel.maxBitrate }));
             // Send the channels JSON to Protect.
             const newDevice = await this.nvr.ufpApi.updateDevice(this.ufp, { channels: updatedChannels });
             // We failed.
@@ -662,8 +607,7 @@ export class ProtectCamera extends ProtectDevice {
             this.log.info("Dynamic streaming bitrate adjustment on the UniFi Protect controller disabled.");
         });
         // Initialize the switch.
-        switchService.updateCharacteristic(this.hap.Characteristic.ConfiguredName, switchName);
-        switchService.updateCharacteristic(this.hap.Characteristic.On, this.accessory.context.dynamicBitrate);
+        service.updateCharacteristic(this.hap.Characteristic.On, this.accessory.context.dynamicBitrate);
         this.log.info("Enabling the dynamic streaming bitrate adjustment switch.");
         return true;
     }
@@ -673,31 +617,29 @@ export class ProtectCamera extends ProtectDevice {
         // The Protect controller supports three modes for recording on a camera: always, detections, and never. We create switches for each of the modes.
         for (const ufpRecordingSwitchType of [ProtectReservedNames.SWITCH_UFP_RECORDING_ALWAYS, ProtectReservedNames.SWITCH_UFP_RECORDING_DETECTIONS, ProtectReservedNames.SWITCH_UFP_RECORDING_NEVER]) {
             const ufpRecordingSetting = ufpRecordingSwitchType.slice(ufpRecordingSwitchType.lastIndexOf(".") + 1);
-            // Find the switch service, if it exists.
-            let switchService = this.accessory.getServiceById(this.hap.Service.Switch, ufpRecordingSwitchType);
-            // If we don't have the feature option enabled, disable the switch and we're done.
-            if (!this.hasFeature("Nvr.Recording.Switch")) {
-                if (switchService) {
-                    this.accessory.removeService(switchService);
+            // Validate whether we should have this service enabled.
+            if (!this.validService(this.hap.Service.Switch, () => {
+                // If we don't have the feature option enabled, disable the switch and we're done.
+                if (!this.hasFeature("Nvr.Recording.Switch")) {
+                    return false;
                 }
+                return true;
+            }, ufpRecordingSwitchType)) {
                 continue;
             }
-            const switchName = this.accessoryName + " UFP Recording " + ufpRecordingSetting.charAt(0).toUpperCase() + ufpRecordingSetting.slice(1);
-            // Add the switch to the camera, if needed.
-            if (!switchService) {
-                switchService = new this.hap.Service.Switch(switchName, ufpRecordingSwitchType);
-                if (!switchService) {
-                    this.log.error("Unable to add the UniFi Protect recording switches.");
-                    continue;
-                }
-                switchService.addOptionalCharacteristic(this.hap.Characteristic.ConfiguredName);
-                this.accessory.addService(switchService);
+            const switchName = this.accessoryName + " UFP Recording " + toCamelCase(ufpRecordingSetting);
+            // Acquire the service.
+            const service = this.acquireService(this.hap.Service.Switch, switchName, ufpRecordingSwitchType);
+            // Fail gracefully.
+            if (!service) {
+                this.log.error("Unable to add UniFi Protect recording switches.");
+                continue;
             }
             // Activate or deactivate the appropriate recording mode on the Protect controller.
-            switchService.getCharacteristic(this.hap.Characteristic.On)?.onGet(() => {
+            service.getCharacteristic(this.hap.Characteristic.On)?.onGet(() => {
                 return this.ufp.recordingSettings.mode === ufpRecordingSetting;
             });
-            switchService.getCharacteristic(this.hap.Characteristic.On)?.onSet(async (value) => {
+            service.getCharacteristic(this.hap.Characteristic.On)?.onSet(async (value) => {
                 // We only want to do something if we're being activated. Turning off the switch would really be an undefined state given that there are three different
                 // settings one can choose from. Instead, we do nothing and leave it to the user to choose what state they really want to set.
                 if (!value) {
@@ -729,8 +671,7 @@ export class ProtectCamera extends ProtectDevice {
                 this.log.info("UniFi Protect recording mode set to %s.", ufpRecordingSetting);
             });
             // Initialize the recording switch state.
-            switchService.updateCharacteristic(this.hap.Characteristic.ConfiguredName, switchName);
-            switchService.updateCharacteristic(this.hap.Characteristic.On, this.ufp.recordingSettings.mode === ufpRecordingSetting);
+            service.updateCharacteristic(this.hap.Characteristic.On, this.ufp.recordingSettings.mode === ufpRecordingSetting);
             switchesEnabled.push(ufpRecordingSetting);
         }
         if (switchesEnabled.length) {
@@ -741,44 +682,28 @@ export class ProtectCamera extends ProtectDevice {
     // Configure MQTT capabilities of this camera.
     configureMqtt() {
         // Return the RTSP URLs when requested.
-        this.nvr.mqtt?.subscribe(this.accessory, "rtsp/get", (message) => {
-            const value = message.toString();
-            // When we get the right message, we trigger the snapshot request.
-            if (value?.toLowerCase() !== "true") {
-                return;
-            }
-            const urlInfo = {};
-            // Grab all the available RTSP channels.
-            for (const channel of this.ufp.channels) {
-                if (!channel.isRtspEnabled) {
-                    continue;
-                }
-                urlInfo[channel.name] = "rtsps://" + this.nvr.ufp.host + ":" + this.nvr.ufp.ports.rtsp.toString() + "/" + channel.rtspAlias + "?enableSrtp";
-            }
-            this.nvr.mqtt?.publish(this.accessory, "rtsp", JSON.stringify(urlInfo));
-            this.log.info("RTSP information published via MQTT.");
+        this.subscribeGet("rtsp", "RTSP information", () => {
+            // Grab all the available RTSP channels and return them as a JSON.
+            return JSON.stringify(Object.assign({}, ...this.ufp.channels.filter(channel => channel.isRtspEnabled)
+                .map(channel => ({ [channel.name]: "rtsps://" + this.nvr.ufp.host + ":" + this.nvr.ufp.ports.rtsp + "/" + channel.rtspAlias + "?enableSrtp" }))));
         });
         // Trigger snapshots when requested.
-        this.nvr.mqtt?.subscribe(this.accessory, "snapshot/trigger", (message) => {
-            const value = message.toString();
+        this.subscribeSet("snapshot", "snapshot trigger", (value) => {
             // When we get the right message, we trigger the snapshot request.
-            if (value?.toLowerCase() !== "true") {
+            if (value !== "true") {
                 return;
             }
             void this.stream?.handleSnapshotRequest();
-            this.log.info("Snapshot triggered via MQTT.");
         });
         // Enable doorbell-specific MQTT capabilities only when we have a Protect doorbell or a doorbell trigger enabled.
         if (this.ufp.featureFlags.isDoorbell || this.hasFeature("Doorbell.Trigger")) {
             // Trigger doorbell when requested.
-            this.nvr.mqtt?.subscribe(this.accessory, "doorbell/trigger", (message) => {
-                const value = message.toString();
+            this.subscribeSet("doorbell", "doorbell ring trigger", (value) => {
                 // When we get the right message, we trigger the doorbell request.
-                if (value?.toLowerCase() !== "true") {
+                if (value !== "true") {
                     return;
                 }
                 this.nvr.events.doorbellEventHandler(this, Date.now());
-                this.log.info("Doorbell ring event triggered via MQTT.");
             });
         }
         return true;
@@ -812,9 +737,8 @@ export class ProtectCamera extends ProtectDevice {
     }
     // Set the bitrate for a specific camera channel.
     async setBitrate(channelId, value) {
-        // If we've disabled the ability to set the bitrate dynamically, silently fail. We prioritize switches over the global
-        // setting here, in case the user enabled both, using the principle that the most specific setting always wins. If the
-        // user has both the global setting and the switch enabled, the switch setting will take precedence.
+        // If we've disabled the ability to set the bitrate dynamically, silently fail. We prioritize switches over the global setting here, in case the user enabled both,
+        // using the principle that the most specific setting always wins. If the user has both the global setting and the switch enabled, the switch will take precedence.
         if ((!this.accessory.context.dynamicBitrate && !this.hasFeature("Video.DynamicBitrate")) ||
             (!this.accessory.context.dynamicBitrate && this.hasFeature("Video.DynamicBitrate") && this.hasFeature("Video.DynamicBitrate.Switch"))) {
             return true;
@@ -842,44 +766,46 @@ export class ProtectCamera extends ProtectDevice {
         return true;
     }
     // Find an RTSP configuration for a given target resolution.
-    findRtspEntry(width, height, rtspEntries, defaultStream = this.rtspQuality.StreamingDefault) {
+    findRtspEntry(width, height, options) {
+        const rtspEntries = options?.rtspEntries ?? this.rtspEntries;
         // No RTSP entries to choose from, we're done.
         if (!rtspEntries || !rtspEntries.length) {
             return null;
         }
         // Second, we check to see if we've set an explicit preference for stream quality.
-        if (defaultStream) {
-            defaultStream = defaultStream.toUpperCase();
-            return rtspEntries.find(x => x.channel.name.toUpperCase() === defaultStream) ?? null;
+        if (options?.default) {
+            options.default = options.default.toUpperCase();
+            return rtspEntries.find(x => x.channel.name.toUpperCase() === options.default) ?? null;
         }
         // See if we have a match for our desired resolution on the camera. We ignore FPS - HomeKit clients seem to be able to handle it just fine.
-        const exactRtsp = rtspEntries.find(x => (x.resolution[0] === width) && (x.resolution[1] === height));
+        const exactRtsp = rtspEntries.find(x => (x.channel.width === width) && (x.channel.height === height));
         if (exactRtsp) {
             return exactRtsp;
         }
-        // No match found, let's see what we have that's closest. We try to be a bit smart about how we select our stream - if it's an HD quality stream request (720p+),
-        // we want to try to return something that's HD quality before looking for something lower resolution.
-        if ((width >= 1280) && (height >= 720)) {
-            const entry = rtspEntries.find(x => x.resolution[0] >= 1280);
-            if (entry) {
-                return entry;
-            }
+        // If we haven't found an exact match, by default, we bias ourselves to the next lower resolution we find or the lowest resolution we have available as a backstop.
+        if (!options?.biasHigher) {
+            return rtspEntries.find(x => x.channel.width < width) ?? rtspEntries[rtspEntries.length - 1];
         }
-        // If we didn't request an HD resolution, or we couldn't find anything HD to use, we try to find the highest resolution we can find that's at least our requested
-        // width or larger. If we can't find anything that matches, we return the lowest resolution we have available.
-        return rtspEntries.filter(x => x.resolution[0] >= width)?.pop() ?? rtspEntries[rtspEntries.length - 1];
+        // If we're biasing ourselves toward higher resolutions (primarily used when transcoding so we start with a higher quality input), we look for the first entry that's
+        // larger than our requested width and if not found, we return the highest resolution we have available.
+        return rtspEntries.filter(x => x.channel.width > width).pop() ?? rtspEntries[0];
     }
     // Find a streaming RTSP configuration for a given target resolution.
-    findRtsp(width, height, rtspEntries = this.rtspEntries, constrainPixels = 0) {
+    findRtsp(width, height, options) {
+        // Create our options JSON if needed.
+        options = options ?? {};
+        // See if we've been given RTSP entries or whether we should default to our own.
+        options.rtspEntries = options.rtspEntries ?? this.rtspEntries;
         // If we've imposed a constraint on the maximum dimensions of what we want due to a hardware limitation, filter out those entries.
-        if (constrainPixels) {
-            rtspEntries = rtspEntries.filter(x => (x.channel.width * x.channel.height) <= constrainPixels);
+        if (options.maxPixels !== undefined) {
+            options.rtspEntries = options.rtspEntries.filter(x => (x.channel.width * x.channel.height) <= (options.maxPixels ?? Infinity));
         }
-        return this.findRtspEntry(width, height, rtspEntries);
+        // Return the entry.
+        return this.findRtspEntry(width, height, options);
     }
     // Find a recording RTSP configuration for a given target resolution.
-    findRecordingRtsp(width, height, rtspEntries = this.rtspEntries) {
-        return this.findRtspEntry(width, height, rtspEntries, this.rtspQuality.RecordingDefault ?? this.stream.ffmpegOptions.recordingDefaultChannel);
+    findRecordingRtsp(width, height) {
+        return this.findRtspEntry(width, height, { biasHigher: true, default: this.rtspQuality.RecordingDefault ?? this.stream.ffmpegOptions.recordingDefaultChannel });
     }
     // Utility function for sorting by resolution.
     sortByResolutions(a, b) {