0.0.5 release source files

Author: n0rt0nthec4t

CHANGELOG.md

@@ -6,14 +6,12 @@ All notable changes to `homebridge-nest-accfactory` will be documented in this f
 
 Currently all releases are considered 'alpha' status, where things may or may not be working. Use at your own risk :-)
 
-## v0.0.5 (alpha)
+## v0.0.5 (2024/09/13)
 
-- General code and bug fixes
-- External dependancy reductions
-    - dropped pbf and axios libraries
-- Nest Cam with Floodlight support
-    - Control light on/off and brightness
-- Streaming/recording still coming for newer Nest/Google camera/doorbell devices
+- General code cleanup and bug fixes
+- External dependancy reductions, dropped pbf and axios libraries
+- Nest Cam with Floodlight support with light on/off and brightness control
+- Fixed issued with setting range temperatures on Nest Thermostat(s)
 
 ## v0.0.4 (2024-09-07)
 
@@ -28,7 +26,7 @@ Currently all releases are considered 'alpha' status, where things may or may no
 - Cleanup fix for when removing a camera/doorbell from Nest/Google
 - Fix for virtual weather device when missing configured city and/or state details
 - Fix for retrieving data from Nest systems when using both a Nest and Google accounts
-- Initial support newer Nest/Google camera/doorbell devices (streaming/recording - coming)
+- Initial support for newer Nest/Google camera/doorbell devices (streaming/recording - coming)
 
 ## v0.0.1 (2024-08-27)
 

package.json

@@ -2,7 +2,7 @@
     "displayName": "Nest Accfactory",
     "name": "homebridge-nest-accfactory",
     "homepage": "https://github.com/n0rt0nthec4t/homebridge-nest-accfactory",
-    "version": "0.0.5-alpha.3",
+    "version": "0.0.5",
     "description": "Homebridge support for Nest/Google devices including HomeKit Secure Video (HKSV) support for doorbells and cameras",
     "license": "Apache-2.0",
     "author": "n0rt0nthec4t",
@@ -35,7 +35,9 @@
     },
     "keywords": [
         "homebridge-plugin",
+        "homebridge",
         "hksv",
+        "homekit secure video",
         "nest",
         "google",
         "doorbell",

src/HomeKitDevice.js

@@ -37,7 +37,7 @@
 // HomeKitDevice.updateServices(deviceData)
 // HomeKitDevice.messageServices(type, message)
 //
-// Code version 12/9/2024
+// Code version 13/9/2024
 // Mark Hulskamp
 'use strict';
 
@@ -104,7 +104,8 @@ export default class HomeKitDevice {
       this.#eventEmitter.addListener(this.deviceData.uuid, this.#message.bind(this));
     }
 
-    // Make copy of current data and store in this object
+    // Make a clone of current data and store in this object
+    // Important that we done have a 'linked' cope of the object data
     // eslint-disable-next-line no-undef
     this.deviceData = structuredClone(deviceData);
 
@@ -149,7 +150,10 @@ export default class HomeKitDevice {
       this.deviceData.model === '' ||
       typeof this.deviceData?.manufacturer !== 'string' ||
       this.deviceData.manufacturer === '' ||
-      (this.#platform === undefined && typeof this.deviceData?.hkPairingCode !== 'string' && this.deviceData.hkPairingCode === '') ||
+      (this.#platform === undefined &&
+        typeof this.deviceData?.hkPairingCode !== 'string' &&
+        (new RegExp(/^([0-9]{3}-[0-9]{2}-[0-9]{3})$/).test(this.deviceData.hkPairingCode) === true ||
+          new RegExp(/^([0-9]{4}-[0-9]{4})$/).test(this.deviceData.hkPairingCode) === true)) ||
       (this.#platform === undefined &&
         typeof this.deviceData?.hkUsername !== 'string' &&
         new RegExp(/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/).test(this.deviceData.hkUsername) === false)

src/camera.js

@@ -99,7 +99,7 @@ export default class NestCamera extends HomeKitDevice {
             (value === true && this.deviceData.statusled_brightness !== 0) ||
             (value === false && this.deviceData.statusled_brightness !== 1)
           ) {
-            this.set({ 'statusled.brightness': value === true ? 0 : 1 });
+            this.set({ statusled_brightness: value === true ? 0 : 1 });
             if (this?.log?.info) {
               this.log.info('Recording status LED on "%s" was turned', this.deviceData.description, value === true ? 'on' : 'off');
             }
@@ -119,7 +119,7 @@ export default class NestCamera extends HomeKitDevice {
         this.operatingModeService.getCharacteristic(this.hap.Characteristic.NightVision).onSet((value) => {
           // only change IRLed status value if different than on-device
           if ((value === false && this.deviceData.irled_enabled === true) || (value === true && this.deviceData.irled_enabled === false)) {
-            this.set({ 'irled.state': value === true ? 'auto_on' : 'always_off' });
+            this.set({ irled_enabled: value === true ? 'auto_on' : 'always_off' });
 
             if (this?.log?.info) {
               this.log.info('Night vision on "%s" was turned', this.deviceData.description, value === true ? 'on' : 'off');
@@ -144,7 +144,7 @@ export default class NestCamera extends HomeKitDevice {
             (this.deviceData.streaming_enabled === true && value === true)
           ) {
             // Camera state does not reflect requested state, so fix
-            this.set({ 'streaming.enabled': value === false ? true : false });
+            this.set({ streaming_enabled: value === false ? true : false });
             if (this?.log?.info) {
               this.log.info('Camera on "%s" was turned', this.deviceData.description, value === false ? 'on' : 'off');
             }
@@ -178,7 +178,7 @@ export default class NestCamera extends HomeKitDevice {
               (this.deviceData.audio_enabled === true && value === this.hap.Characteristic.RecordingAudioActive.DISABLE) ||
               (this.deviceData.audio_enabled === false && value === this.hap.Characteristic.RecordingAudioActive.ENABLE)
             ) {
-              this.set({ 'audio.enabled': value === this.hap.Characteristic.RecordingAudioActive.ENABLE ? true : false });
+              this.set({ audio_enabled: value === this.hap.Characteristic.RecordingAudioActive.ENABLE ? true : false });
               if (this?.log?.info) {
                 this.log.info(
                   'Audio recording on "%s" was turned',

src/doorbell.js

@@ -1,7 +1,7 @@
 // Nest Doorbell(s)
 // Part of homebridge-nest-accfactory
 //
-// Code version 8/9/2024
+// Code version 12/9/2024
 // Mark Hulskamp
 'use strict';
 
@@ -41,7 +41,7 @@ export default class NestDoorbell extends NestCamera {
       this.switchService.getCharacteristic(this.hap.Characteristic.On).onSet((value) => {
         if (value !== this.deviceData.indoor_chime_enabled) {
           // only change indoor chime status value if different than on-device
-          this.set({ 'doorbell.indoor_chime.enabled': value });
+          this.set({ indoor_chime_enabled: value });
 
           this?.log?.info && this.log.info('Indoor chime on "%s" was turned', this.deviceData.description, value === true ? 'on' : 'off');
         }

src/protect.js

@@ -1,7 +1,7 @@
 // Nest Protect
 // Part of homebridge-nest-accfactory
 //
-// Code version 9/8/2024
+// Code version 12/9/2024
 // Mark Hulskamp
 'use strict';
 
@@ -80,7 +80,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,
+        EveSmoke_statusled: this.deviceData.ntp_green_led_enable,
         EveSmoke_smoketestpassed: this.deviceData.smoke_test_passed,
         EveSmoke_heattestpassed: this.deviceData.heat_test_passed,
       });
@@ -202,7 +202,7 @@ export default class NestProtect extends HomeKitDevice {
       this.deviceData.latest_alarm_test = deviceData.latest_alarm_test;
       this.deviceData.self_test_in_progress = deviceData.self_test_in_progress;
       this.deviceData.heat_status = deviceData.heat_status;
-      this.deviceData.ntp_green_led = deviceData.ntp_green_led;
+      this.deviceData.ntp_green_led_enable = deviceData.ntp_green_led_enable;
       this.deviceData.smoke_test_passed = deviceData.smoke_test_passed;
       this.deviceData.heat_test_passed = deviceData.heat_test_passed;
       this.historyService.updateEveHome(this.smokeService, this.#EveHomeGetcommand.bind(this));
@@ -216,7 +216,7 @@ export default class NestProtect extends HomeKitDevice {
       EveHomeGetData.lastalarmtest = this.deviceData.latest_alarm_test;
       EveHomeGetData.alarmtest = this.deviceData.self_test_in_progress;
       EveHomeGetData.heatstatus = this.deviceData.heat_status;
-      EveHomeGetData.statusled = this.deviceData.ntp_green_led;
+      EveHomeGetData.statusled = this.deviceData.ntp_green_led_enable;
       EveHomeGetData.smoketestpassed = this.deviceData.smoke_test_passed;
       EveHomeGetData.heattestpassed = this.deviceData.heat_test_passed;
       EveHomeGetData.hushedstate = this.deviceData.hushed_state;
@@ -233,7 +233,6 @@ export default class NestProtect extends HomeKitDevice {
       //this.log.info('Eve Smoke Alarm test', (EveHomeSetData.alarmtest === true ? 'start' : 'stop'));
     }
     if (typeof EveHomeSetData?.statusled === 'boolean') {
-      this.deviceData.ntp_green_led = EveHomeSetData.statusled; // Do quick status update as setting Nest values does take sometime
       this.set({ ntp_green_led_enable: EveHomeSetData.statusled });
     }
   }

src/protobuf/google/trait/product/camera.proto

@@ -50,4 +50,5 @@ message FloodlightSettingsTrait {
     OnOffTrigger liveViewingTrigger = 4;
     DaylightSensitivity daylightSensitivity = 5;
     OnOffTrigger cameraEventTrigger = 6;
+    uin32 lightState = 7;
 }

src/protobuf/nestlabs/gateway/v1.proto

@@ -260,12 +260,7 @@ message SendCommandResponse {
 }
 
 message BatchUpdateStateRequest {
-    message TraitObject {
-        nestlabs.gateway.v2.TraitId traitId = 1;
-        google.protobuf.Any property = 2;
-    }
-
-    repeated TraitObject batchUpdateStateRequest = 1;
+    repeated TraitUpdateStateRequest batchUpdateStateRequest = 1;
 }
 
 message BatchUpdateStateResponse {

src/protobuf/root.proto

@@ -23,6 +23,7 @@ import "nest/trait/service.proto";
 import "nest/trait/structure.proto";
 import "nest/trait/ui.proto";
 import "weave/common.proto";
+import "weave/trait/actuator.proto";
 import "weave/trait/audio.proto";
 import "weave/trait/description.proto";
 import "weave/trait/heartbeat.proto";

src/protobuf/weave/trait/actuator.proto

@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+import "google/protobuf/wrappers.proto";
+
+package weave.trait.actuator;
+
+message OnOffTrait {
+    message SetStateRequest {
+        bool on = 1;
+    }
+
+    bool on = 1;
+}