@switchbot/homebridge-switchbot 5.0.0-beta.43 → 5.0.0-beta.45

package/src/devices-hap/iosensor.ts

@@ -178,27 +178,41 @@ export class IOSensor extends deviceBase {
   async BLEparseStatus(): Promise<void> {
     this.debugLog('BLEparseStatus')
     this.debugLog(`(battery, temperature, humidity) = BLE:(${this.serviceData.battery}, ${this.serviceData.celsius}, ${this.serviceData.humidity}), current:(${this.Battery.BatteryLevel}, ${this.TemperatureSensor?.CurrentTemperature}, ${this.HumiditySensor?.CurrentRelativeHumidity})`)
+
     // Battery Info
     if ('battery' in this.serviceData) {
-      // BatteryLevel
-      this.Battery.BatteryLevel = this.serviceData.battery
-      this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`)
-      // StatusLowBattery
-      this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
-        ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
-        : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL
-      this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`)
+      if (typeof this.serviceData.battery === 'number') {
+        this.Battery.BatteryLevel = this.serviceData.battery
+        this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`)
+        this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
+          ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
+          : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL
+        this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`)
+      } else {
+        this.debugWarnLog(`BLE battery is undefined; skipping battery update.`)
+      }
     }
+
     // CurrentRelativeHumidity
     if (!(this.device as indoorOutdoorSensorConfig).hide_humidity && this.HumiditySensor?.Service) {
-      this.HumiditySensor.CurrentRelativeHumidity = validHumidity(this.serviceData.humidity, 0, 100)
-      this.debugLog(`CurrentRelativeHumidity: ${this.HumiditySensor.CurrentRelativeHumidity}%`)
+      if (typeof this.serviceData.humidity === 'number') {
+        this.HumiditySensor.CurrentRelativeHumidity = validHumidity(this.serviceData.humidity, 0, 100)
+        this.debugLog(`CurrentRelativeHumidity: ${this.HumiditySensor.CurrentRelativeHumidity}%`)
+      } else {
+        this.debugWarnLog(`BLE humidity is undefined; skipping humidity update.`)
+      }
     }
+
     // Current Temperature
     if (!(this.device as indoorOutdoorSensorConfig).hide_temperature && this.TemperatureSensor?.Service) {
-      const CELSIUS = this.serviceData.celsius < 0 ? 0 : this.serviceData.celsius > 100 ? 100 : this.serviceData.celsius
-      this.TemperatureSensor.CurrentTemperature = CELSIUS
-      this.debugLog(`Temperature: ${this.TemperatureSensor.CurrentTemperature}°c`)
+      if (typeof this.serviceData.celsius === 'number') {
+        const c = this.serviceData.celsius
+        const CELSIUS = c < 0 ? 0 : c > 100 ? 100 : c
+        this.TemperatureSensor.CurrentTemperature = CELSIUS
+        this.debugLog(`Temperature: ${this.TemperatureSensor.CurrentTemperature}°c`)
+      } else {
+        this.debugWarnLog(`BLE temperature is undefined; skipping temperature update.`)
+      }
     }
   }
 
@@ -224,8 +238,9 @@ export class IOSensor extends deviceBase {
 
     // Current Temperature
     if (!(this.device as indoorOutdoorSensorConfig).hide_temperature && this.TemperatureSensor?.Service) {
-      this.TemperatureSensor.CurrentTemperature = this.deviceStatus.temperature
-      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}°c`)
+      // OpenAPI returns Celsius; convert if user configured a different unit
+      this.TemperatureSensor.CurrentTemperature = convertUnits(this.deviceStatus.temperature as number, 'CELSIUS', (this.device as indoorOutdoorSensorConfig).convertUnitTo)
+      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`)
     }
 
     // Firmware Version
@@ -252,12 +267,12 @@ export class IOSensor extends deviceBase {
       this.warnLog(`received a non-CELSIUS Webhook scale: ${this.webhookContext.scale}, Use the *convertUnitsTo* config under Hub settings, if displaying incorrectly in HomeKit.`)
     }
     // CurrentRelativeHumidity
-    if ((this.device as indoorOutdoorSensorConfig).hide_humidity && this.HumiditySensor?.Service) {
+    if (!(this.device as indoorOutdoorSensorConfig).hide_humidity && this.HumiditySensor?.Service) {
       this.HumiditySensor.CurrentRelativeHumidity = this.webhookContext.humidity
       this.debugLog(`CurrentRelativeHumidity: ${this.HumiditySensor.CurrentRelativeHumidity}%`)
     }
     // CurrentTemperature
-    if ((this.device as indoorOutdoorSensorConfig).hide_temperature && this.TemperatureSensor?.Service) {
+    if (!(this.device as indoorOutdoorSensorConfig).hide_temperature && this.TemperatureSensor?.Service) {
       this.TemperatureSensor.CurrentTemperature = convertUnits(this.webhookContext.temperature, this.webhookContext.scale, (this.device as indoorOutdoorSensorConfig).convertUnitTo)
       this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}°c`)
     }
@@ -290,7 +305,7 @@ export class IOSensor extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.OutdoorMeter && serviceData.modelName === SwitchBotBLEModelName.OutdoorMeter) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -316,7 +331,7 @@ export class IOSensor extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: outdoorMeterServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -351,7 +366,7 @@ export class IOSensor extends deviceBase {
       }
     } catch (e: any) {
       await this.apiError(e)
-      this.errorLog(`failed openAPIRefreshStatus with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
+      this.errorLog(`failed openAPIRefreshStatus with ${this.device.connectionType} Connection, Error: ${e.message ?? e}`)
     }
   }
 
@@ -361,7 +376,7 @@ export class IOSensor extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: outdoorMeterWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/devices-hap/lightstrip.ts

@@ -328,7 +328,7 @@ export class StripLight extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.StripLight && serviceData.modelName === SwitchBotBLEModelName.StripLight) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -354,7 +354,7 @@ export class StripLight extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: stripLightServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -399,7 +399,7 @@ export class StripLight extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: stripLightWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()
@@ -485,13 +485,18 @@ export class StripLight extends deviceBase {
             .then(async (device_list: SwitchbotDevice[]) => {
               const deviceList = device_list as WoStrip[]
               this.infoLog(`On: ${this.LightBulb.On}`)
+              this.debugLog(`device_list: ${JSON.stringify(device_list)}`)
               return await this.retryBLE({
                 max: this.maxRetryBLE(),
                 fn: async () => {
-                  if (this.LightBulb.On) {
-                    return await deviceList[0].turnOn()
+                  if (deviceList.length > 0) {
+                    if (this.LightBulb.On) {
+                      return await deviceList[0].turnOn()
+                    } else {
+                      return await deviceList[0].turnOff()
+                    }
                   } else {
-                    return await deviceList[0].turnOff()
+                    throw new Error('No devices found during discovery.')
                   }
                 },
               })
@@ -529,8 +534,19 @@ export class StripLight extends deviceBase {
           switchBotBLE
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
+              const deviceList = device_list as WoStrip[]
               this.infoLog(`Brightness: ${this.LightBulb.Brightness}`)
-              return await (device_list[0] as WoStrip).setBrightness(Number(this.LightBulb.Brightness))
+              this.debugLog(`device_list: ${JSON.stringify(device_list)}`)
+              return await this.retryBLE({
+                max: this.maxRetryBLE(),
+                fn: async () => {
+                  if (deviceList.length > 0) {
+                    return await deviceList[0].setBrightness(Number(this.LightBulb.Brightness))
+                  } else {
+                    throw new Error('No devices found during discovery.')
+                  }
+                },
+              })
             })
             .then(async () => {
               this.successLog(`Brightness: ${this.LightBulb.Brightness} sent over SwitchBot BLE, sent successfully`)
@@ -568,8 +584,19 @@ export class StripLight extends deviceBase {
           switchBotBLE
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
+              const deviceList = device_list as WoStrip[]
               this.infoLog(`RGB: ${(this.LightBulb.Brightness, red, green, blue)}`)
-              return await (device_list[0] as WoStrip).setRGB(Number(this.LightBulb.Brightness), red, green, blue)
+              this.debugLog(`device_list: ${JSON.stringify(device_list)}`)
+              return await this.retryBLE({
+                max: this.maxRetryBLE(),
+                fn: async () => {
+                  if (deviceList.length > 0) {
+                    return await deviceList[0].setRGB(Number(this.LightBulb.Brightness), red, green, blue)
+                  } else {
+                    throw new Error('No devices found during discovery.')
+                  }
+                },
+              })
             })
             .then(async () => {
               this.successLog(`RGB: ${(this.LightBulb.Brightness, red, green, blue)} sent over SwitchBot BLE, sent successfully`)

package/src/devices-hap/lock.ts

@@ -332,7 +332,7 @@ export class Lock extends deviceBase {
         if ((serviceData.model === SwitchBotBLEModel.Lock || SwitchBotBLEModel.LockPro)
           && (serviceData.modelName === SwitchBotBLEModelName.Lock || SwitchBotBLEModelName.LockPro)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -358,7 +358,7 @@ export class Lock extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: lockServiceData | lockProServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -403,7 +403,7 @@ export class Lock extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: lockWebhookContext | lockProWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()
@@ -455,13 +455,20 @@ export class Lock extends deviceBase {
           switchBotBLE
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
+              const deviceList = device_list as WoSmartLock[]
+              this.infoLog(`LockTargetState: ${this.LockMechanism.LockTargetState}`)
+              this.warnLog(`device_list: ${JSON.stringify(device_list)}`)
               return await this.retryBLE({
                 max: this.maxRetryBLE(),
                 fn: async () => {
-                  if (this.LockMechanism.LockTargetState === this.hap.Characteristic.LockTargetState.SECURED) {
-                    return await (device_list[0] as WoSmartLock).lock()
+                  if (deviceList && Array.isArray(deviceList) && deviceList.length > 0) {
+                    if (this.LockMechanism.LockTargetState === this.hap.Characteristic.LockTargetState.SECURED) {
+                      return await deviceList[0].lock()
+                    } else {
+                      return await deviceList[0].unlock()
+                    }
                   } else {
-                    return await (device_list[0] as WoSmartLock).unlock()
+                    throw new Error('No devices found during discovery.')
                   }
                 },
               })

package/src/devices-hap/meter.ts

@@ -209,8 +209,9 @@ export class Meter extends deviceBase {
 
     // CurrentTemperature
     if (!(this.device as meterConfig).hide_temperature && this.TemperatureSensor?.Service) {
-      this.TemperatureSensor.CurrentTemperature = this.deviceStatus.temperature
-      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}°c`)
+      // OpenAPI returns Celsius; convert if user configured a different unit
+      this.TemperatureSensor.CurrentTemperature = convertUnits(this.deviceStatus.temperature, 'CELSIUS', (this.device as meterConfig).convertUnitTo)
+      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`)
     }
 
     // BatteryLevel
@@ -287,7 +288,7 @@ export class Meter extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Meter && serviceData.modelName === SwitchBotBLEModelName.Meter) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -313,7 +314,7 @@ export class Meter extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: meterServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -358,7 +359,7 @@ export class Meter extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: meterWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/devices-hap/meterplus.ts

@@ -213,8 +213,9 @@ export class MeterPlus extends deviceBase {
 
     // CurrentTemperature
     if (!(this.device as meterConfig).hide_temperature && this.TemperatureSensor?.Service) {
-      this.TemperatureSensor.CurrentTemperature = this.deviceStatus.temperature
-      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}°c`)
+      // OpenAPI returns Celsius; convert if user configured a different unit
+      this.TemperatureSensor.CurrentTemperature = convertUnits(this.deviceStatus.temperature, 'CELSIUS', (this.device as meterConfig).convertUnitTo)
+      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`)
     }
 
     // BatteryLevel
@@ -291,7 +292,7 @@ export class MeterPlus extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.MeterPlus && serviceData.modelName === SwitchBotBLEModelName.MeterPlus) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -317,7 +318,7 @@ export class MeterPlus extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: meterPlusServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -362,7 +363,7 @@ export class MeterPlus extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: meterPlusWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/devices-hap/meterpro.ts

@@ -263,8 +263,9 @@ export class MeterPro extends deviceBase {
 
     // CurrentTemperature
     if (!(this.device as meterProConfig).hide_temperature && this.TemperatureSensor?.Service) {
-      this.TemperatureSensor.CurrentTemperature = this.deviceStatus.temperature
-      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}°c`)
+      // OpenAPI returns Celsius; convert if user configured a different unit
+      this.TemperatureSensor.CurrentTemperature = convertUnits(this.deviceStatus.temperature as number, 'CELSIUS', (this.device as meterProConfig).convertUnitTo)
+      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`)
     }
 
     // Carbon Dioxide Sensor
@@ -367,7 +368,7 @@ export class MeterPro extends deviceBase {
         if ((serviceData.model === SwitchBotBLEModel.MeterPro && serviceData.modelName === SwitchBotBLEModelName.MeterPro)
           || (serviceData.model === SwitchBotBLEModel.MeterProCO2 && serviceData.modelName === SwitchBotBLEModelName.MeterProCO2)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -393,7 +394,7 @@ export class MeterPro extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: meterProServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -428,7 +429,7 @@ export class MeterPro extends deviceBase {
       }
     } catch (e: any) {
       await this.apiError(e)
-      this.errorLog(`failed openAPIRefreshStatus with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
+      this.errorLog(`failed openAPIRefreshStatus with ${this.device.connectionType} Connection, Error: ${e.message ?? e}`)
     }
   }
 
@@ -438,7 +439,7 @@ export class MeterPro extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: meterProWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/devices-hap/motion.ts

@@ -262,7 +262,7 @@ export class Motion extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.MotionSensor && serviceData.modelName === SwitchBotBLEModelName.MotionSensor) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -288,7 +288,7 @@ export class Motion extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: motionSensorServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -333,7 +333,7 @@ export class Motion extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: motionSensorWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/devices-hap/plug.ts

@@ -187,7 +187,7 @@ export class Plug extends deviceBase {
         if ((serviceData.model === SwitchBotBLEModel.PlugMiniUS || SwitchBotBLEModel.PlugMiniJP)
           && serviceData.modelName === (SwitchBotBLEModelName.PlugMini || SwitchBotBLEModelName.PlugMini)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -213,7 +213,7 @@ export class Plug extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: plugMiniUSServiceData | plugMiniJPServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -258,7 +258,7 @@ export class Plug extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: plugWebhookContext | plugMiniUSWebhookContext | plugMiniJPWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()
@@ -320,10 +320,14 @@ export class Plug extends deviceBase {
               return await this.retryBLE({
                 max: this.maxRetryBLE(),
                 fn: async () => {
-                  if (this.Outlet.On) {
-                    return await deviceList[0].turnOn()
+                  if (deviceList.length > 0) {
+                    if (this.Outlet.On) {
+                      return await deviceList[0].turnOn()
+                    } else {
+                      return await deviceList[0].turnOff()
+                    }
                   } else {
-                    return await deviceList[0].turnOff()
+                    throw new Error('No devices found during discovery.')
                   }
                 },
               })

package/src/devices-hap/relayswitch.ts

@@ -315,7 +315,7 @@ export class RelaySwitch extends deviceBase {
         // Update HomeKit
         if ((serviceData.model === SwitchBotBLEModel.RelaySwitch1PM && serviceData.modelName === SwitchBotBLEModelName.RelaySwitch1PM) ?? (serviceData.model === SwitchBotBLEModel.RelaySwitch1 && serviceData.modelName === SwitchBotBLEModelName.RelaySwitch1)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -341,7 +341,7 @@ export class RelaySwitch extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: relaySwitch1ServiceData | relaySwitch1PMServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -386,7 +386,7 @@ export class RelaySwitch extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: relaySwitch1Context | relaySwitch1PMContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/devices-hap/robotvacuumcleaner.ts

@@ -275,7 +275,7 @@ export class RobotVacuumCleaner extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Unknown && serviceData.modelName === SwitchBotBLEModelName.Unknown) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -301,7 +301,7 @@ export class RobotVacuumCleaner extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: robotVacuumCleanerServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -346,7 +346,7 @@ export class RobotVacuumCleaner extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: robotVacuumCleanerS1WebhookContext | robotVacuumCleanerS1PlusWebhookContext | floorCleaningRobotS10WebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()
@@ -400,14 +400,20 @@ export class RobotVacuumCleaner extends deviceBase {
           switchBotBLE
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
+              const deviceList = device_list as any[]
               this.infoLog(`On: ${this.LightBulb.On}`)
+              this.warnLog(`device_list: ${JSON.stringify(device_list)}`)
               return await this.retryBLE({
                 max: this.maxRetryBLE(),
                 fn: async () => {
-                  if (this.LightBulb.On) {
-                    return await (device_list[0] as any).turnOn()
+                  if (deviceList && Array.isArray(deviceList) && deviceList.length > 0) {
+                    if (this.LightBulb.On) {
+                      return await (deviceList[0] as any).turnOn()
+                    } else {
+                      return await (deviceList[0] as any).turnOff()
+                    }
                   } else {
-                    return await (device_list[0] as any).turnOff()
+                    throw new Error('No devices found during discovery.')
                   }
                 },
               })

package/src/devices-hap/waterdetector.ts

@@ -269,7 +269,7 @@ export class WaterDetector extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Leak && serviceData.modelName === SwitchBotBLEModelName.Leak) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -295,7 +295,7 @@ export class WaterDetector extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: waterLeakDetectorServiceData) => {
           try {
             this.serviceData = context
-            if (context !== undefined || context !== null) {
+            if (context !== undefined && context !== null) {
               this.debugLog(`received BLE: ${JSON.stringify(context)}`)
               await this.BLEparseStatus()
               await this.updateHomeKitCharacteristics()
@@ -340,7 +340,7 @@ export class WaterDetector extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: waterLeakDetectorWebhookContext) => {
         try {
           this.webhookContext = context
-          if (context !== undefined || context !== null) {
+          if (context !== undefined && context !== null) {
             this.debugLog(`received Webhook: ${JSON.stringify(context)}`)
             await this.parseStatusWebhook()
             await this.updateHomeKitCharacteristics()

package/src/homebridge-ui/public/index.html

@@ -43,7 +43,7 @@
     </form>
     <table class="table w-100" id="deviceTable" style="display: none">
       <thead>
-        <tr class="table-active">
+        <tr>
           <th scope="col" style="width: 40%">Device Name</th>
           <th scope="col" style="width: 60%" id="displayName"></th>
         </tr>
@@ -69,6 +69,18 @@
           <th scope="row">Connection Type</th>
           <td id="connectionType"></td>
         </tr>
+        <tr>
+          <th scope="row">Refresh Rate</th>
+          <td id="refreshRate"></td>
+        </tr>
+        <tr>
+          <th scope="row">Update Rate</th>
+          <td id="updateRate"></td>
+        </tr>
+        <tr>
+          <th scope="row">Push Rate</th>
+          <td id="pushRate"></td>
+        </tr>
       </tbody>
     </table>
     <p class="text-center">External accessories will not be displayed here.</p>