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

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to homebridge-dummy will be documented in this file.
 
-## 1.2.0-beta.0 (2025-08-26)
+## 1.2.0-beta.1 (2025-08-??)
 
 ### HELP NEEDED! (no coding experience required)
 
@@ -11,8 +11,18 @@ Would you like to see Homebridge Easy MQTT in your language? Please consider [ge
 ### Added
 - Security System accessory type
 
+### Fixed
+- Allow raw strings in mqtt messages
+- Changing accessory type cleans up old Homebridge accessories
+
 ### Changed
 - Updated dev dependencies
+- Significant under-the-hood refactoring to speed future development
+- Removed in-use setter topic for outlet since it is not user modifyable
+- Deprecated inconsistent LockMechanism topic names
+    - topicGetLockCurrentState -> topicGetCurrentLockState
+    - topicGetLockTargetState -> topicGetTargetLockState
+    - topicSetTargetState -> topicSetTargetLockState
 
 ## 1.1.0 (2025-08-20)
 

package/README.md

@@ -50,9 +50,9 @@ Using the Homebridge Config UI is the easiest way to set up this plugin. However
         "options": "string"
       },
       "topicGetStatusActive": "string",
-      "topicGetLockCurrentState": "string",
-      "topicGetLockTargetState": "string",
-      "topicSetTargetState": "string",
+      "topicGetCurrentLockState": "string",
+      "topicGetTargetLockState": "string",
+      "topicSetTargetLockState": "string",
       "topicGetOn": "string",
       "topicSetOn": "string",
       "valueStatusActive": "string",
@@ -107,15 +107,14 @@ You may define topics using a JSONPath dot notation to assist the parser in find
   - `topicSetSaturation` - (Optional) For setting the saturation setting of the lightbulb
 
 - LockMechanism
-  - `topicGetLockCurrentState` - The current state of the lock, i.e. locked/unlocked
-  - `topicGetLockTargetState` - The target (i.e. desired) state of the lock
-  - `topicSetTargetState` - For setting the target (i.e. desired) state of the lock
+  - `topicGetCurrentLockState` - The current state of the lock, i.e. locked/unlocked
+  - `topicGetTargetLockState` - The target (i.e. desired) state of the lock
+  - `topicSetTargetLockState` - For setting the target (i.e. desired) state of the lock
 
 - Outlet
   - `topicGetOn` - The current state of the outlet, i.e. on/off
   - `topicSetOn` - For setting the state of the outlet
   - `topicGetOutletInUse` - (Optional) Whether or not the outlet is currently being used
-  - `topicSetOutletInUse` - (Optional) For setting whether the outlet is currently being used
 
 - SecuitySystem
   - `topicGetCurrentSecurityState` — The current state of the system
@@ -152,7 +151,6 @@ As with Topics, you will need to populate the appropriate values based on the ty
   - `valueOn` - Turned on, e.g. "true", or "1", or "On"
   - `valueOff` - Turned off, e.g. "false", or "0", or "Off"
   - `valueOutletInUse` - Currently being used, e.g. "true", or "1", or "On"
-  - `valueOutletNotInUse` - Currently not being used, e.g. "false", or "0", or "Off"
 
 - SecuritySystem
   - `valueArmStay` — (Optional) system armed in stay mode, e.g. "SA" or "stay"

package/config.schema.json

@@ -122,17 +122,17 @@
               "type": "string",
               "title": "${config.title.topicSetSaturation}"
             },
-            "topicGetLockCurrentState": {
+            "topicGetCurrentLockState": {
               "type": "string",
-              "title": "${config.title.topicGetLockCurrentState}"
+              "title": "${config.title.topicGetCurrentLockState}"
             },
-            "topicGetLockTargetState": {
+            "topicGetTargetLockState": {
               "type": "string",
-              "title": "${config.title.topicGetLockTargetState}"
+              "title": "${config.title.topicGetTargetLockState}"
             },
-            "topicSetTargetState": {
+            "topicSetTargetLockState": {
               "type": "string",
-              "title": "${config.title.topicSetTargetState}"
+              "title": "${config.title.topicSetTargetLockState}"
             },
             "topicGetOn": {
               "type": "string",
@@ -146,10 +146,6 @@
               "type": "string",
               "title": "${config.title.topicGetOutletInUse}"
             },
-            "topicSetOutletInUse": {
-              "type": "string",
-              "title": "${config.title.topicSetOutletInUse}"
-            },
             "topicGetCurrentTemperature": {
               "type": "string",
               "title": "${config.title.topicGetCurrentTemperature}"
@@ -176,8 +172,7 @@
             },
             "valueStatusActive": {
               "type": "string",
-              "title": "${config.title.valueStatusActive}",
-              "description": "${config.description.valueStatusActive}"
+              "title": "${config.title.valueStatusActive}"
             },
             "valueLockStateSecured": {
               "type": "string",
@@ -203,10 +198,6 @@
               "type": "string",
               "title": "${config.title.valueOutletInUse}"
             },
-            "valueOutletNotInUse": {
-              "type": "string",
-              "title": "${config.title.valueOutletNotInUse}"
-            },
             "valueArmStay": {
               "type": "string",
               "title": "${config.title.valueArmStay}"
@@ -344,9 +335,9 @@
                   "type": "fieldset",
                   "notitle": "true",
                   "items": [
-                    "accessories[].topicGetLockCurrentState",
-                    "accessories[].topicGetLockTargetState",
-                    "accessories[].topicSetTargetState"
+                    "accessories[].topicGetCurrentLockState",
+                    "accessories[].topicGetTargetLockState",
+                    "accessories[].topicSetTargetLockState"
                   ],
                   "condition": {
                     "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LockMechanism';"
@@ -384,8 +375,7 @@
                   "type": "fieldset",
                   "notitle": "true",
                   "items": [
-                    "accessories[].topicGetOutletInUse",
-                    "accessories[].topicSetOutletInUse"
+                    "accessories[].topicGetOutletInUse"
                   ],
                   "condition": {
                     "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Outlet';"
@@ -485,10 +475,6 @@
                     {
                       "key": "accessories[].valueOutletInUse",
                       "flex": "0 0 25%"
-                    },
-                    {
-                      "key": "accessories[].valueOutletNotInUse",
-                      "flex": "0 0 25%"
                     }
                   ]
                 },
@@ -550,7 +536,7 @@
                   "items": [
                     {
                       "key": "accessories[].valueStatusActive",
-                      "flex": "0 0 50%"
+                      "flex": "0 0 25%"
                     }
                   ]
                 }

package/dist/accessory/abstract/base.d.ts

@@ -1,12 +1,7 @@
-import { PlatformAccessory } from 'homebridge';
+import { Characteristic, CharacteristicGetHandler, CharacteristicSetHandler, CharacteristicValue, PlatformAccessory, PrimitiveTypes, Service, WithUUID } from 'homebridge';
+import { CharacteristicKey } from '../../model/enums.js';
 import { AccessoryConfig, CharacteristicType, ServiceType } from '../../model/types.js';
 import { Log } from '../../tools/log.js';
-import { Primitive } from '../../tools/primitive.js';
-export type TopicHandler = {
-    topic: string;
-    handler: ((topic: string, value: Primitive) => Promise<void>);
-};
-export declare function makeHandler(topic: string, handler: (topic: string, value: Primitive) => Promise<void>): TopicHandler;
 export declare abstract class MQTTAccessory<C extends AccessoryConfig> {
     protected readonly Service: ServiceType;
     protected readonly Characteristic: CharacteristicType;
@@ -14,12 +9,27 @@ export declare abstract class MQTTAccessory<C extends AccessoryConfig> {
     protected readonly config: C;
     protected readonly log: Log;
     private readonly mqttClient;
+    private readonly properties;
+    private readonly topicHandlers;
+    protected readonly accessoryService: Service;
     constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, caller: string);
     private onMQTTConnect;
-    protected abstract get topicHandlers(): TopicHandler[];
+    protected abstract getAccessoryService(): Service;
+    protected bind(constructor: WithUUID<{
+        new (): Characteristic;
+    }>, getTopic: keyof C, getHandler: CharacteristicGetHandler, setTopic?: keyof C | undefined, setHandler?: CharacteristicSetHandler | undefined): void;
+    protected abstract addTopicHandlers(): void;
+    protected addTopicHandler(topicKey: keyof C, handler: (topic: string, value: PrimitiveTypes) => Promise<void>, assert?: boolean): void;
     protected get name(): string;
-    protected publish(topic: string, value: Primitive): void;
+    protected getRawValue(property: keyof C, assert?: boolean): string | undefined;
+    protected getPrimitiveValue(property: keyof C, assert?: boolean): PrimitiveTypes | undefined;
+    protected publish(topic: string, value: PrimitiveTypes): void;
     teardown(): void;
-    protected assert(...keys: (keyof any)[]): boolean;
+    protected get(key: CharacteristicKey): CharacteristicValue;
+    protected set(key: CharacteristicKey, value: CharacteristicValue): void;
+    protected assert(...keys: (keyof C)[]): boolean;
+    protected assertNumber(value: PrimitiveTypes, error: string): boolean;
+    protected onUpdate(key: CharacteristicKey, value: CharacteristicValue, logString?: string | undefined): boolean;
+    protected onSet(key: CharacteristicKey, value: CharacteristicValue, publish: PrimitiveTypes, topic: keyof C, logString: string | undefined): void;
     protected logIfDesired(message: string, ...parameters: string[]): void;
 }

package/dist/accessory/abstract/base.js

@@ -1,10 +1,9 @@
 import { PLATFORM_NAME } from '../../homebridge/settings.js';
+import { AccessoryType } from '../../model/enums.js';
 import { MQTT } from '../../model/mqtt.js';
 import getVersion from '../../tools/version.js';
 import { assert } from '../../tools/validation.js';
-export function makeHandler(topic, handler) {
-    return { topic, handler };
-}
+import { toPrimitive } from '../../tools/primitive.js';
 export class MQTTAccessory {
     Service;
     Characteristic;
@@ -12,6 +11,9 @@ export class MQTTAccessory {
     config;
     log;
     mqttClient;
+    properties = {};
+    topicHandlers = [];
+    accessoryService;
     constructor(Service, Characteristic, accessory, config, log, caller) {
         this.Service = Service;
         this.Characteristic = Characteristic;
@@ -30,25 +32,111 @@ export class MQTTAccessory {
             .setCharacteristic(Characteristic.SerialNumber, config.info.serialNumber ?? `${PLATFORM_NAME}:${name}`)
             .setCharacteristic(Characteristic.Model, config.info.model ?? caller)
             .setCharacteristic(Characteristic.FirmwareRevision, config.info.version ?? getVersion());
+        this.accessoryService = this.getAccessoryService();
+        for (const type of Object.values(AccessoryType)) {
+            const existingService = accessory.getService(Service[type]);
+            if (existingService && type !== config.info.type) {
+                accessory.removeService(existingService);
+            }
+        }
+        this.addTopicHandlers();
     }
     async onMQTTConnect() {
         this.topicHandlers.forEach(topicHandler => {
             this.mqttClient?.subscribe(topicHandler.topic, topicHandler.handler);
         });
     }
+    bind(constructor, getTopic, getHandler, setTopic = undefined, setHandler = undefined) {
+        if (this.config[getTopic] === undefined && (setTopic === undefined || setHandler === undefined || this.config[setTopic] !== undefined)) {
+            for (const characteristic of this.accessoryService.characteristics) {
+                if (characteristic.UUID === constructor.UUID) {
+                    this.accessoryService.removeCharacteristic(characteristic);
+                    break;
+                }
+            }
+            return;
+        }
+        const characteristic = this.accessoryService.getCharacteristic(constructor);
+        if (this.config[getTopic] !== undefined) {
+            characteristic.onGet(getHandler);
+        }
+        if (setTopic !== undefined && setHandler !== undefined && this.config[setTopic] !== undefined) {
+            characteristic.onSet(setHandler);
+        }
+    }
+    addTopicHandler(topicKey, handler, assert = true) {
+        if (!topicKey.toString().startsWith('topic')) {
+            throw new Error(`Trying to fetch topic with unexpected property name '${topicKey.toString()}'`);
+        }
+        if (assert && !this.assert(topicKey)) {
+            return;
+        }
+        const topic = this.config[topicKey];
+        if (topic === undefined) {
+            return;
+        }
+        this.topicHandlers.push({ topic: topic, handler });
+    }
     get name() {
         return this.config.info.name;
     }
+    getRawValue(property, assert = true) {
+        if (!property.toString().startsWith('value')) {
+            throw new Error(`Trying to fetch value with unexpected property name '${property.toString()}'`);
+        }
+        if (assert && !this.assert(property)) {
+            return;
+        }
+        return this.config[property];
+    }
+    getPrimitiveValue(property, assert = true) {
+        const stringValue = this.getRawValue(property, assert);
+        return stringValue ? toPrimitive(stringValue) : undefined;
+    }
     publish(topic, value) {
         this.mqttClient?.publish(topic, value);
     }
     teardown() {
         this.mqttClient?.teardown();
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    get(key) {
+        return this.properties[key];
+    }
+    set(key, value) {
+        this.properties[key] = value;
+    }
     assert(...keys) {
         return assert(this.log, this.name, this.config, ...keys);
     }
+    assertNumber(value, error) {
+        if (typeof value === 'number') {
+            return true;
+        }
+        this.log.error(error, this.name, `'${value}'`);
+        return false;
+    }
+    onUpdate(key, value, logString = undefined) {
+        if (value === this.get(key)) {
+            return false;
+        }
+        this.set(key, value);
+        this.accessoryService.updateCharacteristic(this.Characteristic[key], value);
+        if (logString) {
+            this.logIfDesired(logString);
+        }
+        return true;
+    }
+    onSet(key, value, publish, topic, logString) {
+        if (!this.assert(topic)) {
+            return;
+        }
+        if (logString && value !== this.get(key)) {
+            this.logIfDesired(logString);
+        }
+        this.set(key, value);
+        this.accessoryService.updateCharacteristic(this.Characteristic[key], value);
+        this.publish(this.config[topic], publish);
+    }
     logIfDesired(message, ...parameters) {
         if (this.config.disableLogging) {
             return;

package/dist/accessory/abstract/base.js.map

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

package/dist/accessory/abstract/statusActive.d.ts

@@ -1,13 +1,10 @@
-import { PlatformAccessory, Service } from 'homebridge';
-import { MQTTAccessory, TopicHandler } from './base.js';
+import { PlatformAccessory } from 'homebridge';
+import { MQTTAccessory } from './base.js';
 import { CharacteristicType, StatusActiveConfig, ServiceType } from '../../model/types.js';
 import { Log } from '../../tools/log.js';
 export declare abstract class StatusActiveAccessory<C extends StatusActiveConfig = StatusActiveConfig> extends MQTTAccessory<C> {
-    protected readonly accessoryService: Service;
-    private statusActive;
     constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, className: string);
-    protected abstract getAccessoryService(): Service;
-    protected get topicHandlers(): TopicHandler[];
-    private onStatusActiveUpdate;
+    protected addTopicHandlers(): void;
     private getStatusActive;
+    private onStatusActiveUpdate;
 }

package/dist/accessory/abstract/statusActive.js

@@ -1,39 +1,29 @@
-import { makeHandler, MQTTAccessory } from './base.js';
+import { MQTTAccessory } from './base.js';
 import { strings } from '../../i18n/i18n.js';
-import { toPrimitive } from '../../tools/primitive.js';
+import { CharacteristicKey } from '../../model/enums.js';
 export class StatusActiveAccessory extends MQTTAccessory {
-    accessoryService;
-    statusActive = true;
     constructor(Service, Characteristic, accessory, config, log, className) {
         super(Service, Characteristic, accessory, config, log, className);
-        this.accessoryService = this.getAccessoryService();
-        this.accessoryService.getCharacteristic(Characteristic.StatusActive)
-            .onGet(this.getStatusActive.bind(this));
+        this.set(CharacteristicKey.StatusActive, true);
+        this.bind(Characteristic.StatusActive, 'topicGetStatusActive', this.getStatusActive.bind(this));
     }
-    get topicHandlers() {
-        return [
-            ...(this.config.topicGetStatusActive ? [makeHandler(this.config.topicGetStatusActive, this.onStatusActiveUpdate.bind(this))] : []),
-        ];
+    addTopicHandlers() {
+        this.addTopicHandler('topicGetStatusActive', this.onStatusActiveUpdate.bind(this), false);
+    }
+    async getStatusActive() {
+        return this.get(CharacteristicKey.StatusActive);
     }
     async onStatusActiveUpdate(topic, value) {
-        if (!this.assert('valueStatusActive')) {
-            return;
-        }
-        const statusActive = value === toPrimitive(this.config.valueStatusActive);
-        if (statusActive === this.statusActive) {
+        const statusActive = value === this.getPrimitiveValue('valueStatusActive');
+        if (!this.onUpdate(CharacteristicKey.StatusActive, statusActive)) {
             return;
         }
-        this.statusActive = statusActive;
-        this.accessoryService.updateCharacteristic(this.Characteristic.StatusActive, this.statusActive);
-        if (this.statusActive) {
+        if (statusActive) {
             this.logIfDesired(strings.accessory.statusActive);
         }
         else {
             this.log.warning(strings.accessory.statusInactive, this.name);
         }
     }
-    async getStatusActive() {
-        return this.statusActive;
-    }
 }
 //# sourceMappingURL=statusActive.js.map

package/dist/accessory/abstract/statusActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"statusActive.js","sourceRoot":"","sources":["../../../src/accessory/abstract/statusActive.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAgB,MAAM,WAAW,CAAC;AAErE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAK7C,OAAO,EAAa,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAElE,MAAM,OAAgB,qBAAyE,SAAQ,aAAgB;IAClG,gBAAgB,CAAU;IAErC,YAAY,GAAwB,IAAI,CAAC;IAEjD,YACE,OAAoB,EACpB,cAAkC,EAClC,SAA4B,EAC5B,MAAS,EACT,GAAQ,EACR,SAAiB;QAEjB,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAEnD,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,cAAc,CAAC,YAAY,CAAC;aACjE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5C,CAAC;IAID,IAAc,aAAa;QACzB,OAAO;YACL,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,EAAE,CAAC;SAClI,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,KAAa,EAAE,KAAgB;QAEhE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,KAAK,KAAK,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC1E,IAAI,YAAY,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YACvC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAEhG,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF"}
+{"version":3,"file":"statusActive.js","sourceRoot":"","sources":["../../../src/accessory/abstract/statusActive.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,OAAgB,qBAAyE,SAAQ,aAAgB;IAErH,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAS,EAAE,GAAQ,EAAE,SAAiB;QACxI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAE/C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,sBAAsB,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClG,CAAC;IAES,gBAAgB;QACxB,IAAI,CAAC,eAAe,CAAC,sBAAsB,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5F,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,KAAa,EAAE,KAAqB;QAErE,MAAM,YAAY,GAAG,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QAC3E,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;YACjE,OAAO;QACT,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;CACF"}

package/dist/accessory/lock.d.ts

@@ -1,21 +1,18 @@
 import { PlatformAccessory, Service } from 'homebridge';
-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<LockMechanismConfig> {
-    private currentState;
-    private targetState;
     constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: LockMechanismConfig, log: Log);
     protected getAccessoryService(): Service;
-    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,119 +1,110 @@
-import { makeHandler } from './abstract/base.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 {
-    currentState;
-    targetState;
     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.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.config.topicGetLockCurrentState, this.onCurrentStateUpdate.bind(this)));
-        topicHandlers.push(makeHandler(this.config.topicGetLockTargetState, this.onTargetStateUpdate.bind(this)));
-        return topicHandlers;
+    addTopicHandlers() {
+        super.addTopicHandlers();
+        if (this.config.topicGetLockCurrentState !== undefined && this.config.topicGetCurrentLockState === undefined) {
+            this.addTopicHandler('topicGetLockCurrentState', this.onCurrentStateUpdate.bind(this));
+        }
+        else {
+            this.addTopicHandler('topicGetCurrentLockState', this.onCurrentStateUpdate.bind(this));
+        }
+        if (this.config.topicGetLockTargetState !== undefined && this.config.topicGetTargetLockState === undefined) {
+            this.addTopicHandler('topicGetLockTargetState', this.onCurrentStateUpdate.bind(this));
+        }
+        else {
+            this.addTopicHandler('topicGetTargetLockState', this.onCurrentStateUpdate.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.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.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.targetState = value;
-        this.accessoryService.updateCharacteristic(this.Characteristic.LockTargetState, this.targetState);
-        this.publish(this.config.topicSetTargetState, target);
-    }
-    valueFromTargetState(value) {
-        if (value === undefined || !this.assert('valueLockStateSecured', 'valueLockStateUnsecured')) {
-            return undefined;
+        if (this.config.topicSetTargetState !== undefined && this.config.topicSetTargetLockState === undefined) {
+            this.onSet(CharacteristicKey.LockTargetState, value, target, 'topicSetTargetState', this.stringForState(value, true));
         }
-        switch (value) {
-            case this.Characteristic.LockTargetState.SECURED:
-                return toPrimitive(this.config.valueLockStateSecured);
-            case this.Characteristic.LockTargetState.UNSECURED:
-                return toPrimitive(this.config.valueLockStateUnsecured);
-            default:
-                return undefined;
+        else {
+            this.onSet(CharacteristicKey.LockTargetState, value, target, 'topicSetTargetLockState', 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.config.valueLockStateSecured):
+            case this.getPrimitiveValue('valueLockStateSecured'):
                 return this.Characteristic.LockCurrentState.SECURED;
-            case toPrimitive(this.config.valueLockStateUnsecured):
+            case this.getPrimitiveValue('valueLockStateUnsecured'):
                 return this.Characteristic.LockCurrentState.UNSECURED;
-            case toPrimitive(this.config.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.config.valueLockStateUnsecured):
+            case this.getPrimitiveValue('valueLockStateUnsecured'):
                 return this.Characteristic.LockTargetState.UNSECURED;
-            case toPrimitive(this.config.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: