homebridge-easy-mqtt 1.4.0-beta.9 → 1.4.1-beta.0

package/dist/accessory/abstract/base.js

@@ -13,15 +13,15 @@ export class BaseAccessory extends MQTTAccessory {
                 .setCharacteristic(Characteristic.ConfiguredName, config.info.name)
                 .setCharacteristic(Characteristic.Manufacturer, config.info.manufacturer ?? PLATFORM_NAME)
                 .setCharacteristic(Characteristic.Model, config.info.model ?? config.info.type)
-                .setCharacteristic(Characteristic.SerialNumber, config.info.serialNumber ?? config.info.id)
+                .setCharacteristic(Characteristic.SerialNumber, config.info.serialNumber ?? this.identifier)
                 .setCharacteristic(Characteristic.FirmwareRevision, config.info.version ?? getVersion());
         }
-        this.setupCharacteristic(CharacteristicKey.BatteryLevel, 100, 'topicGetBatteryLevel', this.bindOnUpdateNumeric(CharacteristicKey.BatteryLevel, strings.accessory.batteryLevel), false);
-        this.setupCharacteristic(CharacteristicKey.StatusLowBattery, Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL, 'topicGetBatteryLow', this.onBatteryLowUpdate.bind(this), false);
-        this.setupCharacteristic(CharacteristicKey.StatusActive, true, 'topicGetStatusActive', this.onStatusActiveUpdate.bind(this), false);
+        this.setup(CharacteristicKey.BatteryLevel, 100, 'topicGetBatteryLevel', this.bindOnUpdateNumeric(CharacteristicKey.BatteryLevel, strings.accessory.batteryLevel), false);
+        this.setup(CharacteristicKey.StatusLowBattery, Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL, 'topicGetBatteryLow', this.onBatteryLowUpdate.bind(this), false);
+        this.setup(CharacteristicKey.StatusActive, true, 'topicGetStatusActive', this.onStatusActiveUpdate.bind(this), false);
     }
     async onBatteryLowUpdate(topic, value) {
-        const batteryLow = value === this.getPrimitiveValue('valueBatteryLow');
+        const batteryLow = value === this.getPrimitiveValue('valueBatteryLow') ? 1 : 0;
         if (!this.onUpdate(CharacteristicKey.StatusLowBattery, batteryLow)) {
             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/common.d.ts

@@ -0,0 +1,43 @@
+import { Characteristic, CharacteristicSetHandler, CharacteristicValue, PrimitiveTypes, Service } from 'homebridge';
+import { CharacteristicKey } from '../../model/enums.js';
+import { CharacteristicType, TemperatureConfig } from '../../model/types.js';
+import { Log, LogType } from '../../tools/log.js';
+import { Properties } from '../../tools/properties.js';
+import { Assertable, Type } from '../../tools/validation.js';
+type OnUpdateHandler = (topic: string, value: PrimitiveTypes) => (Promise<void>);
+export type TopicHandler = {
+    topic: string;
+    handler: OnUpdateHandler;
+};
+export type PublishHandler = (topic: string, value: PrimitiveTypes) => void;
+export declare abstract class Common<C extends Assertable> {
+    readonly name: string;
+    private _properties;
+    readonly topicHandlers: TopicHandler[];
+    constructor(name: string);
+    protected abstract get service(): Service;
+    protected abstract get Characteristic(): CharacteristicType;
+    protected abstract get log(): Log;
+    protected abstract get disableLogging(): boolean;
+    protected abstract get config(): C;
+    protected abstract get identifier(): string;
+    protected abstract get useStoredProperties(): boolean;
+    protected abstract publish(rawTopic: string, value: PrimitiveTypes): void;
+    protected get properties(): Properties;
+    protected assert(...keys: (keyof C)[]): boolean;
+    protected assertType(expectedType: Type, ...keys: (keyof C)[]): boolean;
+    protected getRawValue(property: keyof C, assert?: boolean): string | undefined;
+    protected getPrimitiveValue(property: keyof C, assert?: boolean): PrimitiveTypes | undefined;
+    protected addTopicHandlers(topicHandlers: TopicHandler[]): void;
+    protected setup(characteristicKey: CharacteristicKey, defaultValue: CharacteristicValue, getTopicKey: keyof C, onUpdateHandler: OnUpdateHandler, assertGetTopic: boolean, setTopicKey?: keyof C | undefined, onSetHandler?: CharacteristicSetHandler | undefined): Characteristic | undefined;
+    private setupGet;
+    protected setupSet(characteristicKey: CharacteristicKey, setTopicKey?: keyof C | undefined, onSetHandler?: CharacteristicSetHandler | undefined): void;
+    protected bindOnUpdateNumeric(key: CharacteristicKey, logTemplate: string): OnUpdateHandler;
+    protected bindOnUpdateNumericBoolean(charKey: CharacteristicKey, valueKey: keyof C, logTrue: string, logFalse: string): OnUpdateHandler;
+    protected bindTemperatureUpdate<C extends TemperatureConfig>(config: C, charKey: CharacteristicKey, logTemplate: string): OnUpdateHandler;
+    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;
+    protected logIfDesired(level: LogType, message: string, ...parameters: string[]): void;
+}
+export {};

package/dist/accessory/abstract/common.js

@@ -0,0 +1,172 @@
+import { strings } from '../../i18n/i18n.js';
+import { LogType } from '../../tools/log.js';
+import { toNumber, toPrimitive } from '../../tools/primitive.js';
+import { Properties } from '../../tools/properties.js';
+import { assert, assertType } from '../../tools/validation.js';
+import { temperatureUnits, toCelsius } from '../../tools/temperature.js';
+export class Common {
+    name;
+    _properties = undefined;
+    topicHandlers = [];
+    constructor(name) {
+        this.name = name;
+    }
+    get properties() {
+        if (this._properties === undefined) {
+            this._properties = new Properties(this.identifier, this.useStoredProperties);
+        }
+        return this._properties;
+    }
+    assert(...keys) {
+        return assert(this.log, this.name, this.config, ...keys);
+    }
+    assertType(expectedType, ...keys) {
+        return assertType(this.log, this.name, expectedType, this.config, ...keys);
+    }
+    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;
+    }
+    addTopicHandlers(topicHandlers) {
+        this.topicHandlers.push(...topicHandlers);
+    }
+    setup(characteristicKey, defaultValue, getTopicKey, onUpdateHandler, assertGetTopic, setTopicKey = undefined, onSetHandler = undefined) {
+        const characteristic = this.setupGet(characteristicKey, defaultValue, getTopicKey, onUpdateHandler, assertGetTopic);
+        if (!characteristic) {
+            return;
+        }
+        this.setupSet(characteristicKey, setTopicKey, onSetHandler);
+        return characteristic;
+    }
+    setupGet(characteristicKey, defaultValue, getTopicKey, onUpdateHandler, assertTopic) {
+        if (!getTopicKey.toString().startsWith('topic')) {
+            throw new Error(`Trying to fetch topic with unexpected property name '${getTopicKey.toString()}'`);
+        }
+        if (assertTopic) {
+            this.assert(getTopicKey);
+        }
+        if (this.config[getTopicKey] === undefined) {
+            for (const characteristic of this.service.characteristics) {
+                if (characteristic.UUID === this.Characteristic[characteristicKey].UUID) {
+                    this.service.removeCharacteristic(characteristic);
+                    break;
+                }
+            }
+            return;
+        }
+        const startingValue = (this.useStoredProperties && this.properties.get(characteristicKey)) ?? defaultValue;
+        const characteristic = this.service.getCharacteristic(this.Characteristic[characteristicKey]);
+        characteristic.setValue(startingValue);
+        this.properties.set(characteristicKey, startingValue);
+        characteristic.onGet(async () => {
+            return this.properties.get(characteristicKey) ?? null;
+        });
+        this.topicHandlers.push({ topic: this.config[getTopicKey], handler: onUpdateHandler });
+        return characteristic;
+    }
+    setupSet(characteristicKey, setTopicKey = undefined, onSetHandler = undefined) {
+        if (setTopicKey === undefined) {
+            return;
+        }
+        if (!setTopicKey.toString().startsWith('topic')) {
+            throw new Error(`Trying to fetch topic with unexpected property name '${setTopicKey.toString()}'`);
+        }
+        if (!onSetHandler) {
+            throw new Error(`Missing onSetHandler for topic '${setTopicKey.toString()}'`);
+        }
+        const characteristic = this.service.getCharacteristic(this.Characteristic[characteristicKey]);
+        characteristic.onSet(onSetHandler);
+    }
+    bindOnUpdateNumeric(key, logTemplate) {
+        return (async (_topic, value) => {
+            if (typeof value !== 'number') {
+                this.log.error(strings.characteristic.badValue, this.name, key, `'${value.toString()}'`);
+                return;
+            }
+            const characteristic = this.service.getCharacteristic(this.Characteristic[key]);
+            const minValue = characteristic.props.minValue;
+            const maxValue = characteristic.props.maxValue;
+            if (minValue !== undefined && value < minValue) {
+                this.logIfDesired(LogType.WARNING, strings.characteristic.outOfRange, key, `'${value.toString()}'`, `'${minValue.toString()}'`);
+                value = minValue;
+            }
+            else if (maxValue !== undefined && value > maxValue) {
+                this.logIfDesired(LogType.WARNING, strings.characteristic.outOfRange, key, `'${value.toString()}'`, `'${maxValue.toString()}'`);
+                value = maxValue;
+            }
+            const logString = logTemplate.replace('%d', value.toString());
+            this.onUpdate(key, value, logString);
+        }).bind(this);
+    }
+    bindOnUpdateNumericBoolean(charKey, valueKey, logTrue, logFalse) {
+        return (async (_topic, value) => {
+            const numeric = value === this.getPrimitiveValue(valueKey) ? 1 : 0;
+            this.onUpdate(charKey, numeric, numeric ? logTrue : logFalse);
+        }).bind(this);
+    }
+    bindTemperatureUpdate(config, charKey, logTemplate) {
+        return (async (_topic, value) => {
+            if (typeof value !== 'number') {
+                this.log.error(strings.climate.badTemperatureValue, this.name, `'${value}'`);
+                return;
+            }
+            const units = temperatureUnits(config.temperatureUnits);
+            const temperature = toCelsius(toNumber(value), units);
+            const logString = logTemplate.replace('%d°%s', `${value}°${units}`);
+            this.onUpdate(charKey, temperature, logString);
+        }).bind(this);
+    }
+    onUpdate(key, value, logString = undefined) {
+        if (value === this.properties.get(key)) {
+            return false;
+        }
+        this.properties.set(key, value);
+        this.service.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.properties.get(key)) {
+            this.logIfDesired(logString);
+        }
+        this.properties.set(key, value);
+        this.service.updateCharacteristic(this.Characteristic[key], value);
+        this.publish(this.config[topic], publish);
+    }
+    logIfDesired(levelOrMessage, ...rest) {
+        if (this.disableLogging) {
+            return;
+        }
+        if (typeof levelOrMessage === 'string') {
+            this.log.always(levelOrMessage, this.name, ...rest);
+            return;
+        }
+        const [message, ...parameters] = rest;
+        switch (levelOrMessage) {
+            case LogType.WARNING:
+                this.log.warning(message, this.name, ...parameters);
+                break;
+            case LogType.ERROR:
+                this.log.error(message, this.name, ...parameters);
+                break;
+            default:
+                this.log.always(message, this.name, ...parameters);
+                break;
+        }
+    }
+}
+//# sourceMappingURL=common.js.map

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

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

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

@@ -2,4 +2,5 @@ import { PlatformAccessory } from 'homebridge';
 import { BaseAccessory } from './base.js';
 import * as Configs from '../../model/types.js';
 import { Log } from '../../tools/log.js';
+export declare function createIdentifier(info: Configs.InfoConfig): string;
 export declare function createAccessory(Service: Configs.ServiceType, Characteristic: Configs.CharacteristicType, platformAccessory: PlatformAccessory, accessoryConfig: Configs.BaseAccessoryConfig, log: Log, isGrouped?: boolean): BaseAccessory | undefined;

package/dist/accessory/abstract/helper.js

@@ -1,13 +1,17 @@
 import { strings } from '../../i18n/i18n.js';
 import { AccessoryType } from '../../model/enums.js';
+import { GarageDoorAccessory } from '../garage.js';
 import { LockMechanismAccessory } from '../lock.js';
 import { SecuritySystemAccessory } from '../security.js';
+import { FanV2Accessory } from '../climate/fan2.js';
 import { HeaterCoolerAccessory } from '../climate/heaterCooler.js';
 import { PurifierAccessory } from '../climate/purifier.js';
 import { ThermostatAccessory } from '../climate/thermostat.js';
 import { LightbulbAccessory } from '../onoff/lightbulb.js';
 import { OutletAccessory } from '../onoff/outlet.js';
 import { SwitchAccessory } from '../onoff/switch.js';
+import { BlindAccessory } from '../position/blind.js';
+import { AirSensorAccessory } from '../sensor/air.js';
 import { CO2SensorAccessory } from '../sensor/carbonDioxide.js';
 import { COSensorAccessory } from '../sensor/carbonMonoxide.js';
 import { ContactSensorAccessory } from '../sensor/contact.js';
@@ -18,19 +22,32 @@ import { MotionSensorAccessory } from '../sensor/motion.js';
 import { OccupancySensorAccessory } from '../sensor/occupancy.js';
 import { SmokeSensorAccessory } from '../sensor/smoke.js';
 import { TemperatureSensorAccessory } from '../sensor/temperature.js';
+import { ButtonAccessory } from '../button.js';
 import { ValveAccessory } from '../valve.js';
+import { PLUGIN_NAME } from '../../homebridge/settings.js';
+export function createIdentifier(info) {
+    return info.id ?? `${PLUGIN_NAME}:${info.type}:${info.name}`;
+}
 export function createAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped = false) {
     switch (accessoryConfig.info.type) {
+        case AccessoryType.AirPurifier:
+            return new PurifierAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
+        case AccessoryType.AirQualitySensor:
+            return new AirSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
+        case AccessoryType.WindowCovering:
+            return new BlindAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
         case AccessoryType.CarbonDioxideSensor:
             return new CO2SensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
         case AccessoryType.CarbonMonoxideSensor:
             return new COSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
         case AccessoryType.ContactSensor:
             return new ContactSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
+        case AccessoryType.Fanv2:
+            return new FanV2Accessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
+        case AccessoryType.GarageDoorOpener:
+            return new GarageDoorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
         case AccessoryType.HeaterCooler:
             return new HeaterCoolerAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
-        case AccessoryType.AirPurifier:
-            return new PurifierAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
         case AccessoryType.HumiditySensor:
             return new HumiditySensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
         case AccessoryType.LeakSensor:
@@ -51,6 +68,8 @@ export function createAccessory(Service, Characteristic, platformAccessory, acce
             return new SecuritySystemAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
         case AccessoryType.SmokeSensor:
             return new SmokeSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
+        case AccessoryType.StatelessProgrammableSwitch:
+            return new ButtonAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
         case AccessoryType.Switch:
             return new SwitchAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
         case AccessoryType.TemperatureSensor:

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

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

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

@@ -1,35 +1,24 @@
-import { Characteristic, CharacteristicSetHandler, CharacteristicValue, PlatformAccessory, PrimitiveTypes } from 'homebridge';
+import { CharacteristicValue, PlatformAccessory, PrimitiveTypes, Service } from 'homebridge';
+import { Common } from './common.js';
 import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
-import { CharacteristicType, MQTTAccessoryConfig, ServiceType, TemperatureConfig } from '../../model/types.js';
-import { Log, LogType } from '../../tools/log.js';
-type OnUpdateHandler = (topic: string, value: PrimitiveTypes) => (Promise<void>);
-export declare abstract class MQTTAccessory<C extends MQTTAccessoryConfig> {
-    protected readonly Characteristic: CharacteristicType;
-    protected readonly config: C;
-    protected readonly log: Log;
+import { CharacteristicType, MQTTAccessoryConfig, ServiceType } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare abstract class MQTTAccessory<C extends MQTTAccessoryConfig> extends Common<C> {
+    readonly Characteristic: CharacteristicType;
+    readonly platformAccessory: PlatformAccessory;
+    readonly config: C;
+    readonly log: Log;
     private readonly mqttClient;
-    private readonly properties;
-    private readonly topicHandlers;
     private readonly accessoryService;
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, isGrouped: boolean);
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, platformAccessory: PlatformAccessory, config: C, log: Log, isGrouped: boolean);
     protected abstract getAccessoryType(): AccessoryType;
-    protected get name(): string;
+    get service(): Service;
+    get identifier(): string;
+    get useStoredProperties(): boolean;
+    get disableLogging(): boolean;
     get subtype(): string | undefined;
     private setupCustomCharacteristics;
-    protected setupCharacteristic(characteristicKey: CharacteristicKey, defaultValue: CharacteristicValue, getTopicKey: keyof C, onUpdateHandler: OnUpdateHandler, assertGetTopic: boolean, setTopicKey?: keyof C | undefined, onSetHandler?: CharacteristicSetHandler | undefined): Characteristic | undefined;
-    protected bindOnUpdateNumeric(charKey: CharacteristicKey, logTemplate: string): OnUpdateHandler;
-    protected bindOnUpdateNumericBoolean(charKey: CharacteristicKey, valueKey: keyof C, logTrue: string, logFalse: string): OnUpdateHandler;
-    protected bindTemperatureUpdate<C extends TemperatureConfig>(config: C, charKey: CharacteristicKey, logTemplate: string): OnUpdateHandler;
-    protected addTopicHandler(topic: string, handler: (topic: string, value: PrimitiveTypes) => Promise<void>): 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;
+    publish(topic: string, value: PrimitiveTypes): void;
     teardown(): void;
-    protected assert(...keys: (keyof C)[]): boolean;
     protected setCharacteristicValue(key: CharacteristicKey, value: CharacteristicValue): void;
-    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;
-    protected logIfDesired(level: LogType, message: string, ...parameters: string[]): void;
 }
-export {};

package/dist/accessory/abstract/mqtt.js

@@ -1,50 +1,56 @@
+import { Common } from './common.js';
 import { CustomCharacteristic } from './customCharacteristic.js';
-import { strings } from '../../i18n/i18n.js';
-import { AccessoryType, CharacteristicKey, TemperatureUnits } from '../../model/enums.js';
+import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
 import { MQTT } from '../../model/mqtt.js';
-import { LogType } from '../../tools/log.js';
-import { toNumber, toPrimitive } from '../../tools/primitive.js';
-import { toCelsius } from '../../tools/temperature.js';
-import { assert } from '../../tools/validation.js';
-export class MQTTAccessory {
+import { createIdentifier } from './helper.js';
+export class MQTTAccessory extends Common {
     Characteristic;
+    platformAccessory;
     config;
     log;
     mqttClient;
-    properties = new Map();
-    topicHandlers = [];
     accessoryService;
-    constructor(Service, Characteristic, accessory, config, log, isGrouped) {
+    constructor(Service, Characteristic, platformAccessory, config, log, isGrouped) {
+        super(config.info.name);
         this.Characteristic = Characteristic;
+        this.platformAccessory = platformAccessory;
         this.config = config;
         this.log = log;
-        const name = config.info.name;
-        this.mqttClient = MQTT.connect(log, config.mqtt, name, (client) => {
+        this.mqttClient = MQTT.connect(log, config.mqtt, this.name, (client) => {
             this.topicHandlers.forEach(topicHandler => {
                 client.subscribe(topicHandler.topic, topicHandler.handler);
             });
         });
         const serviceInstance = Service[this.getAccessoryType()];
         if (isGrouped) {
-            let accessoryService = accessory.getServiceById(serviceInstance, config.info.id);
+            let accessoryService = platformAccessory.getServiceById(serviceInstance, this.identifier);
             if (!accessoryService) {
-                accessoryService = accessory.addService(serviceInstance, config.info.name, config.info.id);
+                accessoryService = platformAccessory.addService(serviceInstance, config.info.name, this.identifier);
                 accessoryService.setCharacteristic(Characteristic.ConfiguredName, config.info.name);
             }
             this.accessoryService = accessoryService;
             return;
         }
-        this.accessoryService = accessory.getService(serviceInstance) || accessory.addService(serviceInstance);
+        this.accessoryService = platformAccessory.getService(serviceInstance) || platformAccessory.addService(serviceInstance);
         for (const type of Object.values(AccessoryType)) {
-            const existingService = accessory.getService(Service[type]);
+            const existingService = platformAccessory.getService(Service[type]);
             if (existingService && type !== config.info.type) {
-                accessory.removeService(existingService);
+                platformAccessory.removeService(existingService);
             }
         }
         this.setupCustomCharacteristics();
     }
-    get name() {
-        return this.config.info.name;
+    get service() {
+        return this.accessoryService;
+    }
+    get identifier() {
+        return createIdentifier(this.config.info);
+    }
+    get useStoredProperties() {
+        return this.config.resetOnRestart !== true;
+    }
+    get disableLogging() {
+        return this.config.disableLogging;
     }
     get subtype() {
         return this.accessoryService.subtype;
@@ -62,86 +68,9 @@ export class MQTTAccessory {
         for (const config of this.config.customCharacteristics) {
             const customChar = CustomCharacteristic.create(this.accessoryService, this.Characteristic, config, this.name, this.log, this.config.disableLogging);
             if (customChar !== undefined) {
-                this.addTopicHandler(customChar.topic, customChar.onUpdateHandler);
-            }
-        }
-    }
-    setupCharacteristic(characteristicKey, defaultValue, getTopicKey, onUpdateHandler, assertGetTopic, setTopicKey = undefined, onSetHandler = undefined) {
-        if (!getTopicKey.toString().startsWith('topic')) {
-            throw new Error(`Trying to fetch topic with unexpected property name '${getTopicKey.toString()}'`);
-        }
-        if (assertGetTopic) {
-            this.assert(getTopicKey);
-        }
-        if (this.config[getTopicKey] === undefined) {
-            for (const characteristic of this.accessoryService.characteristics) {
-                if (characteristic.UUID === this.Characteristic[characteristicKey].UUID) {
-                    this.accessoryService.removeCharacteristic(characteristic);
-                    break;
-                }
-            }
-            return;
-        }
-        const characteristic = this.accessoryService.getCharacteristic(this.Characteristic[characteristicKey]);
-        this.properties.set(characteristicKey, defaultValue);
-        characteristic.onGet(async () => {
-            return this.properties.get(characteristicKey) ?? null;
-        });
-        this.addTopicHandler(this.config[getTopicKey], onUpdateHandler);
-        if (setTopicKey !== undefined) {
-            if (!setTopicKey.toString().startsWith('topic')) {
-                throw new Error(`Trying to fetch topic with unexpected property name '${setTopicKey.toString()}'`);
-            }
-            if (!onSetHandler) {
-                throw new Error(`Missing onSetHandler for topic '${setTopicKey.toString()}'`);
-            }
-            characteristic.onSet(onSetHandler);
-        }
-        return characteristic;
-    }
-    bindOnUpdateNumeric(charKey, logTemplate) {
-        return (async (_topic, value) => {
-            if (typeof value !== 'number') {
-                this.log.error(strings.characteristic.badValue, this.name, charKey, `'${value.toString()}'`);
-                return;
-            }
-            const logString = logTemplate.replace('%d', value.toString());
-            this.onUpdate(charKey, value, logString);
-        }).bind(this);
-    }
-    bindOnUpdateNumericBoolean(charKey, valueKey, logTrue, logFalse) {
-        return (async (_topic, value) => {
-            const numeric = value === this.getPrimitiveValue(valueKey) ? 1 : 0;
-            this.onUpdate(charKey, numeric, numeric ? logTrue : logFalse);
-        }).bind(this);
-    }
-    bindTemperatureUpdate(config, charKey, logTemplate) {
-        return (async (_topic, value) => {
-            if (typeof value !== 'number') {
-                this.log.error(strings.climate.badTemperatureValue, this.name, `'${value}'`);
-                return;
+                this.topicHandlers.push({ topic: customChar.topic, handler: customChar.onUpdateHandler });
             }
-            const units = config.temperatureUnits ?? TemperatureUnits.CELSIUS;
-            const temperature = toCelsius(toNumber(value), units);
-            const logString = logTemplate.replace('%d°%s', `${value}°${units}`);
-            this.onUpdate(charKey, temperature, logString);
-        }).bind(this);
-    }
-    addTopicHandler(topic, handler) {
-        this.topicHandlers.push({ topic: topic, handler: handler });
-    }
-    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);
@@ -149,56 +78,10 @@ export class MQTTAccessory {
     teardown() {
         this.mqttClient?.teardown();
     }
-    assert(...keys) {
-        return assert(this.log, this.name, this.config, ...keys);
-    }
     setCharacteristicValue(key, value) {
         this.accessoryService.getCharacteristic(this.Characteristic[key]).onGet(() => {
             return value;
         });
     }
-    onUpdate(key, value, logString = undefined) {
-        if (value === this.properties.get(key)) {
-            return false;
-        }
-        this.properties.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.properties.get(key)) {
-            this.logIfDesired(logString);
-        }
-        this.properties.set(key, value);
-        this.accessoryService.updateCharacteristic(this.Characteristic[key], value);
-        this.publish(this.config[topic], publish);
-    }
-    logIfDesired(levelOrMessage, ...rest) {
-        if (this.config.disableLogging) {
-            return;
-        }
-        if (typeof levelOrMessage === 'string') {
-            this.log.always(levelOrMessage, this.name, ...rest);
-            return;
-        }
-        const [message, ...parameters] = rest;
-        switch (levelOrMessage) {
-            case LogType.WARNING:
-                this.log.warning(message, this.name, ...parameters);
-                break;
-            case LogType.ERROR:
-                this.log.error(message, this.name, ...parameters);
-                break;
-            default:
-                this.log.always(message, this.name, ...parameters);
-                break;
-        }
-    }
 }
 //# sourceMappingURL=mqtt.js.map