homebridge-nest-accfactory 0.3.3 → 0.3.4

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 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.3.4 (2025/10/17)
+
+- General code cleanup and stability improvements  
+- General typo and grammar corrections  
+- Fixed handling of the per-device `hksv` setting  
+- Fixed thermostat cooling stage 3 checking  
+- Fixed thermostat fan state checking
+- Fixed periodic camera snapshots when camera is turned off
+- Updated camera resource assets
+
 ## v0.3.3 (2025/08/23)
 
 - Refined timeout warnings for camera and doorbell snapshot capture  

package/README.md

@@ -48,7 +48,7 @@ There may be other keys labelled access_token further along in the string - plea
 
 ### Obtaining a Google cookie token for a Google Account
 
-Google Accounts require an "issueToken" and "cookie". The values of "issueToken" and "cookies" are specific to your Google Account. To get them, follow these steps (only needs to be done once, as long as you stay logged into your Google Account).
+Google Accounts require an "issueToken" and "cookie". The values of "issueToken" and "cookie" are specific to your Google Account. To get them, follow these steps (only needs to be done once, as long as you stay logged into your Google Account).
 
 1. Open a Chrome browser tab in Incognito Mode
 2. Open Developer Tools (View/Developer/Developer Tools).
@@ -57,15 +57,15 @@ Google Accounts require an "issueToken" and "cookie". The values of "issueToken"
 5. Go to home.nest.com, and click 'Sign in with Google'. Log into your account.
 6. One network call (beginning with iframerpc) will appear in the Dev Tools window. Click on it.
 7. In the Headers tab, under General, copy the entire Request URL (beginning with https://accounts.google.com). This is your "Issue Token" which can be entered into the plugin-configuration within Homebridge.
-9. In the 'Filter' box, enter oauth2/iframe
-10. Several network calls will appear in the Dev Tools window. Click on the last iframe call.
-11. In the Headers tab, under Request Headers, copy the entire cookie (include the whole string which is several lines long and has many field/value pairs - do not include the cookie: name). This is your "Cookie" which can be entered into the plugin-configuration within Homebridge.
+8. In the 'Filter' box, enter oauth2/iframe
+9. Several network calls will appear in the Dev Tools window. Click on the last iframe call.
+10. In the Headers tab, under Request Headers, copy the entire cookie (include the whole string which is several lines long and has many field/value pairs - do not include the cookie: name). This is your "Cookie" which can be entered into the plugin-configuration within Homebridge.
 
 **Do not log out of home.nest.com, as this will invalidate your credentials. Just close the browser tab**
 
 ## config.json configuration
 
-When using the plugin configuration using [homebridge-config-ui-x](https://github.com/homebridge/homebridge-config-ui-x), the config.json will be updated/generated with the configuration options available via the web-form. Additional options can be specified in the config.json directly.
+When using the plugin configuration with [homebridge-config-ui-x](https://github.com/homebridge/homebridge-config-ui-x), the config.json will be updated/generated with the configuration options available via the web-form. Additional options can be specified in the config.json directly.
 
 Sample config.json entries below
 ```
@@ -90,8 +90,9 @@ Sample config.json entries below
             "serialNumber": "XXXXXXXX",
             "exclude": false
         },
+        {
             "serialNumber": "YYYYYYYY",
-            "hksv" : true
+            "hksv": true
         }
     ],
     "platform": "NestAccfactory"
@@ -107,9 +108,9 @@ The following options are available in the config.json options object. These app
 | elevation          | Height above sea level for the weather station                                               | 0              |
 | eveHistory         | Provide history in EveHome application where applicable                                      | true           |
 | exclude            | Exclude ALL devices                                                                          | false          |
-| ffmpegDebug        | Turns on specific debugging output for when ffmpeg is envoked                                | false          |
+| ffmpegDebug        | Turns on specific debugging output for when ffmpeg is invoked                                | false          |
 | ffmpegHWaccel      | Enable video hardware acceleration for supported camera(s) and doorbell(s)                   | false          |  
-| ffmegPath          | Path to an ffmpeg binary (looks for binary named `ffmpeg` in path)                           | /usr/local/bin |
+| ffmpegPath         | Path to an ffmpeg binary (looks for binary named `ffmpeg` in path)                           | /usr/local/bin |
 | hksv               | Enable HomeKit Secure Video for supported camera(s) and doorbell(s)                          | false          |
 | weather            | Virtual weather station for each Nest/Google home we discover                                | false          |
 
@@ -120,22 +121,22 @@ The following options are available on a per-device level in the `config.json` `
 | 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             | 
+| 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          |
 | fanDuration        | Override fan runtime duration                                                                |                |
-| ffmpegDebug        | Turns on specific debugging output for when ffmpeg is envoked                                | false          |
+| ffmpegDebug        | Turns on specific debugging output for when ffmpeg is invoked                                | false          |
 | ffmpegHWaccel      | Enable video hardware acceleration for supported camera(s) and doorbell(s)                   | false          |
 | hksv               | Enable HomeKit Secure Video for supported camera(s) and doorbell(s)                          | false          |
 | hotwaterBoostTime  | Time in seconds for hotwater boost heating (30, 160, 120mins)                                | 30mins         |
 | hotwaterMaxTemp    | Maximum supported temperature for hotwater heating                                           | 70c            |
 | hotwaterMinTemp    | Minimum supported temperature for hotwater heating                                           | 30c            |
-| 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          |    
+| humiditySensor     | Create a separate 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            |
-| serialNumber       | Device serial number to which these settings belong too                                      |                |
+| serialNumber       | Device serial number to which these settings belong to                                       |                |
 
 ## ffmpeg
 

package/dist/config.js

@@ -1,7 +1,7 @@
 // Configuration validation and processing
 // Part of homebridge-nest-accfactory
 //
-// Code version 2025.08.18
+// Code version 2025.09.08
 // Mark Hulskamp
 'use strict';
 
@@ -34,7 +34,7 @@ function processConfig(config, log) {
   // Get configuration for max number of concurrent 'live view' streams. For HomeKit Secure Video, this will always be 1
   options.maxStreams = isNaN(config.options?.maxStreams) === false ? Number(config.options.maxStreams) : 2;
 
-  // Check if a ffmpeg binary exist via a specific path in configuration OR /usr/local/bin
+  // Check if an ffmpeg binary exists via a specific path in configuration OR /usr/local/bin
   options.ffmpeg = {
     binary: undefined,
     valid: false,
@@ -127,7 +127,9 @@ function processConfig(config, log) {
     log?.warn?.('');
     log?.warn?.('NOTICE');
     log?.warn?.('> The per device configuration contains legacy options. Please review the readme at the link below');
-    log?.warn?.('> Consider updating your configuration file as the mapping from legacy to current per device configuration maybe removed');
+    log?.warn?.(
+      '> Consider updating your configuration file as the mapping from legacy to current per device configuration may be removed',
+    );
     log?.warn?.('> https://github.com/n0rt0nthec4t/homebridge-nest-accfactory/blob/main/src/README.md');
     log?.warn?.('');
   }

package/dist/consts.js

@@ -1,7 +1,7 @@
 // Common defines
 // Part of homebridge-nest-accfactory
 //
-// Code version 2025.08.20
+// Code version 2025.09.08
 // Mark Hulskamp
 'use strict';
 

package/dist/index.js

@@ -1,5 +1,5 @@
 // Homebridge platform allowing Nest devices to be used with HomeKit
-// This is a port from my standalone project, Nest_accfactory to Homebridge
+// This is a port from my standalone project, NestAccfactory to Homebridge
 //
 // This includes having support for HomeKit Secure Video (HKSV) on doorbells and cameras
 //
@@ -17,7 +17,7 @@
 //
 // Supports both Nest REST and Protobuf APIs for communication
 //
-// Code version 2025.07.29
+// Code version 2025.09.08
 // Mark Hulskamp
 'use strict';
 

package/dist/nexustalk.js

@@ -5,7 +5,7 @@
 //
 // Credit to https://github.com/Brandawg93/homebridge-nest-cam for the work on the Nest Camera comms code on which this is based
 //
-// Code version 2025.07.30
+// Code version 2025.09.08
 // Mark Hulskamp
 'use strict';
 
@@ -98,7 +98,7 @@ export default class NexusTalk extends Streamer {
       this.#protobufNexusTalk = protobuf.loadSync(path.resolve(__dirname + '/protobuf/nest/nexustalk.proto'));
     }
 
-    // Store data we need from the device data passed it
+    // Store data we need from the device data passed in
     this.token = deviceData?.apiAccess?.token;
     this.streaming_host = deviceData?.streaming_host; // Host we'll connect to
     this.useGoogleAuth = typeof deviceData?.apiAccess?.oauth2 === 'string' && deviceData?.apiAccess?.oauth2 !== '';
@@ -175,10 +175,10 @@ export default class NexusTalk extends Streamer {
   }
 
   async close(stopStreamFirst) {
-    // Close an authenicated socket stream gracefully
+    // Close an authenticated socket stream gracefully
     if (this.#socket !== undefined) {
       if (stopStreamFirst === true) {
-        // Send a notifcation to nexus we're finished playback
+        // Send a notification to nexus that we've finished playback
         await this.#stopNexusData();
       }
       this.#socket.destroy();
@@ -288,7 +288,7 @@ export default class NexusTalk extends Streamer {
 
   #sendMessage(type, data) {
     if (this.#socket?.readyState !== 'open' || (type !== PACKET_TYPE.HELLO && this.#authorised === false)) {
-      // We're not connect and/or authorised yet, so 'cache' message for processing once this occurs
+      // We're not connected and/or authorised yet, so 'cache' message for processing once this occurs
       this.#messages.push({ type: type, data: data });
       return;
     }
@@ -314,7 +314,7 @@ export default class NexusTalk extends Streamer {
   #Authenticate(reauthorise) {
     // Authenticate over created socket connection
     if (this.#protobufNexusTalk !== undefined) {
-      this.#authorised = false; // We're nolonger authorised
+      this.#authorised = false; // We're no longer authorised
 
       let authoriseRequest = null;
       let TraitMap = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.AuthoriseRequest');
@@ -429,8 +429,8 @@ export default class NexusTalk extends Streamer {
     if (typeof payload === 'object' && this.#protobufNexusTalk !== undefined) {
       let decodedMessage = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.PlaybackPacket').decode(payload).toJSON();
 
-      // Setup up a timeout to monitor for no packets recieved in a certain period
-      // If its trigger, we'll attempt to restart the stream and/or connection
+      // Set up a timeout to monitor for no packets received in a certain period
+      // If it's triggered, we'll attempt to restart the stream and/or connection
       // <-- testing to see how often this occurs first
       clearTimeout(this.#stalledTimer);
       this.#stalledTimer = setTimeout(() => {
@@ -464,7 +464,7 @@ export default class NexusTalk extends Streamer {
   }
 
   #handlePlaybackEnd(payload) {
-    // Decode playpack ended packet
+    // Decode playback ended packet
     if (typeof payload === 'object' && this.#protobufNexusTalk !== undefined) {
       let decodedMessage = this.#protobufNexusTalk.lookup('nest.nexustalk.v1.PlaybackEnd').decode(payload).toJSON();
 
@@ -519,7 +519,7 @@ export default class NexusTalk extends Streamer {
   }
 
   #handleNexusData(data) {
-    // Process the rawdata from our socket connection and convert into nexus packets to take action against
+    // Process the raw data from our socket connection and convert into nexus packets to take action against
     this.#packets = this.#packets.length === 0 ? data : Buffer.concat([this.#packets, data]);
 
     while (this.#packets.length >= 3) {
@@ -533,7 +533,7 @@ export default class NexusTalk extends Streamer {
       }
 
       if (this.#packets.length < headerSize + packetSize) {
-        // We dont have enough data in the buffer yet to process the full packet
+        // We don't have enough data in the buffer yet to process the full packet
         // so, exit loop and await more data
         break;
       }

package/dist/plugins/camera.js

@@ -31,7 +31,7 @@ const STREAMING_PROTOCOL = {
 
 export default class NestCamera extends HomeKitDevice {
   static TYPE = 'Camera';
-  static VERSION = '2025.08.19'; // Code version
+  static VERSION = '2025.09.08'; // Code version
 
   // For messaging back to parent class (Doorbell/Floodlight)
   static SET = HomeKitDevice.SET;
@@ -84,7 +84,7 @@ export default class NestCamera extends HomeKitDevice {
   onAdd() {
     // Handle HKSV configuration change from enabled/disable states
     if (typeof this?.accessory?.context?.hksv === 'boolean' && this.accessory.context.hksv !== this.deviceData.hksv) {
-      // We need to remove the CameraOperaionMode service to avoid errors when setting up the HomeKit controller
+      // We need to remove the CameraOperatingMode service to avoid errors when setting up the HomeKit controller
       // Thanks to @bcullman (Brad Ullman) for catching this
       if (this.accessory.getService(this.hap.Service.CameraOperatingMode) !== undefined) {
         this.accessory.removeService(this.accessory.getService(this.hap.Service.CameraOperatingMode));
@@ -103,7 +103,7 @@ export default class NestCamera extends HomeKitDevice {
       this.controller = new this.hap.CameraController(this.generateControllerOptions());
     }
     if (this.controller !== undefined) {
-      // Configure the controller thats been created
+      // Configure the controller that's been created
       this.accessory.configureController(this.controller);
     }
 
@@ -130,7 +130,7 @@ export default class NestCamera extends HomeKitDevice {
               (value === false && this.deviceData.statusled_brightness !== 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');
+              this?.log?.info?.('Recording status LED on "%s" was turned %s', this.deviceData.description, value === true ? 'on' : 'off');
             }
           },
           onGet: () => {
@@ -150,7 +150,7 @@ export default class NestCamera extends HomeKitDevice {
               irled_enabled: value === true ? 'auto_on' : 'always_off',
             });
 
-            this?.log?.info?.('Night vision on "%s" was turned', this.deviceData.description, value === true ? 'on' : 'off');
+            this?.log?.info?.('Night vision on "%s" was turned %s', this.deviceData.description, value === true ? 'on' : 'off');
           }
         },
         onGet: () => {
@@ -176,18 +176,13 @@ export default class NestCamera extends HomeKitDevice {
               streaming_enabled: value === this.hap.Characteristic.HomeKitCameraActive.ON ? true : false,
             });
             this?.log?.info?.(
-              'Camera on "%s" was turned',
+              'Camera on "%s" was turned %s',
               this.deviceData.description,
               value === this.hap.Characteristic.HomeKitCameraActive.ON ? 'on' : 'off',
             );
           }
         }
       },
-      onGet: () => {
-        return this.deviceData.streaming_enabled === false
-          ? this.hap.Characteristic.HomeKitCameraActive.OFF
-          : this.hap.Characteristic.HomeKitCameraActive.ON;
-      },
     });
 
     if (this.deviceData?.has_video_flip === true) {
@@ -213,7 +208,7 @@ export default class NestCamera extends HomeKitDevice {
                 audio_enabled: value === this.hap.Characteristic.RecordingAudioActive.ENABLE ? true : false,
               });
               this?.log?.info?.(
-                'Audio recording on "%s" was turned',
+                'Audio recording on "%s" was turned %s',
                 this.deviceData.description,
                 value === this.hap.Characteristic.RecordingAudioActive.ENABLE ? 'on' : 'off',
               );
@@ -397,10 +392,10 @@ export default class NestCamera extends HomeKitDevice {
     if (this.controller?.recordingManagement?.operatingModeService !== undefined) {
       // Update camera off/on status
       this.controller.recordingManagement.operatingModeService.updateCharacteristic(
-        this.hap.Characteristic.HomeKitCameraActive,
+        this.hap.Characteristic.ManuallyDisabled,
         deviceData.streaming_enabled === true
-          ? this.hap.Characteristic.HomeKitCameraActive.ON
-          : this.hap.Characteristic.HomeKitCameraActive.OFF,
+          ? this.hap.Characteristic.ManuallyDisabled.ENABLED
+          : this.hap.Characteristic.ManuallyDisabled.DISABLED,
       );
 
       if (deviceData?.has_statusled === true) {
@@ -431,19 +426,15 @@ export default class NestCamera extends HomeKitDevice {
       }
 
       if (this.deviceData.hksv === false) {
-        // Update snapshot status for non-hksv in operating mode service
+        // Specific settings for non-HKSV camera's
         this.controller.recordingManagement.operatingModeService.updateCharacteristic(
-          this.hap.Characteristic.EventSnapshotsActive,
-          deviceData.streaming_enabled === true
-            ? this.hap.Characteristic.EventSnapshotsActive.ENABLE
-            : this.hap.Characteristic.EventSnapshotsActive.DISABLE,
+          this.hap.Characteristic.PeriodicSnapshotsActive,
+          this.hap.Characteristic.PeriodicSnapshotsActive.ENABLE,
         );
 
         this.controller.recordingManagement.operatingModeService.updateCharacteristic(
-          this.hap.Characteristic.PeriodicSnapshotsActive,
-          deviceData.streaming_enabled === true
-            ? this.hap.Characteristic.PeriodicSnapshotsActive.ENABLE
-            : this.hap.Characteristic.PeriodicSnapshotsActive.DISABLE,
+          this.hap.Characteristic.HomeKitCameraActive,
+          this.hap.Characteristic.HomeKitCameraActive.ON,
         );
       }
     }
@@ -499,7 +490,7 @@ export default class NestCamera extends HomeKitDevice {
               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
+              // Trigger motion for matching zone if not already active
               this.motionServices[zoneID].service.updateCharacteristic(this.hap.Characteristic.MotionDetected, true);
 
               // Log motion started into history
@@ -514,10 +505,10 @@ export default class NestCamera extends HomeKitDevice {
           this.motionTimer = setTimeout(() => {
             event.zone_ids.forEach((zoneID) => {
               if (typeof this.motionServices?.[zoneID]?.service === 'object') {
-                // Mark associted motion services as motion not detected
+                // Mark associated motion services as motion not detected
                 this.motionServices[zoneID].service.updateCharacteristic(this.hap.Characteristic.MotionDetected, false);
 
-                // Log motion started into history
+                // Log motion stopped into history
                 this.history(this.motionServices[zoneID].service, { status: 0 });
               }
             });
@@ -689,9 +680,9 @@ export default class NestCamera extends HomeKitDevice {
     // 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',
+      'ffmpeg process for recording stream from "%s" will be called using the following commandline: %s',
       this.deviceData.description,
-      commandLine.join(' ').toString(),
+      commandLine.join(' '),
     );
 
     let ffmpegStream = this.ffmpeg.createSession(
@@ -722,7 +713,7 @@ export default class NestCamera extends HomeKitDevice {
       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
+          // We don't have enough data in the buffer yet to process the full mp4 box
           // so, exit loop and await more data
           break;
         }
@@ -900,7 +891,7 @@ export default class NestCamera extends HomeKitDevice {
 
     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
+      // We'll use the last successful snapshot as long as its within a certain time period
       imageBuffer = this.#lastSnapshotImage;
     }
 
@@ -1024,7 +1015,7 @@ export default class NestCamera extends HomeKitDevice {
         '0:v:0',
         '-codec:v',
         'copy',
-        // Below is comment out as we don't use hardware acceleration for live streaming
+        // Below is commented 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']),
@@ -1099,9 +1090,9 @@ export default class NestCamera extends HomeKitDevice {
       ];
 
       this?.log?.debug?.(
-        'ffmpeg process for live streaming from "%s" will be called using the following commandline',
+        'ffmpeg process for live streaming from "%s" will be called using the following commandline: %s',
         this.deviceData.description,
-        commandLine.join(' ').toString(),
+        commandLine.join(' '),
       );
 
       // Launch the ffmpeg process for streaming and connect it to streamer input/output
@@ -1169,7 +1160,7 @@ export default class NestCamera extends HomeKitDevice {
         ];
 
         this?.log?.debug?.(
-          'ffmpeg process for talkback on "%s" will be called using the following commandline',
+          'ffmpeg process for talkback on "%s" will be called using the following commandline: %s',
           this.deviceData.description,
           talkbackCommandLine.join(' '),
         );
@@ -1534,7 +1525,7 @@ export function processRawData(log, rawData, config, deviceType = 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
+          // We'll only use the Nest API data for Cameras which have NOT been migrated to Google Home
           tempDevice = processCommonData(
             object_key,
             {
@@ -1598,7 +1589,9 @@ export function processRawData(log, rawData, config, deviceType = undefined) {
         );
         // 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.hksv =
+          (deviceOptions?.hksv === true || (deviceOptions?.hksv !== false && config.options?.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 });

package/dist/plugins/doorbell.js

@@ -13,7 +13,7 @@ export { processRawData };
 
 export default class NestDoorbell extends NestCamera {
   static TYPE = 'Doorbell';
-  static VERSION = '2025.08.12'; // Code version
+  static VERSION = '2025.09.08'; // Code version
 
   doorbellTimer = undefined; // Cooldown timer for doorbell events
   switchService = undefined; // HomeKit switch for enabling/disabling chime
@@ -28,13 +28,13 @@ export default class NestDoorbell extends NestCamera {
     // Setup HomeKit doorbell controller
     if (this.controller === undefined) {
       // Establish the "camera" controller here as a doorbell specific one
-      // when onAdd is called for the base camera class, this will cconfigure our camera controller established here
+      // when onAdd is called for the base camera class, this will configure our camera controller established here
       this.controller = new this.hap.DoorbellController(this.generateControllerOptions());
     }
 
     if (this.deviceData?.has_indoor_chime === true && this.deviceData?.chimeSwitch === true) {
       // Add service to allow automation and enabling/disabling indoor chiming.
-      // This needs to be explically enabled via a configuration option for the device
+      // This needs to be explicitly enabled via a configuration option for the device
       this.switchService = this.addHKService(this.hap.Service.Switch, '', 1);
 
       // Setup set callback for this switch service
@@ -44,7 +44,7 @@ export default class NestDoorbell extends NestCamera {
             // only change indoor chime status value if different than on-device
             this.message(NestDoorbell.SET, { uuid: this.deviceData.nest_google_uuid, indoor_chime_enabled: value });
 
-            this?.log?.info?.('Indoor chime on "%s" was turned', this.deviceData.description, value === true ? 'on' : 'off');
+            this?.log?.info?.('Indoor chime on "%s" was turned %s', this.deviceData.description, value === true ? 'on' : 'off');
           }
         },
         onGet: () => {

package/dist/plugins/floodlight.js

@@ -10,14 +10,14 @@ export { processRawData };
 
 export default class NestFloodlight extends NestCamera {
   static TYPE = 'FloodlightCamera';
-  static VERSION = '2025.07.25'; // Code version
+  static VERSION = '2025.09.08'; // Code version
 
   lightService = undefined; // HomeKit light
 
   // Class functions
   onAdd() {
     if (this.deviceData.has_light === true) {
-      // Add service to for a light, including brightness control
+      // Add service for a light, including brightness control
       this.lightService = this.addHKService(this.hap.Service.Lightbulb, '', 1);
       this.addHKCharacteristic(this.lightService, this.hap.Characteristic.Brightness, {
         props: { minStep: 10 }, // Light only goes in 10% increments
@@ -38,7 +38,7 @@ export default class NestFloodlight extends NestCamera {
           if (value !== this.deviceData.light_enabled) {
             this.message(NestFloodlight.SET, { uuid: this.deviceData.nest_google_uuid, light_enabled: value });
 
-            this?.log?.info?.('Floodlight on "%s" was turned', this.deviceData.description, value === true ? 'on' : 'off');
+            this?.log?.info?.('Floodlight on "%s" was turned %s', this.deviceData.description, value === true ? 'on' : 'off');
           }
         },
         onGet: () => {

package/dist/plugins/lock.js

@@ -13,7 +13,7 @@ import { DATA_SOURCE, DEVICE_TYPE, PROTOBUF_RESOURCES, LOW_BATTERY_LEVEL } from
 
 export default class NestLock extends HomeKitDevice {
   static TYPE = 'Lock';
-  static VERSION = '2025.08.13'; // Code version
+  static VERSION = '2025.09.08'; // Code version
 
   // Define lock bolt states
   static STATE = {
@@ -186,7 +186,7 @@ export default class NestLock extends HomeKitDevice {
         ? deviceData.bolt_state === NestLock.STATE.LOCKED || deviceData.bolt_state === NestLock.STATE.LOCKING
           ? this.hap.Characteristic.LockLastKnownAction.SECURED_BY_KEYPAD
           : this.hap.Characteristic.LockLastKnownAction.UNSECURED_BY_KEYPAD
-        : deviceData.bolt_actor === NestLock.LAST_ACTION.REMOTE || deviceData.LAST_ACTION === NestLock.LAST_ACTION.VOICE
+        : deviceData.bolt_actor === NestLock.LAST_ACTION.REMOTE || deviceData.bolt_actor === NestLock.LAST_ACTION.VOICE
           ? deviceData.bolt_state === NestLock.STATE.LOCKED || deviceData.bolt_state === NestLock.STATE.LOCKING
             ? this.hap.Characteristic.LockLastKnownAction.SECURED_REMOTELY
             : this.hap.Characteristic.LockLastKnownAction.UNSECURED_REMOTELY

package/dist/plugins/protect.js

@@ -13,7 +13,7 @@ import { LOW_BATTERY_LEVEL, DATA_SOURCE, PROTOBUF_RESOURCES, DEVICE_TYPE } from
 
 export default class NestProtect extends HomeKitDevice {
   static TYPE = 'Protect';
-  static VERSION = '2025.08.04'; // Code version
+  static VERSION = '2025.09.08'; // Code version
 
   batteryService = undefined;
   smokeService = undefined;
@@ -109,7 +109,7 @@ export default class NestProtect extends HomeKitDevice {
     }
 
     if (deviceData.smoke_status === false && this.deviceData.smoke_status === true) {
-      this?.log?.info?.('Smoke is nolonger detected in "%s"', deviceData.description);
+      this?.log?.info?.('Smoke is no longer detected in "%s"', deviceData.description);
     }
 
     // Update carbon monoxide details

package/dist/plugins/tempsensor.js

@@ -13,7 +13,7 @@ import { LOW_BATTERY_LEVEL, DATA_SOURCE, PROTOBUF_RESOURCES, DEVICE_TYPE } from
 
 export default class NestTemperatureSensor extends HomeKitDevice {
   static TYPE = 'TemperatureSensor';
-  static VERSION = '2025.08.04'; // Code version
+  static VERSION = '2025.09.08'; // Code version
 
   batteryService = undefined;
   temperatureService = undefined;
@@ -50,7 +50,7 @@ export default class NestTemperatureSensor extends HomeKitDevice {
 
     this.temperatureService.updateCharacteristic(this.hap.Characteristic.StatusActive, deviceData.online === true);
     if (typeof deviceData?.associated_thermostat === 'string' && deviceData.associated_thermostat !== '') {
-      // This temperature sensor is assocated with a thermostat
+      // This temperature sensor is associated with a thermostat
       // Update status if providing active temperature for the thermostats
       this.temperatureService.updateCharacteristic(
         this.hap.Characteristic.StatusActive,

package/dist/plugins/thermostat.js

@@ -28,7 +28,7 @@ import {
 
 export default class NestThermostat extends HomeKitDevice {
   static TYPE = 'Thermostat';
-  static VERSION = '2025.08.21'; // Code version
+  static VERSION = '2025.09.08'; // Code version
 
   thermostatService = undefined;
   batteryService = undefined;
@@ -205,7 +205,7 @@ export default class NestThermostat extends HomeKitDevice {
       this.fanService = undefined;
     }
 
-    // Setup dehumifider service if supported by the thermostat and not already present on the accessory
+    // Setup dehumidifier service if supported by the thermostat and not already present on the accessory
     if (this.deviceData?.has_dehumidifier === true) {
       this.#setupDehumidifier();
     }
@@ -218,7 +218,7 @@ export default class NestThermostat extends HomeKitDevice {
       this.dehumidifierService = undefined;
     }
 
-    // Setup humdity service if configured to be seperate and not already present on the accessory
+    // Setup humidity service if configured to be separate and not already present on the accessory
     if (this.deviceData?.humiditySensor === true) {
       this.humidityService = this.addHKService(this.hap.Service.HumiditySensor, '', 1);
       this.thermostatService.addLinkedService(this.humidityService);
@@ -230,7 +230,7 @@ export default class NestThermostat extends HomeKitDevice {
       });
     }
     if (this.deviceData?.humiditySensor === false) {
-      // No longer have a seperate humidity sensor configure and service present, so removed it
+      // No longer have a separate humidity sensor configure and service present, so removed it
       this.humidityService = this.accessory.getService(this.hap.Service.HumiditySensor);
       if (this.humidityService !== undefined) {
         this.accessory.removeService(this.humidityService);
@@ -239,7 +239,7 @@ export default class NestThermostat extends HomeKitDevice {
     }
 
     // Attempt to load any external modules for this thermostat
-    // We support external cool/heat/fan/dehumidifier/humdifier module functions
+    // We support external cool/heat/fan/dehumidifier/humidifier module functions
     // This is all undocumented on how to use, as its for my specific use case :-)
     this.externalCool = await this.#loadExternalModule(this.deviceData?.externalCool, ['cool', 'off']);
     this.externalHeat = await this.#loadExternalModule(this.deviceData?.externalHeat, ['heat', 'off']);
@@ -248,7 +248,7 @@ export default class NestThermostat extends HomeKitDevice {
     this.externalHumidifier = await this.#loadExternalModule(this.deviceData?.externalHumidifier, ['humidifier', 'off']);
 
     // Extra setup details for output
-    this.humidityService !== undefined && this.postSetupDetail('Seperate humidity sensor');
+    this.humidityService !== undefined && this.postSetupDetail('Separate humidity sensor');
     this.externalCool !== undefined && this.postSetupDetail('Using external cooling module');
     this.externalHeat !== undefined && this.postSetupDetail('Using external heating module');
     this.externalFan !== undefined && this.postSetupDetail('Using external fan module');
@@ -351,7 +351,7 @@ export default class NestThermostat extends HomeKitDevice {
         : this.hap.Characteristic.OccupancyDetected.OCCUPANCY_NOT_DETECTED,
     );
 
-    // Update seperate humidity sensor if configured todo so
+    // Update separate humidity sensor if configured to do so
     if (this.humidityService !== undefined) {
       this.humidityService.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, deviceData.current_humidity);
     }
@@ -378,14 +378,14 @@ export default class NestThermostat extends HomeKitDevice {
       );
     }
 
-    // Check for dehumidifer setup change on thermostat
+    // Check for dehumidifier setup change on thermostat
     if (deviceData.has_dehumidifier !== this.deviceData.has_dehumidifier) {
       if (deviceData.has_dehumidifier === true && this.deviceData.has_dehumidifier === false && this.dehumidifierService === undefined) {
         // Dehumidifier has been added
         this.#setupDehumidifier();
       }
       if (deviceData.has_dehumidifier === false && this.deviceData.has_dehumidifier === true && this.dehumidifierService !== undefined) {
-        // Dehumidifer has been removed
+        // Dehumidifier has been removed
         this.accessory.removeService(this.dehumidifierService);
         this.dehumidifierService = undefined;
       }
@@ -529,7 +529,7 @@ export default class NestThermostat extends HomeKitDevice {
     }
     if (deviceData.hvac_state.toUpperCase() === 'OFF') {
       if (this.deviceData.hvac_state.toUpperCase() === 'COOLING' && typeof this.externalCool?.off === 'function') {
-        // Switched to off mode and external cooling external code was being used, so stop cooling via cooling external code{
+        // Switched to off mode and external cooling external code was being used, so stop cooling via cooling external code
         this.externalCool.off();
       }
       if (this.deviceData.hvac_state.toUpperCase() === 'HEATING' && typeof this.externalHeat?.off === 'function') {
@@ -696,11 +696,11 @@ export default class NestThermostat extends HomeKitDevice {
   setFan(fanState, speed) {
     let currentState = this.fanService.getCharacteristic(this.hap.Characteristic.Active).value;
 
-    // If we have a rotation speed characteristic, use that get the current fan speed, otherwise we us ethe current fan state to determine
+    // If we have a rotation speed characteristic, use that get the current fan speed, otherwise we use the current fan state to determine
     let currentSpeed =
       this.fanService.testCharacteristic(this.hap.Characteristic.RotationSpeed) === true
         ? this.fanService.getCharacteristic(this.hap.Characteristic.RotationSpeed).value
-        : currentState === true
+        : currentState === this.hap.Characteristic.Active.ACTIVE
           ? 100
           : 0;
 
@@ -756,18 +756,18 @@ export default class NestThermostat extends HomeKitDevice {
     }
   }
 
-  setDehumidifier(dehumidiferState) {
-    let isActive = dehumidiferState === this.hap.Characteristic.Active.ACTIVE;
+  setDehumidifier(dehumidifierState) {
+    let isActive = dehumidifierState === this.hap.Characteristic.Active.ACTIVE;
 
     this.message(HomeKitDevice.SET, {
       uuid: this.deviceData.nest_google_uuid,
       dehumidifier_state: isActive,
     });
 
-    this.dehumidifierService.updateCharacteristic(this.hap.Characteristic.Active, dehumidiferState);
+    this.dehumidifierService.updateCharacteristic(this.hap.Characteristic.Active, dehumidifierState);
 
     this?.log?.info?.(
-      'Set dehumidifer on thermostat "%s" to "%s"',
+      'Set dehumidifier on thermostat "%s" to "%s"',
       this.deviceData.description,
       isActive ? 'On with target humidity level of ' + this.deviceData.target_humidity + '%' : 'Off',
     );
@@ -989,7 +989,7 @@ export default class NestThermostat extends HomeKitDevice {
         props: { minStep: 100 / this.deviceData.fan_max_speed },
         onSet: (value) => this.setFan(value !== 0 ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE, value),
         onGet: () => {
-          return this.deviceData.fanState === true ? (this.deviceData.fan_timer_speed / this.deviceData.fan_max_speed) * 100 : 0;
+          return this.deviceData.fan_state === true ? (this.deviceData.fan_timer_speed / this.deviceData.fan_max_speed) * 100 : 0;
         },
       });
     } else {
@@ -1265,7 +1265,7 @@ export function processRawData(log, rawData, config, deviceType = undefined) {
           if (
             value.value?.hvac_control?.hvacState?.coolStage1Active === true ||
             value.value?.hvac_control?.hvacState?.coolStage2Active === true ||
-            value.value?.hvac_control?.hvacState?.coolStage2Active === true
+            value.value?.hvac_control?.hvacState?.coolStage3Active === true
           ) {
             // A cooling source is on, so we're in cooling mode
             RESTTypeData.hvac_state = 'cooling';

package/dist/plugins/weather.js

@@ -13,7 +13,7 @@ import { DATA_SOURCE, DEVICE_TYPE, NESTLABS_MAC_PREFIX } from '../consts.js';
 
 export default class NestWeather extends HomeKitDevice {
   static TYPE = 'Weather';
-  static VERSION = '2025.08.04'; // Code version
+  static VERSION = '2025.09.08'; // Code version
 
   batteryService = undefined;
   airPressureService = undefined;
@@ -155,7 +155,7 @@ export default class NestWeather extends HomeKitDevice {
       this.temperatureService.updateCharacteristic(this.hap.Characteristic.SunsetTime, dateString);
     }
 
-    // If we have the history service running, record temperature and humity every 5mins
+    // If we have the history service running, record temperature and humidity every 5mins
     this.history(
       this.airPressureService,
       { temperature: deviceData.current_temperature, humidity: deviceData.current_humidity, pressure: 0 },
@@ -187,7 +187,7 @@ export function processRawData(log, rawData, config, deviceType = undefined) {
       let tempDevice = {};
       try {
         // For a Google API source data, we use the Nest API structure ID. This will ensure we generate the same serial number
-        // This should prevent two 'wether' objects from being created
+        // This should prevent two 'weather' objects from being created
         // Nest API uses the structure id only
         let serialNumber =
           value?.source === DATA_SOURCE.GOOGLE &&

package/dist/system.js

@@ -1,7 +1,7 @@
 // Nest System communications
 // Part of homebridge-nest-accfactory
 //
-// Code version 2025.08.21
+// Code version 2025.09.08
 // Mark Hulskamp
 'use strict';
 
@@ -236,7 +236,7 @@ export default class NestAccfactory {
         if (refresh !== true) {
           this?.log?.success?.('Successfully authorised using Google account for connection "%s"', this.#connections[uuid].name);
         } else {
-          this?.log?.debug?.('Successfully performed token refesh using Google account for connection "%s"', this.#connections[uuid].name);
+          this?.log?.debug?.('Successfully performed token refresh using Google account for connection "%s"', this.#connections[uuid].name);
         }
       } catch (error) {
         // Attempt to extract HTTP status code from error cause or error object
@@ -533,7 +533,7 @@ export default class NestAccfactory {
           };
         }
 
-        // Dump the the raw data if configured todo so
+        // Dump the raw data if configured to do so
         // This can be used for user support, rather than specific build to dump this :-)
         if (this?.config?.options?.rawdump === true && this.#connections[uuid]?.doneNestRawDump !== true) {
           this.#connections[uuid].doneNestRawDump = true; // Done once
@@ -714,7 +714,7 @@ export default class NestAccfactory {
             }
           }
 
-          // Dump the the raw data if configured todo so
+          // Dump the raw data if configured to do so
           // This can be used for user support, rather than specific build to dump this :-)
           if (this?.config?.options?.rawdump === true && this.#connections[uuid]?.doneGoogleRawDump !== true) {
             this.#connections[uuid].doneGoogleRawDump = true; // Done once
@@ -1323,7 +1323,7 @@ export default class NestAccfactory {
           commandTraits.push(structuredClone(commandElement));
         }
 
-        // Perform any direct trait updates we have todo. This can be done via a single call in a batch
+        // Perform any direct trait updates we have to do. This can be done via a single call in a batch
         if (updatedTraits.length !== 0) {
           let commandResponse = await this.#protobufCommand(uuid, 'nestlabs.gateway.v1.TraitBatchApi', 'BatchUpdateState', {
             batchUpdateStateRequest: updatedTraits,
@@ -1335,7 +1335,7 @@ export default class NestAccfactory {
             this?.log?.debug?.('Google API had error updating traits for device uuid "%s"', nest_google_uuid);
           }
         }
-        // Perform any trait updates required via resource commands. Each one is done seperately
+        // Perform any trait updates required via resource commands. Each one is done separately
         if (commandTraits.length !== 0) {
           for (let command of commandTraits) {
             let commandResponse = await this.#protobufCommand(uuid, 'nestlabs.gateway.v1.ResourceApi', 'SendCommand', command);
@@ -2065,7 +2065,7 @@ export default class NestAccfactory {
       }
     };
 
-    // Retrieve both 'Request' and 'Reponse' traits for the associated service and command
+    // Retrieve both 'Request' and 'Response' traits for the associated service and command
     service = service.trim();
     command = command.trim();
     let TraitMapService = this.#protobufRoot.lookup(service);
@@ -2191,7 +2191,7 @@ export default class NestAccfactory {
       return;
     }
 
-    // Attempt to load in requifred protobuf files
+    // Attempt to load in required protobuf files
     if (fs.existsSync(path.join(__dirname, 'protobuf/root.proto')) === true) {
       protobuf.util.Long = null;
       protobuf.configure();
@@ -2203,7 +2203,7 @@ export default class NestAccfactory {
 
     if (this.#protobufRoot === null) {
       this?.log?.warn?.(
-        'Failed to loaded protobuf support files for Google API. This will cause certain Nest/Google devices to be un-supported',
+        'Failed to load protobuf support files for Google API. This will cause certain Nest/Google devices to be unsupported',
       );
     }
   }

package/dist/utils.js

@@ -1,7 +1,7 @@
 // General helper functions
 // Part of homebridge-nest-accfactory
 //
-// Code version 2025.08.20
+// Code version 2025.09.08
 // Mark Hulskamp
 'use strict';
 
@@ -134,7 +134,6 @@ async function fetchWrapper(method, url, options, data) {
 
         let delay = 500 * Math.pow(2, options._retryCount - 1);
         await new Promise((resolve) => {
-          resolve = resolve;
           setTimeout(resolve, delay);
         });
 

package/dist/webrtc.js

@@ -4,7 +4,7 @@
 // Handles connection and data from Google WebRTC systems
 // Currently a "work in progress"
 //
-// Code version 2025.07.23
+// Code version 2025.09.08
 // Mark Hulskamp
 'use strict';
 
@@ -105,7 +105,7 @@ export default class WebRTC extends Streamer {
         });
 
         // 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 :-)
+        // We need this id for SOME calls to Google Home Foyer services. Gotta love consistency :-)
         if (homeFoyerResponse?.data?.[0]?.homes !== undefined) {
           Object.values(homeFoyerResponse?.data?.[0]?.homes).forEach((home) => {
             Object.values(home.devices).forEach((device) => {
@@ -273,7 +273,7 @@ export default class WebRTC extends Streamer {
                 });
 
                 if (homeFoyerResponse?.data?.[0]?.streamExtensionStatus !== 'STATUS_STREAM_EXTENDED') {
-                  this?.log?.debug?.('Error occurred while requested stream extension for uuid "%s"', this.nest_google_uuid);
+                  this?.log?.debug?.('Error occurred while requesting stream extension for uuid "%s"', this.nest_google_uuid);
 
                   await this.#peerConnection?.close?.();
                 }
@@ -371,7 +371,7 @@ export default class WebRTC extends Streamer {
         }
         if (homeFoyerResponse?.status === 0) {
           this.audio.talking = true;
-          this?.log?.debug?.('Talking start on uuid "%s"', this.nest_google_uuid);
+          this?.log?.debug?.('Talking started on uuid "%s"', this.nest_google_uuid);
         }
       }
 
@@ -383,14 +383,14 @@ export default class WebRTC extends Streamer {
         rtpHeader.payloadOffset = RTP_PACKET_HEADER_SIZE;
         rtpHeader.payloadType = this.audio.id; // As the camera is send/recv, we use the same payload type id as the incoming audio
         rtpHeader.timestamp = Date.now() >>> 0; // Think the time stamp difference should be 960ms per audio packet?
-        rtpHeader.sequenceNumber = this.audio.talkSquenceNumber++ & 0xffff;
+        rtpHeader.sequenceNumber = this.audio.talkSequenceNumber++ & 0xffff;
         let rtpPacket = new werift.RtpPacket(rtpHeader, talkingBuffer);
         this.#audioTransceiver.sender.sendRtp(rtpPacket.serialize());
       }
     }
 
     if (talkingBuffer.length === 0 && this.audio?.talking === true) {
-      // Buffer length of zero, ised to signal no more talking data for the moment
+      // Buffer length of zero, used to signal no more talking data for the moment
       let homeFoyerResponse = await this.#googleHomeFoyerCommand('CameraService', 'SendTalkback', {
         googleDeviceId: {
           value: this.#googleHomeDeviceUUID,
@@ -421,7 +421,7 @@ export default class WebRTC extends Streamer {
         baseTime: undefined,
         sampleRate: 48000,
         opus: undefined,
-        talkSquenceNumber: weriftTrack?.sender?.sequenceNumber === undefined ? 0 : weriftTrack.sender.sequenceNumber,
+        talkSequenceNumber: weriftTrack?.sender?.sequenceNumber === undefined ? 0 : weriftTrack.sender.sequenceNumber,
         talking: undefined,
       };
     }
@@ -450,7 +450,7 @@ export default class WebRTC extends Streamer {
       return;
     }
 
-    // Create timer for stalled  rtp output. Restart strem if so
+    // Create timer for stalled rtp output. Restart stream if so
     clearTimeout(this.#stalledTimer);
     this.#stalledTimer = setTimeout(async () => {
       await this.#peerConnection?.close?.();
@@ -604,7 +604,7 @@ export default class WebRTC extends Streamer {
       return;
     }
 
-    // Attempt to retrieve both 'Request' and 'Reponse' traits for the associated service and command
+    // Attempt to retrieve both 'Request' and 'Response' traits for the associated service and command
     let TraitMapRequest = this.#protobufFoyer.lookup(GOOGLE_HOME_FOYER_PREFIX + command + 'Request');
     let TraitMapResponse = this.#protobufFoyer.lookup(GOOGLE_HOME_FOYER_PREFIX + command + 'Response');
     let buffer = Buffer.alloc(0);

package/package.json

@@ -2,7 +2,7 @@
     "name": "homebridge-nest-accfactory",
     "displayName": "Nest Accfactory",
     "type": "module",
-    "version": "0.3.3",
+    "version": "0.3.4",
     "description": "Homebridge support for Nest/Google devices including HomeKit Secure Video (HKSV) support for doorbells and cameras",
     "author": "n0rt0nthec4t",
     "license": "Apache-2.0",
@@ -54,11 +54,11 @@
         "prepublishOnly": "npm run lint && npm run build"
     },
     "devDependencies": {
-        "@eslint/js": "^9.34.0",
-        "eslint": "^9.34.0",
-        "@stylistic/eslint-plugin": "^5.2.3",
-        "@types/node": "^24.3.0",
-        "@typescript-eslint/parser": "^8.40.0",
+        "@eslint/js": "^9.37.0",
+        "eslint": "^9.37.0",
+        "@stylistic/eslint-plugin": "^5.4.0",
+        "@types/node": "^24.8.1",
+        "@typescript-eslint/parser": "^8.46.1",
         "prettier": "^3.6.2",
         "prettier-eslint": "^16.4.2",
         "copyfiles": "^2.4.1",
@@ -69,6 +69,6 @@
         "@evan/opus": "^1.0.3",
         "protobufjs": "^7.5.4",
         "werift": "^0.22.2",
-        "undici": "7.15.0"
+        "undici": "7.16.0"
     }
 }

package/dist/rtpmuxer.js

@@ -1,186 +0,0 @@
-// rtpmuxer.js
-// Unified RTP Muxer + Stream Engine with FFmpeg support
-// Part of homebridge-nest-accfactory
-//
-// Code version 2025.07.04
-// Mark Hulskamp
-'use strict';
-
-// Define nodejs module requirements
-import dgram from 'dgram';
-import { Writable } from 'stream';
-import { Buffer } from 'node:buffer';
-import { setInterval, clearInterval } from 'node:timers';
-
-// Define constants
-const LOG_LEVELS = {
-  INFO: 'info',
-  SUCCESS: 'success',
-  WARN: 'warn',
-  ERROR: 'error',
-  DEBUG: 'debug',
-};
-const RTP_PACKET_HEADER_SIZE = 12;
-
-export default class RTPMuxer {
-  static RTP_PORT_START = 50000;
-  static RTP_PORT_END = 51000;
-  static SAMPLE_RATE_VIDEO = 90000;
-  static SAMPLE_RATE_AUDIO = 48000;
-  static PAYLOAD_TYPE_H264 = 96;
-  static PAYLOAD_TYPE_OPUS = 111;
-
-  static STREAM_TYPE = {
-    BUFFER: 'buffer',
-    LIVE: 'live',
-    RECORD: 'record',
-    TALK: 'talk',
-  };
-
-  log = undefined; // Logging function object
-
-  #udpServer = undefined; // UDP server for RTP packets
-  #port = undefined; // UDP port for RTP packets
-  #outputSessions = new Map(); // Output sessions for RTP streams
-  #buffer = []; // Buffer for RTP packets
-  #bufferDuration = 5000;
-  #bufferTimer = undefined; // Timer for buffer cleanup
-  #ffmpeg = undefined; // FFmpeg instance for processing RTP streams
-
-  constructor(options) {
-    // Setup logger object if passed as option
-    if (Object.values(LOG_LEVELS).every((fn) => typeof options?.log?.[fn] === 'function')) {
-      this.log = options.log;
-    }
-
-    this.#ffmpeg = options.ffmpeg; // pass instance of FFmpeg from ffmpeg.js
-  }
-
-  async start() {
-    this.#port = await this.#allocatePort();
-    this.#udpServer = dgram.createSocket('udp4');
-    this.#udpServer.on('message', (msg) => this.#handleRTP(msg));
-    this.#udpServer.bind(this.#port);
-    this.#startBufferLoop();
-  }
-
-  stop(uuid) {
-    if (this.#udpServer) {
-      this.#udpServer.close();
-      this.#udpServer = undefined;
-    }
-
-    clearInterval(this.#bufferTimer);
-    this.#outputSessions.clear();
-
-    this.#ffmpeg?.killAllSessions?.(uuid);
-  }
-
-  getPort() {
-    return this.#port;
-  }
-
-  getSDP(kind) {
-    let sdp = '';
-    if (kind === 'video') {
-      sdp += 'm=video ' + this.#port + ' RTP/AVP ' + RTPMuxer.PAYLOAD_TYPE_H264 + '\r\n';
-      sdp += 'a=rtpmap:' + RTPMuxer.PAYLOAD_TYPE_H264 + ' H264/' + RTPMuxer.SAMPLE_RATE_VIDEO + '\r\n';
-    } else if (kind === 'audio') {
-      sdp += 'm=audio ' + this.#port + ' RTP/AVP ' + RTPMuxer.PAYLOAD_TYPE_OPUS + '\r\n';
-      sdp += 'a=rtpmap:' + RTPMuxer.PAYLOAD_TYPE_OPUS + ' opus/' + RTPMuxer.SAMPLE_RATE_AUDIO + '/2\r\n';
-    }
-    return sdp;
-  }
-
-  attachOutput(sessionID, writableStream, options = {}) {
-    this.#outputSessions.set(sessionID, {
-      stream: writableStream,
-      kind: options.kind,
-      isRecording: options.isRecording === true,
-    });
-  }
-
-  detachOutput(sessionID) {
-    this.#outputSessions.delete(sessionID);
-  }
-
-  getWritableStream(type) {
-    return new Writable({
-      write: (chunk, encoding, callback) => {
-        if (type === RTPMuxer.STREAM_TYPE.BUFFER) {
-          this.#buffer.push({ time: Date.now(), data: chunk });
-        }
-        for (let session of this.#outputSessions.values()) {
-          if (session.kind === type || session.kind === undefined) {
-            session.stream.write(chunk);
-          }
-        }
-        callback();
-      },
-    });
-  }
-
-  getBufferedPackets(kind) {
-    let now = Date.now();
-    return this.#buffer.filter((p) => p.kind === kind && now - p.timestamp <= this.#bufferDuration).map((p) => p.packet);
-  }
-
-  startSession(uuid, sessionID, args, sessionType = 'live', errorCallback, pipeCount = 4) {
-    return this.#ffmpeg?.createSession?.(uuid, sessionID, args, sessionType, errorCallback, pipeCount);
-  }
-
-  stopSession(uuid, sessionID, sessionType = 'live') {
-    return this.#ffmpeg?.killSession?.(uuid, sessionID, sessionType);
-  }
-
-  processRTP(packet) {
-    this.#handleRTP(packet);
-  }
-
-  #handleRTP(packet) {
-    if (Buffer.isBuffer(packet) === false || packet.length < RTP_PACKET_HEADER_SIZE) {
-      return;
-    }
-
-    let payloadType = packet[1] & 0x7f;
-    let kind = payloadType === RTPMuxer.PAYLOAD_TYPE_H264 ? 'video' : payloadType === RTPMuxer.PAYLOAD_TYPE_OPUS ? 'audio' : undefined;
-    if (kind === undefined) {
-      return;
-    }
-
-    let copy = Buffer.from(packet);
-    this.#buffer.push({ kind, timestamp: Date.now(), packet: copy });
-
-    for (let session of this.#outputSessions.values()) {
-      if (session.kind === kind || session.kind === undefined) {
-        session.stream.write(copy);
-      }
-    }
-  }
-
-  #startBufferLoop() {
-    this.#bufferTimer = setInterval(() => {
-      let now = Date.now();
-      this.#buffer = this.#buffer.filter((p) => now - p.timestamp <= this.#bufferDuration);
-    }, 1000);
-  }
-
-  async #allocatePort() {
-    for (let port = RTPMuxer.RTP_PORT_START; port <= RTPMuxer.RTP_PORT_END; port += 2) {
-      try {
-        await new Promise((resolve, reject) => {
-          let socket = dgram.createSocket('udp4');
-          socket.once('error', reject);
-          socket.bind(port, () => {
-            socket.close();
-            resolve();
-          });
-        });
-        return port;
-      } catch {
-        // try next port
-      }
-    }
-    throw new Error('No available UDP port');
-  }
-}