@switchbot/homebridge-switchbot 5.0.0-beta.3 → 5.0.0-beta.30

package/src/devices-matter/BaseMatterAccessory.ts

@@ -10,6 +10,8 @@
 
 import type { API, EndpointType, Logger, MatterAccessory } from 'homebridge'
 
+import { rgb2hs } from '../utils.js'
+
 export interface BaseMatterAccessoryConfig {
   uuid: string
   displayName: string
@@ -86,26 +88,187 @@ export abstract class BaseMatterAccessory implements MatterAccessory {
    */
   protected async updateState(cluster: string, attributes: Record<string, unknown>): Promise<void> {
     await this.api.matter.updateAccessoryState(this.uuid, cluster, attributes)
-    this.log.debug(`[${this.displayName}] Updated ${cluster} state:`, attributes)
+    this.logDebug(`Updated ${cluster} state:`, attributes)
   }
 
   /**
    * Log helper methods
    */
+  // Generic logging delegation: prefer platform-provided log helpers in
+  // `this.context` (infoLog/debugLog/warnLog/errorLog) and fall back to the
+  // local `this.log` methods when not available.
+  protected logWith(level: 'info' | 'error' | 'debug' | 'warn', message: string, ...args: unknown[]): void {
+    const ctx: any = this.context as any
+    const map: Record<string, string> = {
+      info: 'infoLog',
+      error: 'errorLog',
+      debug: 'debugLog',
+      warn: 'warnLog',
+    }
+    const fn = ctx?.[map[level]]
+    if (typeof fn === 'function') {
+      fn(`[${this.displayName}] ${message}`, ...args)
+      return
+    }
+    const local = (this.log as any)[level]
+    if (typeof local === 'function') {
+      local.call(this.log, `[${this.displayName}] ${message}`, ...args)
+    }
+  }
+
   protected logInfo(message: string, ...args: unknown[]): void {
-    this.log.info(`[${this.displayName}] ${message}`, ...args)
+    this.logWith('info', message, ...args)
   }
 
   protected logError(message: string, ...args: unknown[]): void {
-    this.log.error(`[${this.displayName}] ${message}`, ...args)
+    this.logWith('error', message, ...args)
   }
 
   protected logDebug(message: string, ...args: unknown[]): void {
-    this.log.debug(`[${this.displayName}] ${message}`, ...args)
+    this.logWith('debug', message, ...args)
   }
 
   protected logWarn(message: string, ...args: unknown[]): void {
-    this.log.warn(`[${this.displayName}] ${message}`, ...args)
+    this.logWith('warn', message, ...args)
+  }
+
+  /**
+   * Logging helpers parity: allow Matter accessories to ask whether device-level
+   * logging is enabled or in debug mode. These mirror the helpers used by the
+   * HAP/IR device bases so behavior is consistent across platforms.
+   */
+  public async loggingIsDebug(): Promise<boolean> {
+    const ctx: any = this.context as any
+    const deviceLogging = ctx?.deviceLogging
+    // deviceLogging may be a string ('debug', 'debugMode', 'standard') or undefined
+    return deviceLogging === 'debugMode' || deviceLogging === 'debug'
+  }
+
+  public async enablingDeviceLogging(): Promise<boolean> {
+    const ctx: any = this.context as any
+    const deviceLogging = ctx?.deviceLogging
+    // If deviceLogging isn't provided, fall back to the platform-wide flag
+    // that indicates whether platform logging is enabled.
+    if (deviceLogging === undefined) {
+      return Boolean((ctx as any)?.platformLogging)
+    }
+    return deviceLogging === 'debugMode' || deviceLogging === 'debug' || deviceLogging === 'standard'
+  }
+
+  /**
+   * Convenience helpers that delegate OpenAPI/BLE commands to platform-provided
+   * functions that are injected into the accessory `context` by
+   * `platform-matter` when the accessory is created from a discovered device.
+   *
+   * These methods are intentionally thin wrappers — the platform controls
+   * retries, discovery and client lifecycle via the helper functions.
+   */
+  protected async sendOpenAPICommand(command: string, parameter = 'default'): Promise<any> {
+    const ctx: any = this.context as any
+    const fn = ctx?.sendOpenAPI
+    if (typeof fn === 'function') {
+      return fn(command, parameter)
+    }
+    throw new Error('OpenAPI helper not available')
+  }
+
+  protected async sendBLECommand(methodName: string, ...args: any[]): Promise<any> {
+    const ctx: any = this.context as any
+    const fn = ctx?.sendBLE
+    if (typeof fn === 'function') {
+      return fn(methodName, ...args)
+    }
+    throw new Error('BLE helper not available')
+  }
+
+  public async sendOnCommand(deviceId?: string): Promise<void> {
+    const ctx: any = this.context as any
+    const id = deviceId ?? ctx?.deviceId
+    try {
+      if (ctx?.connectionType === 'BLE') {
+        await this.sendBLECommand('turnOn')
+      } else {
+        await this.sendOpenAPICommand('turnOn')
+      }
+      // update our matter state
+      await this.updateState(this.api.matter.clusterNames.OnOff, { onOff: true })
+      this.logInfo(`sendOnCommand successful for ${id}`)
+    } catch (e: any) {
+      this.logError(`sendOnCommand failed for ${id}: ${String(e?.message ?? e)}`)
+      throw e
+    }
+  }
+
+  public async sendOffCommand(deviceId?: string): Promise<void> {
+    const ctx: any = this.context as any
+    const id = deviceId ?? ctx?.deviceId
+    try {
+      if (ctx?.connectionType === 'BLE') {
+        await this.sendBLECommand('turnOff')
+      } else {
+        await this.sendOpenAPICommand('turnOff')
+      }
+      await this.updateState(this.api.matter.clusterNames.OnOff, { onOff: false })
+      this.logInfo(`sendOffCommand successful for ${id}`)
+    } catch (e: any) {
+      this.logError(`sendOffCommand failed for ${id}: ${String(e?.message ?? e)}`)
+      throw e
+    }
+  }
+
+  public async sendSetBrightness(percent: number, deviceId?: string): Promise<void> {
+    const ctx: any = this.context as any
+    const id = deviceId ?? ctx?.deviceId
+    try {
+      if (ctx?.connectionType === 'BLE') {
+        await this.sendBLECommand('setBrightness', percent)
+      } else {
+        await this.sendOpenAPICommand('setBrightness', String(percent))
+      }
+      const level = Math.round((percent / 100) * 254)
+      await this.updateState(this.api.matter.clusterNames.LevelControl, { currentLevel: level })
+      this.logInfo(`sendSetBrightness successful for ${id}: ${percent}%`)
+    } catch (e: any) {
+      this.logError(`sendSetBrightness failed for ${id}: ${String(e?.message ?? e)}`)
+      throw e
+    }
+  }
+
+  public async sendSetColor(r: number, g: number, b: number, deviceId?: string): Promise<void> {
+    const ctx: any = this.context as any
+    const id = deviceId ?? ctx?.deviceId
+    try {
+      if (ctx?.connectionType === 'BLE') {
+        await this.sendBLECommand('setRGB', r, g, b)
+      } else {
+        await this.sendOpenAPICommand('setColor', `${r}:${g}:${b}`)
+      }
+      // Convert to hue/sat for matter state update
+      const [h, s] = rgb2hs(r, g, b)
+      await this.updateState(this.api.matter.clusterNames.ColorControl, { currentHue: Math.round((h / 360) * 254), currentSaturation: Math.round((s / 100) * 254) })
+      this.logInfo(`sendSetColor successful for ${id}: ${r},${g},${b}`)
+    } catch (e: any) {
+      this.logError(`sendSetColor failed for ${id}: ${String(e?.message ?? e)}`)
+      throw e
+    }
+  }
+
+  public async sendSetColorTemperature(kelvin: number, deviceId?: string): Promise<void> {
+    const ctx: any = this.context as any
+    const id = deviceId ?? ctx?.deviceId
+    try {
+      if (ctx?.connectionType === 'BLE') {
+        await this.sendBLECommand('setColorTemperature', kelvin)
+      } else {
+        await this.sendOpenAPICommand('setColorTemperature', `${kelvin}`)
+      }
+      const mireds = Math.round(1000000 / kelvin)
+      await this.updateState(this.api.matter.clusterNames.ColorControl, { colorTemperatureMireds: mireds })
+      this.logInfo(`sendSetColorTemperature successful for ${id}: ${kelvin}K`)
+    } catch (e: any) {
+      this.logError(`sendSetColorTemperature failed for ${id}: ${String(e?.message ?? e)}`)
+      throw e
+    }
   }
 
   /**

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/homebridge-ui/public/index.html

@@ -122,6 +122,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 +179,22 @@
         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
+        if ((!cachedAccessories || cachedAccessories.length === 0) && typeof homebridge.request === 'function') {
+          try {
+            const matter = await homebridge.request('/getCachedMatterAccessories')
+            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

@@ -37,6 +37,43 @@ class PluginUiServer extends HomebridgePluginUiServer {
         return []
       }
     })
+    // Provide Matter cached accessories if Homebridge stores them separately.
+    this.onRequest('getCachedMatterAccessories', () => {
+      try {
+        const plugin = 'homebridge-switchbot'
+        const devicesToReturn: any[] = []
+
+        const accFile = `${this.homebridgeStoragePath}/accessories/cachedAccessories`
+        const matterFile = `${this.homebridgeStoragePath}/accessories/cachedMatterAccessories`
+
+        const readAndCollect = (filePath: string) => {
+          if (!fs.existsSync(filePath)) {
+            return
+          }
+          try {
+            const parsed: any[] = JSON.parse(fs.readFileSync(filePath, 'utf8'))
+            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 (pluginName === plugin) {
+                devicesToReturn.push(acc as never)
+              }
+            })
+          } catch {
+            // ignore parse errors for a single file
+          }
+        }
+
+        // Read both canonical files (some Homebridge versions use one or the other)
+        readAndCollect(accFile)
+        readAndCollect(matterFile)
+
+        return devicesToReturn
+      } catch {
+        return []
+      }
+    })
     this.ready()
   }
 }

package/src/index.test.ts

@@ -3,7 +3,6 @@ import type { API } from 'homebridge'
 import { describe, expect, it, vi } from 'vitest'
 
 import registerPlatform from './index.js'
-import { SwitchBotHAPPlatform } from './platform-hap.js'
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js'
 
 describe('index.ts', () => {
@@ -14,6 +13,12 @@ describe('index.ts', () => {
 
     registerPlatform(api)
 
-    expect(api.registerPlatform).toHaveBeenCalledWith(PLUGIN_NAME, PLATFORM_NAME, SwitchBotHAPPlatform)
+    // The platform registration now uses a runtime proxy/delegate constructor so
+    // assert the call happened and the third argument is a constructor function.
+    expect(api.registerPlatform).toHaveBeenCalled()
+    const callArgs = (api.registerPlatform as any).mock.calls[0]
+    expect(callArgs[0]).toBe(PLUGIN_NAME)
+    expect(callArgs[1]).toBe(PLATFORM_NAME)
+    expect(typeof callArgs[2]).toBe('function')
   })
 })

package/src/index.ts

@@ -7,12 +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?.())
-  // 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)
 }