homebridge-easy-mqtt 1.4.1-beta.0 → 1.5.0-beta.0

package/dist/accessory/climate/temperatureControl.d.ts

@@ -1,13 +1,13 @@
-import { CharacteristicValue, PlatformAccessory } from 'homebridge';
+import { CharacteristicValue } from 'homebridge';
 import { BaseAccessory } from '../abstract/base.js';
-import { CharacteristicType, TemperatureControlConfig, ServiceType } from '../../model/types.js';
-import { Log } from '../../tools/log.js';
+import { HKCharacteristicKey } from '../../model/enums.js';
+import { MQTTAccessoryDependency, TemperatureControlConfig } from '../../model/types.js';
 import { TemperatureUnits } from '../../tools/temperature.js';
 export declare const DEFAULT_TEMPERATURE = 10;
 export declare abstract class TemperatureControlAccessory<C extends TemperatureControlConfig = TemperatureControlConfig> extends BaseAccessory<C> {
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, isGrouped: boolean);
+    constructor(dependency: MQTTAccessoryDependency<C>);
     protected setupTemperatureControlCharacteristics(): void;
     protected get temperatureUnits(): TemperatureUnits;
-    private bindOnSetThreshold;
+    protected bindOnSetTemperature(charKey: HKCharacteristicKey, topic: keyof C, logTemplate: string): (value: CharacteristicValue) => Promise<void>;
     protected temperatureFromCV(value: CharacteristicValue): number;
 }

package/dist/accessory/climate/temperatureControl.js

@@ -1,26 +1,26 @@
 import { BaseAccessory } from '../abstract/base.js';
 import { strings } from '../../i18n/i18n.js';
-import { CharacteristicKey } from '../../model/enums.js';
+import { HKCharacteristicKey } from '../../model/enums.js';
 import { fromCelsius, temperatureUnits, TemperatureUnits } from '../../tools/temperature.js';
 export const DEFAULT_TEMPERATURE = 10;
 const DEFAULT_COOLING_THRESHOLD = 25;
 const DEFAULT_HEATING_THRESHOLD = 20;
 export class TemperatureControlAccessory extends BaseAccessory {
-    constructor(Service, Characteristic, accessory, config, log, isGrouped) {
-        super(Service, Characteristic, accessory, config, log, isGrouped);
+    constructor(dependency) {
+        super(dependency);
     }
     setupTemperatureControlCharacteristics() {
         const temperatureDisplayUnits = this.temperatureUnits === TemperatureUnits.FAHRENHEIT
             ? this.Characteristic.TemperatureDisplayUnits.FAHRENHEIT : this.Characteristic.TemperatureDisplayUnits.CELSIUS;
-        this.setCharacteristicValue(CharacteristicKey.TemperatureDisplayUnits, temperatureDisplayUnits);
-        this.setup(CharacteristicKey.CurrentTemperature, DEFAULT_TEMPERATURE, 'topicGetCurrentTemperature', this.bindTemperatureUpdate(this.config, CharacteristicKey.CurrentTemperature, strings.climate.temperatureUpdate), true);
-        this.setup(CharacteristicKey.CoolingThresholdTemperature, DEFAULT_COOLING_THRESHOLD, 'topicGetCoolingThresholdTemperature', this.bindTemperatureUpdate(this.config, CharacteristicKey.CoolingThresholdTemperature, strings.climate.coolingThreshold), false, 'topicSetCoolingThresholdTemperature', this.bindOnSetThreshold(CharacteristicKey.CoolingThresholdTemperature, 'topicSetCoolingThresholdTemperature', strings.climate.coolingThresholdFuture));
-        this.setup(CharacteristicKey.HeatingThresholdTemperature, DEFAULT_HEATING_THRESHOLD, 'topicGetHeatingThresholdTemperature', this.bindTemperatureUpdate(this.config, CharacteristicKey.HeatingThresholdTemperature, strings.climate.heatingThreshold), false, 'topicSetHeatingThresholdTemperature', this.bindOnSetThreshold(CharacteristicKey.HeatingThresholdTemperature, 'topicSetHeatingThresholdTemperature', strings.climate.heatingThresholdFuture));
+        this.setCharacteristicValue(HKCharacteristicKey.TemperatureDisplayUnits, temperatureDisplayUnits);
+        this.setup(HKCharacteristicKey.CurrentTemperature, DEFAULT_TEMPERATURE, 'topicGetCurrentTemperature', this.bindOnUpdateTemperature(this.config, HKCharacteristicKey.CurrentTemperature, strings.climate.temperatureUpdate), true);
+        this.setup(HKCharacteristicKey.CoolingThresholdTemperature, DEFAULT_COOLING_THRESHOLD, 'topicGetCoolingThresholdTemperature', this.bindOnUpdateTemperature(this.config, HKCharacteristicKey.CoolingThresholdTemperature, strings.climate.coolingThreshold), false, 'topicSetCoolingThresholdTemperature', this.bindOnSetTemperature(HKCharacteristicKey.CoolingThresholdTemperature, 'topicSetCoolingThresholdTemperature', strings.climate.coolingThresholdFuture));
+        this.setup(HKCharacteristicKey.HeatingThresholdTemperature, DEFAULT_HEATING_THRESHOLD, 'topicGetHeatingThresholdTemperature', this.bindOnUpdateTemperature(this.config, HKCharacteristicKey.HeatingThresholdTemperature, strings.climate.heatingThreshold), false, 'topicSetHeatingThresholdTemperature', this.bindOnSetTemperature(HKCharacteristicKey.HeatingThresholdTemperature, 'topicSetHeatingThresholdTemperature', strings.climate.heatingThresholdFuture));
     }
     get temperatureUnits() {
         return temperatureUnits(this.config.temperatureUnits);
     }
-    bindOnSetThreshold(charKey, topic, logTemplate) {
+    bindOnSetTemperature(charKey, topic, logTemplate) {
         return (async (value) => {
             const temperature = this.temperatureFromCV(value);
             const logString = logTemplate.replace('%d°%s', `${temperature}°${this.temperatureUnits}`);

package/dist/accessory/climate/temperatureControl.js.map

@@ -1 +1 @@
-{"version":3,"file":"temperatureControl.js","sourceRoot":"","sources":["../../../src/accessory/climate/temperatureControl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIzD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE7F,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAE,CAAC;AACtC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AACrC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAErC,MAAM,OAAgB,2BAA2F,SAAQ,aAAgB;IAEvI,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAS,EAAE,GAAQ,EAAE,SAAkB;QACzI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;IACpE,CAAC;IAES,sCAAsC;QAE9C,MAAM,uBAAuB,GAAG,IAAI,CAAC,gBAAgB,KAAK,gBAAgB,CAAC,UAAU;YACnF,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,OAAO,CAAC;QACjH,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,uBAAuB,CAAC,CAAC;QAEhG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,4BAA4B,EAChG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,CAAC,kBAAkB,EAAE,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,CAAC;QAE1H,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,2BAA2B,EAAE,yBAAyB,EACjF,qCAAqC,EACrC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,CAAC,2BAA2B,EAAE,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAC/H,qCAAqC,EACrC,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,2BAA2B,EAAE,qCAAqC,EAAE,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CACtJ,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,2BAA2B,EAAE,yBAAyB,EACjF,qCAAqC,EACrC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,CAAC,2BAA2B,EAAE,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAC/H,qCAAqC,EACrC,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,2BAA2B,EAAE,qCAAqC,EAAE,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CACtJ,CAAC;IACJ,CAAC;IAED,IAAc,gBAAgB;QAC5B,OAAO,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACxD,CAAC;IAEO,kBAAkB,CAAC,OAA0B,EAAE,KAAqC,EAAE,WAAmB;QAC/G,OAAO,CAAC,KAAK,EAAE,KAA0B,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAClD,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,WAAW,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;YAC1F,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAES,iBAAiB,CAAC,KAA0B;QACpD,MAAM,kBAAkB,GAAG,KAAe,CAAC;QAC3C,OAAO,WAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAChE,CAAC;CACF"}
+{"version":3,"file":"temperatureControl.js","sourceRoot":"","sources":["../../../src/accessory/climate/temperatureControl.ts"],"names":[],"mappings":"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"}

package/dist/accessory/climate/thermostat.d.ts

@@ -1,17 +1,7 @@
-import { PlatformAccessory } from 'homebridge';
 import { TemperatureControlAccessory } from './temperatureControl.js';
 import { AccessoryType } from '../../model/enums.js';
-import { CharacteristicType, ServiceType, ThermostatConfig } from '../../model/types.js';
-import { Log } from '../../tools/log.js';
+import { MQTTAccessoryDependency, ThermostatConfig } from '../../model/types.js';
 export declare class ThermostatAccessory extends TemperatureControlAccessory<ThermostatConfig> {
-    private readonly STATE_MAP;
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: ThermostatConfig, log: Log, isGrouped: boolean);
     protected getAccessoryType(): AccessoryType;
-    private bindOnStateUpdate;
-    private onSetTargetState;
-    private onSetTemperature;
-    private onSetHumidity;
-    private fromCVState;
-    private toCVState;
-    private stateStringForCV;
+    constructor(dependency: MQTTAccessoryDependency<ThermostatConfig>);
 }

package/dist/accessory/climate/thermostat.js

@@ -1,97 +1,44 @@
 import { TemperatureControlAccessory, DEFAULT_TEMPERATURE } from './temperatureControl.js';
 import { strings } from '../../i18n/i18n.js';
-import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
+import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
+import { HistoryType } from '../../model/history.js';
 export class ThermostatAccessory extends TemperatureControlAccessory {
-    STATE_MAP;
-    constructor(Service, Characteristic, accessory, config, log, isGrouped) {
-        super(Service, Characteristic, accessory, config, log, isGrouped);
+    getAccessoryType() {
+        return AccessoryType.Thermostat;
+    }
+    constructor(dependency) {
+        super(dependency);
         this.setupTemperatureControlCharacteristics();
-        this.STATE_MAP = new Map([
-            ['valueModeOff', Characteristic.TargetHeatingCoolingState.OFF],
-            ['valueModeHeat', Characteristic.TargetHeatingCoolingState.HEAT],
-            ['valueModeCool', Characteristic.TargetHeatingCoolingState.COOL],
-            ['valueModeAuto', Characteristic.TargetHeatingCoolingState.AUTO],
+        const stateMap = new Map([
+            ['valueModeOff', dependency.Characteristic.TargetHeatingCoolingState.OFF],
+            ['valueModeHeat', dependency.Characteristic.TargetHeatingCoolingState.HEAT],
+            ['valueModeCool', dependency.Characteristic.TargetHeatingCoolingState.COOL],
+            ['valueModeAuto', dependency.Characteristic.TargetHeatingCoolingState.AUTO],
         ]);
-        const validTargetStates = Array.from(this.STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
+        const validTargetStates = Array.from(stateMap.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
         if (validTargetStates.length === 0 || (validTargetStates.length === 1 && validTargetStates[0] === 'valueModeAuto')) {
             this.log.error(strings.thermostat.noStateValues, this.name);
             return;
         }
-        this.setup(CharacteristicKey.TargetHeatingCoolingState, this.STATE_MAP.get(validTargetStates[0]), 'topicGetTargetHeatingCoolingState', this.bindOnStateUpdate(CharacteristicKey.TargetHeatingCoolingState, true), true, 'topicSetTargetHeatingCoolingState', this.onSetTargetState.bind(this))
-            ?.setProps({ validValues: validTargetStates.map((key) => this.STATE_MAP.get(key)) });
+        const targetStrings = new Map([
+            [dependency.Characteristic.TargetHeatingCoolingState.AUTO, strings.thermostat.stateAutoFuture],
+            [dependency.Characteristic.TargetHeatingCoolingState.COOL, strings.thermostat.stateCoolFuture],
+            [dependency.Characteristic.TargetHeatingCoolingState.HEAT, strings.thermostat.stateHeatFuture],
+            [dependency.Characteristic.TargetHeatingCoolingState.OFF, strings.thermostat.stateOffFuture],
+        ]);
+        this.setup(HKCharacteristicKey.TargetHeatingCoolingState, stateMap.get(validTargetStates[0]), 'topicGetTargetHeatingCoolingState', this.bindOnUpdateState(HKCharacteristicKey.TargetHeatingCoolingState, stateMap, targetStrings, strings.thermostat.stateUnknown), true, 'topicSetTargetHeatingCoolingState', this.bindOnSetState(HKCharacteristicKey.TargetHeatingCoolingState, 'topicSetTargetHeatingCoolingState', stateMap, targetStrings, strings.thermostat.badValue))?.setProps({ validValues: validTargetStates.map((key) => stateMap.get(key)) });
+        const currentStrings = new Map([
+            [dependency.Characteristic.CurrentHeatingCoolingState.COOL, strings.thermostat.stateCool],
+            [dependency.Characteristic.CurrentHeatingCoolingState.HEAT, strings.thermostat.stateHeat],
+            [dependency.Characteristic.CurrentHeatingCoolingState.OFF, strings.thermostat.stateOff],
+        ]);
         const validCurrentStates = validTargetStates.filter((key) => key !== 'valueModeAuto');
-        this.setup(CharacteristicKey.CurrentHeatingCoolingState, this.STATE_MAP.get(validCurrentStates[0]), 'topicGetCurrentHeatingCoolingState', this.bindOnStateUpdate(CharacteristicKey.CurrentHeatingCoolingState), true)
-            ?.setProps({ validValues: validCurrentStates.map((key) => this.STATE_MAP.get(key)) });
-        this.setup(CharacteristicKey.TargetTemperature, DEFAULT_TEMPERATURE, 'topicGetTargetTemperature', this.bindTemperatureUpdate(config, CharacteristicKey.TargetTemperature, strings.thermostat.temperatureTarget), true, 'topicSetTargetTemperature', this.onSetTemperature.bind(this));
-        this.setup(CharacteristicKey.CurrentRelativeHumidity, 0, 'topicGetCurrentRelativeHumidity', this.bindOnUpdateNumeric(CharacteristicKey.CurrentRelativeHumidity, strings.climate.humidityUpdate), false);
-        this.setup(CharacteristicKey.TargetRelativeHumidity, 0, 'topicGetTargetRelativeHumidity', this.bindOnUpdateNumeric(CharacteristicKey.TargetRelativeHumidity, strings.thermostat.humidityFuture), false, 'topicSetTargetRelativeHumidity', this.onSetHumidity.bind(this));
-    }
-    getAccessoryType() {
-        return AccessoryType.Thermostat;
-    }
-    bindOnStateUpdate(charKey, future = false) {
-        return (async (_topic, value) => {
-            const state = this.toCVState(value);
-            if (state === undefined) {
-                return;
-            }
-            this.onUpdate(charKey, state, this.stateStringForCV(state, future));
-        }).bind(this);
-    }
-    async onSetTargetState(value) {
-        const target = this.fromCVState(value);
-        if (target === undefined) {
-            return;
-        }
-        this.onSet(CharacteristicKey.TargetHeatingCoolingState, value, target, 'topicSetTargetHeatingCoolingState', this.stateStringForCV(value, true));
-    }
-    async onSetTemperature(value) {
-        const temperature = this.temperatureFromCV(value);
-        const logString = strings.thermostat.temperatureTargetFuture.replace('%d°%s', `${temperature}°${this.temperatureUnits}`);
-        this.onSet(CharacteristicKey.TargetTemperature, value, temperature, 'topicSetTargetTemperature', logString);
-    }
-    async onSetHumidity(value) {
-        const logString = strings.thermostat.humidityFuture.replace('%d', value.toString());
-        this.onSet(CharacteristicKey.TargetRelativeHumidity, value, value, 'topicSetTargetRelativeHumidity', logString);
-    }
-    fromCVState(value) {
-        let primative = undefined;
-        this.STATE_MAP.forEach((test, key) => {
-            if (value === test) {
-                primative = this.getPrimitiveValue(key);
-            }
-        });
-        if (primative === undefined) {
-            this.log.error(strings.thermostat.badValue, this.name, `'${value}'`);
-        }
-        return primative;
-    }
-    toCVState(value) {
-        switch (value) {
-            case this.getPrimitiveValue('valueModeAuto', false):
-                return this.STATE_MAP.get('valueModeAuto');
-            case this.getPrimitiveValue('valueModeCool', false):
-                return this.STATE_MAP.get('valueModeCool');
-            case this.getPrimitiveValue('valueModeHeat', false):
-                return this.STATE_MAP.get('valueModeHeat');
-            case this.getPrimitiveValue('valueModeOff', false):
-                return this.STATE_MAP.get('valueModeOff');
-        }
-        this.logIfDesired(strings.thermostat.unknownValue, `'${value}'`);
-    }
-    stateStringForCV(state, future = false) {
-        switch (state) {
-            case this.Characteristic.TargetHeatingCoolingState.AUTO:
-                return strings.thermostat.stateAutoFuture;
-            case this.Characteristic.TargetHeatingCoolingState.COOL:
-                return future ? strings.thermostat.stateCoolFuture : strings.thermostat.stateCool;
-            case this.Characteristic.TargetHeatingCoolingState.HEAT:
-                return future ? strings.thermostat.stateHeatFuture : strings.thermostat.stateHeat;
-            case this.Characteristic.TargetHeatingCoolingState.OFF:
-                return future ? strings.thermostat.stateOffFuture : strings.thermostat.stateOff;
-            default:
-                return strings.thermostat.stateUnknown;
-        }
+        this.setup(HKCharacteristicKey.CurrentHeatingCoolingState, stateMap.get(validCurrentStates[0]), 'topicGetCurrentHeatingCoolingState', this.bindOnUpdateState(HKCharacteristicKey.CurrentHeatingCoolingState, stateMap, currentStrings, strings.thermostat.stateUnknown), true)?.setProps({ validValues: validCurrentStates.map((key) => stateMap.get(key)) });
+        this.setup(HKCharacteristicKey.TargetTemperature, DEFAULT_TEMPERATURE, 'topicGetTargetTemperature', this.bindOnUpdateTemperature(dependency.config, HKCharacteristicKey.TargetTemperature, strings.thermostat.temperatureTarget), true, 'topicSetTargetTemperature', this.bindOnSetTemperature(HKCharacteristicKey.TargetTemperature, 'topicSetTargetTemperature', strings.thermostat.temperatureTargetFuture));
+        this.setup(HKCharacteristicKey.CurrentRelativeHumidity, 0, 'topicGetCurrentRelativeHumidity', this.bindOnUpdateNumeric(HKCharacteristicKey.CurrentRelativeHumidity, strings.climate.humidityUpdate, (value) => {
+            this.recordHistory(HistoryType.WEATHER, { humidity: value });
+        }), false);
+        this.setup(HKCharacteristicKey.TargetRelativeHumidity, 0, 'topicGetTargetRelativeHumidity', this.bindOnUpdateNumeric(HKCharacteristicKey.TargetRelativeHumidity, strings.thermostat.humidityFuture), false, 'topicSetTargetRelativeHumidity', this.bindOnSetNumeric(HKCharacteristicKey.TargetRelativeHumidity, 'topicSetTargetRelativeHumidity', strings.thermostat.humidityFuture));
     }
 }
 //# sourceMappingURL=thermostat.js.map

package/dist/accessory/climate/thermostat.js.map

@@ -1 +1 @@
-{"version":3,"file":"thermostat.js","sourceRoot":"","sources":["../../../src/accessory/climate/thermostat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"thermostat.js","sourceRoot":"","sources":["../../../src/accessory/climate/thermostat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,MAAM,OAAO,mBAAoB,SAAQ,2BAA6C;IAE1E,gBAAgB;QACxB,OAAO,aAAa,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,YAAY,UAAqD;QAC/D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,sCAAsC,EAAE,CAAC;QAE9C,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAiC;YACvD,CAAC,cAAc,EAAE,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,GAAG,CAAC;YACzE,CAAC,eAAe,EAAE,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAC3E,CAAC,eAAe,EAAE,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAC3E,CAAC,eAAe,EAAE,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,CAAC;SAC5E,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;QAClH,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,EAAE,CAAC;YACnH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5D,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC;YAC5B,CAAC,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;YAC9F,CAAC,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;YAC9F,CAAC,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;YAC9F,CAAC,UAAU,CAAC,cAAc,CAAC,yBAAyB,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC;SAC7F,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,yBAAyB,EAAE,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAE,EAC3F,mCAAmC,EACnC,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,yBAAyB,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EAC/H,IAAI,EACJ,mCAAmC,EACnC,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,yBAAyB,EAAE,mCAAmC,EACpG,QAAQ,EAAE,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CACxD,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,EAAE,CAAC,CAAC;QAEjF,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC;YAC7B,CAAC,UAAU,CAAC,cAAc,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;YACzF,CAAC,UAAU,CAAC,cAAc,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;YACzF,CAAC,UAAU,CAAC,cAAc,CAAC,0BAA0B,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC;SACxF,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,eAAe,CAAC,CAAC;QACtF,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,0BAA0B,EAAE,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAE,EAC7F,oCAAoC,EACpC,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,0BAA0B,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EACjI,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,EAAE,CAAC,CAAC;QAExF,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,mBAAmB,EACnE,2BAA2B,EAC3B,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,MAAM,EAAE,mBAAmB,CAAC,iBAAiB,EAAE,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAC5H,IAAI,EACJ,2BAA2B,EAC3B,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,2BAA2B,EAAE,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAC1I,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,CAAC,EACvD,iCAAiC,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE;YACjJ,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAE,CAAC;QAChE,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAEb,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,CAAC,EACtD,gCAAgC,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,KAAK,EAChJ,gCAAgC,EAChC,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,gCAAgC,EAAE,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CACvI,CAAC;IACJ,CAAC;CACF"}

package/dist/accessory/garage.d.ts

@@ -1,17 +1,7 @@
-import { PlatformAccessory } from 'homebridge';
 import { LockMechanismAccessory } from './lock.js';
 import { AccessoryType } from '../model/enums.js';
-import { CharacteristicType, GarageDoorConfig, ServiceType } from '../model/types.js';
-import { Log } from '../tools/log.js';
+import { GarageDoorConfig, MQTTAccessoryDependency } from '../model/types.js';
 export declare class GarageDoorAccessory extends LockMechanismAccessory<GarageDoorConfig> {
-    private readonly STATE_MAP;
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: GarageDoorConfig, log: Log, isGrouped: boolean);
     protected getAccessoryType(): AccessoryType;
-    private onCurrentDoorStateUpdate;
-    private onTargetDoorStateUpdate;
-    private onSetTargetDoorState;
-    private onObstructionUpdate;
-    private toCVState;
-    private fromCVState;
-    private stateStringForCV;
+    constructor(dependency: MQTTAccessoryDependency<GarageDoorConfig>);
 }

package/dist/accessory/garage.js

@@ -1,110 +1,44 @@
 import { LockMechanismAccessory } from './lock.js';
 import { strings } from '../i18n/i18n.js';
-import { AccessoryType, CharacteristicKey } from '../model/enums.js';
+import { AccessoryType, HKCharacteristicKey } from '../model/enums.js';
 import { LogType } from '../tools/log.js';
 export class GarageDoorAccessory extends LockMechanismAccessory {
-    STATE_MAP;
-    constructor(Service, Characteristic, accessory, config, log, isGrouped) {
-        super(Service, Characteristic, accessory, config, log, isGrouped, false);
-        this.STATE_MAP = new Map([
-            ['valueDoorStateOpen', Characteristic.CurrentDoorState.OPEN],
-            ['valueDoorStateClosed', Characteristic.CurrentDoorState.CLOSED],
-            ['valueDoorStateOpening', Characteristic.CurrentDoorState.OPENING],
-            ['valueDoorStateClosing', Characteristic.CurrentDoorState.CLOSING],
-            ['valueDoorStateStopped', Characteristic.CurrentDoorState.STOPPED],
+    getAccessoryType() {
+        return AccessoryType.GarageDoorOpener;
+    }
+    constructor(dependency) {
+        super(dependency, false);
+        const stateMap = new Map([
+            ['valueDoorStateOpen', dependency.Characteristic.CurrentDoorState.OPEN],
+            ['valueDoorStateClosed', dependency.Characteristic.CurrentDoorState.CLOSED],
+            ['valueDoorStateOpening', dependency.Characteristic.CurrentDoorState.OPENING],
+            ['valueDoorStateClosing', dependency.Characteristic.CurrentDoorState.CLOSING],
+            ['valueDoorStateStopped', dependency.Characteristic.CurrentDoorState.STOPPED],
+        ]);
+        const currentStateStrings = new Map([
+            [dependency.Characteristic.CurrentDoorState.OPEN, strings.garage.stateOpen],
+            [dependency.Characteristic.CurrentDoorState.CLOSED, strings.garage.stateClosed],
+            [dependency.Characteristic.CurrentDoorState.OPENING, strings.garage.stateOpening],
+            [dependency.Characteristic.CurrentDoorState.CLOSING, strings.garage.stateClosing],
+            [dependency.Characteristic.CurrentDoorState.STOPPED, strings.garage.stateStopped],
         ]);
-        const validCurrentStates = Array.from(this.STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
+        const targetStateStrings = new Map([
+            [dependency.Characteristic.TargetDoorState.OPEN, strings.garage.stateOpenFuture],
+            [dependency.Characteristic.TargetDoorState.CLOSED, strings.garage.stateClosedFuture],
+        ]);
+        const validCurrentStates = Array.from(stateMap.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
         if (validCurrentStates.length === 0) {
             this.log.error(strings.garage.noCurrentStateValues, this.name);
             return;
         }
-        this.setup(CharacteristicKey.CurrentDoorState, Characteristic.CurrentDoorState.CLOSED, 'topicGetCurrentDoorState', this.onCurrentDoorStateUpdate.bind(this), true)?.setProps({ validValues: validCurrentStates.map((key) => this.STATE_MAP.get(key)) });
+        this.setup(HKCharacteristicKey.CurrentDoorState, dependency.Characteristic.CurrentDoorState.CLOSED, 'topicGetCurrentDoorState', this.bindOnUpdateState(HKCharacteristicKey.CurrentDoorState, stateMap, currentStateStrings, strings.garage.unknownValue), true)?.setProps({ validValues: validCurrentStates.map((key) => stateMap.get(key)) });
         const validTargetStates = validCurrentStates.filter((key) => ['valueDoorStateOpen', 'valueDoorStateClosed'].includes(key));
         if (validTargetStates.length === 0) {
             this.log.error(strings.garage.noTargetStateValues, this.name);
             return;
         }
-        this.setup(CharacteristicKey.TargetDoorState, Characteristic.TargetDoorState.CLOSED, 'topicGetTargetDoorState', this.onTargetDoorStateUpdate.bind(this), true, 'topicSetTargetDoorState', this.onSetTargetDoorState.bind(this))?.setProps({ validValues: validTargetStates.map((key) => this.STATE_MAP.get(key)) });
-        this.setup(CharacteristicKey.ObstructionDetected, false, 'topicGetObstructionDetected', this.onObstructionUpdate.bind(this), true);
-    }
-    getAccessoryType() {
-        return AccessoryType.GarageDoorOpener;
-    }
-    async onCurrentDoorStateUpdate(topic, value) {
-        const current = this.toCVState(value);
-        if (current === undefined) {
-            return;
-        }
-        this.onUpdate(CharacteristicKey.CurrentDoorState, current, this.stateStringForCV(current));
-    }
-    async onTargetDoorStateUpdate(topic, value) {
-        const target = this.toCVState(value);
-        if (target === undefined) {
-            return;
-        }
-        this.onUpdate(CharacteristicKey.TargetDoorState, target, this.stateStringForCV(target, true));
-    }
-    async onSetTargetDoorState(value) {
-        const target = this.fromCVState(value);
-        if (target === undefined) {
-            return;
-        }
-        this.onSet(CharacteristicKey.TargetDoorState, value, target, 'topicSetTargetDoorState', this.stateStringForCV(value, true));
-    }
-    async onObstructionUpdate(topic, value) {
-        const obstructed = value === this.getPrimitiveValue('valueDoorObstructed');
-        if (!this.onUpdate(CharacteristicKey.ObstructionDetected, obstructed)) {
-            return;
-        }
-        if (obstructed) {
-            this.logIfDesired(LogType.ERROR, strings.garage.obstructed);
-        }
-        else {
-            this.logIfDesired(strings.garage.unobstructed);
-        }
-    }
-    toCVState(value) {
-        switch (value) {
-            case this.getPrimitiveValue('valueDoorStateOpen', false):
-                return this.STATE_MAP.get('valueDoorStateOpen');
-            case this.getPrimitiveValue('valueDoorStateClosed', false):
-                return this.STATE_MAP.get('valueDoorStateClosed');
-            case this.getPrimitiveValue('valueDoorStateOpening', false):
-                return this.STATE_MAP.get('valueDoorStateOpening');
-            case this.getPrimitiveValue('valueDoorStateClosing', false):
-                return this.STATE_MAP.get('valueDoorStateClosing');
-            case this.getPrimitiveValue('valueDoorStateStopped', false):
-                return this.STATE_MAP.get('valueDoorStateStopped');
-        }
-        this.logIfDesired(strings.garage.unknownValue, `'${value}'`);
-    }
-    fromCVState(value) {
-        let primative = undefined;
-        this.STATE_MAP.forEach((test, key) => {
-            if (value === test) {
-                primative = this.getPrimitiveValue(key);
-            }
-        });
-        if (primative === undefined) {
-            this.log.error(strings.garage.badValue, this.name, `'${value}'`);
-        }
-        return primative;
-    }
-    stateStringForCV(state, future = false) {
-        switch (state) {
-            case this.Characteristic.CurrentDoorState.OPEN:
-                return future ? strings.garage.stateOpenFuture : strings.garage.stateOpen;
-            case this.Characteristic.CurrentDoorState.CLOSED:
-                return future ? strings.garage.stateClosedFuture : strings.garage.stateClosed;
-            case this.Characteristic.CurrentDoorState.OPENING:
-                return strings.garage.stateOpening;
-            case this.Characteristic.CurrentDoorState.CLOSING:
-                return strings.garage.stateClosing;
-            case this.Characteristic.CurrentDoorState.STOPPED:
-                return strings.garage.stateStopped;
-            default:
-                return strings.garage.stateUnknown;
-        }
+        this.setup(HKCharacteristicKey.TargetDoorState, dependency.Characteristic.TargetDoorState.CLOSED, 'topicGetTargetDoorState', this.bindOnUpdateState(HKCharacteristicKey.TargetDoorState, stateMap, targetStateStrings, strings.garage.unknownValue), true, 'topicSetTargetDoorState', this.bindOnSetState(HKCharacteristicKey.TargetDoorState, 'topicSetTargetDoorState', stateMap, targetStateStrings, strings.garage.badValue))?.setProps({ validValues: validTargetStates.map((key) => stateMap.get(key)) });
+        this.setup(HKCharacteristicKey.ObstructionDetected, false, 'topicGetObstructionDetected', this.bindOnUpdateBooleanSingle(HKCharacteristicKey.ObstructionDetected, 'valueDoorObstructed', strings.garage.obstructed, strings.garage.unobstructed, LogType.ERROR), true);
     }
 }
 //# sourceMappingURL=garage.js.map

package/dist/accessory/garage.js.map

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

package/dist/accessory/lock.d.ts

@@ -1,16 +1,10 @@
-import { PlatformAccessory } from 'homebridge';
 import { BaseAccessory } from './abstract/base.js';
 import { AccessoryType } from '../model/enums.js';
-import { CharacteristicType, LockConfig, ServiceType } from '../model/types.js';
-import { Log } from '../tools/log.js';
+import { LockConfig, MQTTAccessoryDependency } from '../model/types.js';
 export declare class LockMechanismAccessory<C extends LockConfig = LockConfig> extends BaseAccessory<C> {
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, isGrouped: boolean, requireTopics?: boolean);
     protected getAccessoryType(): AccessoryType;
+    constructor(dependency: MQTTAccessoryDependency<C>, requireTopics?: boolean);
     private onCurrentStateUpdate;
-    private onTargetStateUpdate;
-    private onSetTargetState;
     private currentStateFromValue;
-    private targetStateFromValue;
-    private valueFromTargetState;
     private stringForState;
 }

package/dist/accessory/lock.js

@@ -1,33 +1,39 @@
 import { BaseAccessory } from './abstract/base.js';
 import { strings } from '../i18n/i18n.js';
-import { AccessoryType, CharacteristicKey } from '../model/enums.js';
+import { AccessoryType, HKCharacteristicKey } from '../model/enums.js';
 import { LogType } from '../tools/log.js';
 export class LockMechanismAccessory extends BaseAccessory {
-    constructor(Service, Characteristic, accessory, config, log, isGrouped, requireTopics = true) {
-        super(Service, Characteristic, accessory, config, log, isGrouped);
-        const getTopicCurrent = this.config.topicGetLockCurrentState !== undefined && this.config.topicGetCurrentLockState === undefined
-            ? 'topicGetLockCurrentState' : 'topicGetCurrentLockState';
-        this.setup(CharacteristicKey.LockCurrentState, Characteristic.LockCurrentState.UNKNOWN, getTopicCurrent, this.onCurrentStateUpdate.bind(this), requireTopics);
-        let getTargetTopic, setTargetTopic;
-        if (this.config.topicGetLockTargetState !== undefined && this.config.topicGetTargetLockState === undefined) {
-            getTargetTopic = 'topicGetLockTargetState';
-            setTargetTopic = 'topicSetTargetState';
-        }
-        else {
-            getTargetTopic = 'topicGetTargetLockState';
-            setTargetTopic = 'topicSetTargetLockState';
-        }
-        this.setup(CharacteristicKey.LockTargetState, Characteristic.LockTargetState.SECURED, getTargetTopic, this.onTargetStateUpdate.bind(this), requireTopics, setTargetTopic, this.onSetTargetState.bind(this));
-    }
     getAccessoryType() {
         return AccessoryType.LockMechanism;
     }
+    constructor(dependency, requireTopics = true) {
+        super(dependency);
+        if (this.config.topicGetLockCurrentState !== undefined && this.config.topicGetCurrentLockState === undefined) {
+            this.config.topicGetCurrentLockState = this.config.topicGetLockCurrentState;
+        }
+        if (this.config.topicGetLockTargetState !== undefined && this.config.topicGetTargetLockState === undefined) {
+            this.config.topicGetTargetLockState = this.config.topicGetLockTargetState;
+        }
+        if (this.config.topicSetTargetState !== undefined && this.config.topicSetTargetLockState === undefined) {
+            this.config.topicSetTargetLockState = this.config.topicSetTargetState;
+        }
+        this.setup(HKCharacteristicKey.LockCurrentState, dependency.Characteristic.LockCurrentState.UNKNOWN, 'topicGetCurrentLockState', this.onCurrentStateUpdate.bind(this), requireTopics);
+        const targetStates = new Map([
+            ['valueLockStateSecured', dependency.Characteristic.LockTargetState.SECURED],
+            ['valueLockStateUnsecured', dependency.Characteristic.LockTargetState.UNSECURED],
+        ]);
+        const targetStrings = new Map([
+            [dependency.Characteristic.LockCurrentState.SECURED, strings.lock.stateSecuredFuture],
+            [dependency.Characteristic.LockCurrentState.UNSECURED, strings.lock.stateUnsecuredFuture],
+        ]);
+        this.setup(HKCharacteristicKey.LockTargetState, dependency.Characteristic.LockTargetState.SECURED, 'topicGetTargetLockState', this.bindOnUpdateState(HKCharacteristicKey.LockTargetState, targetStates, targetStrings, strings.lock.stateUnknown), requireTopics, 'topicSetTargetLockState', this.bindOnSetState(HKCharacteristicKey.LockTargetState, 'topicSetTargetLockState', targetStates, targetStrings, strings.lock.badValue));
+    }
     async onCurrentStateUpdate(topic, value) {
         const current = this.currentStateFromValue(value);
         if (current <= this.Characteristic.LockTargetState.SECURED) {
-            this.onUpdate(CharacteristicKey.LockTargetState, current);
+            this.onUpdate(HKCharacteristicKey.LockTargetState, current);
         }
-        if (!this.onUpdate(CharacteristicKey.LockCurrentState, current)) {
+        if (!this.onUpdate(HKCharacteristicKey.LockCurrentState, current)) {
             return;
         }
         if (current === this.Characteristic.LockCurrentState.JAMMED) {
@@ -37,26 +43,6 @@ export class LockMechanismAccessory extends BaseAccessory {
             this.logIfDesired(this.stringForState(current));
         }
     }
-    async onTargetStateUpdate(topic, value) {
-        const target = this.targetStateFromValue(value);
-        this.onUpdate(CharacteristicKey.LockTargetState, target, this.stringForState(target, true));
-    }
-    async onSetTargetState(value) {
-        if (!this.assert('valueLockStateSecured', 'valueLockStateUnsecured')) {
-            return;
-        }
-        const target = this.valueFromTargetState(value);
-        if (target === undefined) {
-            this.log.error(strings.lock.badValue, this.name, `'${value}'`);
-            return;
-        }
-        if (this.config.topicSetTargetState !== undefined && this.config.topicSetTargetLockState === undefined) {
-            this.onSet(CharacteristicKey.LockTargetState, value, target, 'topicSetTargetState', this.stringForState(value, true));
-        }
-        else {
-            this.onSet(CharacteristicKey.LockTargetState, value, target, 'topicSetTargetLockState', this.stringForState(value, true));
-        }
-    }
     currentStateFromValue(value) {
         if (value === undefined) {
             return this.Characteristic.LockCurrentState.UNKNOWN;
@@ -72,32 +58,12 @@ export class LockMechanismAccessory extends BaseAccessory {
                 return this.Characteristic.LockCurrentState.UNKNOWN;
         }
     }
-    targetStateFromValue(value) {
-        if (value === undefined) {
-            return this.Characteristic.LockTargetState.SECURED;
-        }
-        switch (value) {
-            case this.getPrimitiveValue('valueLockStateUnsecured'):
-                return this.Characteristic.LockTargetState.UNSECURED;
-            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');
-        }
-    }
-    stringForState(state, future = false) {
+    stringForState(state) {
         switch (state) {
             case this.Characteristic.LockCurrentState.SECURED:
-                return future ? strings.lock.stateSecuredFuture : strings.lock.stateSecured;
+                return strings.lock.stateSecured;
             case this.Characteristic.LockCurrentState.UNSECURED:
-                return future ? strings.lock.stateUnsecuredFuture : strings.lock.stateUnsecured;
+                return strings.lock.stateUnsecured;
             case this.Characteristic.LockCurrentState.JAMMED:
                 return strings.lock.stateJammed;
             default: