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

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,52 @@ 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,
-    };
-
-    // 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,
-      };
-    }
+    this.ValidValues = this.hide_automode ? [1, 2] : [0, 1, 2];
 
-    // 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;
 
-    this.HeaterCooler.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+    // Initialize HeaterCooler Service
+    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,
+    };
+    accessory.context.HeaterCooler = this.HeaterCooler as object;
 
-    // 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 +114,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 +126,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 +139,37 @@ 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));
+
+    // 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);
+      accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
+      this.HumiditySensor = {
+        Name:  accessory.context.HumiditySensor ?? 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,
+      };
+      accessory.context.HumiditySensor = this.HumiditySensor as object;
+    }
+
+    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 +568,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,54 @@ export class AirPurifier extends irdeviceBase {
   ) {
     super(platform, accessory, device);
 
-    // Initialize AirPurifier property
+    // Initialize AirPurifier Service
+    accessory.context.AirPurifier = accessory.context.AirPurifier ?? {};
     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,
     };
+    accessory.context.AirPurifier = this.AirPurifier as object;
 
-    // Initialize TemperatureSensor property
-    this.TemperatureSensor = {
-      Service: accessory.getService(this.hap.Service.TemperatureSensor) as Service,
-      CurrentTemperature: accessory.context.CurrentTemperature || 24,
-    };
+    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));
 
-    // 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
+      .getCharacteristic(this.hap.Characteristic.CurrentAirPurifierState)
+      .onGet(() => {
+        return this.CurrentAirPurifierStateGet();
+      });
 
-    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.TargetAirPurifierState)
+      .onGet(() => {
+        return this.AirPurifier.TargetAirPurifierState;
+      })
+      .onSet(this.TargetAirPurifierStateSet.bind(this));
 
-    this.AirPurifier.Service.getCharacteristic(this.hap.Characteristic.CurrentAirPurifierState).onGet(() => {
-      return this.CurrentAirPurifierStateGet();
-    });
+    // Initialize TemperatureSensor Service
+    accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
+    this.TemperatureSensor = {
+      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,
+    };
+    accessory.context.TemperatureSensor = this.TemperatureSensor as object;
 
-    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;
+      });
   }
 
   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,22 @@ export class Camera extends irdeviceBase {
   ) {
     super(platform, accessory, device);
 
-    // Initialize Switch property
+    // Initialize Switch Service
+    accessory.context.Switch = accessory.context.Switch ?? {};
     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,
     };
+    accessory.context.Switch = this.Switch as object;
 
-    // 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));
   }
 
   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,25 @@ export class IRFan extends irdeviceBase {
   ) {
     super(platform, accessory, device);
 
-    // Initialize Switch property
+    // Initialize Switch Service
+    accessory.context.Fan = accessory.context.Fan ?? {};
     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,
     };
+    accessory.context.Fan = this.Fan as object;
 
-    // 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));
 
     if (device.irfan?.rotation_speed) {
       // handle Rotation Speed events using the RotationSpeed characteristic
@@ -62,6 +62,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 +79,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);

package/src/irdevice/light.ts

@@ -18,17 +18,20 @@ import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge
 export class Light extends irdeviceBase {
   // Services
   private LightBulb?: {
+    Name: CharacteristicValue;
     Service: Service;
     On: CharacteristicValue;
   };
 
   private ProgrammableSwitchOn?: {
+    Name: CharacteristicValue;
     Service: Service;
     ProgrammableSwitchEvent: CharacteristicValue;
     ProgrammableSwitchOutputState: CharacteristicValue;
   };
 
   private ProgrammableSwitchOff?: {
+    Name: CharacteristicValue;
     Service: Service;
     ProgrammableSwitchEvent: CharacteristicValue;
     ProgrammableSwitchOutputState: CharacteristicValue;
@@ -42,66 +45,83 @@ export class Light extends irdeviceBase {
     super(platform, accessory, device);
 
     if (!device.irlight?.stateless) {
-      // Initialize LightBulb property
+      // Initialize LightBulb Service
+      accessory.context.LightBulb = accessory.context.LightBulb ?? {};
       this.LightBulb = {
-        Service: accessory.getService(this.hap.Service.Lightbulb)! as Service,
+        Name: accessory.context.LightBulb.Name ?? `${accessory.displayName} ${device.remoteType}`,
+        Service: accessory.getService(this.hap.Service.Lightbulb) ?? accessory.addService(this.hap.Service.Lightbulb) as Service,
         On: accessory.context.On || false,
       };
-      // get the Light service if it exists, otherwise create a new Light service
-      // you can create multiple services for each accessory
-      const LightBulbService = `${accessory.displayName} ${device.remoteType}`;
-      (this.LightBulb.Service = accessory.getService(this.hap.Service.Lightbulb)
-        || accessory.addService(this.hap.Service.Lightbulb)), LightBulbService;
+      accessory.context.LightBulb = this.LightBulb as object;
 
-
-      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));
+      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));
     } else {
-
-      // create a new Stateful Programmable Switch On service
-      const ProgrammableSwitchOn = `${accessory.displayName} ${device.remoteType} On`;
-      (this.ProgrammableSwitchOn!.Service = accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
-        || accessory.addService(this.hap.Service.StatefulProgrammableSwitch)), ProgrammableSwitchOn;
-
-
-      this.ProgrammableSwitchOn?.Service.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} On`);
-
-      this.ProgrammableSwitchOn?.Service.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent).setProps({
-        validValueRanges: [0, 0],
-        minValue: 0,
-        maxValue: 0,
-        validValues: [0],
-      })
+      // Initialize ProgrammableSwitchOn Service
+      accessory.context.ProgrammableSwitchOn = accessory.context.ProgrammableSwitchOn ?? {};
+      this.ProgrammableSwitchOn = {
+        Name: accessory.context.ProgrammableSwitchOn.Name ?? `${accessory.displayName} ${device.remoteType} On`,
+        Service: accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
+        ?? accessory.addService(this.hap.Service.StatefulProgrammableSwitch) as Service,
+        ProgrammableSwitchEvent: accessory.context.ProgrammableSwitchEvent ?? this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS,
+        ProgrammableSwitchOutputState: accessory.context.ProgrammableSwitchOutputState ?? 0,
+      };
+      accessory.context.ProgrammableSwitchOn = this.ProgrammableSwitchOn as object;
+
+      // Initialize ProgrammableSwitchOn Characteristics
+      this.ProgrammableSwitchOn?.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.ProgrammableSwitchOn.Name)
+        .getCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent).setProps({
+          validValueRanges: [0, 0],
+          minValue: 0,
+          maxValue: 0,
+          validValues: [0],
+        })
         .onGet(() => {
           return this.ProgrammableSwitchOn!.ProgrammableSwitchEvent;
         });
 
-      this.ProgrammableSwitchOn?.Service.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
+      this.ProgrammableSwitchOn?.Service
+        .getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
+        .onGet(() => {
+          return this.ProgrammableSwitchOn!.ProgrammableSwitchOutputState;
+        })
         .onSet(this.ProgrammableSwitchOutputStateSetOn.bind(this));
 
-
-
-      // create a new Stateful Programmable Switch Off service
-      const ProgrammableSwitchOff = `${accessory.displayName} ${device.remoteType} Off`;
-      (this.ProgrammableSwitchOff!.Service = accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
-        || accessory.addService(this.hap.Service.StatefulProgrammableSwitch)), ProgrammableSwitchOff;
-
-
-      this.ProgrammableSwitchOff?.Service.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Off`);
-
-      this.ProgrammableSwitchOff?.Service.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent).setProps({
-        validValueRanges: [0, 0],
-        minValue: 0,
-        maxValue: 0,
-        validValues: [0],
-      })
+      // Initialize ProgrammableSwitchOff Service
+      accessory.context.ProgrammableSwitchOff = accessory.context.ProgrammableSwitchOff ?? {};
+      this.ProgrammableSwitchOff = {
+        Name: accessory.context.ProgrammableSwitchOff.Name ?? `${accessory.displayName} ${device.remoteType} Off`,
+        Service: accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
+        ?? accessory.addService(this.hap.Service.StatefulProgrammableSwitch) as Service,
+        ProgrammableSwitchEvent: accessory.context.ProgrammableSwitchEvent ?? this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS,
+        ProgrammableSwitchOutputState: accessory.context.ProgrammableSwitchOutputState ?? 0,
+      };
+      accessory.context.ProgrammableSwitchOff = this.ProgrammableSwitchOff as object;
+
+      // Initialize ProgrammableSwitchOff Characteristics
+      this.ProgrammableSwitchOff?.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.ProgrammableSwitchOff.Name)
+        .getCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent).setProps({
+          validValueRanges: [0, 0],
+          minValue: 0,
+          maxValue: 0,
+          validValues: [0],
+        })
         .onGet(() => {
           return this.ProgrammableSwitchOff!.ProgrammableSwitchEvent;
         });
 
-      this.ProgrammableSwitchOff?.Service.getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
+      this.ProgrammableSwitchOff?.Service
+        .getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
+        .onGet(() => {
+          return this.ProgrammableSwitchOff!.ProgrammableSwitchOutputState;
+        })
         .onSet(this.ProgrammableSwitchOutputStateSetOff.bind(this));
     }