@switchbot/homebridge-switchbot 3.5.1-beta.12 → 3.5.1-beta.14

package/src/device/waterdetector.ts

@@ -36,6 +36,15 @@ export class WaterDetector extends deviceBase {
     LeakDetected: CharacteristicValue;
   };
 
+  // OpenAPI
+  deviceStatus!: waterLeakDetectorStatus;
+
+  //Webhook
+  webhookContext!: waterLeakDetectorWebhookContext;
+
+  // BLE
+  serviceData!: waterLeakDetectorServiceData;
+
   // Updates
   WaterDetectorUpdateInProgress!: boolean;
   doWaterDetectorUpdate: Subject<void>;
@@ -106,13 +115,11 @@ export class WaterDetector extends deviceBase {
     }
 
     // Retrieve initial values and updateHomekit
-    this.debugLog('retrieve initial values and Update Homekit');
+    this.debugLog('Retrieve initial values and update Homekit');
     this.refreshStatus();
 
-    // Retrieve initial values and updateHomekit
-    // this.updateHomeKitCharacteristics();
-
     //regisiter webhook event handler
+    this.debugLog('Registering Webhook Event Handler');
     this.registerWebhook();
 
     // Start an update interval
@@ -124,18 +131,24 @@ export class WaterDetector extends deviceBase {
       });
   }
 
-  async BLEparseStatus(serviceData: waterLeakDetectorServiceData): Promise<void> {
+  async BLEparseStatus(): Promise<void> {
     await this.debugLog('BLEparseStatus');
+    await this.debugLog(`(state, status, battery) = BLE: (${this.serviceData.state}, ${this.serviceData.status}, ${this.serviceData.battery}),`
+      + ` current:(${this.LeakSensor?.LeakDetected}, ${this.Battery.BatteryLevel})`);
+
+    //LeakSensor
     if (this.device.waterdetector?.hide_leak && this.LeakSensor?.Service) {
+
       // StatusActive
-      this.LeakSensor.StatusActive = serviceData.state;
+      this.LeakSensor.StatusActive = this.serviceData.state;
       await this.debugLog(`StatusActive: ${this.LeakSensor.StatusActive}`);
+
       // LeakDetected
-      this.LeakSensor.LeakDetected = serviceData.status;
+      this.LeakSensor.LeakDetected = this.serviceData.status;
       this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}`);
     }
     // BatteryLevel
-    this.Battery.BatteryLevel = Number(serviceData.battery);
+    this.Battery.BatteryLevel = this.serviceData.battery;
     await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
     // StatusLowBattery
     this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
@@ -143,27 +156,36 @@ export class WaterDetector extends deviceBase {
     await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
   }
 
-  async openAPIparseStatus(deviceStatus: waterLeakDetectorStatus): Promise<void> {
+  async openAPIparseStatus(): Promise<void> {
     await this.debugLog('openAPIparseStatus');
+    await this.debugLog(`(status, battery) = OpenAPI: (${this.deviceStatus.status}, ${this.deviceStatus.battery}),`
+      + ` current:(${this.LeakSensor?.LeakDetected}, ${this.Battery.BatteryLevel})`);
+
+    //LeakSensor
     if (!this.device.waterdetector?.hide_leak && this.LeakSensor?.Service) {
+
       // StatusActive
-      this.LeakSensor.StatusActive = deviceStatus.battery === 0 ? false : true;
+      this.LeakSensor.StatusActive = this.deviceStatus.battery === 0 ? false : true;
       await this.debugLog(`StatusActive: ${this.LeakSensor.StatusActive}`);
+
       // LeakDetected
-      this.LeakSensor.LeakDetected = deviceStatus.status;
+      this.LeakSensor.LeakDetected = this.deviceStatus.status;
       this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}`);
     }
+
     // BatteryLevel
-    this.Battery.BatteryLevel = Number(deviceStatus.battery);
+    this.Battery.BatteryLevel = this.deviceStatus.battery;
     await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
+
     // StatusLowBattery
     this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
       ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
     await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
+
     // FirmwareVersion
-    const version = deviceStatus.version.toString();
-    await this.debugLog(`FirmwareVersion: ${version.replace(/^V|-.*$/g, '')}`);
-    if (deviceStatus.version) {
+    if (this.deviceStatus.version) {
+      const version = this.deviceStatus.version.toString();
+      await this.debugLog(`FirmwareVersion: ${version.replace(/^V|-.*$/g, '')}`);
       const deviceVersion = version.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
@@ -176,21 +198,27 @@ export class WaterDetector extends deviceBase {
     }
   }
 
-  async parseStatusWebhook(context: waterLeakDetectorWebhookContext): Promise<void> {
+  async parseStatusWebhook(): Promise<void> {
     await this.debugLog('parseStatusWebhook');
-    await this.debugLog(`(detectionState, battery) = Webhook: (${context.detectionState}, ${context.battery}),`
+    await this.debugLog(`(detectionState, battery) = Webhook: (${this.webhookContext.detectionState}, ${this.webhookContext.battery}),`
       + ` current:(${this.LeakSensor?.LeakDetected}, ${this.Battery.BatteryLevel})`);
+
+    //LeakSensor
     if (!this.device.waterdetector?.hide_leak && this.LeakSensor?.Service) {
+
       // StatusActive
-      this.LeakSensor.StatusActive = context.detectionState ? true : false;
+      this.LeakSensor.StatusActive = this.webhookContext.detectionState ? true : false;
       await this.debugLog(`StatusActive: ${this.LeakSensor.StatusActive}`);
+
       // LeakDetected
-      this.LeakSensor.LeakDetected = context.detectionState;
+      this.LeakSensor.LeakDetected = this.webhookContext.detectionState;
       await this.debugLog(`LeakDetected: ${this.LeakSensor.LeakDetected}`);
     }
+
     // BatteryLevel
-    this.Battery.BatteryLevel = Number(context.battery);
+    this.Battery.BatteryLevel = this.webhookContext.battery;
     await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
+
     // StatusLowBattery
     this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
       ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
@@ -223,10 +251,11 @@ export class WaterDetector extends deviceBase {
       // Start to monitor advertisement packets
       (async () => {
         // Start to monitor advertisement packets
-        const serviceData = await this.monitorAdvertisementPackets(switchbot) as unknown as waterLeakDetectorServiceData;
+        const serviceData = await this.monitorAdvertisementPackets(switchbot) as waterLeakDetectorServiceData;
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Unknown && serviceData.modelName === SwitchBotBLEModelName.Unknown) {
-          await this.BLEparseStatus(serviceData);
+          this.serviceData = serviceData;
+          await this.BLEparseStatus();
           await this.updateHomeKitCharacteristics();
         } else {
           await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`);
@@ -244,7 +273,8 @@ export class WaterDetector extends deviceBase {
       await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);;
       if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
         await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
-        await this.openAPIparseStatus(deviceStatus.body);
+        this.deviceStatus = deviceStatus.body;
+        await this.openAPIparseStatus();
         await this.updateHomeKitCharacteristics();
       } else {
         await this.debugWarnLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
@@ -262,7 +292,8 @@ export class WaterDetector extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: waterLeakDetectorWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
-          await this.parseStatusWebhook(context);
+          this.webhookContext = context;
+          await this.parseStatusWebhook();
           await this.updateHomeKitCharacteristics();
         } catch (e: any) {
           await this.errorLog(`failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);

package/src/irdevice/airconditioner.ts

@@ -352,7 +352,7 @@ export class AirConditioner extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           await this.updateHomeKitCharacteristics();
         } else {
@@ -501,39 +501,25 @@ export class AirConditioner extends irdeviceBase {
   }
 
   async ThresholdTemperatureGet(): Promise<CharacteristicValue> {
+    this.HeaterCooler.Active = this.HeaterCooler.Active === undefined ? this.hap.Characteristic.Active.INACTIVE
+      : this.HeaterCooler.Active ?? this.accessory.context.Active;
 
-    if (this.HeaterCooler.Active === undefined) {
-      this.HeaterCooler.Active = this.hap.Characteristic.Active.INACTIVE;
-    } else {
-      this.HeaterCooler.Active = this.HeaterCooler.Active ? this.HeaterCooler.Active : this.accessory.context.Active;
-    }
+    this.HeaterCooler.CurrentTemperature = (this.HeaterCooler.CurrentTemperature === undefined
+      && this.accessory.context.CurrentTemperature === undefined) ? 24 : this.HeaterCooler.CurrentTemperature
+      ?? this.accessory.context.CurrentTemperature;
 
-    if (this.HeaterCooler.CurrentTemperature === undefined && this.accessory.context.CurrentTemperature === undefined) {
-      this.HeaterCooler.CurrentTemperature = 24;
-    } else {
-      this.HeaterCooler.CurrentTemperature = this.HeaterCooler.CurrentTemperature || this.accessory.context.CurrentTemperature;
-    }
+    this.HeaterCooler.ThresholdTemperature = this.HeaterCooler.ThresholdTemperature === undefined ? 24 : this.HeaterCooler.ThresholdTemperature
+    ?? this.accessory.context.ThresholdTemperature;
 
-    if (this.HeaterCooler.ThresholdTemperature === undefined && this.accessory.context.ThresholdTemperature === undefined) {
-      this.HeaterCooler.ThresholdTemperature = 24;
-    } else {
-      this.HeaterCooler.ThresholdTemperature = this.HeaterCooler.ThresholdTemperature || this.accessory.context.ThresholdTemperature;
-    }
-
-    if (this.HeaterCooler.RotationSpeed === undefined && this.accessory.context.RotationSpeed === undefined) {
-      this.HeaterCooler.RotationSpeed = 4;
-    } else {
-      this.HeaterCooler.RotationSpeed = this.HeaterCooler.RotationSpeed || this.accessory.context.RotationSpeed;
-    }
+    this.HeaterCooler.RotationSpeed = (this.HeaterCooler.RotationSpeed === undefined && this.accessory.context.RotationSpeed === undefined) ? 4
+      : this.HeaterCooler.RotationSpeed ?? this.accessory.context.RotationSpeed;
 
     await this.getAirConditionerConfigSettings(this.accessory, this.device);
 
-    if (this.meter) {
-      if (this.HumiditySensor!.CurrentRelativeHumidity === undefined && this.accessory.context.CurrentRelativeHumidity === undefined) {
-        this.HumiditySensor!.CurrentRelativeHumidity = 0;
-      } else {
-        this.HumiditySensor!.CurrentRelativeHumidity = this.HumiditySensor!.CurrentRelativeHumidity || this.accessory.context.CurrentRelativeHumidity;
-      }
+    if (this.meter && this.HumiditySensor?.Service) {
+      this.HumiditySensor.CurrentRelativeHumidity = (this.HumiditySensor.CurrentRelativeHumidity === undefined
+        && this.accessory.context.CurrentRelativeHumidity === undefined) ? 0 : this.HumiditySensor.CurrentRelativeHumidity
+        ?? this.accessory.context.CurrentRelativeHumidity;
     }
     await this.debugLog(`Get ThresholdTemperature: ${this.HeaterCooler.ThresholdTemperature}`);
     return this.HeaterCooler.ThresholdTemperature;
@@ -588,42 +574,10 @@ export class AirConditioner extends irdeviceBase {
   }
 
   async getAirConditionerConfigSettings(accessory: PlatformAccessory, device: irdevice & irDevicesConfig): Promise<void> {
-    if (this.device.irair?.hide_automode) {
-      this.hide_automode = device.irair?.hide_automode;
-      accessory.context.hide_automode = this.hide_automode;
-    } else {
-      this.hide_automode = device.irair?.hide_automode;
-      accessory.context.hide_automode = this.hide_automode;
-    }
-
-    if (this.device.irair?.set_max_heat) {
-      this.set_max_heat = device.irair?.set_max_heat;
-      accessory.context.set_max_heat = this.set_max_heat;
-    } else {
-      this.set_max_heat = 35;
-      accessory.context.set_max_heat = this.set_max_heat;
-    }
-    if (this.device.irair?.set_min_heat) {
-      this.set_min_heat = device.irair?.set_min_heat;
-      accessory.context.set_min_heat = this.set_min_heat;
-    } else {
-      this.set_min_heat = 0;
-      accessory.context.set_min_heat = this.set_min_heat;
-    }
-
-    if (this.device.irair?.set_max_cool) {
-      this.set_max_cool = device.irair?.set_max_cool;
-      accessory.context.set_max_cool = this.set_max_cool;
-    } else {
-      this.set_max_cool = 35;
-      accessory.context.set_max_cool = this.set_max_cool;
-    }
-    if (this.device.irair?.set_min_cool) {
-      this.set_min_cool = device.irair?.set_min_cool;
-      accessory.context.set_min_cool = this.set_min_cool;
-    } else {
-      this.set_min_cool = 0;
-      accessory.context.set_min_cool = this.set_min_cool;
-    }
+    accessory.context.hide_automode = this.hide_automode = device.irair?.hide_automode;
+    accessory.context.set_max_heat = this.set_max_heat = device.irair?.set_max_heat ?? 35;
+    accessory.context.set_min_heat = this.set_min_heat = device.irair?.set_min_heat ?? 0;
+    accessory.context.set_max_cool = this.set_max_cool = device.irair?.set_max_cool ?? 35;
+    accessory.context.set_min_cool = this.set_min_cool = device.irair?.set_min_cool ?? 0;
   }
 }

package/src/irdevice/airpurifier.ts

@@ -229,7 +229,7 @@ export class AirPurifier extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           await this.updateHomeKitCharacteristics();
         } else {
@@ -262,10 +262,10 @@ export class AirPurifier extends irdeviceBase {
   }
 
   async apiError(e: any): Promise<void> {
-    this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentHeaterCoolerState, e);
-    this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentAirPurifierState, e);
-    this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.TargetAirPurifierState, e);
     this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.Active, e);
+    this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.TargetAirPurifierState, e);
+    this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentAirPurifierState, e);
+    this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentHeaterCoolerState, e);
     this.TemperatureSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, e);
   }
 }

package/src/irdevice/camera.ts

@@ -106,7 +106,7 @@ export class Camera extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           await this.updateHomeKitCharacteristics();
         } else {
@@ -124,14 +124,9 @@ export class Camera extends irdeviceBase {
 
   async updateHomeKitCharacteristics(): Promise<void> {
     await this.debugLog('updateHomeKitCharacteristics');
-    // On
-    if (this.Switch.On === undefined) {
-      await this.debugLog(`On: ${this.Switch.On}`);
-    } else {
-      this.accessory.context.On = this.Switch.On;
-      this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, this.Switch.On);
-      await this.debugLog(`updateCharacteristic On: ${this.Switch.On}`);
-    }
+    // Active
+    await this.updateCharacteristic(this.Switch.Service, this.hap.Characteristic.On,
+      this.Switch.On, 'On');
   }
 
   async apiError(e: any): Promise<void> {

package/src/irdevice/fan.ts

@@ -206,7 +206,7 @@ export class IRFan extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           await this.updateHomeKitCharacteristics();
         } else {
@@ -224,27 +224,15 @@ export class IRFan extends irdeviceBase {
 
   async updateHomeKitCharacteristics(): Promise<void> {
     await this.debugLog('updateHomeKitCharacteristics');
-    if (this.Fan.Active === undefined) {
-      await this.debugLog(`Active: ${this.Fan.Active}`);
-    } else {
-      this.accessory.context.Active = this.Fan.Active;
-      this.Fan.Service.updateCharacteristic(this.hap.Characteristic.Active, this.Fan.Active);
-      await this.debugLog(`updateCharacteristic Active: ${this.Fan.Active}`);
-    }
-    if (this.Fan.SwingMode === undefined) {
-      await this.debugLog(`SwingMode: ${this.Fan.SwingMode}`);
-    } else {
-      this.accessory.context.SwingMode = this.Fan.SwingMode;
-      this.Fan.Service.updateCharacteristic(this.hap.Characteristic.SwingMode, this.Fan.SwingMode);
-      await this.debugLog(`updateCharacteristic SwingMode: ${this.Fan.SwingMode}`);
-    }
-    if (this.Fan.RotationSpeed === undefined) {
-      await this.debugLog(`RotationSpeed: ${this.Fan.RotationSpeed}`);
-    } else {
-      this.accessory.context.RotationSpeed = this.Fan.RotationSpeed;
-      this.Fan.Service.updateCharacteristic(this.hap.Characteristic.RotationSpeed, this.Fan.RotationSpeed);
-      await this.debugLog(`updateCharacteristic RotationSpeed: ${this.Fan.RotationSpeed}`);
-    }
+    // Active
+    await this.updateCharacteristic(this.Fan.Service, this.hap.Characteristic.Active,
+      this.Fan.Active, 'Active');
+    // SwingMode
+    await this.updateCharacteristic(this.Fan.Service, this.hap.Characteristic.SwingMode,
+      this.Fan.SwingMode, 'SwingMode');
+    // RotationSpeed
+    await this.updateCharacteristic(this.Fan.Service, this.hap.Characteristic.RotationSpeed,
+      this.Fan.RotationSpeed, 'RotationSpeed');
   }
 
   async apiError(e: any): Promise<void> {

package/src/irdevice/irdevice.ts

@@ -44,7 +44,7 @@ export abstract class irdeviceBase {
       .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
       .setCharacteristic(this.hap.Characteristic.AppMatchingIdentifier, 'id1087374760')
       .setCharacteristic(this.hap.Characteristic.Name, accessory.context.name ?? accessory.displayName)
-      .setCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.context.name ?? accessory.displayName)
+      .setCharacteristic(this.hap.Characteristic.ConfiguredName, String(accessory.context.name ?? accessory.displayName))
       .setCharacteristic(this.hap.Characteristic.Model, accessory.context.model ?? 'Unknown')
       .setCharacteristic(this.hap.Characteristic.ProductData, accessory.context.deviceId)
       .setCharacteristic(this.hap.Characteristic.SerialNumber, accessory.context.deviceId);
@@ -202,7 +202,7 @@ export abstract class irdeviceBase {
   }
 
   async successfulStatusCodes(statusCode: any, deviceStatus: any) {
-    return (statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100);
+    return await this.successfulStatusCodes(statusCode, deviceStatus);
   }
 
   /**

package/src/irdevice/light.ts

@@ -219,7 +219,7 @@ export class Light extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           this.accessory.context.On = On;
           await this.updateHomeKitCharacteristics();
@@ -239,34 +239,20 @@ export class Light extends irdeviceBase {
 
   async updateHomeKitCharacteristics(): Promise<void> {
     await this.debugLog('updateHomeKitCharacteristics');
-    if (!this.device.irlight?.stateless) {
+    if (!this.device.irlight?.stateless && this.LightBulb?.Service) {
       // On
-      if (this.LightBulb?.On === undefined) {
-        await this.debugLog(`On: ${this.LightBulb?.On}`);
-      } else {
-        this.accessory.context.On = this.LightBulb.On;
-        this.LightBulb?.Service.updateCharacteristic(this.hap.Characteristic.On, this.LightBulb.On);
-        await this.debugLog(`updateCharacteristic On: ${this.LightBulb.On}`);
-      }
+      await this.updateCharacteristic(this.LightBulb.Service, this.hap.Characteristic.On,
+        this.LightBulb.On, 'On');
     } else {
+      if (this.ProgrammableSwitchOn?.Service) {
       // On Stateful Programmable Switch
-      if (this.ProgrammableSwitchOn?.ProgrammableSwitchOutputState === undefined) {
-        await this.debugLog(`ProgrammableSwitchOutputStateOn: ${this.ProgrammableSwitchOn?.ProgrammableSwitchOutputState}`);
-      } else {
-        this.accessory.context.ProgrammableSwitchOutputStateOn = this.ProgrammableSwitchOn.ProgrammableSwitchOutputState;
-        this.ProgrammableSwitchOn?.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState,
-          this.ProgrammableSwitchOn.ProgrammableSwitchOutputState);
-        this.debugLog('updateCharacteristic'
-          + ` ProgrammableSwitchOutputStateOn: ${this.ProgrammableSwitchOn.ProgrammableSwitchOutputState}`);
+        await this.updateCharacteristic(this.ProgrammableSwitchOn.Service, this.hap.Characteristic.ProgrammableSwitchOutputState,
+          this.ProgrammableSwitchOn.ProgrammableSwitchOutputState, 'ProgrammableSwitchOutputState');
       }
+      if (this.ProgrammableSwitchOff?.Service) {
       // Off Stateful Programmable Switch
-      if (this.ProgrammableSwitchOff?.ProgrammableSwitchOutputState === undefined) {
-        await this.debugLog(`ProgrammableSwitchOutputStateOff: ${this.ProgrammableSwitchOff?.ProgrammableSwitchOutputState}`);
-      } else {
-        this.accessory.context.ProgrammableSwitchOutputStateOff = this.ProgrammableSwitchOff.ProgrammableSwitchOutputState;
-        this.ProgrammableSwitchOff.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState,
-          this.ProgrammableSwitchOff.ProgrammableSwitchOutputState);
-        await this.debugLog(`updateCharacteristic ProgrammableSwitchOutputStateOff: ${this.ProgrammableSwitchOff?.ProgrammableSwitchOutputState}`);
+        await this.updateCharacteristic(this.ProgrammableSwitchOff.Service, this.hap.Characteristic.ProgrammableSwitchOutputState,
+          this.ProgrammableSwitchOff.ProgrammableSwitchOutputState, 'ProgrammableSwitchOutputState');
       }
     }
   }

package/src/irdevice/other.ts

@@ -537,7 +537,7 @@ export class Others extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           await this.updateHomeKitCharacteristics();
         } else {

package/src/irdevice/tv.ts

@@ -369,7 +369,7 @@ export class TV extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           await this.updateHomeKitCharacteristics();
         } else {
@@ -388,22 +388,11 @@ export class TV extends irdeviceBase {
   async updateHomeKitCharacteristics(): Promise<void> {
     await this.debugLog('updateHomeKitCharacteristics');
     // Active
-    if (this.Television.Active === undefined) {
-      await this.debugLog(`Active: ${this.Television.Active}`);
-    } else {
-      this.accessory.context.Active = this.Television.Active;
-      this.Television.Service.updateCharacteristic(this.hap.Characteristic.Active, this.Television.Active);
-      await this.debugLog(`updateCharacteristic Active: ${this.Television.Active}`);
-    }
+    await this.updateCharacteristic(this.Television.Service, this.hap.Characteristic.Active,
+      this.Television.Active, 'Active');
     // ActiveIdentifier
-    if (this.Television.ActiveIdentifier === undefined) {
-      await this.debugLog(`ActiveIdentifier: ${this.Television.ActiveIdentifier}`);
-    } else {
-      this.accessory.context.ActiveIdentifier = this.Television.ActiveIdentifier;
-      this.Television.Service.updateCharacteristic(this.hap.Characteristic.ActiveIdentifier, this.Television.ActiveIdentifier);
-      await this.debugLog('updateCharacteristic'
-        + ` ActiveIdentifier: ${this.Television.ActiveIdentifier}`);
-    }
+    await this.updateCharacteristic(this.Television.Service, this.hap.Characteristic.ActiveIdentifier,
+      this.Television.ActiveIdentifier, 'ActiveIdentifier');
   }
 
   async apiError(e: any): Promise<void> {

package/src/irdevice/vacuumcleaner.ts

@@ -103,7 +103,7 @@ export class VacuumCleaner extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           await this.updateHomeKitCharacteristics();
         } else {
@@ -122,13 +122,8 @@ export class VacuumCleaner extends irdeviceBase {
   async updateHomeKitCharacteristics(): Promise<void> {
     await this.debugLog('updateHomeKitCharacteristics');
     // On
-    if (this.Switch.On === undefined) {
-      await this.debugLog(`On: ${this.Switch.On}`);
-    } else {
-      this.accessory.context.On = this.Switch.On;
-      this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, this.Switch.On);
-      await this.debugLog(`updateCharacteristic On: ${this.Switch.On}`);
-    }
+    await this.updateCharacteristic(this.Switch.Service, this.hap.Characteristic.On,
+      this.Switch.On, 'On');
   }
 
   async apiError(e: any): Promise<void> {

package/src/irdevice/waterheater.ts

@@ -105,7 +105,7 @@ export class WaterHeater extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           await this.updateHomeKitCharacteristics();
         } else {
@@ -124,13 +124,8 @@ export class WaterHeater extends irdeviceBase {
   async updateHomeKitCharacteristics(): Promise<void> {
     await this.debugLog('updateHomeKitCharacteristics');
     // Active
-    if (this.Valve.Active === undefined) {
-      await this.debugLog(`Active: ${this.Valve.Active}`);
-    } else {
-      this.accessory.context.Active = this.Valve.Active;
-      this.Valve.Service.updateCharacteristic(this.hap.Characteristic.Active, this.Valve.Active);
-      await this.debugLog(`updateCharacteristic Active: ${this.Valve.Active}`);
-    }
+    await this.updateCharacteristic(this.Valve.Service, this.hap.Characteristic.Active,
+      this.Valve.Active, 'Active');
   }
 
   async apiError({ e }: { e: any }): Promise<void> {