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

package/dist/platform-matter.d.ts

@@ -16,6 +16,17 @@ export declare class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     private switchBotBLE?;
     private discoveredDevices;
     private bleEventHandler;
+    private platformLogging?;
+    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(log: Logging, config: SwitchBotPlatformConfig, api: API);
     /**
      * Normalize a deviceId for matching (uppercase alphanumerics only)

package/dist/platform-matter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform-matter.d.ts","sourceRoot":"","sources":["../src/platform-matter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,qBAAqB,EACrB,OAAO,EAEP,yBAAyB,EAC1B,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AA8B5D;;;;;GAKG;AACH,qBAAa,uBAAwB,YAAW,qBAAqB;aAgBjD,GAAG,EAAE,OAAO;aACZ,MAAM,EAAE,uBAAuB;aAC/B,GAAG,EAAE,GAAG;IAZ1B,SAAgB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAY;IAErF,OAAO,CAAC,YAAY,CAAC,CAAkB;IACvC,OAAO,CAAC,YAAY,CAAC,CAAc;IAEnC,OAAO,CAAC,iBAAiB,CAAe;IAExC,OAAO,CAAC,eAAe,CAA8C;gBAGnD,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,uBAAuB,EAC/B,GAAG,EAAE,GAAG;IA4F1B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAOvB;;;OAGG;YACW,sBAAsB;IAsCpC;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAW5B;;;OAGG;YACW,yBAAyB;IAqXvC;;OAEG;YACW,eAAe;IAwB7B;;OAEG;IACG,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,SAAI,EAAE,mBAAmB,SAAO,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,GAAG,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IA0BzJ;;;OAGG;IACH,OAAO,CAAC,2BAA2B;IAwDnC;;;OAGG;IACH,kBAAkB;IAMlB;;;;;OAKG;IACH,wBAAwB,CAAC,SAAS,EAAE,yBAAyB;IAK7D;;OAEG;YACW,yBAAyB;IAoDvC;;OAEG;YACW,yBAAyB;IAqCvC;;OAEG;YACW,wBAAwB;IA8CtC;;OAEG;YACW,0BAA0B;IAsBxC;;OAEG;YACW,wBAAwB;IAsBtC;;OAEG;YACW,uBAAuB;IA0DrC;;OAEG;YACW,uBAAuB;IAkCrC;;OAEG;YACW,oBAAoB;IA4BlC;;;;;OAKG;YACW,wBAAwB;IAsBtC;;;;;;OAMG;YACW,qBAAqB;CAqBpC"}
+{"version":3,"file":"platform-matter.d.ts","sourceRoot":"","sources":["../src/platform-matter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,qBAAqB,EACrB,OAAO,EAEP,yBAAyB,EAC1B,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AA8B5D;;;;;GAKG;AACH,qBAAa,uBAAwB,YAAW,qBAAqB;aA8BjD,GAAG,EAAE,OAAO;aACZ,MAAM,EAAE,uBAAuB;aAC/B,GAAG,EAAE,GAAG;IA1B1B,SAAgB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAY;IAErF,OAAO,CAAC,YAAY,CAAC,CAAkB;IACvC,OAAO,CAAC,YAAY,CAAC,CAAc;IAEnC,OAAO,CAAC,iBAAiB,CAAe;IAExC,OAAO,CAAC,eAAe,CAA8C;IAErE,OAAO,CAAC,eAAe,CAAC,CAAS;IAGjC,OAAO,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAClC,UAAU,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACrC,eAAe,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAC1C,OAAO,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAClC,YAAY,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACvC,QAAQ,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACnC,aAAa,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACxC,QAAQ,EAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACnC,cAAc,EAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;IACvC,uBAAuB,EAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;gBAG9B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,uBAAuB,EAC/B,GAAG,EAAE,GAAG;IA0G1B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAOvB;;;OAGG;YACW,sBAAsB;IAsCpC;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAW5B;;;OAGG;YACW,yBAAyB;IA8VvC;;OAEG;YACW,eAAe;IAwB7B;;OAEG;IACG,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,SAAI,EAAE,mBAAmB,SAAO,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,GAAG,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IA0BzJ;;;OAGG;IACH,OAAO,CAAC,2BAA2B;IAwDnC;;;OAGG;IACH,kBAAkB;IAMlB;;;;;OAKG;IACH,wBAAwB,CAAC,SAAS,EAAE,yBAAyB;IAK7D;;OAEG;YACW,yBAAyB;IAoDvC;;OAEG;YACW,yBAAyB;IAqCvC;;OAEG;YACW,wBAAwB;IA8CtC;;OAEG;YACW,0BAA0B;IAsBxC;;OAEG;YACW,wBAAwB;IAsBtC;;OAEG;YACW,uBAAuB;IA0DrC;;OAEG;YACW,uBAAuB;IAkCrC;;OAEG;YACW,oBAAoB;IA4BlC;;;;;OAKG;YACW,wBAAwB;IAsBtC;;;;;;OAMG;YACW,qBAAqB;CAqBpC"}

package/dist/platform-matter.js

@@ -1,7 +1,7 @@
 import { SwitchBotBLE, SwitchBotOpenAPI } from 'node-switchbot';
 import { ColorLightAccessory, ColorTemperatureLightAccessory, ContactSensorAccessory, DimmableLightAccessory, DoorLockAccessory, ExtendedColorLightAccessory, FanAccessory, HumiditySensorAccessory, LeakSensorAccessory, LightSensorAccessory, OccupancySensorAccessory, OnOffLightAccessory, OnOffOutletAccessory, OnOffSwitchAccessory, PowerStripAccessory, RoboticVacuumAccessory, SmokeCOAlarmAccessory, TemperatureSensorAccessory, ThermostatAccessory, VenetianBlindAccessory, 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
  * Demonstrates all available Matter device types in Homebridge
@@ -24,11 +24,37 @@ export class SwitchBotMatterPlatform {
     discoveredDevices = [];
     // BLE event handlers keyed by device MAC (formatted)
     bleEventHandler = {};
+    // Platform logging toggle (can be controlled via UI or config)
+    platformLogging;
+    // Platform-provided logging helpers (attached in constructor)
+    infoLog;
+    successLog;
+    debugSuccessLog;
+    warnLog;
+    debugWarnLog;
+    errorLog;
+    debugErrorLog;
+    debugLog;
+    loggingIsDebug;
+    enablingPlatformLogging;
     constructor(log, config, api) {
         this.log = log;
         this.config = config;
         this.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.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 {
             if (this.config.options) {
@@ -43,11 +69,11 @@ export class SwitchBotMatterPlatform {
             }
         }
         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:
         // - If the plugin is running on the main bridge, then the user must have enabled matter in the Homebridge settings page in the UI
@@ -55,36 +81,36 @@ export class SwitchBotMatterPlatform {
         // 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) => this.log.debug('[SwitchBot OpenAPI]', l.message));
+                        this.switchBotAPI.on('log', (l) => 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) {
-                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) => this.log.debug('[SwitchBot BLE]', l.message));
+                    this.switchBotBLE.on('log', (l) => this.debugLog('[SwitchBot BLE]', l.message));
                 }
             }
             catch (e) {
-                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
             if (this.config.options?.BLE && this.switchBotBLE) {
@@ -94,7 +120,7 @@ export class SwitchBotMatterPlatform {
                         await ble.startScan();
                     }
                     catch (e) {
-                        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
                     ble.onadvertisement = async (ad) => {
@@ -106,7 +132,7 @@ export class SwitchBotMatterPlatform {
                             }
                         }
                         catch (e) {
-                            this.log.error(`Failed to handle BLE advertisement: ${e?.message ?? e}`);
+                            this.errorLog(`Failed to handle BLE advertisement: ${e?.message ?? e}`);
                         }
                     };
                 })();
@@ -145,7 +171,7 @@ export class SwitchBotMatterPlatform {
         const devicesWithTypeConfig = await Promise.all(discovered.map(async (deviceObj) => {
             if (!deviceObj.deviceType) {
                 deviceObj.deviceType = deviceObj.configDeviceType !== undefined ? deviceObj.configDeviceType : 'Unknown';
-                this.log.debug(`API missing deviceType for ${deviceObj.deviceId}, using configDeviceType: ${deviceObj.configDeviceType}`);
+                this.debugLog(`API missing deviceType for ${deviceObj.deviceId}, using configDeviceType: ${deviceObj.configDeviceType}`);
             }
             const deviceTypeConfig = this.config.options?.deviceConfig?.[deviceObj.deviceType] || {};
             return Object.assign({}, deviceObj, deviceTypeConfig);
@@ -210,45 +236,9 @@ export class SwitchBotMatterPlatform {
                 deviceId: dev.deviceId,
             },
         };
-        // Small helper to wrap common OpenAPI on/off commands
-        // Helper to send an OpenAPI command
-        const sendOpenAPI = async (command, parameter = 'default') => {
-            const 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, ...args) => {
-            // 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?.bleRetries ?? 2;
-            const retryDelay = this.config.options?.bleRetryDelay ?? 500;
-            let attempt = 0;
-            while (attempt < maxRetries) {
-                try {
-                    const list = await this.switchBotBLE.discover({ model: dev.bleModel, id });
-                    if (!Array.isArray(list) || list.length === 0) {
-                        throw new Error('BLE device not found');
-                    }
-                    const deviceInst = list[0];
-                    if (typeof deviceInst[methodName] !== 'function') {
-                        throw new TypeError(`BLE method ${methodName} not available on device`);
-                    }
-                    return await deviceInst[methodName](...args);
-                }
-                catch (e) {
-                    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?.bleRetries ?? 2, bleRetryDelay: this.config.options?.bleRetryDelay ?? 500 });
         const makeOnOffHandlers = (uuid, connectionType) => ({
             onOff: {
                 on: async () => {
@@ -262,7 +252,7 @@ export class SwitchBotMatterPlatform {
                         await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.OnOff, { onOff: true });
                     }
                     catch (e) {
-                        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 () => {
@@ -276,7 +266,7 @@ export class SwitchBotMatterPlatform {
                         await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.OnOff, { onOff: false });
                     }
                     catch (e) {
-                        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}`);
                     }
                 },
             },
@@ -354,7 +344,7 @@ export class SwitchBotMatterPlatform {
         };
         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;
         }
         // Build opts and handlers tailored for basic capabilities
@@ -381,7 +371,7 @@ export class SwitchBotMatterPlatform {
                         await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.LevelControl, { currentLevel: level });
                     }
                     catch (e) {
-                        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}`);
                     }
                 },
             };
@@ -401,7 +391,7 @@ export class SwitchBotMatterPlatform {
                         await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.ColorControl, { currentHue: hue, currentSaturation: saturation });
                     }
                     catch (e) {
-                        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) => {
@@ -422,7 +412,7 @@ export class SwitchBotMatterPlatform {
                         await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.ColorControl, { currentX: colorX, currentY: colorY });
                     }
                     catch (e) {
-                        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}`);
                     }
                 },
             };
@@ -440,7 +430,7 @@ export class SwitchBotMatterPlatform {
                         await this.api.matter.updateAccessoryState(uuid, this.api.matter.clusterNames.ColorControl, { currentX: request.colorX ?? 0, currentY: request.colorY ?? 0 });
                     }
                     catch (e) {
-                        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}`);
                     }
                 },
             };
@@ -449,11 +439,24 @@ export class SwitchBotMatterPlatform {
         // classes can call OpenAPI/BLE actions (sendOpenAPI/sendBLE) and know
         // the effective connection type.
         try {
+            /* 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.context = Object.assign({}, baseOpts.context, { sendOpenAPI, sendBLE, connectionType });
+            baseOpts.context = Object.assign({}, baseOpts.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) {
-            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 });
         // Instantiate the device class and return its serialized accessory
@@ -490,7 +493,7 @@ export class SwitchBotMatterPlatform {
                     }
                 }
                 catch (e) {
-                    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
                 if (!this.switchBotAPI) {
@@ -535,12 +538,12 @@ export class SwitchBotMatterPlatform {
                     }
                 }
                 catch (e) {
-                    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) {
-            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();
     }
@@ -549,26 +552,26 @@ export class SwitchBotMatterPlatform {
      */
     async discoverDevices() {
         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) {
-            this.log.error('Failed to discover SwitchBot devices:', e?.message ?? e);
+            this.errorLog('Failed to discover SwitchBot devices:', e?.message ?? e);
         }
     }
     /**
@@ -585,7 +588,7 @@ export class SwitchBotMatterPlatform {
                 return { response, statusCode };
             }
             catch (e) {
-                this.log.debug(`retryCommand error: ${e?.message ?? e}`);
+                this.debugLog(`retryCommand error: ${e?.message ?? e}`);
             }
             retryCount++;
             await sleep(delayBetweenRetries);
@@ -645,7 +648,7 @@ export class SwitchBotMatterPlatform {
             return result;
         }
         catch (e) {
-            this.log.debug(`parseAdvertisementForDevice failed for ${dev.deviceId}: ${e?.message ?? e}`);
+            this.debugLog(`parseAdvertisementForDevice failed for ${dev.deviceId}: ${e?.message ?? e}`);
             return null;
         }
     }
@@ -665,21 +668,21 @@ export class SwitchBotMatterPlatform {
      * any custom data you stored when the accessory was originally registered.
      */
     configureMatterAccessory(accessory) {
-        this.log.debug('Loading cached Matter accessory:', accessory.displayName);
+        this.debugLog('Loading cached Matter accessory:', accessory.displayName);
         this.matterAccessories.set(accessory.uuid, accessory);
     }
     /**
      * Register all Matter accessories
      */
     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 = [];
             // Merge device config (deviceConfig per deviceType and per-device overrides) to match HAP behavior
             const devicesToProcess = await this.mergeDiscoveredDevices(this.discoveredDevices);
@@ -691,18 +694,18 @@ export class SwitchBotMatterPlatform {
                     }
                 }
                 catch (e) {
-                    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
         await this.registerSection4Lighting();
@@ -713,9 +716,9 @@ export class SwitchBotMatterPlatform {
         await this.registerSection9HVAC();
         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));
     }
     /**
      * Remove accessories that are disabled in config
@@ -748,7 +751,7 @@ export class SwitchBotMatterPlatform {
             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]);
                     this.matterAccessories.delete(uuid);
                 }
@@ -759,9 +762,9 @@ export class SwitchBotMatterPlatform {
      * Section 4: Lighting Devices (Matter Spec § 4)
      */
     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 = [];
         // On/Off Light
         if (this.config.enableOnOffLight !== false) {
@@ -789,9 +792,9 @@ export class SwitchBotMatterPlatform {
             accessories.push(device.toAccessory());
         }
         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);
         }
@@ -800,9 +803,9 @@ export class SwitchBotMatterPlatform {
      * Section 5: Smart Plugs/Actuators (Matter Spec § 5)
      */
     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 = [];
         // On/Off Outlet
         if (this.config.enableOnOffOutlet !== false) {
@@ -810,9 +813,9 @@ export class SwitchBotMatterPlatform {
             accessories.push(device.toAccessory());
         }
         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);
         }
@@ -821,9 +824,9 @@ export class SwitchBotMatterPlatform {
      * Section 6: Switches & Controllers (Matter Spec § 6)
      */
     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 = [];
         // On/Off Switch
         if (this.config.enableOnOffSwitch !== false) {
@@ -831,9 +834,9 @@ export class SwitchBotMatterPlatform {
             accessories.push(device.toAccessory());
         }
         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);
         }
@@ -842,9 +845,9 @@ export class SwitchBotMatterPlatform {
      * Section 7: Sensors (Matter Spec § 7)
      */
     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 = [];
         // Contact Sensor
         if (this.config.enableContactSensor !== false) {
@@ -882,9 +885,9 @@ export class SwitchBotMatterPlatform {
             accessories.push(device.toAccessory());
         }
         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);
         }
@@ -893,9 +896,9 @@ export class SwitchBotMatterPlatform {
      * Section 8: Closure Devices (Matter Spec § 8)
      */
     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 = [];
         // Door Lock
         if (this.config.enableDoorLock !== false) {
@@ -913,9 +916,9 @@ export class SwitchBotMatterPlatform {
             accessories.push(device.toAccessory());
         }
         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);
         }
@@ -924,9 +927,9 @@ export class SwitchBotMatterPlatform {
      * Section 9: HVAC (Matter Spec § 9)
      */
     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 = [];
         // Thermostat
         if (this.config.enableThermostat !== false) {
@@ -939,9 +942,9 @@ export class SwitchBotMatterPlatform {
             accessories.push(device.toAccessory());
         }
         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);
         }
@@ -953,9 +956,9 @@ export class SwitchBotMatterPlatform {
      * Use those codes to pair the vacuum as a separate bridge in your Home app.
      */
     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 = [];
         // Robot Vacuum
         if (this.config.enableRobotVacuum !== false) {
@@ -963,9 +966,9 @@ export class SwitchBotMatterPlatform {
             accessories.push(device.toAccessory());
         }
         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);
         }
@@ -978,9 +981,9 @@ export class SwitchBotMatterPlatform {
      * like managing multiple logical components within a single device.
      */
     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 = [];
         // Power Strip (4 Outlets)
         if (this.config.enablePowerStrip !== false) {
@@ -988,9 +991,9 @@ export class SwitchBotMatterPlatform {
             accessories.push(device.toAccessory());
         }
         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);
         }