homebridge-easy-mqtt 1.1.0 → 1.2.0-beta.1

package/dist/accessory/lock.d.ts

@@ -1,22 +1,18 @@
 import { PlatformAccessory, Service } from 'homebridge';
-import { TopicHandler } from './base.js';
-import { StatusActiveAccessory } from './statusActive.js';
+import { StatusActiveAccessory } from './abstract/statusActive.js';
 import { CharacteristicType, LockMechanismConfig, ServiceType } from '../model/types.js';
 import { Log } from '../tools/log.js';
-export declare class LockMechanismAccessory extends StatusActiveAccessory {
-    private readonly lockMechanismConfig;
-    private currentState;
-    private targetState;
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, lockMechanismConfig: LockMechanismConfig, log: Log);
+export declare class LockMechanismAccessory extends StatusActiveAccessory<LockMechanismConfig> {
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: LockMechanismConfig, log: Log);
     protected getAccessoryService(): Service;
-    protected get topicHandlers(): TopicHandler[];
+    addTopicHandlers(): void;
     private getCurrentState;
     private getTargetState;
     private onCurrentStateUpdate;
     private onTargetStateUpdate;
-    private setTargetState;
-    private valueFromTargetState;
+    private onSetTargetState;
     private currentStateFromValue;
     private targetStateFromValue;
+    private valueFromTargetState;
     private stringForState;
 }

package/dist/accessory/lock.js

@@ -1,121 +1,95 @@
-import { makeHandler } from './base.js';
-import { StatusActiveAccessory } from './statusActive.js';
+import { StatusActiveAccessory } from './abstract/statusActive.js';
 import { strings } from '../i18n/i18n.js';
-import { toPrimitive } from '../tools/primitive.js';
+import { CharacteristicKey } from '../model/enums.js';
 export class LockMechanismAccessory extends StatusActiveAccessory {
-    lockMechanismConfig;
-    currentState;
-    targetState;
-    constructor(Service, Characteristic, accessory, lockMechanismConfig, log) {
-        super(Service, Characteristic, accessory, lockMechanismConfig, log, LockMechanismAccessory.name);
-        this.lockMechanismConfig = lockMechanismConfig;
-        this.currentState = this.Characteristic.LockCurrentState.UNKNOWN;
-        this.targetState = this.Characteristic.LockTargetState.SECURED;
+    constructor(Service, Characteristic, accessory, config, log) {
+        super(Service, Characteristic, accessory, config, log, LockMechanismAccessory.name);
+        this.set(CharacteristicKey.LockCurrentState, Characteristic.LockCurrentState.UNKNOWN);
+        this.set(CharacteristicKey.LockTargetState, Characteristic.LockTargetState.SECURED);
         this.accessoryService.getCharacteristic(this.Characteristic.LockCurrentState)
             .onGet(this.getCurrentState.bind(this));
         this.accessoryService.getCharacteristic(this.Characteristic.LockTargetState)
             .onGet(this.getTargetState.bind(this))
-            .onSet(this.setTargetState.bind(this));
+            .onSet(this.onSetTargetState.bind(this));
     }
     getAccessoryService() {
         return this.accessory.getService(this.Service.LockMechanism) || this.accessory.addService(this.Service.LockMechanism);
     }
-    get topicHandlers() {
-        const topicHandlers = super.topicHandlers;
-        if (!this.assert('topicGetLockCurrentState', 'topicGetLockTargetState')) {
-            return topicHandlers;
-        }
-        topicHandlers.push(makeHandler(this.lockMechanismConfig.topicGetLockCurrentState, this.onCurrentStateUpdate.bind(this)));
-        topicHandlers.push(makeHandler(this.lockMechanismConfig.topicGetLockTargetState, this.onTargetStateUpdate.bind(this)));
-        return topicHandlers;
+    addTopicHandlers() {
+        super.addTopicHandlers();
+        this.addTopicHandler('topicGetLockCurrentState', this.onCurrentStateUpdate.bind(this));
+        this.addTopicHandler('topicGetLockTargetState', this.onTargetStateUpdate.bind(this));
     }
     async getCurrentState() {
-        return this.currentState;
+        return this.get(CharacteristicKey.LockCurrentState);
     }
     async getTargetState() {
-        return this.targetState;
+        return this.get(CharacteristicKey.LockTargetState);
     }
     async onCurrentStateUpdate(topic, value) {
         const current = this.currentStateFromValue(value);
-        if (current === this.currentState) {
+        if (current <= this.Characteristic.LockTargetState.SECURED) {
+            this.onUpdate(CharacteristicKey.LockTargetState, current);
+        }
+        if (!this.onUpdate(CharacteristicKey.LockCurrentState, current)) {
             return;
         }
-        this.currentState = current;
-        this.accessoryService.updateCharacteristic(this.Characteristic.LockCurrentState, this.currentState);
-        this.targetState = this.currentState;
-        this.accessoryService.updateCharacteristic(this.Characteristic.LockTargetState, this.targetState);
-        if (this.currentState === this.Characteristic.LockCurrentState.JAMMED) {
-            this.log.error(this.stringForState(this.currentState), this.name);
+        if (current === this.Characteristic.LockCurrentState.JAMMED) {
+            this.log.error(this.stringForState(current), this.name);
         }
         else {
-            this.logIfDesired(this.stringForState(this.currentState), this.name);
+            this.logIfDesired(this.stringForState(current));
         }
     }
     async onTargetStateUpdate(topic, value) {
         const target = this.targetStateFromValue(value);
-        if (target === this.targetState) {
-            return;
-        }
-        this.targetState = target;
-        this.accessoryService.updateCharacteristic(this.Characteristic.LockTargetState, this.targetState);
-        this.logIfDesired(this.stringForState(this.targetState, true), this.name);
+        this.onUpdate(CharacteristicKey.LockTargetState, target, this.stringForState(target, true));
     }
-    async setTargetState(value) {
-        if (!this.assert('topicSetTargetState')) {
-            return;
-        }
+    async onSetTargetState(value) {
         const target = this.valueFromTargetState(value);
         if (target === undefined) {
-            this.log.error(strings.lock.badTarget, this.name, value);
             return;
         }
-        if (this.targetState !== value) {
-            this.logIfDesired(this.stringForState(value, true), this.name);
-        }
-        this.targetState = value;
-        this.accessoryService.updateCharacteristic(this.Characteristic.LockTargetState, this.targetState);
-        this.publish(this.lockMechanismConfig.topicSetTargetState, target);
-    }
-    valueFromTargetState(value) {
-        if (value === undefined || !this.assert('valueLockStateSecured', 'valueLockStateUnsecured')) {
-            return undefined;
-        }
-        switch (value) {
-            case this.Characteristic.LockTargetState.SECURED:
-                return toPrimitive(this.lockMechanismConfig.valueLockStateSecured);
-            case this.Characteristic.LockTargetState.UNSECURED:
-                return toPrimitive(this.lockMechanismConfig.valueLockStateUnsecured);
-            default:
-                return undefined;
-        }
+        this.onSet(CharacteristicKey.LockTargetState, value, target, 'topicSetTargetState', this.stringForState(value, true));
     }
     currentStateFromValue(value) {
-        if (value === undefined || !this.assert('valueLockStateSecured', 'valueLockStateUnsecured')) {
+        if (value === undefined) {
             return this.Characteristic.LockCurrentState.UNKNOWN;
         }
         switch (value) {
-            case toPrimitive(this.lockMechanismConfig.valueLockStateSecured):
+            case this.getPrimitiveValue('valueLockStateSecured'):
                 return this.Characteristic.LockCurrentState.SECURED;
-            case toPrimitive(this.lockMechanismConfig.valueLockStateUnsecured):
+            case this.getPrimitiveValue('valueLockStateUnsecured'):
                 return this.Characteristic.LockCurrentState.UNSECURED;
-            case toPrimitive(this.lockMechanismConfig.valueLockStateJammed):
+            case this.getPrimitiveValue('valueLockStateJammed', false):
                 return this.Characteristic.LockCurrentState.JAMMED;
             default:
                 return this.Characteristic.LockCurrentState.UNKNOWN;
         }
     }
     targetStateFromValue(value) {
-        if (value === undefined || !this.assert('valueLockStateSecured', 'valueLockStateUnsecured')) {
+        if (value === undefined) {
             return this.Characteristic.LockTargetState.SECURED;
         }
         switch (value) {
-            case toPrimitive(this.lockMechanismConfig.valueLockStateUnsecured):
+            case this.getPrimitiveValue('valueLockStateUnsecured'):
                 return this.Characteristic.LockTargetState.UNSECURED;
-            case toPrimitive(this.lockMechanismConfig.valueLockStateSecured):
+            case this.getPrimitiveValue('valueLockStateSecured'):
             default:
                 return this.Characteristic.LockTargetState.SECURED;
         }
     }
+    valueFromTargetState(value) {
+        switch (value) {
+            case this.Characteristic.LockTargetState.SECURED:
+                return this.getPrimitiveValue('valueLockStateSecured');
+            case this.Characteristic.LockTargetState.UNSECURED:
+                return this.getPrimitiveValue('valueLockStateUnsecured');
+            default:
+                this.log.error(strings.lock.badTarget, this.name, `'${value}'`);
+                return undefined;
+        }
+    }
     stringForState(state, future = false) {
         switch (state) {
             case this.Characteristic.LockCurrentState.SECURED:

package/dist/accessory/lock.js.map

@@ -1 +1 @@
-{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/accessory/lock.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAgB,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAK1C,OAAO,EAAa,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAE/D,MAAM,OAAO,sBAAuB,SAAQ,qBAAqB;IAS5C;IAPX,YAAY,CAAsB;IAClC,WAAW,CAAsB;IAEzC,YACE,OAAoB,EACpB,cAAkC,EAClC,SAA4B,EACX,mBAAwC,EACzD,GAAQ;QAER,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,mBAAmB,EAAE,GAAG,EAAE,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAHhF,wBAAmB,GAAnB,mBAAmB,CAAqB;QAKzD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC;QACjE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC;QAE/D,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC;aAC1E,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1C,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;aACzE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACrC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACxH,CAAC;IAGD,IAAc,aAAa;QAEzB,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC;QAE1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,yBAAyB,CAAC,EAAE,CAAC;YACxE,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,wBAAwB,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzH,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEvH,OAAO,aAAa,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,KAAa,EAAE,KAAgB;QAEhE,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,OAAO,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YAClC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;QAC5B,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAEpG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC;QACrC,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAElG,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;YACtE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACpE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,KAAa,EAAE,KAAgB;QAE/D,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,MAAM,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;QAC1B,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAElG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,KAA0B;QAErD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;YACxC,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACzD,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;YAC/B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QAEzB,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAElG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;IACrE,CAAC;IAEO,oBAAoB,CAAC,KAA0B;QAErD,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,yBAAyB,CAAC,EAAE,CAAC;YAC5F,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,QAAQ,KAAK,EAAE,CAAC;YAChB,KAAK,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,OAAO;gBAC9C,OAAO,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;YACrE,KAAK,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,SAAS;gBAChD,OAAO,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;YACvE;gBACE,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEO,qBAAqB,CAAC,KAA4B;QAExD,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,yBAAyB,CAAC,EAAE,CAAC;YAC5F,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC;QACtD,CAAC;QAED,QAAQ,KAAK,EAAE,CAAC;YAChB,KAAK,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC;gBAC9D,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC;YACtD,KAAK,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC;gBAChE,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,SAAS,CAAC;YACxD,KAAK,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC;gBAC7D,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC;YACrD;gBACE,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC;QACtD,CAAC;IACH,CAAC;IAEO,oBAAoB,CAAC,KAA4B;QAEvD,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,yBAAyB,CAAC,EAAE,CAAC;YAC5F,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC;QACrD,CAAC;QAED,QAAQ,KAAK,EAAE,CAAC;YAChB,KAAK,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC;gBAChE,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,SAAS,CAAC;YACvD,KAAK,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;YACjE;gBACE,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC;QACrD,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,KAA0B,EAAE,SAAkB,KAAK;QACxE,QAAO,KAAK,EAAE,CAAC;YACf,KAAK,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO;gBAC/C,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC;YACrF,KAAK,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,SAAS;gBACjD,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC;YACzF,KAAK,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM;gBAC9C,OAAO,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC;YAClC;gBACE,OAAO,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;QACnC,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/accessory/lock.ts"],"names":[],"mappings":"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"}

package/dist/accessory/onoff/lightbulb.d.ts

@@ -0,0 +1,21 @@
+import { PlatformAccessory, Service } from 'homebridge';
+import { OnOffAccessory } from './onoff.js';
+import { CharacteristicType, LightbulbConfig, ServiceType } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare class LightbulbAccessory extends OnOffAccessory<LightbulbConfig> {
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: LightbulbConfig, log: Log);
+    protected getAccessoryService(): Service;
+    addTopicHandlers(): void;
+    private getBrightness;
+    private onBrightnessUpdate;
+    private onSetBrightness;
+    private getColorTemperature;
+    private onColorTemperatureUpdate;
+    private onSetColorTemperature;
+    private getHue;
+    private onHueUpdate;
+    private onSetHue;
+    private getSaturation;
+    private onSaturationUpdate;
+    private onSetSaturation;
+}

package/dist/accessory/onoff/lightbulb.js

@@ -0,0 +1,87 @@
+import { OnOffAccessory } from './onoff.js';
+import { strings } from '../../i18n/i18n.js';
+import { CharacteristicKey } from '../../model/enums.js';
+export class LightbulbAccessory extends OnOffAccessory {
+    constructor(Service, Characteristic, accessory, config, log) {
+        super(Service, Characteristic, accessory, config, log, LightbulbAccessory.name);
+        this.set(CharacteristicKey.Brightness, 100);
+        this.set(CharacteristicKey.ColorTemperature, 500);
+        this.set(CharacteristicKey.Hue, 0);
+        this.set(CharacteristicKey.Saturation, 100);
+        this.accessoryService.getCharacteristic(this.Characteristic.Brightness)
+            .onGet(this.getBrightness.bind(this))
+            .onSet(this.onSetBrightness.bind(this));
+        this.accessoryService.getCharacteristic(this.Characteristic.ColorTemperature)
+            .onGet(this.getColorTemperature.bind(this))
+            .onSet(this.onSetColorTemperature.bind(this));
+        this.accessoryService.getCharacteristic(this.Characteristic.Hue)
+            .onGet(this.getHue.bind(this))
+            .onSet(this.onSetHue.bind(this));
+        this.accessoryService.getCharacteristic(this.Characteristic.Saturation)
+            .onGet(this.getSaturation.bind(this))
+            .onSet(this.onSetSaturation.bind(this));
+    }
+    getAccessoryService() {
+        return this.accessory.getService(this.Service.Lightbulb) || this.accessory.addService(this.Service.Lightbulb);
+    }
+    addTopicHandlers() {
+        super.addTopicHandlers();
+        this.addTopicHandler('topicGetBrightness', this.onBrightnessUpdate.bind(this), false);
+        this.addTopicHandler('topicGetColorTemperature', this.onColorTemperatureUpdate.bind(this), false);
+        this.addTopicHandler('topicGetHue', this.onHueUpdate.bind(this), false);
+        this.addTopicHandler('topicGetSaturation', this.onSaturationUpdate.bind(this), false);
+    }
+    async getBrightness() {
+        return this.get(CharacteristicKey.Brightness);
+    }
+    async onBrightnessUpdate(topic, value) {
+        if (this.assertNumber(value, strings.lightbulb.badBrightness)) {
+            const logString = strings.lightbulb.brightness.replace('%d', `${value.toString()}%`);
+            this.onUpdate(CharacteristicKey.Brightness, value, logString);
+        }
+    }
+    async onSetBrightness(value) {
+        const logString = strings.lightbulb.futureBrightness.replace('%d', `${value.toString()}%`);
+        this.onSet(CharacteristicKey.Brightness, value, value, 'topicSetBrightness', logString);
+    }
+    async getColorTemperature() {
+        return this.get(CharacteristicKey.ColorTemperature);
+    }
+    async onColorTemperatureUpdate(topic, value) {
+        if (this.assertNumber(value, strings.lightbulb.badColorTemperature)) {
+            const logString = strings.lightbulb.colorTemperature.replace('%d', `${value.toString()}M`);
+            this.onUpdate(CharacteristicKey.ColorTemperature, value, logString);
+        }
+    }
+    async onSetColorTemperature(value) {
+        const logString = strings.lightbulb.futureColorTemperature.replace('%d', `${value.toString()}M`);
+        this.onSet(CharacteristicKey.ColorTemperature, value, value, 'topicSetColorTemperature', logString);
+    }
+    async getHue() {
+        return this.get(CharacteristicKey.Hue);
+    }
+    async onHueUpdate(topic, value) {
+        if (this.assertNumber(value, strings.lightbulb.badHue)) {
+            const logString = strings.lightbulb.hue.replace('%d', `${value.toString()}°`);
+            this.onUpdate(CharacteristicKey.Hue, value, logString);
+        }
+    }
+    async onSetHue(value) {
+        const logString = strings.lightbulb.futureHue.replace('%d', `${value.toString()}°`);
+        this.onSet(CharacteristicKey.Hue, value, value, 'topicSetHue', logString);
+    }
+    async getSaturation() {
+        return this.get(CharacteristicKey.Saturation);
+    }
+    async onSaturationUpdate(topic, value) {
+        if (this.assertNumber(value, strings.lightbulb.badSaturation)) {
+            const logString = strings.lightbulb.saturation.replace('%d', `${value.toString()}%`);
+            this.onUpdate(CharacteristicKey.Saturation, value, logString);
+        }
+    }
+    async onSetSaturation(value) {
+        const logString = strings.lightbulb.futureSaturation.replace('%d', `${value.toString()}%`);
+        this.onSet(CharacteristicKey.Saturation, value, value, 'topicSetSaturation', logString);
+    }
+}
+//# sourceMappingURL=lightbulb.js.map

package/dist/accessory/onoff/lightbulb.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lightbulb.js","sourceRoot":"","sources":["../../../src/accessory/onoff/lightbulb.ts"],"names":[],"mappings":"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"}

package/dist/accessory/onoff/onoff.d.ts

@@ -0,0 +1,13 @@
+import { PlatformAccessory, PrimitiveTypes } from 'homebridge';
+import { StatusActiveAccessory } from '../abstract/statusActive.js';
+import { CharacteristicType, OnOffConfig, ServiceType } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare abstract class OnOffAccessory<C extends OnOffConfig = OnOffConfig> extends StatusActiveAccessory<C> {
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, className: string);
+    addTopicHandlers(): void;
+    private getOn;
+    private onOnUpdate;
+    private onSetOn;
+    protected booleanForValue(value: PrimitiveTypes, positive: keyof C, negative: keyof C, errorString: string): boolean | undefined;
+    private stringForState;
+}

package/dist/accessory/onoff/onoff.js

@@ -0,0 +1,54 @@
+import { StatusActiveAccessory } from '../abstract/statusActive.js';
+import { strings } from '../../i18n/i18n.js';
+import { CharacteristicKey } from '../../model/enums.js';
+export class OnOffAccessory extends StatusActiveAccessory {
+    constructor(Service, Characteristic, accessory, config, log, className) {
+        super(Service, Characteristic, accessory, config, log, className);
+        this.set(CharacteristicKey.On, false);
+        this.accessoryService.getCharacteristic(Characteristic.On)
+            .onGet(this.getOn.bind(this))
+            .onSet(this.onSetOn.bind(this));
+    }
+    addTopicHandlers() {
+        super.addTopicHandlers();
+        this.addTopicHandler('topicGetOn', this.onOnUpdate.bind(this));
+    }
+    async getOn() {
+        return this.get(CharacteristicKey.On);
+    }
+    async onOnUpdate(topic, value) {
+        const on = this.booleanForValue(value, 'valueOn', 'valueOff', strings.onOff.badValue);
+        if (on !== undefined) {
+            this.onUpdate(CharacteristicKey.On, on, this.stringForState(on));
+        }
+    }
+    async onSetOn(value) {
+        const on = value ? this.getPrimitiveValue('valueOn') : this.getPrimitiveValue('valueOff');
+        if (on !== undefined) {
+            this.onSet(CharacteristicKey.On, value, on, 'topicSetOn', this.stringForState(value, true));
+        }
+    }
+    booleanForValue(value, positive, negative, errorString) {
+        let bool = undefined;
+        if (value === this.getPrimitiveValue(positive)) {
+            bool = true;
+        }
+        else if (value === this.getPrimitiveValue(negative)) {
+            bool = false;
+        }
+        if (bool === undefined) {
+            this.log.error(errorString, this.name, `'${value}'`);
+            return;
+        }
+        return bool;
+    }
+    stringForState(on, future = false) {
+        if (on) {
+            return future ? strings.onOff.stateFutureOn : strings.onOff.stateOn;
+        }
+        else {
+            return future ? strings.onOff.stateFutureOff : strings.onOff.stateOff;
+        }
+    }
+}
+//# sourceMappingURL=onoff.js.map

package/dist/accessory/onoff/onoff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"onoff.js","sourceRoot":"","sources":["../../../src/accessory/onoff/onoff.ts"],"names":[],"mappings":"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"}

package/dist/accessory/onoff/outlet.d.ts

@@ -0,0 +1,13 @@
+import { PlatformAccessory, Service } from 'homebridge';
+import { OnOffAccessory } from './onoff.js';
+import { CharacteristicType, OutletConfig, ServiceType } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare class OutletAccessory extends OnOffAccessory<OutletConfig> {
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: OutletConfig, log: Log);
+    protected getAccessoryService(): Service;
+    addTopicHandlers(): void;
+    private getInUse;
+    private onInUseUpdate;
+    private onSetInUse;
+    private stringForInUse;
+}

package/dist/accessory/onoff/outlet.js

@@ -0,0 +1,44 @@
+import { OnOffAccessory } from './onoff.js';
+import { strings } from '../../i18n/i18n.js';
+import { CharacteristicKey } from '../../model/enums.js';
+export class OutletAccessory extends OnOffAccessory {
+    constructor(Service, Characteristic, accessory, config, log) {
+        super(Service, Characteristic, accessory, config, log, OutletAccessory.name);
+        this.set(CharacteristicKey.OutletInUse, false);
+        this.accessoryService.getCharacteristic(this.Characteristic.OutletInUse)
+            .onGet(this.getInUse.bind(this))
+            .onSet(this.onSetInUse.bind(this));
+    }
+    getAccessoryService() {
+        return this.accessory.getService(this.Service.Outlet) || this.accessory.addService(this.Service.Outlet);
+    }
+    addTopicHandlers() {
+        super.addTopicHandlers();
+        this.addTopicHandler('topicGetOutletInUse', this.onInUseUpdate.bind(this), false);
+    }
+    async getInUse() {
+        return this.get(CharacteristicKey.OutletInUse);
+    }
+    async onInUseUpdate(topic, value) {
+        const inUse = this.booleanForValue(value, 'valueOutletInUse', 'valueOutletNotInUse', strings.outlet.badValue);
+        if (inUse !== undefined) {
+            this.onUpdate(CharacteristicKey.OutletInUse, inUse, this.stringForInUse(inUse));
+        }
+    }
+    async onSetInUse(value) {
+        const inUse = value ? this.getPrimitiveValue('valueOutletInUse') : this.getPrimitiveValue('valueOutletNotInUse');
+        if (!inUse) {
+            return;
+        }
+        this.onSet(CharacteristicKey.OutletInUse, value, inUse, 'topicSetOutletInUse', this.stringForInUse(inUse, true));
+    }
+    stringForInUse(inUse, future = false) {
+        if (inUse) {
+            return future ? strings.outlet.futureInUse : strings.outlet.inUse;
+        }
+        else {
+            return future ? strings.outlet.futureNotInUse : strings.outlet.notInUse;
+        }
+    }
+}
+//# sourceMappingURL=outlet.js.map

package/dist/accessory/onoff/outlet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"outlet.js","sourceRoot":"","sources":["../../../src/accessory/onoff/outlet.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,OAAO,eAAgB,SAAQ,cAA4B;IAE/D,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAoB,EAAE,GAAQ;QAChI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;QAE7E,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAE/C,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC;aACrE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC/B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1G,CAAC;IAEQ,gBAAgB;QACvB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,eAAe,CAAC,qBAAqB,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IACpF,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,KAAqB;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC9G,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,KAA0B;QAEjD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;QACjH,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,EAAC,qBAAqB,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAClH,CAAC;IAEO,cAAc,CAAC,KAA0B,EAAE,SAAkB,KAAK;QACxE,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACpE,CAAC;aAAM,CAAC;YACN,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC1E,CAAC;IACH,CAAC;CACF"}

package/dist/accessory/{switch.d.ts → onoff/switch.d.ts}

@@ -1,8 +1,8 @@
 import { PlatformAccessory, Service } from 'homebridge';
 import { OnOffAccessory } from './onoff.js';
-import { CharacteristicType, ServiceType, SwitchConfig } from '../model/types.js';
-import { Log } from '../tools/log.js';
-export declare class SwitchAccessory extends OnOffAccessory {
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, switchConfig: SwitchConfig, log: Log);
+import { CharacteristicType, ServiceType, SwitchConfig } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare class SwitchAccessory extends OnOffAccessory<SwitchConfig> {
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: SwitchConfig, log: Log);
     protected getAccessoryService(): Service;
 }

package/dist/accessory/{switch.js → onoff/switch.js}

@@ -1,7 +1,7 @@
 import { OnOffAccessory } from './onoff.js';
 export class SwitchAccessory extends OnOffAccessory {
-    constructor(Service, Characteristic, accessory, switchConfig, log) {
-        super(Service, Characteristic, accessory, switchConfig, log, SwitchAccessory.name);
+    constructor(Service, Characteristic, accessory, config, log) {
+        super(Service, Characteristic, accessory, config, log, SwitchAccessory.name);
     }
     getAccessoryService() {
         return this.accessory.getService(this.Service.Switch) || this.accessory.addService(this.Service.Switch);

package/dist/accessory/onoff/switch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"switch.js","sourceRoot":"","sources":["../../../src/accessory/onoff/switch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAM5C,MAAM,OAAO,eAAgB,SAAQ,cAA4B;IAE/D,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAoB,EAAE,GAAQ;QAChI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC/E,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1G,CAAC;CACF"}

package/dist/accessory/security.d.ts

@@ -0,0 +1,22 @@
+import { PlatformAccessory, Service } from 'homebridge';
+import { StatusActiveAccessory } from './abstract/statusActive.js';
+import { CharacteristicType, SecuritySystemConfig, ServiceType } from '../model/types.js';
+import { Log } from '../tools/log.js';
+export declare class SecuritySystemAccessory extends StatusActiveAccessory<SecuritySystemConfig> {
+    private readonly STATE_MAP;
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: SecuritySystemConfig, log: Log);
+    protected getAccessoryService(): Service;
+    addTopicHandlers(): void;
+    private getCurrentState;
+    private getTargetState;
+    private getIsTampered;
+    private getHasStatusFault;
+    private onCurrentStateUpdate;
+    private onTargetStateUpdate;
+    private onTamperedUpdate;
+    private onStatusFaultUpdate;
+    private onSetTargetState;
+    private fromCVState;
+    private toCVState;
+    private stateStringForCV;
+}