@switchbot/homebridge-switchbot 5.0.0-beta.13 → 5.0.0-beta.130

package/src/irdevice/airpurifier.ts

@@ -1,252 +0,0 @@
-/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
- *
- * airpurifier.ts: @switchbot/homebridge-switchbot.
- */
-import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
-import type { bodyChange, irdevice } from 'node-switchbot'
-
-import type { SwitchBotHAPPlatform } from '../platform-hap.js'
-import type { irDevicesConfig } from '../settings.js'
-
-import { irdeviceBase } from './irdevice.js'
-
-/**
- * Platform Accessory
- * An instance of this class is created for each accessory your platform registers
- * Each accessory may expose multiple services of different service types.
- */
-export class AirPurifierIR extends irdeviceBase {
-  // Services
-  private AirPurifier: {
-    Name: CharacteristicValue
-    Service: Service
-    Active: CharacteristicValue
-    RotationSpeed: CharacteristicValue
-    CurrentAirPurifierState: CharacteristicValue
-    TargetAirPurifierState: CharacteristicValue
-    CurrentHeaterCoolerState: CharacteristicValue
-  }
-
-  private TemperatureSensor: {
-    Name: CharacteristicValue
-    Service: Service
-    CurrentTemperature: CharacteristicValue
-  }
-
-  // Characteristic Values
-  APActive!: CharacteristicValue
-  CurrentAPTemp!: CharacteristicValue
-  CurrentAPMode!: CharacteristicValue
-  CurrentAPFanSpeed!: CharacteristicValue
-
-  // Others
-  Busy: any
-  Timeout: any = null
-  static IDLE: number
-  CurrentMode!: number
-  static INACTIVE: number
-  LastTemperature!: number
-  CurrentFanSpeed!: number
-  static PURIFYING_AIR: number
-
-  constructor(
-    readonly platform: SwitchBotHAPPlatform,
-    accessory: PlatformAccessory,
-    device: irdevice & irDevicesConfig,
-  ) {
-    super(platform, accessory, device)
-    // Set category
-    accessory.category = this.hap.Categories.AIR_PURIFIER
-
-    // Initialize AirPurifier Service
-    accessory.context.AirPurifier = accessory.context.AirPurifier ?? {}
-    this.AirPurifier = {
-      Name: accessory.displayName,
-      Service: accessory.getService(this.hap.Service.AirPurifier) ?? accessory.addService(this.hap.Service.AirPurifier) as Service,
-      Active: accessory.context.Active ?? this.hap.Characteristic.Active.INACTIVE,
-      RotationSpeed: accessory.context.RotationSpeed ?? 0,
-      CurrentAirPurifierState: accessory.context.CurrentAirPurifierState ?? this.hap.Characteristic.CurrentAirPurifierState.INACTIVE,
-      TargetAirPurifierState: accessory.context.TargetAirPurifierState ?? this.hap.Characteristic.TargetAirPurifierState.AUTO,
-      CurrentHeaterCoolerState: accessory.context.CurrentHeaterCoolerState ?? this.hap.Characteristic.CurrentHeaterCoolerState.INACTIVE,
-    }
-    accessory.context.AirPurifier = this.AirPurifier as object
-
-    this.AirPurifier.Service.setCharacteristic(this.hap.Characteristic.Name, this.AirPurifier.Name).getCharacteristic(this.hap.Characteristic.Active).onGet(() => {
-      return this.AirPurifier.Active
-    }).onSet(this.ActiveSet.bind(this))
-
-    this.AirPurifier.Service.getCharacteristic(this.hap.Characteristic.CurrentAirPurifierState).onGet(() => {
-      return this.CurrentAirPurifierStateGet()
-    })
-
-    this.AirPurifier.Service.getCharacteristic(this.hap.Characteristic.TargetAirPurifierState).onGet(() => {
-      return this.AirPurifier.TargetAirPurifierState
-    }).onSet(this.TargetAirPurifierStateSet.bind(this))
-
-    // Initialize TemperatureSensor Service
-    accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {}
-    this.TemperatureSensor = {
-      Name: `${accessory.displayName} Temperature Sensor`,
-      Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? accessory.addService(this.hap.Service.TemperatureSensor) as Service,
-      CurrentTemperature: accessory.context.CurrentTemperature || 24,
-    }
-    accessory.context.TemperatureSensor = this.TemperatureSensor as object
-
-    this.TemperatureSensor.Service.setCharacteristic(this.hap.Characteristic.Name, this.TemperatureSensor.Name).getCharacteristic(this.hap.Characteristic.CurrentTemperature).onGet(() => {
-      return this.TemperatureSensor.CurrentTemperature
-    })
-  }
-
-  async ActiveSet(value: CharacteristicValue): Promise<void> {
-    this.debugLog(`Set Active: ${value}`)
-
-    this.AirPurifier.Active = value
-    if (this.AirPurifier.Active === this.hap.Characteristic.Active.ACTIVE) {
-      this.pushAirPurifierOnChanges()
-    } else {
-      this.pushAirPurifierOffChanges()
-    }
-  }
-
-  async TargetAirPurifierStateSet(value: CharacteristicValue): Promise<void> {
-    switch (value) {
-      case this.hap.Characteristic.CurrentAirPurifierState.PURIFYING_AIR:
-        this.CurrentMode = AirPurifierIR.PURIFYING_AIR
-        break
-      case this.hap.Characteristic.CurrentAirPurifierState.IDLE:
-        this.CurrentMode = AirPurifierIR.IDLE
-        break
-      case this.hap.Characteristic.CurrentAirPurifierState.INACTIVE:
-        this.CurrentMode = AirPurifierIR.INACTIVE
-        break
-      default:
-        break
-    }
-  }
-
-  async CurrentAirPurifierStateGet(): Promise<number> {
-    if (this.AirPurifier.Active === 1) {
-      this.AirPurifier.CurrentAirPurifierState = this.hap.Characteristic.CurrentAirPurifierState.PURIFYING_AIR
-    } else {
-      this.AirPurifier.CurrentAirPurifierState = this.hap.Characteristic.CurrentAirPurifierState.INACTIVE
-    }
-    return this.AirPurifier.CurrentAirPurifierState
-  }
-
-  /**
-   * Pushes the requested changes to the SwitchBot API
-   * deviceType          commandType     Command          command parameter          Description
-   * AirPurifier:        "command"       "turnOn"         "default"         =        every home appliance can be turned on by default
-   * AirPurifier:        "command"       "turnOff"        "default"         =        every home appliance can be turned off by default
-   * AirPurifier:        "command"       "swing"          "default"         =        swing
-   * AirPurifier:        "command"       "timer"          "default"         =        timer
-   * AirPurifier:        "command"       "lowSpeed"       "default"         =        fan speed to low
-   * AirPurifier:        "command"       "middleSpeed"    "default"         =        fan speed to medium
-   * AirPurifier:        "command"       "highSpeed"      "default"         =        fan speed to high
-   */
-  async pushAirPurifierOnChanges(): Promise<void> {
-    this.debugLog(`pushAirPurifierOnChanges Active: ${this.AirPurifier.Active}, disablePushOn: ${this.deviceDisablePushOn}`)
-    if (this.AirPurifier.Active === this.hap.Characteristic.Active.ACTIVE && !this.deviceDisablePushOn) {
-      const commandType: string = await this.commandType()
-      const command: string = await this.commandOn()
-      const bodyChange: bodyChange = {
-        command,
-        parameter: 'default',
-        commandType,
-      }
-      await this.pushChanges(bodyChange)
-    }
-  }
-
-  async pushAirPurifierOffChanges(): Promise<void> {
-    this.debugLog(`pushAirPurifierOffChanges Active: ${this.AirPurifier.Active}, disablePushOff: ${this.deviceDisablePushOff}`)
-    if (this.AirPurifier.Active === this.hap.Characteristic.Active.INACTIVE && !this.deviceDisablePushOn) {
-      const commandType: string = await this.commandType()
-      const command: string = await this.commandOff()
-      const bodyChange: bodyChange = {
-        command,
-        parameter: 'default',
-        commandType,
-      }
-      await this.pushChanges(bodyChange)
-    }
-  }
-
-  async pushAirPurifierStatusChanges(): Promise<void> {
-    this.debugLog(`pushAirPurifierStatusChanges Active: ${this.AirPurifier.Active}, disablePushOff: ${this.deviceDisablePushOff}, disablePushOn: ${this.deviceDisablePushOn}`)
-    if (!this.Busy) {
-      this.Busy = true
-      this.AirPurifier.CurrentHeaterCoolerState = this.hap.Characteristic.CurrentHeaterCoolerState.IDLE
-    }
-    clearTimeout(this.Timeout)
-
-    // Make a new Timeout set to go off in 1000ms (1 second)
-    this.Timeout = setTimeout(this.pushAirPurifierDetailsChanges.bind(this), 1500)
-  }
-
-  async pushAirPurifierDetailsChanges(): Promise<void> {
-    this.debugLog(`pushAirPurifierDetailsChanges Active: ${this.AirPurifier.Active}, disablePushOff: ${this.deviceDisablePushOff}, disablePushOn: ${this.deviceDisablePushOn}`)
-    this.CurrentAPTemp = this.TemperatureSensor!.CurrentTemperature ?? 24
-    this.CurrentAPMode = this.CurrentMode ?? 1
-    this.CurrentAPFanSpeed = this.CurrentFanSpeed ?? 1
-    this.APActive = this.AirPurifier.Active === 1 ? 'on' : 'off'
-    const parameter = `${this.CurrentAPTemp},${this.CurrentAPMode},${this.CurrentAPFanSpeed},${this.APActive}`
-    const bodyChange: bodyChange = {
-      command: 'setAll',
-      parameter: `${parameter}`,
-      commandType: 'command',
-    }
-    if (this.AirPurifier.Active === 1) {
-      if ((Number(this.TemperatureSensor!.CurrentTemperature) || 24) < (this.LastTemperature || 30)) {
-        this.AirPurifier.CurrentHeaterCoolerState = this.hap.Characteristic.CurrentHeaterCoolerState.COOLING
-      } else {
-        this.AirPurifier.CurrentHeaterCoolerState = this.hap.Characteristic.CurrentHeaterCoolerState.HEATING
-      }
-    } else {
-      this.AirPurifier.CurrentHeaterCoolerState = this.hap.Characteristic.CurrentHeaterCoolerState.INACTIVE
-    }
-    await this.pushChanges(bodyChange)
-  }
-
-  async pushChanges(bodyChange: any): Promise<void> {
-    this.debugLog('pushChanges')
-    if (this.device.connectionType === 'OpenAPI') {
-      this.infoLog(`Sending request to SwitchBot API, body: ${JSON.stringify(bodyChange)}`)
-      try {
-        const deviceStatus = await this.pushChangeRequest(bodyChange)
-        await this.pushStatusCodes(deviceStatus)
-        if (await this.successfulStatusCodes(deviceStatus)) {
-          await this.successfulPushChange(deviceStatus, bodyChange)
-          await this.updateHomeKitCharacteristics()
-        } else {
-          await this.statusCode(deviceStatus.statusCode)
-        }
-      } catch (e: any) {
-        await this.apiError(e)
-        await this.pushChangeError(e)
-      }
-    } else {
-      this.warnLog(`Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`)
-    }
-  }
-
-  async updateHomeKitCharacteristics(): Promise<void> {
-    this.debugLog('updateHomeKitCharacteristics')
-    // Active
-    await this.updateCharacteristic(this.AirPurifier.Service, this.hap.Characteristic.Active, this.AirPurifier.Active, 'Active')
-    // CurrentAirPurifierState
-    await this.updateCharacteristic(this.AirPurifier.Service, this.hap.Characteristic.CurrentAirPurifierState, this.AirPurifier.CurrentAirPurifierState, 'CurrentAirPurifierState')
-    // CurrentHeaterCoolerState
-    await this.updateCharacteristic(this.AirPurifier.Service, this.hap.Characteristic.CurrentHeaterCoolerState, this.AirPurifier.CurrentHeaterCoolerState, 'CurrentHeaterCoolerState')
-    // CurrentTemperature
-    await this.updateCharacteristic(this.TemperatureSensor.Service, this.hap.Characteristic.CurrentTemperature, this.TemperatureSensor.CurrentTemperature, 'CurrentTemperature')
-  }
-
-  async apiError(e: any): Promise<void> {
-    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

@@ -1,129 +0,0 @@
-/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
- *
- * camera.ts: @switchbot/homebridge-switchbot.
- */
-import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
-import type { bodyChange, irdevice } from 'node-switchbot'
-
-import type { SwitchBotHAPPlatform } from '../platform-hap.js'
-import type { irDevicesConfig } from '../settings.js'
-
-import { irdeviceBase } from './irdevice.js'
-
-/**
- * Platform Accessory
- * An instance of this class is created for each accessory your platform registers
- * Each accessory may expose multiple services of different service types.
- */
-export class Camera extends irdeviceBase {
-  // Services
-  private Switch: {
-    Name: CharacteristicValue
-    Service: Service
-    On: CharacteristicValue
-  }
-
-  constructor(
-    readonly platform: SwitchBotHAPPlatform,
-    accessory: PlatformAccessory,
-    device: irdevice & irDevicesConfig,
-  ) {
-    super(platform, accessory, device)
-    // Set category
-    accessory.category = this.hap.Categories.CAMERA
-
-    // Initialize Switch Service
-    accessory.context.Switch = accessory.context.Switch ?? {}
-    this.Switch = {
-      Name: accessory.displayName,
-      Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch) as Service,
-      On: accessory.context.On ?? false,
-    }
-    accessory.context.Switch = this.Switch as object
-
-    this.Switch.Service.setCharacteristic(this.hap.Characteristic.Name, this.Switch.Name).getCharacteristic(this.hap.Characteristic.On).onGet(() => {
-      return this.Switch.On
-    }).onSet(this.OnSet.bind(this))
-  }
-
-  async OnSet(value: CharacteristicValue): Promise<void> {
-    this.debugLog(`On: ${value}`)
-
-    this.Switch.On = value
-    if (this.Switch.On) {
-      this.pushOnChanges()
-    } else {
-      this.pushOffChanges()
-    }
-  }
-
-  /**
-   * Pushes the requested changes to the SwitchBot API
-   * deviceType    commandType     Command           command parameter           Description
-   * Camera -        "command"       "turnOff"         "default"          =        set to OFF state
-   * Camera -        "command"       "turnOn"          "default"          =        set to ON state
-   * Camera -        "command"       "volumeAdd"       "default"          =        volume up
-   * Camera -        "command"       "volumeSub"       "default"          =        volume down
-   * Camera -        "command"       "channelAdd"      "default"          =        next channel
-   * Camera -        "command"       "channelSub"      "default"          =        previous channel
-   */
-  async pushOnChanges(): Promise<void> {
-    this.debugLog(`pushOnChanges On: ${this.Switch.On}, disablePushOn: ${this.deviceDisablePushOn}`)
-    if (this.Switch.On && !this.deviceDisablePushOn) {
-      const commandType: string = await this.commandType()
-      const command: string = await this.commandOn()
-      const bodyChange: bodyChange = {
-        command,
-        parameter: 'default',
-        commandType,
-      }
-      await this.pushChanges(bodyChange)
-    }
-  }
-
-  async pushOffChanges(): Promise<void> {
-    this.debugLog(`pushOffChanges On: ${this.Switch.On}, disablePushOff: ${this.deviceDisablePushOff}`)
-    if (!this.Switch.On && !this.deviceDisablePushOff) {
-      const commandType: string = await this.commandType()
-      const command: string = await this.commandOff()
-      const bodyChange: bodyChange = {
-        command,
-        parameter: 'default',
-        commandType,
-      }
-      await this.pushChanges(bodyChange)
-    }
-  }
-
-  async pushChanges(bodyChange: any): Promise<void> {
-    this.debugLog('pushChanges')
-    if (this.device.connectionType === 'OpenAPI') {
-      this.infoLog(`Sending request to SwitchBot API, body: ${JSON.stringify(bodyChange)}`)
-      try {
-        const deviceStatus = await this.pushChangeRequest(bodyChange)
-        await this.pushStatusCodes(deviceStatus)
-        if (await this.successfulStatusCodes(deviceStatus)) {
-          await this.successfulPushChange(deviceStatus, bodyChange)
-          await this.updateHomeKitCharacteristics()
-        } else {
-          await this.statusCode(deviceStatus.statusCode)
-        }
-      } catch (e: any) {
-        await this.apiError(e)
-        await this.pushChangeError(e)
-      }
-    } else {
-      this.warnLog(`Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`)
-    }
-  }
-
-  async updateHomeKitCharacteristics(): Promise<void> {
-    this.debugLog('updateHomeKitCharacteristics')
-    // Active
-    await this.updateCharacteristic(this.Switch.Service, this.hap.Characteristic.On, this.Switch.On, 'On')
-  }
-
-  async apiError(e: any): Promise<void> {
-    this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, e)
-  }
-}

package/src/irdevice/fan.ts

@@ -1,226 +0,0 @@
-/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
- *
- * fan.ts: @switchbot/homebridge-switchbot.
- */
-import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
-import type { bodyChange, irdevice } from 'node-switchbot'
-
-import type { SwitchBotHAPPlatform } from '../platform-hap.js'
-import type { irDevicesConfig, irFanConfig } from '../settings.js'
-
-import { irdeviceBase } from './irdevice.js'
-
-/**
- * Platform Accessory
- * An instance of this class is created for each accessory your platform registers
- * Each accessory may expose multiple services of different service types.
- */
-export class IRFan extends irdeviceBase {
-  // Services
-  private Fan: {
-    Name: CharacteristicValue
-    Service: Service
-    Active: CharacteristicValue
-    SwingMode: CharacteristicValue
-    RotationSpeed: CharacteristicValue
-    RotationDirection: CharacteristicValue
-  }
-
-  constructor(
-    readonly platform: SwitchBotHAPPlatform,
-    accessory: PlatformAccessory,
-    device: irdevice & irDevicesConfig,
-  ) {
-    super(platform, accessory, device)
-    // Set category
-    accessory.category = this.hap.Categories.FAN
-
-    // Initialize Switch Service
-    accessory.context.Fan = accessory.context.Fan ?? {}
-    this.Fan = {
-      Name: accessory.displayName,
-      Service: accessory.getService(this.hap.Service.Fanv2) ?? accessory.addService(this.hap.Service.Fanv2) as Service,
-      Active: accessory.context.Active ?? this.hap.Characteristic.Active.INACTIVE,
-      SwingMode: accessory.context.SwingMode ?? this.hap.Characteristic.SwingMode.SWING_DISABLED,
-      RotationSpeed: accessory.context.RotationSpeed ?? 0,
-      RotationDirection: accessory.context.RotationDirection ?? this.hap.Characteristic.RotationDirection.CLOCKWISE,
-    }
-    accessory.context.Fan = this.Fan as object
-
-    this.Fan.Service.setCharacteristic(this.hap.Characteristic.Name, this.Fan.Name).getCharacteristic(this.hap.Characteristic.Active).onGet(() => {
-      return this.Fan.Active
-    }).onSet(this.ActiveSet.bind(this))
-
-    if ((device as irFanConfig).rotation_speed) {
-      // handle Rotation Speed events using the RotationSpeed characteristic
-      this.Fan.Service.getCharacteristic(this.hap.Characteristic.RotationSpeed).setProps({
-        minStep: (device as irFanConfig).set_minStep ?? 1,
-        minValue: (device as irFanConfig).set_min ?? 1,
-        maxValue: (device as irFanConfig).set_max ?? 100,
-      }).onGet(() => {
-        return this.Fan.RotationSpeed
-      }).onSet(this.RotationSpeedSet.bind(this))
-    } else if (this.Fan.Service.testCharacteristic(this.hap.Characteristic.RotationSpeed) && !(device as irFanConfig).swing_mode) {
-      const characteristic = this.Fan.Service.getCharacteristic(this.hap.Characteristic.RotationSpeed)
-      this.Fan.Service.removeCharacteristic(characteristic)
-      this.debugLog('Rotation Speed Characteristic was removed.')
-    } else {
-      this.debugLog(`RotationSpeed Characteristic was not removed/added, Clear Cache on ${this.accessory.displayName} to remove Chracteristic`)
-    }
-
-    if ((device as irFanConfig).swing_mode) {
-      // handle Osolcation events using the SwingMode characteristic
-      this.Fan.Service.getCharacteristic(this.hap.Characteristic.SwingMode).onGet(() => {
-        return this.Fan.SwingMode
-      }).onSet(this.SwingModeSet.bind(this))
-    } else if (this.Fan.Service.testCharacteristic(this.hap.Characteristic.SwingMode) && !(device as irFanConfig).swing_mode) {
-      const characteristic = this.Fan.Service.getCharacteristic(this.hap.Characteristic.SwingMode)
-      this.Fan.Service.removeCharacteristic(characteristic)
-      this.debugLog('Swing Mode Characteristic was removed.')
-    } else {
-      this.debugLog(`Swing Mode Characteristic was not removed/added, Clear Cache on ${this.accessory.displayName} To Remove Chracteristic`)
-    }
-  }
-
-  async SwingModeSet(value: CharacteristicValue): Promise<void> {
-    this.debugLog(`SwingMode: ${value}`)
-    if (value > this.Fan.SwingMode) {
-      this.Fan.SwingMode = 1
-      await this.pushFanOnChanges()
-      await this.pushFanSwingChanges()
-    } else {
-      this.Fan.SwingMode = 0
-      await this.pushFanOnChanges()
-      await this.pushFanSwingChanges()
-    }
-    this.Fan.SwingMode = value
-    this.accessory.context.SwingMode = this.Fan.SwingMode
-  }
-
-  async RotationSpeedSet(value: CharacteristicValue): Promise<void> {
-    this.debugLog(`RotationSpeed: ${value}`)
-    if (value > this.Fan.RotationSpeed) {
-      this.Fan.RotationSpeed = 1
-      this.pushFanSpeedUpChanges()
-      this.pushFanOnChanges()
-    } else {
-      this.Fan.RotationSpeed = 0
-      this.pushFanSpeedDownChanges()
-    }
-    this.Fan.RotationSpeed = value
-    this.accessory.context.RotationSpeed = this.Fan.RotationSpeed
-  }
-
-  async ActiveSet(value: CharacteristicValue): Promise<void> {
-    this.debugLog(`Active: ${value}`)
-
-    this.Fan.Active = value
-    if (this.Fan.Active === this.hap.Characteristic.Active.ACTIVE) {
-      this.pushFanOnChanges()
-    } else {
-      this.pushFanOffChanges()
-    }
-  }
-
-  /**
-   * Pushes the requested changes to the SwitchBot API
-   * deviceType  commandType     Command           command parameter           Description
-   * Fan -        "command"       "swing"          "default"          =        swing
-   * Fan -        "command"       "timer"          "default"          =        timer
-   * Fan -        "command"       "lowSpeed"       "default"          =        fan speed to low
-   * Fan -        "command"       "middleSpeed"    "default"          =        fan speed to medium
-   * Fan -        "command"       "highSpeed"      "default"          =        fan speed to high
-   */
-  async pushFanOnChanges(): Promise<void> {
-    this.debugLog(`pushFanOnChanges Active: ${this.Fan.Active}, disablePushOn: ${this.deviceDisablePushOn}`)
-    if (this.Fan.Active === this.hap.Characteristic.Active.ACTIVE && !this.deviceDisablePushOn) {
-      const commandType: string = await this.commandType()
-      const command: string = await this.commandOn()
-      const bodyChange: bodyChange = {
-        command,
-        parameter: 'default',
-        commandType,
-      }
-      await this.pushChanges(bodyChange)
-    }
-  }
-
-  async pushFanOffChanges(): Promise<void> {
-    this.debugLog(`pushLightOffChanges Active: ${this.Fan.Active}, disablePushOff: ${this.deviceDisablePushOff}`)
-    if (this.Fan.Active === this.hap.Characteristic.Active.INACTIVE && !this.deviceDisablePushOff) {
-      const commandType: string = await this.commandType()
-      const command: string = await this.commandOff()
-      const bodyChange: bodyChange = {
-        command,
-        parameter: 'default',
-        commandType,
-      }
-      await this.pushChanges(bodyChange)
-    }
-  }
-
-  async pushFanSpeedUpChanges(): Promise<void> {
-    const bodyChange: bodyChange = {
-      command: 'highSpeed',
-      parameter: 'default',
-      commandType: 'command',
-    }
-    await this.pushChanges(bodyChange)
-  }
-
-  async pushFanSpeedDownChanges(): Promise<void> {
-    const bodyChange: bodyChange = {
-      command: 'lowSpeed',
-      parameter: 'default',
-      commandType: 'command',
-    }
-    await this.pushChanges(bodyChange)
-  }
-
-  async pushFanSwingChanges(): Promise<void> {
-    const bodyChange: bodyChange = {
-      command: 'swing',
-      parameter: 'default',
-      commandType: 'command',
-    }
-    await this.pushChanges(bodyChange)
-  }
-
-  async pushChanges(bodyChange: any): Promise<void> {
-    this.debugLog('pushChanges')
-    if (this.device.connectionType === 'OpenAPI') {
-      this.infoLog(`Sending request to SwitchBot API, body: ${JSON.stringify(bodyChange)}`)
-      try {
-        const deviceStatus = await this.pushChangeRequest(bodyChange)
-        await this.pushStatusCodes(deviceStatus)
-        if (await this.successfulStatusCodes(deviceStatus)) {
-          await this.successfulPushChange(deviceStatus, bodyChange)
-          await this.updateHomeKitCharacteristics()
-        } else {
-          await this.statusCode(deviceStatus.statusCode)
-        }
-      } catch (e: any) {
-        await this.apiError(e)
-        await this.pushChangeError(e)
-      }
-    } else {
-      this.warnLog(`Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`)
-    }
-  }
-
-  async updateHomeKitCharacteristics(): Promise<void> {
-    this.debugLog('updateHomeKitCharacteristics')
-    // 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> {
-    this.Fan.Service.updateCharacteristic(this.hap.Characteristic.Active, e)
-    this.Fan.Service.updateCharacteristic(this.hap.Characteristic.RotationSpeed, e)
-    this.Fan.Service.updateCharacteristic(this.hap.Characteristic.SwingMode, e)
-  }
-}