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

package/dist/accessory/security.js

@@ -1,105 +1,73 @@
 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 SecuritySystemAccessory extends BaseAccessory {
-    STATE_MAP;
-    constructor(Service, Characteristic, accessory, config, log, isGrouped) {
-        super(Service, Characteristic, accessory, config, log, isGrouped);
-        this.STATE_MAP = new Map([
-            ['valueArmStay', Characteristic.SecuritySystemCurrentState.STAY_ARM],
-            ['valueArmAway', Characteristic.SecuritySystemCurrentState.AWAY_ARM],
-            ['valueArmNight', Characteristic.SecuritySystemCurrentState.NIGHT_ARM],
-            ['valueDisarm', Characteristic.SecuritySystemCurrentState.DISARMED],
-            ['valueAlarmTriggered', Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED],
+    STATES;
+    CURRENT_STRINGS;
+    getAccessoryType() {
+        return AccessoryType.SecuritySystem;
+    }
+    constructor(dependency) {
+        super(dependency);
+        this.STATES = new Map([
+            ['valueArmStay', dependency.Characteristic.SecuritySystemCurrentState.STAY_ARM],
+            ['valueArmAway', dependency.Characteristic.SecuritySystemCurrentState.AWAY_ARM],
+            ['valueArmNight', dependency.Characteristic.SecuritySystemCurrentState.NIGHT_ARM],
+            ['valueDisarm', dependency.Characteristic.SecuritySystemCurrentState.DISARMED],
+            ['valueAlarmTriggered', dependency.Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED],
+        ]);
+        this.CURRENT_STRINGS = new Map([
+            [dependency.Characteristic.SecuritySystemCurrentState.STAY_ARM, strings.security.stateStay],
+            [dependency.Characteristic.SecuritySystemCurrentState.AWAY_ARM, strings.security.stateAway],
+            [dependency.Characteristic.SecuritySystemCurrentState.NIGHT_ARM, strings.security.stateNight],
+            [dependency.Characteristic.SecuritySystemCurrentState.DISARMED, strings.security.stateDisarmed],
+            [dependency.Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED, strings.security.stateTriggered],
         ]);
-        const validCurrentStates = Array.from(this.STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
+        const validCurrentStates = Array.from(this.STATES.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
         if (validCurrentStates.length === 0) {
             this.log.error(strings.security.noStateValues, this.name);
             return;
         }
-        this.setup(CharacteristicKey.SecuritySystemCurrentState, Characteristic.SecuritySystemCurrentState.DISARMED, 'topicGetCurrentSecurityState', this.onCurrentStateUpdate.bind(this), true)?.setProps({ validValues: validCurrentStates.map((key) => this.STATE_MAP.get(key)) });
+        this.setup(HKCharacteristicKey.SecuritySystemCurrentState, dependency.Characteristic.SecuritySystemCurrentState.DISARMED, 'topicGetCurrentSecurityState', this.onCurrentStateUpdate.bind(this), true)?.setProps({ validValues: validCurrentStates.map((key) => this.STATES.get(key)) });
         const validTargetStates = validCurrentStates.filter((key) => key !== 'valueAlarmTriggered');
-        this.setup(CharacteristicKey.SecuritySystemTargetState, Characteristic.SecuritySystemTargetState.DISARM, 'topicGetTargetSecurityState', this.onTargetStateUpdate.bind(this), true, 'topicSetTargetSecurityState', this.onSetTargetState.bind(this))?.setProps({ validValues: validTargetStates.map((key) => this.STATE_MAP.get(key)) });
-        this.setup(CharacteristicKey.StatusTampered, Characteristic.StatusTampered.NOT_TAMPERED, 'topicGetStatusTampered', this.bindOnUpdateNumericBoolean(CharacteristicKey.StatusTampered, 'valueTampered', strings.error.isTampered, strings.error.notTampered), false);
-        this.setup(CharacteristicKey.StatusFault, Characteristic.StatusFault.NO_FAULT, 'topicGetStatusFault', this.bindOnUpdateNumericBoolean(CharacteristicKey.StatusFault, 'valueFault', strings.error.hasFault, strings.error.noFault), false);
-    }
-    getAccessoryType() {
-        return AccessoryType.SecuritySystem;
+        const futureStrings = new Map([
+            [dependency.Characteristic.SecuritySystemCurrentState.STAY_ARM, strings.security.stateStayFuture],
+            [dependency.Characteristic.SecuritySystemCurrentState.AWAY_ARM, strings.security.stateAwayFuture],
+            [dependency.Characteristic.SecuritySystemCurrentState.NIGHT_ARM, strings.security.stateNightFuture],
+            [dependency.Characteristic.SecuritySystemCurrentState.DISARMED, strings.security.stateDisarmFuture],
+        ]);
+        this.setup(HKCharacteristicKey.SecuritySystemTargetState, dependency.Characteristic.SecuritySystemTargetState.DISARM, 'topicGetTargetSecurityState', this.bindOnUpdateState(HKCharacteristicKey.SecuritySystemTargetState, this.STATES, futureStrings, strings.security.unknownValue), true, 'topicSetTargetSecurityState', this.bindOnSetState(HKCharacteristicKey.SecuritySystemTargetState, 'topicSetTargetSecurityState', this.STATES, futureStrings, strings.security.badValue))?.setProps({ validValues: validTargetStates.map((key) => this.STATES.get(key)) });
+        this.setup(HKCharacteristicKey.StatusTampered, dependency.Characteristic.StatusTampered.NOT_TAMPERED, 'topicGetStatusTampered', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.StatusTampered, 'valueTampered', strings.error.isTampered, strings.error.notTampered), false);
+        this.setup(HKCharacteristicKey.StatusFault, dependency.Characteristic.StatusFault.NO_FAULT, 'topicGetStatusFault', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.StatusFault, 'valueFault', strings.error.hasFault, strings.error.noFault), false);
     }
-    async onCurrentStateUpdate(topic, value) {
-        const current = this.toCVState(value);
+    async onCurrentStateUpdate(_topic, value) {
+        let current;
+        for (const valueKey of this.STATES.keys()) {
+            if (value === this.getPrimitiveValue(valueKey, false)) {
+                current = this.STATES.get(valueKey);
+                break;
+            }
+        }
         if (current === undefined) {
+            this.logIfDesired(strings.security.unknownValue, `'${value}'`);
             return;
         }
         if (current <= this.Characteristic.SecuritySystemTargetState.DISARM) {
-            this.onUpdate(CharacteristicKey.SecuritySystemTargetState, current);
+            this.onUpdate(HKCharacteristicKey.SecuritySystemTargetState, current);
         }
-        if (!this.onUpdate(CharacteristicKey.SecuritySystemCurrentState, current)) {
+        if (!this.onUpdate(HKCharacteristicKey.SecuritySystemCurrentState, current)) {
             return;
         }
-        if (current === this.Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED) {
-            this.logIfDesired(LogType.ERROR, this.stateStringForCV(current));
-        }
-        else {
-            this.logIfDesired(this.stateStringForCV(current));
-        }
-    }
-    async onTargetStateUpdate(topic, value) {
-        const target = this.toCVState(value);
-        if (target === undefined) {
-            return;
-        }
-        this.onUpdate(CharacteristicKey.SecuritySystemTargetState, target, this.stateStringForCV(target, true));
-    }
-    async onSetTargetState(value) {
-        const target = this.fromCVState(value);
-        if (target === undefined) {
+        const logString = this.CURRENT_STRINGS.get(current);
+        if (!logString) {
             return;
         }
-        this.onSet(CharacteristicKey.SecuritySystemTargetState, value, target, 'topicSetTargetSecurityState', this.stateStringForCV(value, true));
-    }
-    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.security.badValue, this.name, `'${value}'`);
-        }
-        return primative;
-    }
-    toCVState(value) {
-        switch (value) {
-            case this.getPrimitiveValue('valueArmStay', false):
-                return this.STATE_MAP.get('valueArmStay');
-            case this.getPrimitiveValue('valueArmAway', false):
-                return this.STATE_MAP.get('valueArmAway');
-            case this.getPrimitiveValue('valueArmNight', false):
-                return this.STATE_MAP.get('valueArmNight');
-            case this.getPrimitiveValue('valueDisarm', false):
-                return this.STATE_MAP.get('valueDisarm');
-            case this.getPrimitiveValue('valueAlarmTriggered', false):
-                return this.STATE_MAP.get('valueAlarmTriggered');
+        if (current === this.Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED) {
+            this.logIfDesired(LogType.ERROR, logString);
         }
-        this.logIfDesired(strings.security.unknownValue, `'${value}'`);
-    }
-    stateStringForCV(state, future = false) {
-        switch (state) {
-            case this.Characteristic.SecuritySystemCurrentState.STAY_ARM:
-                return future ? strings.security.stateStayFuture : strings.security.stateStay;
-            case this.Characteristic.SecuritySystemCurrentState.AWAY_ARM:
-                return future ? strings.security.stateAwayFuture : strings.security.stateAway;
-            case this.Characteristic.SecuritySystemCurrentState.NIGHT_ARM:
-                return future ? strings.security.stateNightFuture : strings.security.stateNight;
-            case this.Characteristic.SecuritySystemCurrentState.DISARMED:
-                return future ? strings.security.stateDisarmFuture : strings.security.stateDisarmed;
-            case this.Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED:
-                return strings.security.stateTriggered;
-            default:
-                return strings.security.stateUnknown;
+        else {
+            this.logIfDesired(logString);
         }
     }
 }

package/dist/accessory/security.js.map

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

package/dist/accessory/sensor/air.d.ts

@@ -1,14 +1,8 @@
-import { PlatformAccessory } from 'homebridge';
 import { SensorAccessory } from './sensor.js';
 import { AccessoryType } from '../../model/enums.js';
-import { CharacteristicType, AirSensorConfig, ServiceType } from '../../model/types.js';
-import { Log } from '../../tools/log.js';
+import { AirSensorConfig, MQTTAccessoryDependency } from '../../model/types.js';
 export declare class AirSensorAccessory extends SensorAccessory<AirSensorConfig> {
-    private readonly STATE_MAP;
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: AirSensorConfig, log: Log, isGrouped: boolean);
     protected getAccessoryType(): AccessoryType;
-    private onAirQualityUpdate;
-    private toCVState;
-    private qualityStringForCV;
+    constructor(dependency: MQTTAccessoryDependency<AirSensorConfig>);
     private logTemplateForDensityKey;
 }

package/dist/accessory/sensor/air.js

@@ -1,93 +1,61 @@
 import { SensorAccessory } from './sensor.js';
 import { strings } from '../../i18n/i18n.js';
-import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
+import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
 const MAX_DENSITY = 5000;
 export class AirSensorAccessory extends SensorAccessory {
-    STATE_MAP;
-    constructor(Service, Characteristic, accessory, config, log, isGrouped) {
-        super(Service, Characteristic, accessory, config, log, isGrouped);
-        this.STATE_MAP = new Map([
-            ['valueAQUnknown', Characteristic.AirQuality.UNKNOWN],
-            ['valueAQExcellent', Characteristic.AirQuality.EXCELLENT],
-            ['valueAQGood', Characteristic.AirQuality.GOOD],
-            ['valueAQFair', Characteristic.AirQuality.FAIR],
-            ['valueAQInferior', Characteristic.AirQuality.INFERIOR],
-            ['valueAQPoor', Characteristic.AirQuality.POOR],
+    getAccessoryType() {
+        return AccessoryType.AirQualitySensor;
+    }
+    constructor(dependency) {
+        super(dependency);
+        const stateMap = new Map([
+            ['valueAQUnknown', dependency.Characteristic.AirQuality.UNKNOWN],
+            ['valueAQExcellent', dependency.Characteristic.AirQuality.EXCELLENT],
+            ['valueAQGood', dependency.Characteristic.AirQuality.GOOD],
+            ['valueAQFair', dependency.Characteristic.AirQuality.FAIR],
+            ['valueAQInferior', dependency.Characteristic.AirQuality.INFERIOR],
+            ['valueAQPoor', dependency.Characteristic.AirQuality.POOR],
         ]);
-        const validStates = Array.from(this.STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
+        const stateStrings = new Map([
+            [dependency.Characteristic.AirQuality.EXCELLENT, strings.sensor.air.qualityExcellent],
+            [dependency.Characteristic.AirQuality.GOOD, strings.sensor.air.qualityGood],
+            [dependency.Characteristic.AirQuality.FAIR, strings.sensor.air.qualityFair],
+            [dependency.Characteristic.AirQuality.INFERIOR, strings.sensor.air.qualityInferior],
+            [dependency.Characteristic.AirQuality.POOR, strings.sensor.air.qualityPoor],
+            [dependency.Characteristic.AirQuality.UNKNOWN, strings.sensor.air.qualityUnknown],
+        ]);
+        const validStates = Array.from(stateMap.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
         if (validStates.length === 0 || (validStates.length === 1 && validStates[0] === 'valueAQUnknown')) {
             this.log.error(strings.sensor.air.noStateValues, this.name);
             return;
         }
-        this.setup(CharacteristicKey.AirQuality, Characteristic.AirQuality.UNKNOWN, 'topicGetAirQuality', this.onAirQualityUpdate.bind(this), true)?.setProps({ validValues: validStates.map((key) => this.STATE_MAP.get(key)) });
+        this.setup(HKCharacteristicKey.AirQuality, dependency.Characteristic.AirQuality.UNKNOWN, 'topicGetAirQuality', this.bindOnUpdateState(HKCharacteristicKey.AirQuality, stateMap, stateStrings, strings.sensor.air.unknownValue), true)?.setProps({ validValues: validStates.map((key) => stateMap.get(key)) });
         const densityMap = new Map([
-            ['topicGetNitrogenDioxideDensity', CharacteristicKey.NitrogenDioxideDensity],
-            ['topicGetOzoneDensity', CharacteristicKey.OzoneDensity],
-            ['topicGetPM10Density', CharacteristicKey.PM10Density],
-            ['topicGetPM2_5Density', CharacteristicKey.PM2_5Density],
-            ['topicGetSulphurDioxideDensity', CharacteristicKey.SulphurDioxideDensity],
-            ['topicGetVOCDensity', CharacteristicKey.VOCDensity],
+            ['topicGetNitrogenDioxideDensity', HKCharacteristicKey.NitrogenDioxideDensity],
+            ['topicGetOzoneDensity', HKCharacteristicKey.OzoneDensity],
+            ['topicGetPM10Density', HKCharacteristicKey.PM10Density],
+            ['topicGetPM2_5Density', HKCharacteristicKey.PM2_5Density],
+            ['topicGetSulphurDioxideDensity', HKCharacteristicKey.SulphurDioxideDensity],
+            ['topicGetVOCDensity', HKCharacteristicKey.VOCDensity],
         ]);
         densityMap.forEach((key, topic) => {
             this.setup(key, 0, topic, this.bindOnUpdateNumeric(key, this.logTemplateForDensityKey(key)), false)
                 ?.setProps({ maxValue: MAX_DENSITY });
         });
     }
-    getAccessoryType() {
-        return AccessoryType.AirQualitySensor;
-    }
-    async onAirQualityUpdate(topic, value) {
-        const current = this.toCVState(value);
-        this.onUpdate(CharacteristicKey.AirQuality, current, this.qualityStringForCV(current));
-    }
-    toCVState(value) {
-        switch (value) {
-            case this.getPrimitiveValue('valueAQUnknown', false):
-                return this.STATE_MAP.get('valueAQUnknown');
-            case this.getPrimitiveValue('valueAQExcellent', false):
-                return this.STATE_MAP.get('valueAQExcellent');
-            case this.getPrimitiveValue('valueAQGood', false):
-                return this.STATE_MAP.get('valueAQGood');
-            case this.getPrimitiveValue('valueAQFair', false):
-                return this.STATE_MAP.get('valueAQFair');
-            case this.getPrimitiveValue('valueAQInferior', false):
-                return this.STATE_MAP.get('valueAQInferior');
-            case this.getPrimitiveValue('valueAQPoor', false):
-                return this.STATE_MAP.get('valueAQPoor');
-        }
-        this.logIfDesired(strings.sensor.air.unknownValue, `'${value}'`);
-        return this.STATE_MAP.get('valueAQUnknown');
-    }
-    qualityStringForCV(state) {
-        switch (state) {
-            case this.Characteristic.AirQuality.EXCELLENT:
-                return strings.sensor.air.qualityExcellent;
-            case this.Characteristic.AirQuality.GOOD:
-                return strings.sensor.air.qualityGood;
-            case this.Characteristic.AirQuality.FAIR:
-                return strings.sensor.air.qualityFair;
-            case this.Characteristic.AirQuality.INFERIOR:
-                return strings.sensor.air.qualityInferior;
-            case this.Characteristic.AirQuality.POOR:
-                return strings.sensor.air.qualityPoor;
-            case this.Characteristic.AirQuality.UNKNOWN:
-            default:
-                return strings.sensor.air.qualityUnknown;
-        }
-    }
     logTemplateForDensityKey(key) {
         switch (key) {
-            case CharacteristicKey.NitrogenDioxideDensity:
+            case HKCharacteristicKey.NitrogenDioxideDensity:
                 return strings.sensor.air.densityNitrogen;
-            case CharacteristicKey.OzoneDensity:
+            case HKCharacteristicKey.OzoneDensity:
                 return strings.sensor.air.densityOzone;
-            case CharacteristicKey.PM10Density:
+            case HKCharacteristicKey.PM10Density:
                 return strings.sensor.air.densityPM10;
-            case CharacteristicKey.PM2_5Density:
+            case HKCharacteristicKey.PM2_5Density:
                 return strings.sensor.air.densityPM2_5;
-            case CharacteristicKey.SulphurDioxideDensity:
+            case HKCharacteristicKey.SulphurDioxideDensity:
                 return strings.sensor.air.densitySulphur;
-            case CharacteristicKey.VOCDensity:
+            case HKCharacteristicKey.VOCDensity:
                 return strings.sensor.air.densityVOC;
         }
         throw new Error(`Missing log template for density key '${key}'`);

package/dist/accessory/sensor/air.js.map

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

package/dist/accessory/sensor/carbonDioxide.d.ts

@@ -1,9 +1,7 @@
-import { PlatformAccessory } from 'homebridge';
 import { SensorAccessory } from './sensor.js';
 import { AccessoryType } from '../../model/enums.js';
-import { CharacteristicType, CO2SensorConfig, ServiceType } from '../../model/types.js';
-import { Log } from '../../tools/log.js';
+import { CO2SensorConfig, MQTTAccessoryDependency } from '../../model/types.js';
 export declare class CO2SensorAccessory extends SensorAccessory<CO2SensorConfig> {
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: CO2SensorConfig, log: Log, isGrouped: boolean);
     protected getAccessoryType(): AccessoryType;
+    constructor(dependency: MQTTAccessoryDependency<CO2SensorConfig>);
 }

package/dist/accessory/sensor/carbonDioxide.js

@@ -1,15 +1,15 @@
 import { SensorAccessory } from './sensor.js';
 import { strings } from '../../i18n/i18n.js';
-import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
+import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
 export class CO2SensorAccessory extends SensorAccessory {
-    constructor(Service, Characteristic, accessory, config, log, isGrouped) {
-        super(Service, Characteristic, accessory, config, log, isGrouped);
-        this.setup(CharacteristicKey.CarbonDioxideDetected, Characteristic.CarbonDioxideDetected.CO2_LEVELS_NORMAL, 'topicGetCarbonDioxideDetected', this.bindOnUpdateNumericBoolean(CharacteristicKey.CarbonDioxideDetected, 'valueCarbonDioxideDetected', strings.sensor.carbonDioxide.active, strings.sensor.carbonDioxide.inactive), true);
-        this.setup(CharacteristicKey.CarbonDioxideLevel, 0, 'topicGetCarbonDioxideLevel', this.bindOnUpdateNumeric(CharacteristicKey.CarbonDioxideLevel, strings.sensor.carbonDioxide.level), false);
-        this.setup(CharacteristicKey.CarbonDioxidePeakLevel, 0, 'topicGetCarbonDioxidePeakLevel', this.bindOnUpdateNumeric(CharacteristicKey.CarbonDioxidePeakLevel, strings.sensor.carbonDioxide.peakLevel), false);
-    }
     getAccessoryType() {
         return AccessoryType.CarbonDioxideSensor;
     }
+    constructor(dependency) {
+        super(dependency);
+        this.setup(HKCharacteristicKey.CarbonDioxideDetected, dependency.Characteristic.CarbonDioxideDetected.CO2_LEVELS_NORMAL, 'topicGetCarbonDioxideDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.CarbonDioxideDetected, 'valueCarbonDioxideDetected', strings.sensor.carbonDioxide.active, strings.sensor.carbonDioxide.inactive), true);
+        this.setup(HKCharacteristicKey.CarbonDioxideLevel, 0, 'topicGetCarbonDioxideLevel', this.bindOnUpdateNumeric(HKCharacteristicKey.CarbonDioxideLevel, strings.sensor.carbonDioxide.level), false);
+        this.setup(HKCharacteristicKey.CarbonDioxidePeakLevel, 0, 'topicGetCarbonDioxidePeakLevel', this.bindOnUpdateNumeric(HKCharacteristicKey.CarbonDioxidePeakLevel, strings.sensor.carbonDioxide.peakLevel), false);
+    }
 }
 //# sourceMappingURL=carbonDioxide.js.map

package/dist/accessory/sensor/carbonDioxide.js.map

@@ -1 +1 @@
-{"version":3,"file":"carbonDioxide.js","sourceRoot":"","sources":["../../../src/accessory/sensor/carbonDioxide.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKxE,MAAM,OAAO,kBAAmB,SAAQ,eAAgC;IAEtE,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAuB,EAAE,GAAQ,EAAE,SAAkB;QACvJ,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,cAAc,CAAC,qBAAqB,CAAC,iBAAiB,EACxG,+BAA+B,EAC/B,IAAI,CAAC,0BAA0B,CAC7B,iBAAiB,CAAC,qBAAqB,EACvC,4BAA4B,EAC5B,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,EAC7E,IAAI,CAAC,CAAC;QAER,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,CAAC,EAChD,4BAA4B,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QAE3I,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,sBAAsB,EAAE,CAAC,EACpD,gCAAgC,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,sBAAsB,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IACzJ,CAAC;IAES,gBAAgB;QACxB,OAAO,aAAa,CAAC,mBAAmB,CAAC;IAC3C,CAAC;CACF"}
+{"version":3,"file":"carbonDioxide.js","sourceRoot":"","sources":["../../../src/accessory/sensor/carbonDioxide.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,kBAAmB,SAAQ,eAAgC;IAE5D,gBAAgB;QACxB,OAAO,aAAa,CAAC,mBAAmB,CAAC;IAC3C,CAAC;IAED,YAAY,UAAoD;QAC9D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,UAAU,CAAC,cAAc,CAAC,qBAAqB,CAAC,iBAAiB,EACrH,+BAA+B,EAC/B,IAAI,CAAC,0BAA0B,CAC7B,mBAAmB,CAAC,qBAAqB,EACzC,4BAA4B,EAC5B,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,EAC7E,IAAI,CAAC,CAAC;QAER,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,CAAC,EAClD,4BAA4B,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QAE7I,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,CAAC,EACtD,gCAAgC,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC3J,CAAC;CACF"}

package/dist/accessory/sensor/carbonMonoxide.d.ts

@@ -1,9 +1,7 @@
-import { PlatformAccessory } from 'homebridge';
 import { SensorAccessory } from './sensor.js';
 import { AccessoryType } from '../../model/enums.js';
-import { CharacteristicType, COSensorConfig, ServiceType } from '../../model/types.js';
-import { Log } from '../../tools/log.js';
+import { COSensorConfig, MQTTAccessoryDependency } from '../../model/types.js';
 export declare class COSensorAccessory extends SensorAccessory<COSensorConfig> {
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: COSensorConfig, log: Log, isGrouped: boolean);
     protected getAccessoryType(): AccessoryType;
+    constructor(dependency: MQTTAccessoryDependency<COSensorConfig>);
 }

package/dist/accessory/sensor/carbonMonoxide.js

@@ -1,15 +1,15 @@
 import { SensorAccessory } from './sensor.js';
 import { strings } from '../../i18n/i18n.js';
-import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
+import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
 export class COSensorAccessory extends SensorAccessory {
-    constructor(Service, Characteristic, accessory, config, log, isGrouped) {
-        super(Service, Characteristic, accessory, config, log, isGrouped);
-        this.setup(CharacteristicKey.CarbonMonoxideDetected, Characteristic.CarbonMonoxideDetected.CO_LEVELS_NORMAL, 'topicGetCarbonMonoxideDetected', this.bindOnUpdateNumericBoolean(CharacteristicKey.CarbonMonoxideDetected, 'valueCarbonMonoxideDetected', strings.sensor.carbonMonoxide.active, strings.sensor.carbonMonoxide.inactive), true);
-        this.setup(CharacteristicKey.CarbonMonoxideLevel, 0, 'topicGetCarbonMonoxideLevel', this.bindOnUpdateNumeric(CharacteristicKey.CarbonMonoxideLevel, strings.sensor.carbonMonoxide.level), false);
-        this.setup(CharacteristicKey.CarbonMonoxidePeakLevel, 0, 'topicGetCarbonMonoxidePeakLevel', this.bindOnUpdateNumeric(CharacteristicKey.CarbonMonoxidePeakLevel, strings.sensor.carbonMonoxide.peakLevel), false);
-    }
     getAccessoryType() {
         return AccessoryType.CarbonMonoxideSensor;
     }
+    constructor(dependency) {
+        super(dependency);
+        this.setup(HKCharacteristicKey.CarbonMonoxideDetected, dependency.Characteristic.CarbonMonoxideDetected.CO_LEVELS_NORMAL, 'topicGetCarbonMonoxideDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.CarbonMonoxideDetected, 'valueCarbonMonoxideDetected', strings.sensor.carbonMonoxide.active, strings.sensor.carbonMonoxide.inactive), true);
+        this.setup(HKCharacteristicKey.CarbonMonoxideLevel, 0, 'topicGetCarbonMonoxideLevel', this.bindOnUpdateNumeric(HKCharacteristicKey.CarbonMonoxideLevel, strings.sensor.carbonMonoxide.level), false);
+        this.setup(HKCharacteristicKey.CarbonMonoxidePeakLevel, 0, 'topicGetCarbonMonoxidePeakLevel', this.bindOnUpdateNumeric(HKCharacteristicKey.CarbonMonoxidePeakLevel, strings.sensor.carbonMonoxide.peakLevel), false);
+    }
 }
 //# sourceMappingURL=carbonMonoxide.js.map

package/dist/accessory/sensor/carbonMonoxide.js.map

@@ -1 +1 @@
-{"version":3,"file":"carbonMonoxide.js","sourceRoot":"","sources":["../../../src/accessory/sensor/carbonMonoxide.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKxE,MAAM,OAAO,iBAAkB,SAAQ,eAA+B;IAEpE,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAsB,EAAE,GAAQ,EAAE,SAAkB;QACtJ,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,sBAAsB,EAAE,cAAc,CAAC,sBAAsB,CAAC,gBAAgB,EACzG,gCAAgC,EAChC,IAAI,CAAC,0BAA0B,CAC7B,iBAAiB,CAAC,sBAAsB,EACxC,6BAA6B,EAC7B,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAC/E,IAAI,CAAC,CAAC;QAER,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,CAAC,EACjD,6BAA6B,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QAE9I,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,CAAC,EACrD,iCAAiC,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5J,CAAC;IAES,gBAAgB;QACxB,OAAO,aAAa,CAAC,oBAAoB,CAAC;IAC5C,CAAC;CACF"}
+{"version":3,"file":"carbonMonoxide.js","sourceRoot":"","sources":["../../../src/accessory/sensor/carbonMonoxide.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,iBAAkB,SAAQ,eAA+B;IAE1D,gBAAgB;QACxB,OAAO,aAAa,CAAC,oBAAoB,CAAC;IAC5C,CAAC;IAED,YAAY,UAAmD;QAC7D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,UAAU,CAAC,cAAc,CAAC,sBAAsB,CAAC,gBAAgB,EACtH,gCAAgC,EAChC,IAAI,CAAC,0BAA0B,CAC7B,mBAAmB,CAAC,sBAAsB,EAC1C,6BAA6B,EAC7B,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAC/E,IAAI,CAAC,CAAC;QAER,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,CAAC,EACnD,6BAA6B,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QAEhJ,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,CAAC,EACvD,iCAAiC,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC9J,CAAC;CACF"}

package/dist/accessory/sensor/contact.d.ts

@@ -1,10 +1,8 @@
-import { PlatformAccessory } from 'homebridge';
 import { SensorAccessory } from './sensor.js';
 import { AccessoryType } from '../../model/enums.js';
-import { CharacteristicType, ContactSensorConfig, ServiceType } from '../../model/types.js';
-import { Log } from '../../tools/log.js';
+import { ContactSensorConfig, MQTTAccessoryDependency } from '../../model/types.js';
 export declare class ContactSensorAccessory extends SensorAccessory<ContactSensorConfig> {
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: ContactSensorConfig, log: Log, isGrouped: boolean);
     protected getAccessoryType(): AccessoryType;
+    constructor(dependency: MQTTAccessoryDependency<ContactSensorConfig>);
     private onContactStateUpdate;
 }

package/dist/accessory/sensor/contact.js

@@ -1,17 +1,30 @@
 import { SensorAccessory } from './sensor.js';
+import { EVE_EPOCH } from '../characteristic/eve.js';
 import { strings } from '../../i18n/i18n.js';
-import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
+import { AccessoryType, EveCharacteristicKey, HKCharacteristicKey } from '../../model/enums.js';
+import { HistoryType } from '../../model/history.js';
 export class ContactSensorAccessory extends SensorAccessory {
-    constructor(Service, Characteristic, accessory, config, log, isGrouped) {
-        super(Service, Characteristic, accessory, config, log, isGrouped);
-        this.setup(CharacteristicKey.ContactSensorState, Characteristic.ContactSensorState.CONTACT_NOT_DETECTED, 'topicGetContactSensorState', this.onContactStateUpdate.bind(this), true);
-    }
     getAccessoryType() {
         return AccessoryType.ContactSensor;
     }
+    constructor(dependency) {
+        super(dependency);
+        this.setup(HKCharacteristicKey.ContactSensorState, dependency.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED, 'topicGetContactSensorState', this.onContactStateUpdate.bind(this), true);
+        this.setupTopicless(EveCharacteristicKey.OpenDuration, 0);
+        this.setupTopicless(EveCharacteristicKey.ClosedDuration, 0);
+        this.setupTopicless(EveCharacteristicKey.TimesOpened, 0);
+        this.setupTopicless(EveCharacteristicKey.ResetTotal, EVE_EPOCH, () => {
+            this.onUpdate(EveCharacteristicKey.TimesOpened, 0, strings.sensor.contact.timesOpenedReset);
+        });
+    }
     async onContactStateUpdate(topic, value) {
-        const numeric = value === this.getPrimitiveValue('valueContactDetected') ? 0 : 1;
-        this.onUpdate(CharacteristicKey.ContactSensorState, numeric, numeric ? strings.sensor.contact.inactive : strings.sensor.contact.active);
+        const numeric = value === this.getPrimitiveValue('valueContactDetected') ?
+            this.Characteristic.ContactSensorState.CONTACT_DETECTED : this.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
+        this.onUpdate(HKCharacteristicKey.ContactSensorState, numeric, numeric ? strings.sensor.contact.inactive : strings.sensor.contact.active);
+        this.recordHistory(HistoryType.DOOR, { status: numeric }, true);
+        if (numeric === this.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED) {
+            this.updateNumericValue(EveCharacteristicKey.TimesOpened, 1);
+        }
     }
 }
 //# sourceMappingURL=contact.js.map

package/dist/accessory/sensor/contact.js.map

@@ -1 +1 @@
-{"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../src/accessory/sensor/contact.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKxE,MAAM,OAAO,sBAAuB,SAAQ,eAAoC;IAE9E,YACE,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAA2B,EAAE,GAAQ,EAAE,SAAkB;QACjJ,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,cAAc,CAAC,kBAAkB,CAAC,oBAAoB,EACrG,4BAA4B,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IAC9E,CAAC;IAES,gBAAgB;QACxB,OAAO,aAAa,CAAC,aAAa,CAAC;IACrC,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,KAAa,EAAE,KAAqB;QACrE,MAAM,OAAO,GAAG,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1I,CAAC;CACF"}
+{"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../src/accessory/sensor/contact.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChG,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,MAAM,OAAO,sBAAuB,SAAQ,eAAoC;IAEpE,gBAAgB;QACxB,OAAO,aAAa,CAAC,aAAa,CAAC;IACrC,CAAC;IAED,YACE,UAAwD;QACxD,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,oBAAoB,EAClH,4BAA4B,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QAE5E,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QAE1D,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAE5D,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAEzD,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE;YACnE,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,WAAW,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC9F,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,KAAa,EAAE,KAAqB;QACrE,MAAM,OAAO,GAAG,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC,CAAC;YACxE,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,oBAAoB,CAAC;QACxH,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE1I,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;QAEhE,IAAI,OAAO,KAAK,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,oBAAoB,EAAE,CAAC;YAC5E,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CACF"}

package/dist/accessory/sensor/humidity.d.ts

@@ -1,9 +1,7 @@
-import { PlatformAccessory } from 'homebridge';
 import { SensorAccessory } from './sensor.js';
 import { AccessoryType } from '../../model/enums.js';
-import { CharacteristicType, HumiditySensorConfig, ServiceType } from '../../model/types.js';
-import { Log } from '../../tools/log.js';
+import { HumiditySensorConfig, MQTTAccessoryDependency } from '../../model/types.js';
 export declare class HumiditySensorAccessory extends SensorAccessory<HumiditySensorConfig> {
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: HumiditySensorConfig, log: Log, isGrouped: boolean);
     protected getAccessoryType(): AccessoryType;
+    constructor(dependency: MQTTAccessoryDependency<HumiditySensorConfig>);
 }

package/dist/accessory/sensor/humidity.js

@@ -1,13 +1,16 @@
 import { SensorAccessory } from './sensor.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 HumiditySensorAccessory extends SensorAccessory {
-    constructor(Service, Characteristic, accessory, config, log, isGrouped) {
-        super(Service, Characteristic, accessory, config, log, isGrouped);
-        this.setup(CharacteristicKey.CurrentRelativeHumidity, 0, 'topicGetCurrentRelativeHumidity', this.bindOnUpdateNumeric(CharacteristicKey.CurrentRelativeHumidity, strings.climate.humidityUpdate), true);
-    }
     getAccessoryType() {
         return AccessoryType.HumiditySensor;
     }
+    constructor(dependency) {
+        super(dependency);
+        this.setup(HKCharacteristicKey.CurrentRelativeHumidity, 0, 'topicGetCurrentRelativeHumidity', this.bindOnUpdateNumeric(HKCharacteristicKey.CurrentRelativeHumidity, strings.climate.humidityUpdate, (value) => {
+            this.recordHistory(HistoryType.WEATHER, { humidity: value });
+        }), true);
+    }
 }
 //# sourceMappingURL=humidity.js.map

package/dist/accessory/sensor/humidity.js.map

@@ -1 +1 @@
-{"version":3,"file":"humidity.js","sourceRoot":"","sources":["../../../src/accessory/sensor/humidity.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKxE,MAAM,OAAO,uBAAwB,SAAQ,eAAqC;IAEhF,YACE,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAA4B,EAAE,GAAQ,EAAE,SAAkB;QAClJ,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,CAAC,EACrD,iCAAiC,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC,CAAC;IAClJ,CAAC;IAES,gBAAgB;QACxB,OAAO,aAAa,CAAC,cAAc,CAAC;IACtC,CAAC;CACF"}
+{"version":3,"file":"humidity.js","sourceRoot":"","sources":["../../../src/accessory/sensor/humidity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,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,uBAAwB,SAAQ,eAAqC;IAEtE,gBAAgB;QACxB,OAAO,aAAa,CAAC,cAAc,CAAC;IACtC,CAAC;IAED,YACE,UAAyD;QACzD,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,CAAC,EACvD,iCAAiC,EACjC,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE;YAC9G,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAE,CAAC;QAChE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACd,CAAC;CACF"}

package/dist/accessory/sensor/leak.d.ts

@@ -1,9 +1,7 @@
-import { PlatformAccessory } from 'homebridge';
 import { SensorAccessory } from './sensor.js';
 import { AccessoryType } from '../../model/enums.js';
-import { CharacteristicType, LeakSensorConfig, ServiceType } from '../../model/types.js';
-import { Log } from '../../tools/log.js';
+import { LeakSensorConfig, MQTTAccessoryDependency } from '../../model/types.js';
 export declare class LeakSensorAccessory extends SensorAccessory<LeakSensorConfig> {
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: LeakSensorConfig, log: Log, isGrouped: boolean);
     protected getAccessoryType(): AccessoryType;
+    constructor(dependency: MQTTAccessoryDependency<LeakSensorConfig>);
 }