@switchbot/homebridge-switchbot 5.0.0-beta.0 → 5.0.0-beta.10

package/src/platform-hap.ts

@@ -55,7 +55,7 @@ import { TV } from './irdevice/tv.js'
 import { VacuumCleaner } from './irdevice/vacuumcleaner.js'
 import { WaterHeater } from './irdevice/waterheater.js'
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js'
-import { formatDeviceIdAsMac, isBlindTiltDevice, isCurtainDevice, safeStringify, sleep } from './utils.js'
+import { cleanDeviceConfig, formatDeviceIdAsMac, isBlindTiltDevice, isCurtainDevice, safeStringify, sleep } from './utils.js'
 
 /**
  * HomebridgePlatform
@@ -119,6 +119,21 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
       devices: config.devices as { deviceId: string }[],
     }
 
+    // Normalize deviceConfig to remove UI-inserted defaults (lots of false/empty values)
+    try {
+      if ((this.config as any).options) {
+        const cleaned = cleanDeviceConfig((this.config as any).options.deviceConfig)
+        if (cleaned) {
+          ;(this.config as any).options.deviceConfig = cleaned
+        } else {
+          // remove the empty deviceConfig so downstream checks treat it as absent
+          delete (this.config as any).options.deviceConfig
+        }
+      }
+    } catch (e) {
+      this.debugErrorLog(`Failed to clean deviceConfig: ${e}`)
+    }
+
     // Plugin Configuration
     this.getPlatformLogSettings()
     this.getPlatformRateSettings()
@@ -190,7 +205,18 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
       this.debugLog('Executed didFinishLaunching callback')
       // run the method to discover / register your devices as accessories
       try {
-        await this.discoverDevices()
+        // Does the user have a version of Homebridge that is compatible with matter?
+        if (!this.api.isMatterAvailable?.()) {
+          this.log.debug(`Matter is not available in this version of Homebridge. Please update Homebridge to use this plugin, ${this.api.isMatterAvailable?.() ? '' : ' (Matter is not available in this version of Homebridge)'}`)
+        }
+        if (!this.api.isMatterEnabled?.()) {
+          this.log.debug(`Matter is not enabled in Homebridge. Please enable Matter in the Homebridge settings to use this plugin, ${this.api.isMatterEnabled?.() ? '' : ' (Matter is not enabled in Homebridge)'}`)
+        }
+        if (!this.api.isMatterAvailable?.() && !this.api.isMatterEnabled?.()) {
+          await this.discoverDevices()
+        } else {
+          this.log.info('Matter is enabled in Homebridge. SwitchBot Matter devices will be handled by the Matter platform.')
+        }
       } catch (e: any) {
         this.errorLog(`Failed to Discover, Error Message: ${e.message ?? e}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug')
         this.debugErrorLog(`Failed to Discover, Error: ${e.message ?? e}`)