homebridge-nest-accfactory 0.3.1 → 0.3.2

package/dist/plugins/camera.js

@@ -8,36 +8,34 @@
 import EventEmitter from 'node:events';
 import { Buffer } from 'node:buffer';
 import { setTimeout, clearTimeout } from 'node:timers';
-import process from 'node:process';
-import child_process from 'node:child_process';
-import net from 'node:net';
 import dgram from 'node:dgram';
 import fs from 'node:fs';
 import path from 'node:path';
-import { fileURLToPath } from 'node:url';
 
 // Define our modules
 import HomeKitDevice from '../HomeKitDevice.js';
+import Streamer from '../streamer.js';
 import NexusTalk from '../nexustalk.js';
 import WebRTC from '../webrtc.js';
+import FFmpeg from '../ffmpeg.js';
+import { processCommonData, parseDurationToSeconds, scaleValue } from '../utils.js';
 
-const CAMERA_RESOURCE = {
-  OFFLINE: 'Nest_camera_offline.jpg',
-  OFF: 'Nest_camera_off.jpg',
-  TRANSFER: 'Nest_camera_transfer.jpg',
-};
-const MP4BOX = 'mp4box'; // MP4 box fragement event for HKSV recording
-const SNAPSHOT_CACHE_TIMEOUT = 30000; // Timeout for retaining snapshot image (in milliseconds)
+// Define constants
+import { DATA_SOURCE, PROTOBUF_RESOURCES, __dirname, RESOURCE_PATH, RESOURCE_IMAGES, DEVICE_TYPE, TIMERS } from '../consts.js';
+
+const MP4BOX = 'mp4box';
 const STREAMING_PROTOCOL = {
   WEBRTC: 'PROTOCOL_WEBRTC',
   NEXUSTALK: 'PROTOCOL_NEXUSTALK',
 };
-const RESOURCE_PATH = '../res';
-const __dirname = path.dirname(fileURLToPath(import.meta.url)); // Make a defined for JS __dirname
 
 export default class NestCamera extends HomeKitDevice {
   static TYPE = 'Camera';
-  static VERSION = '2025.06.15';
+  static VERSION = '2025.08.04'; // Code version
+
+  // For messaging back to parent class (Doorbell/Floodlight)
+  static SET = HomeKitDevice.SET;
+  static GET = HomeKitDevice.GET;
 
   controller = undefined; // HomeKit Camera/Doorbell controller service
   streamer = undefined; // Streamer object for live/recording stream
@@ -46,22 +44,21 @@ export default class NestCamera extends HomeKitDevice {
   operatingModeService = undefined; // Link to camera/doorbell operating mode service
   personTimer = undefined; // Cooldown timer for person/face events
   motionTimer = undefined; // Cooldown timer for motion events
-  snapshotTimer = undefined; // Timer for cached snapshot images
-  lastSnapshotImage = undefined; // JPG image buffer for last camera snapshot
   snapshotEvent = undefined; // Event for which to get snapshot for
+  ffmpeg = undefined; // FFMpeg object class
 
   // Internal data only for this class
-  #hkSessions = []; // Track live and recording active sessions
+  #liveSessions = new Map(); // Track active HomeKit live stream sessions (port, crypto, rtpSplitter)
   #recordingConfig = {}; // HomeKit Secure Video recording configuration
-  #cameraOfflineImage = undefined; // JPG image buffer for camera offline
-  #cameraVideoOffImage = undefined; // JPG image buffer for camera video off
-  #cameraTransferringImage = undefined; // JPG image buffer for camera transferring between Nest/Google Home
+  #cameraImages = {}; // Snapshot resource images
+  #snapshotTimer = undefined; // Timer for cached snapshot images
+  #lastSnapshotImage = undefined; // JPG image buffer for last camera snapshot
 
-  constructor(accessory, api, log, eventEmitter, deviceData) {
-    super(accessory, api, log, eventEmitter, deviceData);
+  constructor(accessory, api, log, deviceData) {
+    super(accessory, api, log, deviceData);
 
-    // Load supporrt image files as required
-    const loadImageIfExists = (filename, label) => {
+    // Load support image files as required
+    const loadImageResource = (filename, label) => {
       let buffer = undefined;
       let file = path.resolve(__dirname, RESOURCE_PATH, filename);
       if (fs.existsSync(file) === true) {
@@ -72,25 +69,36 @@ export default class NestCamera extends HomeKitDevice {
       return buffer;
     };
 
-    this.#cameraOfflineImage = loadImageIfExists(CAMERA_RESOURCE.OFFLINE, 'offline');
-    this.#cameraVideoOffImage = loadImageIfExists(CAMERA_RESOURCE.OFF, 'video off');
-    this.#cameraTransferringImage = loadImageIfExists(CAMERA_RESOURCE.TRANSFER, 'transferring');
+    this.#cameraImages = {
+      offline: loadImageResource(RESOURCE_IMAGES.CAMERA_OFFLINE, 'offline'),
+      off: loadImageResource(RESOURCE_IMAGES.CAMERA_OFF, 'video off'),
+      transfer: loadImageResource(RESOURCE_IMAGES.CAMERA_TRANSFER, 'transferring'),
+    };
+
+    // Create ffmpeg object if have been told valid binary
+    if (typeof this.deviceData?.ffmpeg?.binary === 'string' && this.deviceData?.ffmpeg?.valid === true) {
+      this.ffmpeg = new FFmpeg(this.deviceData?.ffmpeg?.binary, log);
+    }
   }
 
   // Class functions
-  setupDevice(hapController = this.hap.CameraController) {
-    // Setup motion services
+  onAdd() {
+    // Setup motion services. This needs to be done before we setup the HomeKit camera controller
     if (this.motionServices === undefined) {
       this.createCameraMotionServices();
     }
 
-    // Setup HomeKit camera/doorbell controller
-    if (this.controller === undefined && typeof hapController === 'function') {
-      // Need to cleanup the CameraOperatingMode service. This is to allow seamless configuration
-      // switching between enabling hksv or not
-      // Thanks to @bcullman (Brad Ullman) for catching this
-      this.accessory.removeService(this.accessory.getService(this.hap.Service.CameraOperatingMode));
-      this.controller = new hapController(this.generateControllerOptions());
+    // Setup HomeKit camera controller
+    // Need to cleanup the CameraOperatingMode service. This is to allow seamless configuration
+    // switching between enabling hksv or not
+    // Thanks to @bcullman (Brad Ullman) for catching this
+    this.accessory.removeService(this.accessory.getService(this.hap.Service.CameraOperatingMode));
+    if (this.controller === undefined) {
+      // Establish the "camera" controller here
+      this.controller = new this.hap.CameraController(this.generateControllerOptions());
+    }
+    if (this.controller !== undefined) {
+      // Configure the controller thats been created
       this.accessory.configureController(this.controller);
     }
 
@@ -112,7 +120,7 @@ export default class NestCamera extends HomeKitDevice {
             (value === true && this.deviceData.statusled_brightness !== 0) ||
             (value === false && this.deviceData.statusled_brightness !== 1)
           ) {
-            this.set({ uuid: this.deviceData.nest_google_uuid, statusled_brightness: value === true ? 0 : 1 });
+            this.message(HomeKitDevice.SET, { uuid: this.deviceData.nest_google_uuid, statusled_brightness: value === true ? 0 : 1 });
             this?.log?.info?.('Recording status LED on "%s" was turned', this.deviceData.description, value === true ? 'on' : 'off');
           }
         },
@@ -127,7 +135,10 @@ export default class NestCamera extends HomeKitDevice {
         onSet: (value) => {
           // only change IRLed status value if different than on-device
           if ((value === false && this.deviceData.irled_enabled === true) || (value === true && this.deviceData.irled_enabled === false)) {
-            this.set({ uuid: this.deviceData.nest_google_uuid, irled_enabled: value === true ? 'auto_on' : 'always_off' });
+            this.message(HomeKitDevice.SET, {
+              uuid: this.deviceData.nest_google_uuid,
+              irled_enabled: value === true ? 'auto_on' : 'always_off',
+            });
 
             this?.log?.info?.('Night vision on "%s" was turned', this.deviceData.description, value === true ? 'on' : 'off');
           }
@@ -147,7 +158,7 @@ export default class NestCamera extends HomeKitDevice {
             (this.deviceData.streaming_enabled === true && value === true)
           ) {
             // Camera state does not reflect requested state, so fix
-            this.set({ uuid: this.deviceData.nest_google_uuid, streaming_enabled: value === false ? true : false });
+            this.message(HomeKitDevice.SET, { uuid: this.deviceData.nest_google_uuid, streaming_enabled: value === false ? true : false });
             this?.log?.info?.('Camera on "%s" was turned', this.deviceData.description, value === false ? 'on' : 'off');
           }
         }
@@ -177,7 +188,7 @@ export default class NestCamera extends HomeKitDevice {
               (this.deviceData.audio_enabled === true && value === this.hap.Characteristic.RecordingAudioActive.DISABLE) ||
               (this.deviceData.audio_enabled === false && value === this.hap.Characteristic.RecordingAudioActive.ENABLE)
             ) {
-              this.set({
+              this.message(HomeKitDevice.SET, {
                 uuid: this.deviceData.nest_google_uuid,
                 audio_enabled: value === this.hap.Characteristic.RecordingAudioActive.ENABLE ? true : false,
               });
@@ -214,46 +225,37 @@ export default class NestCamera extends HomeKitDevice {
       );
     }
 
-    // Setup linkage to EveHome app if configured todo so
-    if (
-      this.deviceData?.eveHistory === true &&
-      typeof this.motionServices?.[1]?.service === 'object' &&
-      typeof this.historyService?.linkToEveHome === 'function'
-    ) {
-      this.historyService.linkToEveHome(this.motionServices[1].service, {
-        description: this.deviceData.description,
-      });
-    }
-
     // Extra setup details for output
-    this.deviceData.hksv === true &&
-      this.postSetupDetail('HomeKit Secure Video support' + (this.streamer?.isBuffering() === true ? ' and recording buffer started' : ''));
-    this.deviceData.localAccess === true && this.postSetupDetail('Local access');
+    this.deviceData.streaming_protocols.includes(STREAMING_PROTOCOL.WEBRTC) === true &&
+      WebRTC !== undefined &&
+      this.postSetupDetail('WebRTC streamer', 'debug');
+    this.deviceData.streaming_protocols.includes(STREAMING_PROTOCOL.NEXUSTALK) === true &&
+      NexusTalk !== undefined &&
+      this.postSetupDetail('NexusTalk streamer', 'debug');
+    this.deviceData.hksv === true && this.postSetupDetail('HomeKit Secure Video support');
+    this.deviceData.localAccess === true && this.postSetupDetail('Local network access');
+    this.deviceData.ffmpeg.hwaccel === true && this.postSetupDetail('Video hardware acceleration');
   }
 
-  removeDevice() {
+  onRemove() {
     // Clean up our camera object since this device is being removed
     clearTimeout(this.motionTimer);
     clearTimeout(this.personTimer);
-    clearTimeout(this.snapshotTimer);
+    clearTimeout(this.#snapshotTimer);
     this.motionTimer = undefined;
     this.personTimer = undefined;
-    this.snapshotTimer = undefined;
+    this.#snapshotTimer = undefined;
+
+    // Stop all streamer logic (buffering, output, etc)
+    this.streamer?.stopEverything?.();
 
-    this.streamer !== undefined && this.streamer.stopEverything();
+    // Terminate any remaining ffmpeg sessions for this camera/doorbell
+    this.ffmpeg?.killAllSessions?.(this.uuid);
 
     // Stop any on-going HomeKit sessions, either live or recording
-    // We'll terminate any ffmpeg, rtpSpliter etc processes
-    this.#hkSessions.forEach((session) => {
-      if (typeof session.rtpSplitter?.close === 'function') {
-        session.rtpSplitter.close();
-      }
-      session.ffmpeg.forEach((ffmpeg) => {
-        ffmpeg.kill('SIGKILL');
-      });
-      if (session?.eventEmitter instanceof EventEmitter === true) {
-        session.eventEmitter.removeAllListeners(MP4BOX);
-      }
+    // We'll terminate any ffmpeg, rtpSplitter etc processes
+    this.#liveSessions?.forEach?.((session) => {
+      session?.rtpSplitter?.close?.();
     });
 
     // Remove any motion services we created
@@ -265,300 +267,573 @@ export default class NestCamera extends HomeKitDevice {
     // Remove the camera controller
     this.accessory.removeController(this.controller);
 
+    // Clear references
     this.operatingModeService = undefined;
-    this.#hkSessions = undefined;
+    this.#liveSessions = undefined;
     this.motionServices = undefined;
     this.streamer = undefined;
     this.controller = undefined;
   }
 
-  // Taken and adapted from:
-  // https://github.com/hjdhjd/homebridge-unifi-protect/blob/eee6a4e379272b659baa6c19986d51f5bf2cbbbc/src/protect-ffmpeg-record.ts
-  async *handleRecordingStreamRequest(sessionID) {
-    if (this.deviceData?.ffmpeg?.binary === undefined) {
-      this?.log?.warn?.(
-        'Received request to start recording for "%s" however we do not have an ffmpeg binary present',
-        this.deviceData.description,
-      );
-      return;
-    }
-
-    if (
-      this.motionServices?.[1]?.service !== undefined &&
-      this.motionServices[1].service.getCharacteristic(this.hap.Characteristic.MotionDetected).value === false
-    ) {
-      // Should only be recording if motion detected.
-      // Sometimes when starting up, HAP-nodeJS or HomeKit triggers this even when motion isn't occuring
-      this?.log?.debug?.('Received request to commence recording for "%s" however we have not detected any motion');
-      return;
-    }
-
-    if (this.streamer === undefined) {
-      this?.log?.error?.(
-        'Received request to start recording for "%s" however we do not any associated streaming protocol support',
-        this.deviceData.description,
-      );
+  async onUpdate(deviceData) {
+    if (typeof deviceData !== 'object' || this.controller === undefined) {
       return;
     }
 
-    // Build our ffmpeg command string for the liveview video/audio stream
-    let commandLine = [
-      '-hide_banner',
-      '-nostats',
-      '-use_wallclock_as_timestamps 1',
-      '-fflags +discardcorrupt',
-      '-max_delay 500000',
-      '-flags low_delay',
-      '-f h264',
-      '-i pipe:0',
-    ];
-
-    let includeAudio = false;
-    if (
-      this.deviceData.audio_enabled === true &&
-      this.controller.recordingManagement.recordingManagementService.getCharacteristic(this.hap.Characteristic.RecordingAudioActive)
-        .value === this.hap.Characteristic.RecordingAudioActive.ENABLE &&
-      this.streamer?.codecs?.audio === 'aac' &&
-      this.deviceData?.ffmpeg?.libfdk_aac === true
-    ) {
-      // Audio data only on extra pipe created in spawn command
-      commandLine.push('-f aac -i pipe:3');
-      includeAudio = true;
-    }
-
-    if (
-      this.deviceData.audio_enabled === true &&
-      this.controller.recordingManagement.recordingManagementService.getCharacteristic(this.hap.Characteristic.RecordingAudioActive)
-        .value === this.hap.Characteristic.RecordingAudioActive.ENABLE &&
-      this.streamer?.codecs?.audio === 'opus' &&
-      this.deviceData?.ffmpeg?.libopus === true
-    ) {
-      // Audio data only on extra pipe created in spawn command
-      commandLine.push('-i pipe:3');
-      includeAudio = true;
+    if (this.deviceData.migrating === false && deviceData.migrating === true) {
+      // Migration happening between Nest <-> Google Home apps. We'll stop any active streams, close the current streaming object
+      this?.log?.warn?.('Migration between Nest <-> Google Home apps has started for "%s"', deviceData.description);
+      this.streamer?.stopEverything?.();
+      this.streamer = undefined;
     }
 
-    // Build our video command for ffmpeg
-    commandLine.push(
-      '-map 0:v:0',
-      '-codec:v libx264',
-      '-preset veryfast',
-      '-profile:v ' +
-        (this.#recordingConfig.videoCodec.parameters.profile === this.hap.H264Profile.HIGH
-          ? 'high'
-          : this.#recordingConfig.videoCodec.parameters.profile === this.hap.H264Profile.MAIN
-            ? 'main'
-            : 'baseline'),
-      '-level:v ' +
-        (this.#recordingConfig.videoCodec.parameters.level === this.hap.H264Level.LEVEL4_0
-          ? '4.0'
-          : this.#recordingConfig.videoCodec.parameters.level === this.hap.H264Level.LEVEL3_2
-            ? '3.2'
-            : '3.1'),
-      '-noautoscale',
-      '-bf 0',
-      '-filter:v fps=fps=' + this.#recordingConfig.videoCodec.resolution[2],
-      '-g:v ' + (this.#recordingConfig.videoCodec.resolution[2] * this.#recordingConfig.videoCodec.parameters.iFrameInterval) / 1000,
-      '-b:v ' + this.#recordingConfig.videoCodec.parameters.bitRate + 'k',
-      '-bufsize ' + 2 * this.#recordingConfig.videoCodec.parameters.bitRate + 'k',
-      '-fps_mode passthrough',
-      '-reset_timestamps 1',
-      '-video_track_timescale 90000',
-      '-movflags frag_keyframe+empty_moov+default_base_moof',
-    );
-
-    // We have seperate video and audio streams that need to be muxed together if audio enabled
-    if (includeAudio === true) {
-      let audioSampleRates = ['8', '16', '24', '32', '44.1', '48'];
-
-      commandLine.push(
-        '-map 1:a:0',
-        '-codec:a libfdk_aac',
-        '-profile:a aac_low',
-        '-ar ' + audioSampleRates[this.#recordingConfig.audioCodec.samplerate] + 'k',
-        '-b:a ' + this.#recordingConfig.audioCodec.bitrate + 'k',
-        '-ac ' + this.#recordingConfig.audioCodec.audioChannels,
-      );
+    if (this.deviceData.migrating === true && deviceData.migrating === false) {
+      // Migration has completed between Nest <-> Google Home apps
+      this?.log?.success?.('Migration between Nest <-> Google Home apps has completed for "%s"', deviceData.description);
     }
 
-    commandLine.push('-f mp4 pipe:1'); // output to stdout in mp4
-
-    // Start our ffmpeg recording process and stream from our streamer
-    // video is pipe #1
-    // audio is pipe #3 if including audio
-    this?.log?.debug?.(
-      'ffmpeg process for recording stream from "%s" will be called using the following commandline',
-      this.deviceData.description,
-      commandLine.join(' ').toString(),
-    );
-    let ffmpegRecording = child_process.spawn(this.deviceData.ffmpeg.binary, commandLine.join(' ').split(' '), {
-      env: process.env,
-      stdio: ['pipe', 'pipe', 'pipe', 'pipe'],
-    });
-
-    // Process FFmpeg output and parse out the fMP4 stream it's generating for HomeKit Secure Video.
-    let mp4FragmentData = [];
-    let mp4boxes = [];
-    let eventEmitter = new EventEmitter();
-
-    ffmpegRecording.stdout.on('data', (data) => {
-      // Process the mp4 data from our socket connection and convert into mp4 fragment boxes we need
-      mp4FragmentData = mp4FragmentData.length === 0 ? data : Buffer.concat([mp4FragmentData, data]);
-      while (mp4FragmentData.length >= 8) {
-        let boxSize = mp4FragmentData.slice(0, 4).readUInt32BE(0); // Includes header and data size
-
-        if (mp4FragmentData.length < boxSize) {
-          // We dont have enough data in the buffer yet to process the full mp4 box
-          // so, exit loop and await more data
-          break;
-        }
-
-        // Add it to our queue to be pushed out through the generator function.
-        if (Array.isArray(mp4boxes) === true && eventEmitter !== undefined) {
-          mp4boxes.push({
-            header: mp4FragmentData.slice(0, 8),
-            type: mp4FragmentData.slice(4, 8).toString(),
-            data: mp4FragmentData.slice(8, boxSize),
-          });
-          eventEmitter.emit(MP4BOX);
+    // Handle case of changes in streaming protocols OR just finished migration between Nest <-> Google Home apps
+    if (this.streamer === undefined && deviceData.migrating === false) {
+      if (JSON.stringify(deviceData.streaming_protocols) !== JSON.stringify(this.deviceData.streaming_protocols)) {
+        this?.log?.warn?.('Available streaming protocols have changed for "%s"', deviceData.description);
+        this.streamer?.stopEverything?.();
+        this.streamer = undefined;
+      }
+      if (deviceData.streaming_protocols.includes(STREAMING_PROTOCOL.WEBRTC) === true && WebRTC !== undefined) {
+        if (this.deviceData.migrating === true && deviceData.migrating === false) {
+          this?.log?.debug?.('Using WebRTC streamer for "%s" after migration', deviceData.description);
         }
 
-        // Remove the section of data we've just processed from our buffer
-        mp4FragmentData = mp4FragmentData.slice(boxSize);
+        this.streamer = new WebRTC(this.uuid, deviceData, {
+          log: this.log,
+        });
       }
-    });
 
-    ffmpegRecording.on('exit', (code, signal) => {
-      if (signal !== 'SIGKILL' || signal === null) {
-        this?.log?.error?.('ffmpeg recording process for "%s" stopped unexpectedly. Exit code was "%s"', this.deviceData.description, code);
-      }
+      if (deviceData.streaming_protocols.includes(STREAMING_PROTOCOL.NEXUSTALK) === true && NexusTalk !== undefined) {
+        if (this.deviceData.migrating === true && deviceData.migrating === false) {
+          this?.log?.debug?.('Using NexusTalk streamer for "%s" after migration', deviceData.description);
+        }
 
-      if (this.#hkSessions?.[sessionID] !== undefined) {
-        delete this.#hkSessions[sessionID];
+        this.streamer = new NexusTalk(this.uuid, deviceData, {
+          log: this.log,
+        });
       }
-    });
-
-    // eslint-disable-next-line no-unused-vars
-    ffmpegRecording.on('error', (error) => {
-      // Empty
-    });
-
-    // ffmpeg console output is via stderr
-    ffmpegRecording.stderr.on('data', (data) => {
-      if (data.toString().includes('frame=') === false && this.deviceData?.ffmpeg?.debug === true) {
-        // Monitor ffmpeg output
-        this?.log?.debug?.(data.toString());
+      if (
+        this?.streamer?.isBuffering() === false &&
+        deviceData?.hksv === true &&
+        this?.controller?.recordingManagement?.recordingManagementService !== undefined &&
+        this.controller.recordingManagement.recordingManagementService.getCharacteristic(this.hap.Characteristic.Active).value ===
+          this.hap.Characteristic.Active.ACTIVE
+      ) {
+        await this.message(Streamer.MESSAGE, Streamer.MESSAGE_TYPE.START_BUFFER);
       }
-    });
+    }
 
-    // Start the appropriate streamer
-    this.streamer !== undefined &&
-      this.streamer.startRecordStream(sessionID, ffmpegRecording.stdin, ffmpegRecording?.stdio?.[3] ? ffmpegRecording.stdio[3] : null);
+    // Check to see if any activity zones were added for both non-HKSV and HKSV enabled devices
+    if (
+      Array.isArray(deviceData.activity_zones) === true &&
+      JSON.stringify(deviceData.activity_zones) !== JSON.stringify(this.deviceData.activity_zones)
+    ) {
+      deviceData.activity_zones.forEach((zone) => {
+        if (this.deviceData.hksv === false || (this.deviceData.hksv === true && this.ffmpeg instanceof FFmpeg === true && zone.id === 1)) {
+          if (this.motionServices?.[zone.id]?.service === undefined) {
+            // Zone doesn't have an associated motion sensor, so add one
+            let zoneName = zone.id === 1 ? '' : zone.name;
+            let eveOptions = zone.id === 1 ? {} : undefined; // Only link EveHome for zone 1
 
-    // Store our ffmpeg sessions
-    this.#hkSessions[sessionID] = {};
-    this.#hkSessions[sessionID].eventEmitter = eventEmitter;
-    this.#hkSessions[sessionID].ffmpeg = ffmpegRecording; // Store ffmpeg process ID
+            let tempService = this.addHKService(this.hap.Service.MotionSensor, zoneName, zone.id, eveOptions);
 
-    this?.log?.info?.('Started recording from "%s" %s', this.deviceData.description, includeAudio === false ? 'without audio' : '');
+            this.addHKCharacteristic(tempService, this.hap.Characteristic.Active);
+            tempService.updateCharacteristic(this.hap.Characteristic.Name, zoneName);
+            tempService.updateCharacteristic(this.hap.Characteristic.MotionDetected, false); // No motion initially
 
-    // Loop generating MOOF/MDAT box pairs for HomeKit Secure Video.
-    // HAP-NodeJS cancels this async generator function when recording completes also
-    let segment = [];
-    for (;;) {
-      if (this.#hkSessions?.[sessionID] === undefined || this.#hkSessions?.[sessionID]?.ffmpeg === undefined) {
-        // Our session object is not present
-        // ffmpeg recorder process is not present
-        // so finish up the loop
-        break;
-      }
+            this.motionServices[zone.id] = { service: tempService, timer: undefined };
+          }
+        }
+      });
+    }
 
-      if (mp4boxes?.length === 0 && eventEmitter !== undefined) {
-        // since the ffmpeg recorder process hasn't notified us of any mp4 fragment boxes, wait until there are some
-        await EventEmitter.once(eventEmitter, MP4BOX);
-      }
+    // Check to see if any activity zones were removed for both non-HKSV and HKSV enabled devices
+    // We'll also update the online status of the camera in the motion service here
+    Object.entries(this.motionServices).forEach(([zoneID, service]) => {
+      // Set online status
+      service.service.updateCharacteristic(
+        this.hap.Characteristic.Active,
+        deviceData.online === true ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE,
+      );
 
-      let mp4box = mp4boxes.shift();
-      if (typeof mp4box !== 'object') {
-        // Not an mp4 fragment box, so try again
-        continue;
+      // Handle deleted zones (excluding zone ID 1 for HKSV)
+      if (
+        zoneID !== '1' &&
+        Array.isArray(deviceData.activity_zones) === true &&
+        deviceData.activity_zones.findIndex(({ id }) => id === Number(zoneID)) === -1
+      ) {
+        // Motion service we created doesn't appear in zone list anymore, so assume deleted
+        this.accessory.removeService(service.service);
+        delete this.motionServices[zoneID];
       }
+    });
 
-      // Queue up this fragment mp4 segment
-      segment.push(mp4box.header, mp4box.data);
+    if (this.operatingModeService !== undefined) {
+      // Update camera off/on status
+      this.operatingModeService.updateCharacteristic(
+        this.hap.Characteristic.ManuallyDisabled,
+        deviceData.streaming_enabled === false
+          ? this.hap.Characteristic.ManuallyDisabled.DISABLED
+          : this.hap.Characteristic.ManuallyDisabled.ENABLED,
+      );
 
-      if (mp4box.type === 'moov' || mp4box.type === 'mdat') {
-        yield { data: Buffer.concat(segment), isLast: false };
-        segment = [];
+      if (deviceData?.has_statusled === true) {
+        // Set camera recording indicator. This cannot be turned off on Nest Cameras/Doorbells
+        // 0 = auto
+        // 1 = low
+        // 2 = high
+        this.operatingModeService.updateCharacteristic(
+          this.hap.Characteristic.CameraOperatingModeIndicator,
+          deviceData.statusled_brightness !== 1,
+        );
       }
-    }
-  }
 
-  closeRecordingStream(sessionID, closeReason) {
-    // Stop the associated recording stream
-    this.streamer !== undefined && this.streamer.stopRecordStream(sessionID);
-
-    if (typeof this.#hkSessions?.[sessionID] === 'object') {
-      if (this.#hkSessions[sessionID]?.ffmpeg !== undefined) {
-        // Kill the ffmpeg recorder process
-        this.#hkSessions[sessionID].ffmpeg.kill('SIGKILL');
+      if (deviceData?.has_irled === true) {
+        // Set nightvision status in HomeKit
+        this.operatingModeService.updateCharacteristic(this.hap.Characteristic.NightVision, deviceData.irled_enabled);
       }
-      if (this.#hkSessions[sessionID]?.eventEmitter !== undefined) {
-        this.#hkSessions[sessionID].eventEmitter.emit(MP4BOX); // This will ensure we cleanly exit out from our segment generator
-        this.#hkSessions[sessionID].eventEmitter.removeAllListeners(MP4BOX); // Tidy up our event listeners
+
+      if (deviceData?.has_video_flip === true) {
+        // Update image flip status
+        this.operatingModeService.updateCharacteristic(this.hap.Characteristic.ImageRotation, deviceData.video_flipped === true ? 180 : 0);
       }
-      delete this.#hkSessions[sessionID];
     }
 
-    // Log recording finished messages depending on reason
-    if (closeReason === this.hap.HDSProtocolSpecificErrorReason.NORMAL) {
-      this?.log?.info?.('Completed recording from "%s"', this.deviceData.description);
-    } else {
-      this?.log?.warn?.(
-        'Recording from "%s" completed with error. Reason was "%s"',
-        this.deviceData.description,
-        this.hap.HDSProtocolSpecificErrorReason[closeReason],
+    if (deviceData.hksv === true && this.controller?.recordingManagement?.recordingManagementService !== undefined) {
+      // Update recording audio status
+      this.controller.recordingManagement.recordingManagementService.updateCharacteristic(
+        this.hap.Characteristic.RecordingAudioActive,
+        deviceData.audio_enabled === true
+          ? this.hap.Characteristic.RecordingAudioActive.ENABLE
+          : this.hap.Characteristic.RecordingAudioActive.DISABLE,
       );
     }
-  }
 
-  updateRecordingActive(enableRecording) {
-    if (enableRecording === true && this.streamer?.isBuffering() === false) {
-      // Start a buffering stream for this camera/doorbell. Ensures motion captures all video on motion trigger
-      // Required due to data delays by on prem Nest to cloud to HomeKit accessory to iCloud etc
-      // Make sure have appropriate bandwidth!!!
-      this?.log?.info?.('Recording was turned on for "%s"', this.deviceData.description);
-      this.streamer.startBuffering();
+    if (this.controller?.microphoneService !== undefined) {
+      // Update microphone volume if specified
+      //this.controller.microphoneService.updateCharacteristic(this.hap.Characteristic.Volume, deviceData.xxx);
+
+      // if audio is disabled, we'll mute microphone
+      this.controller.setMicrophoneMuted(deviceData.audio_enabled === false ? true : false);
     }
+    if (this.controller?.speakerService !== undefined) {
+      // Update speaker volume if specified
+      //this.controller.speakerService.updateCharacteristic(this.hap.Characteristic.Volume, deviceData.xxx);
 
-    if (enableRecording === false && this.streamer?.isBuffering() === true) {
-      this.streamer.stopBuffering();
-      this?.log?.warn?.('Recording was turned off for "%s"', this.deviceData.description);
+      // if audio is disabled, we'll mute speaker
+      this.controller.setSpeakerMuted(deviceData.audio_enabled === false ? true : false);
     }
-  }
 
-  updateRecordingConfiguration(recordingConfig) {
-    this.#recordingConfig = recordingConfig; // Store the recording configuration HKSV has provided
-  }
+    // Process alerts, the most recent alert is first
+    // For HKSV, we're interested motion events
+    // For non-HKSV, we're interested motion, face and person events (maybe sound and package later)
+    deviceData.alerts.forEach((event) => {
+      if (
+        this.operatingModeService === undefined ||
+        (this.operatingModeService !== undefined &&
+          this.operatingModeService.getCharacteristic(this.hap.Characteristic.HomeKitCameraActive).value ===
+            this.hap.Characteristic.HomeKitCameraActive.ON)
+      ) {
+        // We're configured to handle camera events
+        // https://github.com/Supereg/secure-video-specification?tab=readme-ov-file#33-homekitcameraactive
 
-  async handleSnapshotRequest(snapshotRequestDetails, callback) {
-    // snapshotRequestDetails.reason === ResourceRequestReason.PERIODIC
-    // snapshotRequestDetails.reason === ResourceRequestReason.EVENT
+        // Handle motion event
+        // For a HKSV enabled camera, we will use this to trigger the starting of the HKSV recording if the camera is active
+        if (event.types.includes('motion') === true) {
+          if (
+            this.motionTimer === undefined &&
+            (this.deviceData.hksv === false || this.ffmpeg instanceof FFmpeg === false || this.streamer === undefined)
+          ) {
+            this?.log?.info?.('Motion detected at "%s"', deviceData.description);
+          }
 
-    // Get current image from camera/doorbell
-    let imageBuffer = undefined;
+          event.zone_ids.forEach((zoneID) => {
+            if (
+              typeof this.motionServices?.[zoneID]?.service === 'object' &&
+              this.motionServices[zoneID].service.getCharacteristic(this.hap.Characteristic.MotionDetected).value !== true
+            ) {
+              // Trigger motion for matching zone of not aleady active
+              this.motionServices[zoneID].service.updateCharacteristic(this.hap.Characteristic.MotionDetected, true);
 
-    if (this.deviceData.migrating === false && this.deviceData.streaming_enabled === true && this.deviceData.online === true) {
-      let response = await this.get({ uuid: this.deviceData.nest_google_uuid, camera_snapshot: '' });
-      if (Buffer.isBuffer(response?.camera_snapshot) === true) {
-        imageBuffer = response.camera_snapshot;
-        this.lastSnapshotImage = response.camera_snapshot;
+              // Log motion started into history
+              this.history(this.motionServices[zoneID].service, {
+                status: 1,
+              });
+            }
+          });
 
-        // Keep this snapshot image cached for a certain period
-        clearTimeout(this.snapshotTimer);
-        this.snapshotTimer = setTimeout(() => {
-          this.lastSnapshotImage = undefined;
-        }, SNAPSHOT_CACHE_TIMEOUT);
+          // Clear any motion active timer so we can extend if more motion detected
+          clearTimeout(this.motionTimer);
+          this.motionTimer = setTimeout(() => {
+            event.zone_ids.forEach((zoneID) => {
+              if (typeof this.motionServices?.[zoneID]?.service === 'object') {
+                // Mark associted motion services as motion not detected
+                this.motionServices[zoneID].service.updateCharacteristic(this.hap.Characteristic.MotionDetected, false);
+
+                // Log motion started into history
+                this.history(this.motionServices[zoneID].service, { status: 0 });
+              }
+            });
+
+            this.motionTimer = undefined; // No motion timer active
+          }, this.deviceData.motionCooldown * 1000);
+        }
+
+        // Handle person/face event
+        // We also treat a 'face' event the same as a person event ie: if you have a face, you have a person
+        if (event.types.includes('person') === true || event.types.includes('face') === true) {
+          if (this.personTimer === undefined) {
+            // We don't have a person cooldown timer running, so we can process the 'person'/'face' event
+            if (this.deviceData.hksv === false || this.ffmpeg instanceof FFmpeg === false || this.streamer === undefined) {
+              // We'll only log a person detected event if HKSV is disabled
+              this?.log?.info?.('Person detected at "%s"', deviceData.description);
+            }
+
+            // Cooldown for person being detected
+            // Start this before we process further
+            this.personTimer = setTimeout(() => {
+              this.personTimer = undefined; // No person timer active
+            }, this.deviceData.personCooldown * 1000);
+
+            if (event.types.includes('motion') === false) {
+              // If person/face events doesn't include a motion event, add in here
+              // This will handle all the motion triggering stuff
+              event.types.push('motion');
+            }
+          }
+        }
+      }
+    });
+  }
+
+  onShutdown() {
+    // Stop all streamer logic (buffering, output, etc)
+    this.streamer?.stopEverything?.();
+
+    // Terminate any remaining ffmpeg sessions for this camera/doorbell
+    this.ffmpeg?.killAllSessions?.(this.uuid);
+
+    // Stop any on-going HomeKit sessions, either live or recording
+    // We'll terminate any ffmpeg, rtpSplitter etc processes
+    this.#liveSessions?.forEach?.((session) => {
+      session?.rtpSplitter?.close?.();
+    });
+  }
+
+  // Taken and adapted from:
+  // https://github.com/hjdhjd/homebridge-unifi-protect/blob/eee6a4e379272b659baa6c19986d51f5bf2cbbbc/src/protect-ffmpeg-record.ts
+  async *handleRecordingStreamRequest(sessionID) {
+    if (this.ffmpeg instanceof FFmpeg === false) {
+      // No valid ffmpeg binary present, so cannot do recording!!
+      this?.log?.warn?.(
+        'Received request to start recording for "%s" however we do not have an ffmpeg binary present',
+        this.deviceData.description,
+      );
+      return;
+    }
+
+    if (this.streamer === undefined) {
+      this?.log?.error?.(
+        'Received request to start recording for "%s" however we do not have any associated streaming protocol support',
+        this.deviceData.description,
+      );
+      return;
+    }
+
+    if (
+      this.motionServices?.[1]?.service !== undefined &&
+      this.motionServices[1].service.getCharacteristic(this.hap.Characteristic.MotionDetected).value === false
+    ) {
+      // Should only be recording if motion detected.
+      // Sometimes when starting up, HAP-nodeJS or HomeKit triggers this even when motion isn't occurring
+      this?.log?.debug?.(
+        'Received request to commence recording for "%s" however we have not detected any motion',
+        this.deviceData.description,
+      );
+      return;
+    }
+
+    let includeAudio =
+      this.deviceData.audio_enabled === true &&
+      this.controller?.recordingManagement?.recordingManagementService?.getCharacteristic(this.hap.Characteristic.RecordingAudioActive)
+        ?.value === this.hap.Characteristic.RecordingAudioActive.ENABLE;
+
+    let commandLine = [
+      '-hide_banner',
+      '-nostats',
+      '-fflags',
+      '+discardcorrupt+genpts',
+      '-avoid_negative_ts',
+      'make_zero',
+      '-max_delay',
+      '500000',
+      '-flags',
+      'low_delay',
+
+      // Video input
+      '-f',
+      'h264',
+      '-i',
+      'pipe:0',
+
+      // Audio input (optional)
+      ...(includeAudio === true
+        ? this.streamer.codecs.audio === Streamer.CODEC_TYPE.PCM
+          ? ['-thread_queue_size', '512', '-f', 's16le', '-ar', '48000', '-ac', '2', '-i', 'pipe:3']
+          : this.streamer.codecs.audio === Streamer.CODEC_TYPE.AAC
+            ? ['-thread_queue_size', '512', '-f', 'aac', '-i', 'pipe:3']
+            : []
+        : []),
+
+      // Video output including hardware acceleration if available
+      '-map',
+      '0:v:0',
+      '-codec:v',
+      this.deviceData?.ffmpeg?.hwaccel === true && this.ffmpeg?.hardwareH264Codec !== undefined ? this.ffmpeg.hardwareH264Codec : 'libx264',
+      ...(this.deviceData?.ffmpeg?.hwaccel !== true || ['h264_nvenc', 'h264_qsv'].includes(this.ffmpeg?.hardwareH264Codec || '') === true
+        ? [
+            '-preset',
+            'veryfast',
+            '-profile:v',
+            this.#recordingConfig.videoCodec.parameters.profile === this.hap.H264Profile.HIGH
+              ? 'high'
+              : this.#recordingConfig.videoCodec.parameters.profile === this.hap.H264Profile.MAIN
+                ? 'main'
+                : 'baseline',
+            '-level:v',
+            this.#recordingConfig.videoCodec.parameters.level === this.hap.H264Level.LEVEL4_0
+              ? '4.0'
+              : this.#recordingConfig.videoCodec.parameters.level === this.hap.H264Level.LEVEL3_2
+                ? '3.2'
+                : '3.1',
+            '-bf',
+            '0',
+          ]
+        : []),
+
+      '-filter:v',
+      'fps=fps=' + this.#recordingConfig.videoCodec.resolution[2] + ',format=yuv420p',
+      '-fps_mode',
+      'cfr',
+      '-g:v',
+      Math.round(
+        (this.#recordingConfig.videoCodec.resolution[2] * this.#recordingConfig.videoCodec.parameters.iFrameInterval) / 1000,
+      ).toString(),
+      '-b:v',
+      this.#recordingConfig.videoCodec.parameters.bitRate + 'k',
+      '-bufsize',
+      2 * this.#recordingConfig.videoCodec.parameters.bitRate + 'k',
+      '-video_track_timescale',
+      '90000',
+      '-movflags',
+      'frag_keyframe+empty_moov+default_base_moof',
+
+      // Audio output
+      ...(includeAudio === true
+        ? ['-map', '1:a:0', '-codec:a', 'libfdk_aac', '-profile:a', 'aac_low', '-ar', '16000', '-b:a', '16k', '-ac', '1']
+        : []),
+
+      '-f',
+      'mp4',
+      'pipe:1',
+    ];
+
+    // Start our ffmpeg recording process and stream from our streamer
+    // video is pipe #1
+    // audio is pipe #3 if including audio
+    this?.log?.debug?.(
+      'ffmpeg process for recording stream from "%s" will be called using the following commandline',
+      this.deviceData.description,
+      commandLine.join(' ').toString(),
+    );
+
+    let ffmpegStream = this.ffmpeg.createSession(
+      this.uuid,
+      sessionID,
+      commandLine,
+      'record',
+      this.deviceData.ffmpeg.debug === true
+        ? (data) => {
+            if (data.toString().includes('frame=') === false) {
+              this?.log?.debug?.(data.toString());
+            }
+          }
+        : undefined,
+      4, // 4 pipes required
+    );
+
+    if (ffmpegStream === undefined) {
+      return;
+    }
+
+    let buffer = Buffer.alloc(0);
+    let mp4boxes = [];
+
+    ffmpegStream?.stdout?.on?.('data', (chunk) => {
+      buffer = Buffer.concat([buffer, chunk]);
+
+      while (buffer.length >= 8) {
+        let boxSize = buffer.readUInt32BE(0);
+        if (boxSize < 8 || buffer.length < boxSize) {
+          // We dont have enough data in the buffer yet to process the full mp4 box
+          // so, exit loop and await more data
+          break;
+        }
+
+        let boxType = buffer.subarray(4, 8).toString();
+
+        // Add it to our queue to be pushed out through the generator function.
+        mp4boxes.push({
+          header: buffer.subarray(0, 8),
+          type: boxType,
+          data: buffer.subarray(8, boxSize),
+        });
+
+        buffer = buffer.subarray(boxSize);
+        this.emit(MP4BOX);
+      }
+    });
+
+    ffmpegStream?.on?.('exit', (code, signal) => {
+      if (signal !== 'SIGKILL' || signal === null) {
+        this?.log?.error?.('ffmpeg recording process for "%s" stopped unexpectedly. Exit code was "%s"', this.deviceData.description, code);
+      }
+
+      // Ensure generator wakes up and exits
+      this.emit(MP4BOX);
+      this.removeAllListeners(MP4BOX);
+    });
+
+    // Start the appropriate streamer
+    let { video, audio } = await this.message(Streamer.MESSAGE, Streamer.MESSAGE_TYPE.START_RECORD, {
+      sessionID: sessionID,
+    });
+
+    // Connect the ffmpeg process to the streamer input/output
+    video?.pipe?.(ffmpegStream?.stdin); // Streamer video → ffmpeg stdin (pipe:0)
+    audio?.pipe?.(ffmpegStream?.stdio?.[3]); // Streamer audio → ffmpeg pipe:3
+
+    this?.log?.info?.('Started recording from "%s" %s', this.deviceData.description, includeAudio === false ? 'without audio' : '');
+
+    // Loop generating MOOF/MDAT box pairs for HomeKit Secure Video.
+    // HAP-NodeJS cancels this async generator function when recording completes also
+    let segment = [];
+    for (;;) {
+      if (this.ffmpeg?.hasSession?.(this.uuid, sessionID, 'record') === false) {
+        break;
+      }
+
+      if (mp4boxes.length === 0) {
+        await EventEmitter.once(this, MP4BOX);
+
+        if (this.ffmpeg?.hasSession?.(this.uuid, sessionID, 'record') === false) {
+          break;
+        }
+
+        if (mp4boxes.length === 0) {
+          continue;
+        }
+      }
+
+      let box = mp4boxes.shift();
+      if (box === undefined) {
+        continue;
+      }
+
+      segment.push(box.header, box.data);
+
+      if (box.type === 'moov' || box.type === 'mdat') {
+        yield { data: Buffer.concat(segment), isLast: false };
+        segment = [];
+      }
+    }
+  }
+
+  async closeRecordingStream(sessionID, closeReason) {
+    // Stop recording stream from the streamer
+    await this.message(Streamer.MESSAGE, Streamer.MESSAGE_TYPE.STOP_RECORD, {
+      sessionID: sessionID,
+    });
+
+    // Terminate the ffmpeg recording process
+    this.ffmpeg?.killSession?.(this.uuid, sessionID, 'record', 'SIGKILL');
+
+    // Wake and clear HomeKit Secure Video generator
+    this.emit(MP4BOX);
+    this.removeAllListeners(MP4BOX);
+
+    // Log completion depending on reason
+    if (closeReason === this.hap.HDSProtocolSpecificErrorReason.NORMAL) {
+      this?.log?.info?.('Completed recording from "%s"', this.deviceData.description);
+    } else {
+      this?.log?.warn?.(
+        'Recording from "%s" completed with error. Reason was "%s"',
+        this.deviceData.description,
+        this.hap.HDSProtocolSpecificErrorReason?.[closeReason] || 'code ' + closeReason,
+      );
+    }
+  }
+
+  async updateRecordingActive(enableRecording) {
+    if (this.streamer === undefined) {
+      return;
+    }
+
+    if (enableRecording === true && this.streamer.isBuffering() === false) {
+      // Start a buffering stream for this camera/doorbell. Ensures motion captures all video on motion trigger
+      // Required due to data delays by on prem Nest to cloud to HomeKit accessory to iCloud etc
+      // Make sure have appropriate bandwidth!!!
+      this?.log?.info?.('Recording was turned on for "%s"', this.deviceData.description);
+      await this.message(Streamer.MESSAGE, Streamer.MESSAGE_TYPE.START_BUFFER);
+    }
+
+    if (enableRecording === false && this.streamer.isBuffering() === true) {
+      // Stop buffering stream for this camera/doorbell
+      await this.message(Streamer.MESSAGE, Streamer.MESSAGE_TYPE.STOP_BUFFER);
+      this?.log?.warn?.('Recording was turned off for "%s"', this.deviceData.description);
+    }
+  }
+
+  updateRecordingConfiguration(recordingConfig) {
+    this.#recordingConfig = recordingConfig; // Store the recording configuration HKSV has provided
+  }
+
+  async handleSnapshotRequest(snapshotRequestDetails, callback) {
+    // snapshotRequestDetails.reason === ResourceRequestReason.PERIODIC
+    // snapshotRequestDetails.reason === ResourceRequestReason.EVENT
+
+    // eslint-disable-next-line no-unused-vars
+    const isLikelyBlackImage = (buffer) => {
+      // TODO <- Placeholder for actual black image detection logic
+      return false;
+    };
+
+    // Get current image from camera/doorbell
+    let imageBuffer = undefined;
+
+    if (this.deviceData.migrating === false && this.deviceData.streaming_enabled === true && this.deviceData.online === true) {
+      // Call the camera/doorbell to get a snapshot image.
+      // Prefer onGet() result if implemented; fallback to static handler
+      let response = await this.get({ uuid: this.deviceData.nest_google_uuid, camera_snapshot: Buffer.alloc(0) });
+      if (
+        Buffer.isBuffer(response?.camera_snapshot) === true &&
+        response.camera_snapshot.length > 0 &&
+        isLikelyBlackImage(response.camera_snapshot) === false
+      ) {
+        imageBuffer = response.camera_snapshot;
+        this.#lastSnapshotImage = response.camera_snapshot;
+
+        // Keep this snapshot image cached for a certain period
+        clearTimeout(this.#snapshotTimer);
+        this.#snapshotTimer = setTimeout(() => {
+          this.#lastSnapshotImage = undefined;
+        }, TIMERS.SNAPSHOT);
       }
     }
 
@@ -566,43 +841,42 @@ export default class NestCamera extends HomeKitDevice {
       this.deviceData.migrating === false &&
       this.deviceData.streaming_enabled === false &&
       this.deviceData.online === true &&
-      this.#cameraVideoOffImage !== undefined
+      this.#cameraImages?.off !== undefined
     ) {
       // Return 'camera switched off' jpg to image buffer
-      imageBuffer = this.#cameraVideoOffImage;
+      imageBuffer = this.#cameraImages.off;
     }
 
-    if (this.deviceData.migrating === false && this.deviceData.online === false && this.#cameraOfflineImage !== undefined) {
+    if (this.deviceData.migrating === false && this.deviceData.online === false && this.#cameraImages?.offline !== undefined) {
       // Return 'camera offline' jpg to image buffer
-      imageBuffer = this.#cameraOfflineImage;
+      imageBuffer = this.#cameraImages.offline;
     }
 
-    if (this.deviceData.migrating === true && this.#cameraTransferringImage !== undefined) {
+    if (this.deviceData.migrating === true && this.#cameraImages?.transfer !== undefined) {
       // Return 'camera transferring' jpg to image buffer
-      imageBuffer = this.#cameraTransferringImage;
+      imageBuffer = this.#cameraImages.transfer;
     }
 
     if (imageBuffer === undefined) {
       // If we get here, we have no snapshot image
       // We'll use the last success snapshop as long as its within a certain time period
-      imageBuffer = this.lastSnapshotImage;
+      imageBuffer = this.#lastSnapshotImage;
     }
 
     callback(imageBuffer?.length === 0 ? 'Unable to obtain Camera/Doorbell snapshot' : null, imageBuffer);
   }
 
   async prepareStream(request, callback) {
-    const getPort = async (options) => {
+    // HomeKit has asked us to prepare ports and encryption details for video/audio streaming
+
+    const getPort = async () => {
       return new Promise((resolve, reject) => {
-        let server = net.createServer();
-        server.unref();
-        server.on('error', reject);
-        server.listen(options, () => {
+        let server = dgram.createSocket('udp4');
+        server.bind({ port: 0, exclusive: true }, () => {
           let port = server.address().port;
-          server.close(() => {
-            resolve(port); // return port
-          });
+          server.close(() => resolve(port));
         });
+        server.on('error', reject);
       });
     };
 
@@ -618,21 +892,15 @@ export default class NestCamera extends HomeKitDevice {
       audioPort: request.audio.port,
       localAudioPort: await getPort(),
       audioTalkbackPort: await getPort(),
-      rptSplitterPort: await getPort(),
+      rtpSplitterPort: await getPort(),
       audioCryptoSuite: request.video.srtpCryptoSuite,
       audioSRTP: Buffer.concat([request.audio.srtp_key, request.audio.srtp_salt]),
       audioSSRC: this.hap.CameraController.generateSynchronisationSource(),
 
-      rtpSplitter: null,
-      ffmpeg: [], // Array of ffmpeg processes we create for streaming video/audio and audio talkback
-      video: null,
-      audio: null,
+      rtpSplitter: null, // setup later during stream start
     };
 
-    // Build response back to HomeKit with the details filled out
-
-    // Dropped ip module by using small snippet of code below
-    // Converts ipv4 mapped into ipv6 address into pure ipv4
+    // Converts ipv4-mapped ipv6 into pure ipv4
     if (request.addressVersion === 'ipv4' && request.sourceAddress.startsWith('::ffff:') === true) {
       request.sourceAddress = request.sourceAddress.replace('::ffff:', '');
     }
@@ -646,272 +914,251 @@ export default class NestCamera extends HomeKitDevice {
         srtp_salt: request.video.srtp_salt,
       },
       audio: {
-        port: sessionInfo.rptSplitterPort,
+        port: sessionInfo.rtpSplitterPort,
         ssrc: sessionInfo.audioSSRC,
         srtp_key: request.audio.srtp_key,
         srtp_salt: request.audio.srtp_salt,
       },
     };
-    this.#hkSessions[request.sessionID] = sessionInfo; // Store the session information
+
+    this.#liveSessions.set(request.sessionID, sessionInfo); // Store the session information
     callback(undefined, response);
   }
 
   async handleStreamRequest(request, callback) {
     // called when HomeKit asks to start/stop/reconfigure a camera/doorbell live stream
-    if (request.type === this.hap.StreamRequestTypes.START && this.streamer === undefined) {
-      // We have no streamer object configured, so cannot do live streams!!
-      this?.log?.error?.(
-        'Received request to start live video for "%s" however we do not any associated streaming protocol support',
-        this.deviceData.description,
-      );
-    }
 
-    if (request.type === this.hap.StreamRequestTypes.START && this.deviceData?.ffmpeg?.binary === undefined) {
-      // No ffmpeg binary present, so cannot do live streams!!
-      this?.log?.warn?.(
-        'Received request to start live video for "%s" however we do not have an ffmpeg binary present',
-        this.deviceData.description,
-      );
-    }
+    if (request.type === this.hap.StreamRequestTypes.START) {
+      if (this.streamer === undefined) {
+        // We have no streamer object configured, so cannot do live streams!!
+        this?.log?.error?.(
+          'Received request to start live video for "%s" however we do not have any associated streaming protocol support',
+          this.deviceData.description,
+        );
+        return callback?.();
+      }
+
+      if (this.ffmpeg instanceof FFmpeg === false) {
+        // No valid ffmpeg binary present, so cannot do live streams!!
+        this?.log?.warn?.(
+          'Received request to start live video for "%s" however we do not have a valid ffmpeg binary',
+          this.deviceData.description,
+        );
+        return callback?.();
+      }
+
+      let session = this.#liveSessions.get(request.sessionID);
+      let includeAudio = this.deviceData.audio_enabled === true && this.streamer?.codecs?.audio !== undefined;
 
-    if (
-      request.type === this.hap.StreamRequestTypes.START &&
-      this.streamer !== undefined &&
-      this.deviceData?.ffmpeg?.binary !== undefined
-    ) {
       // Build our ffmpeg command string for the liveview video/audio stream
       let commandLine = [
         '-hide_banner',
         '-nostats',
-        '-use_wallclock_as_timestamps 1',
-        '-fflags +discardcorrupt',
-        '-max_delay 500000',
-        '-flags low_delay',
-        '-f h264',
-        '-i pipe:0',
+        '-use_wallclock_as_timestamps',
+        '1',
+        '-fflags',
+        '+discardcorrupt',
+        '-max_delay',
+        '500000',
+        '-flags',
+        'low_delay',
+
+        // Video input
+        '-f',
+        'h264',
+        '-i',
+        'pipe:0',
+
+        // Audio input (if enabled)
+        ...(includeAudio === true
+          ? this.streamer.codecs.audio === Streamer.CODEC_TYPE.PCM
+            ? ['-thread_queue_size', '512', '-f', 's16le', '-ar', '48000', '-ac', '2', '-i', 'pipe:3']
+            : this.streamer.codecs.audio === Streamer.CODEC_TYPE.AAC
+              ? ['-thread_queue_size', '512', '-f', 'aac', '-i', 'pipe:3']
+              : []
+          : []),
+
+        // Video output
+        '-map',
+        '0:v:0',
+        '-codec:v',
+        'copy',
+        // Below is comment out as we don't use hardware acceleration for live streaming
+        //       ...(this.deviceData.ffmpeg.hwaccel === true && this.ffmpeg.hardwareH264Codec !== undefined
+        //         ? ['-codec:v', this.ffmpeg.hardwareH264Codec]
+        //         : ['-codec:v', 'copy']),
+        '-fps_mode',
+        'passthrough',
+        '-reset_timestamps',
+        '1',
+        '-video_track_timescale',
+        '90000',
+        '-payload_type',
+        request.video.pt,
+        '-ssrc',
+        session.videoSSRC,
+        '-f',
+        'rtp',
+        '-srtp_out_suite',
+        this.hap.SRTPCryptoSuites[session.videoCryptoSuite],
+        '-srtp_out_params',
+        session.videoSRTP.toString('base64'),
+        'srtp://' + session.address + ':' + session.videoPort + '?rtcpport=' + session.videoPort + '&pkt_size=' + request.video.mtu,
+
+        // Audio output (if enabled)
+        ...(includeAudio === true
+          ? request.audio.codec === this.hap.AudioStreamingCodecType.AAC_ELD
+            ? ['-map', '1:a:0', '-codec:a', 'libfdk_aac', '-profile:a', 'aac_eld']
+            : request.audio.codec === this.hap.AudioStreamingCodecType.OPUS
+              ? [
+                  '-map',
+                  '1:a:0',
+                  '-codec:a',
+                  'libopus',
+                  '-application',
+                  'lowdelay',
+                  '-frame_duration',
+                  request.audio.packet_time.toString(),
+                ]
+              : []
+          : []),
+
+        // Shared audio output params
+        ...(includeAudio === true
+          ? [
+              '-flags',
+              '+global_header',
+              '-ar',
+              request.audio.sample_rate.toString() + 'k',
+              '-b:a',
+              request.audio.max_bit_rate + 'k',
+              '-ac',
+              request.audio.channel.toString(),
+              '-payload_type',
+              request.audio.pt,
+              '-ssrc',
+              session.audioSSRC,
+              '-f',
+              'rtp',
+              '-srtp_out_suite',
+              this.hap.SRTPCryptoSuites[session.audioCryptoSuite],
+              '-srtp_out_params',
+              session.audioSRTP.toString('base64'),
+              'srtp://' +
+                session.address +
+                ':' +
+                session.audioPort +
+                '?rtcpport=' +
+                session.audioPort +
+                '&localrtcpport=' +
+                session.localAudioPort +
+                '&pkt_size=188',
+            ]
+          : []),
       ];
 
-      let includeAudio = false;
-      if (
-        this.deviceData.audio_enabled === true &&
-        this.streamer?.codecs?.audio === 'aac' &&
-        this.deviceData?.ffmpeg?.libfdk_aac === true
-      ) {
-        // Audio data only on extra pipe created in spawn command
-        commandLine.push('-f aac -i pipe:3');
-        includeAudio = true;
-      }
-
-      if (this.deviceData.audio_enabled === true && this.streamer?.codecs?.audio === 'opus' && this.deviceData?.ffmpeg?.libopus === true) {
-        // Audio data only on extra pipe created in spawn command
-        commandLine.push('-i pipe:3');
-        includeAudio = true;
-      }
-
-      // Build our video command for ffmpeg
-      commandLine.push(
-        '-map 0:v:0',
-        '-codec:v copy',
-        '-fps_mode passthrough',
-        '-reset_timestamps 1',
-        '-video_track_timescale 90000',
-        '-payload_type ' + request.video.pt,
-        '-ssrc ' + this.#hkSessions[request.sessionID].videoSSRC,
-        '-f rtp',
-        '-srtp_out_suite ' + this.hap.SRTPCryptoSuites[this.#hkSessions[request.sessionID].videoCryptoSuite],
-        '-srtp_out_params ' +
-          this.#hkSessions[request.sessionID].videoSRTP.toString('base64') +
-          ' srtp://' +
-          this.#hkSessions[request.sessionID].address +
-          ':' +
-          this.#hkSessions[request.sessionID].videoPort +
-          '?rtcpport=' +
-          this.#hkSessions[request.sessionID].videoPort +
-          '&pkt_size=' +
-          request.video.mtu,
-      );
-
-      // We have seperate video and audio streams that need to be muxed together if audio enabled
-      if (includeAudio === true) {
-        if (request.audio.codec === this.hap.AudioStreamingCodecType.AAC_ELD) {
-          commandLine.push('-map 1:a:0', '-codec:a libfdk_aac', '-profile:a aac_eld');
-        }
-
-        if (request.audio.codec === this.hap.AudioStreamingCodecType.OPUS) {
-          commandLine.push(
-            '-map 1:a:0',
-            '-codec:a libopus',
-            '-application lowdelay',
-            '-frame_duration ' + request.audio.packet_time.toString(),
-          );
-        }
-
-        commandLine.push(
-          '-flags +global_header',
-          '-ar ' + request.audio.sample_rate + 'k',
-          '-b:a ' + request.audio.max_bit_rate + 'k',
-          '-ac ' + request.audio.channel,
-          '-payload_type ' + request.audio.pt,
-          '-ssrc ' + this.#hkSessions[request.sessionID].audioSSRC,
-          '-f rtp',
-          '-srtp_out_suite ' + this.hap.SRTPCryptoSuites[this.#hkSessions[request.sessionID].audioCryptoSuite],
-          '-srtp_out_params ' +
-            this.#hkSessions[request.sessionID].audioSRTP.toString('base64') +
-            ' srtp://' +
-            this.#hkSessions[request.sessionID].address +
-            ':' +
-            this.#hkSessions[request.sessionID].audioPort +
-            '?rtcpport=' +
-            this.#hkSessions[request.sessionID].audioPort +
-            '&localrtcpport=' +
-            this.#hkSessions[request.sessionID].localAudioPort +
-            '&pkt_size=188',
-        );
-      }
-
-      // Start our ffmpeg streaming process and stream from our streamer
-      // video is pipe #1
-      // audio is pipe #3 if including audio
       this?.log?.debug?.(
         'ffmpeg process for live streaming from "%s" will be called using the following commandline',
         this.deviceData.description,
         commandLine.join(' ').toString(),
       );
-      let ffmpegStreaming = child_process.spawn(this.deviceData.ffmpeg.binary, commandLine.join(' ').split(' '), {
-        env: process.env,
-        stdio: ['pipe', 'pipe', 'pipe', 'pipe'],
-      });
-
-      ffmpegStreaming.on('exit', (code, signal) => {
-        if (signal !== 'SIGKILL' || signal === null) {
-          this?.log?.error?.(
-            'ffmpeg video/audio live streaming process for "%s" stopped unexpectedly. Exit code was "%s"',
-            this.deviceData.description,
-            code,
-          );
-
-          // Clean up or streaming request, but calling it again with a 'STOP' reques
-          this.handleStreamRequest({ type: this.hap.StreamRequestTypes.STOP, sessionID: request.sessionID }, null);
-        }
-      });
 
-      // ffmpeg console output is via stderr
-      ffmpegStreaming.stderr.on('data', (data) => {
-        if (data.toString().includes('frame=') === false && this.deviceData?.ffmpeg?.debug === true) {
-          // Monitor ffmpeg output
-          this?.log?.debug?.(data.toString());
-        }
-      });
-
-      // eslint-disable-next-line no-unused-vars
-      ffmpegStreaming.on('error', (error) => {
-        // Empty
-      });
+      // Launch the ffmpeg process for streaming and connect it to streamer input/output
+      let ffmpegStream = this.ffmpeg.createSession(
+        this.uuid,
+        request.sessionID,
+        commandLine,
+        'live',
+        (data) => {
+          if (data.toString().includes('frame=') === false && this.deviceData.ffmpeg.debug === true) {
+            this?.log?.debug?.(data.toString());
+          }
+        },
+        4, // 4 pipes required
+      );
 
-      // We only enable two/way audio on camera/doorbell if we have the required libraries in ffmpeg AND two-way/audio is enabled
-      let ffmpegAudioTalkback = null; // No ffmpeg process for return audio yet
+      // Two-way audio support if enabled and codecs available
+      let ffmpegTalk = null;
       if (
-        ((this.streamer.codecs.talk === 'speex' && this.deviceData?.ffmpeg?.libspeex === true) ||
-          (this.streamer.codecs.talk === 'opus' && this.deviceData?.ffmpeg?.libopus === true)) &&
-        this.deviceData?.ffmpeg?.libfdk_aac === true &&
+        ((this.streamer?.codecs?.talkback === Streamer.CODEC_TYPE.SPEEX &&
+          this.ffmpeg?.features?.encoders?.includes('libspeex') === true) ||
+          (this.streamer?.codecs?.talkback === Streamer.CODEC_TYPE.OPUS &&
+            this.ffmpeg?.features?.encoders?.includes('libopus') === true)) &&
+        this.ffmpeg?.features?.encoders?.includes('libfdk_aac') === true &&
         this.deviceData.audio_enabled === true &&
         this.deviceData.has_speaker === true &&
         this.deviceData.has_microphone === true
       ) {
-        // Setup RTP splitter for two/away audio
-        this.#hkSessions[request.sessionID].rtpSplitter = dgram.createSocket('udp4');
-        this.#hkSessions[request.sessionID].rtpSplitter.bind(this.#hkSessions[request.sessionID].rptSplitterPort);
-
-        this.#hkSessions[request.sessionID].rtpSplitter.on('error', () => {
-          this.#hkSessions[request.sessionID].rtpSplitter.close();
-        });
-
-        this.#hkSessions[request.sessionID].rtpSplitter.on('message', (message) => {
-          let payloadType = message.readUInt8(1) & 0x7f;
-          if (payloadType === request.audio.pt) {
-            // Audio payload type from HomeKit should match our payload type for audio
-            if (message.length > 50) {
-              // Only send on audio data if we have a longer audio packet.
-              // (not sure it makes any difference, as under iOS 15 packets are roughly same length)
-              this.#hkSessions[request.sessionID].rtpSplitter.send(message, this.#hkSessions[request.sessionID].audioTalkbackPort);
-            }
+        // Setup RTP splitter for two-way audio
+        session.rtpSplitter = dgram.createSocket('udp4');
+        session.rtpSplitter.bind(session.rtpSplitterPort);
+        session.rtpSplitter.on('error', () => session.rtpSplitter.close());
+        session.rtpSplitter.on('message', (message) => {
+          let pt = message.readUInt8(1) & 0x7f;
+          if (pt === request.audio.pt && message.length > 50) {
+            session.rtpSplitter.send(message, session.audioTalkbackPort);
           } else {
-            this.#hkSessions[request.sessionID].rtpSplitter.send(message, this.#hkSessions[request.sessionID].localAudioPort);
-            // Send RTCP to return audio as a heartbeat
-            this.#hkSessions[request.sessionID].rtpSplitter.send(message, this.#hkSessions[request.sessionID].audioTalkbackPort);
+            session.rtpSplitter.send(message, session.localAudioPort);
+            session.rtpSplitter.send(message, session.audioTalkbackPort); // RTCP keepalive
           }
         });
 
-        // Build ffmpeg command
-        let commandLine = [
-          '-hide_banner -nostats',
-          '-protocol_whitelist pipe,udp,rtp',
-          '-f sdp',
-          '-codec:a libfdk_aac',
-          '-i pipe:0',
-          '-map 0:a',
+        let talkbackCommandLine = [
+          '-hide_banner',
+          '-nostats',
+          '-protocol_whitelist',
+          'pipe,udp,rtp',
+          '-f',
+          'sdp',
+          '-codec:a',
+          'libfdk_aac',
+          '-i',
+          'pipe:0',
+          '-map',
+          '0:a',
+          ...(this.streamer?.codecs?.talkback === Streamer.CODEC_TYPE.SPEEX
+            ? ['-codec:a', 'libspeex', '-frames_per_packet', '4', '-vad', '1', '-ac', '1', '-ar', '16k']
+            : []),
+          ...(this.streamer?.codecs?.talkback === Streamer.CODEC_TYPE.OPUS
+            ? ['-codec:a', 'libopus', '-application', 'lowdelay', '-ac', '2', '-ar', '48k']
+            : []),
+          '-f',
+          'data',
+          'pipe:1',
         ];
 
-        if (this.streamer.codecs.talk === 'speex') {
-          commandLine.push('-codec:a libspeex', '-frames_per_packet 4', '-vad 1', '-ac 1', '-ar 16k');
-        }
-
-        if (this.streamer.codecs.talk === 'opus') {
-          commandLine.push('-codec:a libopus', '-application lowdelay', '-ac 2', '-ar 48k');
-        }
-
-        commandLine.push('-f data pipe:1');
-
         this?.log?.debug?.(
           'ffmpeg process for talkback on "%s" will be called using the following commandline',
           this.deviceData.description,
-          commandLine.join(' ').toString(),
+          talkbackCommandLine.join(' '),
         );
-        ffmpegAudioTalkback = child_process.spawn(this.deviceData.ffmpeg.binary, commandLine.join(' ').split(' '), {
-          env: process.env,
-        });
 
-        ffmpegAudioTalkback.on('exit', (code, signal) => {
-          if (signal !== 'SIGKILL' || signal === null) {
-            this?.log?.error?.(
-              'ffmpeg audio talkback streaming process for "%s" stopped unexpectedly. Exit code was "%s"',
-              this.deviceData.description,
-              code,
-            );
-
-            // Clean up or streaming request, but calling it again with a 'STOP' request
-            this.handleStreamRequest({ type: this.hap.StreamRequestTypes.STOP, sessionID: request.sessionID }, null);
-          }
-        });
-
-        // eslint-disable-next-line no-unused-vars
-        ffmpegAudioTalkback.on('error', (error) => {
-          // Empty
-        });
-
-        // ffmpeg console output is via stderr
-        ffmpegAudioTalkback.stderr.on('data', (data) => {
-          if (data.toString().includes('frame=') === false && this.deviceData?.ffmpeg?.debug === true) {
-            // Monitor ffmpeg output
-            this?.log?.debug?.(data.toString());
-          }
-        });
+        ffmpegTalk = this.ffmpeg.createSession(
+          this.uuid,
+          request.sessionID,
+          talkbackCommandLine,
+          'talk',
+          (data) => {
+            if (data.toString().includes('frame=') === false && this.deviceData.ffmpeg.debug === true) {
+              this?.log?.debug?.(data.toString());
+            }
+          },
+          3, // 3 pipes required
+        );
 
-        // Write out SDP configuration
-        // Tried to align the SDP configuration to what HomeKit has sent us in its audio request details
-        let sdpResponse = [
+        let sdp = [
           'v=0',
-          'o=- 0 0 IN ' + (this.#hkSessions[request.sessionID].ipv6 ? 'IP6' : 'IP4') + ' ' + this.#hkSessions[request.sessionID].address,
+          'o=- 0 0 IN ' + (session.ipv6 ? 'IP6' : 'IP4') + ' ' + session.address,
           's=HomeKit Audio Talkback',
-          'c=IN ' + (this.#hkSessions[request.sessionID].ipv6 ? 'IP6' : 'IP4') + ' ' + this.#hkSessions[request.sessionID].address,
+          'c=IN ' + (session.ipv6 ? 'IP6' : 'IP4') + ' ' + session.address,
           't=0 0',
-          'm=audio ' + this.#hkSessions[request.sessionID].audioTalkbackPort + ' RTP/AVP ' + request.audio.pt,
+          'm=audio ' + session.audioTalkbackPort + ' RTP/AVP ' + request.audio.pt,
           'b=AS:' + request.audio.max_bit_rate,
           'a=ptime:' + request.audio.packet_time,
         ];
 
         if (request.audio.codec === this.hap.AudioStreamingCodecType.AAC_ELD) {
-          sdpResponse.push(
+          sdp.push(
             'a=rtpmap:' + request.audio.pt + ' MPEG4-GENERIC/' + request.audio.sample_rate * 1000 + '/' + request.audio.channel,
             'a=fmtp:' +
               request.audio.pt +
@@ -920,309 +1167,46 @@ export default class NestCamera extends HomeKitDevice {
         }
 
         if (request.audio.codec === this.hap.AudioStreamingCodecType.OPUS) {
-          sdpResponse.push(
+          sdp.push(
             'a=rtpmap:' + request.audio.pt + ' opus/' + request.audio.sample_rate * 1000 + '/' + request.audio.channel,
-            'a=fmtp:' + request.audio.pt + ' minptime=10;useinbandfec=1"',
+            'a=fmtp:' + request.audio.pt + ' minptime=10;useinbandfec=1',
           );
         }
 
-        sdpResponse.push(
-          'a=crypto:1 ' +
-            this.hap.SRTPCryptoSuites[this.#hkSessions[request.sessionID].audioCryptoSuite] +
-            ' inline:' +
-            this.#hkSessions[request.sessionID].audioSRTP.toString('base64'),
-        );
-
-        ffmpegAudioTalkback.stdin.write(sdpResponse.join('\r\n'));
-        ffmpegAudioTalkback.stdin.end();
+        sdp.push('a=crypto:1 ' + this.hap.SRTPCryptoSuites[session.audioCryptoSuite] + ' inline:' + session.audioSRTP.toString('base64'));
+        ffmpegTalk?.stdin?.write?.(sdp.join('\r\n'));
+        ffmpegTalk?.stdin?.end?.();
       }
 
-      this?.log?.info?.(
-        'Live stream started on "%s" %s',
-        this.deviceData.description,
-        ffmpegAudioTalkback?.stdout ? 'with two-way audio' : '',
-      );
-
-      // Start the appropriate streamer
-      this.streamer !== undefined &&
-        this.streamer.startLiveStream(
-          request.sessionID,
-          ffmpegStreaming.stdin,
-          ffmpegStreaming?.stdio?.[3] ? ffmpegStreaming.stdio[3] : null,
-          ffmpegAudioTalkback?.stdout ? ffmpegAudioTalkback.stdout : null,
-        );
-
-      // Store our ffmpeg sessions
-      ffmpegStreaming && this.#hkSessions[request.sessionID].ffmpeg.push(ffmpegStreaming); // Store ffmpeg process ID
-      ffmpegAudioTalkback && this.#hkSessions[request.sessionID].ffmpeg.push(ffmpegAudioTalkback); // Store ffmpeg audio return process ID
-      this.#hkSessions[request.sessionID].video = request.video; // Cache the video request details
-      this.#hkSessions[request.sessionID].audio = request.audio; // Cache the audio request details
+      // Start the actual streamer process
+      this?.log?.info?.('Live stream started on "%s"%s', this.deviceData.description, ffmpegTalk ? ' (two-way audio enabled)' : '');
+      let { video, audio, talkback } = await this.message(Streamer.MESSAGE, Streamer.MESSAGE_TYPE.START_LIVE, {
+        sessionID: request.sessionID,
+      });
+      // Connect the ffmpeg process to the streamer input/output
+      video?.pipe?.(ffmpegStream?.stdin); // Streamer video → ffmpeg stdin (pipe:0)
+      audio?.pipe?.(ffmpegStream?.stdio?.[3]); // Streamer audio → ffmpeg pipe:3
+      ffmpegTalk?.stdout?.pipe?.(talkback); // ffmpeg talkback stdout → Streamer talkback pipe:1
     }
 
-    if (request.type === this.hap.StreamRequestTypes.STOP && typeof this.#hkSessions[request.sessionID] === 'object') {
-      this.streamer !== undefined && this.streamer.stopLiveStream(request.sessionID);
-
-      // Close HomeKit session
-      this.controller.forceStopStreamingSession(request.sessionID);
-
-      // Close off any running ffmpeg and/or splitter processes we created
-      if (typeof this.#hkSessions[request.sessionID]?.rtpSplitter?.close === 'function') {
-        this.#hkSessions[request.sessionID].rtpSplitter.close();
-      }
-      this.#hkSessions[request.sessionID].ffmpeg.forEach((ffmpeg) => {
-        ffmpeg.kill('SIGKILL');
+    if (request.type === this.hap.StreamRequestTypes.STOP && this.#liveSessions.has(request.sessionID)) {
+      // Stop the HomeKit stream and cleanup any associated ffmpeg or RTP splitter sessions
+      await this.message(Streamer.MESSAGE, Streamer.MESSAGE_TYPE.STOP_LIVE, {
+        sessionID: request.sessionID,
       });
-
-      delete this.#hkSessions[request.sessionID];
-
+      this.controller.forceStopStreamingSession(request.sessionID);
+      this.#liveSessions.get(request.sessionID)?.rtpSplitter?.close?.();
+      this.ffmpeg?.killSession?.(this.uuid, request.sessionID, 'live', 'SIGKILL');
+      this.ffmpeg?.killSession?.(this.uuid, request.sessionID, 'talk', 'SIGKILL');
+      this.#liveSessions.delete(request.sessionID);
       this?.log?.info?.('Live stream stopped from "%s"', this.deviceData.description);
     }
 
-    if (request.type === this.hap.StreamRequestTypes.RECONFIGURE && typeof this.#hkSessions[request.sessionID] === 'object') {
+    if (request.type === this.hap.StreamRequestTypes.RECONFIGURE && this.#liveSessions.has(request.sessionID)) {
       this?.log?.debug?.('Unsupported reconfiguration request for live stream on "%s"', this.deviceData.description);
     }
 
-    if (typeof callback === 'function') {
-      callback(); // do callback if defined
-    }
-  }
-
-  updateDevice(deviceData) {
-    if (typeof deviceData !== 'object' || this.controller === undefined) {
-      return;
-    }
-
-    if (this.deviceData.migrating === false && deviceData.migrating === true) {
-      // Migration happening between Nest <-> Google Home apps. We'll stop any active streams, close the current streaming object
-      this?.log?.warn?.('Migration between Nest <-> Google Home apps has started for "%s"', deviceData.description);
-      this.streamer !== undefined && this.streamer.stopEverything();
-      this.streamer = undefined;
-    }
-
-    if (this.deviceData.migrating === true && deviceData.migrating === false) {
-      // Migration has completed between Nest <-> Google Home apps
-      this?.log?.success?.('Migration between Nest <-> Google Home apps has completed for "%s"', deviceData.description);
-    }
-
-    // Handle case of changes in streaming protocols OR just finished migration between Nest <-> Google Home apps
-    if (this.streamer === undefined && deviceData.migrating === false) {
-      if (JSON.stringify(deviceData.streaming_protocols) !== JSON.stringify(this.deviceData.streaming_protocols)) {
-        this?.log?.warn?.('Available streaming protocols have changed for "%s"', deviceData.description);
-        this.streamer !== undefined && this.streamer.stopEverything();
-        this.streamer = undefined;
-      }
-      if (deviceData.streaming_protocols.includes(STREAMING_PROTOCOL.WEBRTC) === true && WebRTC !== undefined) {
-        this?.log?.debug?.('Using WebRTC streamer for "%s"', deviceData.description);
-        this.streamer = new WebRTC(deviceData, {
-          log: this.log,
-          buffer:
-            deviceData.hksv === true &&
-            this?.controller?.recordingManagement?.recordingManagementService !== undefined &&
-            this.controller.recordingManagement.recordingManagementService.getCharacteristic(this.hap.Characteristic.Active).value ===
-              this.hap.Characteristic.Active.ACTIVE,
-        });
-      }
-
-      if (deviceData.streaming_protocols.includes(STREAMING_PROTOCOL.NEXUSTALK) === true && NexusTalk !== undefined) {
-        this?.log?.debug?.('Using NexusTalk streamer for "%s"', deviceData.description);
-        this.streamer = new NexusTalk(deviceData, {
-          log: this.log,
-          buffer:
-            deviceData.hksv === true &&
-            this?.controller?.recordingManagement?.recordingManagementService !== undefined &&
-            this.controller.recordingManagement.recordingManagementService.getCharacteristic(this.hap.Characteristic.Active).value ===
-              this.hap.Characteristic.Active.ACTIVE,
-        });
-      }
-    }
-
-    // Check to see if any activity zones were added for both non-HKSV and HKSV enabled devices
-    if (
-      Array.isArray(deviceData.activity_zones) === true &&
-      JSON.stringify(deviceData.activity_zones) !== JSON.stringify(this.deviceData.activity_zones)
-    ) {
-      deviceData.activity_zones.forEach((zone) => {
-        if (this.deviceData.hksv === false || (this.deviceData.hksv === true && zone.id === 1)) {
-          if (this.motionServices?.[zone.id]?.service === undefined) {
-            // Zone doesn't have an associated motion sensor, so add one
-            let zoneName = zone.id === 1 ? '' : zone.name;
-            let tempService = this.addHKService(this.hap.Service.MotionSensor, zoneName, zone.id);
-
-            this.addHKCharacteristic(tempService, this.hap.Characteristic.Active);
-            tempService.updateCharacteristic(this.hap.Characteristic.Name, zoneName);
-            tempService.updateCharacteristic(this.hap.Characteristic.MotionDetected, false); // No motion initially
-
-            this.motionServices[zone.id] = { service: tempService, timer: undefined };
-          }
-        }
-      });
-    }
-
-    // Check to see if any activity zones were removed for both non-HKSV and HKSV enabled devices
-    // We'll also update the online status of the camera in the motion service here
-    Object.entries(this.motionServices).forEach(([zoneID, service]) => {
-      // Set online status
-      service.service.updateCharacteristic(
-        this.hap.Characteristic.Active,
-        deviceData.online === true ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE,
-      );
-
-      // Handle deleted zones (excluding zone ID 1 for HKSV)
-      if (
-        zoneID !== '1' &&
-        Array.isArray(deviceData.activity_zones) === true &&
-        deviceData.activity_zones.findIndex(({ id }) => id === Number(zoneID)) === -1
-      ) {
-        // Motion service we created doesn't appear in zone list anymore, so assume deleted
-        this.accessory.removeService(service.service);
-        delete this.motionServices[zoneID];
-      }
-    });
-
-    if (this.operatingModeService !== undefined) {
-      // Update camera off/on status
-      this.operatingModeService.updateCharacteristic(
-        this.hap.Characteristic.ManuallyDisabled,
-        deviceData.streaming_enabled === false
-          ? this.hap.Characteristic.ManuallyDisabled.DISABLED
-          : this.hap.Characteristic.ManuallyDisabled.ENABLED,
-      );
-
-      if (deviceData?.has_statusled === true) {
-        // Set camera recording indicator. This cannot be turned off on Nest Cameras/Doorbells
-        // 0 = auto
-        // 1 = low
-        // 2 = high
-        this.operatingModeService.updateCharacteristic(
-          this.hap.Characteristic.CameraOperatingModeIndicator,
-          deviceData.statusled_brightness !== 1,
-        );
-      }
-
-      if (deviceData?.has_irled === true) {
-        // Set nightvision status in HomeKit
-        this.operatingModeService.updateCharacteristic(this.hap.Characteristic.NightVision, deviceData.irled_enabled);
-      }
-
-      if (deviceData?.has_video_flip === true) {
-        // Update image flip status
-        this.operatingModeService.updateCharacteristic(this.hap.Characteristic.ImageRotation, deviceData.video_flipped === true ? 180 : 0);
-      }
-    }
-
-    if (deviceData.hksv === true && this.controller?.recordingManagement?.recordingManagementService !== undefined) {
-      // Update recording audio status
-      this.controller.recordingManagement.recordingManagementService.updateCharacteristic(
-        this.hap.Characteristic.RecordingAudioActive,
-        deviceData.audio_enabled === true
-          ? this.hap.Characteristic.RecordingAudioActive.ENABLE
-          : this.hap.Characteristic.RecordingAudioActive.DISABLE,
-      );
-    }
-
-    if (this.controller?.microphoneService !== undefined) {
-      // Update microphone volume if specified
-      //this.controller.microphoneService.updateCharacteristic(this.hap.Characteristic.Volume, deviceData.xxx);
-
-      // if audio is disabled, we'll mute microphone
-      this.controller.setMicrophoneMuted(deviceData.audio_enabled === false ? true : false);
-    }
-    if (this.controller?.speakerService !== undefined) {
-      // Update speaker volume if specified
-      //this.controller.speakerService.updateCharacteristic(this.hap.Characteristic.Volume, deviceData.xxx);
-
-      // if audio is disabled, we'll mute speaker
-      this.controller.setSpeakerMuted(deviceData.audio_enabled === false ? true : false);
-    }
-
-    // Notify our associated streamers about any data changes
-    this.streamer !== undefined && this.streamer.update(deviceData);
-
-    // Process alerts, the most recent alert is first
-    // For HKSV, we're interested motion events
-    // For non-HKSV, we're interested motion, face and person events (maybe sound and package later)
-    deviceData.alerts.forEach((event) => {
-      if (
-        this.operatingModeService === undefined ||
-        (this.operatingModeService !== undefined &&
-          this.operatingModeService.getCharacteristic(this.hap.Characteristic.HomeKitCameraActive).value ===
-            this.hap.Characteristic.HomeKitCameraActive.ON)
-      ) {
-        // We're configured to handle camera events
-        // https://github.com/Supereg/secure-video-specification?tab=readme-ov-file#33-homekitcameraactive
-
-        // Handle motion event
-        // For a HKSV enabled camera, we will use this to trigger the starting of the HKSV recording if the camera is active
-        if (event.types.includes('motion') === true) {
-          if (this.motionTimer === undefined && (this.deviceData.hksv === false || this.streamer === undefined)) {
-            this?.log?.info?.('Motion detected at "%s"', deviceData.description);
-          }
-
-          event.zone_ids.forEach((zoneID) => {
-            if (
-              typeof this.motionServices?.[zoneID]?.service === 'object' &&
-              this.motionServices[zoneID].service.getCharacteristic(this.hap.Characteristic.MotionDetected).value !== true
-            ) {
-              // Trigger motion for matching zone of not aleady active
-              this.motionServices[zoneID].service.updateCharacteristic(this.hap.Characteristic.MotionDetected, true);
-
-              // Log motion started into history
-              if (typeof this.historyService?.addHistory === 'function') {
-                this.historyService.addHistory(this.motionServices[zoneID].service, {
-                  time: Math.floor(Date.now() / 1000),
-                  status: 1,
-                });
-              }
-            }
-          });
-
-          // Clear any motion active timer so we can extend if more motion detected
-          clearTimeout(this.motionTimer);
-          this.motionTimer = setTimeout(() => {
-            event.zone_ids.forEach((zoneID) => {
-              if (typeof this.motionServices?.[zoneID]?.service === 'object') {
-                // Mark associted motion services as motion not detected
-                this.motionServices[zoneID].service.updateCharacteristic(this.hap.Characteristic.MotionDetected, false);
-
-                // Log motion started into history
-                if (typeof this.historyService?.addHistory === 'function') {
-                  this.historyService.addHistory(this.motionServices[zoneID].service, {
-                    time: Math.floor(Date.now() / 1000),
-                    status: 0,
-                  });
-                }
-              }
-            });
-
-            this.motionTimer = undefined; // No motion timer active
-          }, this.deviceData.motionCooldown * 1000);
-        }
-
-        // Handle person/face event
-        // We also treat a 'face' event the same as a person event ie: if you have a face, you have a person
-        if (event.types.includes('person') === true || event.types.includes('face') === true) {
-          if (this.personTimer === undefined) {
-            // We don't have a person cooldown timer running, so we can process the 'person'/'face' event
-            if (this.deviceData.hksv === false || this.streamer === undefined) {
-              // We'll only log a person detected event if HKSV is disabled
-              this?.log?.info?.('Person detected at "%s"', deviceData.description);
-            }
-
-            // Cooldown for person being detected
-            // Start this before we process further
-            this.personTimer = setTimeout(() => {
-              this.personTimer = undefined; // No person timer active
-            }, this.deviceData.personCooldown * 1000);
-
-            if (event.types.includes('motion') === false) {
-              // If person/face events doesn't include a motion event, add in here
-              // This will handle all the motion triggering stuff
-              event.types.push('motion');
-            }
-          }
-        }
-      }
-    });
+    callback?.(); // do callback if defined
   }
 
   createCameraMotionServices() {
@@ -1241,12 +1225,14 @@ export default class NestCamera extends HomeKitDevice {
       // If we have HKSV video enabled, we'll only create a single motion sensor
       // A zone with the ID of 1 is treated as the main motion sensor
       for (let zone of zones) {
-        if (this.deviceData.hksv === true && zone.id !== 1) {
+        if (this.deviceData.hksv === true && this.ffmpeg instanceof FFmpeg === true && zone.id !== 1) {
           continue;
         }
 
         let zoneName = zone.id === 1 ? '' : zone.name;
-        let service = this.addHKService(this.hap.Service.MotionSensor, zoneName, zone.id);
+        let eveOptions = zone.id === 1 ? {} : undefined; // Only link EveHome for zone 1
+
+        let service = this.addHKService(this.hap.Service.MotionSensor, zoneName, zone.id, eveOptions);
         this.addHKCharacteristic(service, this.hap.Characteristic.Active);
         service.updateCharacteristic(this.hap.Characteristic.Name, zoneName);
         service.updateCharacteristic(this.hap.Characteristic.MotionDetected, false); // No motion initially
@@ -1258,92 +1244,335 @@ export default class NestCamera extends HomeKitDevice {
 
   generateControllerOptions() {
     // Setup HomeKit controller camera/doorbell options
+
+    let resolutions = [
+      [3840, 2160, 30], // 4K
+      [1920, 1080, 30], // 1080p
+      [1600, 1200, 30], // Native res of Nest Hello
+      [1280, 960, 30],
+      [1280, 720, 30], // 720p
+      [1024, 768, 30],
+      [640, 480, 30],
+      [640, 360, 30],
+      [480, 360, 30],
+      [480, 270, 30],
+      [320, 240, 30],
+      [320, 240, 15], // Apple Watch requires this (plus OPUS @16K)
+      [320, 180, 30],
+      [320, 180, 15],
+    ];
+
+    let profiles = [this.hap.H264Profile.MAIN];
+    let levels = [this.hap.H264Level.LEVEL3_1, this.hap.H264Level.LEVEL3_2, this.hap.H264Level.LEVEL4_0];
+    let videoType = this.hap.VideoCodecType.H264;
+
     let controllerOptions = {
       cameraStreamCount: this.deviceData.maxStreams,
       delegate: this,
-      streamingOptions: {
-        supportedCryptoSuites: [this.hap.SRTPCryptoSuites.NONE, this.hap.SRTPCryptoSuites.AES_CM_128_HMAC_SHA1_80],
-        video: {
-          resolutions: [
-            // width, height, framerate
-            // <--- Need to auto generate this list
-            [3840, 2160, 30], // 4K
-            [1920, 1080, 30], // 1080p
-            [1600, 1200, 30], // Native res of Nest Hello
-            [1280, 960, 30],
-            [1280, 720, 30], // 720p
-            [1024, 768, 30],
-            [640, 480, 30],
-            [640, 360, 30],
-            [480, 360, 30],
-            [480, 270, 30],
-            [320, 240, 30],
-            [320, 240, 15], // Apple Watch requires this configuration (Apple Watch also seems to required OPUS @16K)
-            [320, 180, 30],
-            [320, 180, 15],
-          ],
-          codec: {
-            type: this.hap.VideoCodecType.H264,
-            profiles: [this.hap.H264Profile.MAIN],
-            levels: [this.hap.H264Level.LEVEL3_1, this.hap.H264Level.LEVEL3_2, this.hap.H264Level.LEVEL4_0],
-          },
-        },
-        audio: {
-          twoWayAudio:
-            this.deviceData?.ffmpeg?.libfdk_aac === true &&
-            (this.deviceData?.ffmpeg?.libspeex === true || this.deviceData?.ffmpeg?.libopus === true) &&
-            this.deviceData.has_speaker === true &&
-            this.deviceData.has_microphone === true,
-          codecs: [
-            {
-              type: this.hap.AudioStreamingCodecType.AAC_ELD,
-              samplerate: this.hap.AudioStreamingSamplerate.KHZ_16,
-              audioChannel: 1,
+      streamingOptions:
+        this.ffmpeg instanceof FFmpeg === true
+          ? {
+              supportedCryptoSuites: [this.hap.SRTPCryptoSuites.NONE, this.hap.SRTPCryptoSuites.AES_CM_128_HMAC_SHA1_80],
+              video: {
+                resolutions,
+                codec: {
+                  type: videoType,
+                  profiles,
+                  levels,
+                },
+              },
+              audio: {
+                twoWayAudio:
+                  this.ffmpeg?.features?.encoders?.includes('libfdk_aac') === true &&
+                  (this.ffmpeg?.features?.encoders?.includes('libspeex') === true ||
+                    this.ffmpeg?.features?.encoders?.includes('libopus') === true) &&
+                  this.deviceData.has_speaker === true &&
+                  this.deviceData.has_microphone === true,
+                codecs: [
+                  {
+                    type: this.hap.AudioStreamingCodecType.AAC_ELD,
+                    samplerate: this.hap.AudioStreamingSamplerate.KHZ_16,
+                    audioChannel: 1,
+                  },
+                ],
+              },
+            }
+          : {
+              supportedCryptoSuites: [this.hap.SRTPCryptoSuites.NONE],
+              video: {
+                resolutions: [],
+                codec: {
+                  type: videoType,
+                  profiles: [],
+                  levels: [],
+                },
+              },
+              audio: {
+                twoWayAudio: false,
+                codecs: [],
+              },
             },
-          ],
-        },
-      },
-      recording: undefined,
-      sensors: undefined,
+      recording:
+        this.deviceData.hksv === true && this.ffmpeg instanceof FFmpeg === true
+          ? {
+              delegate: this,
+              options: {
+                overrideEventTriggerOptions: [this.hap.EventTriggerOption.MOTION],
+                mediaContainerConfiguration: [
+                  {
+                    fragmentLength: 4000,
+                    type: this.hap.MediaContainerType.FRAGMENTED_MP4,
+                  },
+                ],
+                prebufferLength: 4000, // Seems to always be 4000???
+                video: {
+                  resolutions,
+                  parameters: {
+                    profiles,
+                    levels,
+                  },
+                  type: videoType,
+                },
+                audio: {
+                  codecs: [
+                    {
+                      type: this.hap.AudioRecordingCodecType.AAC_LC,
+                      samplerate: this.hap.AudioRecordingSamplerate.KHZ_16,
+                      audioChannel: 1,
+                    },
+                  ],
+                },
+              },
+            }
+          : undefined,
+      sensors:
+        this.deviceData.hksv === true && this.ffmpeg instanceof FFmpeg === true
+          ? {
+              motion: typeof this.motionServices?.[1]?.service === 'object' ? this.motionServices[1].service : false,
+            }
+          : undefined,
     };
+    return controllerOptions;
+  }
+}
+
+// Function to process our RAW Nest or Google for this device type
+export function processRawData(log, rawData, config, deviceType = undefined) {
+  if (
+    rawData === null ||
+    typeof rawData !== 'object' ||
+    rawData?.constructor !== Object ||
+    typeof config !== 'object' ||
+    config?.constructor !== Object
+  ) {
+    return;
+  }
 
-    if (this.deviceData.hksv === true) {
-      controllerOptions.recording = {
-        delegate: this,
-        options: {
-          overrideEventTriggerOptions: [this.hap.EventTriggerOption.MOTION],
-          mediaContainerConfiguration: [
+  let devices = {};
+
+  // Process data for any camera/doorbell(s) we have in the raw data
+  Object.entries(rawData)
+    .filter(
+      ([key, value]) =>
+        key.startsWith('quartz.') === true ||
+        (key.startsWith('DEVICE_') === true && PROTOBUF_RESOURCES.CAMERA.includes(value.value?.device_info?.typeName) === true),
+    )
+    .forEach(([object_key, value]) => {
+      let tempDevice = {};
+      try {
+        if (
+          value?.source === DATA_SOURCE.GOOGLE &&
+          rawData?.[value.value?.device_info?.pairerId?.resourceId] !== undefined &&
+          Array.isArray(value.value?.streaming_protocol?.supportedProtocols) === true &&
+          value.value.streaming_protocol.supportedProtocols.includes('PROTOCOL_WEBRTC') === true &&
+          (value.value?.configuration_done?.deviceReady === true ||
+            value.value?.camera_migration_status?.state?.where === 'MIGRATED_TO_GOOGLE_HOME')
+        ) {
+          tempDevice = processCommonData(
+            object_key,
             {
-              fragmentLength: 4000,
-              type: this.hap.MediaContainerType.FRAGMENTED_MP4,
+              type: DEVICE_TYPE.CAMERA,
+              model:
+                value.value.device_info.typeName === 'google.resource.NeonQuartzResource' &&
+                value.value?.floodlight_settings === undefined &&
+                value.value?.floodlight_state === undefined
+                  ? 'Cam (battery)'
+                  : value.value.device_info.typeName === 'google.resource.GreenQuartzResource'
+                    ? 'Doorbell (2nd gen, battery)'
+                    : value.value.device_info.typeName === 'google.resource.SpencerResource'
+                      ? 'Cam (wired)'
+                      : value.value.device_info.typeName === 'google.resource.VenusResource'
+                        ? 'Doorbell (2nd gen, wired)'
+                        : value.value.device_info.typeName === 'nest.resource.NestCamOutdoorResource'
+                          ? 'Cam Outdoor (1st gen)'
+                          : value.value.device_info.typeName === 'nest.resource.NestCamIndoorResource'
+                            ? 'Cam Indoor (1st gen)'
+                            : value.value.device_info.typeName === 'nest.resource.NestCamIQResource'
+                              ? 'Cam IQ'
+                              : value.value.device_info.typeName === 'nest.resource.NestCamIQOutdoorResource'
+                                ? 'Cam Outdoor (1st gen)'
+                                : value.value.device_info.typeName === 'nest.resource.NestHelloResource'
+                                  ? 'Doorbell (1st gen, wired)'
+                                  : value.value.device_info.typeName === 'google.resource.NeonQuartzResource' &&
+                                      value.value?.floodlight_settings !== undefined &&
+                                      value.value?.floodlight_state !== undefined
+                                    ? 'Cam with Floodlight'
+                                    : 'Camera (unknown)',
+              softwareVersion: value.value.device_identity.softwareVersion,
+              serialNumber: value.value.device_identity.serialNumber,
+              description: String(value.value?.label?.label ?? ''),
+              location: String(
+                [
+                  ...Object.values(
+                    rawData?.[value.value?.device_info?.pairerId?.resourceId]?.value?.located_annotations?.predefinedWheres || {},
+                  ),
+                  ...Object.values(
+                    rawData?.[value.value?.device_info?.pairerId?.resourceId]?.value?.located_annotations?.customWheres || {},
+                  ),
+                ].find((where) => where?.whereId?.resourceId === value.value?.device_located_settings?.whereAnnotationRid?.resourceId)
+                  ?.label?.literal ?? '',
+              ),
+              online: value.value?.liveness?.status === 'LIVENESS_DEVICE_STATUS_ONLINE',
+              audio_enabled: value.value?.microphone_settings?.enableMicrophone === true,
+              has_indoor_chime:
+                value.value?.doorbell_indoor_chime_settings?.chimeType === 'CHIME_TYPE_MECHANICAL' ||
+                value.value?.doorbell_indoor_chime_settings?.chimeType === 'CHIME_TYPE_ELECTRONIC',
+              indoor_chime_enabled: value.value?.doorbell_indoor_chime_settings?.chimeEnabled === true,
+              streaming_enabled: value.value?.recording_toggle?.currentCameraState === 'CAMERA_ON',
+              has_microphone: value.value?.microphone_settings?.enableMicrophone === true,
+              has_speaker: value.value?.speaker_volume?.volume !== undefined,
+              has_motion_detection: value.value?.observation_trigger_capabilities?.videoEventTypes?.motion?.value === true,
+              activity_zones: Array.isArray(value.value?.activity_zone_settings?.activityZones)
+                ? value.value.activity_zone_settings.activityZones.map((zone) => ({
+                    id: zone.zoneProperties?.zoneId !== undefined ? zone.zoneProperties.zoneId : zone.zoneProperties.internalIndex,
+                    name: HomeKitDevice.makeValidHKName(zone.zoneProperties?.name !== undefined ? zone.zoneProperties.name : ''),
+                    hidden: false,
+                    uri: '',
+                  }))
+                : [],
+              alerts: typeof value.value?.alerts === 'object' ? value.value.alerts : [],
+              quiet_time_enabled:
+                isNaN(value.value?.quiet_time_settings?.quietTimeEnds?.seconds) === false &&
+                Number(value.value.quiet_time_settings.quietTimeEnds.seconds) !== 0 &&
+                Math.floor(Date.now() / 1000) < Number(value.value.quiet_time_settings.quietTimeEnds.seconds),
+              camera_type: value.value.device_identity.vendorProductId,
+              streaming_protocols:
+                value.value?.streaming_protocol?.supportedProtocols !== undefined ? value.value.streaming_protocol.supportedProtocols : [],
+              streaming_host:
+                typeof value.value?.streaming_protocol?.directHost?.value === 'string'
+                  ? value.value.streaming_protocol.directHost.value
+                  : '',
+              has_light: value.value?.floodlight_settings !== undefined && value.value?.floodlight_state !== undefined,
+              light_enabled: value.value?.floodlight_state?.currentState === 'LIGHT_STATE_ON',
+              light_brightness:
+                isNaN(value.value?.floodlight_settings?.brightness) === false
+                  ? scaleValue(Number(value.value.floodlight_settings.brightness), 0, 10, 0, 100)
+                  : 0,
+              migrating:
+                value.value?.camera_migration_status?.state?.progress !== undefined &&
+                value.value.camera_migration_status.state.progress !== 'PROGRESS_COMPLETE' &&
+                value.value.camera_migration_status.state.progress !== 'PROGRESS_NONE',
             },
-          ],
-          prebufferLength: 4000, // Seems to always be 4000???
-          video: {
-            resolutions: controllerOptions.streamingOptions.video.resolutions,
-            parameters: {
-              profiles: controllerOptions.streamingOptions.video.codec.profiles,
-              levels: controllerOptions.streamingOptions.video.codec.levels,
+            config,
+          );
+          if (tempDevice.model.toUpperCase().includes('DOORBELL') === true) {
+            tempDevice.type = DEVICE_TYPE.DOORBELL;
+          }
+          if (tempDevice.model.toUpperCase().includes('FLOODLIGHT') === true) {
+            tempDevice.type = DEVICE_TYPE.FLOODLIGHT;
+          }
+        }
+
+        if (
+          value?.source === DATA_SOURCE.NEST &&
+          rawData?.['where.' + value.value.structure_id] !== undefined &&
+          value.value?.nexus_api_http_server_url !== undefined &&
+          (value.value?.properties?.['cc2migration.overview_state'] === 'NORMAL' ||
+            value.value?.properties?.['cc2migration.overview_state'] === 'REVERSE_MIGRATION_IN_PROGRESS')
+        ) {
+          // We'll only use the Nest API data for Camera's which have NOT been migrated to Google Home
+          tempDevice = processCommonData(
+            object_key,
+            {
+              type: DEVICE_TYPE.CAMERA,
+              serialNumber: value.value.serial_number,
+              softwareVersion: value.value.software_version,
+              model: value.value.model.replace(/nest\s*/gi, ''), // Use camera/doorbell model that Nest supplies
+              description: typeof value.value?.description === 'string' ? value.value.description : '',
+              location:
+                rawData?.['where.' + value.value.structure_id]?.value?.wheres?.find((where) => where?.where_id === value.value.where_id)
+                  ?.name ?? '',
+              streaming_enabled: value.value.streaming_state.includes('enabled') === true,
+              nexus_api_http_server_url: value.value.nexus_api_http_server_url,
+              online: value.value.streaming_state.includes('offline') === false,
+              audio_enabled: value.value.audio_input_enabled === true,
+              has_indoor_chime: value.value?.capabilities.includes('indoor_chime') === true,
+              indoor_chime_enabled: value.value?.properties['doorbell.indoor_chime.enabled'] === true,
+              has_irled: value.value?.capabilities.includes('irled') === true,
+              irled_enabled: value.value?.properties['irled.state'] !== 'always_off',
+              has_statusled: value.value?.capabilities.includes('statusled') === true,
+              has_video_flip: value.value?.capabilities.includes('video.flip') === true,
+              video_flipped: value.value?.properties['video.flipped'] === true,
+              statusled_brightness:
+                isNaN(value.value?.properties?.['statusled.brightness']) === false
+                  ? Number(value.value.properties['statusled.brightness'])
+                  : 0,
+              has_microphone: value.value?.capabilities.includes('audio.microphone') === true,
+              has_speaker: value.value?.capabilities.includes('audio.speaker') === true,
+              has_motion_detection: value.value?.capabilities.includes('detectors.on_camera') === true,
+              activity_zones: value.value.activity_zones,
+              alerts: typeof value.value?.alerts === 'object' ? value.value.alerts : [],
+              streaming_protocols: ['PROTOCOL_NEXUSTALK'],
+              streaming_host: value.value.direct_nexustalk_host,
+              quiet_time_enabled: false,
+              camera_type: value.value.camera_type,
+              migrating:
+                value.value?.properties?.['cc2migration.overview_state'] !== undefined &&
+                value.value.properties['cc2migration.overview_state'] !== 'NORMAL',
             },
-            type: controllerOptions.streamingOptions.video.codec.type,
-          },
-          audio: {
-            codecs: [
-              {
-                type: this.hap.AudioRecordingCodecType.AAC_LC,
-                samplerate: this.hap.AudioRecordingSamplerate.KHZ_16,
-                audioChannel: 1,
-              },
-            ],
-          },
-        },
-      };
+            config,
+          );
+          if (tempDevice.model.toUpperCase().includes('DOORBELL') === true) {
+            tempDevice.type = DEVICE_TYPE.DOORBELL;
+          }
+          if (tempDevice.model.toUpperCase().includes('FLOODLIGHT') === true) {
+            tempDevice.type = DEVICE_TYPE.FLOODLIGHT;
+          }
+        }
+        // eslint-disable-next-line no-unused-vars
+      } catch (error) {
+        log?.debug?.('Error processing camera data for "%s"', object_key);
+      }
 
-      controllerOptions.sensors = {
-        motion: typeof this.motionServices?.[1]?.service === 'object' ? this.motionServices[1].service : false,
-      };
-    }
+      if (
+        Object.entries(tempDevice).length !== 0 &&
+        typeof devices[tempDevice.serialNumber] === 'undefined' &&
+        (deviceType === undefined || (typeof deviceType === 'string' && deviceType !== '' && tempDevice.type === deviceType))
+      ) {
+        let deviceOptions = config?.devices?.find(
+          (device) => device?.serialNumber?.toUpperCase?.() === tempDevice?.serialNumber?.toUpperCase?.(),
+        );
+        // Insert any extra options we've read in from configuration file for this device
+        tempDevice.eveHistory = config.options.eveHistory === true || deviceOptions?.eveHistory === true;
+        tempDevice.hksv = (config.options?.hksv === true || deviceOptions?.hksv === true) && config.options?.ffmpeg?.valid === true;
+        tempDevice.doorbellCooldown = parseDurationToSeconds(deviceOptions?.doorbellCooldown, { defaultValue: 60, min: 0, max: 300 });
+        tempDevice.motionCooldown = parseDurationToSeconds(deviceOptions?.motionCooldown, { defaultValue: 60, min: 0, max: 300 });
+        tempDevice.personCooldown = parseDurationToSeconds(deviceOptions?.personCooldown, { defaultValue: 120, min: 0, max: 300 });
+        tempDevice.chimeSwitch = deviceOptions?.chimeSwitch === true; // Control 'indoor' chime by switch
+        tempDevice.localAccess = deviceOptions?.localAccess === true; // Local network video streaming rather than from cloud from camera/doorbells
+        tempDevice.ffmpeg = {
+          binary: config.options.ffmpeg.binary,
+          valid: config.options.ffmpeg.valid === true,
+          debug: deviceOptions?.ffmpegDebug === true || config.options?.ffmpeg.debug === true,
+          hwaccel:
+            (deviceOptions?.ffmpegHWaccel === true || config.options?.ffmpegHWaccel === true) &&
+            config.options.ffmpeg.valid === true &&
+            config.options.ffmpeg.hwaccel === true,
+        };
+        tempDevice.maxStreams = config.options.hksv === true || deviceOptions?.hksv === true ? 1 : 2;
+        devices[tempDevice.serialNumber] = tempDevice; // Store processed device
+      }
+    });
 
-    return controllerOptions;
-  }
+  return devices;
 }