@switchbot/homebridge-switchbot 3.8.3-beta.11 → 3.8.3-beta.13

package/src/device/humidifier.ts

@@ -3,13 +3,10 @@
  * humidifier.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { bodyChange, device, humidifierServiceData, humidifierStatus, humidifierWebhookContext } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { devicesConfig } from '../settings.js'
-import type { humidifierServiceData } from '../types/bledevicestatus.js'
-import type { device } from '../types/devicelist.js'
-import type { humidifierStatus } from '../types/devicestatus.js'
-import type { humidifierWebhookContext } from '../types/devicewebhookstatus.js'
 
 /*
 * For Testing Locally:
@@ -470,11 +467,11 @@ export class Humidifier extends deviceBase {
       && (this.HumidifierDehumidifier.Active === this.hap.Characteristic.Active.ACTIVE)
       && (this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold !== this.HumidifierDehumidifier.CurrentRelativeHumidity)) {
       await this.debugLog(`Auto Off, RelativeHumidityHumidifierThreshold: ${this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold}!`)
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'setMode',
         parameter: `${this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold}`,
         commandType: 'command',
-      })
+      }
       await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
       try {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange)
@@ -507,11 +504,11 @@ export class Humidifier extends deviceBase {
       === this.hap.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER_OR_DEHUMIDIFIER)
       && (this.HumidifierDehumidifier.Active === this.hap.Characteristic.Active.ACTIVE)) {
       await this.debugLog('Pushing Auto')
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'setMode',
         parameter: 'auto',
         commandType: 'command',
-      })
+      }
       await this.debugLog(`pushAutoChanges, SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
       try {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange)
@@ -540,11 +537,11 @@ export class Humidifier extends deviceBase {
     await this.debugLog('pushActiveChanges')
     if (this.HumidifierDehumidifier.Active === this.hap.Characteristic.Active.INACTIVE) {
       await this.debugLog('Pushing Off')
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'turnOff',
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.debugLog(`pushActiveChanges, SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
       try {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange)

package/src/device/iosensor.ts

@@ -3,13 +3,10 @@
  * iosensor.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { device, outdoorMeterServiceData, outdoorMeterStatus, outdoorMeterWebhookContext } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { devicesConfig } from '../settings.js'
-import type { outdoorMeterServiceData } from '../types/bledevicestatus.js'
-import type { device } from '../types/devicelist.js'
-import type { outdoorMeterStatus } from '../types/devicestatus.js'
-import type { outdoorMeterWebhookContext } from '../types/devicewebhookstatus.js'
 
 import { Units } from 'homebridge'
 /*

package/src/device/lightstrip.ts

@@ -3,13 +3,10 @@
  * lightstrip.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, Controller, ControllerConstructor, ControllerServiceMap, PlatformAccessory, Service } from 'homebridge'
+import type { bodyChange, device, stripLightServiceData, stripLightStatus, stripLightWebhookContext } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { devicesConfig } from '../settings.js'
-import type { stripLightServiceData } from '../types/bledevicestatus.js'
-import type { device } from '../types/devicelist.js'
-import type { stripLightStatus } from '../types/devicestatus.js'
-import type { stripLightWebhookContext } from '../types/devicewebhookstatus.js'
 
 /*
 * For Testing Locally:
@@ -580,11 +577,11 @@ export class StripLight extends deviceBase {
     await this.debugLog('openAPIpushChanges')
     if (this.LightBulb.On !== this.accessory.context.On) {
       const command = this.LightBulb.On ? 'turnOn' : 'turnOff'
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: `${command}`,
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
       try {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange)
@@ -612,11 +609,11 @@ export class StripLight extends deviceBase {
       await this.debugLog(`Hue: ${JSON.stringify(this.LightBulb.Hue)}, Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`)
       const [red, green, blue] = hs2rgb(this.LightBulb.Hue, this.LightBulb.Saturation)
       await this.debugLog(`rgb: ${JSON.stringify([red, green, blue])}`)
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'setColor',
         parameter: `${red}:${green}:${blue}`,
         commandType: 'command',
-      })
+      }
       await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
       try {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange)
@@ -641,11 +638,11 @@ export class StripLight extends deviceBase {
   async pushBrightnessChanges(): Promise<void> {
     await this.debugLog('pushBrightnessChanges')
     if (this.LightBulb.Brightness !== this.accessory.context.Brightness) {
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'setBrightness',
         parameter: `${this.LightBulb.Brightness}`,
         commandType: 'command',
-      })
+      }
       await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
       try {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange)

package/src/device/lock.ts

@@ -3,13 +3,10 @@
  * lock.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { bodyChange, device, lockProServiceData, lockProStatus, lockProWebhookContext, lockServiceData, lockStatus, lockWebhookContext } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { devicesConfig } from '../settings.js'
-import type { lockProServiceData, lockServiceData } from '../types/bledevicestatus.js'
-import type { device } from '../types/devicelist.js'
-import type { lockProStatus, lockStatus } from '../types/devicestatus.js'
-import type { lockProWebhookContext, lockWebhookContext } from '../types/devicewebhookstatus.js'
 
 /*
 * For Testing Locally:
@@ -222,7 +219,7 @@ export class Lock extends deviceBase {
 
     // Contact Sensor
     if (!this.device.lock?.hide_contactsensor && this.ContactSensor?.Service) {
-      this.ContactSensor.ContactSensorState = this.serviceData.door_open === 'opened'
+      this.ContactSensor.ContactSensorState = this.serviceData.door_open
         ? this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
         : this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED
       await this.debugLog(`ContactSensorState: ${this.ContactSensor.ContactSensorState}`)
@@ -486,11 +483,11 @@ export class Lock extends deviceBase {
     if ((this.LockMechanism.LockTargetState !== this.accessory.context.LockTargetState) || LatchUnlock) {
       // Determine the command based on the LockTargetState or the forceUnlock parameter
       const command = LatchUnlock ? 'unlock' : this.LockMechanism.LockTargetState ? 'lock' : 'unlock'
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: `${command}`,
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
       try {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange)

package/src/device/meter.ts

@@ -3,13 +3,10 @@
  * meter.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { device, meterServiceData, meterStatus, meterWebhookContext } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { devicesConfig } from '../settings.js'
-import type { meterServiceData } from '../types/bledevicestatus.js'
-import type { device } from '../types/devicelist.js'
-import type { meterStatus } from '../types/devicestatus.js'
-import type { meterWebhookContext } from '../types/devicewebhookstatus.js'
 
 import { Units } from 'homebridge'
 /*

package/src/device/meterplus.ts

@@ -3,13 +3,10 @@
  * meterplus.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { device, meterPlusServiceData, meterPlusStatus, meterPlusWebhookContext } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { devicesConfig } from '../settings.js'
-import type { meterPlusServiceData } from '../types/bledevicestatus.js'
-import type { device } from '../types/devicelist.js'
-import type { meterPlusStatus } from '../types/devicestatus.js'
-import type { meterPlusWebhookContext } from '../types/devicewebhookstatus.js'
 
 import { Units } from 'homebridge'
 /*

package/src/device/motion.ts

@@ -3,13 +3,10 @@
  * motion.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { device, motionSensorServiceData, motionSensorStatus, motionSensorWebhookContext } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { devicesConfig } from '../settings.js'
-import type { motionSensorServiceData } from '../types/bledevicestatus.js'
-import type { device } from '../types/devicelist.js'
-import type { motionSensorStatus } from '../types/devicestatus.js'
-import type { motionSensorWebhookContext } from '../types/devicewebhookstatus.js'
 
 /*
 * For Testing Locally:

package/src/device/plug.ts

@@ -3,13 +3,10 @@
  * plug.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { bodyChange, device, plugMiniJPServiceData, plugMiniJPWebhookContext, plugMiniStatus, plugMiniUSServiceData, plugMiniUSWebhookContext, plugStatus, plugWebhookContext } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { devicesConfig } from '../settings.js'
-import type { plugMiniJPServiceData, plugMiniUSServiceData } from '../types/bledevicestatus.js'
-import type { device } from '../types/devicelist.js'
-import type { plugMiniStatus, plugStatus } from '../types/devicestatus.js'
-import type { plugMiniJPWebhookContext, plugMiniUSWebhookContext, plugWebhookContext } from '../types/devicewebhookstatus.js'
 
 /*
 * For Testing Locally:
@@ -347,11 +344,11 @@ export class Plug extends deviceBase {
     await this.debugLog('openAPIpushChanges')
     if (this.Outlet.On !== this.accessory.context.On) {
       const command = this.Outlet.On ? 'turnOn' : 'turnOff'
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: `${command}`,
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
       try {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange)

package/src/device/robotvacuumcleaner.ts

@@ -3,17 +3,10 @@
  * robotvacuumcleaner.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { bodyChange, device, floorCleaningRobotS10Status, floorCleaningRobotS10WebhookContext, robotVacuumCleanerS1PlusStatus, robotVacuumCleanerS1PlusWebhookContext, robotVacuumCleanerS1Status, robotVacuumCleanerS1WebhookContext, robotVacuumCleanerServiceData } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { devicesConfig } from '../settings.js'
-import type { robotVacuumCleanerServiceData } from '../types/bledevicestatus.js'
-import type { device } from '../types/devicelist.js'
-import type { floorCleaningRobotS10Status, robotVacuumCleanerS1PlusStatus, robotVacuumCleanerS1Status } from '../types/devicestatus.js'
-import type {
-  floorCleaningRobotS10WebhookContext,
-  robotVacuumCleanerS1PlusWebhookContext,
-  robotVacuumCleanerS1WebhookContext,
-} from '../types/devicewebhookstatus.js'
 
 /*
 * For Testing Locally:
@@ -434,11 +427,11 @@ export class RobotVacuumCleaner extends deviceBase {
     await this.debugLog('openAPIpushChanges')
     if (this.LightBulb.On !== this.accessory.context.On) {
       const command = this.LightBulb.On ? 'start' : 'dock'
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: `${command}`,
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
       try {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange)
@@ -471,11 +464,11 @@ export class RobotVacuumCleaner extends deviceBase {
           : this.LightBulb.Brightness === 75
             ? '2'
             : this.LightBulb.Brightness === 100 ? '3' : 'default'
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: `${command}`,
         parameter: `${parameter}`,
         commandType: 'command',
-      })
+      }
       await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
       try {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange)

package/src/device/waterdetector.ts

@@ -3,13 +3,10 @@
  * waterdetector.ts: @switchbot/homebridge-switchbot.
  */
 import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge'
+import type { device, waterLeakDetectorServiceData, waterLeakDetectorStatus, waterLeakDetectorWebhookContext } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { devicesConfig } from '../settings.js'
-import type { waterLeakDetectorServiceData } from '../types/bledevicestatus.js'
-import type { device } from '../types/devicelist.js'
-import type { waterLeakDetectorStatus } from '../types/devicestatus.js'
-import type { waterLeakDetectorWebhookContext } from '../types/devicewebhookstatus.js'
 
 /*
 * For Testing Locally:

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 { irdeviceBase } from './irdevice.js'
 
@@ -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)
   }
 

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

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)
     }
   }

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 { irdeviceBase } from './irdevice.js'
 
@@ -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)
   }
 

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'
 
 export abstract class irdeviceBase {
   public readonly api: API
@@ -129,12 +125,8 @@ 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: any }> {
+    return this.platform.switchBotAPI.controlDevice(this.device.deviceId, bodyChange.command, bodyChange.parameter, bodyChange.commandType)
   }
 
   async successfulStatusCodes(statusCode: any, deviceStatus: any) {

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 { irdeviceBase } from './irdevice.js'
 
@@ -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)
     }
   }

package/src/irdevice/other.ts

@@ -3,10 +3,10 @@
  * other.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'
 
@@ -412,11 +412,11 @@ export class Others extends irdeviceBase {
       if (On === true && !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)
       }
     } else {
@@ -430,11 +430,11 @@ export class Others extends irdeviceBase {
       if (On === false && !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)
       }
     } else {