homebridge 2.0.0-alpha.61 → 2.0.0-alpha.63

package/dist/matter/matterBehaviors.js

@@ -10,7 +10,64 @@
  */
 import { ColorControlServer, DoorLockServer, IdentifyServer, LevelControlServer, OnOffServer, RvcCleanModeServer, RvcOperationalStateServer, RvcRunModeServer, ServiceAreaServer, ThermostatServer, WindowCoveringServer, } from '@matter/main/behaviors';
 import { Logger } from '../logger.js';
+import { clusterNames } from './matterTypes.js';
 const log = Logger.withPrefix('Matter/Behaviours');
+/**
+ * Command names for each cluster
+ * Provides type safety and autocomplete for command names
+ */
+const commandNames = {
+    OnOff: {
+        on: 'on',
+        off: 'off',
+        toggle: 'toggle',
+    },
+    LevelControl: {
+        moveToLevel: 'moveToLevel',
+        moveToLevelWithOnOff: 'moveToLevelWithOnOff',
+        move: 'move',
+        step: 'step',
+        stop: 'stop',
+    },
+    WindowCovering: {
+        upOrOpen: 'upOrOpen',
+        downOrClose: 'downOrClose',
+        stopMotion: 'stopMotion',
+    },
+    DoorLock: {
+        lockDoor: 'lockDoor',
+        unlockDoor: 'unlockDoor',
+    },
+    Thermostat: {
+        setpointRaiseLower: 'setpointRaiseLower',
+    },
+    Identify: {
+        identify: 'identify',
+    },
+    ColorControl: {
+        moveToColorTemperatureLogic: 'moveToColorTemperatureLogic',
+        moveToHueAndSaturationLogic: 'moveToHueAndSaturationLogic',
+        moveToColorLogic: 'moveToColorLogic',
+        moveToHueLogic: 'moveToHueLogic',
+        moveToSaturationLogic: 'moveToSaturationLogic',
+        stopAllColorMovement: 'stopAllColorMovement',
+    },
+    RvcOperationalState: {
+        pause: 'pause',
+        resume: 'resume',
+        goHome: 'goHome',
+    },
+    RvcRunMode: {
+        changeToMode: 'changeToMode',
+    },
+    RvcCleanMode: {
+        changeToMode: 'changeToMode',
+    },
+    ServiceArea: {
+        selectAreas: 'selectAreas',
+        skipArea: 'skipArea',
+    },
+};
 /**
  * Store for custom handlers
  * Maps endpoint ID -> cluster name -> command name -> handler
@@ -74,7 +131,7 @@ export function registerHandler(endpointId, clusterName, commandName, handler) {
     }
     const clusterHandlers = endpointHandlers.get(clusterName);
     clusterHandlers.set(commandName, handler);
-    log.info(`Registered handler for ${endpointId}.${clusterName}.${commandName}`);
+    log.debug(`Registered handler for ${endpointId}.${clusterName}.${commandName}`);
 }
 /**
  * Get a handler for a specific endpoint/cluster/command
@@ -82,69 +139,45 @@ export function registerHandler(endpointId, clusterName, commandName, handler) {
 function getHandler(endpointId, clusterName, commandName) {
     return handlerStore.get(endpointId)?.get(clusterName)?.get(commandName);
 }
+/**
+ * Execute a handler with consistent error handling and logging
+ */
+function executeHandler(endpointId, clusterName, commandName, request) {
+    const handler = getHandler(endpointId, clusterName, commandName);
+    log.debug(`${clusterName}.${commandName} called for endpoint ${endpointId}`);
+    if (handler) {
+        handler(request);
+        log.debug(`  ✓ Plugin handler for ${endpointId}.${clusterName}.${commandName} executed successfully`);
+    }
+    else {
+        log.warn(`  ⚠ No handler registered for ${endpointId}.${clusterName}.${commandName}`);
+    }
+}
 /**
  * Custom OnOff Server that calls plugin handlers
  */
 export class HomebridgeOnOffServer extends OnOffServer {
     on() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'onOff', 'on');
-        log.info(`OnOff.on called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
-        else {
-            log.warn(`  ⚠ No handler registered for ${endpointId}.onOff.on`);
-        }
+        executeHandler(endpointId, clusterNames.OnOff, commandNames.OnOff.on);
         const result = super.on();
-        // Sync the new state to cache for persistence
-        syncEndpointStateToCache(endpointId, 'onOff', { onOff: true });
+        syncEndpointStateToCache(endpointId, clusterNames.OnOff, { onOff: true });
         return result;
     }
     off() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'onOff', 'off');
-        log.info(`OnOff.off called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
-        else {
-            log.warn(`  ⚠ No handler registered for ${endpointId}.onOff.off`);
-        }
+        executeHandler(endpointId, clusterNames.OnOff, commandNames.OnOff.off);
         const result = super.off();
-        // Sync the new state to cache for persistence
-        syncEndpointStateToCache(endpointId, 'onOff', { onOff: false });
+        syncEndpointStateToCache(endpointId, clusterNames.OnOff, { onOff: false });
         return result;
     }
     toggle() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'onOff', 'toggle');
-        log.info(`OnOff.toggle called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.OnOff, commandNames.OnOff.toggle);
         const result = super.toggle();
         // Read the new state from the endpoint and sync to cache
         const newState = this.state.onOff;
-        syncEndpointStateToCache(endpointId, 'onOff', { onOff: newState });
+        syncEndpointStateToCache(endpointId, clusterNames.OnOff, { onOff: newState });
         return result;
     }
 }
@@ -154,94 +187,41 @@ export class HomebridgeOnOffServer extends OnOffServer {
 export class HomebridgeLevelControlServer extends LevelControlServer {
     moveToLevel(request) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'levelControl', 'moveToLevel');
-        log.info(`LevelControl.moveToLevel called for endpoint ${endpointId} with level ${request.level}`);
-        if (handler) {
-            try {
-                handler(request);
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
-        else {
-            log.warn(`  ⚠ No handler registered for ${endpointId}.levelControl.moveToLevel`);
-        }
+        executeHandler(endpointId, clusterNames.LevelControl, commandNames.LevelControl.moveToLevel, request);
         const result = super.moveToLevel(request);
-        // Sync the new level to cache for persistence
-        syncEndpointStateToCache(endpointId, 'levelControl', { currentLevel: request.level });
+        syncEndpointStateToCache(endpointId, clusterNames.LevelControl, { currentLevel: request.level });
         return result;
     }
     moveToLevelWithOnOff(request) {
         const endpointId = this.endpoint.id;
-        // Try to get a specific handler for moveToLevelWithOnOff first
-        let handler = getHandler(endpointId, 'levelControl', 'moveToLevelWithOnOff');
-        // Fall back to moveToLevel handler if no specific handler is registered
-        if (!handler) {
-            handler = getHandler(endpointId, 'levelControl', 'moveToLevel');
-        }
-        log.info(`LevelControl.moveToLevelWithOnOff called for endpoint ${endpointId} with level ${request.level}`);
+        // Try specific handler first, fall back to moveToLevel handler
+        const handler = getHandler(endpointId, clusterNames.LevelControl, commandNames.LevelControl.moveToLevelWithOnOff)
+            || getHandler(endpointId, clusterNames.LevelControl, commandNames.LevelControl.moveToLevel);
+        log.debug(`LevelControl.moveToLevelWithOnOff called for endpoint ${endpointId} with level ${request.level}`);
         if (handler) {
-            try {
-                handler(request);
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
+            handler(request);
+            log.debug(`  ✓ Plugin handler for ${endpointId}.LevelControl.moveToLevelWithOnOff executed successfully`);
         }
         else {
             log.warn(`  ⚠ No handler registered for ${endpointId}.levelControl.moveToLevelWithOnOff or moveToLevel`);
         }
         const result = super.moveToLevelWithOnOff(request);
-        // Sync the new level to cache for persistence
-        syncEndpointStateToCache(endpointId, 'levelControl', { currentLevel: request.level });
+        syncEndpointStateToCache(endpointId, clusterNames.LevelControl, { currentLevel: request.level });
         return result;
     }
     move(request) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'levelControl', 'move');
-        log.info(`LevelControl.move called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler(request);
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.LevelControl, commandNames.LevelControl.move, request);
         return super.move(request);
     }
     step(request) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'levelControl', 'step');
-        log.info(`LevelControl.step called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler(request);
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.LevelControl, commandNames.LevelControl.step, request);
         return super.step(request);
     }
     stop(request) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'levelControl', 'stop');
-        log.info(`LevelControl.stop called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler(request);
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.LevelControl, commandNames.LevelControl.stop, request);
         return super.stop(request);
     }
 }
@@ -251,17 +231,7 @@ export class HomebridgeLevelControlServer extends LevelControlServer {
 export class HomebridgeWindowCoveringServer extends WindowCoveringServer {
     upOrOpen() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'windowCovering', 'upOrOpen');
-        log.info(`WindowCovering.upOrOpen called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.WindowCovering, commandNames.WindowCovering.upOrOpen);
         const result = super.upOrOpen();
         // Sync state to cache - window covering opening
         const currentState = this.state;
@@ -272,22 +242,12 @@ export class HomebridgeWindowCoveringServer extends WindowCoveringServer {
         if (currentState.currentPositionLiftPercent100ths !== undefined) {
             stateUpdate.currentPositionLiftPercent100ths = currentState.currentPositionLiftPercent100ths;
         }
-        syncEndpointStateToCache(endpointId, 'windowCovering', stateUpdate);
+        syncEndpointStateToCache(endpointId, clusterNames.WindowCovering, stateUpdate);
         return result;
     }
     downOrClose() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'windowCovering', 'downOrClose');
-        log.info(`WindowCovering.downOrClose called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.WindowCovering, commandNames.WindowCovering.downOrClose);
         const result = super.downOrClose();
         // Sync state to cache - window covering closing
         const currentState = this.state;
@@ -298,22 +258,12 @@ export class HomebridgeWindowCoveringServer extends WindowCoveringServer {
         if (currentState.currentPositionLiftPercent100ths !== undefined) {
             stateUpdate.currentPositionLiftPercent100ths = currentState.currentPositionLiftPercent100ths;
         }
-        syncEndpointStateToCache(endpointId, 'windowCovering', stateUpdate);
+        syncEndpointStateToCache(endpointId, clusterNames.WindowCovering, stateUpdate);
         return result;
     }
     stopMotion() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'windowCovering', 'stopMotion');
-        log.info(`WindowCovering.stopMotion called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.WindowCovering, commandNames.WindowCovering.stopMotion);
         const result = super.stopMotion();
         // Sync state to cache - window covering stopped
         const currentState = this.state;
@@ -324,7 +274,7 @@ export class HomebridgeWindowCoveringServer extends WindowCoveringServer {
         if (currentState.currentPositionLiftPercent100ths !== undefined) {
             stateUpdate.currentPositionLiftPercent100ths = currentState.currentPositionLiftPercent100ths;
         }
-        syncEndpointStateToCache(endpointId, 'windowCovering', stateUpdate);
+        syncEndpointStateToCache(endpointId, clusterNames.WindowCovering, stateUpdate);
         return result;
     }
 }
@@ -334,43 +284,23 @@ export class HomebridgeWindowCoveringServer extends WindowCoveringServer {
 export class HomebridgeDoorLockServer extends DoorLockServer {
     lockDoor() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'doorLock', 'lockDoor');
-        log.info(`DoorLock.lockDoor called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.DoorLock, commandNames.DoorLock.lockDoor);
         const result = super.lockDoor();
         // Sync lock state to cache
         const currentState = this.state;
         if (currentState.lockState !== undefined) {
-            syncEndpointStateToCache(endpointId, 'doorLock', { lockState: currentState.lockState });
+            syncEndpointStateToCache(endpointId, clusterNames.DoorLock, { lockState: currentState.lockState });
         }
         return result;
     }
     unlockDoor() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'doorLock', 'unlockDoor');
-        log.info(`DoorLock.unlockDoor called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.DoorLock, commandNames.DoorLock.unlockDoor);
         const result = super.unlockDoor();
         // Sync lock state to cache
         const currentState = this.state;
         if (currentState.lockState !== undefined) {
-            syncEndpointStateToCache(endpointId, 'doorLock', { lockState: currentState.lockState });
+            syncEndpointStateToCache(endpointId, clusterNames.DoorLock, { lockState: currentState.lockState });
         }
         return result;
     }
@@ -381,17 +311,7 @@ export class HomebridgeDoorLockServer extends DoorLockServer {
 export class HomebridgeThermostatServer extends ThermostatServer {
     setpointRaiseLower(request) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'thermostat', 'setpointRaiseLower');
-        log.info(`Thermostat.setpointRaiseLower called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler(request);
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.Thermostat, commandNames.Thermostat.setpointRaiseLower, request);
         const result = super.setpointRaiseLower(request);
         // Sync thermostat setpoints to cache
         const currentState = this.state;
@@ -402,7 +322,7 @@ export class HomebridgeThermostatServer extends ThermostatServer {
         if (currentState.occupiedHeatingSetpoint !== undefined) {
             stateUpdate.occupiedHeatingSetpoint = currentState.occupiedHeatingSetpoint;
         }
-        syncEndpointStateToCache(endpointId, 'thermostat', stateUpdate);
+        syncEndpointStateToCache(endpointId, clusterNames.Thermostat, stateUpdate);
         return result;
     }
 }
@@ -412,17 +332,7 @@ export class HomebridgeThermostatServer extends ThermostatServer {
 export class HomebridgeIdentifyServer extends IdentifyServer {
     identify(request) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'identify', 'identify');
-        log.info(`Identify.identify called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler(request);
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.Identify, commandNames.Identify.identify, request);
         return super.identify(request);
     }
 }
@@ -443,22 +353,12 @@ export class HomebridgeColorControlServer extends ColorControlServer {
      */
     moveToColorTemperatureLogic(targetMireds, transitionTime) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'colorControl', 'moveToColorTemperatureLogic');
-        log.info(`ColorControl.moveToColorTemperatureLogic called for endpoint ${endpointId} with mireds=${targetMireds}, transitionTime=${transitionTime}`);
-        if (handler) {
-            try {
-                handler({ targetMireds, transitionTime });
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.ColorControl, commandNames.ColorControl.moveToColorTemperatureLogic, { targetMireds, transitionTime });
         const result = super.moveToColorTemperatureLogic(targetMireds, transitionTime);
         // Sync color temperature to cache
         const currentState = this.state;
         if (currentState.colorTemperatureMireds !== undefined) {
-            syncEndpointStateToCache(endpointId, 'colorControl', {
+            syncEndpointStateToCache(endpointId, clusterNames.ColorControl, {
                 colorTemperatureMireds: currentState.colorTemperatureMireds,
             });
         }
@@ -472,17 +372,7 @@ export class HomebridgeColorControlServer extends ColorControlServer {
      */
     moveToHueAndSaturationLogic(targetHue, targetSaturation, transitionTime) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'colorControl', 'moveToHueAndSaturationLogic');
-        log.info(`ColorControl.moveToHueAndSaturationLogic called for endpoint ${endpointId} with hue=${targetHue}, saturation=${targetSaturation}, transitionTime=${transitionTime}`);
-        if (handler) {
-            try {
-                handler({ targetHue, targetSaturation, transitionTime });
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.ColorControl, commandNames.ColorControl.moveToHueAndSaturationLogic, { targetHue, targetSaturation, transitionTime });
         const result = super.moveToHueAndSaturationLogic(targetHue, targetSaturation, transitionTime);
         // Sync hue and saturation to cache
         const currentState = this.state;
@@ -493,7 +383,7 @@ export class HomebridgeColorControlServer extends ColorControlServer {
         if (currentState.currentSaturation !== undefined) {
             stateUpdate.currentSaturation = currentState.currentSaturation;
         }
-        syncEndpointStateToCache(endpointId, 'colorControl', stateUpdate);
+        syncEndpointStateToCache(endpointId, clusterNames.ColorControl, stateUpdate);
         return result;
     }
     /**
@@ -504,17 +394,7 @@ export class HomebridgeColorControlServer extends ColorControlServer {
      */
     moveToColorLogic(targetX, targetY, transitionTime) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'colorControl', 'moveToColorLogic');
-        log.info(`ColorControl.moveToColorLogic called for endpoint ${endpointId} with x=${targetX}, y=${targetY}, transitionTime=${transitionTime}`);
-        if (handler) {
-            try {
-                handler({ targetX, targetY, transitionTime });
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.ColorControl, commandNames.ColorControl.moveToColorLogic, { targetX, targetY, transitionTime });
         const result = super.moveToColorLogic(targetX, targetY, transitionTime);
         // Sync XY color to cache
         const currentState = this.state;
@@ -525,7 +405,7 @@ export class HomebridgeColorControlServer extends ColorControlServer {
         if (currentState.currentY !== undefined) {
             stateUpdate.currentY = currentState.currentY;
         }
-        syncEndpointStateToCache(endpointId, 'colorControl', stateUpdate);
+        syncEndpointStateToCache(endpointId, clusterNames.ColorControl, stateUpdate);
         return result;
     }
     /**
@@ -537,17 +417,7 @@ export class HomebridgeColorControlServer extends ColorControlServer {
      */
     moveToHueLogic(targetHue, direction, transitionTime, isEnhancedHue = false) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'colorControl', 'moveToHueLogic');
-        log.info(`ColorControl.moveToHueLogic called for endpoint ${endpointId} with hue=${targetHue}, direction=${direction}, transitionTime=${transitionTime}, enhanced=${isEnhancedHue}`);
-        if (handler) {
-            try {
-                handler({ targetHue, direction, transitionTime, isEnhancedHue });
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.ColorControl, commandNames.ColorControl.moveToHueLogic, { targetHue, direction, transitionTime, isEnhancedHue });
         const result = super.moveToHueLogic(targetHue, direction, transitionTime, isEnhancedHue);
         // Sync hue to cache
         const currentState = this.state;
@@ -558,7 +428,7 @@ export class HomebridgeColorControlServer extends ColorControlServer {
         else if (currentState.currentHue !== undefined) {
             stateUpdate.currentHue = currentState.currentHue;
         }
-        syncEndpointStateToCache(endpointId, 'colorControl', stateUpdate);
+        syncEndpointStateToCache(endpointId, clusterNames.ColorControl, stateUpdate);
         return result;
     }
     /**
@@ -568,22 +438,12 @@ export class HomebridgeColorControlServer extends ColorControlServer {
      */
     moveToSaturationLogic(targetSaturation, transitionTime) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'colorControl', 'moveToSaturationLogic');
-        log.info(`ColorControl.moveToSaturationLogic called for endpoint ${endpointId} with saturation=${targetSaturation}, transitionTime=${transitionTime}`);
-        if (handler) {
-            try {
-                handler({ targetSaturation, transitionTime });
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.ColorControl, commandNames.ColorControl.moveToSaturationLogic, { targetSaturation, transitionTime });
         const result = super.moveToSaturationLogic(targetSaturation, transitionTime);
         // Sync saturation to cache
         const currentState = this.state;
         if (currentState.currentSaturation !== undefined) {
-            syncEndpointStateToCache(endpointId, 'colorControl', {
+            syncEndpointStateToCache(endpointId, clusterNames.ColorControl, {
                 currentSaturation: currentState.currentSaturation,
             });
         }
@@ -594,17 +454,7 @@ export class HomebridgeColorControlServer extends ColorControlServer {
      */
     stopAllColorMovement() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'colorControl', 'stopAllColorMovement');
-        log.info(`ColorControl.stopAllColorMovement called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.ColorControl, commandNames.ColorControl.stopAllColorMovement);
         return super.stopAllColorMovement();
     }
 }
@@ -615,47 +465,17 @@ export class HomebridgeColorControlServer extends ColorControlServer {
 export class HomebridgeRvcOperationalStateServer extends RvcOperationalStateServer {
     pause() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'rvcOperationalState', 'pause');
-        log.info(`RvcOperationalState.pause called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.RvcOperationalState, commandNames.RvcOperationalState.pause);
         return super.pause();
     }
     resume() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'rvcOperationalState', 'resume');
-        log.info(`RvcOperationalState.resume called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.RvcOperationalState, commandNames.RvcOperationalState.resume);
         return super.resume();
     }
     goHome() {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'rvcOperationalState', 'goHome');
-        log.info(`RvcOperationalState.goHome called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler();
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.RvcOperationalState, commandNames.RvcOperationalState.goHome);
         return super.goHome();
     }
 }
@@ -666,17 +486,7 @@ export class HomebridgeRvcOperationalStateServer extends RvcOperationalStateServ
 export class HomebridgeRvcRunModeServer extends RvcRunModeServer {
     changeToMode(request) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'rvcRunMode', 'changeToMode');
-        log.info(`RvcRunMode.changeToMode called for endpoint ${endpointId} with mode ${request.newMode}`);
-        if (handler) {
-            try {
-                handler(request);
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.RvcRunMode, commandNames.RvcRunMode.changeToMode, request);
         return super.changeToMode(request);
     }
 }
@@ -687,17 +497,7 @@ export class HomebridgeRvcRunModeServer extends RvcRunModeServer {
 export class HomebridgeRvcCleanModeServer extends RvcCleanModeServer {
     changeToMode(request) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'rvcCleanMode', 'changeToMode');
-        log.info(`RvcCleanMode.changeToMode called for endpoint ${endpointId} with mode ${request.newMode}`);
-        if (handler) {
-            try {
-                handler(request);
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.RvcCleanMode, commandNames.RvcCleanMode.changeToMode, request);
         return super.changeToMode(request);
     }
 }
@@ -708,32 +508,12 @@ export class HomebridgeRvcCleanModeServer extends RvcCleanModeServer {
 export class HomebridgeServiceAreaServer extends ServiceAreaServer {
     selectAreas(request) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'serviceArea', 'selectAreas');
-        log.info(`ServiceArea.selectAreas called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler(request);
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.ServiceArea, commandNames.ServiceArea.selectAreas, request);
         return super.selectAreas(request);
     }
     skipArea(request) {
         const endpointId = this.endpoint.id;
-        const handler = getHandler(endpointId, 'serviceArea', 'skipArea');
-        log.info(`ServiceArea.skipArea called for endpoint ${endpointId}`);
-        if (handler) {
-            try {
-                handler(request);
-                log.info('  ✓ Plugin handler executed successfully');
-            }
-            catch (error) {
-                log.error('  ✗ Error in plugin handler:', error);
-            }
-        }
+        executeHandler(endpointId, clusterNames.ServiceArea, commandNames.ServiceArea.skipArea, request);
         return super.skipArea(request);
     }
 }