@switchbot/homebridge-switchbot 3.5.0-beta.57 → 3.5.0-beta.59

package/src/device/lock.ts

@@ -1,31 +1,37 @@
 import { request } from 'undici';
 import { deviceBase } from './device.js';
 import { interval, Subject } from 'rxjs';
-import { SwitchBotPlatform } from '../platform.js';
+import { Devices } from '../settings.js';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, deviceStatus, Devices, serviceData } from '../settings.js';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import type { device, devicesConfig, deviceStatus, serviceData } from '../settings.js';
 
 export class Lock extends deviceBase {
   // Services
   private LockMechanism: {
+    Name: CharacteristicValue;
     Service: Service;
     LockTargetState: CharacteristicValue;
     LockCurrentState: CharacteristicValue;
   };
 
   private Battery: {
+    Name: CharacteristicValue;
     Service: Service;
     BatteryLevel: CharacteristicValue;
     StatusLowBattery: CharacteristicValue;
   };
 
   private ContactSensor?: {
+    Name: CharacteristicValue;
     Service: Service;
     ContactSensorState: CharacteristicValue;
   };
 
   private Switch?: {
+    Name: CharacteristicValue;
     Service: Service;
     On: CharacteristicValue;
   };
@@ -44,91 +50,96 @@ export class Lock extends deviceBase {
     this.doLockUpdate = new Subject();
     this.lockUpdateInProgress = false;
 
-    // Initialize LockMechanism property
+    // Initialize LockMechanism Service
     this.LockMechanism = {
-      Service: accessory.getService(this.hap.Service.LockMechanism) as Service,
-      LockTargetState: accessory.context.LockTargetState || this.hap.Characteristic.LockTargetState.SECURED,
-      LockCurrentState: accessory.context.LockCurrentState || this.hap.Characteristic.LockCurrentState.SECURED,
+      Name: accessory.context.LockMechanism.Name ?? accessory.displayName,
+      Service: accessory.getService(this.hap.Service.LockMechanism) ?? accessory.addService(this.hap.Service.LockMechanism) as Service,
+      LockTargetState: accessory.context.LockTargetState ?? this.hap.Characteristic.LockTargetState.SECURED,
+      LockCurrentState: accessory.context.LockCurrentState ?? this.hap.Characteristic.LockCurrentState.SECURED,
     };
 
+    // Initialize LockMechanism Characteristics
+    this.LockMechanism.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.LockMechanism.Name)
+      .getCharacteristic(this.hap.Characteristic.LockTargetState)
+      .onGet(() => {
+        return this.LockMechanism.LockTargetState;
+      })
+      .onSet(this.LockTargetStateSet.bind(this));
+    accessory.context.LockMechanism.Name = this.LockMechanism.Name;
+
     // Initialize Battery property
     this.Battery = {
-      Service: accessory.getService(this.hap.Service.Battery) as Service,
-      BatteryLevel: accessory.context.BatteryLevel || 100,
-      StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
+      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+      Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
+      BatteryLevel: accessory.context.BatteryLevel ?? 100,
+      StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
 
-    // Initialize ContactSensor property
-    if (!this.device.lock?.hide_contactsensor) {
+    // Initialize Battery Characteristics
+    this.Battery.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
+      .setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE)
+      .getCharacteristic(this.hap.Characteristic.BatteryLevel)
+      .onGet(() => {
+        return this.Battery.BatteryLevel;
+      });
+
+    this.Battery.Service
+      .getCharacteristic(this.hap.Characteristic.StatusLowBattery)
+      .onGet(() => {
+        return this.Battery.StatusLowBattery;
+      });
+    accessory.context.Battery.Name = this.Battery.Name;
+
+    // Contact Sensor Service
+    if (device.lock?.hide_contactsensor) {
+      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Contact Sensor Service`);
+      this.ContactSensor!.Service = this.accessory.getService(this.hap.Service.ContactSensor) as Service;
+      accessory.removeService(this.ContactSensor!.Service);
+    } else {
       this.ContactSensor = {
-        Service: accessory.getService(this.hap.Service.ContactSensor) as Service,
-        ContactSensorState: accessory.context.ContactSensorState || this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED,
+        Name: accessory.context.ContactSensor.Name ?? `${accessory.displayName} Contact Sensor`,
+        Service: accessory.getService(this.hap.Service.ContactSensor) ?? this.accessory.addService(this.hap.Service.ContactSensor) as Service,
+        ContactSensorState: accessory.context.ContactSensorState ?? this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED,
       };
-    }
 
-    // Initialize Latch Button Service
-    if (device.lock?.activate_latchbutton) {
-      this.Switch = {
-        Service: accessory.getService(this.hap.Service.Switch) as Service,
-        On: accessory.context.On || false,
-      };
+      // Initialize Contact Sensor Characteristics
+      this.ContactSensor.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.ContactSensor.Name)
+        .setCharacteristic(this.hap.Characteristic.StatusActive, true)
+        .getCharacteristic(this.hap.Characteristic.ContactSensorState)
+        .onGet(() => {
+          return this.ContactSensor!.ContactSensorState;
+        });
+      accessory.context.ContactSensor.Name = this.ContactSensor.Name;
     }
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
-    // get the LockMechanism service if it exists, otherwise create a new LockMechanism service
-    // you can create multiple services for each accessory
-    const LockMechanismService = `${accessory.displayName} ${device.deviceType}`;
-    (this.LockMechanism.Service = accessory.getService(this.hap.Service.LockMechanism)
-      || accessory.addService(this.hap.Service.LockMechanism)), LockMechanismService;
-
-    this.LockMechanism.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-
-    this.LockMechanism.Service.getCharacteristic(this.hap.Characteristic.LockTargetState).onSet(this.LockTargetStateSet.bind(this));
-
-    // Latch Button Service
+    // Initialize Latch Button Service
     if (device.lock?.activate_latchbutton === false) { // remove the service when this variable is false
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Latch Button Service`);
       this.Switch!.Service = accessory.getService(this.hap.Service.Switch) as Service;
       accessory.removeService(this.Switch!.Service);
-    } else if (!this.Switch!.Service && device.lock?.activate_latchbutton === true) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Adding Latch Button Service`);
-      const latchServiceName = `${accessory.displayName} Latch`;
-      this.Switch!.Service = accessory.getService(this.hap.Service.Switch)
-        || accessory.addService(this.hap.Service.Switch, latchServiceName, 'Switch.ServiceIdentifier');
-
-      this.Switch!.Service.setCharacteristic(this.hap.Characteristic.Name, latchServiceName);
-
-      this.Switch!.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
     } else {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Latch Button Service Not Added`);
-    }
-
-
-    // Contact Sensor Service
-    if (device.lock?.hide_contactsensor) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Contact Sensor Service`);
-      this.ContactSensor!.Service = this.accessory.getService(this.hap.Service.ContactSensor) as Service;
-      accessory.removeService(this.ContactSensor!.Service);
-    } else if (!this.ContactSensor?.Service) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Contact Sensor Service`);
-      const ContactSensorService = `${accessory.displayName} Contact Sensor`;
-      (this.ContactSensor!.Service = this.accessory.getService(this.hap.Service.ContactSensor)
-        || this.accessory.addService(this.hap.Service.ContactSensor)), ContactSensorService;
+      this.Switch = {
+        Name: accessory.context.Switch.Name ?? `${accessory.displayName} Latch`,
+        Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch) as Service,
+        On: accessory.context.On ?? false,
+      };
 
-      this.ContactSensor!.Service.setCharacteristic(this.hap.Characteristic.Name, ContactSensorService);
-    } else {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Contact Sensor Service Not Added`);
+      // Initialize Latch Button Characteristics
+      this.Switch.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.Switch.Name)
+        .getCharacteristic(this.hap.Characteristic.On)
+        .onGet(() => {
+          return this.Switch!.On;
+        })
+        .onSet(this.OnSet.bind(this));
+      accessory.context.Switch.Name = this.Switch.Name;
     }
 
-    // Battery Service
-    const BatteryService = `${accessory.displayName} Battery`;
-    (this.Battery.Service = this.accessory.getService(this.hap.Service.Battery)
-      || accessory.addService(this.hap.Service.Battery)), BatteryService;
-
-    this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, BatteryService);
-    this.Battery.Service.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
 
     // Update Homekit
     this.updateHomeKitCharacteristics();

package/src/device/meter.ts

@@ -2,27 +2,33 @@
  *
  * meter.ts: @switchbot/homebridge-switchbot.
  */
+import { Units } from 'homebridge';
+import { Devices } from '../settings.js';
 import { deviceBase } from './device.js';
-import { SwitchBotPlatform } from '../platform.js';
 import { convertUnits } from '../utils.js';
 import { Subject, interval, skipWhile } from 'rxjs';
-import { CharacteristicValue, PlatformAccessory, Service, Units } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { CharacteristicValue, PlatformAccessory, Service} from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus} from '../settings.js';
 
 export class Meter extends deviceBase {
   // Services
-  private Battery!: {
+  private Battery: {
+    Name: CharacteristicValue;
     Service: Service;
     BatteryLevel: CharacteristicValue;
     StatusLowBattery: CharacteristicValue;
   };
 
   private HumiditySensor?: {
+    Name: CharacteristicValue;
     Service: Service;
     CurrentRelativeHumidity: CharacteristicValue;
   };
 
   private TemperatureSensor?: {
+    Name: CharacteristicValue;
     Service: Service;
     CurrentTemperature: CharacteristicValue;
   };
@@ -41,45 +47,45 @@ export class Meter extends deviceBase {
     this.doMeterUpdate = new Subject();
     this.meterUpdateInProgress = false;
 
-    // Initialize Temperature Sensor property
-    if (!device.meter?.hide_temperature) {
-      this.TemperatureSensor = {
-        Service: accessory.getService(this.hap.Service.TemperatureSensor) as Service,
-        CurrentTemperature: accessory.context.CurrentTemperature || 30,
-      };
-    }
-
-    // Initialize Humidity Sensor property
-    if (!device.meter?.hide_humidity) {
-      this.HumiditySensor = {
-        Service: accessory.getService(this.hap.Service.HumiditySensor) as Service,
-        CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
-      };
-    }
-
-    // Initialize Battery property
+    // Initialize Battery Service
     this.Battery = {
-      Service: accessory.getService(this.hap.Service.Battery) as Service,
-      BatteryLevel: accessory.context.BatteryLevel || 100,
-      StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
+      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+      Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
+      BatteryLevel: accessory.context.BatteryLevel ?? 100,
+      StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
+    // Initialize Battery Characteristics
+    this.Battery.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
+      .setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE)
+      .getCharacteristic(this.hap.Characteristic.BatteryLevel)
+      .onGet(() => {
+        return this.Battery.BatteryLevel;
+      });
+
+    this.Battery.Service
+      .getCharacteristic(this.hap.Characteristic.StatusLowBattery)
+      .onGet(() => {
+        return this.Battery.StatusLowBattery;
+      });
+    accessory.context.Battery.Name = this.Battery.Name;
 
-    // Temperature Sensor Service
+    // Initialize Temperature Sensor Service
     if (device.meter?.hide_temperature) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
       this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
       accessory.removeService(this.TemperatureSensor!.Service);
-    } else if (!this.TemperatureSensor?.Service) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
-      const TemperatureSensorService = `${accessory.displayName} Temperature Sensor`;
-      (this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor)
-        || this.accessory.addService(this.hap.Service.TemperatureSensor)), TemperatureSensorService;
-
-      this.TemperatureSensor!.Service.setCharacteristic(this.hap.Characteristic.Name, TemperatureSensorService);
-      this.TemperatureSensor!.Service
+    } else {
+      this.TemperatureSensor = {
+        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? this.accessory.addService(this.hap.Service.TemperatureSensor) as Service,
+        CurrentTemperature: accessory.context.CurrentTemperature ?? 30,
+      };
+
+      // Initialize Temperature Sensor Characteristics
+      this.TemperatureSensor.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.TemperatureSensor.Name)
         .getCharacteristic(this.hap.Characteristic.CurrentTemperature)
         .setProps({
           unit: Units['CELSIUS'],
@@ -91,23 +97,23 @@ export class Meter extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature!;
         });
-    } else {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Temperature Sensor Service Not Added`);
+      accessory.context.TemperatureSensor.Name = this.TemperatureSensor.Name;
     }
-
-    // Humidity Sensor Service
+    // Initialize Humidity Sensor Service
     if (device.meter?.hide_humidity) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
       this.HumiditySensor!.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
       accessory.removeService(this.HumiditySensor!.Service);
-    } else if (!this.HumiditySensor?.Service) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Humidity Sensor Service`);
-      const HumiditySensorService = `${accessory.displayName} Humidity Sensor`;
-      (this.HumiditySensor!.Service = this.accessory.getService(this.hap.Service.HumiditySensor)
-        || this.accessory.addService(this.hap.Service.HumiditySensor)), HumiditySensorService;
+    } else {
+      this.HumiditySensor = {
+        Name: accessory.context.HumiditySensor.Name ?? `${accessory.displayName} Humidity Sensor`,
+        Service: accessory.getService(this.hap.Service.HumiditySensor) ?? this.accessory.addService(this.hap.Service.HumiditySensor) as Service,
+        CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity ?? 50,
+      };
 
-      this.HumiditySensor!.Service.setCharacteristic(this.hap.Characteristic.Name, HumiditySensorService);
+      // Initialize Humidity Sensor Characteristics
       this.HumiditySensor!.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.HumiditySensor.Name)
         .getCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity)
         .setProps({
           minStep: 0.1,
@@ -115,17 +121,11 @@ export class Meter extends deviceBase {
         .onGet(() => {
           return this.HumiditySensor!.CurrentRelativeHumidity!;
         });
-    } else {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Humidity Sensor Service Not Added`);
+      accessory.context.HumiditySensor.Name = this.HumiditySensor.Name;
     }
 
-    // Battery Service
-    const BatteryService = `${accessory.displayName} Battery`;
-    (this.Battery.Service = this.accessory.getService(this.hap.Service.Battery)
-      || accessory.addService(this.hap.Service.Battery)), BatteryService;
-
-    this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, BatteryService);
-    this.Battery.Service.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
 
     // Retrieve initial values and update Homekit
     this.updateHomeKitCharacteristics();

package/src/device/meterplus.ts

@@ -2,11 +2,14 @@
  *
  * meterplus.ts: @switchbot/homebridge-switchbot.
  */
+import { Units } from 'homebridge';
+import { Devices } from '../settings.js';
 import { deviceBase } from './device.js';
-import { SwitchBotPlatform } from '../platform.js';
 import { Subject, interval, skipWhile } from 'rxjs';
-import { CharacteristicValue, PlatformAccessory, Service, Units } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../settings.js';
+
+import type { SwitchBotPlatform } from '../platform.js';
+import type { CharacteristicValue, PlatformAccessory, Service} from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus} from '../settings.js';
 
 /**
  * Platform Accessory
@@ -15,18 +18,21 @@ import { device, devicesConfig, serviceData, deviceStatus, Devices } from '../se
  */
 export class MeterPlus extends deviceBase {
   // Services
-  private Battery!: {
+  private Battery: {
+    Name: CharacteristicValue;
     Service: Service;
     BatteryLevel: CharacteristicValue;
     StatusLowBattery: CharacteristicValue;
   };
 
   private HumiditySensor?: {
+    Name: CharacteristicValue;
     Service: Service;
     CurrentRelativeHumidity: CharacteristicValue;
   };
 
   private TemperatureSensor?: {
+    Name: CharacteristicValue;
     Service: Service;
     CurrentTemperature: CharacteristicValue;
   };
@@ -45,45 +51,45 @@ export class MeterPlus extends deviceBase {
     this.doMeterUpdate = new Subject();
     this.meterUpdateInProgress = false;
 
-    // Initialize Temperature Sensor property
-    if (!device.meter?.hide_temperature) {
-      this.TemperatureSensor = {
-        Service: accessory.getService(this.hap.Service.TemperatureSensor) as Service,
-        CurrentTemperature: accessory.context.CurrentTemperature || 30,
-      };
-    }
-
-    // Initialize Humidity Sensor property
-    if (!device.meter?.hide_humidity) {
-      this.HumiditySensor = {
-        Service: accessory.getService(this.hap.Service.HumiditySensor) as Service,
-        CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
-      };
-    }
-
-    // Initialize Battery property
+    // Initialize Battery Service
     this.Battery = {
-      Service: accessory.getService(this.hap.Service.Battery) as Service,
-      BatteryLevel: accessory.context.BatteryLevel || 100,
-      StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
+      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+      Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
+      BatteryLevel: accessory.context.BatteryLevel ?? 100,
+      StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
+    // Initialize Battery Characteristics
+    this.Battery.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
+      .setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE)
+      .getCharacteristic(this.hap.Characteristic.BatteryLevel)
+      .onGet(() => {
+        return this.Battery.BatteryLevel;
+      });
+
+    this.Battery.Service
+      .getCharacteristic(this.hap.Characteristic.StatusLowBattery)
+      .onGet(() => {
+        return this.Battery.StatusLowBattery;
+      });
+    accessory.context.Battery.Name = this.Battery.Name;
 
-    // Temperature Sensor Service
+    // Initialize Temperature Sensor Service
     if (device.meter?.hide_temperature) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
       this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
       accessory.removeService(this.TemperatureSensor!.Service);
-    } else if (!this.TemperatureSensor?.Service) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
-      const TemperatureSensorService = `${accessory.displayName} Temperature Sensor`;
-      (this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor)
-        || this.accessory.addService(this.hap.Service.TemperatureSensor)), TemperatureSensorService;
-
-      this.TemperatureSensor!.Service.setCharacteristic(this.hap.Characteristic.Name, TemperatureSensorService);
-      this.TemperatureSensor!.Service
+    } else {
+      this.TemperatureSensor = {
+        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? this.accessory.addService(this.hap.Service.TemperatureSensor) as Service,
+        CurrentTemperature: accessory.context.CurrentTemperature ?? 30,
+      };
+
+      // Initialize Temperature Sensor Characteristics
+      this.TemperatureSensor.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.TemperatureSensor.Name)
         .getCharacteristic(this.hap.Characteristic.CurrentTemperature)
         .setProps({
           unit: Units['CELSIUS'],
@@ -95,23 +101,23 @@ export class MeterPlus extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature!;
         });
-    } else {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Temperature Sensor Service Not Added`);
+      accessory.context.TemperatureSensor.Name = this.TemperatureSensor.Name;
     }
-
-    // Humidity Sensor Service
+    // Initialize Humidity Sensor Service
     if (device.meter?.hide_humidity) {
       this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
       this.HumiditySensor!.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
       accessory.removeService(this.HumiditySensor!.Service);
-    } else if (!this.HumiditySensor?.Service) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Humidity Sensor Service`);
-      const HumiditySensorService = `${accessory.displayName} Humidity Sensor`;
-      (this.HumiditySensor!.Service = this.accessory.getService(this.hap.Service.HumiditySensor)
-        || this.accessory.addService(this.hap.Service.HumiditySensor)), HumiditySensorService;
+    } else {
+      this.HumiditySensor = {
+        Name: accessory.context.HumiditySensor.Name ?? `${accessory.displayName} Humidity Sensor`,
+        Service: accessory.getService(this.hap.Service.HumiditySensor) ?? this.accessory.addService(this.hap.Service.HumiditySensor) as Service,
+        CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity ?? 50,
+      };
 
-      this.HumiditySensor!.Service.setCharacteristic(this.hap.Characteristic.Name, HumiditySensorService);
+      // Initialize Humidity Sensor Characteristics
       this.HumiditySensor!.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.HumiditySensor.Name)
         .getCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity)
         .setProps({
           minStep: 0.1,
@@ -119,17 +125,11 @@ export class MeterPlus extends deviceBase {
         .onGet(() => {
           return this.HumiditySensor!.CurrentRelativeHumidity!;
         });
-    } else {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Humidity Sensor Service Not Added`);
+      accessory.context.HumiditySensor.Name = this.HumiditySensor.Name;
     }
 
-    // Battery Service
-    const BatteryService = `${accessory.displayName} Battery`;
-    (this.Battery.Service = this.accessory.getService(this.hap.Service.Battery)
-      || accessory.addService(this.hap.Service.Battery)), BatteryService;
-
-    this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, BatteryService);
-    this.Battery.Service.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
 
     // Retrieve initial values and updateHomekit
     this.updateHomeKitCharacteristics();