@switchbot/homebridge-switchbot 5.0.0-beta.13 → 5.0.0-beta.15

package/src/platform-matter.ts

@@ -35,7 +35,7 @@ import {
   WindowBlindAccessory,
 } from './devices-matter/index.js'
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js'
-import { cleanDeviceConfig, formatDeviceIdAsMac, hs2rgb, rgb2hs, sleep } from './utils.js'
+import { cleanDeviceConfig, createPlatformLogger, formatDeviceIdAsMac, hs2rgb, makeBLESender, makeOpenAPISender, rgb2hs, sleep } from './utils.js'
 
 /**
  * MatterPlatform
@@ -57,13 +57,41 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
   private discoveredDevices: device[] = []
   // BLE event handlers keyed by device MAC (formatted)
   private bleEventHandler: { [x: string]: (context: any) => void } = {}
+  // Platform logging toggle (can be controlled via UI or config)
+  private platformLogging?: boolean
+
+  // Platform-provided logging helpers (attached in constructor)
+  infoLog!: (...args: any[]) => void
+  successLog!: (...args: any[]) => void
+  debugSuccessLog!: (...args: any[]) => void
+  warnLog!: (...args: any[]) => void
+  debugWarnLog!: (...args: any[]) => void
+  errorLog!: (...args: any[]) => void
+  debugErrorLog!: (...args: any[]) => void
+  debugLog!: (...args: any[]) => void
+  loggingIsDebug!: () => Promise<boolean>
+  enablingPlatformLogging!: () => Promise<boolean>
 
   constructor(
     public readonly log: Logging,
     public readonly config: SwitchBotPlatformConfig,
     public readonly api: API,
   ) {
-    this.log.debug('Finished initializing platform:', this.config.name)
+    // Attach platform-wide logging helpers from utils so Matter and device
+    // classes can use consistent logging methods (infoLog/debugLog/etc.)
+    const _pl = createPlatformLogger(async () => (this as any).platformLogging, this.log)
+    this.infoLog = _pl.infoLog
+    this.successLog = _pl.successLog
+    this.debugSuccessLog = _pl.debugSuccessLog
+    this.warnLog = _pl.warnLog
+    this.debugWarnLog = _pl.debugWarnLog
+    this.errorLog = _pl.errorLog
+    this.debugErrorLog = _pl.debugErrorLog
+    this.debugLog = _pl.debugLog
+    this.loggingIsDebug = _pl.loggingIsDebug
+    this.enablingPlatformLogging = _pl.enablingPlatformLogging
+
+    this.debugLog('Finished initializing platform:', this.config.name)
 
     // Normalize deviceConfig to remove UI-inserted defaults
     try {
@@ -76,12 +104,12 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
         }
       }
     } catch (e) {
-      this.log.debug('Failed to clean deviceConfig: %s', e)
+      this.debugLog('Failed to clean deviceConfig: %s', e)
     }
 
     // Does the user have a version of Homebridge that is compatible with matter?
     if (!this.api.isMatterAvailable?.()) {
-      this.log.warn('Matter is not available in this version of Homebridge. Please update Homebridge to use this plugin.')
+      this.warnLog('Matter is not available in this version of Homebridge. Please update Homebridge to use this plugin.')
     }
 
     // Check if the user has matter enabled, this means:
@@ -90,35 +118,35 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     // In reality, only the below check is needed, but they are both included here for completeness
     // Remember to use a '?.' optional chaining operator in case the user is running an older version of Homebridge that does not have these APIs
     if (!this.api.isMatterEnabled?.()) {
-      this.log.warn('Matter is not enabled in Homebridge. Please enable Matter in the Homebridge settings to use this plugin.')
+      this.warnLog('Matter is not enabled in Homebridge. Please enable Matter in the Homebridge settings to use this plugin.')
       return
     }
 
     // Register Matter accessories when Homebridge has finished launching
     this.api.on('didFinishLaunching', () => {
-      this.log.debug('Executed didFinishLaunching callback')
+      this.debugLog('Executed didFinishLaunching callback')
       // Initialize SwitchBot API clients
       try {
         if (this.config.credentials?.token && this.config.credentials?.secret) {
           this.switchBotAPI = new SwitchBotOpenAPI(this.config.credentials.token, this.config.credentials.secret, this.config.options?.hostname)
           // forward basic logs
           if (!this.config.options?.disableLogsforOpenAPI && this.switchBotAPI?.on) {
-            this.switchBotAPI.on('log', (l: any) => this.log.debug('[SwitchBot OpenAPI]', l.message))
+            this.switchBotAPI.on('log', (l: any) => this.debugLog('[SwitchBot OpenAPI]', l.message))
           }
         } else {
-          this.log.debug('SwitchBot OpenAPI credentials not provided; cloud devices will be skipped')
+          this.debugLog('SwitchBot OpenAPI credentials not provided; cloud devices will be skipped')
         }
       } catch (e: any) {
-        this.log.error('Failed to initialize SwitchBot OpenAPI:', e?.message ?? e)
+        this.errorLog('Failed to initialize SwitchBot OpenAPI:', e?.message ?? e)
       }
 
       try {
         this.switchBotBLE = new SwitchBotBLE()
         if (!this.config.options?.disableLogsforBLE && this.switchBotBLE?.on) {
-          this.switchBotBLE.on('log', (l: any) => this.log.debug('[SwitchBot BLE]', l.message))
+          this.switchBotBLE.on('log', (l: any) => this.debugLog('[SwitchBot BLE]', l.message))
         }
       } catch (e: any) {
-        this.log.error('Failed to initialize SwitchBot BLE client:', e?.message ?? e)
+        this.errorLog('Failed to initialize SwitchBot BLE client:', e?.message ?? e)
       }
 
       // If BLE scanning is enabled, start scanning and route advertisements to registered handlers
@@ -128,7 +156,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
           try {
             await ble.startScan()
           } catch (e: any) {
-            this.log.error(`Failed to start BLE scanning: ${e?.message ?? e}`)
+            this.errorLog(`Failed to start BLE scanning: ${e?.message ?? e}`)
           }
 
           // route advertisements to our handlers
@@ -140,7 +168,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
                 await handler(ad.serviceData)
               }
             } catch (e: any) {
-              this.log.error(`Failed to handle BLE advertisement: ${e?.message ?? e}`)
+              this.errorLog(`Failed to handle BLE advertisement: ${e?.message ?? e}`)
             }
           }
         })()
@@ -185,7 +213,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     const devicesWithTypeConfig = await Promise.all(discovered.map(async (deviceObj) => {
       if (!deviceObj.deviceType) {
         deviceObj.deviceType = (deviceObj as any).configDeviceType !== undefined ? (deviceObj as any).configDeviceType : 'Unknown'
-        this.log.debug(`API missing deviceType for ${deviceObj.deviceId}, using configDeviceType: ${(deviceObj as any).configDeviceType}`)
+        this.debugLog(`API missing deviceType for ${deviceObj.deviceId}, using configDeviceType: ${(deviceObj as any).configDeviceType}`)
       }
       const deviceTypeConfig = this.config.options?.deviceConfig?.[deviceObj.deviceType] || {}
       return Object.assign({}, deviceObj, deviceTypeConfig)
@@ -258,45 +286,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
       },
     }
 
-    // Small helper to wrap common OpenAPI on/off commands
-    // Helper to send an OpenAPI command
-    const sendOpenAPI = async (command: string, parameter = 'default') => {
-      const bodyChange: bodyChange = { command, parameter, commandType: 'command' }
-      return this.retryCommand(dev, bodyChange, this.config.options?.maxRetries ?? 1, this.config.options?.delayBetweenRetries ?? 1000)
-    }
-
-    // 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 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)
-        }
-      }
-      throw new Error('BLE operation failed')
-    }
+    // Build platform-side helpers using shared factories so they can be reused/tested
+    const sendOpenAPI = makeOpenAPISender(this.retryCommand.bind(this), dev, { maxRetries: this.config.options?.maxRetries ?? 1, delayBetweenRetries: this.config.options?.delayBetweenRetries ?? 1000 })
+    const sendBLE = makeBLESender(this.switchBotBLE, dev, { bleRetries: (this.config.options as any)?.bleRetries ?? 2, bleRetryDelay: (this.config.options as any)?.bleRetryDelay ?? 500 })
 
     const makeOnOffHandlers = (uuid: string, connectionType: 'BLE' | 'OpenAPI') => ({
       onOff: {
@@ -309,7 +301,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
             }
             await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.OnOff, { onOff: true })
           } catch (e: any) {
-            this.log.error(`Failed to turn on device ${dev.deviceId}: ${e?.message ?? e}`)
+            this.errorLog(`Failed to turn on device ${dev.deviceId}: ${e?.message ?? e}`)
           }
         },
         off: async () => {
@@ -321,7 +313,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
             }
             await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.OnOff, { onOff: false })
           } catch (e: any) {
-            this.log.error(`Failed to turn off device ${dev.deviceId}: ${e?.message ?? e}`)
+            this.errorLog(`Failed to turn off device ${dev.deviceId}: ${e?.message ?? e}`)
           }
         },
       },
@@ -409,7 +401,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
 
     const Ctor = mapping[dev.deviceType ?? '']
     if (!Ctor) {
-      this.log.debug(`No Matter mapping for deviceType='${dev.deviceType}', deviceId=${dev.deviceId}`)
+      this.debugLog(`No Matter mapping for deviceType='${dev.deviceType}', deviceId=${dev.deviceId}`)
       return undefined
     }
 
@@ -438,7 +430,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
             }
             await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.LevelControl, { currentLevel: level })
           } catch (e: any) {
-            this.log.error(`Failed to set brightness for ${dev.deviceId}: ${e?.message ?? e}`)
+            this.errorLog(`Failed to set brightness for ${dev.deviceId}: ${e?.message ?? e}`)
           }
         },
       }
@@ -457,7 +449,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
             }
             await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.ColorControl, { currentHue: hue, currentSaturation: saturation })
           } catch (e: any) {
-            this.log.error(`Failed to set hue/sat for ${dev.deviceId}: ${e?.message ?? e}`)
+            this.errorLog(`Failed to set hue/sat for ${dev.deviceId}: ${e?.message ?? e}`)
           }
         },
         moveToColorLogic: async (request: any) => {
@@ -476,7 +468,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
             }
             await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.ColorControl, { currentX: colorX, currentY: colorY })
           } catch (e: any) {
-            this.log.error(`Failed to set XY color for ${dev.deviceId}: ${e?.message ?? e}`)
+            this.errorLog(`Failed to set XY color for ${dev.deviceId}: ${e?.message ?? e}`)
           }
         },
       }
@@ -493,7 +485,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
             }
             await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.ColorControl, { currentX: request.colorX ?? 0, currentY: request.colorY ?? 0 })
           } catch (e: any) {
-            this.log.error(`Failed to set color temperature for ${dev.deviceId}: ${e?.message ?? e}`)
+            this.errorLog(`Failed to set color temperature for ${dev.deviceId}: ${e?.message ?? e}`)
           }
         },
       }
@@ -503,9 +495,22 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     // classes can call OpenAPI/BLE actions (sendOpenAPI/sendBLE) and know
     // the effective connection type.
     try {
-      ;(baseOpts as any).context = Object.assign({}, (baseOpts as any).context, { sendOpenAPI, sendBLE, connectionType })
+      /* Inject platform helpers (OpenAPI/BLE senders + logging helpers + connection type)
+         into the accessory context so Matter accessory classes can use them without
+         reaching into the platform implementation directly. */
+      ;(baseOpts as any).context = Object.assign({}, (baseOpts as any).context, {
+        sendOpenAPI,
+        sendBLE,
+        connectionType,
+        // Expose platform logging helpers so accessories can use consistent logging
+        infoLog: this.infoLog,
+        debugLog: this.debugLog,
+        warnLog: this.warnLog,
+        errorLog: this.errorLog,
+        successLog: this.successLog,
+      })
     } catch (e: any) {
-      this.log.debug('Failed to attach platform helpers to baseOpts.context: %s', e?.message ?? e)
+      this.debugLog('Failed to attach platform helpers to baseOpts.context: %s', e?.message ?? e)
     }
 
     const opts = Object.assign({}, baseOpts, { handlers })
@@ -548,7 +553,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
             }
           }
         } catch (e: any) {
-          this.log.debug(`BLE advertisement parsing failed for ${dev.deviceId}: ${e?.message ?? e}`)
+          this.debugLog(`BLE advertisement parsing failed for ${dev.deviceId}: ${e?.message ?? e}`)
         }
 
         // Fallback to OpenAPI getDeviceStatus when serviceData is not present or parsing failed
@@ -595,11 +600,11 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
             await this.api.matter.updateAccessoryState(uuidLocal, this.api.matter.clusterNames.ColorControl, { currentHue: Math.round((h / 360) * 254), currentSaturation: Math.round((s / 100) * 254) })
           }
         } catch (e: any) {
-          this.log.debug(`BLE push handler failed for ${dev.deviceId}: ${e?.message ?? e}`)
+          this.debugLog(`BLE push handler failed for ${dev.deviceId}: ${e?.message ?? e}`)
         }
       }
     } catch (e: any) {
-      this.log.debug(`Failed to register BLE handler for ${dev.deviceId}: ${e?.message ?? e}`)
+      this.debugLog(`Failed to register BLE handler for ${dev.deviceId}: ${e?.message ?? e}`)
     }
 
     return instance.toAccessory()
@@ -610,25 +615,25 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
    */
   private async discoverDevices(): Promise<void> {
     if (!this.switchBotAPI) {
-      this.log.debug('SwitchBot OpenAPI not configured; skipping discovery')
+      this.debugLog('SwitchBot OpenAPI not configured; skipping discovery')
       return
     }
 
     try {
       const { response, statusCode } = await this.switchBotAPI.getDevices()
-      this.log.debug(`SwitchBot getDevices response status: ${statusCode}`)
+      this.debugLog(`SwitchBot getDevices response status: ${statusCode}`)
       if (statusCode === 100 || statusCode === 200) {
         const deviceList = Array.isArray(response?.body?.deviceList) ? response.body.deviceList : []
         this.discoveredDevices = deviceList
-        this.log.info(`Discovered ${deviceList.length} SwitchBot device(s) from OpenAPI`)
+        this.infoLog(`Discovered ${deviceList.length} SwitchBot device(s) from OpenAPI`)
         for (const d of deviceList) {
-          this.log.debug(`  - ${d.deviceName} (${d.deviceType}) id=${d.deviceId}`)
+          this.debugLog(`  - ${d.deviceName} (${d.deviceType}) id=${d.deviceId}`)
         }
       } else {
-        this.log.warn(`SwitchBot getDevices returned status ${statusCode}`)
+        this.warnLog(`SwitchBot getDevices returned status ${statusCode}`)
       }
     } catch (e: any) {
-      this.log.error('Failed to discover SwitchBot devices:', e?.message ?? e)
+      this.errorLog('Failed to discover SwitchBot devices:', e?.message ?? e)
     }
   }
 
@@ -652,7 +657,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
         )
         return { response, statusCode }
       } catch (e: any) {
-        this.log.debug(`retryCommand error: ${e?.message ?? e}`)
+        this.debugLog(`retryCommand error: ${e?.message ?? e}`)
       }
       retryCount++
 
@@ -716,7 +721,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
 
       return result
     } catch (e: any) {
-      this.log.debug(`parseAdvertisementForDevice failed for ${dev.deviceId}: ${e?.message ?? e}`)
+      this.debugLog(`parseAdvertisementForDevice failed for ${dev.deviceId}: ${e?.message ?? e}`)
       return null
     }
   }
@@ -738,7 +743,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
    * any custom data you stored when the accessory was originally registered.
    */
   configureMatterAccessory(accessory: SerializedMatterAccessory) {
-    this.log.debug('Loading cached Matter accessory:', accessory.displayName)
+    this.debugLog('Loading cached Matter accessory:', accessory.displayName)
     this.matterAccessories.set(accessory.uuid, accessory)
   }
 
@@ -746,16 +751,16 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
    * Register all Matter accessories
    */
   private async registerMatterAccessories() {
-    this.log.debug('═'.repeat(80))
-    this.log.info('Homebridge Matter Plugin')
-    this.log.debug('═'.repeat(80))
+    this.debugLog('═'.repeat(80))
+    this.infoLog('Homebridge Matter Plugin')
+    this.debugLog('═'.repeat(80))
 
     // Remove accessories that are disabled in config
     await this.removeDisabledAccessories()
 
     // If we discovered real SwitchBot devices via OpenAPI, map and register them
     if (this.discoveredDevices && this.discoveredDevices.length > 0) {
-      this.log.info(`Registering ${this.discoveredDevices.length} discovered SwitchBot device(s) as Matter accessories`)
+      this.infoLog(`Registering ${this.discoveredDevices.length} discovered SwitchBot device(s) as Matter accessories`)
       const accessories: Array<MatterAccessory<Record<string, unknown>>> = []
 
       // Merge device config (deviceConfig per deviceType and per-device overrides) to match HAP behavior
@@ -768,18 +773,18 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
             accessories.push(acc)
           }
         } catch (e: any) {
-          this.log.error(`Failed to create Matter accessory for ${dev.deviceId}: ${e?.message ?? e}`)
+          this.errorLog(`Failed to create Matter accessory for ${dev.deviceId}: ${e?.message ?? e}`)
         }
       }
       if (accessories.length > 0) {
-        this.log.info(`✓ Registered ${accessories.length} discovered device(s)`)
+        this.infoLog(`✓ Registered ${accessories.length} discovered device(s)`)
         for (const acc of accessories) {
-          this.log.info(`  - ${acc.displayName}`)
+          this.infoLog(`  - ${acc.displayName}`)
         }
         await this.api.matter.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, accessories)
         return
       }
-      this.log.info('No discovered devices were mapped to Matter accessories; falling back to example sections')
+      this.infoLog('No discovered devices were mapped to Matter accessories; falling back to example sections')
     }
 
     // Register example/demo devices by Matter specification sections
@@ -792,9 +797,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     await this.registerSection12Robotic()
     await this.registerCustomDevices()
 
-    this.log.debug('═'.repeat(80))
-    this.log.debug('Finished registering Matter accessories')
-    this.log.debug('═'.repeat(80))
+    this.debugLog('═'.repeat(80))
+    this.debugLog('Finished registering Matter accessories')
+    this.debugLog('═'.repeat(80))
   }
 
   /**
@@ -829,7 +834,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
       if (enabled === false) {
         const existingAccessory = this.matterAccessories.get(uuid)
         if (existingAccessory) {
-          this.log.info(`Removing accessory '${name}' (disabled in config)`)
+          this.infoLog(`Removing accessory '${name}' (disabled in config)`)
           await this.api.matter.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [existingAccessory as unknown as MatterAccessory])
           this.matterAccessories.delete(uuid)
         }
@@ -841,9 +846,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
    * Section 4: Lighting Devices (Matter Spec § 4)
    */
   private async registerSection4Lighting() {
-    this.log.debug('═'.repeat(80))
-    this.log.info('Section 4: Lighting Devices (Matter Spec § 4)')
-    this.log.debug('═'.repeat(80))
+    this.debugLog('═'.repeat(80))
+    this.infoLog('Section 4: Lighting Devices (Matter Spec § 4)')
+    this.debugLog('═'.repeat(80))
 
     const accessories: Array<MatterAccessory<Record<string, unknown>>> = []
 
@@ -878,9 +883,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     }
 
     if (accessories.length > 0) {
-      this.log.info(`✓ Registered ${accessories.length} lighting device(s)`)
+      this.infoLog(`✓ Registered ${accessories.length} lighting device(s)`)
       for (const acc of accessories) {
-        this.log.info(`  - ${acc.displayName}`)
+        this.infoLog(`  - ${acc.displayName}`)
       }
       await this.api.matter.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, accessories)
     }
@@ -890,9 +895,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
    * Section 5: Smart Plugs/Actuators (Matter Spec § 5)
    */
   private async registerSection5SmartPlugs() {
-    this.log.debug('═'.repeat(80))
-    this.log.info('Section 5: Smart Plugs/Actuators (Matter Spec § 5)')
-    this.log.debug('═'.repeat(80))
+    this.debugLog('═'.repeat(80))
+    this.infoLog('Section 5: Smart Plugs/Actuators (Matter Spec § 5)')
+    this.debugLog('═'.repeat(80))
 
     const accessories: Array<MatterAccessory<Record<string, unknown>>> = []
 
@@ -903,9 +908,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     }
 
     if (accessories.length > 0) {
-      this.log.info(`✓ Registered ${accessories.length} smart plug/actuator device(s)`)
+      this.infoLog(`✓ Registered ${accessories.length} smart plug/actuator device(s)`)
       for (const acc of accessories) {
-        this.log.info(`  - ${acc.displayName}`)
+        this.infoLog(`  - ${acc.displayName}`)
       }
       await this.api.matter.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, accessories)
     }
@@ -915,9 +920,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
    * Section 6: Switches & Controllers (Matter Spec § 6)
    */
   private async registerSection6Switches() {
-    this.log.debug('═'.repeat(80))
-    this.log.info('Section 6: Switches & Controllers (Matter Spec § 6)')
-    this.log.debug('═'.repeat(80))
+    this.debugLog('═'.repeat(80))
+    this.infoLog('Section 6: Switches & Controllers (Matter Spec § 6)')
+    this.debugLog('═'.repeat(80))
 
     const accessories: Array<MatterAccessory<Record<string, unknown>>> = []
 
@@ -928,9 +933,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     }
 
     if (accessories.length > 0) {
-      this.log.info(`✓ Registered ${accessories.length} switch/controller device(s)`)
+      this.infoLog(`✓ Registered ${accessories.length} switch/controller device(s)`)
       for (const acc of accessories) {
-        this.log.info(`  - ${acc.displayName}`)
+        this.infoLog(`  - ${acc.displayName}`)
       }
       await this.api.matter.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, accessories)
     }
@@ -940,9 +945,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
    * Section 7: Sensors (Matter Spec § 7)
    */
   private async registerSection7Sensors() {
-    this.log.debug('═'.repeat(80))
-    this.log.info('Section 7: Sensors (Matter Spec § 7)')
-    this.log.debug('═'.repeat(80))
+    this.debugLog('═'.repeat(80))
+    this.infoLog('Section 7: Sensors (Matter Spec § 7)')
+    this.debugLog('═'.repeat(80))
 
     const accessories: Array<MatterAccessory<Record<string, unknown>>> = []
 
@@ -989,9 +994,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     }
 
     if (accessories.length > 0) {
-      this.log.info(`✓ Registered ${accessories.length} sensor device(s)`)
+      this.infoLog(`✓ Registered ${accessories.length} sensor device(s)`)
       for (const acc of accessories) {
-        this.log.info(`  - ${acc.displayName}`)
+        this.infoLog(`  - ${acc.displayName}`)
       }
       await this.api.matter.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, accessories)
     }
@@ -1001,9 +1006,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
    * Section 8: Closure Devices (Matter Spec § 8)
    */
   private async registerSection8Closure() {
-    this.log.debug('═'.repeat(80))
-    this.log.info('Section 8: Closure Devices (Matter Spec § 8)')
-    this.log.debug('═'.repeat(80))
+    this.debugLog('═'.repeat(80))
+    this.infoLog('Section 8: Closure Devices (Matter Spec § 8)')
+    this.debugLog('═'.repeat(80))
 
     const accessories: Array<MatterAccessory<Record<string, unknown>>> = []
 
@@ -1026,9 +1031,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     }
 
     if (accessories.length > 0) {
-      this.log.info(`✓ Registered ${accessories.length} closure device(s)`)
+      this.infoLog(`✓ Registered ${accessories.length} closure device(s)`)
       for (const acc of accessories) {
-        this.log.info(`  - ${acc.displayName}`)
+        this.infoLog(`  - ${acc.displayName}`)
       }
       await this.api.matter.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, accessories)
     }
@@ -1038,9 +1043,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
    * Section 9: HVAC (Matter Spec § 9)
    */
   private async registerSection9HVAC() {
-    this.log.debug('═'.repeat(80))
-    this.log.info('Section 9: HVAC (Matter Spec § 9)')
-    this.log.debug('═'.repeat(80))
+    this.debugLog('═'.repeat(80))
+    this.infoLog('Section 9: HVAC (Matter Spec § 9)')
+    this.debugLog('═'.repeat(80))
 
     const accessories: Array<MatterAccessory<Record<string, unknown>>> = []
 
@@ -1057,9 +1062,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     }
 
     if (accessories.length > 0) {
-      this.log.info(`✓ Registered ${accessories.length} HVAC device(s)`)
+      this.infoLog(`✓ Registered ${accessories.length} HVAC device(s)`)
       for (const acc of accessories) {
-        this.log.info(`  - ${acc.displayName}`)
+        this.infoLog(`  - ${acc.displayName}`)
       }
       await this.api.matter.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, accessories)
     }
@@ -1072,9 +1077,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
    * Use those codes to pair the vacuum as a separate bridge in your Home app.
    */
   private async registerSection12Robotic() {
-    this.log.debug('═'.repeat(80))
-    this.log.info('Section 12: Robotic Devices (Matter Spec § 12)')
-    this.log.debug('═'.repeat(80))
+    this.debugLog('═'.repeat(80))
+    this.infoLog('Section 12: Robotic Devices (Matter Spec § 12)')
+    this.debugLog('═'.repeat(80))
 
     const accessories: Array<MatterAccessory<Record<string, unknown>>> = []
 
@@ -1085,9 +1090,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     }
 
     if (accessories.length > 0) {
-      this.log.info(`✓ Registered ${accessories.length} robot vacuum device(s)`)
+      this.infoLog(`✓ Registered ${accessories.length} robot vacuum device(s)`)
       for (const acc of accessories) {
-        this.log.info(`  - ${acc.displayName} (standalone for Apple Home compatibility)`)
+        this.infoLog(`  - ${acc.displayName} (standalone for Apple Home compatibility)`)
       }
       await this.api.matter.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, accessories)
     }
@@ -1101,9 +1106,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
    * like managing multiple logical components within a single device.
    */
   private async registerCustomDevices() {
-    this.log.debug('═'.repeat(80))
-    this.log.info('Custom Devices')
-    this.log.debug('═'.repeat(80))
+    this.debugLog('═'.repeat(80))
+    this.infoLog('Custom Devices')
+    this.debugLog('═'.repeat(80))
 
     const accessories: Array<MatterAccessory<Record<string, unknown>>> = []
 
@@ -1114,9 +1119,9 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     }
 
     if (accessories.length > 0) {
-      this.log.info(`✓ Registered ${accessories.length} custom device(s)`)
+      this.infoLog(`✓ Registered ${accessories.length} custom device(s)`)
       for (const acc of accessories) {
-        this.log.info(`  - ${acc.displayName}`)
+        this.infoLog(`  - ${acc.displayName}`)
       }
       await this.api.matter.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, accessories)
     }