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

package/dist/accessory/lock.d.ts

@@ -1,15 +1,14 @@
 import { PlatformAccessory, Service } from 'homebridge';
-import { TopicHandler } from './base.js';
-import { StatusActiveAccessory } from './statusActive.js';
+import { TopicHandler } from './abstract/base.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;
+export declare class LockMechanismAccessory extends StatusActiveAccessory<LockMechanismConfig> {
     private currentState;
     private targetState;
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, lockMechanismConfig: LockMechanismConfig, log: Log);
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: LockMechanismConfig, log: Log);
     protected getAccessoryService(): Service;
-    protected get topicHandlers(): TopicHandler[];
+    get topicHandlers(): TopicHandler[];
     private getCurrentState;
     private getTargetState;
     private onCurrentStateUpdate;

package/dist/accessory/lock.js

@@ -1,14 +1,12 @@
-import { makeHandler } from './base.js';
-import { StatusActiveAccessory } from './statusActive.js';
+import { makeHandler } from './abstract/base.js';
+import { StatusActiveAccessory } from './abstract/statusActive.js';
 import { strings } from '../i18n/i18n.js';
 import { toPrimitive } from '../tools/primitive.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;
+    constructor(Service, Characteristic, accessory, config, log) {
+        super(Service, Characteristic, accessory, config, log, LockMechanismAccessory.name);
         this.currentState = this.Characteristic.LockCurrentState.UNKNOWN;
         this.targetState = this.Characteristic.LockTargetState.SECURED;
         this.accessoryService.getCharacteristic(this.Characteristic.LockCurrentState)
@@ -25,8 +23,8 @@ export class LockMechanismAccessory extends StatusActiveAccessory {
         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)));
+        topicHandlers.push(makeHandler(this.config.topicGetLockCurrentState, this.onCurrentStateUpdate.bind(this)));
+        topicHandlers.push(makeHandler(this.config.topicGetLockTargetState, this.onTargetStateUpdate.bind(this)));
         return topicHandlers;
     }
     async getCurrentState() {
@@ -48,7 +46,7 @@ export class LockMechanismAccessory extends StatusActiveAccessory {
             this.log.error(this.stringForState(this.currentState), this.name);
         }
         else {
-            this.logIfDesired(this.stringForState(this.currentState), this.name);
+            this.logIfDesired(this.stringForState(this.currentState));
         }
     }
     async onTargetStateUpdate(topic, value) {
@@ -58,7 +56,7 @@ export class LockMechanismAccessory extends StatusActiveAccessory {
         }
         this.targetState = target;
         this.accessoryService.updateCharacteristic(this.Characteristic.LockTargetState, this.targetState);
-        this.logIfDesired(this.stringForState(this.targetState, true), this.name);
+        this.logIfDesired(this.stringForState(this.targetState, true));
     }
     async setTargetState(value) {
         if (!this.assert('topicSetTargetState')) {
@@ -70,11 +68,11 @@ export class LockMechanismAccessory extends StatusActiveAccessory {
             return;
         }
         if (this.targetState !== value) {
-            this.logIfDesired(this.stringForState(value, true), this.name);
+            this.logIfDesired(this.stringForState(value, true));
         }
         this.targetState = value;
         this.accessoryService.updateCharacteristic(this.Characteristic.LockTargetState, this.targetState);
-        this.publish(this.lockMechanismConfig.topicSetTargetState, target);
+        this.publish(this.config.topicSetTargetState, target);
     }
     valueFromTargetState(value) {
         if (value === undefined || !this.assert('valueLockStateSecured', 'valueLockStateUnsecured')) {
@@ -82,9 +80,9 @@ export class LockMechanismAccessory extends StatusActiveAccessory {
         }
         switch (value) {
             case this.Characteristic.LockTargetState.SECURED:
-                return toPrimitive(this.lockMechanismConfig.valueLockStateSecured);
+                return toPrimitive(this.config.valueLockStateSecured);
             case this.Characteristic.LockTargetState.UNSECURED:
-                return toPrimitive(this.lockMechanismConfig.valueLockStateUnsecured);
+                return toPrimitive(this.config.valueLockStateUnsecured);
             default:
                 return undefined;
         }
@@ -94,11 +92,11 @@ export class LockMechanismAccessory extends StatusActiveAccessory {
             return this.Characteristic.LockCurrentState.UNKNOWN;
         }
         switch (value) {
-            case toPrimitive(this.lockMechanismConfig.valueLockStateSecured):
+            case toPrimitive(this.config.valueLockStateSecured):
                 return this.Characteristic.LockCurrentState.SECURED;
-            case toPrimitive(this.lockMechanismConfig.valueLockStateUnsecured):
+            case toPrimitive(this.config.valueLockStateUnsecured):
                 return this.Characteristic.LockCurrentState.UNSECURED;
-            case toPrimitive(this.lockMechanismConfig.valueLockStateJammed):
+            case toPrimitive(this.config.valueLockStateJammed):
                 return this.Characteristic.LockCurrentState.JAMMED;
             default:
                 return this.Characteristic.LockCurrentState.UNKNOWN;
@@ -109,9 +107,9 @@ export class LockMechanismAccessory extends StatusActiveAccessory {
             return this.Characteristic.LockTargetState.SECURED;
         }
         switch (value) {
-            case toPrimitive(this.lockMechanismConfig.valueLockStateUnsecured):
+            case toPrimitive(this.config.valueLockStateUnsecured):
                 return this.Characteristic.LockTargetState.UNSECURED;
-            case toPrimitive(this.lockMechanismConfig.valueLockStateSecured):
+            case toPrimitive(this.config.valueLockStateSecured):
             default:
                 return this.Characteristic.LockTargetState.SECURED;
         }

package/dist/accessory/lock.js.map

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

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

@@ -1,17 +1,16 @@
 import { PlatformAccessory, Service } from 'homebridge';
-import { TopicHandler } from './base.js';
+import { TopicHandler } from '../abstract/base.js';
 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 {
-    private readonly lightbulbConfig;
+import { CharacteristicType, LightbulbConfig, ServiceType } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare class LightbulbAccessory extends OnOffAccessory<LightbulbConfig> {
     private brightness;
     private hue;
     private colorTemperature;
     private saturation;
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, lightbulbConfig: LightbulbConfig, log: Log);
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: LightbulbConfig, log: Log);
     protected getAccessoryService(): Service;
-    protected get topicHandlers(): TopicHandler[];
+    get topicHandlers(): TopicHandler[];
     private getBrightness;
     private getHue;
     private getColorTemperature;

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

@@ -1,16 +1,14 @@
-import { makeHandler } from './base.js';
+import { makeHandler } from '../abstract/base.js';
 import { OnOffAccessory } from './onoff.js';
-import { strings } from '../i18n/i18n.js';
-import { toPrimitive } from '../tools/primitive.js';
+import { strings } from '../../i18n/i18n.js';
+import { toPrimitive } from '../../tools/primitive.js';
 export class LightbulbAccessory extends OnOffAccessory {
-    lightbulbConfig;
     brightness = 100;
     hue = 0;
     colorTemperature = 500;
     saturation = 100;
-    constructor(Service, Characteristic, accessory, lightbulbConfig, log) {
-        super(Service, Characteristic, accessory, lightbulbConfig, log, LightbulbAccessory.name);
-        this.lightbulbConfig = lightbulbConfig;
+    constructor(Service, Characteristic, accessory, config, log) {
+        super(Service, Characteristic, accessory, config, log, LightbulbAccessory.name);
         this.accessoryService.getCharacteristic(this.Characteristic.Brightness)
             .onGet(this.getBrightness.bind(this))
             .onSet(this.setBrightness.bind(this));
@@ -29,17 +27,17 @@ export class LightbulbAccessory extends OnOffAccessory {
     }
     get topicHandlers() {
         const topicHandlers = super.topicHandlers;
-        if (this.lightbulbConfig.topicGetBrightness) {
-            topicHandlers.push(makeHandler(this.lightbulbConfig.topicGetBrightness, this.onBrightnessUpdate.bind(this)));
+        if (this.config.topicGetBrightness) {
+            topicHandlers.push(makeHandler(this.config.topicGetBrightness, this.onBrightnessUpdate.bind(this)));
         }
-        if (this.lightbulbConfig.topicGetHue) {
-            topicHandlers.push(makeHandler(this.lightbulbConfig.topicGetHue, this.onHueUpdate.bind(this)));
+        if (this.config.topicGetHue) {
+            topicHandlers.push(makeHandler(this.config.topicGetHue, this.onHueUpdate.bind(this)));
         }
-        if (this.lightbulbConfig.topicGetColorTemperature) {
-            topicHandlers.push(makeHandler(this.lightbulbConfig.topicGetColorTemperature, this.onColorTemperatureUpdate.bind(this)));
+        if (this.config.topicGetColorTemperature) {
+            topicHandlers.push(makeHandler(this.config.topicGetColorTemperature, this.onColorTemperatureUpdate.bind(this)));
         }
-        if (this.lightbulbConfig.topicGetSaturation) {
-            topicHandlers.push(makeHandler(this.lightbulbConfig.topicGetSaturation, this.onSaturationUpdate.bind(this)));
+        if (this.config.topicGetSaturation) {
+            topicHandlers.push(makeHandler(this.config.topicGetSaturation, this.onSaturationUpdate.bind(this)));
         }
         return topicHandlers;
     }
@@ -86,17 +84,17 @@ export class LightbulbAccessory extends OnOffAccessory {
         this[propertyKey] = value;
         const characteristicKey = this.toCharacteristicKey(propertyKey);
         this.accessoryService.updateCharacteristic(this.Characteristic[characteristicKey], value);
-        this.logIfDesired(logString, this.name, value.toString());
+        this.logIfDesired(logString, value.toString());
     }
     _set(topic, propertyKey, value, logString) {
         if (!this.assert(topic)) {
             return;
         }
         this[propertyKey] = value;
-        this.logIfDesired(logString, this.name, value.toString());
+        this.logIfDesired(logString, value.toString());
         const characteristicKey = this.toCharacteristicKey(propertyKey);
         this.accessoryService.updateCharacteristic(this.Characteristic[characteristicKey], value);
-        this.publish(this.lightbulbConfig[topic], toPrimitive(value));
+        this.publish(this.config[topic], toPrimitive(value));
     }
     toCharacteristicKey(key) {
         const capitalized = key.charAt(0).toUpperCase() + key.slice(1);

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

@@ -0,0 +1 @@
+{"version":3,"file":"lightbulb.js","sourceRoot":"","sources":["../../../src/accessory/onoff/lightbulb.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAK7C,OAAO,EAAa,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAMlE,MAAM,OAAO,kBAAmB,SAAQ,cAA+B;IAE7D,UAAU,GAAwB,GAAG,CAAC;IACtC,GAAG,GAAwB,CAAC,CAAC;IAC7B,gBAAgB,GAAwB,GAAG,CAAC;IAC5C,UAAU,GAAwB,GAAG,CAAC;IAE9C,YACE,OAAoB,EACpB,cAAkC,EAClC,SAA4B,EAC5B,MAAuB,EACvB,GAAQ;QAER,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAEhF,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;aACpE,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACpC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAExC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;aAC7D,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7B,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEjC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC;aAC1E,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1C,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE9C,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;aACpE,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACpC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1C,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAChH,CAAC;IAED,IAAa,aAAa;QACxB,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC;QAE1C,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;YACnC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtG,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC5B,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACxF,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAAC;YACzC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClH,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;YACnC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtG,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAEO,KAAK,CAAC,MAAM;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC/B,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,KAAa,EAAE,KAAgB;QAC9D,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACpE,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,KAA0B;QACpD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC3F,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,KAAa,EAAE,KAAgB;QACvD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACtD,CAAC;IAEO,KAAK,CAAC,MAAM,CAAC,KAA0B;QAC7C,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACtE,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,KAAa,EAAE,KAAgB;QACpE,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAChF,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,KAA0B;QAC1D,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,kBAAkB,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAC7G,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,KAAa,EAAE,KAAgB;QAC9D,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACpE,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,KAA0B;QACpD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC3F,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,WAAwB,EAAE,KAAgB,EAAE,SAAiB;QAEnF,IAAI,KAAK,KAAK,IAAI,CAAC,WAAyB,CAAC,EAAE,CAAC;YAC9C,OAAO;QACT,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC;QAE1B,MAAM,iBAAiB,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAChE,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE,KAAK,CAAC,CAAC;QAE1F,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjD,CAAC;IAEO,IAAI,CAAC,KAAkB,EAAE,WAAwB,EAAE,KAA0B,EAAE,SAAiB;QAEtG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC;QAE1B,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE/C,MAAM,iBAAiB,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAChE,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE,KAAK,CAAC,CAAC;QAE1F,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAE,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACxD,CAAC;IAEO,mBAAmB,CAAC,GAAgB;QAC1C,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/D,OAAO,WAAgC,CAAC;IAC1C,CAAC;CACF"}

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

@@ -0,0 +1,14 @@
+import { PlatformAccessory } from 'homebridge';
+import { TopicHandler } from '../abstract/base.js';
+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> {
+    private on;
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, className: string);
+    get topicHandlers(): TopicHandler[];
+    private onOnUpdate;
+    private getOn;
+    private setOn;
+    private stringForState;
+}

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

@@ -1,13 +1,11 @@
-import { makeHandler } from './base.js';
-import { StatusActiveAccessory } from './statusActive.js';
-import { strings } from '../i18n/i18n.js';
-import { toPrimitive } from '../tools/primitive.js';
+import { makeHandler } from '../abstract/base.js';
+import { StatusActiveAccessory } from '../abstract/statusActive.js';
+import { strings } from '../../i18n/i18n.js';
+import { toPrimitive } from '../../tools/primitive.js';
 export class OnOffAccessory extends StatusActiveAccessory {
-    onOffConfig;
     on = false;
-    constructor(Service, Characteristic, accessory, onOffConfig, log, className) {
-        super(Service, Characteristic, accessory, onOffConfig, log, className);
-        this.onOffConfig = onOffConfig;
+    constructor(Service, Characteristic, accessory, config, log, className) {
+        super(Service, Characteristic, accessory, config, log, className);
         this.accessoryService.getCharacteristic(Characteristic.On)
             .onGet(this.getOn.bind(this))
             .onSet(this.setOn.bind(this));
@@ -17,20 +15,20 @@ export class OnOffAccessory extends StatusActiveAccessory {
         if (!this.assert('topicGetOn')) {
             return topicHandlers;
         }
-        topicHandlers.push(makeHandler(this.onOffConfig.topicGetOn, this.onOnUpdate.bind(this)));
+        topicHandlers.push(makeHandler(this.config.topicGetOn, this.onOnUpdate.bind(this)));
         return topicHandlers;
     }
     async onOnUpdate(topic, value) {
         if (!this.assert('valueOn')) {
             return;
         }
-        const on = value === toPrimitive(this.onOffConfig.valueOn);
+        const on = value === toPrimitive(this.config.valueOn);
         if (on === this.on) {
             return;
         }
         this.on = on;
         this.accessoryService.updateCharacteristic(this.Characteristic.On, this.on);
-        this.logIfDesired(this.stringForState(this.on), this.name);
+        this.logIfDesired(this.stringForState(this.on));
     }
     async getOn() {
         return this.on;
@@ -39,11 +37,11 @@ export class OnOffAccessory extends StatusActiveAccessory {
         if (!this.assert('topicSetOn', 'valueOn', 'valueOff')) {
             return;
         }
-        const on = value ? this.onOffConfig.valueOn : this.onOffConfig.valueOff;
+        const on = value ? this.config.valueOn : this.config.valueOff;
         this.on = value;
-        this.logIfDesired(this.stringForState(this.on, true), this.name);
+        this.logIfDesired(this.stringForState(this.on, true));
         this.accessoryService.updateCharacteristic(this.Characteristic.On, this.on);
-        this.publish(this.onOffConfig.topicSetOn, on);
+        this.publish(this.config.topicSetOn, on);
     }
     stringForState(on, future = false) {
         if (on) {

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/{outlet.d.ts → onoff/outlet.d.ts}

@@ -1,14 +1,13 @@
 import { PlatformAccessory, Service } from 'homebridge';
-import { TopicHandler } from './base.js';
 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 {
-    private readonly outletConfig;
+import { TopicHandler } from '../abstract/base.js';
+import { CharacteristicType, OutletConfig, ServiceType } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare class OutletAccessory extends OnOffAccessory<OutletConfig> {
     private inUse;
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, outletConfig: OutletConfig, log: Log);
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: OutletConfig, log: Log);
     protected getAccessoryService(): Service;
-    protected get topicHandlers(): TopicHandler[];
+    get topicHandlers(): TopicHandler[];
     private getInUse;
     private onInUseUpdate;
     private setInUse;

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

@@ -1,13 +1,11 @@
-import { makeHandler } from './base.js';
 import { OnOffAccessory } from './onoff.js';
-import { strings } from '../i18n/i18n.js';
-import { toPrimitive } from '../tools/primitive.js';
+import { makeHandler } from '../abstract/base.js';
+import { strings } from '../../i18n/i18n.js';
+import { toPrimitive } from '../../tools/primitive.js';
 export class OutletAccessory extends OnOffAccessory {
-    outletConfig;
     inUse = false;
-    constructor(Service, Characteristic, accessory, outletConfig, log) {
-        super(Service, Characteristic, accessory, outletConfig, log, OutletAccessory.name);
-        this.outletConfig = outletConfig;
+    constructor(Service, Characteristic, accessory, config, log) {
+        super(Service, Characteristic, accessory, config, log, OutletAccessory.name);
         this.accessoryService.getCharacteristic(this.Characteristic.OutletInUse)
             .onGet(this.getInUse.bind(this))
             .onSet(this.setInUse.bind(this));
@@ -17,8 +15,8 @@ export class OutletAccessory extends OnOffAccessory {
     }
     get topicHandlers() {
         const topicHandlers = super.topicHandlers;
-        if (this.outletConfig.topicGetOutletInUse) {
-            topicHandlers.push(makeHandler(this.outletConfig.topicGetOutletInUse, this.onInUseUpdate.bind(this)));
+        if (this.config.topicGetOutletInUse) {
+            topicHandlers.push(makeHandler(this.config.topicGetOutletInUse, this.onInUseUpdate.bind(this)));
         }
         return topicHandlers;
     }
@@ -29,23 +27,23 @@ export class OutletAccessory extends OnOffAccessory {
         if (!this.assert('valueOutletInUse')) {
             return;
         }
-        const inUse = value === toPrimitive(this.outletConfig.valueOutletInUse);
+        const inUse = value === toPrimitive(this.config.valueOutletInUse);
         if (inUse === this.inUse) {
             return;
         }
         this.inUse = inUse;
         this.accessoryService.updateCharacteristic(this.Characteristic.OutletInUse, this.inUse);
-        this.logIfDesired(this.stringForInUse(this.inUse), this.name);
+        this.logIfDesired(this.stringForInUse(this.inUse));
     }
     async setInUse(value) {
         if (!this.assert('topicSetOutletInUse', 'valueOutletInUse', 'valueOutletNotInUse')) {
             return;
         }
-        const inUse = value ? this.outletConfig.valueOutletInUse : this.outletConfig.valueOutletNotInUse;
+        const inUse = value ? this.config.valueOutletInUse : this.config.valueOutletNotInUse;
         this.inUse = value;
-        this.logIfDesired(this.stringForInUse(this.inUse, true), this.name);
+        this.logIfDesired(this.stringForInUse(this.inUse, true));
         this.accessoryService.updateCharacteristic(this.Characteristic.OutletInUse, this.inUse);
-        this.publish(this.outletConfig.topicSetOutletInUse, inUse);
+        this.publish(this.config.topicSetOutletInUse, inUse);
     }
     stringForInUse(inUse, future = false) {
         if (inUse) {

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

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

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,YACE,OAAoB,EACpB,cAAkC,EAClC,SAA4B,EAC5B,MAAoB,EACpB,GAAQ;QAER,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,27 @@
+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';
+import { TopicHandler } from './abstract/base.js';
+export declare class SecuritySystemAccessory extends StatusActiveAccessory<SecuritySystemConfig> {
+    private currentState;
+    private targetState;
+    private isTampered;
+    private hasStatusFault;
+    private readonly STATE_MAP;
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: SecuritySystemConfig, log: Log);
+    protected getAccessoryService(): Service;
+    get topicHandlers(): TopicHandler[];
+    private getCurrentState;
+    private getTargetState;
+    private getIsTampered;
+    private getHasStatusFault;
+    private onCurrentStateUpdate;
+    private onTargetStateUpdate;
+    private onTamperedUpdate;
+    private onStatusFaultUpdate;
+    private setTargetState;
+    private fromCVState;
+    private toCVState;
+    private stateStringForCV;
+}