@switchbot/homebridge-switchbot 5.0.0-beta.80 → 5.0.0-beta.82

package/src/platform.ts

@@ -1,8 +1,9 @@
+import type { SwitchBotPluginConfig } from './settings.js'
 import type { API, Logger, PlatformConfig } from 'homebridge'
-import { SwitchBotClient } from './switchbotClient.js'
+
 import { createDevice } from './deviceFactory.js'
-import type { SwitchBotPluginConfig } from './settings.js'
-import { PLUGIN_NAME, PLATFORM_NAME } from './settings.js'
+import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js'
+import { SwitchBotClient } from './switchbotClient.js'
 
 // Which device types should prefer Matter if available
 const DEVICE_MATTER_SUPPORTED: Record<string, boolean> = {
@@ -13,10 +14,13 @@ const DEVICE_MATTER_SUPPORTED: Record<string, boolean> = {
   lightstrip: true,
   motion: true,
   contact: true,
-  vacuum: false,
+  vacuum: true,
   lock: true,
   humidifier: true,
   temperature: true,
+  wosweeper: true,
+  wosweepermini: true,
+  wosweeperminipro: true,
 }
 
 export class SwitchBotHAPPlatform {
@@ -26,6 +30,9 @@ export class SwitchBotHAPPlatform {
   devices: any[] = []
   // cached accessories restored by Homebridge
   accessories: Map<string, any>
+  // Track last loaded config to detect changes
+  private lastConfigHash: string = ''
+  private configReloadInterval: NodeJS.Timeout | null = null
 
   constructor(log: Logger, config: PlatformConfig, api?: API) {
     this.log = log
@@ -56,9 +63,37 @@ export class SwitchBotHAPPlatform {
     if (this.api && typeof (this.api as any).on === 'function') {
       ;(this.api as any).on('didFinishLaunching', () => {
         void this.loadDevices()
+        // Start periodic config reload to pick up UI changes
+        this.configReloadInterval = setInterval(() => {
+          void this.checkAndReloadDevices()
+        }, 10000) // Check every 10 seconds
       })
     } else {
       void this.loadDevices()
+      // Start periodic config reload to pick up UI changes
+      this.configReloadInterval = setInterval(() => {
+        void this.checkAndReloadDevices()
+      }, 10000) // Check every 10 seconds
+    }
+  }
+
+  private getConfigHash(): string {
+    // Create a simple hash of current device config to detect changes
+    const devices = (this.config as any)?.devices ?? []
+    return JSON.stringify(devices.map((d: any) => ({
+      id: d.deviceId ?? d.id,
+      type: d.configDeviceType ?? d.type,
+      name: d.configDeviceName ?? d.name,
+    })))
+  }
+
+  private async checkAndReloadDevices() {
+    const currentHash = this.getConfigHash()
+    if (currentHash !== this.lastConfigHash) {
+      this.log.info('[SwitchBot] Detected config changes, reloading devices...')
+      // Clear existing devices
+      this.devices = []
+      await this.loadDevices()
     }
   }
 
@@ -73,7 +108,11 @@ export class SwitchBotHAPPlatform {
         _raw: raw,
       }
 
-      const type: string = d.type
+      let type: string = d.type
+      // Normalize wosweeper variants to vacuum
+      if (['wosweeper', 'wosweepermini', 'wosweeperminipro'].includes((type || '').toLowerCase())) {
+        type = 'vacuum'
+      }
       const matterSupported = !!DEVICE_MATTER_SUPPORTED[(type || '').toLowerCase()]
       const useMatter = !!this.config.enableMatter && matterSupported && !!this.config.preferMatter
 
@@ -93,7 +132,7 @@ export class SwitchBotHAPPlatform {
               const accessory: any = {
                 uuid,
                 displayName: createdDesc.name || d.name || type,
-                context: { deviceId: d.id, type: type, _created: true },
+                context: { deviceId: d.id, type, _created: true },
               }
               try {
                 await matterApi.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory])
@@ -121,7 +160,7 @@ export class SwitchBotHAPPlatform {
             let accessory: any = this.accessories.get(uuid)
             // If not found by uuid, attempt to find by stored deviceId in accessory.context
             if (!accessory) {
-              for (const [k, a] of Array.from(this.accessories.entries())) {
+              for (const [, a] of Array.from(this.accessories.entries())) {
                 try {
                   if (a && a.context && a.context.deviceId === d.id) {
                     accessory = a
@@ -165,12 +204,16 @@ export class SwitchBotHAPPlatform {
             if (accDesc && accDesc.services) {
               for (const s of accDesc.services) {
                 const Service = hap.Service[s.type] || hap.Service[s.type]
-                if (!Service) continue
+                if (!Service) {
+                  continue
+                }
                 const service = accessory.getService(Service) || accessory.addService(Service)
                 for (const [charName, getterSetterRaw] of Object.entries(s.characteristics || {})) {
                   const getterSetter: any = getterSetterRaw
                   const Characteristic = (hap.Characteristic as any)[charName]
-                  if (!Characteristic) continue
+                  if (!Characteristic) {
+                    continue
+                  }
                   // Apply characteristic props if provided (min/max/step)
                   if (getterSetter && getterSetter.props) {
                     try {
@@ -201,6 +244,8 @@ export class SwitchBotHAPPlatform {
         this.log.error(`Failed to create device ${d.id}:`, e as any)
       }
     }
+    // Update hash after successfully loading devices
+    this.lastConfigHash = this.getConfigHash()
   }
 
   // Example lifecycle method called by Homebridge
@@ -234,6 +279,9 @@ export class SwitchBotMatterPlatform {
   config: SwitchBotPluginConfig
   devices: any[] = []
   accessories: Map<string, any>
+  // Track last loaded config to detect changes
+  private lastConfigHash: string = ''
+  private configReloadInterval: NodeJS.Timeout | null = null
 
   constructor(log: Logger, config: PlatformConfig, api?: API) {
     this.log = log
@@ -259,9 +307,17 @@ export class SwitchBotMatterPlatform {
             this.log.warn('Error during Matter platform startup', e)
           }
         })()
+        // Start periodic config reload to pick up UI changes
+        this.configReloadInterval = setInterval(() => {
+          void this.checkAndReloadDevices()
+        }, 10000) // Check every 10 seconds
       })
     } else {
       void this.loadDevices()
+      // Start periodic config reload to pick up UI changes
+      this.configReloadInterval = setInterval(() => {
+        void this.checkAndReloadDevices()
+      }, 10000) // Check every 10 seconds
     }
     // Create/shared SwitchBot client and attach to config so child devices reuse it.
     try {
@@ -284,7 +340,11 @@ export class SwitchBotMatterPlatform {
         _raw: raw,
       }
 
-      const type: string = d.type
+      let type: string = d.type
+      // Normalize wosweeper variants to vacuum
+      if (['wosweeper', 'wosweepermini', 'wosweeperminipro'].includes((type || '').toLowerCase())) {
+        type = 'vacuum'
+      }
       const matterSupported = !!DEVICE_MATTER_SUPPORTED[(type || '').toLowerCase()]
       const useMatter = !!this.config.enableMatter && matterSupported
       try {
@@ -293,12 +353,40 @@ export class SwitchBotMatterPlatform {
         if (useMatter) {
           this.log.info(`Prepared Matter accessory for ${d.id} (${type})`)
         } else {
-          this.log.info(`Skipping Matter for ${d.id} (${type}) - not supported`)
+          if (!this.config.enableMatter) {
+            this.log.info(`Skipping Matter for ${d.id} (${type}) - Matter not enabled in plugin config`)
+          } else if (!matterSupported) {
+            this.log.info(`Skipping Matter for ${d.id} (${type}) - device type not supported`)
+          } else {
+            this.log.info(`Skipping Matter for ${d.id} (${type}) - not supported`)
+          }
         }
       } catch (e) {
         this.log.error(`Failed to create Matter device ${d.id}:`, e as any)
       }
     }
+    // Update hash after successfully loading devices
+    this.lastConfigHash = this.getConfigHash()
+  }
+
+  private getConfigHash(): string {
+    // Create a simple hash of current device config to detect changes
+    const devices = (this.config as any)?.devices ?? []
+    return JSON.stringify(devices.map((d: any) => ({
+      id: d.deviceId ?? d.id,
+      type: d.configDeviceType ?? d.type,
+      name: d.configDeviceName ?? d.name,
+    })))
+  }
+
+  private async checkAndReloadDevices() {
+    const currentHash = this.getConfigHash()
+    if (currentHash !== this.lastConfigHash) {
+      this.log.info('[SwitchBot] Detected config changes, reloading devices...')
+      // Clear existing devices
+      this.devices = []
+      await this.loadDevices()
+    }
   }
 
   async configureAccessory(accessory: any) {
@@ -324,7 +412,9 @@ export class SwitchBotMatterPlatform {
 
   // Register serialized Matter accessories via Homebridge Matter API
   async registerMatterAccessories() {
-    if (!this.api) return
+    if (!this.api) {
+      return
+    }
     const matterApi = (this.api as any).matter
     if (!matterApi || typeof matterApi.registerPlatformAccessories !== 'function') {
       this.log.info('Homebridge Matter API not available; skipping Matter accessory registration')
@@ -338,7 +428,9 @@ export class SwitchBotMatterPlatform {
       const type: string = d.type || d.deviceType || 'unknown'
       const matterSupported = !!DEVICE_MATTER_SUPPORTED[(type || '').toLowerCase()]
       const useMatter = !!this.config.enableMatter && matterSupported
-      if (!useMatter) continue
+      if (!useMatter) {
+        continue
+      }
 
       try {
         const created = await createDevice({ id: d.id, type, name: d.name }, this.config, true)
@@ -346,7 +438,7 @@ export class SwitchBotMatterPlatform {
         const uuid = matterApi.uuid.generate(`${d.id}`)
         // Try to find existing restored accessory by deviceId
         let existing: any | undefined
-        for (const [k, a] of Array.from(this.accessories.entries())) {
+        for (const [, a] of Array.from(this.accessories.entries())) {
           try {
             if (a && a.context && a.context.deviceId === d.id) {
               existing = a
@@ -382,7 +474,7 @@ export class SwitchBotMatterPlatform {
     if (accessoriesToRegister.length > 0) {
       try {
         await matterApi.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, accessoriesToRegister)
-        this.log.info(`Registered ${accessoriesToRegister.length} Matter accessory(ies) with Homebridge`) 
+        this.log.info(`Registered ${accessoriesToRegister.length} Matter accessory(ies) with Homebridge`)
       } catch (e) {
         this.log.warn('Failed to register Matter accessories', e)
       }