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

package/src/device/device.ts

@@ -5,7 +5,7 @@
 
 import type { API, CharacteristicValue, HAP, Logging, PlatformAccessory, Service } from 'homebridge'
 import type { MqttClient } from 'mqtt'
-import type { ad, bodyChange, device } from 'node-switchbot'
+import type { ad, bodyChange, device, deviceStatus, deviceStatusRequest, pushResponse } from 'node-switchbot'
 
 import type { SwitchBotPlatform } from '../platform.js'
 import type { blindTiltConfig, botConfig, ceilingLightConfig, colorBulbConfig, contactConfig, curtainConfig, devicesConfig, hubConfig, humidifierConfig, indoorOutdoorSensorConfig, lockConfig, meterConfig, motionConfig, stripLightConfig, SwitchBotPlatformConfig, waterDetectorConfig } from '../settings.js'
@@ -379,17 +379,17 @@ export abstract class deviceBase {
     }
   }
 
-  async pushChangeRequest(bodyChange: bodyChange): Promise<{ body: any, statusCode: number }> {
+  async pushChangeRequest(bodyChange: bodyChange): Promise<{ body: pushResponse['body'], statusCode: pushResponse['statusCode'] }> {
     const { response, statusCode } = await this.platform.switchBotAPI.controlDevice(this.device.deviceId, bodyChange.command, bodyChange.parameter, bodyChange.commandType)
     return { body: response, statusCode }
   }
 
-  async deviceRefreshStatus(): Promise<{ body: any, statusCode: number }> {
+  async deviceRefreshStatus(): Promise<{ body: deviceStatus, statusCode: deviceStatusRequest['statusCode'] }> {
     const { response, statusCode } = await this.platform.retryRequest(this.device.deviceId, this.deviceMaxRetries, this.deviceDelayBetweenRetries)
     return { body: response, statusCode }
   }
 
-  async successfulStatusCodes(deviceStatus: any) {
+  async successfulStatusCodes(deviceStatus: deviceStatusRequest) {
     return (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)
   }
 

package/src/platform.ts

@@ -20,7 +20,7 @@ import { EveHomeKitTypes } from 'homebridge-lib/EveHomeKitTypes'
 * import type { blindTilt, curtain, curtain3, device, irdevice } from '/Users/Shared/GitHub/OpenWonderLabs/node-switchbot/dist/index.js';
 * import { LogLevel, SwitchBotBLE, SwitchBotModel, SwitchBotOpenAPI } from '/Users/Shared/GitHub/OpenWonderLabs/node-switchbot/dist/index.js';
 */
-import type { blindTilt, curtain, curtain3, device, irdevice } from 'node-switchbot'
+import type { blindTilt, curtain, curtain3, device, deviceStatus, deviceStatusRequest, irdevice } from 'node-switchbot'
 
 import { LogLevel, SwitchBotBLE, SwitchBotModel, SwitchBotOpenAPI } from 'node-switchbot'
 import { queueScheduler } from 'rxjs'
@@ -113,7 +113,6 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       credentials: config.credentials as object,
       options: config.options as object,
       devices: config.devices as { deviceId: string }[],
-      deviceConfig: config.deviceConfig as { [deviceType: string]: devicesConfig },
     }
 
     // Plugin Configuration
@@ -615,9 +614,11 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       'Battery Circulator Fan': this.createFan.bind(this),
     }
 
+    const deviceConfig = this.config.options?.deviceConfig?.[device.deviceType] || {}
+
     if (deviceTypeHandlers[device.deviceType!]) {
       await this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`)
-      await deviceTypeHandlers[device.deviceType!](device)
+      await deviceTypeHandlers[device.deviceType!]({ ...device, ...deviceConfig })
     } else if (['Hub Mini', 'Hub Plus', 'Remote', 'Indoor Cam', 'remote with screen'].includes(device.deviceType!)) {
       await this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}, is currently not supported, device: ${JSON.stringify(device)}`)
     } else {
@@ -2534,7 +2535,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     }
   }
 
-  async retryRequest(deviceId: string, deviceMaxRetries: number, deviceDelayBetweenRetries: number): Promise<{ response: any, statusCode: number }> {
+  async retryRequest(deviceId: string, deviceMaxRetries: number, deviceDelayBetweenRetries: number): Promise<{ response: deviceStatus, statusCode: deviceStatusRequest['statusCode'] }> {
     let retryCount = 0
     const maxRetries = deviceMaxRetries
     const delayBetweenRetries = deviceDelayBetweenRetries
@@ -2550,7 +2551,14 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       await this.debugLog(`Retry attempt ${retryCount} of ${maxRetries}`)
       await sleep(delayBetweenRetries)
     }
-    return { response: null, statusCode: 500 }
+    return { response: {
+      deviceId: '',
+      deviceType: '',
+      hubDeviceId: '',
+      version: 0,
+      deviceName: '',
+      enableCloudService: false,
+    }, statusCode: 500 }
   }
 
   // BLE Connection

package/src/settings.ts

@@ -23,7 +23,6 @@ export const PLUGIN_NAME = '@switchbot/homebridge-switchbot'
 export interface SwitchBotPlatformConfig extends PlatformConfig {
   credentials?: credentials
   options?: options
-  deviceConfig?: { [deviceType: string]: devicesConfig }
 }
 interface credentials {
   token?: string
@@ -33,6 +32,7 @@ interface credentials {
 
 export interface options {
   devices?: devicesConfig[]
+  deviceConfig?: { [deviceType: string]: devicesConfig }
   irdevices?: irDevicesConfig[]
   allowInvalidCharacters?: boolean
   mqttURL?: string
@@ -132,7 +132,7 @@ export interface curtainConfig extends BaseDeviceConfig {
 export interface blindTiltConfig extends BaseDeviceConfig {
   configDeviceType: 'Blind Tilt'
   disable_group?: boolean
-  mode?: string
+  mapping?: string
   hide_lightsensor?: boolean
   set_minLux?: number
   set_maxLux?: number