@switchbot/homebridge-switchbot 1.3.1-beta.1 → 1.3.1-beta.13

package/src/devices/meters.ts

@@ -3,7 +3,7 @@ import { interval, Subject } from 'rxjs';
 import { skipWhile } from 'rxjs/operators';
 import { SwitchBotPlatform } from '../platform';
 import { Service, PlatformAccessory, Units, CharacteristicValue } from 'homebridge';
-import { DeviceURL, device, devicesConfig, serviceData, ad, switchbot, deviceStatusResponse } from '../settings';
+import { DeviceURL, device, devicesConfig, serviceData, ad, switchbot, deviceStatusResponse, temperature } from '../settings';
 
 /**
  * Platform Accessory
@@ -18,8 +18,11 @@ export class Meter {
 
   // Characteristic Values
   CurrentRelativeHumidity!: CharacteristicValue;
+  CurrentRelativeHumidityCached!: CharacteristicValue;
   CurrentTemperature!: CharacteristicValue;
+  CurrentTemperatureCached!: CharacteristicValue;
   BatteryLevel!: CharacteristicValue;
+  BatteryLevelCached!: CharacteristicValue;
   ChargingState!: CharacteristicValue;
   StatusLowBattery!: CharacteristicValue;
   Active!: CharacteristicValue;
@@ -32,10 +35,9 @@ export class Meter {
   connected?: boolean;
   switchbot!: switchbot;
   serviceData!: serviceData;
+  temperature!: temperature['c'];
   battery!: serviceData['battery'];
   humidity!: serviceData['humidity'];
-  fahrenheit!: serviceData['fahrenheit'];
-  temperature!: serviceData['temperature'];
 
   // Config
   private readonly deviceDebug = this.platform.config.options?.debug === 'device' || this.platform.debugMode;
@@ -51,15 +53,31 @@ export class Meter {
     public device: device & devicesConfig,
   ) {
     // Meter Config
-    this.platform.device(`Meter: ${this.accessory.displayName} Config: (ble: ${device.ble}, unit: ${device.meter?.unit},`
-      + ` hide_temperature: ${device.meter?.hide_temperature}, hide_humidity: ${device.meter?.hide_humidity})`);
+    this.platform.device(`Meter: ${this.accessory.displayName} Config: (ble: ${device.ble}, hide_temperature: ${device.meter?.hide_temperature},`
+      + ` hide_humidity: ${device.meter?.hide_humidity})`);
 
     // default placeholders
-    this.BatteryLevel = 0;
-    this.ChargingState = 2;
-    this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
-    this.CurrentRelativeHumidity = 0;
-    this.CurrentTemperature = 0;
+    if (this.BatteryLevel === undefined) {
+      this.BatteryLevel = 100;
+    } else {
+      this.BatteryLevel = this.accessory.context.BatteryLevel;
+    }
+    if (this.BatteryLevel < 15) {
+      this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+    } else {
+      this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+    }
+    this.ChargingState = this.platform.Characteristic.ChargingState.NOT_CHARGEABLE;
+    if (this.CurrentRelativeHumidity === undefined) {
+      this.CurrentRelativeHumidity = 0;
+    } else {
+      this.CurrentRelativeHumidity = this.accessory.context.CurrentRelativeHumidity;
+    }
+    if (this.CurrentTemperature === undefined) {
+      this.CurrentTemperature = 0;
+    } else {
+      this.CurrentTemperature = this.accessory.context.CurrentTemperature;
+    }
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doMeterUpdate = new Subject();
@@ -177,9 +195,9 @@ export class Meter {
     // Battery
     this.BatteryLevel = Number(this.battery);
     if (this.BatteryLevel < 15) {
-      this.StatusLowBattery = 1;
+      this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
     } else {
-      this.StatusLowBattery = 0;
+      this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
     }
     this.platform.debug(`${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
 
@@ -191,13 +209,8 @@ export class Meter {
 
     // Current Temperature
     if (!this.device.meter?.hide_temperature) {
-      if (this.device.meter?.unit === 1) {
-        this.CurrentTemperature = this.toFahrenheit(this.temperature!.c);
-      } else if (this.device.meter?.unit === 0) {
-        this.CurrentTemperature = this.toCelsius(this.temperature!.c);
-      } else {
-        this.CurrentTemperature = Number(this.temperature?.c);
-      }
+      this.temperature < 0 ? 0 : this.temperature > 100 ? 100 : this.temperature;
+      this.CurrentTemperature = this.temperature;
       this.platform.debug(`Meter: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
     }
   }
@@ -211,9 +224,9 @@ export class Meter {
         this.BatteryLevel = 10;
       }
       if (this.BatteryLevel < 15) {
-        this.StatusLowBattery = 1;
+        this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
       } else {
-        this.StatusLowBattery = 0;
+        this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
       }
       // Current Relative Humidity
       if (!this.device.meter?.hide_humidity) {
@@ -223,13 +236,7 @@ export class Meter {
 
       // Current Temperature
       if (!this.device.meter?.hide_temperature) {
-        if (this.device.meter?.unit === 1) {
-          this.CurrentTemperature = this.toFahrenheit(this.deviceStatus.body.temperature!);
-        } else if (this.device.meter?.unit === 0) {
-          this.CurrentTemperature = this.toCelsius(this.deviceStatus.body.temperature!);
-        } else {
-          this.CurrentTemperature = Number(this.deviceStatus.body.temperature);
-        }
+        this.CurrentTemperature = Number(this.deviceStatus.body.temperature);
         this.platform.debug(`Meter: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
       }
     }
@@ -259,20 +266,18 @@ export class Meter {
     const switchbot = this.connectBLE();
     // Start to monitor advertisement packets
     switchbot.startScan({
-      model: 'T',
       id: this.device.bleMac,
     }).then(() => {
       // Set an event hander
       switchbot.onadvertisement = (ad: ad) => {
         this.serviceData = ad.serviceData;
-        this.temperature = ad.serviceData.temperature;
-        this.fahrenheit = ad.serviceData.fahrenheit;
+        this.temperature = ad.serviceData.temperature!.c;
         this.humidity = ad.serviceData.humidity;
         this.battery = ad.serviceData.battery;
         this.platform.device(`Meter: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
         this.platform.device(`Meter: ${this.accessory.displayName} model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName}, `
-          + `temperature: ${JSON.stringify(ad.serviceData.temperature)}, fahrenheit: ${ad.serviceData.fahrenheit}, `
-          + `humidity: ${ad.serviceData.humidity}, battery: ${ad.serviceData.battery}`);
+          + `temperature: ${JSON.stringify(ad.serviceData.temperature?.c)}, humidity: ${ad.serviceData.humidity}, `
+          + `battery: ${ad.serviceData.battery}`);
 
         if (this.serviceData) {
           this.connected = true;
@@ -288,6 +293,12 @@ export class Meter {
       // Stop to monitor
       switchbot.stopScan();
       if (this.connected) {
+        this.CurrentTemperatureCached = this.temperature;
+        this.accessory.context.CurrentTemperature = this.CurrentTemperatureCached;
+        this.CurrentRelativeHumidityCached = this.humidity!;
+        this.accessory.context.CurrentRelativeHumidity = this.CurrentRelativeHumidityCached;
+        this.BatteryLevelCached = this.battery!;
+        this.accessory.context.BatteryLevel = this.BatteryLevelCached;
         this.parseStatus();
         this.updateHomeKitCharacteristics();
       } else {
@@ -321,6 +332,12 @@ export class Meter {
       try {
         this.deviceStatus = (await this.platform.axios.get(`${DeviceURL}/${this.device.deviceId}/status`)).data;
         this.platform.debug(`Meter: ${this.accessory.displayName} openAPIRefreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+        this.CurrentTemperatureCached = this.deviceStatus.body.humidity!;
+        this.accessory.context.CurrentTemperature = this.CurrentTemperatureCached;
+        this.CurrentRelativeHumidityCached = this.deviceStatus.body.humidity!;
+        this.accessory.context.CurrentRelativeHumidity = this.CurrentRelativeHumidityCached;
+        this.BatteryLevelCached = 100;
+        this.accessory.context.BatteryLevel = this.BatteryLevelCached;
         this.parseStatus();
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
@@ -382,19 +399,4 @@ export class Meter {
       this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, e);
     }
   }
-
-  /**
-   * Converts the value to celsius if the temperature units are in Fahrenheit
-   */
-  toCelsius(value: number) {
-    // celsius should be to the nearest 0.5 degree
-    return Math.round((5 / 9) * (value - 32) * 2) / 2;
-  }
-
-  /**
-   * Converts the value to fahrenheit if the temperature units are in Fahrenheit
-   */
-  toFahrenheit(value: number) {
-    return Math.round((value * 9) / 5 + 32);
-  }
 }

package/src/devices/plugs.ts

@@ -2,7 +2,7 @@
 import { AxiosResponse } from 'axios';
 import { interval, Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
-import { debounceTime, skipWhile, tap } from 'rxjs/operators';
+import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
 import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
 import { DeviceURL, device, devicesConfig, deviceStatusResponse, payload } from '../settings';
 
@@ -12,6 +12,7 @@ export class Plug {
 
   // Characteristic Values
   On!: CharacteristicValue;
+  OnCached!: CharacteristicValue;
 
   // OpenAPI Others
   deviceStatus!: deviceStatusResponse;
@@ -29,8 +30,15 @@ export class Plug {
     private accessory: PlatformAccessory,
     public device: device & devicesConfig,
   ) {
+    // Bot Config
+    this.platform.device(`Plug: ${this.accessory.displayName} Config: (offline: ${device.offline})`);
+
     // default placeholders
-    this.On = false;
+    if (this.On === undefined) {
+      this.On = false;
+    } else {
+      this.On = this.accessory.context.On;
+    }
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doPlugUpdate = new Subject();
@@ -142,24 +150,34 @@ export class Plug {
  * Plug   -    "command"     "turnOn"    "default"	  =        set to ON state
  */
   async pushChanges() {
-    const payload = {
-      commandType: 'command',
-      parameter: 'default',
-    } as payload;
-
-    if (this.On) {
-      payload.command = 'turnOn';
-    } else {
-      payload.command = 'turnOff';
-    }
+    if (this.On !== this.OnCached) {
+      const payload = {
+        commandType: 'command',
+        parameter: 'default',
+      } as payload;
+
+      if (this.On) {
+        payload.command = 'turnOn';
+      } else {
+        payload.command = 'turnOff';
+      }
 
-    this.platform.log.info(`Plug: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
-      + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
+      this.platform.log.info(`Plug: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
+        + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
 
-    // Make the API request
-    const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
-    this.platform.debug(`Plug: ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
-    this.statusCode(push);
+      // Make the API request
+      const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
+      this.platform.debug(`Plug: ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
+      this.statusCode(push);
+      this.OnCached = this.On;
+      this.accessory.context.On = this.OnCached;
+    }
+    interval(5000)
+      .pipe(skipWhile(() => this.plugUpdateInProgress))
+      .pipe(take(1))
+      .subscribe(() => {
+        this.refreshStatus();
+      });
   }
 
   updateHomeKitCharacteristics() {
@@ -188,9 +206,11 @@ export class Plug {
         break;
       case 161:
         this.platform.log.error(`Plug: ${this.accessory.displayName} Device is offline.`);
+        this.offlineOff();
         break;
       case 171:
         this.platform.log.error(`Plug: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
+        this.offlineOff();
         break;
       case 190:
         this.platform.log.error(`Plug: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
@@ -204,6 +224,13 @@ export class Plug {
     }
   }
 
+  private offlineOff() {
+    if (this.device.offline) {
+      this.On = false;
+      this.service.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
+    }
+  }
+
   /**
    * Handle requests to set the value of the "On" characteristic
    */

package/src/irdevices/airconditioners.ts

@@ -14,9 +14,11 @@ export class AirConditioner {
 
   // Characteristic Values
   Active!: CharacteristicValue;
+  ActiveCached!: CharacteristicValue;
   RotationSpeed!: CharacteristicValue;
   LastTemperature!: CharacteristicValue;
   CurrentTemperature!: CharacteristicValue;
+  CurrentTemperatureCached!: CharacteristicValue;
   TargetHeaterCoolerState?: CharacteristicValue;
   CurrentHeaterCoolerState!: CharacteristicValue;
   HeatingThresholdTemperature?: CharacteristicValue;
@@ -41,7 +43,17 @@ export class AirConditioner {
     private accessory: PlatformAccessory,
     public device: irdevice & irDevicesConfig,
   ) {
-    this.CurrentTemperature = 24;
+    // default placeholders
+    if (this.Active === undefined) {
+      this.Active = this.platform.Characteristic.Active.INACTIVE;
+    } else {
+      this.Active = this.accessory.context.Active;
+    }
+    if (this.CurrentTemperature === undefined) {
+      this.CurrentTemperature = 24;
+    } else {
+      this.CurrentTemperature = this.accessory.context.CurrentTemperature;
+    }
 
     // set accessory information
     accessory
@@ -161,6 +173,8 @@ export class AirConditioner {
       this.platform.device(`Air Conditioner: ${this.accessory.displayName} pushAirConditionerOffChanges, Active: ${this.Active}`);
     }
     this.Active = value;
+    this.ActiveCached = this.Active;
+    this.accessory.context.Active = this.ActiveCached;
   }
 
   private updateHomeKitCharacteristics() {
@@ -349,6 +363,8 @@ export class AirConditioner {
       const push: any = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
       this.platform.log.error(`Air Conditioner: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
       this.statusCode(push);
+      this.CurrentTemperatureCached = this.CurrentTemperature;
+      this.accessory.context.CurrentTemperature = this.CurrentTemperatureCached;
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.platform.log.error(`Air Conditioner: ${this.accessory.displayName} failed pushChanges`);

package/src/irdevices/airpurifiers.ts

@@ -15,11 +15,13 @@ export class AirPurifier {
   // Characteristic Values
   Active!: CharacteristicValue;
   APActive!: CharacteristicValue;
+  ActiveCached!: CharacteristicValue;
   CurrentAPTemp!: CharacteristicValue;
   CurrentAPMode!: CharacteristicValue;
   RotationSpeed!: CharacteristicValue;
   CurrentAPFanSpeed!: CharacteristicValue;
   CurrentTemperature!: CharacteristicValue;
+  CurrentTemperatureCached!: CharacteristicValue;
   CurrentAirPurifierState!: CharacteristicValue;
   CurrentHeaterCoolerState!: CharacteristicValue;
 
@@ -42,6 +44,18 @@ export class AirPurifier {
     private accessory: PlatformAccessory,
     public device: irdevice & irDevicesConfig,
   ) {
+    // default placeholders
+    if (this.Active === undefined) {
+      this.Active = this.platform.Characteristic.Active.INACTIVE;
+    } else {
+      this.Active = this.accessory.context.Active;
+    }
+    if (this.CurrentTemperature === undefined) {
+      this.CurrentTemperature = 24;
+    } else {
+      this.CurrentTemperature = this.accessory.context.CurrentTemperature;
+    }
+
     // set accessory information
     accessory
       .getService(this.platform.Service.AccessoryInformation)!
@@ -81,6 +95,8 @@ export class AirPurifier {
       this.pushAirConditionerOnChanges();
     }
     this.Active = value;
+    this.ActiveCached = this.Active;
+    this.accessory.context.Active = this.ActiveCached;
   }
 
   private updateHomeKitCharacteristics() {
@@ -210,6 +226,8 @@ export class AirPurifier {
       this.platform.debug(`Air Purifier: ${this.accessory.displayName} pushChanges: ${push.data}`);
       this.statusCode(push);
       this.updateHomeKitCharacteristics();
+      this.CurrentTemperatureCached = this.CurrentTemperature;
+      this.accessory.context.CurrentTemperature = this.CurrentTemperatureCached;
     } catch (e: any) {
       this.platform.log.error(`Air Purifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
       if (this.deviceDebug) {

package/src/irdevices/cameras.ts

@@ -14,6 +14,7 @@ export class Camera {
 
   // Characteristic Values
   On!: CharacteristicValue;
+  OnCached!: CharacteristicValue;
 
   // Config
   private readonly deviceDebug = this.platform.config.options?.debug === 'device' || this.platform.debugMode;
@@ -24,6 +25,13 @@ export class Camera {
     private accessory: PlatformAccessory,
     public device: irdevice & irDevicesConfig,
   ) {
+    // default placeholders
+    if (this.On === undefined) {
+      this.On = false;
+    } else {
+      this.On = this.accessory.context.On;
+    }
+
     // set accessory information
     accessory
       .getService(this.platform.Service.AccessoryInformation)!
@@ -110,6 +118,8 @@ export class Camera {
       this.platform.debug(`Camera: ${this.accessory.displayName} pushChanges: ${push.data}`);
       this.statusCode(push);
       this.updateHomeKitCharacteristics();
+      this.OnCached = this.On;
+      this.accessory.context.On = this.OnCached;
     } catch (e: any) {
       this.platform.log.error(`Camera: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
       if (this.deviceDebug) {

package/src/irdevices/fans.ts

@@ -14,6 +14,7 @@ export class Fan {
 
   // Characteristic Values
   Active!: CharacteristicValue;
+  ActiveCached!: CharacteristicValue;
   ActiveIdentifier!: CharacteristicValue;
   RotationSpeed!: CharacteristicValue;
   SwingMode!: CharacteristicValue;
@@ -34,6 +35,13 @@ export class Fan {
     private accessory: PlatformAccessory,
     public device: irdevice & irDevicesConfig,
   ) {
+    // default placeholders
+    if (this.Active === undefined) {
+      this.Active = this.platform.Characteristic.Active.INACTIVE;
+    } else {
+      this.Active = this.accessory.context.Active;
+    }
+
     // set accessory information
     accessory
       .getService(this.platform.Service.AccessoryInformation)!
@@ -164,6 +172,8 @@ export class Fan {
       this.pushFanOnChanges();
     }
     this.Active = value;
+    this.ActiveCached = this.Active;
+    this.accessory.context.Active = this.ActiveCached;
   }
 
   /**

package/src/irdevices/lights.ts

@@ -14,6 +14,7 @@ export class Light {
 
   // Characteristic Values
   On!: CharacteristicValue;
+  OnCached!: CharacteristicValue;
 
   // Config
   private readonly deviceDebug = this.platform.config.options?.debug === 'device' || this.platform.debugMode;
@@ -24,6 +25,13 @@ export class Light {
     private accessory: PlatformAccessory,
     public device: irdevice & irDevicesConfig,
   ) {
+    // default placeholders
+    if (this.On === undefined) {
+      this.On = false;
+    } else {
+      this.On = this.accessory.context.On;
+    }
+
     // set accessory information
     accessory
       .getService(this.platform.Service.AccessoryInformation)!
@@ -142,6 +150,8 @@ export class Light {
       const push = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
       this.platform.debug(`Light: ${this.accessory.displayName} pushChanges: ${push.data}`);
       this.statusCode(push);
+      this.OnCached = this.On;
+      this.accessory.context.On = this.OnCached;
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.platform.log.error(`Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);

package/src/irdevices/others.ts

@@ -14,6 +14,7 @@ export class Others {
 
   // Characteristic Values
   Active!: CharacteristicValue;
+  ActiveCached!: CharacteristicValue;
 
   // Config
   private readonly deviceDebug = this.platform.config.options?.debug === 'device' || this.platform.debugMode;
@@ -24,6 +25,13 @@ export class Others {
     private accessory: PlatformAccessory,
     public device: irdevice & irDevicesConfig,
   ) {
+    // default placeholders
+    if (this.Active === undefined) {
+      this.Active = this.platform.Characteristic.Active.INACTIVE;
+    } else {
+      this.Active = this.accessory.context.Active;
+    }
+
     // set accessory information
     accessory
       .getService(this.platform.Service.AccessoryInformation)!
@@ -54,6 +62,8 @@ export class Others {
       this.pushOffChanges();
     }
     this.Active = value;
+    this.ActiveCached = this.Active;
+    this.accessory.context.Active = this.ActiveCached;
   }
 
   private updateHomeKitCharacteristics() {

package/src/irdevices/tvs.ts

@@ -15,6 +15,7 @@ export class TV {
 
   // Characteristic Values
   Active!: CharacteristicValue;
+  ActiveCached!: CharacteristicValue;
   ActiveIdentifier!: CharacteristicValue;
 
   // Others
@@ -29,6 +30,13 @@ export class TV {
     private accessory: PlatformAccessory,
     public device: irdevice & irDevicesConfig,
   ) {
+    // default placeholders
+    if (this.Active === undefined) {
+      this.Active = this.platform.Characteristic.Active.INACTIVE;
+    } else {
+      this.Active = this.accessory.context.Active;
+    }
+
     // set accessory information
     accessory
       .getService(this.platform.Service.AccessoryInformation)!
@@ -207,6 +215,8 @@ export class TV {
         this.pushTvOnChanges();
       }
       this.Active = value;
+      this.ActiveCached = this.Active;
+      this.accessory.context.Active = this.ActiveCached;
     }
   }
 

package/src/irdevices/vacuumcleaners.ts

@@ -14,6 +14,7 @@ export class VacuumCleaner {
 
   // Characteristic Values
   On!: CharacteristicValue;
+  OnCached!: CharacteristicValue;
 
   // Config
   private readonly deviceDebug = this.platform.config.options?.debug === 'device' || this.platform.debugMode;
@@ -24,6 +25,13 @@ export class VacuumCleaner {
     private accessory: PlatformAccessory,
     public device: irdevice & irDevicesConfig,
   ) {
+    // default placeholders
+    if (this.On === undefined) {
+      this.On = false;
+    } else {
+      this.On = this.accessory.context.On;
+    }
+
     // set accessory information
     accessory
       .getService(this.platform.Service.AccessoryInformation)!
@@ -109,6 +117,8 @@ export class VacuumCleaner {
       const push = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
       this.platform.debug(`Vacuum Cleaner: ${this.accessory.displayName} pushChanges: ${push.data}`);
       this.statusCode(push);
+      this.OnCached = this.On;
+      this.accessory.context.On = this.OnCached;
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.platform.log.error(`Vacuum Cleaner: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);

package/src/irdevices/waterheaters.ts

@@ -14,6 +14,7 @@ export class WaterHeater {
 
   // Characteristic Values
   Active!: CharacteristicValue;
+  ActiveCached!: CharacteristicValue;
 
   // Config
   private readonly deviceDebug = this.platform.config.options?.debug === 'device' || this.platform.debugMode;
@@ -24,6 +25,13 @@ export class WaterHeater {
     private accessory: PlatformAccessory,
     public device: irdevice & irDevicesConfig,
   ) {
+    // default placeholders
+    if (this.Active === undefined) {
+      this.Active = this.platform.Characteristic.Active.INACTIVE;
+    } else {
+      this.Active = this.accessory.context.Active;
+    }
+
     // set accessory information
     accessory
       .getService(this.platform.Service.AccessoryInformation)!
@@ -71,6 +79,8 @@ export class WaterHeater {
       this.service.setCharacteristic(this.platform.Characteristic.InUse, this.platform.Characteristic.InUse.IN_USE);
     }
     this.Active = value;
+    this.ActiveCached = this.Active;
+    this.accessory.context.Active = this.ActiveCached;
   }
 
   private updateHomeKitCharacteristics() {