@switchbot/homebridge-switchbot 3.8.3 → 4.0.0-beta.1

package/src/irdevice/airconditioner.ts

@@ -3,10 +3,10 @@
  * airconditioners.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { bodyChange, irdevice } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
-import type { irDevicesConfig } from '../settings.js'
-import type { irdevice } from '../types/irdevicelist.js'
+import type { irAirConfig, irDevicesConfig } from '../settings.js'
 
 import { irdeviceBase } from './irdevice.js'
 
@@ -124,8 +124,8 @@ export class AirConditioner extends irdeviceBase {
 
     // Initialize HumiditySensor property
 
-    if (this.device.irair?.meterType && this.device.irair?.meterId) {
-      const meterUuid = this.platform.api.hap.uuid.generate(`${this.device.irair.meterId}-${this.device.irair.meterType}`)
+    if ((this.device as irAirConfig).meterType && (this.device as irAirConfig).meterId) {
+      const meterUuid = this.platform.api.hap.uuid.generate(`${(device as irAirConfig).meterId}-${(device as irAirConfig).meterType}`)
       this.meter = this.platform.accessories.find(accessory => accessory.UUID === meterUuid)
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {}
       this.HumiditySensor = {
@@ -136,8 +136,8 @@ export class AirConditioner extends irdeviceBase {
       accessory.context.HumiditySensor = this.HumiditySensor as object
     }
 
-    if (this.device.irair?.meterType && this.device.irair?.meterId) {
-      const meterUuid = this.platform.api.hap.uuid.generate(`${this.device.irair.meterId}-${this.device.irair.meterType}`)
+    if ((this.device as irAirConfig).meterType && (this.device as irAirConfig).meterId) {
+      const meterUuid = this.platform.api.hap.uuid.generate(`${(device as irAirConfig).meterId}-${(device as irAirConfig).meterType}`)
       this.meter = this.platform.accessories.find(accessory => accessory.UUID === meterUuid)
     }
 
@@ -162,11 +162,11 @@ export class AirConditioner extends irdeviceBase {
     if (this.HeaterCooler.Active === this.hap.Characteristic.Active.ACTIVE && !this.disablePushOn) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOn()
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command,
         parameter: 'default',
         commandType,
-      })
+      }
       await this.pushChanges(bodyChange)
     }
   }
@@ -176,11 +176,11 @@ export class AirConditioner extends irdeviceBase {
     if (this.HeaterCooler.Active === this.hap.Characteristic.Active.INACTIVE && !this.disablePushOff) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOff()
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command,
         parameter: 'default',
         commandType,
-      })
+      }
       await this.pushChanges(bodyChange)
     }
   }
@@ -219,12 +219,11 @@ export class AirConditioner extends irdeviceBase {
     const parameter = `${this.HeaterCooler.ThresholdTemperature},${this.CurrentMode},${this.CurrentFanSpeed},${this.state}`
 
     await this.UpdateCurrentHeaterCoolerState()
-    const bodyChange = JSON.stringify({
+    const bodyChange: bodyChange = {
       command: 'setAll',
       parameter: `${parameter}`,
       commandType: 'command',
-    })
-
+    }
     await this.pushChanges(bodyChange)
   }
 
@@ -254,38 +253,38 @@ export class AirConditioner extends irdeviceBase {
         this.HeaterCooler.RotationSpeed = this.HeaterCooler.RotationSpeed || this.accessory.context.RotationSpeed
       }
 
-      if (this.device.irair?.hide_automode) {
-        this.hide_automode = this.device.irair?.hide_automode
+      if ((this.device as irAirConfig).hide_automode) {
+        this.hide_automode = (this.device as irAirConfig).hide_automode
         this.accessory.context.hide_automode = this.hide_automode
       } else {
-        this.hide_automode = this.device.irair?.hide_automode
+        this.hide_automode = (this.device as irAirConfig).hide_automode
         this.accessory.context.hide_automode = this.hide_automode
       }
 
-      if (this.device.irair?.set_max_heat) {
-        this.set_max_heat = this.device.irair?.set_max_heat
+      if ((this.device as irAirConfig).set_max_heat) {
+        this.set_max_heat = (this.device as irAirConfig).set_max_heat
         this.accessory.context.set_max_heat = this.set_max_heat
       } else {
         this.set_max_heat = 35
         this.accessory.context.set_max_heat = this.set_max_heat
       }
-      if (this.device.irair?.set_min_heat) {
-        this.set_min_heat = this.device.irair?.set_min_heat
+      if ((this.device as irAirConfig).set_min_heat) {
+        this.set_min_heat = (this.device as irAirConfig).set_min_heat
         this.accessory.context.set_min_heat = this.set_min_heat
       } else {
         this.set_min_heat = 0
         this.accessory.context.set_min_heat = this.set_min_heat
       }
 
-      if (this.device.irair?.set_max_cool) {
-        this.set_max_cool = this.device.irair?.set_max_cool
+      if ((this.device as irAirConfig).set_max_cool) {
+        this.set_max_cool = (this.device as irAirConfig).set_max_cool
         this.accessory.context.set_max_cool = this.set_max_cool
       } else {
         this.set_max_cool = 35
         this.accessory.context.set_max_cool = this.set_max_cool
       }
-      if (this.device.irair?.set_min_cool) {
-        this.set_min_cool = this.device.irair?.set_min_cool
+      if ((this.device as irAirConfig).set_min_cool) {
+        this.set_min_cool = (this.device as irAirConfig).set_min_cool
         this.accessory.context.set_min_cool = this.set_min_cool
       } else {
         this.set_min_cool = 0
@@ -317,14 +316,13 @@ export class AirConditioner extends irdeviceBase {
     if (this.device.connectionType === 'OpenAPI' && !this.disablePushDetail) {
       await this.infoLog(`Sending request to SwitchBot API, body: ${bodyChange},`)
       try {
-        const { body, statusCode } = await this.pushChangeRequest(bodyChange)
-        const deviceStatus: any = await body.json()
-        await this.pushStatusCodes(statusCode, deviceStatus)
-        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
-          await this.successfulPushChange(statusCode, deviceStatus, bodyChange)
+        const { body } = await this.pushChangeRequest(bodyChange)
+        const deviceStatus: any = await body
+        await this.pushStatusCodes(deviceStatus)
+        if (await this.successfulStatusCodes(deviceStatus)) {
+          await this.successfulPushChange(deviceStatus, bodyChange)
           await this.updateHomeKitCharacteristics()
         } else {
-          await this.statusCode(statusCode)
           await this.statusCode(deviceStatus.statusCode)
         }
       } catch (e: any) {
@@ -527,10 +525,10 @@ export class AirConditioner extends irdeviceBase {
   }
 
   async getAirConditionerConfigSettings(accessory: PlatformAccessory, device: irdevice & irDevicesConfig): Promise<void> {
-    accessory.context.hide_automode = this.hide_automode = device.irair?.hide_automode
-    accessory.context.set_max_heat = this.set_max_heat = device.irair?.set_max_heat ?? 35
-    accessory.context.set_min_heat = this.set_min_heat = device.irair?.set_min_heat ?? 0
-    accessory.context.set_max_cool = this.set_max_cool = device.irair?.set_max_cool ?? 35
-    accessory.context.set_min_cool = this.set_min_cool = device.irair?.set_min_cool ?? 0
+    accessory.context.hide_automode = this.hide_automode = (device as irAirConfig).hide_automode
+    accessory.context.set_max_heat = this.set_max_heat = (device as irAirConfig).set_max_heat ?? 35
+    accessory.context.set_min_heat = this.set_min_heat = (device as irAirConfig).set_min_heat ?? 0
+    accessory.context.set_max_cool = this.set_max_cool = (device as irAirConfig).set_max_cool ?? 35
+    accessory.context.set_min_cool = this.set_min_cool = (device as irAirConfig).set_min_cool ?? 0
   }
 }

package/src/irdevice/airpurifier.ts

@@ -3,10 +3,10 @@
  * airpurifier.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { bodyChange, irdevice } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { irDevicesConfig } from '../settings.js'
-import type { irdevice } from '../types/irdevicelist.js'
 
 import { irdeviceBase } from './irdevice.js'
 
@@ -149,11 +149,11 @@ export class AirPurifier extends irdeviceBase {
     if (this.AirPurifier.Active === this.hap.Characteristic.Active.ACTIVE && !this.disablePushOn) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOn()
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command,
         parameter: 'default',
         commandType,
-      })
+      }
       await this.pushChanges(bodyChange)
     }
   }
@@ -163,11 +163,11 @@ export class AirPurifier extends irdeviceBase {
     if (this.AirPurifier.Active === this.hap.Characteristic.Active.INACTIVE && !this.disablePushOn) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOff()
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command,
         parameter: 'default',
         commandType,
-      })
+      }
       await this.pushChanges(bodyChange)
     }
   }
@@ -191,11 +191,11 @@ export class AirPurifier extends irdeviceBase {
     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 = JSON.stringify({
+    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
@@ -213,14 +213,13 @@ export class AirPurifier extends irdeviceBase {
     if (this.device.connectionType === 'OpenAPI') {
       this.infoLog(`Sending request to SwitchBot API, body: ${bodyChange},`)
       try {
-        const { body, statusCode } = await this.pushChangeRequest(bodyChange)
-        const deviceStatus: any = await body.json()
-        await this.pushStatusCodes(statusCode, deviceStatus)
-        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
-          await this.successfulPushChange(statusCode, deviceStatus, bodyChange)
+        const { body } = await this.pushChangeRequest(bodyChange)
+        const deviceStatus: any = await body
+        await this.pushStatusCodes(deviceStatus)
+        if (await this.successfulStatusCodes(deviceStatus)) {
+          await this.successfulPushChange(deviceStatus, bodyChange)
           await this.updateHomeKitCharacteristics()
         } else {
-          await this.statusCode(statusCode)
           await this.statusCode(deviceStatus.statusCode)
         }
       } catch (e: any) {

package/src/irdevice/camera.ts

@@ -3,10 +3,10 @@
  * camera.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { bodyChange, irdevice } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { irDevicesConfig } from '../settings.js'
-import type { irdevice } from '../types/irdevicelist.js'
 
 import { irdeviceBase } from './irdevice.js'
 
@@ -72,11 +72,11 @@ export class Camera extends irdeviceBase {
     if (this.Switch.On && !this.disablePushOn) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOn()
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command,
         parameter: 'default',
         commandType,
-      })
+      }
       await this.pushChanges(bodyChange)
     }
   }
@@ -86,11 +86,11 @@ export class Camera extends irdeviceBase {
     if (!this.Switch.On && !this.disablePushOff) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOff()
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command,
         parameter: 'default',
         commandType,
-      })
+      }
       await this.pushChanges(bodyChange)
     }
   }
@@ -100,14 +100,13 @@ export class Camera extends irdeviceBase {
     if (this.device.connectionType === 'OpenAPI') {
       this.infoLog(`Sending request to SwitchBot API, body: ${bodyChange},`)
       try {
-        const { body, statusCode } = await this.pushChangeRequest(bodyChange)
-        const deviceStatus: any = await body.json()
-        await this.pushStatusCodes(statusCode, deviceStatus)
-        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
-          await this.successfulPushChange(statusCode, deviceStatus, bodyChange)
+        const { body } = await this.pushChangeRequest(bodyChange)
+        const deviceStatus: any = await body
+        await this.pushStatusCodes(deviceStatus)
+        if (await this.successfulStatusCodes(deviceStatus)) {
+          await this.successfulPushChange(deviceStatus, bodyChange)
           await this.updateHomeKitCharacteristics()
         } else {
-          await this.statusCode(statusCode)
           await this.statusCode(deviceStatus.statusCode)
         }
       } catch (e: any) {

package/src/irdevice/fan.ts

@@ -3,10 +3,10 @@
  * fan.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { bodyChange, irdevice } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
-import type { irDevicesConfig } from '../settings.js'
-import type { irdevice } from '../types/irdevicelist.js'
+import type { irDevicesConfig, irFanConfig } from '../settings.js'
 
 import { irdeviceBase } from './irdevice.js'
 
@@ -51,16 +51,16 @@ export class IRFan extends irdeviceBase {
       return this.Fan.Active
     }).onSet(this.ActiveSet.bind(this))
 
-    if (device.irfan?.rotation_speed) {
+    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.irfan?.set_minStep ?? 1,
-        minValue: device.irfan?.set_min ?? 1,
-        maxValue: device.irfan?.set_max ?? 100,
+        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.irfan?.swing_mode) {
+    } 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.')
@@ -68,12 +68,12 @@ export class IRFan extends irdeviceBase {
       this.debugLog(`RotationSpeed Characteristic was not removed/added, Clear Cache on ${this.accessory.displayName} to remove Chracteristic`)
     }
 
-    if (device.irfan?.swing_mode) {
+    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.irfan?.swing_mode) {
+    } 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.')
@@ -136,11 +136,11 @@ export class IRFan extends irdeviceBase {
     if (this.Fan.Active === this.hap.Characteristic.Active.ACTIVE && !this.disablePushOn) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOn()
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command,
         parameter: 'default',
         commandType,
-      })
+      }
       await this.pushChanges(bodyChange)
     }
   }
@@ -150,39 +150,39 @@ export class IRFan extends irdeviceBase {
     if (this.Fan.Active === this.hap.Characteristic.Active.INACTIVE && !this.disablePushOff) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOff()
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command,
         parameter: 'default',
         commandType,
-      })
+      }
       await this.pushChanges(bodyChange)
     }
   }
 
   async pushFanSpeedUpChanges(): Promise<void> {
-    const bodyChange = JSON.stringify({
+    const bodyChange: bodyChange = {
       command: 'highSpeed',
       parameter: 'default',
       commandType: 'command',
-    })
+    }
     await this.pushChanges(bodyChange)
   }
 
   async pushFanSpeedDownChanges(): Promise<void> {
-    const bodyChange = JSON.stringify({
+    const bodyChange: bodyChange = {
       command: 'lowSpeed',
       parameter: 'default',
       commandType: 'command',
-    })
+    }
     await this.pushChanges(bodyChange)
   }
 
   async pushFanSwingChanges(): Promise<void> {
-    const bodyChange = JSON.stringify({
+    const bodyChange: bodyChange = {
       command: 'swing',
       parameter: 'default',
       commandType: 'command',
-    })
+    }
     await this.pushChanges(bodyChange)
   }
 
@@ -191,14 +191,13 @@ export class IRFan extends irdeviceBase {
     if (this.device.connectionType === 'OpenAPI') {
       this.infoLog(`Sending request to SwitchBot API, body: ${bodyChange},`)
       try {
-        const { body, statusCode } = await this.pushChangeRequest(bodyChange)
-        const deviceStatus: any = await body.json()
-        await this.pushStatusCodes(statusCode, deviceStatus)
-        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
-          await this.successfulPushChange(statusCode, deviceStatus, bodyChange)
+        const { body } = await this.pushChangeRequest(bodyChange)
+        const deviceStatus: any = await body
+        await this.pushStatusCodes(deviceStatus)
+        if (await this.successfulStatusCodes(deviceStatus)) {
+          await this.successfulPushChange(deviceStatus, bodyChange)
           await this.updateHomeKitCharacteristics()
         } else {
-          await this.statusCode(statusCode)
           await this.statusCode(deviceStatus.statusCode)
         }
       } catch (e: any) {

package/src/irdevice/irdevice.ts

@@ -3,14 +3,10 @@
  * device.ts: @switchbot/homebridge-switchbot.
  */
 import type { API, CharacteristicValue, HAP, Logging, PlatformAccessory, Service } from 'homebridge'
+import type { bodyChange, irdevice } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
-import type { irDevicesConfig, SwitchBotPlatformConfig } from '../settings.js'
-import type { irdevice } from '../types/irdevicelist.js'
-
-import { request } from 'undici'
-
-import { Devices } from '../settings.js'
+import type { irAirConfig, irDevicesConfig, irFanConfig, irLightConfig, irOtherConfig, SwitchBotPlatformConfig } from '../settings.js'
 
 export abstract class irdeviceBase {
   public readonly api: API
@@ -82,18 +78,30 @@ export abstract class irdeviceBase {
       device.disablePushOff === true && { disablePushOff: device.disablePushOff },
       device.disablePushDetail === true && { disablePushDetail: device.disablePushDetail },
     )
+    let deviceSpecificConfig = {}
+    switch (device.configRemoteType) {
+      case 'Fan':
+      case 'DIY Fan':
+        deviceSpecificConfig = device as irFanConfig
+        break
+      case 'Light':
+      case 'DIY Light':
+        deviceSpecificConfig = device as irLightConfig
+        break
+      case 'Air Conditioner':
+      case 'DIY Air Conditioner':
+        deviceSpecificConfig = device as irAirConfig
+        break
+      case 'Others':
+        deviceSpecificConfig = device as irOtherConfig
+        break
+      default:
+        break
+    }
     const config = Object.assign(
       {},
       deviceConfig,
-      device.irair,
-      device.irpur,
-      device.ircam,
-      device.irfan,
-      device.irlight,
-      device.other,
-      device.irtv,
-      device.irvc,
-      device.irwh,
+      deviceSpecificConfig,
     )
     if (Object.keys(config).length !== 0) {
       this.debugSuccessLog(`Config: ${JSON.stringify(config)}`)
@@ -129,16 +137,13 @@ export abstract class irdeviceBase {
     this.debugSuccessLog(`version: ${accessory.context.version}`)
   }
 
-  async pushChangeRequest(bodyChange: string): Promise<{ body: any, statusCode: any }> {
-    return await request(`${Devices}/${this.device.deviceId}/commands`, {
-      body: bodyChange,
-      method: 'POST',
-      headers: this.platform.generateHeaders(),
-    })
+  async pushChangeRequest(bodyChange: bodyChange): Promise<{ body: any, statusCode: number }> {
+    const { response, statusCode } = await this.platform.switchBotAPI.controlDevice(this.device.deviceId, bodyChange.command, bodyChange.parameter, bodyChange.commandType)
+    return { body: response, statusCode }
   }
 
-  async successfulStatusCodes(statusCode: any, deviceStatus: any) {
-    return (statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)
+  async successfulStatusCodes(deviceStatus: any) {
+    return (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)
   }
 
   /**
@@ -163,14 +168,13 @@ export abstract class irdeviceBase {
     }
   }
 
-  async pushStatusCodes(statusCode: any, deviceStatus: any) {
-    await this.debugWarnLog(`statusCode: ${statusCode}`)
+  async pushStatusCodes(deviceStatus: any) {
     await this.debugWarnLog(`deviceStatus: ${JSON.stringify(deviceStatus)}`)
     await this.debugWarnLog(`deviceStatus statusCode: ${deviceStatus.statusCode}`)
   }
 
-  async successfulPushChange(statusCode: any, deviceStatus: any, bodyChange: any) {
-    this.debugSuccessLog(`statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`)
+  async successfulPushChange(deviceStatus: any, bodyChange: any) {
+    this.debugSuccessLog(`deviceStatus StatusCode: ${deviceStatus.statusCode}`)
     this.successLog(`request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`)
   }
 

package/src/irdevice/light.ts

@@ -3,10 +3,10 @@
  * light.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { bodyChange, irdevice } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
-import type { irDevicesConfig } from '../settings.js'
-import type { irdevice } from '../types/irdevicelist.js'
+import type { irDevicesConfig, irLightConfig } from '../settings.js'
 
 import { irdeviceBase } from './irdevice.js'
 
@@ -46,7 +46,7 @@ export class Light extends irdeviceBase {
     // Set category
     accessory.category = this.hap.Categories.LIGHTBULB
 
-    if (!device.irlight?.stateless) {
+    if (!(device as irLightConfig).stateless) {
       // Initialize LightBulb Service
       accessory.context.LightBulb = accessory.context.LightBulb ?? {}
       this.LightBulb = {
@@ -170,11 +170,11 @@ export class Light extends irdeviceBase {
     if (On === true && this.disablePushOn === false) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOn()
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command,
         parameter: 'default',
         commandType,
-      })
+      }
       await this.pushChanges(bodyChange, On)
     }
   }
@@ -184,11 +184,11 @@ export class Light extends irdeviceBase {
     if (On === false && this.disablePushOff === false) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOff()
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command,
         parameter: 'default',
         commandType,
-      })
+      }
       await this.pushChanges(bodyChange, On)
     }
   }
@@ -198,15 +198,14 @@ export class Light extends irdeviceBase {
     if (this.device.connectionType === 'OpenAPI') {
       this.infoLog(`Sending request to SwitchBot API, body: ${bodyChange},`)
       try {
-        const { body, statusCode } = await this.pushChangeRequest(bodyChange)
-        const deviceStatus: any = await body.json()
-        await this.pushStatusCodes(statusCode, deviceStatus)
-        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
-          await this.successfulPushChange(statusCode, deviceStatus, bodyChange)
+        const { body } = await this.pushChangeRequest(bodyChange)
+        const deviceStatus: any = await body
+        await this.pushStatusCodes(deviceStatus)
+        if (await this.successfulStatusCodes(deviceStatus)) {
+          await this.successfulPushChange(deviceStatus, bodyChange)
           this.accessory.context.On = On
           await this.updateHomeKitCharacteristics()
         } else {
-          await this.statusCode(statusCode)
           await this.statusCode(deviceStatus.statusCode)
         }
       } catch (e: any) {
@@ -220,7 +219,7 @@ export class Light extends irdeviceBase {
 
   async updateHomeKitCharacteristics(): Promise<void> {
     await this.debugLog('updateHomeKitCharacteristics')
-    if (!this.device.irlight?.stateless && this.LightBulb?.Service) {
+    if (!(this.device as irLightConfig).stateless && this.LightBulb?.Service) {
       // On
       await this.updateCharacteristic(this.LightBulb.Service, this.hap.Characteristic.On, this.LightBulb.On, 'On')
     } else {
@@ -236,7 +235,7 @@ export class Light extends irdeviceBase {
   }
 
   async apiError(e: any): Promise<void> {
-    if (!this.device.irlight?.stateless) {
+    if (!(this.device as irLightConfig).stateless) {
       this.LightBulb?.Service.updateCharacteristic(this.hap.Characteristic.On, e)
     } else {
       this.ProgrammableSwitchOn?.Service.updateCharacteristic(this.hap.Characteristic.ProgrammableSwitchEvent, e)