@switchbot/homebridge-switchbot 5.0.0-beta.4 → 5.0.0-beta.6

package/src/platform-matter.ts

@@ -187,19 +187,35 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
 
     // Helper to send a BLE action if Platform BLE is enabled and switchBotBLE exists
     const sendBLE = async (methodName: string, ...args: any[]) => {
+      // Provide a small retry loop for flaky BLE operations
       if (!this.switchBotBLE) {
         throw new Error('Platform BLE not available')
       }
       const id = formatDeviceIdAsMac(dev.deviceId)
-      const list = await this.switchBotBLE.discover({ model: (dev as any).bleModel, id })
-      if (!Array.isArray(list) || list.length === 0) {
-        throw new Error('BLE device not found')
-      }
-      const deviceInst: any = list[0]
-      if (typeof deviceInst[methodName] !== 'function') {
-        throw new TypeError(`BLE method ${methodName} not available on device`)
+      const maxRetries = (this.config.options as any)?.bleRetries ?? 2
+      const retryDelay = (this.config.options as any)?.bleRetryDelay ?? 500
+      let attempt = 0
+      while (attempt < maxRetries) {
+        try {
+          const list = await this.switchBotBLE.discover({ model: (dev as any).bleModel, id })
+          if (!Array.isArray(list) || list.length === 0) {
+            throw new Error('BLE device not found')
+          }
+          const deviceInst: any = list[0]
+          if (typeof deviceInst[methodName] !== 'function') {
+            throw new TypeError(`BLE method ${methodName} not available on device`)
+          }
+          return await deviceInst[methodName](...args)
+        } catch (e: any) {
+          attempt++
+          if (attempt >= maxRetries) {
+            throw e
+          }
+          this.log.debug(`BLE ${methodName} attempt ${attempt} failed for ${dev.deviceId}: ${e?.message ?? e}, retrying in ${retryDelay}ms`)
+          await sleep(retryDelay)
+        }
       }
-      return await deviceInst[methodName](...args)
+      throw new Error('BLE operation failed')
     }
 
     const makeOnOffHandlers = (uuid: string) => ({
@@ -233,14 +249,19 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
 
     // Mapping from SwitchBot deviceType -> constructor
     const mapping: { [key: string]: any } = {
+      // Plugs / Outlets
       'Plug': OnOffOutletAccessory,
       'Plug Mini (US)': OnOffOutletAccessory,
       'Plug Mini (JP)': OnOffOutletAccessory,
+
+      // Lighting
       'Color Bulb': ColorLightAccessory,
       'Ceiling Light': ColorTemperatureLightAccessory,
       'Ceiling Light Pro': ColorTemperatureLightAccessory,
       'Strip Light': ExtendedColorLightAccessory,
       'Dimmable Light': DimmableLightAccessory,
+
+      // Robot Vacuums
       'K10+': RoboticVacuumAccessory,
       'K10+ Pro': RoboticVacuumAccessory,
       'WoSweeper': RoboticVacuumAccessory,
@@ -248,8 +269,12 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
       'Robot Vacuum Cleaner S1': RoboticVacuumAccessory,
       'Robot Vacuum Cleaner S1 Plus': RoboticVacuumAccessory,
       'Robot Vacuum Cleaner S10': RoboticVacuumAccessory,
+
+      // Locks
       'Smart Lock': DoorLockAccessory,
       'Smart Lock Pro': DoorLockAccessory,
+
+      // Sensors
       'Motion Sensor': OccupancySensorAccessory,
       'Contact Sensor': ContactSensorAccessory,
       'Water Detector': LeakSensorAccessory,
@@ -258,14 +283,30 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
       'MeterPro': TemperatureSensorAccessory,
       'WoIOSensor': TemperatureSensorAccessory,
       'Air Purifier PM2.5': HumiditySensorAccessory,
+
+      // Fans
       'Battery Circulator Fan': FanAccessory,
+
+      // Curtains / Blinds
       'Blind Tilt': VenetianBlindAccessory,
       'Curtain': WindowBlindAccessory,
       'Curtain3': WindowBlindAccessory,
       'WoRollerShade': WindowBlindAccessory,
       'Roller Shade': WindowBlindAccessory,
+
+      // Switches / Relays
       'Relay Switch 1': OnOffSwitchAccessory,
       'Relay Switch 1PM': OnOffSwitchAccessory,
+
+      // Misc
+      'Hub 2': undefined,
+      'Hub 3': undefined,
+      'Bot': undefined,
+      'Humidifier': undefined,
+      'Humidifier2': undefined,
+      'Air Purifier Table PM2.5': undefined,
+      'Air Purifier VOC': undefined,
+      'Air Purifier Table VOC': undefined,
     }
 
     const Ctor = mapping[dev.deviceType ?? '']
@@ -369,48 +410,29 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
       this.bleEventHandler[mac] = async (serviceData?: any) => {
         const uuidLocal = baseOpts.uuid
 
-        // Try to parse BLE advertisement/serviceData first (works without cloud)
+        // First try model-specific / normalized parsing of BLE advertisement
         try {
-          if (serviceData) {
+          const parsed = this.parseAdvertisementForDevice(dev, serviceData)
+          if (parsed) {
             // Power
-            const power = serviceData.power ?? serviceData.on ?? serviceData.p
-            if (power !== undefined) {
-              const on = (String(power).toLowerCase() === 'on' || Number(power) === 1)
-              await this.api.matter.updateAccessoryState(uuidLocal, this.api.matter.clusterNames.OnOff, { onOff: on })
+            if (parsed.power !== undefined) {
+              await this.api.matter.updateAccessoryState(uuidLocal, this.api.matter.clusterNames.OnOff, { onOff: Boolean(parsed.power) })
             }
 
             // Brightness
-            const brightness = serviceData.brightness ?? serviceData.b
-            if (brightness !== undefined) {
-              const level = Math.round((Number(brightness) / 100) * 254)
+            if (parsed.brightness !== undefined) {
+              const level = Math.round((Number(parsed.brightness) / 100) * 254)
               await this.api.matter.updateAccessoryState(uuidLocal, this.api.matter.clusterNames.LevelControl, { currentLevel: level })
             }
 
-            // Color (r:g:b or hex or hex without #)
-            const color = serviceData.color ?? serviceData.rgb ?? serviceData.c
-            if (color !== undefined) {
-              let r = 0
-              let g = 0
-              let b = 0
-              const c = String(color)
-              if (c.includes(':')) {
-                const parts = c.split(':').map(Number)
-                ;[r, g, b] = parts
-              } else if (c.startsWith('#')) {
-                const hex = c.replace('#', '')
-                r = Number.parseInt(hex.substring(0, 2), 16)
-                g = Number.parseInt(hex.substring(2, 4), 16)
-                b = Number.parseInt(hex.substring(4, 6), 16)
-              } else if (/^[0-9a-f]{6}$/i.test(c)) {
-                r = Number.parseInt(c.substring(0, 2), 16)
-                g = Number.parseInt(c.substring(2, 4), 16)
-                b = Number.parseInt(c.substring(4, 6), 16)
-              }
+            // Color
+            if (parsed.color !== undefined) {
+              const { r, g, b } = parsed.color
               const [h, s] = rgb2hs(r, g, b)
               await this.api.matter.updateAccessoryState(uuidLocal, this.api.matter.clusterNames.ColorControl, { currentHue: Math.round((h / 360) * 254), currentSaturation: Math.round((s / 100) * 254) })
             }
 
-            // If serviceData was present, prefer it and return early
+            // If we parsed something from serviceData prefer it and return early
             if (serviceData) {
               return
             }
@@ -529,6 +551,66 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     return { response: {}, statusCode: 500 }
   }
 
+  /**
+   * Parse BLE advertisement/serviceData into normalized fields for a given device.
+   * Returns null when serviceData is falsy or parsing fails.
+   */
+  private parseAdvertisementForDevice(dev: device, serviceData?: any) {
+    if (!serviceData) {
+      return null
+    }
+    try {
+      const sd = serviceData
+      const result: any = {}
+
+      // Power/on state - supports multiple field names used by different models
+      const power = sd.power ?? sd.on ?? sd.p
+      if (power !== undefined) {
+        result.power = (String(power).toLowerCase() === 'on' || Number(power) === 1)
+      }
+
+      // Brightness (0-100)
+      const brightness = sd.brightness ?? sd.b
+      if (brightness !== undefined) {
+        result.brightness = Number(brightness)
+      }
+
+      // Color - could be 'r:g:b', '#rrggbb' or 'rrggbb'
+      const color = sd.color ?? sd.rgb ?? sd.c
+      if (color !== undefined) {
+        let r = 0
+        let g = 0
+        let b = 0
+        const c = String(color)
+        if (c.includes(':')) {
+          const parts = c.split(':').map(Number)
+          ;[r, g, b] = parts
+        } else if (c.startsWith('#')) {
+          const hex = c.replace('#', '')
+          r = Number.parseInt(hex.substring(0, 2), 16)
+          g = Number.parseInt(hex.substring(2, 4), 16)
+          b = Number.parseInt(hex.substring(4, 6), 16)
+        } else if (/^[0-9a-f]{6}$/i.test(c)) {
+          r = Number.parseInt(c.substring(0, 2), 16)
+          g = Number.parseInt(c.substring(2, 4), 16)
+          b = Number.parseInt(c.substring(4, 6), 16)
+        }
+        result.color = { r, g, b }
+      }
+
+      // Battery (some devices use battery or batt)
+      const battery = sd.battery ?? sd.batt
+      if (battery !== undefined) {
+        result.battery = Number(battery)
+      }
+
+      return result
+    } catch (e: any) {
+      this.log.debug(`parseAdvertisementForDevice failed for ${dev.deviceId}: ${e?.message ?? e}`)
+      return null
+    }
+  }
+
   /**
    * Required for DynamicPlatformPlugin
    * Called when homebridge restores cached accessories from disk at startup