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

package/src/device/humidifier.ts

@@ -7,7 +7,7 @@ import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
 
 import type { SwitchBotPlatform } from '../platform.js';
 import type { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import type { device, devicesConfig, serviceData, deviceStatus} from '../settings.js';
+import type { device, devicesConfig, serviceData, deviceStatus } from '../settings.js';
 
 /**
  * Platform Accessory
@@ -17,6 +17,7 @@ import type { device, devicesConfig, serviceData, deviceStatus} from '../setting
 export class Humidifier extends deviceBase {
   // Services
   private HumidifierDehumidifier: {
+    Name: CharacteristicValue;
     Service: Service;
     Active: CharacteristicValue;
     WaterLevel: CharacteristicValue;
@@ -27,6 +28,7 @@ export class Humidifier extends deviceBase {
   };
 
   private TemperatureSensor?: {
+    Name: CharacteristicValue;
     Service: Service;
     CurrentTemperature: CharacteristicValue;
   };
@@ -47,46 +49,24 @@ export class Humidifier extends deviceBase {
 
     // Initialize the HumidifierDehumidifier Service
     this.HumidifierDehumidifier = {
-      Service: accessory.getService(this.hap.Service.HumidifierDehumidifier) as Service,
-      Active: accessory.context.Active || this.hap.Characteristic.Active.ACTIVE,
-      WaterLevel: accessory.context.WaterLevel || 100,
-      CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
+      Name: accessory.context.HumidifierDehumidifier.Name ?? accessory.displayName,
+      Service: accessory.getService(this.hap.Service.HumidifierDehumidifier)
+        ?? accessory.addService(this.hap.Service.HumidifierDehumidifier) as Service,
+      Active: accessory.context.Active ?? this.hap.Characteristic.Active.ACTIVE,
+      WaterLevel: accessory.context.WaterLevel ?? 100,
+      CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity ?? 50,
       TargetHumidifierDehumidifierState: accessory.context.TargetHumidifierDehumidifierState
-        || this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER,
+        ?? this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER,
       CurrentHumidifierDehumidifierState: accessory.context.CurrentHumidifierDehumidifierState
-        || this.hap.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE,
-      RelativeHumidityHumidifierThreshold: accessory.context.RelativeHumidityHumidifierThreshold || 50,
+        ?? this.hap.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE,
+      RelativeHumidityHumidifierThreshold: accessory.context.RelativeHumidityHumidifierThreshold ?? 50,
     };
 
-    // Initialize the Temperature Sensor Service
-    if (!device.humidifier?.hide_temperature) {
-      this.TemperatureSensor = {
-        Service: accessory.getService(this.hap.Service.TemperatureSensor) as Service,
-        CurrentTemperature: accessory.context.CurrentTemperature || 30,
-      };
-    }
-
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
-    // get the service if it exists, otherwise create a new service
-    // you can create multiple services for each accessory
-    const HumidifierDehumidifierService = `${accessory.displayName} Humidifier`;
-    (this.HumidifierDehumidifier.Service = accessory.getService(this.hap.Service.HumidifierDehumidifier)
-      || accessory.addService(this.hap.Service.HumidifierDehumidifier)), HumidifierDehumidifierService;
-
-    this.HumidifierDehumidifier.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-
-    // each service must implement at-minimum the "required characteristics" for the given service type
-    // see https://developers.homebridge.io/#/service/HumidifierDehumidifier
-
-    // create handlers for required characteristics
-    this.HumidifierDehumidifier.Service.setCharacteristic(
-      this.hap.Characteristic.CurrentHumidifierDehumidifierState,
-      this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState,
-    );
-
+    // Initialize the HumidifierDehumidifier Characteristics
     this.HumidifierDehumidifier.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.HumidifierDehumidifier.Name)
+      .setCharacteristic(this.hap.Characteristic.CurrentHumidifierDehumidifierState,
+        this.HumidifierDehumidifier.CurrentHumidifierDehumidifierState)
       .getCharacteristic(this.hap.Characteristic.TargetHumidifierDehumidifierState)
       .setProps({
         validValueRanges: [0, 1],
@@ -94,9 +74,17 @@ export class Humidifier extends deviceBase {
         maxValue: 1,
         validValues: [0, 1],
       })
+      .onGet(() => {
+        return this.HumidifierDehumidifier.TargetHumidifierDehumidifierState;
+      })
       .onSet(this.TargetHumidifierDehumidifierStateSet.bind(this));
 
-    this.HumidifierDehumidifier.Service.getCharacteristic(this.hap.Characteristic.Active).onSet(this.ActiveSet.bind(this));
+    this.HumidifierDehumidifier.Service
+      .getCharacteristic(this.hap.Characteristic.Active)
+      .onGet(() => {
+        return this.HumidifierDehumidifier.Active;
+      })
+      .onSet(this.ActiveSet.bind(this));
 
     this.HumidifierDehumidifier.Service
       .getCharacteristic(this.hap.Characteristic.RelativeHumidityHumidifierThreshold)
@@ -106,21 +94,27 @@ export class Humidifier extends deviceBase {
         maxValue: 100,
         minStep: this.minStep(device),
       })
+      .onGet(() => {
+        return this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold;
+      })
       .onSet(this.RelativeHumidityHumidifierThresholdSet.bind(this));
+    accessory.context.HumidifierDehumidifier.Name = this.HumidifierDehumidifier.Name;
 
-    // Temperature Sensor Service
-    if (device.humidifier?.hide_temperature || this.BLE) {
+    // Initialize the Temperature Sensor Service
+    if (device.humidifier?.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.BLE) {
-      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 the Temperature Sensor Characteristics
+      this.TemperatureSensor.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.TemperatureSensor.Name)
         .getCharacteristic(this.hap.Characteristic.CurrentTemperature)
         .setProps({
           validValueRanges: [-273.15, 100],
@@ -131,10 +125,12 @@ export class Humidifier 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;
     }
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // Retrieve initial values and updateHomekit
     this.updateHomeKitCharacteristics();
 
@@ -155,9 +151,9 @@ export class Humidifier extends deviceBase {
           const { CurrentRelativeHumidity } = this.HumidifierDehumidifier;
           const { CurrentTemperature } = this.TemperatureSensor || { CurrentTemperature: undefined };
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
-              '(temperature, humidity) = ' +
-              `Webhook:(${convertUnits(temperature, context.scale, device.iosensor?.convertUnitTo)}, ${humidity}), ` +
-              `current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
+            '(temperature, humidity) = ' +
+            `Webhook:(${convertUnits(temperature, context.scale, device.iosensor?.convertUnitTo)}, ${humidity}), ` +
+            `current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
           this.HumidifierDehumidifier.CurrentRelativeHumidity = humidity;
           if (!this.device.humidifier?.hide_temperature) {
             this.TemperatureSensor!.CurrentTemperature = convertUnits(temperature, context.scale, device.iosensor?.convertUnitTo);

package/src/device/iosensor.ts

@@ -9,8 +9,8 @@ import { convertUnits } from '../utils.js';
 import { Subject, interval, skipWhile } from 'rxjs';
 
 import type { SwitchBotPlatform } from '../platform.js';
-import type { CharacteristicValue, PlatformAccessory, Service} from 'homebridge';
-import type { device, devicesConfig, serviceData, deviceStatus} from '../settings.js';
+import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus } from '../settings.js';
 
 /**
  * Platform Accessory
@@ -20,17 +20,20 @@ import type { device, devicesConfig, serviceData, deviceStatus} from '../setting
 export class IOSensor extends deviceBase {
   // Services
   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;
   };
@@ -49,45 +52,45 @@ export class IOSensor extends deviceBase {
     this.doIOSensorUpdate = new Subject();
     this.ioSensorUpdateInProgress = false;
 
-    // Initialize Temperature Sensor property
-    if (!device.iosensor?.hide_temperature) {
-      this.TemperatureSensor = {
-        Service: accessory.getService(this.hap.Service.TemperatureSensor) as Service,
-        CurrentTemperature: accessory.context.CurrentTemperature || 30,
-      };
-    }
-
-    // Initialize Humidity Sensor property
-    if (!device.iosensor?.hide_humidity) {
-      this.HumiditySensor = {
-        Service: accessory.getService(this.hap.Service.HumiditySensor) as Service,
-        CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity || 50,
-      };
-    }
-
     // 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,
     };
 
-    // 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
+    // InitializeTemperature Sensor Service
     if (device.iosensor?.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'],
@@ -97,25 +100,26 @@ export class IOSensor extends deviceBase {
           minStep: 0.1,
         })
         .onGet(() => {
-          return this.TemperatureSensor!.CurrentTemperature!;
+          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.iosensor?.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;
-
-      this.HumiditySensor!.Service.setCharacteristic(this.hap.Characteristic.Name, HumiditySensorService);
-      this.HumiditySensor!.Service
+    } 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,
+      };
+
+      // Initialize Humidity Sensor Characteristics
+      this.HumiditySensor.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.HumiditySensor.Name)
         .getCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity)
         .setProps({
           minStep: 0.1,
@@ -123,17 +127,11 @@ export class IOSensor 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();

package/src/device/lightstrip.ts

@@ -17,6 +17,7 @@ import type { Service, PlatformAccessory, CharacteristicValue, ControllerConstru
 export class StripLight extends deviceBase {
   // Services
   private LightBulb: {
+    Name: CharacteristicValue;
     Service: Service;
     On: CharacteristicValue;
     Hue: CharacteristicValue;
@@ -44,37 +45,47 @@ export class StripLight extends deviceBase {
     this.doStripLightUpdate = new Subject();
     this.stripLightUpdateInProgress = false;
 
-    // Initialize the LightBulb property
+    // Initialize the LightBulb Service
     this.LightBulb = {
-      Service: accessory.getService(this.hap.Service.Lightbulb) as Service,
-      On: accessory.context.On || false,
-      Hue: accessory.context.Hue || 0,
-      Saturation: accessory.context.Saturation || 0,
-      Brightness: accessory.context.Brightness || 0,
-      ColorTemperature: accessory.context.ColorTemperature || 140,
+      Name: accessory.context.LightBulb.Name ?? accessory.displayName,
+      Service: accessory.getService(this.hap.Service.Lightbulb) ?? accessory.addService(this.hap.Service.Lightbulb) as Service,
+      On: accessory.context.On ?? false,
+      Hue: accessory.context.Hue ?? 0,
+      Saturation: accessory.context.Saturation ?? 0,
+      Brightness: accessory.context.Brightness ?? 0,
+      ColorTemperature: accessory.context.ColorTemperature ?? 140,
     };
 
-    // Retrieve initial values and updateHomekit
-    this.refreshStatus();
-
-    // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
-    // you can create multiple services for each accessory
-    const LightBulbService = `${accessory.displayName} ${device.deviceType}`;
-    (this.LightBulb.Service = accessory.getService(this.hap.Service.Lightbulb)
-      || accessory.addService(this.hap.Service.Lightbulb)), LightBulbService;
-
+    // Adaptive Lighting
     if (this.adaptiveLightingShift === -1 && this.accessory.context.adaptiveLighting) {
       this.accessory.removeService(this.LightBulb.Service);
       this.LightBulb.Service = this.accessory.addService(this.hap.Service.Lightbulb);
       this.accessory.context.adaptiveLighting = false;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting}`);
     }
+    if (this.adaptiveLightingShift !== -1) {
+      this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.LightBulb.Service, {
+        customTemperatureAdjustment: this.adaptiveLightingShift,
+      });
+      this.accessory.configureController(this.AdaptiveLightingController);
+      this.accessory.context.adaptiveLighting = true;
+      this.debugLog(
+        `${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting},` +
+        ` adaptiveLightingShift: ${this.adaptiveLightingShift}`,
+      );
+    }
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
 
-    this.LightBulb.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-    // handle on / off events using the On characteristic
-    this.LightBulb.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
+    // Initialize LightBulb Characteristics
+    this.LightBulb.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.LightBulb.Name)
+      .getCharacteristic(this.hap.Characteristic.On)
+      .onGet(() => {
+        return this.LightBulb.On;
+      })
+      .onSet(this.OnSet.bind(this));
 
-    // handle Brightness events using the Brightness characteristic
+    // Initialize LightBulb Brightness Characteristic
     this.LightBulb.Service
       .getCharacteristic(this.hap.Characteristic.Brightness)
       .setProps({
@@ -88,7 +99,7 @@ export class StripLight extends deviceBase {
       })
       .onSet(this.BrightnessSet.bind(this));
 
-    // handle ColorTemperature events using the ColorTemperature characteristic
+    // Initialize LightBulb ColorTemperature Characteristic
     this.LightBulb.Service
       .getCharacteristic(this.hap.Characteristic.ColorTemperature)
       .setProps({
@@ -101,7 +112,7 @@ export class StripLight extends deviceBase {
       })
       .onSet(this.ColorTemperatureSet.bind(this));
 
-    // handle Hue events using the Hue characteristic
+    // Initialize LightBulb Hue Characteristic
     this.LightBulb.Service
       .getCharacteristic(this.hap.Characteristic.Hue)
       .setProps({
@@ -114,7 +125,7 @@ export class StripLight extends deviceBase {
       })
       .onSet(this.HueSet.bind(this));
 
-    // handle Hue events using the Hue characteristic
+    // Initialize LightBulb Saturation Characteristic
     this.LightBulb.Service
       .getCharacteristic(this.hap.Characteristic.Saturation)
       .setProps({
@@ -126,19 +137,10 @@ export class StripLight extends deviceBase {
         return this.LightBulb.Saturation;
       })
       .onSet(this.SaturationSet.bind(this));
+    accessory.context.LightBulb.Name = this.LightBulb.Name;
 
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
-    if (this.adaptiveLightingShift !== -1) {
-      this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.LightBulb.Service, {
-        customTemperatureAdjustment: this.adaptiveLightingShift,
-      });
-      this.accessory.configureController(this.AdaptiveLightingController);
-      this.accessory.context.adaptiveLighting = true;
-      this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting},` +
-        ` adaptiveLightingShift: ${this.adaptiveLightingShift}`,
-      );
-    }
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
 
     // Update Homekit
     this.updateHomeKitCharacteristics();

package/src/device/lock.ts

@@ -11,23 +11,27 @@ import type { device, devicesConfig, deviceStatus, serviceData } from '../settin
 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;
   };
@@ -46,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();