@switchbot/homebridge-switchbot 5.0.0-beta.5 → 5.0.0-beta.51

package/src/devices-matter/ColorLightAccessory.ts

@@ -5,6 +5,7 @@
 
 import type { API, Logger, MatterRequests } from 'homebridge'
 
+import { hs2rgb } from '../utils.js'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class ColorLightAccessory extends BaseMatterAccessory {
@@ -56,38 +57,37 @@ export class ColorLightAccessory extends BaseMatterAccessory {
 
   private async handleOn(): Promise<void> {
     this.logInfo('turning on.')
-    // TODO: await myLightAPI.turnOn()
+    await this.sendOnCommand()
   }
 
   private async handleOff(): Promise<void> {
     this.logInfo('turning off.')
-    // TODO: await myLightAPI.turnOff()
+    await this.sendOffCommand()
   }
 
   private async handleSetLevel(request: MatterRequests.MoveToLevel): Promise<void> {
     this.logInfo(`MoveToLevel request: ${JSON.stringify(request)}`)
     const { level } = request
     const brightnessPercent = Math.round((level / 254) * 100)
-    this.logInfo(`setting brightness to ${brightnessPercent}%.`)
-    // TODO: await myLightAPI.setBrightness(brightnessPercent)
+    await this.sendSetBrightness(brightnessPercent)
   }
 
   private async handleSetColor(request: MatterRequests.MoveToColor): Promise<void> {
     this.logInfo(`MoveToColor request: ${JSON.stringify(request)}`)
-    const { colorX, colorY, transitionTime } = request
-    const xFloat = (colorX / 65535).toFixed(4)
-    const yFloat = (colorY / 65535).toFixed(4)
-    this.logInfo(`setting xy color to (${xFloat}, ${yFloat}) with transition ${transitionTime}.`)
-    // TODO: await myLightAPI.setXY(xFloat, yFloat, transitionTime)
+    const { colorX, colorY } = request
+    const hueApprox = Math.round((colorX / 65535) * 360)
+    const satApprox = Math.round((colorY / 65535) * 100)
+    const [r, g, b] = hs2rgb(hueApprox, satApprox)
+    await this.sendSetColor(r, g, b)
   }
 
   private async handleSetHueSaturation(request: MatterRequests.MoveToHueAndSaturation): Promise<void> {
     this.logInfo(`MoveToHueAndSaturation request: ${JSON.stringify(request)}`)
-    const { hue, saturation, transitionTime } = request
+    const { hue, saturation } = request
     const hueDegrees = Math.round((hue / 254) * 360)
     const saturationPercent = Math.round((saturation / 254) * 100)
-    this.logInfo(`setting color to ${hueDegrees}°, ${saturationPercent}% with transition ${transitionTime}.`)
-    // TODO: await myLightAPI.setColor(hueDegrees, saturationPercent, transitionTime)
+    const [r, g, b] = hs2rgb(hueDegrees, saturationPercent)
+    await this.sendSetColor(r, g, b)
   }
 
   public updateOnOffState(isOn: boolean): void {

package/src/devices-matter/ColorTemperatureLightAccessory.ts

@@ -52,28 +52,26 @@ export class ColorTemperatureLightAccessory extends BaseMatterAccessory {
 
   private async handleOn(): Promise<void> {
     this.logInfo('turning on.')
-    // TODO: await myLightAPI.turnOn()
+    await this.sendOnCommand()
   }
 
   private async handleOff(): Promise<void> {
     this.logInfo('turning off.')
-    // TODO: await myLightAPI.turnOff()
+    await this.sendOffCommand()
   }
 
   private async handleSetLevel(request: MatterRequests.MoveToLevel): Promise<void> {
     this.logInfo(`MoveToLevel request: ${JSON.stringify(request)}`)
     const { level } = request
     const brightnessPercent = Math.round((level / 254) * 100)
-    this.logInfo(`setting brightness to ${brightnessPercent}% (level: ${level}).`)
-    // TODO: await myLightAPI.setBrightness(brightnessPercent)
+    await this.sendSetBrightness(brightnessPercent)
   }
 
   private async handleSetColorTemperature(request: MatterRequests.MoveToColorTemperature): Promise<void> {
     this.logInfo(`MoveToColorTemperature request: ${JSON.stringify(request)}`)
-    const { colorTemperatureMireds, transitionTime } = request
+    const { colorTemperatureMireds } = request
     const kelvin = Math.round(1000000 / colorTemperatureMireds)
-    this.logInfo(`setting color temp to ${kelvin}k (${colorTemperatureMireds} mireds) with transitionTime=${transitionTime}.`)
-    // TODO: await myLightAPI.setColorTemperature(kelvin, transitionTime)
+    await this.sendSetColorTemperature(kelvin)
   }
 
   public updateOnOffState(isOn: boolean): void {

package/src/devices-matter/DimmableLightAccessory.ts

@@ -69,10 +69,10 @@ export class DimmableLightAccessory extends BaseMatterAccessory {
     this.logInfo('turning on.')
 
     try {
-      // TODO: Control your physical device
-      // await myLightAPI.turnOn()
+      // Use platform helper (OpenAPI/BLE) when available
+      await this.sendOnCommand()
 
-      this.logInfo('physical device turned on.')
+      this.logInfo('physical device turned on (via platform helper).')
     } catch (error) {
       this.logError('failed to turn on:', error)
       throw error
@@ -86,10 +86,10 @@ export class DimmableLightAccessory extends BaseMatterAccessory {
     this.logInfo('turning off.')
 
     try {
-      // TODO: Control your physical device
-      // await myLightAPI.turnOff()
+      // Use platform helper (OpenAPI/BLE) when available
+      await this.sendOffCommand()
 
-      this.logInfo('physical device turned off.')
+      this.logInfo('physical device turned off (via platform helper).')
     } catch (error) {
       this.logError('failed to turn off:', error)
       throw error
@@ -110,10 +110,10 @@ export class DimmableLightAccessory extends BaseMatterAccessory {
     this.logInfo(`setting brightness to ${brightnessPercent}% (level: ${level}), transitionTime: ${transitionTime}.`)
 
     try {
-      // TODO: Control your physical device
-      // await myLightAPI.setBrightness(brightnessPercent, transitionTime)
+      // Use platform helper (OpenAPI/BLE) when available
+      await this.sendSetBrightness(brightnessPercent)
 
-      this.logInfo(`physical device brightness set to ${brightnessPercent}%.`)
+      this.logInfo(`physical device brightness set to ${brightnessPercent}% (via platform helper).`)
     } catch (error) {
       this.logError('Failed to set brightness:', error)
       throw error

package/src/devices-matter/ExtendedColorLightAccessory.ts

@@ -5,6 +5,7 @@
 
 import type { API, Logger, MatterRequests } from 'homebridge'
 
+import { hs2rgb } from '../utils.js'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class ExtendedColorLightAccessory extends BaseMatterAccessory {
@@ -61,46 +62,44 @@ export class ExtendedColorLightAccessory extends BaseMatterAccessory {
 
   private async handleOn(): Promise<void> {
     this.logInfo('turning on.')
-    // TODO: await myLightAPI.turnOn()
+    await this.sendOnCommand()
   }
 
   private async handleOff(): Promise<void> {
     this.logInfo('turning off.')
-    // TODO: await myLightAPI.turnOff()
+    await this.sendOffCommand()
   }
 
   private async handleSetLevel(request: MatterRequests.MoveToLevel): Promise<void> {
     this.logInfo(`MoveToLevel request: ${JSON.stringify(request)}`)
     const { level } = request
     const brightnessPercent = Math.round((level / 254) * 100)
-    this.logInfo(`setting brightness to ${brightnessPercent}%.`)
-    // TODO: await myLightAPI.setBrightness(brightnessPercent)
+    await this.sendSetBrightness(brightnessPercent)
   }
 
   private async handleSetColor(request: MatterRequests.MoveToColor): Promise<void> {
     this.logInfo(`MoveToColor request: ${JSON.stringify(request)}`)
-    const { colorX, colorY, transitionTime } = request
-    const xFloat = (colorX / 65535).toFixed(4)
-    const yFloat = (colorY / 65535).toFixed(4)
-    this.logInfo(`setting xy color to (${xFloat}, ${yFloat}), ${transitionTime}ms.`)
-    // TODO: await myLightAPI.setXY(xFloat, yFloat, transitionTime)
+    const { colorX, colorY } = request
+    const hueApprox = Math.round((colorX / 65535) * 360)
+    const satApprox = Math.round((colorY / 65535) * 100)
+    const [r, g, b] = hs2rgb(hueApprox, satApprox)
+    await this.sendSetColor(r, g, b)
   }
 
   private async handleSetHueSaturation(request: MatterRequests.MoveToHueAndSaturation): Promise<void> {
     this.logInfo(`MoveToHueAndSaturation request: ${JSON.stringify(request)}`)
-    const { hue, saturation, transitionTime } = request
+    const { hue, saturation } = request
     const hueDegrees = Math.round((hue / 254) * 360)
     const saturationPercent = Math.round((saturation / 254) * 100)
-    this.logInfo(`setting color to ${hueDegrees}°, ${saturationPercent}%, ${transitionTime}ms.`)
-    // TODO: await myLightAPI.setColor(hueDegrees, saturationPercent, transitionTime)
+    const [r, g, b] = hs2rgb(hueDegrees, saturationPercent)
+    await this.sendSetColor(r, g, b)
   }
 
   private async handleSetColorTemperature(request: MatterRequests.MoveToColorTemperature): Promise<void> {
     this.logInfo(`MoveToColorTemperature request: ${JSON.stringify(request)}`)
-    const { colorTemperatureMireds, transitionTime } = request
+    const { colorTemperatureMireds } = request
     const kelvin = Math.round(1000000 / colorTemperatureMireds)
-    this.logInfo(`setting color temp to ${kelvin}k, ${transitionTime}ms.`)
-    // TODO: await myLightAPI.setColorTemperature(kelvin, transitionTime)
+    await this.sendSetColorTemperature(kelvin)
   }
 
   public updateOnOffState(isOn: boolean): void {

package/src/devices-matter/OnOffLightAccessory.ts

@@ -27,12 +27,8 @@ export class OnOffLightAccessory extends BaseMatterAccessory {
     const clusters = opts?.clusters ?? { onOff: { onOff: true } }
     const handlers = opts?.handlers ?? {
       onOff: {
-        on: async () => {
-          log.debug(`${displayName} on handler invoked (default no-op).`)
-        },
-        off: async () => {
-          log.debug(`${displayName} off handler invoked (default no-op).`)
-        },
+        on: async () => this.handleOnCommand(),
+        off: async () => this.handleOffCommand(),
       },
     }
 
@@ -61,14 +57,10 @@ export class OnOffLightAccessory extends BaseMatterAccessory {
     this.logInfo('turning on.')
 
     try {
-      // TODO: Control your physical device here
-      // Examples:
-      // await fetch('https://api.mydevice.com/light/on', { method: 'POST' })
-      // await fetch('http://192.168.1.50/api/light/on')
-      // mqttClient.publish('home/light/command', JSON.stringify({ state: 'ON' }))
-      // await myLightAPI.turnOn(this.context.deviceId)
+      // Delegate to the platform-provided helper (OpenAPI/BLE) when available
+      await this.sendOnCommand()
 
-      this.logInfo('physical device turned on.')
+      this.logInfo('physical device turned on (via platform helper).')
 
       // State automatically updated by Homebridge after handler completes
     } catch (error) {
@@ -84,10 +76,10 @@ export class OnOffLightAccessory extends BaseMatterAccessory {
     this.logInfo('turning off.')
 
     try {
-      // TODO: Control your physical device here
-      // await myLightAPI.turnOff(this.context.deviceId)
+      // Delegate to the platform-provided helper (OpenAPI/BLE) when available
+      await this.sendOffCommand()
 
-      this.logInfo('physical device turned off.')
+      this.logInfo('physical device turned off (via platform helper).')
 
       // State automatically updated by Homebridge after handler completes
     } catch (error) {

package/src/devices-matter/OnOffOutletAccessory.ts

@@ -13,13 +13,8 @@ export class OnOffOutletAccessory extends BaseMatterAccessory {
     const clusters = opts?.clusters ?? { onOff: { onOff: false } }
     const handlers = opts?.handlers ?? {
       onOff: {
-        on: async () => {
-          // default no-op; platform may inject handlers via opts.handlers
-          log.debug(`${displayName} on handler invoked (default no-op).`)
-        },
-        off: async () => {
-          log.debug(`${displayName} off handler invoked (default no-op).`)
-        },
+        on: async () => this.handleOn(),
+        off: async () => this.handleOff(),
       },
     }
 
@@ -43,4 +38,14 @@ export class OnOffOutletAccessory extends BaseMatterAccessory {
   public updateOnOffState(isOn: boolean): void {
     this.updateState(this.api.matter.clusterNames.OnOff, { onOff: isOn })
   }
+
+  private async handleOn(): Promise<void> {
+    this.logInfo('turning on.')
+    await this.sendOnCommand()
+  }
+
+  private async handleOff(): Promise<void> {
+    this.logInfo('turning off.')
+    await this.sendOffCommand()
+  }
 }

package/src/devices-matter/OnOffSwitchAccessory.ts

@@ -37,12 +37,12 @@ export class OnOffSwitchAccessory extends BaseMatterAccessory {
 
   private async handleOn(): Promise<void> {
     this.logInfo('turning on.')
-    // TODO: await mySwitchAPI.turnOn()
+    await this.sendOnCommand()
   }
 
   private async handleOff(): Promise<void> {
     this.logInfo('turning off.')
-    // TODO: await mySwitchAPI.turnOff()
+    await this.sendOffCommand()
   }
 
   public updateOnOffState(isOn: boolean): void {

package/src/devices-matter/RoboticVacuumAccessory.ts

@@ -33,14 +33,6 @@ export class RoboticVacuumAccessory extends BaseMatterAccessory {
   constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
     const serialNumber = opts?.serialNumber ?? 'VACUUM-001'
     const clusters = opts?.clusters ?? {
-      powerSource: {
-        status: 0,
-        order: 0,
-        description: 'Battery',
-        batPercentRemaining: 100,
-        batChargeLevel: 2,
-        batReplaceability: 1,
-      },
       rvcRunMode: {
         supportedModes: [
           { label: 'Idle', mode: 0, modeTags: [{ value: 16384 }] },
@@ -387,21 +379,39 @@ export class RoboticVacuumAccessory extends BaseMatterAccessory {
 
   /**
    * Update battery percentage
-   * @param percentage - Battery percentage (0-100)
+   *
+   * Note: The Matter specification for RoboticVacuumCleaner does not include
+   * the PowerSource cluster. Battery information for robotic vacuums should be
+   * communicated through device-specific status reporting or via the RVC
+   * operational state cluster.
+   *
+   * This method is retained for API compatibility but does not update any
+   * Matter cluster state.
+   *
+   * @param percentageOrBatPercentRemaining - Battery percentage (0-100) or batPercentRemaining (0-200)
    */
-  public async updateBatteryPercentage(percentage: number): Promise<void> {
-    // Convert percentage to Matter format (0-200, where 200 = 100%)
-    const batPercentRemaining = Math.max(0, Math.min(200, Math.round(percentage * 2)))
+  public async updateBatteryPercentage(percentageOrBatPercentRemaining: number): Promise<void> {
+    // Accept either 0–100 (percentage) or 0–200 (batPercentRemaining) to be robust
+    const isBatPercent = Number(percentageOrBatPercentRemaining) > 100
+    const percentage = isBatPercent
+      ? Math.max(0, Math.min(100, Math.round(Number(percentageOrBatPercentRemaining) / 2)))
+      : Math.max(0, Math.min(100, Math.round(Number(percentageOrBatPercentRemaining))))
 
     // Determine charge level based on percentage
-    let batChargeLevel = 0 // Ok
+    let chargeLevel = 0 // Ok
     if (percentage < 20) {
-      batChargeLevel = 2 // Critical
+      chargeLevel = 2 // Critical
     } else if (percentage < 40) {
-      batChargeLevel = 1 // Warning
+      chargeLevel = 1 // Warning
     }
 
-    await this.updateState('powerSource', { batPercentRemaining, batChargeLevel })
-    this.logInfo(`battery updated to: ${percentage}% (${batChargeLevel === 0 ? 'Ok' : batChargeLevel === 1 ? 'Warning' : 'Critical'})`)
+    // Log battery status only - PowerSource cluster is not supported for RoboticVacuumCleaner
+    this.logInfo(`battery status: ${percentage}% (${chargeLevel === 0 ? 'Ok' : chargeLevel === 1 ? 'Warning' : 'Critical'})`)
+
+    // Store battery info in context for reference
+    if (this.context) {
+      (this.context as any).batteryPercentage = percentage
+      ;(this.context as any).batteryChargeLevel = chargeLevel
+    }
   }
 }

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>
@@ -122,6 +134,41 @@
   (async () => {
     try {
       const currentConfig = await homebridge.getPluginConfig();
+
+      // Defensive wrapper: ensure token/secret aren't accidentally cleared by
+      // the UI/schema form. Some versions of config UI can omit sensitive
+      // fields from the submitted payload; when that happens we copy the
+      // existing values from `currentConfig` into the outgoing payload so
+      // saved config does not inadvertently remove credentials.
+      try {
+        if (typeof homebridge.updatePluginConfig === 'function') {
+          const _origUpdatePluginConfig = homebridge.updatePluginConfig.bind(homebridge)
+          homebridge.updatePluginConfig = async (cfg) => {
+            try {
+              if (Array.isArray(cfg) && cfg.length > 0 && Array.isArray(currentConfig) && currentConfig.length > 0) {
+                const incoming = cfg[0] || {}
+                const existing = currentConfig[0] || {}
+                incoming.credentials = incoming.credentials || {}
+                // Preserve token/secret when incoming payload leaves them blank/undefined
+                if ((incoming.credentials.token === undefined || String(incoming.credentials.token).trim() === '') && existing.credentials && existing.credentials.token) {
+                  incoming.credentials.token = existing.credentials.token
+                }
+                if ((incoming.credentials.secret === undefined || String(incoming.credentials.secret).trim() === '') && existing.credentials && existing.credentials.secret) {
+                  incoming.credentials.secret = existing.credentials.secret
+                }
+                cfg[0] = incoming
+              }
+            } catch (e) {
+              // Swallow any wrapper errors but log to console for debugging
+              // (do not expose secrets).
+              console.error('updatePluginConfig wrapper error', e)
+            }
+            return await _origUpdatePluginConfig(cfg)
+          }
+        }
+      } catch (e) {
+        console.error('Failed to attach updatePluginConfig wrapper', e)
+      }
       showIntro = () => {
         const introLink = document.getElementById('introLink');
         introLink.addEventListener('click', () => {
@@ -144,10 +191,25 @@
         document.getElementById('menuSettings').classList.add('btn-primary');
         document.getElementById('pageSupport').style.display = 'none';
         document.getElementById('pageDevices').style.display = 'block';
-        const cachedAccessories =
+        let cachedAccessories =
           typeof homebridge.getCachedAccessories === 'function'
             ? await homebridge.getCachedAccessories()
             : await homebridge.request('/getCachedAccessories');
+
+        // If no HAP cached accessories were returned, try the Matter cached list using the new native method
+        if ((!cachedAccessories || cachedAccessories.length === 0)) {
+          try {
+            // Use the new native getCachedMatterAccessories() method from @homebridge/plugin-ui-utils v2.1.1-beta.0+
+            const matter = typeof homebridge.getCachedMatterAccessories === 'function'
+              ? await homebridge.getCachedMatterAccessories()
+              : await homebridge.request('/getCachedMatterAccessories'); // Fallback to custom handler for older UI versions
+            if (Array.isArray(matter) && matter.length > 0) {
+              cachedAccessories = matter
+            }
+          } catch (e) {
+            // ignore
+          }
+        }
         if (cachedAccessories.length > 0) {
           cachedAccessories.sort((a, b) => {
             return a.displayName.toLowerCase() > b.displayName.toLowerCase() ? 1 : b.displayName.toLowerCase() > a.displayName.toLowerCase() ? -1 : 0;

package/src/homebridge-ui/server.ts

@@ -9,9 +9,12 @@ class PluginUiServer extends HomebridgePluginUiServer {
       A native method getCachedAccessories() was introduced in config-ui-x v4.37.0
       The following is for users who have a lower version of config-ui-x
     */
-    this.onRequest('getCachedAccessories', () => {
+    const getCachedAccessoriesHandler = () => {
       try {
-        const plugin = 'homebridge-switchbot'
+        // Some Homebridge versions store cached accessories with the scoped
+        // plugin name ("@switchbot/homebridge-switchbot"); others may use
+        // the unscoped id ("homebridge-switchbot"). Check both.
+        const pluginNames = ['@switchbot/homebridge-switchbot', 'homebridge-switchbot']
         const devicesToReturn = []
 
         // The path and file of the cached accessories
@@ -22,21 +25,89 @@ class PluginUiServer extends HomebridgePluginUiServer {
           // read the cached accessories file
           const cachedAccessories: any[] = JSON.parse(fs.readFileSync(accFile, 'utf8'))
 
-          cachedAccessories.forEach((accessory: any) => {
-            // Check the accessory is from this plugin
-            if (accessory.plugin === plugin) {
-              // Add the cached accessory to the array
-              devicesToReturn.push(accessory.accessory as never)
+          cachedAccessories.forEach((entry: any) => {
+            // entry shape varies by UI version
+            const pluginName = entry.plugin || entry?.accessory?.plugin || entry?.accessory?.pluginName
+            const acc = entry.accessory ?? entry
+            if (pluginNames.includes(pluginName)) {
+              devicesToReturn.push(acc as never)
             }
           })
         }
         // Return the array
+        console.warn(`[Homebridge UI] getCachedAccessories returning ${devicesToReturn.length} device(s)`)
         return devicesToReturn
-      } catch {
+      } catch (e: any) {
         // Just return an empty accessory list in case of any errors
+        console.error(`[Homebridge UI] getCachedAccessories error: ${e?.message ?? e}`)
         return []
       }
-    })
+    }
+    this.onRequest('getCachedAccessories', getCachedAccessoriesHandler)
+    // Also register with a leading slash for compatibility with some UIs
+    this.onRequest('/getCachedAccessories', getCachedAccessoriesHandler)
+    // Provide Matter cached accessories if Homebridge stores them separately.
+    const getCachedMatterAccessoriesHandler = () => {
+      try {
+        const pluginNames = ['@switchbot/homebridge-switchbot', 'homebridge-switchbot']
+        const devicesToReturn: any[] = []
+
+        const accFile = `${this.homebridgeStoragePath}/accessories/cachedAccessories`
+        const matterFile = `${this.homebridgeStoragePath}/accessories/cachedMatterAccessories`
+
+        // Log all files in the accessories directory for debugging
+        try {
+          const accessoriesDir = `${this.homebridgeStoragePath}/accessories`
+          if (fs.existsSync(accessoriesDir)) {
+            const files = fs.readdirSync(accessoriesDir)
+            console.warn(`[Homebridge UI] Files in accessories directory: ${files.join(', ')}`)
+          }
+        } catch (e: any) {
+          console.error(`[Homebridge UI] Error listing accessories directory: ${e?.message ?? e}`)
+        }
+
+        console.warn(`[Homebridge UI] Checking for cached files:`)
+        console.warn(`[Homebridge UI]   - cachedAccessories: ${fs.existsSync(accFile)}`)
+        console.warn(`[Homebridge UI]   - cachedMatterAccessories: ${fs.existsSync(matterFile)}`)
+
+        const readAndCollect = (filePath: string) => {
+          if (!fs.existsSync(filePath)) {
+            return
+          }
+          try {
+            const parsed: any[] = JSON.parse(fs.readFileSync(filePath, 'utf8'))
+            console.warn(`[Homebridge UI]   - ${filePath}: found ${parsed.length} total entries`)
+            let matchCount = 0
+            parsed.forEach((entry: any) => {
+              // Entry shape varies between Homebridge versions; try common locations
+              const pluginName = entry.plugin || entry?.accessory?.plugin || entry?.accessory?.pluginName
+              const acc = entry.accessory ?? entry
+              if (pluginNames.includes(pluginName)) {
+                devicesToReturn.push(acc as never)
+                matchCount++
+              }
+            })
+            console.warn(`[Homebridge UI]   - ${filePath}: matched ${matchCount} SwitchBot entries`)
+          } catch (e: any) {
+            // ignore parse errors for a single file
+            console.error(`[Homebridge UI]   - ${filePath}: parse error - ${e?.message ?? e}`)
+          }
+        }
+
+        // Read both canonical files (some Homebridge versions use one or the other)
+        readAndCollect(accFile)
+        readAndCollect(matterFile)
+
+        console.warn(`[Homebridge UI] getCachedMatterAccessories returning ${devicesToReturn.length} device(s)`)
+        return devicesToReturn
+      } catch (e: any) {
+        console.error(`[Homebridge UI] getCachedMatterAccessories error: ${e?.message ?? e}`)
+        return []
+      }
+    }
+    this.onRequest('getCachedMatterAccessories', getCachedMatterAccessoriesHandler)
+    // Also register with a leading slash for compatibility with some UIs
+    this.onRequest('/getCachedMatterAccessories', getCachedMatterAccessoriesHandler)
     this.ready()
   }
 }

package/src/index.ts

@@ -7,14 +7,11 @@ import type { API } from 'homebridge'
 import { SwitchBotHAPPlatform } from './platform-hap.js'
 import { SwitchBotMatterPlatform } from './platform-matter.js'
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js'
+import { createPlatformProxy } from './utils.js'
 
 // Register our platform with homebridge.
 export default (api: API): void => {
-  // Call the instance method on the runtime `api` object (optional chaining in case
-  // older homebridge doesn't provide it). Treat undefined as false.
-  const isMatter = Boolean(api.isMatterEnabled?.())
-  const log = (api as any).logger ?? console
-  log.info?.(`Homebridge SwitchBot Plugin initializing in ${isMatter ? 'Matter' : 'HAP'} mode.`)
-  // If Matter is enabled register the Matter platform, otherwise use HAP platform.
-  api.registerPlatform(PLUGIN_NAME, PLATFORM_NAME, isMatter ? SwitchBotMatterPlatform : SwitchBotHAPPlatform)
+  // Create and register a small proxy that selects the correct platform (HAP or Matter) at runtime.
+  const ProxyCtor = createPlatformProxy(SwitchBotHAPPlatform, SwitchBotMatterPlatform)
+  api.registerPlatform(PLUGIN_NAME, PLATFORM_NAME, ProxyCtor as any)
 }