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

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 type { irDevicesConfig, irOtherConfig } from '../settings.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 {
@@ -447,14 +447,13 @@ export class Others 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) {
@@ -785,10 +784,8 @@ export class Others extends irdeviceBase {
   }
 
   async getOtherConfigSettings(accessory: PlatformAccessory, device: irdevice & irDevicesConfig): Promise<void> {
-    this.otherDeviceType = accessory.context.otherDeviceType
-      ? accessory.context.otherDeviceType
-      : device.other?.deviceType ? device.other.deviceType : 'outlet'
-    const deviceType = accessory.context.otherDeviceType ? 'Accessory Cache' : device.other?.deviceType ? 'Device Config' : 'Default'
-    await this.debugLog(`Use ${deviceType} Type: ${this.otherDeviceType}`)
+    this.otherDeviceType = (device as irOtherConfig).type ?? 'outlet'
+    const deviceType = (device as irOtherConfig).type ? 'Device Config' : 'Default'
+    await this.debugLog(`Use ${deviceType} Device Type: ${this.otherDeviceType}`)
   }
 }

package/src/irdevice/tv.ts

@@ -3,10 +3,10 @@
  * tv.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'
 
@@ -210,11 +210,11 @@ export class TV extends irdeviceBase {
     if (this.Television.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.pushTVChanges(bodyChange)
     }
   }
@@ -224,11 +224,11 @@ export class TV extends irdeviceBase {
     if (this.Television.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.pushTVChanges(bodyChange)
     }
   }
@@ -236,11 +236,11 @@ export class TV extends irdeviceBase {
   async pushOkChanges(): Promise<void> {
     await this.debugLog(`pushOkChanges disablePushDetail: ${this.disablePushDetail}`)
     if (!this.disablePushDetail) {
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'Ok',
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.pushTVChanges(bodyChange)
     }
   }
@@ -248,11 +248,11 @@ export class TV extends irdeviceBase {
   async pushBackChanges(): Promise<void> {
     await this.debugLog(`pushBackChanges disablePushDetail: ${this.disablePushDetail}`)
     if (!this.disablePushDetail) {
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'Back',
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.pushTVChanges(bodyChange)
     }
   }
@@ -260,11 +260,11 @@ export class TV extends irdeviceBase {
   async pushMenuChanges(): Promise<void> {
     await this.debugLog(`pushMenuChanges disablePushDetail: ${this.disablePushDetail}`)
     if (!this.disablePushDetail) {
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'Menu',
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.pushTVChanges(bodyChange)
     }
   }
@@ -272,11 +272,11 @@ export class TV extends irdeviceBase {
   async pushUpChanges(): Promise<void> {
     await this.debugLog(`pushUpChanges disablePushDetail: ${this.disablePushDetail}`)
     if (!this.disablePushDetail) {
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'Up',
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.pushTVChanges(bodyChange)
     }
   }
@@ -284,11 +284,11 @@ export class TV extends irdeviceBase {
   async pushDownChanges(): Promise<void> {
     await this.debugLog(`pushDownChanges disablePushDetail: ${this.disablePushDetail}`)
     if (!this.disablePushDetail) {
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'Down',
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.pushTVChanges(bodyChange)
     }
   }
@@ -296,11 +296,11 @@ export class TV extends irdeviceBase {
   async pushRightChanges(): Promise<void> {
     await this.debugLog(`pushRightChanges disablePushDetail: ${this.disablePushDetail}`)
     if (!this.disablePushDetail) {
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'Right',
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.pushTVChanges(bodyChange)
     }
   }
@@ -308,11 +308,11 @@ export class TV extends irdeviceBase {
   async pushLeftChanges(): Promise<void> {
     await this.debugLog(`pushLeftChanges disablePushDetail: ${this.disablePushDetail}`)
     if (!this.disablePushDetail) {
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'Left',
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.pushTVChanges(bodyChange)
     }
   }
@@ -320,11 +320,11 @@ export class TV extends irdeviceBase {
   async pushVolumeUpChanges(): Promise<void> {
     await this.debugLog(`pushVolumeUpChanges disablePushDetail: ${this.disablePushDetail}`)
     if (!this.disablePushDetail) {
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'volumeAdd',
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.pushTVChanges(bodyChange)
     }
   }
@@ -332,11 +332,11 @@ export class TV extends irdeviceBase {
   async pushVolumeDownChanges(): Promise<void> {
     await this.debugLog(`pushVolumeDownChanges disablePushDetail: ${this.disablePushDetail}`)
     if (!this.disablePushDetail) {
-      const bodyChange = JSON.stringify({
+      const bodyChange: bodyChange = {
         command: 'volumeSub',
         parameter: 'default',
         commandType: 'command',
-      })
+      }
       await this.pushTVChanges(bodyChange)
     }
   }
@@ -346,14 +346,13 @@ export class TV extends irdeviceBase {
     if (this.device.connectionType === 'OpenAPI') {
       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) {

package/src/irdevice/vacuumcleaner.ts

@@ -3,10 +3,10 @@
  * vacuumcleaner.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'
 
@@ -69,11 +69,11 @@ export class VacuumCleaner 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)
     }
   }
@@ -83,11 +83,11 @@ export class VacuumCleaner 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)
     }
   }
@@ -97,14 +97,13 @@ export class VacuumCleaner extends irdeviceBase {
     if (this.device.connectionType === 'OpenAPI') {
       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) {

package/src/irdevice/waterheater.ts

@@ -3,10 +3,10 @@
  * waterheater.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'
 
@@ -70,11 +70,11 @@ export class WaterHeater extends irdeviceBase {
     if (this.Valve.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)
     }
   }
@@ -84,11 +84,11 @@ export class WaterHeater extends irdeviceBase {
     if (this.Valve.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)
     }
   }
@@ -98,14 +98,13 @@ export class WaterHeater 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) {