@switchbot/homebridge-switchbot 3.5.0-beta.62 → 3.5.0-beta.63

package/src/device/blindtilt.ts

@@ -66,9 +66,10 @@ export class BlindTilt extends deviceBase {
     this.blindTiltUpdateInProgress = false;
     this.setNewTarget = false;
 
+    accessory.context.WindowCovering = accessory.context.WindowCovering ?? {};
     // Initialize WindowCovering Service
     this.WindowCovering = {
-      Name: accessory.context.WindowCoveringName ?? accessory.displayName,
+      Name: accessory.context.WindowCovering.Name ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.WindowCovering) ?? accessory.addService(this.hap.Service.WindowCovering) as Service,
       PositionState: accessory.context.PositionState ?? this.hap.Characteristic.PositionState.STOPPED,
       TargetPosition: accessory.context.TargetPosition ?? 100,
@@ -76,6 +77,7 @@ export class BlindTilt extends deviceBase {
       TargetHorizontalTiltAngle: accessory.context.TargetHorizontalTiltAngle ?? 90,
       CurrentHorizontalTiltAngle: accessory.context.CurrentHorizontalTiltAngle ?? 90,
     };
+    accessory.context.WindowCovering = this.WindowCovering as object;
 
     // Initialize WindowCovering Characteristics
     this.WindowCovering.Service
@@ -117,7 +119,7 @@ export class BlindTilt extends deviceBase {
         return this.WindowCovering.TargetHorizontalTiltAngle;
       })
       .onSet(this.TargetHorizontalTiltAngleSet.bind(this));
-    accessory.context.WindowCoveringName = this.WindowCovering.Name;
+    accessory.context.WindowCovering.Name = this.WindowCovering.Name;
 
     // Initialize WindowCovering CurrentHorizontalTiltAngle Characteristic
     this.WindowCovering.Service

package/src/device/bot.ts

@@ -111,9 +111,10 @@ export class Bot extends deviceBase {
     this.doBotUpdate = new Subject();
     this.botUpdateInProgress = false;
 
+    accessory.context.Battery = accessory.context.Battery ?? {};
     // Initialize Battery property
     this.Battery = {
-      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
+      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,

package/src/device/colorbulb.ts

@@ -51,8 +51,7 @@ export class ColorBulb extends deviceBase {
     this.doColorBulbUpdate = new Subject();
     this.colorBulbUpdateInProgress = false;
 
-    accessory.context.LightBulb = {};
-
+    accessory.context.LightBulb = accessory.context.LightBulb ?? {};
     // Initialize LightBulb property
     this.LightBulb = {
       Name: accessory.context.LightBulb.Name ?? accessory.displayName,
@@ -63,6 +62,8 @@ export class ColorBulb extends deviceBase {
       Brightness: accessory.context.Brightness ?? 0,
       ColorTemperature: accessory.context.ColorTemperature ?? 140,
     };
+    accessory.context.LightBulb = this.LightBulb as object;
+    this.errorLog(`${device.deviceType}: ${accessory.displayName} LightBulb Context: ${JSON.stringify(accessory.context.LightBulb)}`);
 
     // Adaptive Lighting
     if (this.adaptiveLightingShift === -1 && accessory.context.adaptiveLighting) {

package/src/device/curtain.ts

@@ -59,15 +59,17 @@ export class Curtain extends deviceBase {
     this.curtainUpdateInProgress = false;
     this.setNewTarget = false;
 
-    // Initialize LightBulb property
+    // Initialize WindowCovering Service
+    accessory.context.WindowCovering = accessory.context.WindowCovering ?? {};
     this.WindowCovering = {
-      Name: accessory.context.WindowCoveringName ?? accessory.displayName,
+      Name: accessory.context.WindowCovering.Name ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.WindowCovering) ?? accessory.addService(this.hap.Service.WindowCovering) as Service,
       PositionState: accessory.context.PositionState ?? this.hap.Characteristic.PositionState.STOPPED,
       TargetPosition: accessory.context.TargetPosition ?? 100,
       CurrentPosition: accessory.context.CurrentPosition ?? 100,
       HoldPosition: accessory.context.HoldPosition ?? false,
     };
+    accessory.context.WindowCovering = this.WindowCovering as object;
 
     // Initialize WindowCovering Service
     this.WindowCovering.Service.
@@ -77,7 +79,6 @@ export class Curtain extends deviceBase {
       .onGet(() => {
         return this.WindowCovering.PositionState;
       });
-    accessory.context.WindowCoveringName = this.WindowCovering.Name;
 
     // Initialize WindowCovering CurrentPosition
     this.WindowCovering.Service
@@ -114,14 +115,16 @@ export class Curtain extends deviceBase {
       })
       .onSet(this.HoldPositionSet.bind(this));
 
-    // Initialize Battery property
+    // Initialize Battery Service
+    accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
+      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,
       ChargingState: accessory.context.ChargingState ?? this.hap.Characteristic.ChargingState.NOT_CHARGING,
     };
+    accessory.context.Battery = this.Battery as object;
 
     // Initialize Battery Service
     this.Battery.Service
@@ -130,7 +133,6 @@ export class Curtain extends deviceBase {
       .onGet(() => {
         return this.Battery.BatteryLevel;
       });
-    accessory.context.BatteryName = this.Battery.Name;
 
     this.Battery.Service
       .getCharacteristic(this.hap.Characteristic.StatusLowBattery)
@@ -150,11 +152,13 @@ export class Curtain extends deviceBase {
       this.LightSensor!.Service = this.accessory.getService(this.hap.Service.LightSensor) as Service;
       accessory.removeService(this.LightSensor!.Service);
     } else {
+      accessory.context.LightSensor = accessory.context.LightSensor ?? {};
       this.LightSensor = {
-        Name: accessory.context.LightSensorName ?? `${accessory.displayName} Light Sensor`,
+        Name: accessory.context.LightSensor.Name ?? `${accessory.displayName} Light Sensor`,
         Service: accessory.getService(this.hap.Service.LightSensor) ?? this.accessory.addService(this.hap.Service.LightSensor) as Service,
         CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel ?? 0.0001,
       };
+      accessory.context.LightSensor = this.LightSensor as object;
 
       // Initialize LightSensor Characteristic
       this.LightSensor.Service
@@ -164,7 +168,6 @@ export class Curtain extends deviceBase {
         .onGet(() => {
           return this.LightSensor!.CurrentAmbientLightLevel!;
         });
-      accessory.context.LightSensorName = this.LightSensor.Name;
     }
 
     // Retrieve initial values and updateHomekit

package/src/device/motion.ts

@@ -102,7 +102,7 @@ export class Motion extends deviceBase {
       this.LightSensor = {
         Name: accessory.context.LightSensorName ?? `${accessory.displayName} Light Sensor`,
         Service: accessory.getService(this.hap.Service.LightSensor) ?? this.accessory.addService(this.hap.Service.LightSensor) as Service,
-        CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel ?? 0,
+        CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel ?? 0.0001,
       };
 
       // Initialize LightSensor Characteristics

package/src/device/waterdetector.ts

@@ -52,7 +52,7 @@ export class WaterDetector extends deviceBase {
 
     // Initialize Battery Service
     this.Battery = {
-      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
+      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,
@@ -73,7 +73,7 @@ export class WaterDetector extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.BatteryName = this.Battery.Name;
+    accessory.context.Battery.Name = this.Battery.Name;
 
     // Initialize Leak Sensor Service
     if (device.waterdetector?.hide_leak) {
@@ -82,7 +82,7 @@ export class WaterDetector extends deviceBase {
       accessory.removeService(this.LeakSensor!.Service);
     } else {
       this.LeakSensor = {
-        Name: accessory.context.LeakSensorName ?? `${accessory.displayName} Leak Sensor`,
+        Name: accessory.context.LeakSensor.Name ?? `${accessory.displayName} Leak Sensor`,
         Service: accessory.getService(this.hap.Service.LeakSensor) ?? this.accessory.addService(this.hap.Service.LeakSensor) as Service,
         StatusActive: accessory.context.StatusActive ?? false,
         LeakDetected: accessory.context.LeakDetected ?? this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED,
@@ -96,7 +96,7 @@ export class WaterDetector extends deviceBase {
         .onGet(() => {
           return this.LeakSensor!.LeakDetected;
         });
-      accessory.context.LeakSensorName = this.LeakSensor.Name;
+      accessory.context.LeakSensor.Name = this.LeakSensor.Name;
     }
 
     // Retrieve initial values and updateHomekit

package/src/irdevice/airconditioner.ts

@@ -18,6 +18,7 @@ import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge
 export class AirConditioner extends irdeviceBase {
   // Services
   private HeaterCooler: {
+    Name: CharacteristicValue;
     Service: Service;
     Active: CharacteristicValue;
     CurrentHeaterCoolerState: CharacteristicValue;
@@ -27,7 +28,9 @@ export class AirConditioner extends irdeviceBase {
     RotationSpeed: CharacteristicValue;
   };
 
+  meter?: PlatformAccessory;
   private HumiditySensor?: {
+    Name: CharacteristicValue;
     Service: Service;
     CurrentRelativeHumidity: CharacteristicValue;
   };
@@ -46,7 +49,6 @@ export class AirConditioner extends irdeviceBase {
   set_min_heat?: number;
   set_max_cool?: number;
   set_min_cool?: number;
-  meter?: PlatformAccessory;
 
   constructor(
     readonly platform: SwitchBotPlatform,
@@ -58,64 +60,54 @@ export class AirConditioner extends irdeviceBase {
     // default placeholders
     this.getAirConditionerConfigSettings(accessory, device);
 
-    // Initialize HeaterCooler property
-    this.HeaterCooler = {
-      Service: accessory.getService(this.hap.Service.Switch) as Service,
-      Active: accessory.context.Active || this.hap.Characteristic.Active.INACTIVE,
-      CurrentHeaterCoolerState: accessory.context.CurrentHeaterCoolerState || this.hap.Characteristic.CurrentHeaterCoolerState.IDLE,
-      TargetHeaterCoolerState: accessory.context.TargetHeaterCoolerState || this.hap.Characteristic.TargetHeaterCoolerState.AUTO,
-      CurrentTemperature: accessory.context.CurrentTemperature || 24,
-      ThresholdTemperature: accessory.context.ThresholdTemperature || 24,
-      RotationSpeed: accessory.context.RotationSpeed || 4,
-    };
+    this.ValidValues = this.hide_automode ? [1, 2] : [0, 1, 2];
 
-    // Initialize HumiditySensor property
-    if (this.device.irair?.meterType && this.device.irair?.meterId) {
-      const meterUuid = this.platform.api.hap.uuid.generate(`${this.device.irair.meterId}-${this.device.irair.meterType}`);
-      this.meter = this.platform.accessories.find((accessory) => accessory.UUID === meterUuid);
-      this.HumiditySensor = {
-        Service: this.meter!.getService(this.hap.Service.HumiditySensor) as Service,
-        CurrentRelativeHumidity: this.meter!.context.CurrentRelativeHumidity || 0,
-      };
-    }
 
-    // get the Television service if it exists, otherwise create a new Television service
-    // you can create multiple services for each accessory
-    const HeaterCoolerService = `${accessory.displayName} ${device.remoteType}`;
-    (this.HeaterCooler.Service = accessory.getService(this.hap.Service.HeaterCooler)
-      || accessory.addService(this.hap.Service.HeaterCooler)), HeaterCoolerService;
+    // Initialize HeaterCooler Service
+    if (!accessory.context.HeaterCooler) {
+      accessory.context.HeaterCooler = {};
+    }
+    this.HeaterCooler = {
+      Name: accessory.context.HeaterCooler.Name ?? `${accessory.displayName} ${device.remoteType}`,
+      Service: accessory.getService(this.hap.Service.HeaterCooler) ?? accessory.addService(this.hap.Service.HeaterCooler) as Service,
+      Active: accessory.context.Active ?? this.hap.Characteristic.Active.INACTIVE,
+      CurrentHeaterCoolerState: accessory.context.CurrentHeaterCoolerState ?? this.hap.Characteristic.CurrentHeaterCoolerState.IDLE,
+      TargetHeaterCoolerState: accessory.context.TargetHeaterCoolerState ?? this.hap.Characteristic.TargetHeaterCoolerState.AUTO,
+      CurrentTemperature: accessory.context.CurrentTemperature ?? 24,
+      ThresholdTemperature: accessory.context.ThresholdTemperature ?? 24,
+      RotationSpeed: accessory.context.RotationSpeed ?? 4,
+    };
 
-    this.HeaterCooler.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
 
-    // handle on / off events using the Active characteristic
-    this.HeaterCooler.Service.getCharacteristic(this.hap.Characteristic.Active)
+    this.HeaterCooler.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.HeaterCooler.Name)
+      .getCharacteristic(this.hap.Characteristic.Active)
+      .onGet(() => {
+        return this.HeaterCooler.Active;
+      })
       .onSet(this.ActiveSet.bind(this));
 
-    this.HeaterCooler.Service.getCharacteristic(this.hap.Characteristic.CurrentTemperature)
-      .onGet(this.CurrentTemperatureGet.bind(this));
-
-    this.ValidValues = this.hide_automode ? [1, 2] : [0, 1, 2];
-
-    if (this.device.irair?.meterType && this.device.irair?.meterId) {
-      const meterUuid = this.platform.api.hap.uuid.generate(`${this.device.irair.meterId}-${this.device.irair.meterType}`);
-      this.meter = this.platform.accessories.find((accessory) => accessory.UUID === meterUuid);
-    }
-
-    if (this.meter) {
-      this.HumiditySensor!.Service.getCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity)
-        .onGet(this.CurrentRelativeHumidityGet.bind(this));
-    }
+    this.HeaterCooler.Service
+      .getCharacteristic(this.hap.Characteristic.CurrentTemperature)
+      .onGet(async () => {
+        return await this.CurrentTemperatureGet();
+      });
 
     this.HeaterCooler.Service
       .getCharacteristic(this.hap.Characteristic.TargetHeaterCoolerState)
       .setProps({
         validValues: this.ValidValues,
       })
-      .onGet(this.TargetHeaterCoolerStateGet.bind(this))
+      .onGet(async () => {
+        return await this.TargetHeaterCoolerStateGet();
+      })
       .onSet(this.TargetHeaterCoolerStateSet.bind(this));
 
-    this.HeaterCooler.Service.getCharacteristic(this.hap.Characteristic.CurrentHeaterCoolerState)
-      .onGet(this.CurrentHeaterCoolerStateGet.bind(this));
+    this.HeaterCooler.Service
+      .getCharacteristic(this.hap.Characteristic.CurrentHeaterCoolerState)
+      .onGet(async () => {
+        return await this.CurrentHeaterCoolerStateGet();
+      });
 
     this.HeaterCooler.Service
       .getCharacteristic(this.hap.Characteristic.HeatingThresholdTemperature)
@@ -124,7 +116,9 @@ export class AirConditioner extends irdeviceBase {
         maxValue: this.set_max_heat,
         minStep: 0.5,
       })
-      .onGet(this.ThresholdTemperatureGet.bind(this))
+      .onGet(async () => {
+        return await this.ThresholdTemperatureGet();
+      })
       .onSet(this.ThresholdTemperatureSet.bind(this));
 
     this.HeaterCooler.Service
@@ -134,7 +128,9 @@ export class AirConditioner extends irdeviceBase {
         maxValue: this.set_max_cool,
         minStep: 0.5,
       })
-      .onGet(this.ThresholdTemperatureGet.bind(this))
+      .onGet(async () => {
+        return await this.ThresholdTemperatureGet();
+      })
       .onSet(this.ThresholdTemperatureSet.bind(this));
 
     this.HeaterCooler.Service
@@ -145,8 +141,36 @@ export class AirConditioner extends irdeviceBase {
         minValue: 1,
         maxValue: 4,
       })
-      .onGet(this.RotationSpeedGet.bind(this))
+      .onGet(async () => {
+        return await this.RotationSpeedGet();
+      })
       .onSet(this.RotationSpeedSet.bind(this));
+    accessory.context.HeaterCooler.Name = this.HeaterCooler.Name;
+
+    // Initialize HumiditySensor property
+
+    if (this.device.irair?.meterType && this.device.irair?.meterId) {
+      const meterUuid = this.platform.api.hap.uuid.generate(`${this.device.irair.meterId}-${this.device.irair.meterType}`);
+      this.meter = this.platform.accessories.find((accessory) => accessory.UUID === meterUuid);
+      this.HumiditySensor = {
+        Name:  this.meter!.displayName,
+        Service: this.meter!.getService(this.hap.Service.HumiditySensor) ?? this.meter!.addService(this.hap.Service.HumiditySensor) as Service,
+        CurrentRelativeHumidity: this.meter!.context.CurrentRelativeHumidity || 0,
+      };
+    }
+
+    if (this.device.irair?.meterType && this.device.irair?.meterId) {
+      const meterUuid = this.platform.api.hap.uuid.generate(`${this.device.irair.meterId}-${this.device.irair.meterType}`);
+      this.meter = this.platform.accessories.find((accessory) => accessory.UUID === meterUuid);
+    }
+
+    if (this.meter) {
+      this.HumiditySensor!.Service
+        .getCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity)
+        .onGet(async () => {
+          return await this.CurrentRelativeHumidityGet();
+        });
+    }
   }
 
   /**
@@ -545,43 +569,7 @@ export class AirConditioner extends irdeviceBase {
       this.HeaterCooler.RotationSpeed = this.HeaterCooler.RotationSpeed || this.accessory.context.RotationSpeed;
     }
 
-    if (this.device.irair?.hide_automode) {
-      this.hide_automode = this.device.irair?.hide_automode;
-      this.accessory.context.hide_automode = this.hide_automode;
-    } else {
-      this.hide_automode = this.device.irair?.hide_automode;
-      this.accessory.context.hide_automode = this.hide_automode;
-    }
-
-    if (this.device.irair?.set_max_heat) {
-      this.set_max_heat = this.device.irair?.set_max_heat;
-      this.accessory.context.set_max_heat = this.set_max_heat;
-    } else {
-      this.set_max_heat = 35;
-      this.accessory.context.set_max_heat = this.set_max_heat;
-    }
-    if (this.device.irair?.set_min_heat) {
-      this.set_min_heat = this.device.irair?.set_min_heat;
-      this.accessory.context.set_min_heat = this.set_min_heat;
-    } else {
-      this.set_min_heat = 0;
-      this.accessory.context.set_min_heat = this.set_min_heat;
-    }
-
-    if (this.device.irair?.set_max_cool) {
-      this.set_max_cool = this.device.irair?.set_max_cool;
-      this.accessory.context.set_max_cool = this.set_max_cool;
-    } else {
-      this.set_max_cool = 35;
-      this.accessory.context.set_max_cool = this.set_max_cool;
-    }
-    if (this.device.irair?.set_min_cool) {
-      this.set_min_cool = this.device.irair?.set_min_cool;
-      this.accessory.context.set_min_cool = this.set_min_cool;
-    } else {
-      this.set_min_cool = 0;
-      this.accessory.context.set_min_cool = this.set_min_cool;
-    }
+    await this.getAirConditionerConfigSettings(this.accessory, this.device);
 
     if (this.meter) {
       if (this.HumiditySensor!.CurrentRelativeHumidity === undefined && this.accessory.context.CurrentRelativeHumidity === undefined) {

package/src/irdevice/airpurifier.ts

@@ -18,6 +18,7 @@ import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge
 export class AirPurifier extends irdeviceBase {
   // Services
   private AirPurifier: {
+    Name: CharacteristicValue;
     Service: Service;
     Active: CharacteristicValue;
     RotationSpeed: CharacteristicValue;
@@ -26,6 +27,7 @@ export class AirPurifier extends irdeviceBase {
   };
 
   private TemperatureSensor: {
+    Name: CharacteristicValue;
     Service: Service;
     CurrentTemperature: CharacteristicValue;
   };
@@ -54,36 +56,59 @@ export class AirPurifier extends irdeviceBase {
   ) {
     super(platform, accessory, device);
 
+    if (!accessory.context.AirPurifier) {
+      accessory.context.AirPurifier = {};
+    }
+
     // Initialize AirPurifier property
     this.AirPurifier = {
-      Service: accessory.getService(this.hap.Service.Switch) as Service,
-      Active: accessory.context.Active || this.hap.Characteristic.Active.INACTIVE,
-      RotationSpeed: accessory.context.RotationSpeed || 0,
-      CurrentAirPurifierState: accessory.context.CurrentAirPurifierState || this.hap.Characteristic.CurrentAirPurifierState.INACTIVE,
-      TargetAirPurifierState: accessory.context.TargetAirPurifierState || this.hap.Characteristic.TargetAirPurifierState.AUTO,
+      Name: accessory.context.AirPurifier.Name ?? `${accessory.displayName} Air Purifier`,
+      Service: accessory.getService(this.hap.Service.AirPurifier) ?? accessory.addService(this.hap.Service.AirPurifier) as Service,
+      Active: accessory.context.Active ?? this.hap.Characteristic.Active.INACTIVE,
+      RotationSpeed: accessory.context.RotationSpeed ?? 0,
+      CurrentAirPurifierState: accessory.context.CurrentAirPurifierState ?? this.hap.Characteristic.CurrentAirPurifierState.INACTIVE,
+      TargetAirPurifierState: accessory.context.TargetAirPurifierState ?? this.hap.Characteristic.TargetAirPurifierState.AUTO,
     };
 
+    this.AirPurifier.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.AirPurifier.Name)
+      .getCharacteristic(this.hap.Characteristic.Active)
+      .onGet(() => {
+        return this.AirPurifier.Active;
+      })
+      .onSet(this.ActiveSet.bind(this));
+
+    this.AirPurifier.Service
+      .getCharacteristic(this.hap.Characteristic.CurrentAirPurifierState)
+      .onGet(() => {
+        return this.CurrentAirPurifierStateGet();
+      });
+
+    this.AirPurifier.Service
+      .getCharacteristic(this.hap.Characteristic.TargetAirPurifierState)
+      .onGet(() => {
+        return this.AirPurifier.TargetAirPurifierState;
+      })
+      .onSet(this.TargetAirPurifierStateSet.bind(this));
+    accessory.context.AirPurifier.Name = this.AirPurifier.Name;
+
+    if (!accessory.context.TemperatureSensor) {
+      accessory.context.TemperatureSensor = {};
+    }
     // Initialize TemperatureSensor property
     this.TemperatureSensor = {
-      Service: accessory.getService(this.hap.Service.TemperatureSensor) as Service,
+      Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+      Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? accessory.addService(this.hap.Service.TemperatureSensor) as Service,
       CurrentTemperature: accessory.context.CurrentTemperature || 24,
     };
 
-    // get the Television service if it exists, otherwise create a new Television service
-    // you can create multiple services for each accessory
-    const AirPurifierService = `${accessory.displayName} Air Purifier`;
-    (this.AirPurifier.Service = accessory.getService(this.hap.Service.AirPurifier)
-      || accessory.addService(this.hap.Service.AirPurifier)), AirPurifierService;
-
-    this.AirPurifier.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-    // handle on / off events using the Active characteristic
-    this.AirPurifier.Service.getCharacteristic(this.hap.Characteristic.Active).onSet(this.ActiveSet.bind(this));
-
-    this.AirPurifier.Service.getCharacteristic(this.hap.Characteristic.CurrentAirPurifierState).onGet(() => {
-      return this.CurrentAirPurifierStateGet();
-    });
-
-    this.AirPurifier.Service.getCharacteristic(this.hap.Characteristic.TargetAirPurifierState).onSet(this.TargetAirPurifierStateSet.bind(this));
+    this.TemperatureSensor.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.TemperatureSensor.Name)
+      .getCharacteristic(this.hap.Characteristic.CurrentTemperature)
+      .onGet(() => {
+        return this.TemperatureSensor.CurrentTemperature;
+      });
+    accessory.context.TemperatureSensor.Name = this.TemperatureSensor.Name;
   }
 
   async ActiveSet(value: CharacteristicValue): Promise<void> {

package/src/irdevice/camera.ts

@@ -18,6 +18,7 @@ import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge
 export class Camera extends irdeviceBase {
   // Services
   private Switch: {
+    Name: CharacteristicValue;
     Service: Service;
     On: CharacteristicValue;
   };
@@ -29,22 +30,24 @@ export class Camera extends irdeviceBase {
   ) {
     super(platform, accessory, device);
 
+    if (!accessory.context.Switch) {
+      accessory.context.Switch = {};
+    }
     // Initialize Switch property
     this.Switch = {
-      Service: accessory.getService(this.hap.Service.Switch) as Service,
-      On: accessory.context.On || false,
+      Name: accessory.context.Switch.Name ?? `${accessory.displayName} Camera`,
+      Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch) as Service,
+      On: accessory.context.On ?? false,
     };
 
-    // get the Television service if it exists, otherwise create a new Television service
-    // you can create multiple services for each accessory
-    const SwitchService = `${accessory.displayName} Camera`;
-    (this.Switch.Service = accessory.getService(this.hap.Service.Switch)
-      || accessory.addService(this.hap.Service.Switch)), SwitchService;
-
-    this.Switch.Service.setCharacteristic(this.hap.Characteristic.Name, SwitchService);
-
-    // handle on / off events using the On characteristic
-    this.Switch.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
+    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;
   }
 
   async OnSet(value: CharacteristicValue): Promise<void> {

package/src/irdevice/fan.ts

@@ -18,6 +18,7 @@ import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge
 export class IRFan extends irdeviceBase {
   // Services
   private Fan: {
+    Name: CharacteristicValue;
     Service: Service;
     Active: CharacteristicValue;
     SwingMode: CharacteristicValue;
@@ -32,26 +33,28 @@ export class IRFan extends irdeviceBase {
   ) {
     super(platform, accessory, device);
 
+    if (!accessory.context.Fan) {
+      accessory.context.Fan = {};
+    }
+
     // Initialize Switch property
     this.Fan = {
-      Service: accessory.getService(this.hap.Service.Lightbulb) as Service,
-      Active: accessory.context.Active || this.hap.Characteristic.Active.INACTIVE,
-      SwingMode: accessory.context.SwingMode || this.hap.Characteristic.SwingMode.SWING_DISABLED,
-      RotationSpeed: accessory.context.RotationSpeed || 0,
-      RotationDirection: accessory.context.On || this.hap.Characteristic.RotationDirection.CLOCKWISE,
+      Name: accessory.context.Fan.Name ?? `${accessory.displayName} Fan`,
+      Service: accessory.getService(this.hap.Service.Fanv2) ?? accessory.addService(this.hap.Service.Fanv2) as Service,
+      Active: accessory.context.Active ?? this.hap.Characteristic.Active.INACTIVE,
+      SwingMode: accessory.context.SwingMode ?? this.hap.Characteristic.SwingMode.SWING_DISABLED,
+      RotationSpeed: accessory.context.RotationSpeed ?? 0,
+      RotationDirection: accessory.context.RotationDirection ?? this.hap.Characteristic.RotationDirection.CLOCKWISE,
     };
 
-    // get the Television service if it exists, otherwise create a new Television service
-    // you can create multiple services for each accessory
-    const FanService = `${accessory.displayName} Fan`;
-    (this.Fan.Service = accessory.getService(this.hap.Service.Fanv2)
-      || accessory.addService(this.hap.Service.Fanv2)), FanService;
-
-    this.Fan.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-
-    // handle on / off events using the Active characteristic
-    this.Fan.Service.getCharacteristic(this.hap.Characteristic.Active).onSet(this.ActiveSet.bind(this));
-
+    this.Fan.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.Fan.Name)
+      .getCharacteristic(this.hap.Characteristic.Active)
+      .onGet(() => {
+        return this.Fan.Active;
+      })
+      .onSet(this.ActiveSet.bind(this));
+    accessory.context.Fan.Name = this.Fan.Name;
 
     if (device.irfan?.rotation_speed) {
       // handle Rotation Speed events using the RotationSpeed characteristic
@@ -62,6 +65,9 @@ export class IRFan extends irdeviceBase {
           minValue: Number(this.minValue(device)),
           maxValue: Number(this.maxValue(device)),
         })
+        .onGet(() => {
+          return this.Fan.RotationSpeed;
+        })
         .onSet(this.RotationSpeedSet.bind(this));
     } else if (this.Fan.Service.testCharacteristic(this.hap.Characteristic.RotationSpeed) && !device.irfan?.swing_mode) {
       const characteristic = this.Fan.Service.getCharacteristic(this.hap.Characteristic.RotationSpeed);
@@ -76,7 +82,12 @@ export class IRFan extends irdeviceBase {
 
     if (device.irfan?.swing_mode) {
       // handle Osolcation events using the SwingMode characteristic
-      this.Fan.Service.getCharacteristic(this.hap.Characteristic.SwingMode).onSet(this.SwingModeSet.bind(this));
+      this.Fan.Service
+        .getCharacteristic(this.hap.Characteristic.SwingMode)
+        .onGet(() => {
+          return this.Fan.SwingMode;
+        })
+        .onSet(this.SwingModeSet.bind(this));
     } else if (this.Fan.Service.testCharacteristic(this.hap.Characteristic.SwingMode) && !device.irfan?.swing_mode) {
       const characteristic = this.Fan.Service.getCharacteristic(this.hap.Characteristic.SwingMode);
       this.Fan.Service.removeCharacteristic(characteristic);
@@ -87,6 +98,7 @@ export class IRFan extends irdeviceBase {
         `Clear Cache on ${this.accessory.displayName} To Remove Chracteristic`,
       );
     }
+    accessory.context.Fan.Name = this.Fan.Name;
   }
 
   async minStep(device: irdevice & irDevicesConfig): Promise<number> {