homebridge-nest-accfactory 0.2.11 → 0.3.0

package/dist/{doorbell.js → plugins/doorbell.js}

@@ -1,7 +1,6 @@
 // Nest Doorbell(s)
 // Part of homebridge-nest-accfactory
 //
-// Code version 2025/03/19
 // Mark Hulskamp
 'use strict';
 
@@ -12,6 +11,9 @@ import { setTimeout, clearTimeout } from 'node:timers';
 import NestCamera from './camera.js';
 
 export default class NestDoorbell extends NestCamera {
+  static TYPE = 'Doorbell';
+  static VERSION = '2025.06.11';
+
   doorbellTimer = undefined; // Cooldown timer for doorbell events
   switchService = undefined; // HomeKit switch for enabling/disabling chime
 
@@ -20,47 +22,47 @@ export default class NestDoorbell extends NestCamera {
   }
 
   // Class functions
-  addServices() {
+  setupDevice() {
     // Call parent to setup the common camera things. Once we return, we can add in the specifics for our doorbell
     // We pass in the HAP Doorbell controller constructor function here also
-    let postSetupDetails = super.addServices(this.hap.DoorbellController);
+    super.setupDevice(this.hap.DoorbellController);
 
-    this.switchService = this.accessory.getService(this.hap.Service.Switch);
-    if (this.deviceData.has_indoor_chime === true && this.deviceData.chimeSwitch === true) {
+    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
-      if (this.switchService === undefined) {
-        this.switchService = this.accessory.addService(this.hap.Service.Switch, '', 1);
-      }
+      this.switchService = this.addHKService(this.hap.Service.Switch, '', 1);
 
       // Setup set callback for this switch service
-      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({ uuid: this.deviceData.nest_google_uuid, indoor_chime_enabled: value });
-
-          this?.log?.info && this.log.info('Indoor chime on "%s" was turned', this.deviceData.description, value === true ? 'on' : 'off');
-        }
-      });
-
-      this.switchService.getCharacteristic(this.hap.Characteristic.On).onGet(() => {
-        return this.deviceData.indoor_chime_enabled === true;
+      this.addHKCharacteristic(this.switchService, 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({ 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');
+          }
+        },
+        onGet: () => {
+          return this.deviceData.indoor_chime_enabled === true;
+        },
       });
     }
-    if (this.switchService !== undefined && (this.deviceData.has_indoor_chime === false || this.deviceData.chimeSwitch === false)) {
+    if (this.deviceData?.has_indoor_chime === false || this.deviceData?.chimeSwitch === false) {
       // No longer required to have the switch service
       // This is to handle Homebridge cached restored accessories and if configuration options have changed
-      this.accessory.removeService(this.switchService);
+      this.switchService = this.accessory.getService(this.hap.Service.Switch);
+      if (this.switchService !== undefined) {
+        this.accessory.removeService(this.switchService);
+      }
       this.switchService = undefined;
     }
 
-    // Create extra details for output
-    this.switchService !== undefined && postSetupDetails.push('Chime switch');
-    return postSetupDetails;
+    // Extra setup details for output
+    this.switchService !== undefined && this.postSetupDetail('Chime switch');
   }
 
-  removeServices() {
-    super.removeServices();
+  removeDevice() {
+    super.removeDevice();
 
     clearTimeout(this.doorbellTimer);
     this.doorbellTimer = undefined;
@@ -71,13 +73,13 @@ export default class NestDoorbell extends NestCamera {
     this.switchService = undefined;
   }
 
-  updateServices(deviceData) {
+  updateDevice(deviceData) {
     if (typeof deviceData !== 'object' || this.controller === undefined) {
       return;
     }
 
     // Get the camera class todo all its updates first, then we'll handle the doorbell specific stuff
-    super.updateServices(deviceData);
+    super.updateDevice(deviceData);
 
     if (this.switchService !== undefined) {
       // Update status of indoor chime enable/disable switch
@@ -95,11 +97,11 @@ export default class NestDoorbell extends NestCamera {
 
         if (deviceData.indoor_chime_enabled === false || deviceData.quiet_time_enabled === true) {
           // Indoor chime is disabled or quiet time is enabled, so we won't 'ring' the doorbell
-          this?.log?.warn && this.log.warn('Doorbell rung at "%s" but indoor chime is silenced', deviceData.description);
+          this?.log?.warn?.('Doorbell rung at "%s" but indoor chime is silenced', deviceData.description);
         }
         if (deviceData.indoor_chime_enabled === true && deviceData.quiet_time_enabled === false) {
           // Indoor chime is enabled and quiet time isn't enabled, so 'ring' the doorbell
-          this?.log?.info && this.log.info('Doorbell rung at "%s"', deviceData.description);
+          this?.log?.info?.('Doorbell rung at "%s"', deviceData.description);
           this.controller.ringDoorbell();
         }
 

package/dist/plugins/floodlight.js

@@ -0,0 +1,91 @@
+// Nest Cam with Floodlight
+// Part of homebridge-nest-accfactory
+//
+// Mark Hulskamp
+'use strict';
+
+// Define external module requirements
+import NestCamera from './camera.js';
+
+export default class NestFloodlight extends NestCamera {
+  static TYPE = 'FloodlightCamera';
+  static VERSION = '2025.06.11';
+
+  lightService = undefined; // HomeKit light
+
+  constructor(accessory, api, log, eventEmitter, deviceData) {
+    super(accessory, api, log, eventEmitter, deviceData);
+  }
+
+  // Class functions
+  setupDevice() {
+    // Call parent to setup the common camera things. Once we return, we can add in the specifics for our floodlight
+    super.setupDevice();
+
+    if (this.deviceData.has_light === true) {
+      // Add service to 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
+        onSet: (value) => {
+          if (value !== this.deviceData.light_brightness) {
+            this.set({ uuid: this.deviceData.nest_google_uuid, light_brightness: value });
+
+            this?.log?.info?.('Floodlight brightness on "%s" was set to "%s %"', this.deviceData.description, value);
+          }
+        },
+        onGet: () => {
+          return this.deviceData.light_brightness;
+        },
+      });
+
+      this.addHKCharacteristic(this.lightService, this.hap.Characteristic.On, {
+        onSet: (value) => {
+          if (value !== this.deviceData.light_enabled) {
+            this.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');
+          }
+        },
+        onGet: () => {
+          return this.deviceData.light_enabled === true;
+        },
+      });
+    }
+    if (this.deviceData.has_light !== true) {
+      // No longer required to have the light service
+      this.lightService = this.accessory.getService(this.hap.Service.Lightbulb);
+      if (this.lightService !== undefined) {
+        this.accessory.removeService(this.lightService);
+      }
+      this.lightService === undefined;
+    }
+
+    // Extra setup details for output
+    this.lightService !== undefined && this.postSetupDetails('Light support');
+  }
+
+  removeDevice() {
+    super.removeDevice();
+
+    if (this.lightService !== undefined) {
+      this.accessory.removeService(this.lightService);
+    }
+    this.lightService = undefined;
+  }
+
+  updateDevice(deviceData) {
+    if (typeof deviceData !== 'object' || this.controller === undefined) {
+      return;
+    }
+
+    // Get the camera class todo all its updates first, then we'll handle the doorbell specific stuff
+    super.updateDevice(deviceData);
+
+    if (this.lightService !== undefined) {
+      // Update status of light, including brightness
+      this.lightService.updateCharacteristic(this.hap.Characteristic.On, deviceData.light_enabled);
+      this.lightService.updateCharacteristic(this.hap.Characteristic.Brightness, deviceData.light_brightness);
+    }
+  }
+}

package/dist/plugins/heatlink.js

@@ -0,0 +1,17 @@
+// Nest Heatlink
+// Part of homebridge-nest-accfactory
+//
+// Mark Hulskamp
+'use strict';
+
+// Define our modules
+import NestTemperatureSensor from './tempsensor.js';
+
+export default class NestHeatlink extends NestTemperatureSensor {
+  static TYPE = 'Heatlink';
+  static VERSION = '2025.06.11';
+
+  constructor(accessory, api, log, eventEmitter, deviceData) {
+    super(accessory, api, log, eventEmitter, deviceData);
+  }
+}

package/dist/{protect.js → plugins/protect.js}

@@ -1,16 +1,18 @@
 // Nest Protect
 // Part of homebridge-nest-accfactory
 //
-// Code version 2025/01/17
 // Mark Hulskamp
 'use strict';
 
 // Define our modules
-import HomeKitDevice from './HomeKitDevice.js';
+import HomeKitDevice from '../HomeKitDevice.js';
 
 const LOWBATTERYLEVEL = 10; // Low battery level percentage
 
 export default class NestProtect extends HomeKitDevice {
+  static TYPE = 'Protect';
+  static VERSION = '2025.06.11';
+
   batteryService = undefined;
   smokeService = undefined;
   motionService = undefined;
@@ -21,43 +23,25 @@ export default class NestProtect extends HomeKitDevice {
   }
 
   // Class functions
-  addServices() {
-    // Create extra details for output
-    let postSetupDetails = [];
-
+  setupDevice() {
     // Setup the smoke sensor service if not already present on the accessory
-    this.smokeService = this.accessory.getService(this.hap.Service.SmokeSensor);
-    if (this.smokeService === undefined) {
-      this.smokeService = this.accessory.addService(this.hap.Service.SmokeSensor, '', 1);
-    }
-    if (this.smokeService.testCharacteristic(this.hap.Characteristic.StatusActive) === false) {
-      this.smokeService.addCharacteristic(this.hap.Characteristic.StatusActive);
-    }
-    if (this.smokeService.testCharacteristic(this.hap.Characteristic.StatusFault) === false) {
-      this.smokeService.addCharacteristic(this.hap.Characteristic.StatusFault);
-    }
+    this.smokeService = this.addHKService(this.hap.Service.SmokeSensor, '', 1);
     this.smokeService.setPrimaryService();
 
+    this.addHKCharacteristic(this.smokeService, this.hap.Characteristic.StatusActive);
+    this.addHKCharacteristic(this.smokeService, this.hap.Characteristic.StatusFault);
+
     // Setup the carbon monoxide service if not already present on the accessory
-    this.carbonMonoxideService = this.accessory.getService(this.hap.Service.CarbonMonoxideSensor);
-    if (this.carbonMonoxideService === undefined) {
-      this.carbonMonoxideService = this.accessory.addService(this.hap.Service.CarbonMonoxideSensor, '', 1);
-    }
+    this.carbonMonoxideService = this.addHKService(this.hap.Service.CarbonMonoxideSensor, '', 1);
 
     // Setup battery service if not already present on the accessory
-    this.batteryService = this.accessory.getService(this.hap.Service.Battery);
-    if (this.batteryService === undefined) {
-      this.batteryService = this.accessory.addService(this.hap.Service.Battery, '', 1);
-    }
+    this.batteryService = this.addHKService(this.hap.Service.Battery, '', 1);
     this.batteryService.setHiddenService(true);
 
     // Setup motion service if not already present on the accessory and Nest protect is a wired version
-    if (typeof this.deviceData?.wired_or_battery === 'number' && this.deviceData?.wired_or_battery === 0) {
-      this.motionService = this.accessory.getService(this.hap.Service.MotionSensor);
-      if (this.motionService === undefined) {
-        this.motionService = this.accessory.addService(this.hap.Service.MotionSensor, '', 1);
-      }
-      postSetupDetails.push('With motion sensor');
+    if (this.deviceData?.wired_or_battery === 0) {
+      this.motionService = this.addHKService(this.hap.Service.MotionSensor, '', 1);
+      this.postSetupDetail('With motion sensor');
     }
 
     // Setup linkage to EveHome app if configured todo so
@@ -79,11 +63,9 @@ export default class NestProtect extends HomeKitDevice {
         EveSmoke_heattestpassed: this.deviceData.heat_test_passed,
       });
     }
-
-    return postSetupDetails;
   }
 
-  updateServices(deviceData) {
+  updateDevice(deviceData) {
     if (
       typeof deviceData !== 'object' ||
       this.smokeService === undefined ||
@@ -101,6 +83,7 @@ export default class NestProtect extends HomeKitDevice {
         ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL
         : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW,
     );
+    this.batteryService.updateCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
 
     // Update smoke details
     // If protect isn't online, replacement date past, report in HomeKit
@@ -124,11 +107,11 @@ export default class NestProtect extends HomeKitDevice {
     );
 
     if (deviceData.smoke_status === true && this.deviceData.smoke_status === false) {
-      this?.log?.warn && this.log.warn('Smoke detected in "%s"', deviceData.description);
+      this?.log?.warn?.('Smoke detected in "%s"', deviceData.description);
     }
 
     if (deviceData.smoke_status === false && this.deviceData.smoke_status === true) {
-      this?.log?.info && this.log.info('Smoke is nolonger detected in "%s"', deviceData.description);
+      this?.log?.info?.('Smoke is nolonger detected in "%s"', deviceData.description);
     }
 
     // Update carbon monoxide details
@@ -140,20 +123,20 @@ export default class NestProtect extends HomeKitDevice {
     );
 
     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);
+      this?.log?.warn?.('Abnormal carbon monoxide levels detected in "%s"', deviceData.description);
     }
 
     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);
+      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);
+      this?.log?.warn?.('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);
+      this?.log?.info?.('Smoke and Carbon monoxide sensor testing completed in "%s"', deviceData.description);
     }
 
     // Update motion service if present
@@ -161,7 +144,7 @@ export default class NestProtect extends HomeKitDevice {
       this.motionService.updateCharacteristic(this.hap.Characteristic.MotionDetected, deviceData.detected_motion === true);
 
       if (deviceData.detected_motion === true && this.deviceData.detected_motion === false) {
-        this?.log?.info && this.log.info('Motion detected in "%s"', deviceData.description);
+        this?.log?.info?.('Motion detected in "%s"', deviceData.description);
       }
 
       // Log motion to history only if changed to previous recording
@@ -211,7 +194,7 @@ export default class NestProtect extends HomeKitDevice {
     }
 
     if (typeof EveHomeSetData?.alarmtest === 'boolean') {
-      //this.log.info('Eve Smoke Alarm test', (EveHomeSetData.alarmtest === true ? 'start' : 'stop'));
+      //this?.log?.info?.('Eve Smoke Alarm test', (EveHomeSetData.alarmtest === true ? 'start' : 'stop'));
     }
     if (typeof EveHomeSetData?.statusled === 'boolean') {
       this.set({ uuid: this.deviceData.nest_google_uuid, ntp_green_led_enable: EveHomeSetData.statusled });

package/dist/{tempsensor.js → plugins/tempsensor.js}

@@ -1,16 +1,18 @@
 // Nest Temperature Sensor
 // Part of homebridge-nest-accfactory
 //
-// Code version 27/8/2024
 // Mark Hulskamp
 'use strict';
 
 // Define our modules
-import HomeKitDevice from './HomeKitDevice.js';
+import HomeKitDevice from '../HomeKitDevice.js';
 
 const LOWBATTERYLEVEL = 10; // Low battery level percentage
 
 export default class NestTemperatureSensor extends HomeKitDevice {
+  static TYPE = 'TemperatureSensor';
+  static VERSION = '2025.06.11';
+
   batteryService = undefined;
   temperatureService = undefined;
 
@@ -19,19 +21,13 @@ export default class NestTemperatureSensor extends HomeKitDevice {
   }
 
   // Class functions
-  addServices() {
-    // Setup the temperature service if not already present on the accessory
-    this.temperatureService = this.accessory.getService(this.hap.Service.TemperatureSensor);
-    if (this.temperatureService === undefined) {
-      this.temperatureService = this.accessory.addService(this.hap.Service.TemperatureSensor, '', 1);
-    }
+  setupDevice() {
+    // Setup temperature service if not already present on the accessory
+    this.temperatureService = this.addHKService(this.hap.Service.TemperatureSensor, '', 1);
     this.temperatureService.setPrimaryService();
 
-    // Setup the battery service if not already present on the accessory
-    this.batteryService = this.accessory.getService(this.hap.Service.Battery);
-    if (this.batteryService === undefined) {
-      this.batteryService = this.accessory.addService(this.hap.Service.Battery, '', 1);
-    }
+    // Setup battery service if not already present on the accessory
+    this.batteryService = this.addHKService(this.hap.Service.Battery, '', 1);
     this.batteryService.setHiddenService(true);
 
     // Setup linkage to EveHome app if configured todo so
@@ -46,7 +42,7 @@ export default class NestTemperatureSensor extends HomeKitDevice {
     }
   }
 
-  updateServices(deviceData) {
+  updateDevice(deviceData) {
     if (typeof deviceData !== 'object' || this.temperatureService === undefined || this.batteryService === undefined) {
       return;
     }
@@ -57,10 +53,10 @@ export default class NestTemperatureSensor extends HomeKitDevice {
       deviceData.online === true ? this.hap.Characteristic.StatusFault.NO_FAULT : this.hap.Characteristic.StatusFault.GENERAL_FAULT,
     );
 
-    this.temperatureService.updateCharacteristic(this.hap.Characteristic.StatusActive, deviceData.online);
+    this.temperatureService.updateCharacteristic(this.hap.Characteristic.StatusActive, deviceData.online === true);
     if (typeof deviceData?.associated_thermostat === 'string' && deviceData.associated_thermostat !== '') {
-      // This tempature sensor is assocated with a theromstat
-      // Update sttaus if providing active temperature for the thermostats
+      // This temperature sensor is assocated with a thermostat
+      // Update status if providing active temperature for the thermostats
       this.temperatureService.updateCharacteristic(
         this.hap.Characteristic.StatusActive,
         deviceData.online === true && deviceData?.active_sensor === true,