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

package/src/devices-hap/airpurifier.ts

@@ -264,7 +264,7 @@ export class AirPurifier extends deviceBase {
         // Update HomeKit
         if ((serviceData.model === SwitchBotBLEModel.AirPurifier && SwitchBotBLEModelName.AirPurifier) ?? (serviceData.model === SwitchBotBLEModel.AirPurifierTable && SwitchBotBLEModelName.AirPurifierTable)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -290,7 +290,7 @@ export class AirPurifier extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: airPurifierServiceData | airPurifierTableServiceData) => {
           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()
@@ -335,7 +335,7 @@ export class AirPurifier extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: airPurifierWebhookContext | airPurifierTableWebhookContext) => {
         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,13 +400,18 @@ export class AirPurifier extends deviceBase {
           switchBotBLE
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
+              this.debugLog(`device_list: ${JSON.stringify(device_list)}`)
               return await this.retryBLE({
                 max: this.maxRetryBLE(),
                 fn: async () => {
-                  if (this.AirPurifier.Active) {
-                    return await (device_list[0] as any).turnOn()
+                  if (Array.isArray(device_list) && device_list.length > 0) {
+                    if (this.AirPurifier.Active) {
+                      return await (device_list[0] as any).turnOn()
+                    } else {
+                      return await (device_list[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/blindtilt.ts

@@ -465,7 +465,7 @@ export class BlindTilt extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.BlindTilt && serviceData.modelName === SwitchBotBLEModelName.BlindTilt) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -491,7 +491,7 @@ export class BlindTilt extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: blindTiltServiceData) => {
           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()
@@ -536,7 +536,7 @@ export class BlindTilt extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: blindTiltWebhookContext) => {
         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/bot.ts

@@ -262,7 +262,7 @@ export class Bot extends deviceBase {
           }
         } catch (e: any) {
           await this.apiError(e)
-          this.errorLog(`failed pushChanges with ${device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
+          this.errorLog(`failed pushChanges with ${device.connectionType} Connection, Error: ${e.message ?? e}`)
         }
         this.botUpdateInProgress = false
       })
@@ -381,7 +381,7 @@ export class Bot extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Bot && serviceData.modelName === SwitchBotBLEModelName.Bot) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -407,7 +407,7 @@ export class Bot extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: botServiceData) => {
           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()
@@ -452,7 +452,7 @@ export class Bot extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: botWebhookContext) => {
         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()
@@ -510,7 +510,17 @@ export class Bot extends deviceBase {
             .then(async (device_list: SwitchbotDevice[]) => {
               const deviceList = device_list as WoHand[]
               this.infoLog(`On: ${this.On}`)
-              return await deviceList[0].press()
+              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].press()
+                  } else {
+                    throw new Error('No device found')
+                  }
+                },
+              })
             })
             .then(async () => {
               this.successLog(`On: ${this.On} sent over SwitchBot BLE, sent successfully`)

package/src/devices-hap/ceilinglight.ts

@@ -291,7 +291,7 @@ export class CeilingLight extends deviceBase {
         // Update HomeKit
         if ((serviceData.model === SwitchBotBLEModel.CeilingLight || SwitchBotBLEModel.CeilingLightPro) && (serviceData.modelName === SwitchBotBLEModelName.CeilingLight || SwitchBotBLEModelName.CeilingLightPro)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -317,7 +317,7 @@ export class CeilingLight extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: ceilingLightServiceData | ceilingLightProServiceData) => {
           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 +362,7 @@ export class CeilingLight extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: ceilingLightWebhookContext | ceilingLightProWebhookContext) => {
         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()
@@ -434,15 +434,20 @@ export class CeilingLight extends deviceBase {
           switchBotBLE
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
-              const deviceList = device_list[0] as WoCeilingLight
+              const deviceList = device_list as WoCeilingLight[]
               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.')
                   }
                 },
               })

package/src/devices-hap/colorbulb.ts

@@ -326,7 +326,7 @@ export class ColorBulb extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.ColorBulb && serviceData.modelName === SwitchBotBLEModelName.ColorBulb) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -352,7 +352,7 @@ export class ColorBulb extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: colorBulbServiceData) => {
           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()
@@ -397,7 +397,7 @@ export class ColorBulb extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: colorBulbWebhookContext) => {
         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()
@@ -480,15 +480,21 @@ export class ColorBulb extends deviceBase {
         if (switchBotBLE !== false) {
           switchBotBLE
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
-            .then(async (device_list: WoBulb[]) => {
+            .then(async (device_list: SwitchbotDevice[]) => {
+              const deviceList = device_list as WoBulb[]
               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 device_list[0].turnOn()
+                  if (deviceList.length > 0) {
+                    if (this.LightBulb.On) {
+                      return await deviceList[0].turnOn()
+                    } else {
+                      return await deviceList[0].turnOff()
+                    }
                   } else {
-                    return await device_list[0].turnOff()
+                    throw new Error('No devices found during discovery.')
                   }
                 },
               })
@@ -528,7 +534,17 @@ export class ColorBulb extends deviceBase {
             .then(async (device_list: SwitchbotDevice[]) => {
               const deviceList = device_list as WoBulb[]
               this.infoLog(`Target Brightness: ${this.LightBulb.Brightness}`)
-              return await deviceList[0].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`)
@@ -567,7 +583,17 @@ export class ColorBulb extends deviceBase {
             .then(async (device_list: SwitchbotDevice[]) => {
               const deviceList = device_list as WoBulb[]
               this.infoLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`)
-              return await deviceList[0].setColorTemperature(kelvin)
+              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].setColorTemperature(kelvin)
+                  } else {
+                    throw new Error('No devices found during discovery.')
+                  }
+                },
+              })
             })
             .then(async () => {
               this.successLog(`ColorTemperature: ${this.LightBulb.ColorTemperature} sent over SwitchBot BLE, sent successfully`)
@@ -607,7 +633,17 @@ export class ColorBulb extends deviceBase {
             .then(async (device_list: SwitchbotDevice[]) => {
               const deviceList = device_list as WoBulb[]
               this.infoLog(`RGB: ${(this.LightBulb.Brightness, red, green, blue)}`)
-              return await deviceList[0].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/contact.ts

@@ -307,7 +307,7 @@ export class Contact extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.ContactSensor && serviceData.modelName === SwitchBotBLEModelName.ContactSensor) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -333,7 +333,7 @@ export class Contact extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: contactSensorServiceData) => {
           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()
@@ -378,7 +378,7 @@ export class Contact extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: contactSensorWebhookContext) => {
         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/curtain.ts

@@ -534,7 +534,7 @@ export class Curtain extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: curtainWebhookContext | curtain3WebhookContext) => {
         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()
@@ -657,7 +657,7 @@ export class Curtain extends deviceBase {
       const adjustedTargetPosition = 100 - Number(this.WindowCovering.TargetPosition)
       const { setPositionMode, Mode }: { setPositionMode: number, Mode: string } = await this.setPerformance()
       this.debugLog(`Mode: ${Mode}, setPositionMode: ${setPositionMode}`)
-      const adjustedMode = setPositionMode || 'ff'
+      const adjustedMode = setPositionMode === 1 ? '01' : '00'
       let bodyChange: bodyChange
       if (this.WindowCovering.HoldPosition) {
         bodyChange = {

package/src/devices-hap/device.ts

@@ -147,7 +147,9 @@ export abstract class deviceBase {
       device.scanDuration !== 0 && { scanDuration: device.scanDuration },
       device.offline === true && { offline: device.offline },
       device.maxRetry !== 0 && { maxRetry: device.maxRetry },
-      device.webhook === true && { webhook: device.webhook },
+      (device.webhook === true || (device.webhook === undefined && this.config.options?.webhook === true)) && {
+        webhook: device.webhook !== undefined ? device.webhook : this.config.options?.webhook,
+      },
       device.connectionType !== '' && { connectionType: device.connectionType },
       device.disablePlatformBLE !== false && { disablePlatformBLE: device.disablePlatformBLE },
       device.external === true && { external: device.external },
@@ -584,6 +586,12 @@ export abstract class deviceBase {
         bleModelName: SwitchBotBLEModelName.LockPro,
         bleModelFriendlyName: SwitchBotBLEModelFriendlyName.LockPro,
       },
+      'Smart Lock Ultra': {
+        model: SwitchBotModel.LockPro,
+        bleModel: SwitchBotBLEModel.LockPro,
+        bleModelName: SwitchBotBLEModelName.LockPro,
+        bleModelFriendlyName: SwitchBotBLEModelFriendlyName.LockPro,
+      },
       'Color Bulb': {
         model: SwitchBotModel.ColorBulb,
         bleModel: SwitchBotBLEModel.ColorBulb,
@@ -709,6 +717,17 @@ export abstract class deviceBase {
       .updateValue(deviceVersion)
     accessory.context.version = deviceVersion
     this.debugSuccessLog(`version: ${accessory.context.version}`)
+
+    // Expose effective webhook setting on accessory context (parity with Matter)
+    try {
+      const effectiveWebhook = device.webhook !== undefined ? device.webhook : (this.config.options?.webhook === true ? true : undefined)
+      if (effectiveWebhook !== undefined) {
+        accessory.context.webhook = effectiveWebhook
+        this.debugLog(`Effective webhook for ${device.deviceId}: ${String(effectiveWebhook)}`)
+      }
+    } catch (e: any) {
+      this.debugLog(`Failed to set webhook context for ${device.deviceId}: ${e?.message ?? e}`)
+    }
   }
 
   async statusCode(statusCode: number): Promise<void> {

package/src/devices-hap/fan.ts

@@ -329,7 +329,7 @@ export class Fan extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Unknown && SwitchBotBLEModelName.Unknown) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -355,7 +355,7 @@ export class Fan extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: batteryCirculatorFanServiceData) => {
           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()
@@ -400,7 +400,7 @@ export class Fan extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: batteryCirculatorFanWebhookContext) => {
         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()
@@ -468,13 +468,18 @@ export class Fan extends deviceBase {
           switchBotBLE
             .discover({ model: this.device.bleModel, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
+              this.debugLog(`device_list: ${JSON.stringify(device_list)}`)
               return await this.retryBLE({
                 max: this.maxRetryBLE(),
                 fn: async () => {
-                  if (this.Fan.Active) {
-                    return await (device_list[0] as any).turnOn()
+                  if (Array.isArray(device_list) && device_list.length > 0) {
+                    if (this.Fan.Active) {
+                      return await (device_list[0] as any).turnOn()
+                    } else {
+                      return await (device_list[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/hub.ts

@@ -211,8 +211,9 @@ export class Hub extends deviceBase {
 
     // CurrentTemperature
     if (!(this.device as hubConfig).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 hubConfig).convertUnitTo)
+      this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`)
     }
 
     // LightSensor
@@ -297,7 +298,7 @@ export class Hub extends deviceBase {
         if ((serviceData.model === SwitchBotBLEModel.Hub2 && serviceData.modelName === SwitchBotBLEModelName.Hub2)
           || (serviceData.model === SwitchBotBLEModel.Hub3 && serviceData.modelName === SwitchBotBLEModelName.Hub3)) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -323,7 +324,7 @@ export class Hub extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: hub2ServiceData) => {
           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()
@@ -368,7 +369,7 @@ export class Hub extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: hub2WebhookContext) => {
         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/humidifier.ts

@@ -42,6 +42,12 @@ export class Humidifier extends deviceBase {
     CurrentTemperature: CharacteristicValue
   }
 
+  private DryingFilterSwitch?: {
+    Name: CharacteristicValue
+    Service: Service
+    On: CharacteristicValue
+  }
+
   // OpenAPI
   deviceStatus!: humidifierStatus | humidifier2Status
 
@@ -132,6 +138,31 @@ export class Humidifier extends deviceBase {
       })
     }
 
+    // Initialize optional Drying Filter Switch (Humidifier2 only)
+    if ((device as humidifierConfig).configDeviceType === 'Humidifier2' && (device as humidifierConfig).activate_dryingfilter) {
+      accessory.context.DryingFilterSwitch = accessory.context.DryingFilterSwitch ?? {}
+      this.DryingFilterSwitch = {
+        Name: `${accessory.displayName} Drying Filter`,
+        Service: accessory.getService(`${accessory.displayName} Drying Filter`) ?? accessory.addService(this.hap.Service.Switch, `${accessory.displayName} Drying Filter`, 'DryingFilterSwitch') as Service,
+        On: false,
+      }
+      accessory.context.DryingFilterSwitch = this.DryingFilterSwitch as object
+
+      this.DryingFilterSwitch.Service.setCharacteristic(this.hap.Characteristic.Name, this.DryingFilterSwitch.Name)
+        .getCharacteristic(this.hap.Characteristic.On)
+        .onGet(() => {
+          return this.DryingFilterSwitch!.On
+        })
+        .onSet(this.DryingFilterOnSet.bind(this))
+      this.debugLog('Initialized Drying Filter Switch Service')
+    } else {
+      const svc = this.accessory.getServiceById(this.hap.Service.Switch, 'DryingFilterSwitch')
+      if (svc) {
+        this.debugLog('Removing Drying Filter Switch Service')
+        this.accessory.removeService(svc)
+      }
+    }
+
     // Retrieve initial values and updateHomekit
     try {
       this.debugLog('Retrieve initial values and update Homekit')
@@ -326,7 +357,7 @@ export class Humidifier extends deviceBase {
         // Update HomeKit
         if (serviceData.model === SwitchBotBLEModel.Humidifier && serviceData.modelName === SwitchBotBLEModelName.Humidifier) {
           this.serviceData = serviceData
-          if (serviceData !== undefined || serviceData !== null) {
+          if (serviceData !== undefined && serviceData !== null) {
             await this.BLEparseStatus()
             await this.updateHomeKitCharacteristics()
           } else {
@@ -352,7 +383,7 @@ export class Humidifier extends deviceBase {
         this.platform.bleEventHandler[this.device.bleMac] = async (context: humidifierServiceData | humidifier2ServiceData) => {
           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()
@@ -397,7 +428,7 @@ export class Humidifier extends deviceBase {
       this.platform.webhookEventHandler[this.device.deviceId] = async (context: humidifierWebhookContext | humidifier2WebhookContext) => {
         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()
@@ -446,7 +477,17 @@ export class Humidifier extends deviceBase {
           switchBotBLE
             .discover({ model: this.device.bleModel, quick: true, id: this.device.bleMac })
             .then(async (device_list: SwitchbotDevice[]) => {
-              return await (device_list[0] as WoHumi).percentage(Number(this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold))
+              this.debugLog(`device_list: ${JSON.stringify(device_list)}`)
+              return await this.retryBLE({
+                max: this.maxRetryBLE(),
+                fn: async () => {
+                  if (device_list.length > 0) {
+                    return await (device_list[0] as WoHumi).percentage(Number(this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold))
+                  } else {
+                    throw new Error('No devices found during discovery.')
+                  }
+                },
+              })
             })
             .then(async () => {
               this.successLog(`RelativeHumidityHumidifierThreshold: ${this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold} sent over BLE, sent successfully`)
@@ -630,6 +671,58 @@ export class Humidifier extends deviceBase {
     if (!(this.device as humidifierConfig).hide_temperature && this.TemperatureSensor?.Service) {
       await this.updateCharacteristic(this.TemperatureSensor.Service, this.hap.Characteristic.CurrentTemperature, this.TemperatureSensor.CurrentTemperature, 'CurrentTemperature')
     }
+    // DryingFilter switch is momentary; ensure it reflects current cached state
+    if (this.DryingFilterSwitch?.Service) {
+      await this.updateCharacteristic(this.DryingFilterSwitch.Service, this.hap.Characteristic.On, this.DryingFilterSwitch.On, 'DryingFilter.On')
+    }
+  }
+
+  /**
+   * Handle requests to set the Drying Filter switch (Humidifier2 only)
+   */
+  async DryingFilterOnSet(value: CharacteristicValue): Promise<void> {
+    if (!this.DryingFilterSwitch?.Service) {
+      this.debugLog('DryingFilterOnSet called but service not initialized')
+      return
+    }
+    this.DryingFilterSwitch.On = value
+    if (value !== true) {
+      // Switch is momentary; ignore turning off manually
+      this.debugLog('Drying Filter switch set to false (ignored)')
+      return
+    }
+
+    this.infoLog('Trigger Drying Filter mode')
+    if (this.OpenAPI && this.platform.config.credentials?.token) {
+      const bodyChange: bodyChange = {
+        command: 'setMode',
+        parameter: '8',
+        commandType: 'command',
+      }
+      this.debugLog(`DryingFilterOnSet, SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
+      try {
+        const deviceStatus = await this.pushChangeRequest(bodyChange)
+        this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
+        if (await this.successfulStatusCodes(deviceStatus)) {
+          this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
+        } else {
+          await this.statusCode(deviceStatus.statusCode)
+        }
+      } catch (e: any) {
+        await this.apiError(e)
+        this.errorLog(`failed DryingFilterOnSet with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`)
+      }
+    } else {
+      this.debugWarnLog('Drying Filter requires OpenAPI; BLE not supported for this action')
+    }
+
+    // Auto-reset the momentary switch back to off after a short delay
+    setTimeout(async () => {
+      if (this.DryingFilterSwitch) {
+        this.DryingFilterSwitch.On = false
+        await this.updateHomeKitCharacteristics()
+      }
+    }, 1500)
   }
 
   async BLEPushConnection() {