homebridge-nest-accfactory 0.2.3 → 0.2.9

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to `homebridge-nest-accfactory` will be documented in this file. This project tries to adhere to [Semantic Versioning](http://semver.org/).
 
+## v0.2.8 (2025/03/23)
+
+- General code cleanup and bug fixes
+- Support for Nest Protect(s) in Google Home app
+- Default location to check for ffmpeg binary is now /usr/local/bin
+- Logs Nest Protect(s) self testing status
+
+## v0.2.5 (2024/12/10)
+
+- Fix for dropped sub modules.. Do not know why!
+
+## v0.2.4 (2024/12/10)
+
+- Fix for camera video stream when audio disabled
+
 ## v0.2.3 (2024/12/06)
 
 - General code cleanup and bug fixes

package/README.md

@@ -95,38 +95,36 @@ Sample config.json entries below
 
 The following options are available in the config.json options object. These apply to all discovered devices.
 
-| Name              | Description                                                                                   | Default    |
-|-------------------|-----------------------------------------------------------------------------------------------|------------|
-| elevation         | Height above sea level for the weather station                                                | 0          |
-| eveHistory        | Provide history in EveHome application where applicable                                       | true       |
-| ffmegDebug        | Turns on specific debugging output for when ffmpeg is envoked                                 | false      |
-| ffmegPath         | Path to an ffmpeg binary for us to use. Will look in current directory by default             |            |
-| hksv              | Enable HomeKit Secure Video for supported camera(s) and doorbell(s)                           | false      |
-| maxStreams        | Maximum number of concurrent video streams in HomeKit for supported camera(s) and doorbell(s) | 2          |
-| weather           | Virtual weather station for each Nest/Google home we discover                                 | false      |
+| Name              | Description                                                                                   | Default        |
+|-------------------|-----------------------------------------------------------------------------------------------|----------------|
+| elevation         | Height above sea level for the weather station                                                | 0              |
+| eveHistory        | Provide history in EveHome application where applicable                                       | true           |
+| ffmegDebug        | Turns on specific debugging output for when ffmpeg is envoked                                 | false          |
+| ffmegPath         | Path to an ffmpeg binary for us to use                                                        | /usr/local/bin |
+| hksv              | Enable HomeKit Secure Video for supported camera(s) and doorbell(s)                           | false          |
+| maxStreams        | Maximum number of concurrent video streams in HomeKit for supported camera(s) and doorbell(s) | 2              |
+| weather           | Virtual weather station for each Nest/Google home we discover                                 | false          |
 
 #### devices
 
 The following options are available on a per-device level in the config.json devices object. The device is specified by using its serial number (in uppercase)
 
-| Name              | Description                                                                                   | Default    |
-|-------------------|-----------------------------------------------------------------------------------------------|------------|
-| chimeSwitch       | Create a switch for supported doorbell(s) which allows the indoor chime to be turned on/off   | false      |
-| doorbellCooldown  | Time in seconds between doorbell press events                                                 | 60         | 
-| elevation         | Height above sea level for the specific weather station                                       | 0          |
-| eveHistory        | Provide history in EveHome application where applicable for the specific device               | true       |
-| exclude           | Exclude the device                                                                            | false      |
-| ffmegDebug        | Turns on specific debugging output for when ffmpeg is envoked                                 | false      |
-| hksv              | Enable HomeKit Secure Video for supported camera(s) and doorbell(s)                           | false      |
-| humiditySensor    | Create a seperate humidity sensor for supported thermostat(s)                                 | false      |
-| localAccess       | Use direct access to supported camera(s) and doorbell(s) for video streaming and recording    | false      |    
-| motionCooldown    | Time in seconds between detected motion events                                                | 60         |
-| personCooldown    | Time in seconds between detected person events                                                | 120        |
+| Name              | Description                                                                                   | Default        |
+|-------------------|-----------------------------------------------------------------------------------------------|----------------|
+| chimeSwitch       | Create a switch for supported doorbell(s) which allows the indoor chime to be turned on/off   | false          |
+| doorbellCooldown  | Time in seconds between doorbell press events                                                 | 60             | 
+| elevation         | Height above sea level for the specific weather station                                       | 0              |
+| eveHistory        | Provide history in EveHome application where applicable for the specific device               | true           |
+| exclude           | Exclude the device                                                                            | false          |
+| ffmegDebug        | Turns on specific debugging output for when ffmpeg is envoked                                 | false          |
+| hksv              | Enable HomeKit Secure Video for supported camera(s) and doorbell(s)                           | false          |
+| humiditySensor    | Create a seperate humidity sensor for supported thermostat(s)                                 | false          |
+| localAccess       | Use direct access to supported camera(s) and doorbell(s) for video streaming and recording    | false          |    
+| motionCooldown    | Time in seconds between detected motion events                                                | 60             |
+| personCooldown    | Time in seconds between detected person events                                                | 120            |
 
 ## ffmpeg
 
-**As of 3/10/2024, the [Homebridge Docker Image](https://hub.docker.com/r/homebridge/homebridge) includes an ffmpeg binary meeting our requirements. Its located in /usr/local/bin/ffmpeg**
-
 To support streaming and recording from cameras, an ffmpeg binary needs to be present. We have specific requirements, which are:
 - version 6.0 or later
 - compiled with:
@@ -135,7 +133,7 @@ To support streaming and recording from cameras, an ffmpeg binary needs to be pr
   - libspeex
   - libopus
 
-By default, we look in the current directory where the plug-in excutes for an ffmpeg binary, however, you can specify a specific ffmpeg binary to use via the configuration option 'ffmpegPath'
+By default, we look in /usr/local/bin for an ffmpeg binary, however, you can specify a specific ffmpeg binary to use via the configuration option 'ffmpegPath'
 
 ## Disclaimer
 

package/config.schema.json

@@ -5,6 +5,12 @@
     "schema": {
         "type": "object",
         "properties": {
+            "name": {
+                "title": "Name",
+                "type": "string",
+                "default": "NestAccfactory",
+                "condition": "1=2"
+            },
             "nest": {
                 "title": "Nest Account",
                 "type": "object",
@@ -90,7 +96,8 @@
                     "ffmpegPath": {
                         "title": "Path to ffmpeg binary",
                         "type": "string",
-                        "placeholder": "Path to an ffmpeg binary. By default, we look in HomeBridge user path"
+                        "placeholder": "Path to an ffmpeg binary",
+                        "default": "/usr/local/bin/ffmpeg"
                     }
                 }
             }

package/dist/HomeKitHistory.js

@@ -10,7 +10,7 @@
 //
 // Credit to https://github.com/simont77/fakegato-history for the work on starting the EveHome comms protocol decoding
 //
-// Version 15/10/2024
+// Version 2025/18/01
 // Mark Hulskamp
 
 // Define nodejs module requirements
@@ -1169,7 +1169,7 @@ export default class HomeKitHistory {
           firmware: typeof options?.EveSmoke_firmware === 'number' ? options.EveSmoke_firmware : 1208, // Firmware version
           lastalarmtest: typeof options?.EveSmoke_lastalarmtest === 'number' ? options.EveSmoke_lastalarmtest : 0, // Seconds of alarm test
           alarmtest: options?.EveSmoke_alarmtest === true, // Is alarmtest running
-          heatstatus: typeof options?.EveSmoke_heatstatus === 'number' ? options.EveSmoke_heatstatus : 0, // Heat sensor status
+          heatstatus: options.EveSmoke_heatstatus === true, // Heat sensor status
           statusled: options?.EveSmoke_statusled === false, // Status LED flash/enabled
           smoketestpassed: options?.EveSmoke_smoketestpassed === false, // Passed smoke test?
           heattestpassed: options?.EveSmoke_heattestpassed === false, // Passed smoke test?
@@ -2009,7 +2009,7 @@ export default class HomeKitHistory {
       ) {
         value |= 1 << 0; // 1st bit, smoke detected
       }
-      if (this.EveSmokePersist.heatstatus !== 0) {
+      if (this.EveSmokePersist.heatstatus === true) {
         value |= 1 << 1; // 2th bit - heat detected
       }
       if (this.EveSmokePersist.alarmtest === true) {

package/dist/camera.js

@@ -1,7 +1,7 @@
 // Nest Cameras
 // Part of homebridge-nest-accfactory
 //
-// Code version 10/11/2024
+// Code version 2025/03/19
 // Mark Hulskamp
 'use strict';
 
@@ -71,15 +71,19 @@ export default class NestCamera extends HomeKitDevice {
   }
 
   // Class functions
-  addServices() {
+  addServices(hapController = this.hap.CameraController) {
     // Setup motion services
     if (this.motionServices === undefined) {
       this.createCameraMotionServices();
     }
 
-    // Setup HomeKit camera controller
-    if (this.controller === undefined) {
-      this.controller = new this.hap.CameraController(this.generateControllerOptions());
+    // 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());
       this.accessory.configureController(this.controller);
     }
 
@@ -87,7 +91,7 @@ export default class NestCamera extends HomeKitDevice {
     this.operatingModeService = this.controller?.recordingManagement?.operatingModeService;
     if (this.operatingModeService === undefined) {
       // Add in operating mode service for a non-hksv camera/doorbell
-      // Allow us to change things such as night vision, camera indicator etc within HomeKit for those also:-)
+      // Allow us to change things such as night vision, camera indicator etc within HomeKit for those also :-)
       this.operatingModeService = this.accessory.getService(this.hap.Service.CameraOperatingMode);
       if (this.operatingModeService === undefined) {
         this.operatingModeService = this.accessory.addService(this.hap.Service.CameraOperatingMode, '', 1);
@@ -414,7 +418,7 @@ export default class NestCamera extends HomeKitDevice {
       );
     let ffmpegRecording = child_process.spawn(this.deviceData.ffmpeg.binary, commandLine.join(' ').split(' '), {
       env: process.env,
-      stdio: ['pipe', 'pipe', 'pipe', includeAudio === true ? 'pipe' : ''],
+      stdio: ['pipe', 'pipe', 'pipe', 'pipe'],
     });
 
     // Process FFmpeg output and parse out the fMP4 stream it's generating for HomeKit Secure Video.
@@ -806,7 +810,7 @@ export default class NestCamera extends HomeKitDevice {
         );
       let ffmpegStreaming = child_process.spawn(this.deviceData.ffmpeg.binary, commandLine.join(' ').split(' '), {
         env: process.env,
-        stdio: ['pipe', 'pipe', 'pipe', includeAudio === true ? 'pipe' : ''],
+        stdio: ['pipe', 'pipe', 'pipe', 'pipe'],
       });
 
       ffmpegStreaming.on('exit', (code, signal) => {

package/dist/doorbell.js

@@ -1,7 +1,7 @@
 // Nest Doorbell(s)
 // Part of homebridge-nest-accfactory
 //
-// Code version 11/10/2024
+// Code version 2025/03/19
 // Mark Hulskamp
 'use strict';
 
@@ -21,13 +21,9 @@ export default class NestDoorbell extends NestCamera {
 
   // Class functions
   addServices() {
-    // Setup some details around the doorbell BEFORE will call out parent addServices function
-    this.createCameraMotionServices();
-    this.controller = new this.hap.DoorbellController(this.generateControllerOptions());
-    this.accessory.configureController(this.controller);
-
     // Call parent to setup the common camera things. Once we return, we can add in the specifics for our doorbell
-    let postSetupDetails = super.addServices();
+    // We pass in the HAP Doorbell controller constructor function here also
+    let postSetupDetails = super.addServices(this.hap.DoorbellController);
 
     this.switchService = this.accessory.getService(this.hap.Service.Switch);
     if (this.deviceData.has_indoor_chime === true && this.deviceData.chimeSwitch === true) {

package/dist/protect.js

@@ -1,7 +1,7 @@
 // Nest Protect
 // Part of homebridge-nest-accfactory
 //
-// Code version 5/10/2024
+// Code version 2025/01/17
 // Mark Hulskamp
 'use strict';
 
@@ -74,7 +74,7 @@ export default class NestProtect extends HomeKitDevice {
         EveSmoke_alarmtest: this.deviceData.self_test_in_progress,
         EveSmoke_heatstatus: this.deviceData.heat_status,
         EveSmoke_hushedstate: this.deviceData.hushed_state,
-        EveSmoke_statusled: this.deviceData.ntp_green_led_enable,
+        Evesmoke_statusled: this.deviceData.ntp_green_led_enable,
         EveSmoke_smoketestpassed: this.deviceData.smoke_test_passed,
         EveSmoke_heattestpassed: this.deviceData.heat_test_passed,
       });
@@ -103,50 +103,59 @@ export default class NestProtect extends HomeKitDevice {
     );
 
     // Update smoke details
-    // If protect isn't online, removed from base, replacement date past, report in HomeKit
+    // If protect isn't online, replacement date past, report in HomeKit
     this.smokeService.updateCharacteristic(
       this.hap.Characteristic.StatusActive,
-      deviceData.online === true && deviceData.removed_from_base === false && Math.floor(Date.now() / 1000) <= deviceData.replacement_date,
+      deviceData.online === true && Math.floor(Date.now() / 1000) <= deviceData.replacement_date,
     );
 
     this.smokeService.updateCharacteristic(
       this.hap.Characteristic.StatusFault,
-      deviceData.online === true && deviceData.removed_from_base === false && Math.floor(Date.now() / 1000) <= deviceData.replacement_date
+      deviceData.online === true && Math.floor(Date.now() / 1000) <= deviceData.replacement_date
         ? this.hap.Characteristic.StatusFault.NO_FAULT
         : this.hap.Characteristic.StatusFault.GENERAL_FAULT,
     );
 
     this.smokeService.updateCharacteristic(
       this.hap.Characteristic.SmokeDetected,
-      deviceData.smoke_status === 2
+      deviceData.smoke_status === true
         ? this.hap.Characteristic.SmokeDetected.SMOKE_DETECTED
         : this.hap.Characteristic.SmokeDetected.SMOKE_NOT_DETECTED,
     );
 
-    if (deviceData.smoke_status !== 0 && this.deviceData.smoke_status === 0) {
+    if (deviceData.smoke_status === true && this.deviceData.smoke_status === false) {
       this?.log?.warn && this.log.warn('Smoke detected in "%s"', deviceData.description);
     }
 
-    if (deviceData.smoke_status === 0 && this.deviceData.smoke_status !== 0) {
+    if (deviceData.smoke_status === false && this.deviceData.smoke_status === true) {
       this?.log?.info && this.log.info('Smoke is nolonger detected in "%s"', deviceData.description);
     }
 
     // Update carbon monoxide details
     this.carbonMonoxideService.updateCharacteristic(
       this.hap.Characteristic.CarbonMonoxideDetected,
-      deviceData.co_status !== 0
+      deviceData.co_status === true
         ? this.hap.Characteristic.CarbonMonoxideDetected.CO_LEVELS_ABNORMAL
         : this.hap.Characteristic.CarbonMonoxideDetected.CO_LEVELS_NORMAL,
     );
 
-    if (deviceData.co_status !== 0 && this.deviceData.co_status === 0) {
+    if (deviceData.co_status === true && this.deviceData.co_status === false) {
       this?.log?.warn && this.log.warn('Abnormal carbon monoxide levels detected in "%s"', deviceData.description);
     }
 
-    if (deviceData.co_status === 0 && this.deviceData.co_status !== 0) {
+    if (deviceData.co_status === false && this.deviceData.co_status === true) {
       this?.log?.info && this.log.info('Carbon monoxide levels have returned to normal in "%s"', deviceData.description);
     }
 
+    // Update self testing details
+    if (deviceData.self_test_in_progress === true && this.deviceData.self_test_in_progress === false) {
+      this?.log?.warn && this.log.info('Smoke and Carbon monoxide sensor testing has started in "%s"', deviceData.description);
+    }
+
+    if (deviceData.self_test_in_progress === false && this.deviceData.self_test_in_progress === true) {
+      this?.log?.info && this.log.info('Smoke and Carbon monoxide sensor testing completed in "%s"', deviceData.description);
+    }
+
     // Update motion service if present
     if (this.motionService !== undefined) {
       this.motionService.updateCharacteristic(this.hap.Characteristic.MotionDetected, deviceData.detected_motion === true);

package/dist/protobuf/root.proto

@@ -3,11 +3,11 @@ syntax = "proto3";
 import "google/trait/product/camera.proto";
 import "nest/trait/audio.proto";
 import "nest/trait/detector.proto";
-import "nest/trait/hvac.proto";
 import "nest/trait/humanlibrary.proto";
 import "nest/trait/history.proto";
-import "nest/trait/humanlibrary.proto";
+import "nest/trait/hvac.proto";
 import "nest/trait/input.proto";
+import "nest/trait/lighting.proto";
 import "nest/trait/located.proto";
 import "nest/trait/media.proto";
 import "nest/trait/network.proto";
@@ -22,6 +22,7 @@ import "nest/trait/sensor.proto";
 import "nest/trait/service.proto";
 import "nest/trait/structure.proto";
 import "nest/trait/ui.proto";
+import "nest/trait/user.proto";
 import "weave/common.proto";
 import "weave/trait/actuator.proto";
 import "weave/trait/audio.proto";

package/dist/streamer.js

@@ -17,7 +17,7 @@
 //
 // blankAudio - Buffer containing a blank audio segment for the type of audio being used
 //
-// Code version 20/11/2024
+// Code version 2025/03/16
 // Mark Hulskamp
 'use strict';
 
@@ -162,7 +162,7 @@ export default class Streamer {
   startBuffering() {
     if (this.#outputs?.buffer === undefined) {
       // No active buffer session, start connection to streamer
-      if (this.connected === undefined && typeof this.connect === 'function') {
+      if (this.online === true && this.videoEnabled === true && this.connected === undefined && typeof this.connect === 'function') {
         this?.log?.debug && this.log.debug('Started buffering for uuid "%s"', this.uuid);
         this.connect();
       }
@@ -209,7 +209,7 @@ export default class Streamer {
       });
     }
 
-    if (this.connected === undefined && typeof this.connect === 'function') {
+    if (this.online === true && this.videoEnabled === true && this.connected === undefined && typeof this.connect === 'function') {
       // We do not have an active connection, so startup connection
       this.connect();
     }
@@ -247,7 +247,7 @@ export default class Streamer {
       });
     }
 
-    if (this.connected === undefined && typeof this.connect === 'function') {
+    if (this.connected === undefined && typeof this.connect === 'function' && this.online === true && this.videoEnabled === true) {
       // We do not have an active connection, so startup connection
       this.connect();
     }
@@ -328,7 +328,7 @@ export default class Streamer {
         if (typeof this.close === 'function') {
           this.close();
         }
-        if (typeof this.connect === 'function') {
+        if (this.online === true && this.videoEnabled === true && this.connected === undefined && typeof this.connect === 'function') {
           this.connect();
         }
       }

package/dist/system.js

@@ -1,7 +1,7 @@
 // Nest System communications
 // Part of homebridge-nest-accfactory
 //
-// Code version 2024/12/01
+// Code version 2025/03/20
 // Mark Hulskamp
 'use strict';
 
@@ -129,6 +129,10 @@ export default class NestAccfactory {
     this.config.options.weather = this.config.options?.weather === true;
     this.config.options.hksv = this.config.options?.hksv === true;
 
+    // Controls what APIs we use, default is to use both REST and protobuf APIs
+    this.config.options.restAPI = this.config.options?.restAPI === true || this.config.options?.restAPI === undefined;
+    this.config.options.protobufAPI = this.config.options?.protobufAPI === true || this.config.options?.protobufAPI === undefined;
+
     // Get configuration for max number of concurrent 'live view' streams. For HomeKit Secure Video, this will always be 1
     this.config.options.maxStreams =
       isNaN(this.config.options?.maxStreams) === false && this.deviceData?.hksv === false
@@ -137,16 +141,13 @@ export default class NestAccfactory {
           ? 1
           : 2;
 
-    // Check if a ffmpeg binary exists in current path OR the specific path via configuration
-    // If using HomeBridge, the default path will be where the Homebridge user folder is, otherwise the current directory
+    // Check if a ffmpeg binary exist via a specific path in configuration OR /usr/local/bin
     this.config.options.ffmpeg = {};
     this.config.options.ffmpeg.debug = this.config.options?.ffmpegDebug === true;
     this.config.options.ffmpeg.binary = path.resolve(
       typeof this.config.options?.ffmpegPath === 'string' && this.config.options.ffmpegPath !== ''
         ? this.config.options.ffmpegPath
-        : typeof api?.user?.storagePath === 'function'
-          ? api.user.storagePath()
-          : __dirname,
+        : '/usr/local/bin',
     );
 
     // If the path doesn't include 'ffmpeg' on the end, we'll add it here
@@ -170,6 +171,7 @@ export default class NestAccfactory {
       this.config.options.ffmpeg.binary = undefined;
     }
 
+    // Process ffmpeg binary to see if we can use it
     if (fs.existsSync(this.config.options.ffmpeg.binary) === true) {
       let ffmpegProcess = child_process.spawnSync(this.config.options.ffmpeg.binary, ['-version'], {
         env: process.env,
@@ -186,7 +188,11 @@ export default class NestAccfactory {
         this.config.options.ffmpeg.libx264 = ffmpegProcess.stdout.toString().includes('--enable-libx264') === true;
         this.config.options.ffmpeg.libfdk_aac = ffmpegProcess.stdout.toString().includes('--enable-libfdk-aac') === true;
         if (
-          this.config.options.ffmpeg.version.replace(/\./gi, '') < parseFloat(FFMPEGVERSION.toString().replace(/\./gi, '')) ||
+          this.config.options.ffmpeg.version.localeCompare(FFMPEGVERSION, undefined, {
+            numeric: true,
+            sensitivity: 'case',
+            caseFirst: 'upper',
+          }) === -1 ||
           this.config.options.ffmpeg.libspeex === false ||
           this.config.options.ffmpeg.libopus === false ||
           this.config.options.ffmpeg.libx264 === false ||
@@ -194,7 +200,13 @@ export default class NestAccfactory {
         ) {
           this?.log?.warn &&
             this.log.warn('ffmpeg binary "%s" does not meet the minimum support requirements', this.config.options.ffmpeg.binary);
-          if (this.config.options.ffmpeg.version.replace(/\./gi, '') < parseFloat(FFMPEGVERSION.toString().replace(/\./gi, ''))) {
+          if (
+            this.config.options.ffmpeg.version.localeCompare(FFMPEGVERSION, undefined, {
+              numeric: true,
+              sensitivity: 'case',
+              caseFirst: 'upper',
+            }) === -1
+          ) {
             this?.log?.warn &&
               this.log.warn(
                 'Minimum binary version is "%s", however the installed version is "%s"',
@@ -243,6 +255,10 @@ export default class NestAccfactory {
       }
     }
 
+    if (this.config.options.ffmpeg.binary !== undefined) {
+      this?.log?.success && this.log.success('Found valid ffmpeg binary in %s', this.config.options.ffmpeg.binary);
+    }
+
     if (this.api instanceof EventEmitter === true) {
       this.api.on('didFinishLaunching', async () => {
         // We got notified that Homebridge has finished loading, so we are ready to process
@@ -287,7 +303,7 @@ export default class NestAccfactory {
   }
 
   configureAccessory(accessory) {
-    // This gets called from HomeBridge each time it restores an accessory from its cache
+    // This gets called from Homebridge each time it restores an accessory from its cache
     this?.log?.info && this.log.info('Loading accessory from cache:', accessory.displayName);
 
     // add the restored accessory to the accessories cache, so we can track if it has already been registered
@@ -298,8 +314,10 @@ export default class NestAccfactory {
     Object.keys(this.#connections).forEach((uuid) => {
       if (this.#connections[uuid].authorised === false) {
         this.#connect(uuid).then(() => {
-          if (this.#connections[uuid].authorised === true) {
+          if (this.#connections[uuid].authorised === true && this.config.options?.restAPI === true) {
             this.#subscribeREST(uuid, true);
+          }
+          if (this.#connections[uuid].authorised === true && this.config.options?.protobufAPI === true) {
             this.#subscribeProtobuf(uuid, true);
           }
         });
@@ -701,11 +719,13 @@ export default class NestAccfactory {
                         });
 
                         // Send removed notice onto HomeKit device for it to process
-                        this.#eventEmitter.emit(
-                          this.#trackedDevices[this.#rawData[object_key].value.serial_number].uuid,
-                          HomeKitDevice.REMOVE,
-                          {},
-                        );
+                        if (this.#eventEmitter !== undefined) {
+                          this.#eventEmitter.emit(
+                            this.#trackedDevices[this.#rawData[object_key].value.serial_number].uuid,
+                            HomeKitDevice.REMOVE,
+                            {},
+                          );
+                        }
 
                         // Finally, remove from tracked devices
                         delete this.#trackedDevices[this.#rawData[object_key].value.serial_number];
@@ -909,11 +929,13 @@ export default class NestAccfactory {
                       }
 
                       // Send removed notice onto HomeKit device for it to process
-                      this.#eventEmitter.emit(
-                        this.#trackedDevices[this.#rawData[resource.resourceId].value.device_identity.serialNumber].uuid,
-                        HomeKitDevice.REMOVE,
-                        {},
-                      );
+                      if (this.#eventEmitter !== undefined) {
+                        this.#eventEmitter.emit(
+                          this.#trackedDevices[this.#rawData[resource.resourceId].value.device_identity.serialNumber].uuid,
+                          HomeKitDevice.REMOVE,
+                          {},
+                        );
+                      }
 
                       // Finally, remove from tracked devices
                       delete this.#trackedDevices[this.#rawData[resource.resourceId].value.device_identity.serialNumber];
@@ -972,6 +994,7 @@ export default class NestAccfactory {
           this.log.debug('Error was "%s"', error);
         }
       })
+
       .finally(() => {
         this?.log?.debug && this.log.debug('Restarting Protobuf API trait observe for connection uuid "%s"', connectionUUID);
         setTimeout(this.#subscribeProtobuf.bind(this, connectionUUID, false), 1000);
@@ -983,7 +1006,16 @@ export default class NestAccfactory {
       if (this.#trackedDevices?.[deviceData?.serialNumber] === undefined && deviceData?.excluded === true) {
         // We haven't tracked this device before (ie: should be a new one) and but its excluded
         this?.log?.warn && this.log.warn('Device "%s" is ignored due to it being marked as excluded', deviceData.description);
+
+        // Track this device even though its excluded
+        this.#trackedDevices[deviceData.serialNumber] = {
+          uuid: undefined,
+          rawDataUuid: deviceData.nest_google_uuid,
+          source: undefined,
+          exclude: true,
+        };
       }
+
       if (this.#trackedDevices?.[deviceData?.serialNumber] === undefined && deviceData?.excluded === false) {
         // We haven't tracked this device before (ie: should be a new one) and its not excluded
         // so create the required HomeKit accessories based upon the device data
@@ -1097,7 +1129,7 @@ export default class NestAccfactory {
                     this.#rawData[nest_google_uuid].value.activity_zones = zones;
 
                     // Send updated data onto HomeKit device for it to process
-                    if (this.#trackedDevices?.[deviceData?.serialNumber]?.uuid !== undefined) {
+                    if (this.#eventEmitter !== undefined && this.#trackedDevices?.[deviceData?.serialNumber]?.uuid !== undefined) {
                       this.#eventEmitter.emit(this.#trackedDevices[deviceData.serialNumber].uuid, HomeKitDevice.UPDATE, {
                         activity_zones: zones,
                       });
@@ -1258,7 +1290,7 @@ export default class NestAccfactory {
               this.#rawData[nest_google_uuid].value.alerts = alerts;
 
               // Send updated alerts onto HomeKit device for it to process
-              if (this.#trackedDevices?.[deviceData?.serialNumber]?.uuid !== undefined) {
+              if (this.#eventEmitter !== undefined && this.#trackedDevices?.[deviceData?.serialNumber]?.uuid !== undefined) {
                 this.#eventEmitter.emit(this.#trackedDevices[deviceData.serialNumber].uuid, HomeKitDevice.UPDATE, {
                   alerts: alerts,
                 });
@@ -1292,7 +1324,7 @@ export default class NestAccfactory {
               );
 
               // Send updated weather data onto HomeKit device for it to process
-              if (this.#trackedDevices?.[deviceData?.serialNumber]?.uuid !== undefined) {
+              if (this.#eventEmitter !== undefined && this.#trackedDevices?.[deviceData?.serialNumber]?.uuid !== undefined) {
                 this.#eventEmitter.emit(
                   this.#trackedDevices[deviceData.serialNumber].uuid,
                   HomeKitDevice.UPDATE,
@@ -1323,7 +1355,9 @@ export default class NestAccfactory {
           this.#trackedDevices[deviceData.serialNumber].rawDataUuid = deviceData.nest_google_uuid;
         }
 
-        this.#eventEmitter.emit(this.#trackedDevices[deviceData.serialNumber].uuid, HomeKitDevice.UPDATE, deviceData);
+        if (this.#eventEmitter !== undefined) {
+          this.#eventEmitter.emit(this.#trackedDevices[deviceData.serialNumber].uuid, HomeKitDevice.UPDATE, deviceData);
+        }
       }
     });
   }
@@ -1458,7 +1492,11 @@ export default class NestAccfactory {
       .forEach(([object_key, value]) => {
         let tempDevice = {};
         try {
-          if (value?.source === NestAccfactory.DataSource.PROTOBUF && value.value?.configuration_done?.deviceReady === true) {
+          if (
+            value?.source === NestAccfactory.DataSource.PROTOBUF &&
+            this.config.options?.protobufAPI === true &&
+            value.value?.configuration_done?.deviceReady === true
+          ) {
             let RESTTypeData = {};
             RESTTypeData.serialNumber = value.value.device_identity.serialNumber;
             RESTTypeData.softwareVersion =
@@ -1688,7 +1726,11 @@ export default class NestAccfactory {
             tempDevice = process_thermostat_data(object_key, RESTTypeData);
           }
 
-          if (value?.source === NestAccfactory.DataSource.REST && value.value?.where_id !== undefined) {
+          if (
+            value?.source === NestAccfactory.DataSource.REST &&
+            this.config.options?.restAPI === true &&
+            value.value?.where_id !== undefined
+          ) {
             let RESTTypeData = {};
             RESTTypeData.serialNumber = value.value.serial_number;
             RESTTypeData.softwareVersion = value.value.current_version;
@@ -1953,6 +1995,7 @@ export default class NestAccfactory {
         try {
           if (
             value?.source === NestAccfactory.DataSource.PROTOBUF &&
+            this.config.options?.protobufAPI === true &&
             value.value?.configuration_done?.deviceReady === true &&
             typeof value?.value?.associated_thermostat === 'string' &&
             value?.value?.associated_thermostat !== ''
@@ -1977,6 +2020,7 @@ export default class NestAccfactory {
           }
           if (
             value?.source === NestAccfactory.DataSource.REST &&
+            this.config.options?.restAPI === true &&
             value.value?.where_id !== undefined &&
             value.value?.structure_id !== undefined &&
             typeof value?.value?.associated_thermostat === 'string' &&
@@ -2014,7 +2058,6 @@ export default class NestAccfactory {
         // Fix up data we need to
         data = process_common_data(object_key, data);
         data.device_type = NestAccfactory.DeviceType.SMOKESENSOR; // Nest Protect
-        data.battery_level = scaleValue(data.battery_level, 0, 5400, 0, 100);
         data.model = 'Protect';
         if (data.wired_or_battery === 0) {
           data.model = data.model + ' (wired'; // Mains powered
@@ -2046,8 +2089,68 @@ export default class NestAccfactory {
       .forEach(([object_key, value]) => {
         let tempDevice = {};
         try {
+          if (
+            value?.source === NestAccfactory.DataSource.PROTOBUF &&
+            this.config.options?.protobufAPI === true &&
+            value.value?.configuration_done?.deviceReady === true
+          ) {
+            let RESTTypeData = {};
+            RESTTypeData.serialNumber = value.value.device_identity.serialNumber;
+            RESTTypeData.softwareVersion =
+              value.value.device_identity.softwareVersion.split(/\s+/)?.[3] !== undefined
+                ? value.value.device_identity.softwareVersion.split(/\s+/)?.[3]
+                : value.value.device_identity.softwareVersion;
+            RESTTypeData.online = value.value?.liveness?.status === 'LIVENESS_DEVICE_STATUS_ONLINE';
+            RESTTypeData.line_power_present = value.value?.wall_power?.status === 'POWER_SOURCE_STATUS_ACTIVE';
+            RESTTypeData.wired_or_battery = typeof value.value?.wall_power?.status === 'string' ? 0 : 1;
+            RESTTypeData.battery_level =
+              isNaN(value.value?.battery_voltage_bank1?.batteryValue?.batteryVoltage?.value) === false
+                ? scaleValue(Number(value.value.battery_voltage_bank1.batteryValue.batteryVoltage.value), 0, 5.4, 0, 100)
+                : 0;
+            RESTTypeData.battery_health_state =
+              value.value?.battery_voltage_bank0?.faultInformation === undefined &&
+              value.value?.battery_voltage_bank1?.faultInformation === undefined
+                ? 0
+                : 1;
+            RESTTypeData.smoke_status = value.value?.safety_alarm_smoke?.alarmState === 'ALARM_STATE_ALARM';
+            RESTTypeData.co_status = value.value?.safety_alarm_co?.alarmState === 'ALARM_STATE_ALARM';
+            RESTTypeData.heat_status = false; // To find in protobuf
+            RESTTypeData.hushed_state =
+              value.value?.safety_alarm_smoke?.silenceState === 'SILENCE_STATE_SILENCED' ||
+              value.value?.safety_alarm_co?.silenceState === 'SILENCE_STATE_SILENCED';
+            RESTTypeData.ntp_green_led = value.value?.night_time_promise_settings?.greenLedEnabled === true;
+            RESTTypeData.smoke_test_passed =
+              typeof value.value.safety_summary?.warningDevices?.failures === 'object'
+                ? value.value.safety_summary?.warningDevices?.failures.includes('FAILURE_TYPE_SMOKE') === false
+                : true;
+            RESTTypeData.heat_test_passed =
+              typeof value.value.safety_summary?.warningDevices?.failures === 'object'
+                ? value.value.safety_summary?.warningDevices?.failures.includes('FAILURE_TYPE_TEMP') === false
+                : true;
+            RESTTypeData.latest_alarm_test =
+              isNaN(value.value.self_test?.lastMstEnd?.seconds) === false ? Number(value.value.self_test.lastMstEnd.seconds) : 0;
+            RESTTypeData.self_test_in_progress =
+              value.value?.legacy_structure_self_test?.mstInProgress === true ||
+              value.value?.legacy_structure_self_test?.astInProgress === true;
+            RESTTypeData.replacement_date =
+              isNaN(value.value.legacy_protect_device_settings?.replaceByDate?.seconds) === false
+                ? Number(value.value.legacy_protect_device_settings.replaceByDate.seconds)
+                : 0;
+            RESTTypeData.topaz_hush_key =
+              typeof value.value?.safety_structure_settings?.structureHushKey === 'string'
+                ? value.value.safety_structure_settings.structureHushKey
+                : '';
+            RESTTypeData.detected_motion = value.value?.legacy_protect_device_info?.autoAway !== true; // undefined or false = motion
+            RESTTypeData.description = typeof value.value?.label?.label === 'string' ? value.value.label.label : '';
+            RESTTypeData.location = get_location_name(
+              value.value?.device_info?.pairerId?.resourceId,
+              value.value?.device_located_settings?.whereAnnotationRid?.resourceId,
+            );
+            tempDevice = process_protect_data(object_key, RESTTypeData);
+          }
           if (
             value?.source === NestAccfactory.DataSource.REST &&
+            this.config.options?.restAPI === true &&
             value.value?.where_id !== undefined &&
             value.value?.structure_id !== undefined
           ) {
@@ -2060,11 +2163,11 @@ export default class NestAccfactory {
                 : false;
             RESTTypeData.line_power_present = value.value.line_power_present === true;
             RESTTypeData.wired_or_battery = value.value.wired_or_battery;
-            RESTTypeData.battery_level = value.value.battery_level;
+            RESTTypeData.battery_level = scaleValue(value.value.battery_level, 0, 5400, 0, 100);
             RESTTypeData.battery_health_state = value.value.battery_health_state;
-            RESTTypeData.smoke_status = value.value.smoke_status;
-            RESTTypeData.co_status = value.value.co_status;
-            RESTTypeData.heat_status = value.value.heat_status;
+            RESTTypeData.smoke_status = value.value.smoke_status !== 0;
+            RESTTypeData.co_status = value.value.co_status !== 0;
+            RESTTypeData.heat_status = value.value.heat_status !== 0;
             RESTTypeData.hushed_state = value.value.hushed_state === true;
             RESTTypeData.ntp_green_led_enable = value.value.ntp_green_led_enable === true;
             RESTTypeData.smoke_test_passed = value.value.component_smoke_test_passed === true;
@@ -2073,7 +2176,6 @@ export default class NestAccfactory {
             RESTTypeData.self_test_in_progress =
               this.#rawData?.['safety.' + value.value.structure_id]?.value?.manual_self_test_in_progress === true;
             RESTTypeData.replacement_date = value.value.replace_by_date_utc_secs;
-            RESTTypeData.removed_from_base = value.value.removed_from_base === true;
             RESTTypeData.topaz_hush_key =
               typeof this.#rawData?.['structure.' + value.value.structure_id]?.value?.topaz_hush_key === 'string'
                 ? this.#rawData?.['structure.' + value.value.structure_id]?.value?.topaz_hush_key
@@ -2141,6 +2243,7 @@ export default class NestAccfactory {
         try {
           if (
             value?.source === NestAccfactory.DataSource.PROTOBUF &&
+            this.config.options?.protobufAPI === true &&
             Array.isArray(value.value?.streaming_protocol?.supportedProtocols) === true &&
             value.value.streaming_protocol.supportedProtocols.includes('PROTOCOL_WEBRTC') === true &&
             (value.value?.configuration_done?.deviceReady === true ||
@@ -2255,6 +2358,7 @@ export default class NestAccfactory {
 
           if (
             value?.source === NestAccfactory.DataSource.REST &&
+            this.config.options?.restAPI === true &&
             value.value?.where_id !== undefined &&
             value.value?.structure_id !== undefined &&
             value.value?.nexus_api_http_server_url !== undefined &&
@@ -2388,6 +2492,7 @@ export default class NestAccfactory {
         try {
           if (
             value?.source === NestAccfactory.DataSource.PROTOBUF &&
+            this.config.options?.protobufAPI === true &&
             value.value?.structure_location?.geoCoordinate?.latitude !== undefined &&
             value.value?.structure_location?.geoCoordinate?.longitude !== undefined
           ) {
@@ -2412,6 +2517,7 @@ export default class NestAccfactory {
 
           if (
             value?.source === NestAccfactory.DataSource.REST &&
+            this.config.options?.restAPI === true &&
             value.value?.latitude !== undefined &&
             value.value?.longitude !== undefined
           ) {
@@ -3130,7 +3236,7 @@ function makeHomeKitName(nameToMakeValid) {
   // Matches against uni-code characters
   return typeof nameToMakeValid === 'string'
     ? nameToMakeValid
-        .replace(/[^\p{L}\p{N}\p{Z}\u2019.,-]/gu, '')
+        .replace(/[^\p{L}\p{N}\p{Z}\u2019 '.,-]/gu, '')
         .replace(/^[^\p{L}\p{N}]*/gu, '')
         .replace(/[^\p{L}\p{N}]+$/gu, '')
     : nameToMakeValid;

package/dist/webrtc.js

@@ -2,14 +2,15 @@
 // Part of homebridge-nest-accfactory
 //
 // Handles connection and data from Google WebRTC systems
+// Currently a "work in progress"
 //
-// Code version 15/11/2024
+// Code version 2025/03/16
 // Mark Hulskamp
 'use strict';
 
 // Define external library requirements
 import protobuf from 'protobufjs';
-import werift from 'werift';
+import * as werift from 'werift';
 
 // Define nodejs module requirements
 import EventEmitter from 'node:events';
@@ -98,194 +99,196 @@ export default class WebRTC extends Streamer {
     this.stalledTimer = undefined;
     this.#id = undefined;
 
-    if (this.#googleHomeDeviceUUID === undefined) {
-      // We don't have the 'google id' yet for this device, so obtain
-      let homeFoyerResponse = await this.#googleHomeFoyerCommand('StructuresService', 'GetHomeGraph', {
-        requestId: crypto.randomUUID(),
-      });
-
-      // Translate our uuid (DEVICE_xxxxxxxxxx) into the associated 'google id' from the Google Home Foyer
-      // We need this id for SOME calls to Google Home Foyer services. Gotta love consistancy :-)
-      if (homeFoyerResponse?.data?.[0]?.homes !== undefined) {
-        Object.values(homeFoyerResponse?.data?.[0]?.homes).forEach((home) => {
-          Object.values(home.devices).forEach((device) => {
-            if (device?.id?.googleUuid !== undefined && device?.otherIds?.otherThirdPartyId !== undefined) {
-              // Test to see if our uuid matches here
-              let currentGoogleUuid = device?.id?.googleUuid;
-              Object.values(device.otherIds.otherThirdPartyId).forEach((other) => {
-                if (other?.id === this.uuid) {
-                  this.#googleHomeDeviceUUID = currentGoogleUuid;
-                }
-              });
-            }
-          });
+    if (this.online === true && this.videoEnabled === true) {
+      if (this.#googleHomeDeviceUUID === undefined) {
+        // We don't have the 'google id' yet for this device, so obtain
+        let homeFoyerResponse = await this.#googleHomeFoyerCommand('StructuresService', 'GetHomeGraph', {
+          requestId: crypto.randomUUID(),
         });
-      }
-    }
-
-    if (this.#googleHomeDeviceUUID !== undefined) {
-      // Start setting up connection to camera stream
-      this.connected = false; // Starting connection
-      let homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'SendCameraViewIntent', {
-        request: {
-          googleDeviceId: {
-            value: this.#googleHomeDeviceUUID,
-          },
-          command: 'VIEW_INTENT_START',
-        },
-      });
 
-      if (homeFoyerResponse.status !== 0) {
-        this.connected = undefined;
-        this?.log?.debug && this.log.debug('Request to start camera viewing was not accepted for uuid "%s"', this.uuid);
+        // Translate our uuid (DEVICE_xxxxxxxxxx) into the associated 'google id' from the Google Home Foyer
+        // We need this id for SOME calls to Google Home Foyer services. Gotta love consistancy :-)
+        if (homeFoyerResponse?.data?.[0]?.homes !== undefined) {
+          Object.values(homeFoyerResponse?.data?.[0]?.homes).forEach((home) => {
+            Object.values(home.devices).forEach((device) => {
+              if (device?.id?.googleUuid !== undefined && device?.otherIds?.otherThirdPartyId !== undefined) {
+                // Test to see if our uuid matches here
+                let currentGoogleUuid = device?.id?.googleUuid;
+                Object.values(device.otherIds.otherThirdPartyId).forEach((other) => {
+                  if (other?.id === this.uuid) {
+                    this.#googleHomeDeviceUUID = currentGoogleUuid;
+                  }
+                });
+              }
+            });
+          });
+        }
       }
 
-      if (homeFoyerResponse.status === 0) {
-        // Setup our WebWRTC peer connection for this device
-        this.#peerConnection = new werift.RTCPeerConnection({
-          iceUseIpv4: true,
-          iceUseIpv6: false,
-          bundlePolicy: 'max-bundle',
-          codecs: {
-            audio: [
-              new werift.RTCRtpCodecParameters({
-                mimeType: 'audio/opus',
-                clockRate: 48000,
-                channels: 2,
-                rtcpFeedback: [{ type: 'transport-cc' }, { type: 'nack' }],
-                parameters: 'minptime=10;useinbandfec=1',
-                payloadType: RTP_AUDIO_PAYLOAD_TYPE,
-              }),
-            ],
-            video: [
-              // H264 Main profile, level 4.0
-              new werift.RTCRtpCodecParameters({
-                mimeType: 'video/H264',
-                clockRate: 90000,
-                rtcpFeedback: [
-                  { type: 'transport-cc' },
-                  { type: 'ccm', parameter: 'fir' },
-                  { type: 'nack' },
-                  { type: 'nack', parameter: 'pli' },
-                  { type: 'goog-remb' },
-                ],
-                parameters: 'level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42e01f',
-                payloadType: RTP_VIDEO_PAYLOAD_TYPE,
-              }),
-            ],
-          },
-          headerExtensions: {
-            audio: [werift.useTransportWideCC(), werift.useAudioLevelIndication()],
+      if (this.#googleHomeDeviceUUID !== undefined) {
+        // Start setting up connection to camera stream
+        this.connected = false; // Starting connection
+        let homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'SendCameraViewIntent', {
+          request: {
+            googleDeviceId: {
+              value: this.#googleHomeDeviceUUID,
+            },
+            command: 'VIEW_INTENT_START',
           },
         });
 
-        this.#peerConnection.createDataChannel('webrtc-datachannel');
+        if (homeFoyerResponse.status !== 0) {
+          this.connected = undefined;
+          this?.log?.debug && this.log.debug('Request to start camera viewing was not accepted for uuid "%s"', this.uuid);
+        }
 
-        this.#audioTransceiver = this.#peerConnection.addTransceiver('audio', {
-          direction: 'sendrecv',
-        });
+        if (homeFoyerResponse.status === 0) {
+          // Setup our WebWRTC peer connection for this device
+          this.#peerConnection = new werift.RTCPeerConnection({
+            iceUseIpv4: true,
+            iceUseIpv6: false,
+            bundlePolicy: 'max-bundle',
+            codecs: {
+              audio: [
+                new werift.RTCRtpCodecParameters({
+                  mimeType: 'audio/opus',
+                  clockRate: 48000,
+                  channels: 2,
+                  rtcpFeedback: [{ type: 'transport-cc' }, { type: 'nack' }],
+                  parameters: 'minptime=10;useinbandfec=1',
+                  payloadType: RTP_AUDIO_PAYLOAD_TYPE,
+                }),
+              ],
+              video: [
+                // H264 Main profile, level 4.0
+                new werift.RTCRtpCodecParameters({
+                  mimeType: 'video/H264',
+                  clockRate: 90000,
+                  rtcpFeedback: [
+                    { type: 'transport-cc' },
+                    { type: 'ccm', parameter: 'fir' },
+                    { type: 'nack' },
+                    { type: 'nack', parameter: 'pli' },
+                    { type: 'goog-remb' },
+                  ],
+                  parameters: 'level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42e01f',
+                  payloadType: RTP_VIDEO_PAYLOAD_TYPE,
+                }),
+              ],
+            },
+            headerExtensions: {
+              audio: [werift.useTransportWideCC(), werift.useAudioLevelIndication()],
+            },
+          });
 
-        this.#videoTransceiver = this.#peerConnection.addTransceiver('video', {
-          direction: 'recvonly',
-        });
+          this.#peerConnection.createDataChannel('webrtc-datachannel');
 
-        let webRTCOffer = await this.#peerConnection.createOffer();
-        await this.#peerConnection.setLocalDescription(webRTCOffer);
+          this.#audioTransceiver = this.#peerConnection.addTransceiver('audio', {
+            direction: 'sendrecv',
+          });
 
-        this?.log?.debug && this.log.debug('Sending WebRTC offer for uuid "%s"', this.uuid);
+          this.#videoTransceiver = this.#peerConnection.addTransceiver('video', {
+            direction: 'recvonly',
+          });
 
-        homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'JoinStream', {
-          command: 'offer',
-          deviceId: this.uuid,
-          local: this.localAccess,
-          streamContext: 'STREAM_CONTEXT_DEFAULT',
-          requestedVideoResolution: 'VIDEO_RESOLUTION_FULL_HIGH',
-          sdp: webRTCOffer.sdp,
-        });
+          let webRTCOffer = await this.#peerConnection.createOffer();
+          await this.#peerConnection.setLocalDescription(webRTCOffer);
 
-        if (homeFoyerResponse.status !== 0) {
-          this.connected = undefined;
-          this?.log?.debug && this.log.debug('WebRTC offer was not agreed with remote for uuid "%s"', this.uuid);
-        }
+          this?.log?.debug && this.log.debug('Sending WebRTC offer for uuid "%s"', this.uuid);
 
-        if (
-          homeFoyerResponse.status === 0 &&
-          homeFoyerResponse.data?.[0]?.responseType === 'answer' &&
-          homeFoyerResponse.data?.[0]?.streamId !== undefined
-        ) {
-          this?.log?.debug && this.log.debug('WebRTC offer agreed with remote for uuid "%s"', this.uuid);
+          homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'JoinStream', {
+            command: 'offer',
+            deviceId: this.uuid,
+            local: this.localAccess,
+            streamContext: 'STREAM_CONTEXT_DEFAULT',
+            requestedVideoResolution: 'VIDEO_RESOLUTION_FULL_HIGH',
+            sdp: webRTCOffer.sdp,
+          });
 
-          this.#audioTransceiver?.onTrack &&
-            this.#audioTransceiver.onTrack.subscribe((track) => {
-              this.#handlePlaybackBegin(track);
+          if (homeFoyerResponse.status !== 0) {
+            this.connected = undefined;
+            this?.log?.debug && this.log.debug('WebRTC offer was not agreed with remote for uuid "%s"', this.uuid);
+          }
 
-              track.onReceiveRtp.subscribe((rtp) => {
-                this.#handlePlaybackPacket(rtp);
-              });
-            });
+          if (
+            homeFoyerResponse.status === 0 &&
+            homeFoyerResponse.data?.[0]?.responseType === 'answer' &&
+            homeFoyerResponse.data?.[0]?.streamId !== undefined
+          ) {
+            this?.log?.debug && this.log.debug('WebRTC offer agreed with remote for uuid "%s"', this.uuid);
 
-          this.#videoTransceiver?.onTrack &&
-            this.#videoTransceiver.onTrack.subscribe((track) => {
-              this.#handlePlaybackBegin(track);
+            this.#audioTransceiver?.onTrack &&
+              this.#audioTransceiver.onTrack.subscribe((track) => {
+                this.#handlePlaybackBegin(track);
 
-              track.onReceiveRtp.subscribe((rtp) => {
-                this.#handlePlaybackPacket(rtp);
+                track.onReceiveRtp.subscribe((rtp) => {
+                  this.#handlePlaybackPacket(rtp);
+                });
               });
-              track.onReceiveRtcp.once(() => {
-                setInterval(() => {
-                  if (this.#videoTransceiver?.receiver !== undefined) {
-                    this.#videoTransceiver.receiver.sendRtcpPLI(track.ssrc);
-                  }
-                }, 2000);
+
+            this.#videoTransceiver?.onTrack &&
+              this.#videoTransceiver.onTrack.subscribe((track) => {
+                this.#handlePlaybackBegin(track);
+
+                track.onReceiveRtp.subscribe((rtp) => {
+                  this.#handlePlaybackPacket(rtp);
+                });
+                track.onReceiveRtcp.once(() => {
+                  setInterval(() => {
+                    if (this.#videoTransceiver?.receiver !== undefined) {
+                      this.#videoTransceiver.receiver.sendRtcpPLI(track.ssrc);
+                    }
+                  }, 2000);
+                });
               });
-            });
 
-          this.#id = homeFoyerResponse.data[0].streamId;
-          this.#peerConnection &&
-            (await this.#peerConnection.setRemoteDescription({
-              type: 'answer',
-              sdp: homeFoyerResponse.data[0].sdp,
-            }));
-
-          this?.log?.debug && this.log.debug('Playback started from WebRTC for uuid "%s" with session ID "%s"', this.uuid, this.#id);
-          this.connected = true;
-
-          // Monitor connection status. If closed and there are still output streams, re-connect
-          // Never seem to get a 'connected' status. Could use that for something?
-          this.#peerConnection &&
-            this.#peerConnection.connectionStateChange.subscribe((state) => {
-              if (state !== 'connected' && state !== 'connecting') {
-                this?.log?.debug && this.log.debug('Connection closed to WebRTC for uuid "%s"', this.uuid);
-                this.connected = undefined;
-                if (this.haveOutputs() === true) {
-                  this.connect();
+            this.#id = homeFoyerResponse.data[0].streamId;
+            this.#peerConnection &&
+              (await this.#peerConnection.setRemoteDescription({
+                type: 'answer',
+                sdp: homeFoyerResponse.data[0].sdp,
+              }));
+
+            this?.log?.debug && this.log.debug('Playback started from WebRTC for uuid "%s" with session ID "%s"', this.uuid, this.#id);
+            this.connected = true;
+
+            // Monitor connection status. If closed and there are still output streams, re-connect
+            // Never seem to get a 'connected' status. Could use that for something?
+            this.#peerConnection &&
+              this.#peerConnection.connectionStateChange.subscribe((state) => {
+                if (state !== 'connected' && state !== 'connecting') {
+                  this?.log?.debug && this.log.debug('Connection closed to WebRTC for uuid "%s"', this.uuid);
+                  this.connected = undefined;
+                  if (this.haveOutputs() === true) {
+                    this.connect();
+                  }
                 }
-              }
-            });
-
-          // Create a timer to extend the active stream every period as defined
-          this.extendTimer = setInterval(async () => {
-            if (
-              this.#googleHomeFoyer !== undefined &&
-              this.connected === true &&
-              this.#id !== undefined &&
-              this.#googleHomeDeviceUUID !== undefined
-            ) {
-              let homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'JoinStream', {
-                command: 'extend',
-                deviceId: this.uuid,
-                streamId: this.#id,
               });
 
-              if (homeFoyerResponse?.data?.[0]?.streamExtensionStatus !== 'STATUS_STREAM_EXTENDED') {
-                this?.log?.debug && this.log.debug('Error occurred while requested stream extension for uuid "%s"', this.uuid);
-
-                if (typeof this.#peerConnection?.close === 'function') {
-                  await this.#peerConnection.close();
+            // Create a timer to extend the active stream every period as defined
+            this.extendTimer = setInterval(async () => {
+              if (
+                this.#googleHomeFoyer !== undefined &&
+                this.connected === true &&
+                this.#id !== undefined &&
+                this.#googleHomeDeviceUUID !== undefined
+              ) {
+                let homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'JoinStream', {
+                  command: 'extend',
+                  deviceId: this.uuid,
+                  streamId: this.#id,
+                });
+
+                if (homeFoyerResponse?.data?.[0]?.streamExtensionStatus !== 'STATUS_STREAM_EXTENDED') {
+                  this?.log?.debug && this.log.debug('Error occurred while requested stream extension for uuid "%s"', this.uuid);
+
+                  if (typeof this.#peerConnection?.close === 'function') {
+                    await this.#peerConnection.close();
+                  }
                 }
               }
-            }
-          }, EXTENDINTERVAL);
+            }, EXTENDINTERVAL);
+          }
         }
       }
     }

package/package.json

@@ -2,7 +2,7 @@
     "name": "homebridge-nest-accfactory",
     "displayName": "Nest Accfactory",
     "type": "module",
-    "version": "0.2.3",
+    "version": "0.2.9",
     "description": "Homebridge support for Nest/Google devices including HomeKit Secure Video (HKSV) support for doorbells and cameras",
     "author": "n0rt0nthec4t",
     "license": "Apache-2.0",
@@ -45,26 +45,26 @@
     ],
     "scripts": {
         "clean": "rimraf ./dist*",
-        "format": "prettier --write src/*.js src/**/*.js",
-        "lint": "eslint src/*.js src/**/*.js --max-warnings=20",
+        "format": "prettier --write src/*.js src/**/*.js src/**/*.mjs",
+        "lint": "eslint src/*.js src/**/*.js src/**/*.mjs --max-warnings=20",
         "build": "npm run clean && copyfiles -u 1 src/*.js dist && copyfiles -u 2 src/HomeKitDevice/*.js dist && copyfiles -u 2 src/HomeKitHistory/*.js dist && copyfiles -u 1 src/res/*.h264 dist && copyfiles -u 1 src/res/*.jpg dist && copyfiles -u 1 'src/protobuf/**/*.proto' dist",
         "prepublishOnly": "npm run lint && npm run build"
     },
     "devDependencies": {
-        "@eslint/js": "^9.16.0",
-        "@stylistic/eslint-plugin": "^2.11.0",
-        "@types/node": "^22.10.1",
-        "@typescript-eslint/parser": "^8.17.0",
-        "homebridge": "^2.0.0-beta.0",
+        "@eslint/js": "^9.23.0",
+        "@stylistic/eslint-plugin": "^4.2.0",
+        "@types/node": "^22.13.11",
+        "@typescript-eslint/parser": "^8.27.0",
         "copyfiles": "^2.4.1",
-        "eslint": "^9.16.0",
-        "prettier": "^3.4.2",
+        "eslint": "^9.23.0",
+        "homebridge": "^2.0.0-beta.0",
+        "prettier": "^3.5.3",
         "prettier-eslint": "^16.3.0",
         "rimraf": "^6.0.1"
     },
     "dependencies": {
         "protobufjs": "^7.4.0",
-        "ws": "^8.18.0",
-        "werift": "^0.20.1"
+        "werift": "^0.22.1",
+        "ws": "^8.18.1"
     }
 }