@switchbot/homebridge-switchbot 2.2.0-beta.2 → 2.2.0-beta.3

package/src/device/colorbulb.ts

@@ -506,85 +506,85 @@ export class ColorBulb {
 
   async BLEpushChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
-    //if (this.On !== this.accessory.context.On) {
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
-    const switchbot = await this.platform.connectBLE();
-    // Convert to BLE Address
-    this.device.bleMac = this.device
-      .deviceId!.match(/.{1,2}/g)!
-      .join(':')
-      .toLowerCase();
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-    switchbot
-      .discover({
-        model: 'u',
-        id: this.device.bleMac,
-      })
-      .then((device_list: any) => {
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
-        return this.turnOnOff(device_list);
-      })
-      .then(() => {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-        this.On = false;
-      })
-      .catch(async (e: any) => {
-        this.apiError(e);
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
+    if (this.On !== this.accessory.context.On) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
+      const switchbot = await this.platform.connectBLE();
+      // Convert to BLE Address
+      this.device.bleMac = this.device
+        .deviceId!.match(/.{1,2}/g)!
+        .join(':')
+        .toLowerCase();
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+      switchbot
+        .discover({
+          model: 'u',
+          id: this.device.bleMac,
+        })
+        .then((device_list: any) => {
+          this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+          return this.turnOnOff(device_list);
+        })
+        .then(() => {
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+          this.On = false;
+        })
+        .catch(async (e: any) => {
+          this.apiError(e);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
         + ` Connection, Error Message: ${superStringify(e.message)}`);
-        await this.BLEPushConnection();
-      });
-    // Push Brightness Update
-    if (this.On) {
-      await this.BLEpushBrightnessChanges();
-    }
-    // Push ColorTemperature Update
-    if (this.On) {
-      await this.BLEpushColorTemperatureChanges();
-    }
-    // Push Hue & Saturation Update
-    if (this.On) {
-      await this.BLEpushRGBChanges();
+          await this.BLEPushConnection();
+        });
+      // Push Brightness Update
+      if (this.On) {
+        await this.BLEpushBrightnessChanges();
+      }
+      // Push ColorTemperature Update
+      if (this.On) {
+        await this.BLEpushColorTemperatureChanges();
+      }
+      // Push Hue & Saturation Update
+      if (this.On) {
+        await this.BLEpushRGBChanges();
+      }
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` + `On: ${this.On}, `
+         +`OnCached: ${this.accessory.context.On}`);
     }
-    // } else {
-    //   this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` + `On: ${this.On}, `
-    //     +`OnCached: ${this.accessory.context.On}`);
-    // }
   }
 
   async BLEpushBrightnessChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushBrightnessChanges`);
-    //if (this.Brightness !== this.accessory.context.Brightness) {
-    const switchbot = await this.platform.connectBLE();
-    // Convert to BLE Address
-    this.device.bleMac = this.device
-      .deviceId!.match(/.{1,2}/g)!
-      .join(':')
-      .toLowerCase();
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-    switchbot
-      .discover({
-        model: 'u',
-        id: this.device.bleMac,
-      })
-      .then((device_list: any) => {
-        this.infoLog(`${this.accessory.displayName} Target Brightness: ${this.Brightness}`);
-        return device_list[0].setBrightness(this.Brightness);
-      })
-      .then(() => {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
-        this.On = false;
-      })
-      .catch(async (e: any) => {
-        this.apiError(e);
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushBrightnessChanges with ${this.device.connectionType}`
+    if (this.Brightness !== this.accessory.context.Brightness) {
+      const switchbot = await this.platform.connectBLE();
+      // Convert to BLE Address
+      this.device.bleMac = this.device
+        .deviceId!.match(/.{1,2}/g)!
+        .join(':')
+        .toLowerCase();
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+      switchbot
+        .discover({
+          model: 'u',
+          id: this.device.bleMac,
+        })
+        .then((device_list: any) => {
+          this.infoLog(`${this.accessory.displayName} Target Brightness: ${this.Brightness}`);
+          return device_list[0].setBrightness(this.Brightness);
+        })
+        .then(() => {
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+          this.On = false;
+        })
+        .catch(async (e: any) => {
+          this.apiError(e);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushBrightnessChanges with ${this.device.connectionType}`
         + ` Connection, Error Message: ${superStringify(e.message)}`);
-        await this.BLEPushConnection();
-      });
-    // } else {
-    // this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushBrightnessChanges.` + `Brightness: ${this.Brightness}, `
-    //   +`BrightnessCached: ${this.accessory.context.Brightness}`);
-    //}
+          await this.BLEPushConnection();
+        });
+    } else {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushBrightnessChanges.` + `Brightness: ${this.Brightness}, `
+       +`BrightnessCached: ${this.accessory.context.Brightness}`);
+    }
   }
 
   async BLEpushColorTemperatureChanges(): Promise<void> {
@@ -1068,8 +1068,8 @@ export class ColorBulb {
   async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
     switchbot.stopScan();
     if (this.connected) {
-      this.BLEparseStatus();
-      this.updateHomeKitCharacteristics();
+      await this.BLEparseStatus();
+      await this.updateHomeKitCharacteristics();
     } else {
       await this.BLERefreshConnection(switchbot);
     }

package/src/device/contact.ts

@@ -450,11 +450,11 @@ export class Contact {
     }
   }
 
-  async stopScanning(switchbot: any) {
+  async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
     switchbot.stopScan();
     if (this.connected) {
-      this.BLEparseStatus();
-      this.updateHomeKitCharacteristics();
+      await this.BLEparseStatus();
+      await this.updateHomeKitCharacteristics();
     } else {
       await this.BLERefreshConnection(switchbot);
     }

package/src/device/curtain.ts

@@ -809,8 +809,8 @@ export class Curtain {
   async stopScanning(switchbot: any) {
     switchbot.stopScan();
     if (this.connected) {
-      this.BLEparseStatus();
-      this.updateHomeKitCharacteristics();
+      await this.BLEparseStatus();
+      await this.updateHomeKitCharacteristics();
     } else {
       await this.BLERefreshConnection(switchbot);
     }

package/src/device/humidifier.ts

@@ -768,8 +768,8 @@ export class Humidifier {
   async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
     switchbot.stopScan();
     if (this.connected) {
-      this.BLEparseStatus();
-      this.updateHomeKitCharacteristics();
+      await this.BLEparseStatus();
+      await this.updateHomeKitCharacteristics();
     } else {
       await this.BLERefreshConnection(switchbot);
     }

package/src/device/lock.ts

@@ -7,7 +7,7 @@ import superStringify from 'super-stringify';
 import { SwitchBotPlatform } from '../platform';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
 import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, deviceStatus, HostDomain, DevicePath } from '../settings';
+import { device, devicesConfig, deviceStatus, HostDomain, DevicePath, switchbot, ad, serviceData } from '../settings';
 
 export class Lock {
   // Services
@@ -24,6 +24,12 @@ export class Lock {
   lockState!: deviceStatus['lockState'];
   deviceStatus!: any; //deviceStatusResponse;
 
+  // BLE Others
+  connected?: boolean;
+  switchbot!: switchbot;
+  address!: ad['address'];
+  serviceData!: serviceData;
+
   // Config
   scanDuration!: number;
   deviceLogging!: string;
@@ -206,6 +212,63 @@ export class Lock {
     }
   }
 
+  async BLERefreshStatus(): Promise<void> {
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLERefreshStatus`);
+    const switchbot = await this.platform.connectBLE();
+    // Convert to BLE Address
+    this.device.bleMac = this.device
+      .deviceId!.match(/.{1,2}/g)!
+      .join(':')
+      .toLowerCase();
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+    this.getCustomBLEAddress(switchbot);
+    // Start to monitor advertisement packets
+    if (switchbot !== false) {
+      switchbot
+        .startScan({
+          model: 'o',
+          id: this.device.bleMac,
+        })
+        .then(() => {
+          // Set an event hander
+          switchbot.onadvertisement = async (ad: any) => {
+            this.address = ad.address;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},`
+            + ` BLE Address Found: ${this.address}`);
+            this.serviceData = ad.serviceData;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${superStringify(ad.serviceData)}`);
+            this.debugLog(
+              `${this.device.deviceType}: ${this.accessory.displayName} calibration: ${ad.serviceData.calibration}, ` +
+                `position: ${ad.serviceData.position}, lightLevel: ${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}, ` +
+                `inMotion: ${ad.serviceData.inMotion}`);
+
+            if (this.serviceData) {
+              this.connected = true;
+              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+              await this.stopScanning(switchbot);
+            } else {
+              this.connected = false;
+              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+            }
+          };
+          // Wait 2 seconds
+          return switchbot.wait(this.scanDuration * 1000);
+        })
+        .then(async () => {
+          // Stop to monitor
+          await this.stopScanning(switchbot);
+        })
+        .catch(async (e: any) => {
+          this.apiError(e);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${superStringify(e.message)}`);
+          await this.BLERefreshConnection(switchbot);
+        });
+    } else {
+      await this.BLERefreshConnection(switchbot);
+    }
+  }
+
   async openAPIRefreshStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
     try {
@@ -427,6 +490,34 @@ export class Lock {
     }
   }
 
+  async stopScanning(switchbot: any) {
+    switchbot.stopScan();
+    if (this.connected) {
+      await this.BLEparseStatus();
+      await this.updateHomeKitCharacteristics();
+    } else {
+      await this.BLERefreshConnection(switchbot);
+    }
+  }
+
+  async getCustomBLEAddress(switchbot: any) {
+    if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
+      (async () => {
+        // Start to monitor advertisement packets
+        await switchbot.startScan({
+          model: 'c',
+        });
+        // Set an event handler
+        switchbot.onadvertisement = (ad: any) => {
+          this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${superStringify(ad, null, '  ')}`);
+        };
+        await switchbot.wait(10000);
+        // Stop to monitor
+        switchbot.stopScan();
+      })();
+    }
+  }
+
   async BLEPushConnection() {
     if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
       this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Push Changes`);

package/src/device/meter.ts

@@ -491,8 +491,8 @@ export class Meter {
   async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
     switchbot.stopScan();
     if (this.connected) {
-      this.BLEparseStatus();
-      this.updateHomeKitCharacteristics();
+      await this.BLEparseStatus();
+      await this.updateHomeKitCharacteristics();
     } else {
       await this.BLERefreshConnection(switchbot);
     }

package/src/device/meterplus.ts

@@ -490,8 +490,8 @@ export class MeterPlus {
   async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
     switchbot.stopScan();
     if (this.connected) {
-      this.BLEparseStatus();
-      this.updateHomeKitCharacteristics();
+      await this.BLEparseStatus();
+      await this.updateHomeKitCharacteristics();
     } else {
       await this.BLERefreshConnection(switchbot);
     }

package/src/device/motion.ts

@@ -394,11 +394,11 @@ export class Motion {
     }
   }
 
-  async stopScanning(switchbot: any) {
+  async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
     switchbot.stopScan();
     if (this.connected) {
-      this.BLEparseStatus();
-      this.updateHomeKitCharacteristics();
+      await this.BLEparseStatus();
+      await this.updateHomeKitCharacteristics();
     } else {
       await this.BLERefreshConnection(switchbot);
     }

package/src/device/plug.ts

@@ -461,8 +461,8 @@ export class Plug {
   async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
     switchbot.stopScan();
     if (this.connected) {
-      this.BLEparseStatus();
-      this.updateHomeKitCharacteristics();
+      await this.BLEparseStatus();
+      await this.updateHomeKitCharacteristics();
     } else {
       await this.BLERefreshConnection(switchbot);
     }

package/src/device/striplight.ts

@@ -812,8 +812,8 @@ export class StripLight {
   async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
     switchbot.stopScan();
     if (this.connected) {
-      this.BLEparseStatus();
-      this.updateHomeKitCharacteristics();
+      await this.BLEparseStatus();
+      await this.updateHomeKitCharacteristics();
     } else {
       await this.BLERefreshConnection(switchbot);
     }

package/src/irdevice/airconditioner.ts

@@ -48,7 +48,7 @@ export class AirConditioner {
     // default placeholders
     this.logs({ device });
     this.config({ device });
-    this.context({ device });
+    this.context();
     this.allowPushOnChanges({ device });
     this.allowPushOffChanges({ device });
 
@@ -202,7 +202,7 @@ export class AirConditioner {
   }
 
   async pushAirConditionerDetailsChanges(): Promise<void> {
-    this.CurrentTemperatureUndefined();
+    await this.context();
     if (this.CurrentMode === undefined) {
       this.CurrentMode = 1;
     }
@@ -224,7 +224,7 @@ export class AirConditioner {
     const parameter = `${this.CurrentTemperature},${this.CurrentMode},${this.CurrentFanSpeed},${this.state}`;
 
     if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
-      this.CurrentTemperatureUndefined();
+      await this.context();
       if (this.CurrentTemperature < this.accessory.context.CurrentTemperature) {
         this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.COOLING;
       } else if (this.CurrentTemperature > this.accessory.context.CurrentTemperature) {
@@ -282,11 +282,11 @@ export class AirConditioner {
         req.write(body);
         req.end();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushchanges: ${superStringify(req)}`);
-        this.accessory.context.CurrentTemperature = this.CurrentTemperature;
+        //this.accessory.context.CurrentTemperature = this.CurrentTemperature;
         this.HeatingThresholdTemperature = this.CurrentTemperature;
         this.CoolingThresholdTemperature = this.CurrentTemperature;
-        this.accessory.context.HeatingThresholdTemperature = this.HeatingThresholdTemperature;
-        this.accessory.context.CoolingThresholdTemperature = this.CoolingThresholdTemperature;
+        //this.accessory.context.HeatingThresholdTemperature = this.HeatingThresholdTemperature;
+        //this.accessory.context.CoolingThresholdTemperature = this.CoolingThresholdTemperature;
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
         this.apiError({ e });
@@ -332,7 +332,6 @@ export class AirConditioner {
       this.CurrentFanSpeed = Number(value) + 1;
     }
     this.RotationSpeed = this.CurrentFanSpeed;
-    this.accessory.context.RotationSpeed = this.RotationSpeed;
     this.pushAirConditionerStatusChanges();
   }
 
@@ -354,7 +353,6 @@ export class AirConditioner {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.Active = value;
-    this.accessory.context.Active = this.Active;
   }
 
   async TargetHeaterCoolerStateGet(): Promise<CharacteristicValue> {
@@ -407,7 +405,6 @@ export class AirConditioner {
         );
       }
     }
-    this.accessory.context.TargetHeaterCoolerState = this.TargetHeaterCoolerState;
     this.pushAirConditionerStatusChanges();
   }
 
@@ -434,7 +431,7 @@ export class AirConditioner {
 
   async CurrentHeaterCoolerStateGet(): Promise<CharacteristicValue> {
     if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
-      this.CurrentTemperatureUndefined();
+      await this.context();
       if (this.CurrentTemperature < this.accessory.context.CurrentTemperature) {
         this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.COOLING;
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName}`
@@ -454,7 +451,7 @@ export class AirConditioner {
   }
 
   async HeatingThresholdTemperatureGet(): Promise<CharacteristicValue> {
-    this.CurrentTemperatureUndefined;
+    await this.context();
     this.CurrentTemperature = this.accessory.context.CurrentTemperature;
     this.HeatingThresholdTemperature = this.accessory.context.CurrentTemperature;
     this.accessory.context.HeatingThresholdTemperature = this.HeatingThresholdTemperature;
@@ -463,18 +460,14 @@ export class AirConditioner {
   }
 
   async HeatingThresholdTemperatureSet(value: CharacteristicValue): Promise<void> {
-    this.accessory.context.CurrentTemperature = this.CurrentTemperature;
     this.CurrentTemperature = value;
-    this.accessory.context.HeatingThresholdTemperature = this.HeatingThresholdTemperature;
-    this.debugLog(
-      `${this.device.remoteType}: ${this.accessory.displayName} Set HeatingThresholdTemperature: ${this.HeatingThresholdTemperature},` +
-        ` CurrentTemperatureCached: ${this.accessory.context.CurrentTemperature}`,
-    );
+    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Set HeatingThresholdTemperature: ${this.HeatingThresholdTemperature},` +
+        ` CurrentTemperatureCached: ${this.accessory.context.CurrentTemperature}`);
     this.pushAirConditionerStatusChanges();
   }
 
   async CoolingThresholdTemperatureGet(): Promise<CharacteristicValue> {
-    this.CurrentTemperatureUndefined;
+    await this.context();
     this.CurrentTemperature = this.accessory.context.CurrentTemperature;
     this.CoolingThresholdTemperature = this.accessory.context.CurrentTemperature;
     this.accessory.context.CoolingThresholdTemperature = this.CoolingThresholdTemperature;
@@ -483,25 +476,12 @@ export class AirConditioner {
   }
 
   async CoolingThresholdTemperatureSet(value: CharacteristicValue): Promise<void> {
-    this.accessory.context.CurrentTemperature = this.CurrentTemperature;
     this.CurrentTemperature = value;
-    this.accessory.context.CoolingThresholdTemperature = this.CoolingThresholdTemperature;
-    this.debugLog(
-      `${this.device.remoteType}: ${this.accessory.displayName} Set CoolingThresholdTemperature: ${this.CoolingThresholdTemperature},` +
-        ` CurrentTemperatureCached: ${this.accessory.context.CurrentTemperature}`,
-    );
+    this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Set CoolingThresholdTemperature: ${this.CoolingThresholdTemperature},` +
+        ` CurrentTemperatureCached: ${this.accessory.context.CurrentTemperature}`);
     this.pushAirConditionerStatusChanges();
   }
 
-  async CurrentTemperatureUndefined(): Promise<void> {
-    if (this.CurrentTemperature === undefined) {
-      this.CurrentTemperature = 24;
-    }
-    if (this.accessory.context.CurrentTemperature === undefined) {
-      this.CurrentTemperature = 30;
-    }
-  }
-
   async updateHomeKitCharacteristics(): Promise<void> {
     if (this.Active === undefined) {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${this.Active}`);
@@ -668,7 +648,7 @@ export class AirConditioner {
     return FirmwareRevision;
   }
 
-  async context({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+  async context(): Promise<void> {
     if (this.Active === undefined) {
       this.Active = this.platform.Characteristic.Active.INACTIVE;
     } else {
@@ -679,11 +659,14 @@ export class AirConditioner {
     } else {
       this.CurrentTemperature = this.accessory.context.CurrentTemperature;
     }
-    if (device.irair?.hide_automode) {
-      this.hide_automode = device.irair?.hide_automode;
+    if (this.accessory.context.CurrentTemperature === undefined) {
+      this.CurrentTemperature = 30;
+    }
+    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 = device.irair?.hide_automode;
+      this.hide_automode = this.device.irair?.hide_automode;
       this.accessory.context.hide_automode = this.hide_automode;
     }
   }

package/src/irdevice/airpurifier.ts

@@ -94,7 +94,6 @@ export class AirPurifier {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.Active = value;
-    this.accessory.context.Active = this.Active;
   }
 
   async TargetAirPurifierStateSet(value: CharacteristicValue): Promise<void> {
@@ -134,7 +133,7 @@ export class AirPurifier {
    * AirPurifier:        "command"       "highSpeed"      "default"	        =        fan speed to high
    */
   async pushAirPurifierOnChanges(): Promise<void> {
-    if (this.Active !== 1) {
+    if (this.Active === this.platform.Characteristic.Active.INACTIVE || this.allowPushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -147,9 +146,9 @@ export class AirPurifier {
   }
 
   async pushAirPurifierOffChanges(): Promise<void> {
-    const commandType: string = await this.commandType();
-    const command: string = await this.commandOff();
-    if (this.Active !== 0) {
+    if (this.Active === this.platform.Characteristic.Active.ACTIVE || this.allowPushOn) {
+      const commandType: string = await this.commandType();
+      const command: string = await this.commandOff();
       const body = superStringify({
         'command': command,
         'parameter': 'default',

package/src/irdevice/camera.ts

@@ -70,7 +70,6 @@ export class Camera {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.On = value;
-    this.accessory.context.On = this.On;
   }
 
   /**
@@ -84,7 +83,7 @@ export class Camera {
    * Camera -        "command"       "channelSub"      "default"	        =        previous channel
    */
   async pushOnChanges(): Promise<void> {
-    if (this.On) {
+    if (this.On || this.allowPushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -99,7 +98,7 @@ export class Camera {
   async pushOffChanges(): Promise<void> {
     const commandType: string = await this.commandType();
     const command: string = await this.commandOff();
-    if (!this.On) {
+    if (!this.On || this.allowPushOff) {
       const body = superStringify({
         'command': command,
         'parameter': 'default',
@@ -109,7 +108,7 @@ export class Camera {
     }
   }
 
-  async pushChanges(body): Promise<void> {
+  async pushChanges(body: any): Promise<void> {
     if (this.device.connectionType === 'OpenAPI') {
       try {
       // Make Push On request to the API

package/src/irdevice/fan.ts

@@ -161,7 +161,6 @@ export class Fan {
      * they are updated, so we are only updating the accessory state after calling the above.
      */
     this.Active = value;
-    this.accessory.context.Active = this.Active;
   }
 
   /**
@@ -174,7 +173,7 @@ export class Fan {
    * Fan -        "command"       "highSpeed"      "default"	        =        fan speed to high
    */
   async pushFanOnChanges(): Promise<void> {
-    if (this.Active !== 1) {
+    if (this.Active === this.platform.Characteristic.Active.INACTIVE || this.allowPushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -187,14 +186,16 @@ export class Fan {
   }
 
   async pushFanOffChanges(): Promise<void> {
-    const commandType: string = await this.commandType();
-    const command: string = await this.commandOff();
-    const body = superStringify({
-      'command': command,
-      'parameter': 'default',
-      'commandType': commandType,
-    });
-    await this.pushTVChanges(body);
+    if (this.Active === this.platform.Characteristic.Active.ACTIVE || this.allowPushOff) {
+      const commandType: string = await this.commandType();
+      const command: string = await this.commandOff();
+      const body = superStringify({
+        'command': command,
+        'parameter': 'default',
+        'commandType': commandType,
+      });
+      await this.pushTVChanges(body);
+    }
   }
 
   async pushFanSpeedUpChanges(): Promise<void> {