@switchbot/homebridge-switchbot 1.3.1-beta.7 → 1.4.1-beta.0

package/src/devices/humidifiers.ts

@@ -3,7 +3,7 @@ import Switchbot from 'node-switchbot';
 import { interval, Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import { Service, PlatformAccessory, CharacteristicValue, HAPStatus } from 'homebridge';
 import { DeviceURL, device, devicesConfig, serviceData, ad, deviceStatusResponse, payload } from '../settings';
 
 /**
@@ -50,7 +50,7 @@ export class Humidifier {
     public device: device & devicesConfig,
   ) {
     // Humidifiers Config
-    this.platform.device(`Humidifier: ${this.accessory.displayName} Config: (ble: ${device.ble}, hide_temperature: `
+    this.platform.device(`Humidifier: ${this.accessory.displayName} Config: (ble: ${device.ble}, offline: ${device.offline}, hide_temperature: `
       + `${device.humidifier?.hide_temperature}, set_minStep: ${device.humidifier?.set_minStep})`);
 
     // default placeholders
@@ -184,7 +184,7 @@ export class Humidifier {
             this.platform.log.error(`Humidifier: ${this.accessory.displayName} failed pushChanges,`
               + ` Error: ${JSON.stringify(e)}`);
           }
-          this.apiError(e);
+          this.apiError();
         }
         this.humidifierUpdateInProgress = false;
       });
@@ -354,7 +354,7 @@ export class Humidifier {
         this.platform.log.warn(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
         await this.openAPIRefreshStatus();
       }
-      this.apiError(e);
+      this.apiError();
     });
   }
 
@@ -380,7 +380,7 @@ export class Humidifier {
           this.platform.log.error(`Humidifier: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
             + ` Error: ${JSON.stringify(e)}`);
         }
-        this.apiError(e);
+        this.apiError();
       }
     }
   }
@@ -424,7 +424,7 @@ export class Humidifier {
         this.platform.log.warn(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
         await this.OpenAPIpushChanges();
       }
-      this.apiError(e);
+      this.apiError();
     });
   }
 
@@ -461,7 +461,7 @@ export class Humidifier {
             this.platform.log.error(`Humidifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
               + ` Error: ${JSON.stringify(e)}`);
           }
-          this.apiError(e);
+          this.apiError();
         }
       } else if (
         this.TargetHumidifierDehumidifierState ===
@@ -510,7 +510,7 @@ export class Humidifier {
         this.platform.log.error(`Humidifier: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection,`
           + ` Error: ${JSON.stringify(e)}`);
       }
-      this.apiError(e);
+      this.apiError();
     }
   }
 
@@ -545,7 +545,7 @@ export class Humidifier {
         this.platform.log.error(`Humidifier: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection,`
           + ` Error: ${JSON.stringify(e)}`);
       }
-      this.apiError(e);
+      this.apiError();
     }
   }
 
@@ -606,18 +606,8 @@ export class Humidifier {
     }
   }
 
-  public apiError(e: any) {
-    this.service.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, e);
-    if (!this.device.ble) {
-      this.service.updateCharacteristic(this.platform.Characteristic.WaterLevel, e);
-    }
-    this.service.updateCharacteristic(this.platform.Characteristic.CurrentHumidifierDehumidifierState, e);
-    this.service.updateCharacteristic(this.platform.Characteristic.TargetHumidifierDehumidifierState, e);
-    this.service.updateCharacteristic(this.platform.Characteristic.Active, e);
-    this.service.updateCharacteristic(this.platform.Characteristic.RelativeHumidityHumidifierThreshold, e);
-    if (!this.device.humidifier?.hide_temperature && !this.device.ble) {
-      this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, e);
-    }
+  public apiError() {
+    throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   }
 
   private statusCode(push: AxiosResponse<{ statusCode: number; }>) {
@@ -633,9 +623,11 @@ export class Humidifier {
         break;
       case 161:
         this.platform.log.error(`Humidifier: ${this.accessory.displayName} Device is offline.`);
+        this.offlineOff();
         break;
       case 171:
         this.platform.log.error(`Humidifier: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
+        this.offlineOff();
         break;
       case 190:
         this.platform.log.error(`Humidifier: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
@@ -649,6 +641,13 @@ export class Humidifier {
     }
   }
 
+  private offlineOff() {
+    if (this.device.offline) {
+      this.Active = this.platform.Characteristic.Active.INACTIVE;
+      this.service.getCharacteristic(this.platform.Characteristic.Active).updateValue(this.Active);
+    }
+  }
+
   /**
    * Handle requests to set the "Target Humidifier Dehumidifier State" characteristic
    */

package/src/devices/indoorcam.ts

@@ -2,7 +2,7 @@ import { AxiosResponse } from 'axios';
 import { interval, Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import { Service, PlatformAccessory, CharacteristicValue, HAPStatus } from 'homebridge';
 import { DeviceURL, device, devicesConfig, deviceStatusResponse, payload } from '../settings';
 
 export class IndoorCam {
@@ -126,7 +126,7 @@ export class IndoorCam {
             this.platform.log.error(`Indoor Cam: ${this.accessory.displayName} failed pushChanges,`
               + ` Error: ${JSON.stringify(e)}`);
           }
-          this.apiError(e);
+          this.apiError();
         }
         this.cameraUpdateInProgress = false;
       });
@@ -139,7 +139,7 @@ export class IndoorCam {
 
   private async refreshStatus() {
     try {
-      this.deviceStatus = (await this.platform.axios.get(`${DeviceURL}/${this.device.deviceId}/status`)).data;
+      //this.deviceStatus = (await this.platform.axios.get(`${DeviceURL}/${this.device.deviceId}/status`)).data;
       this.platform.device(`Indoor Cam: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
       this.parseStatus();
       this.updateHomeKitCharacteristics();
@@ -153,7 +153,7 @@ export class IndoorCam {
         this.platform.log.error(`Indoor Cam: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
           + ` Error: ${JSON.stringify(e)}`);
       }
-      this.apiError(e);
+      this.apiError();
     }
   }
 
@@ -198,8 +198,8 @@ export class IndoorCam {
     }
   }
 
-  public apiError(e: any) {
-    this.service.updateCharacteristic(this.platform.Characteristic.SelectedRTPStreamConfiguration, e);
+  public apiError() {
+    throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   }
 
   private statusCode(push: AxiosResponse<{ statusCode: number; }>) {
@@ -215,9 +215,15 @@ export class IndoorCam {
         break;
       case 161:
         this.platform.log.error(`Indoor Cam: ${this.accessory.displayName} Device is offline.`);
+        if (this.device.offline) {
+          this.Active = false;
+        }
         break;
       case 171:
         this.platform.log.error(`Indoor Cam: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
+        if (this.device.offline) {
+          this.Active = false;
+        }
         break;
       case 190:
         this.platform.log.error(`Indoor Cam: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`

package/src/devices/meters.ts

@@ -2,8 +2,8 @@ import Switchbot from 'node-switchbot';
 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 { Service, PlatformAccessory, Units, CharacteristicValue, HAPStatus } from 'homebridge';
+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`);
       }
     }
@@ -240,9 +247,9 @@ export class Meter {
    */
   async refreshStatus() {
     if (this.device.ble) {
-      await this.BLErefreshStatus();
+      this.BLErefreshStatus();
     } else {
-      await this.openAPIRefreshStatus();
+      this.openAPIRefreshStatus();
     }
   }
 
@@ -253,7 +260,7 @@ export class Meter {
     return switchbot;
   }
 
-  private async BLErefreshStatus() {
+  private BLErefreshStatus() {
     this.platform.debug(`Meter: ${this.accessory.displayName} BLE RefreshStatus`);
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const switchbot = this.connectBLE();
@@ -265,14 +272,13 @@ export class Meter {
       // 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,13 +294,19 @@ 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 {
         this.platform.log.error(`Meter: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
         if (this.platform.config.credentials?.openToken) {
           this.platform.log.warn(`Meter: ${this.accessory.displayName} Using OpenAPI Connection`);
-          await this.openAPIRefreshStatus();
+          this.openAPIRefreshStatus();
         }
       }
     }).catch(async (e: any) => {
@@ -309,9 +321,9 @@ export class Meter {
       }
       if (this.platform.config.credentials?.openToken) {
         this.platform.log.warn(`Meter: ${this.accessory.displayName} Using OpenAPI Connection`);
-        await this.openAPIRefreshStatus();
+        this.openAPIRefreshStatus();
       }
-      this.apiError(e);
+      this.apiError();
     });
   }
 
@@ -321,6 +333,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) {
@@ -333,7 +351,7 @@ export class Meter {
           this.platform.log.error(`Meter: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
             + ` Error: ${JSON.stringify(e)}`);
         }
-        this.apiError(e);
+        this.apiError();
       }
     }
   }
@@ -372,29 +390,7 @@ export class Meter {
     }
   }
 
-  public apiError(e: any) {
-    this.service.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
-    this.service.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
-    if (!this.device.meter?.hide_humidity) {
-      this.humidityservice?.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, e);
-    }
-    if (!this.device.meter?.hide_temperature) {
-      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);
+  public apiError() {
+    throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   }
 }

package/src/devices/motion.ts

@@ -2,7 +2,7 @@ import Switchbot from 'node-switchbot';
 import { interval, Subject } from 'rxjs';
 import { skipWhile } from 'rxjs/operators';
 import { SwitchBotPlatform } from '../platform';
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import { Service, PlatformAccessory, CharacteristicValue, HAPStatus } from 'homebridge';
 import { DeviceURL, device, devicesConfig, serviceData, switchbot, deviceStatusResponse } from '../settings';
 
 /**
@@ -224,7 +224,7 @@ export class Motion {
         this.platform.log.warn(`Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
         await this.openAPIRefreshStatus();
       }
-      this.apiError(e);
+      this.apiError();
     });
   }
 
@@ -246,7 +246,7 @@ export class Motion {
           this.platform.log.error(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
             + ` Error: ${JSON.stringify(e)}`);
         }
-        this.apiError(e);
+        this.apiError();
       }
     }
   }
@@ -284,12 +284,7 @@ export class Motion {
     }
   }
 
-  public apiError(e: any) {
-    this.service.updateCharacteristic(this.platform.Characteristic.MotionDetected, e);
-    if (this.device.ble) {
-      this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
-      this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
-      this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, e);
-    }
+  public apiError() {
+    throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   }
 }

package/src/devices/plugs.ts

@@ -3,7 +3,7 @@ import { AxiosResponse } from 'axios';
 import { interval, Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import { Service, PlatformAccessory, CharacteristicValue, HAPStatus } from 'homebridge';
 import { DeviceURL, device, devicesConfig, deviceStatusResponse, payload } from '../settings';
 
 export class Plug {
@@ -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();
@@ -98,7 +106,7 @@ export class Plug {
             this.platform.log.error(`Plug: ${this.accessory.displayName} failed pushChanges,`
               + ` Error: ${JSON.stringify(e)}`);
           }
-          this.apiError(e);
+          this.apiError();
         }
         this.plugUpdateInProgress = false;
       });
@@ -131,7 +139,7 @@ export class Plug {
         this.platform.log.error(`Plug: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
           + ` Error: ${JSON.stringify(e)}`);
       }
-      this.apiError(e);
+      this.apiError();
     }
   }
 
@@ -142,24 +150,28 @@ 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))
@@ -177,8 +189,8 @@ export class Plug {
     }
   }
 
-  public apiError(e: any) {
-    this.service.updateCharacteristic(this.platform.Characteristic.On, e);
+  public apiError() {
+    throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   }
 
   private statusCode(push: AxiosResponse<{ statusCode: number; }>) {
@@ -194,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,`
@@ -210,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
    */