homebridge-easy-mqtt 1.4.0-beta.0 → 1.4.0-beta.10

package/dist/model/enums.d.ts

@@ -1,4 +1,5 @@
 export declare enum AccessoryType {
+    AirPurifier = "AirPurifier",
     CarbonDioxideSensor = "CarbonDioxideSensor",
     CarbonMonoxideSensor = "CarbonMonoxideSensor",
     ContactSensor = "ContactSensor",
@@ -6,6 +7,7 @@ export declare enum AccessoryType {
     HumiditySensor = "HumiditySensor",
     LeakSensor = "LeakSensor",
     Lightbulb = "Lightbulb",
+    LightSensor = "LightSensor",
     LockMechanism = "LockMechanism",
     MotionSensor = "MotionSensor",
     OccupancySensor = "OccupancySensor",
@@ -14,7 +16,11 @@ export declare enum AccessoryType {
     SmokeSensor = "SmokeSensor",
     Switch = "Switch",
     TemperatureSensor = "TemperatureSensor",
-    Thermostat = "Thermostat"
+    Thermostat = "Thermostat",
+    Valve = "Valve"
+}
+export declare enum AddonType {
+    FilterMaintenance = "FilterMaintenance"
 }
 export declare enum CharacteristicKey {
     Active = "Active",
@@ -29,12 +35,18 @@ export declare enum CharacteristicKey {
     ColorTemperature = "ColorTemperature",
     ContactSensorState = "ContactSensorState",
     CoolingThresholdTemperature = "CoolingThresholdTemperature",
+    CurrentAmbientLightLevel = "CurrentAmbientLightLevel",
+    CurrentAirPurifierState = "CurrentAirPurifierState",
     CurrentHeaterCoolerState = "CurrentHeaterCoolerState",
     CurrentHeatingCoolingState = "CurrentHeatingCoolingState",
     CurrentRelativeHumidity = "CurrentRelativeHumidity",
     CurrentTemperature = "CurrentTemperature",
+    FilterChangeIndication = "FilterChangeIndication",
+    FilterLifeLevel = "FilterLifeLevel",
     HeatingThresholdTemperature = "HeatingThresholdTemperature",
     Hue = "Hue",
+    InUse = "InUse",
+    IsConfigured = "IsConfigured",
     LeakDetected = "LeakDetected",
     LockCurrentState = "LockCurrentState",
     LockPhysicalControls = "LockPhysicalControls",
@@ -43,23 +55,34 @@ export declare enum CharacteristicKey {
     OccupancyDetected = "OccupancyDetected",
     On = "On",
     OutletInUse = "OutletInUse",
+    RemainingDuration = "RemainingDuration",
+    ResetFilterIndication = "ResetFilterIndication",
     RotationSpeed = "RotationSpeed",
     Saturation = "Saturation",
     SecuritySystemCurrentState = "SecuritySystemCurrentState",
     SecuritySystemTargetState = "SecuritySystemTargetState",
+    SetDuration = "SetDuration",
     SmokeDetected = "SmokeDetected",
     StatusActive = "StatusActive",
     StatusFault = "StatusFault",
     StatusLowBattery = "StatusLowBattery",
     StatusTampered = "StatusTampered",
     SwingMode = "SwingMode",
+    TargetAirPurifierState = "TargetAirPurifierState",
     TargetHeaterCoolerState = "TargetHeaterCoolerState",
     TargetHeatingCoolingState = "TargetHeatingCoolingState",
     TargetRelativeHumidity = "TargetRelativeHumidity",
     TargetTemperature = "TargetTemperature",
-    TemperatureDisplayUnits = "TemperatureDisplayUnits"
+    TemperatureDisplayUnits = "TemperatureDisplayUnits",
+    ValveType = "ValveType"
 }
 export declare enum TemperatureUnits {
     CELSIUS = "C",
     FAHRENHEIT = "F"
 }
+export declare enum ValveType {
+    GENERIC_VALVE = "GENERIC_VALVE",
+    IRRIGATION = "IRRIGATION",
+    SHOWER_HEAD = "SHOWER_HEAD",
+    WATER_FAUCET = "WATER_FAUCET"
+}

package/dist/model/enums.js

@@ -1,5 +1,6 @@
 export var AccessoryType;
 (function (AccessoryType) {
+    AccessoryType["AirPurifier"] = "AirPurifier";
     AccessoryType["CarbonDioxideSensor"] = "CarbonDioxideSensor";
     AccessoryType["CarbonMonoxideSensor"] = "CarbonMonoxideSensor";
     AccessoryType["ContactSensor"] = "ContactSensor";
@@ -7,6 +8,7 @@ export var AccessoryType;
     AccessoryType["HumiditySensor"] = "HumiditySensor";
     AccessoryType["LeakSensor"] = "LeakSensor";
     AccessoryType["Lightbulb"] = "Lightbulb";
+    AccessoryType["LightSensor"] = "LightSensor";
     AccessoryType["LockMechanism"] = "LockMechanism";
     AccessoryType["MotionSensor"] = "MotionSensor";
     AccessoryType["OccupancySensor"] = "OccupancySensor";
@@ -16,7 +18,12 @@ export var AccessoryType;
     AccessoryType["Switch"] = "Switch";
     AccessoryType["TemperatureSensor"] = "TemperatureSensor";
     AccessoryType["Thermostat"] = "Thermostat";
+    AccessoryType["Valve"] = "Valve";
 })(AccessoryType || (AccessoryType = {}));
+export var AddonType;
+(function (AddonType) {
+    AddonType["FilterMaintenance"] = "FilterMaintenance";
+})(AddonType || (AddonType = {}));
 export var CharacteristicKey;
 (function (CharacteristicKey) {
     CharacteristicKey["Active"] = "Active";
@@ -31,12 +38,18 @@ export var CharacteristicKey;
     CharacteristicKey["ColorTemperature"] = "ColorTemperature";
     CharacteristicKey["ContactSensorState"] = "ContactSensorState";
     CharacteristicKey["CoolingThresholdTemperature"] = "CoolingThresholdTemperature";
+    CharacteristicKey["CurrentAmbientLightLevel"] = "CurrentAmbientLightLevel";
+    CharacteristicKey["CurrentAirPurifierState"] = "CurrentAirPurifierState";
     CharacteristicKey["CurrentHeaterCoolerState"] = "CurrentHeaterCoolerState";
     CharacteristicKey["CurrentHeatingCoolingState"] = "CurrentHeatingCoolingState";
     CharacteristicKey["CurrentRelativeHumidity"] = "CurrentRelativeHumidity";
     CharacteristicKey["CurrentTemperature"] = "CurrentTemperature";
+    CharacteristicKey["FilterChangeIndication"] = "FilterChangeIndication";
+    CharacteristicKey["FilterLifeLevel"] = "FilterLifeLevel";
     CharacteristicKey["HeatingThresholdTemperature"] = "HeatingThresholdTemperature";
     CharacteristicKey["Hue"] = "Hue";
+    CharacteristicKey["InUse"] = "InUse";
+    CharacteristicKey["IsConfigured"] = "IsConfigured";
     CharacteristicKey["LeakDetected"] = "LeakDetected";
     CharacteristicKey["LockCurrentState"] = "LockCurrentState";
     CharacteristicKey["LockPhysicalControls"] = "LockPhysicalControls";
@@ -45,25 +58,37 @@ export var CharacteristicKey;
     CharacteristicKey["OccupancyDetected"] = "OccupancyDetected";
     CharacteristicKey["On"] = "On";
     CharacteristicKey["OutletInUse"] = "OutletInUse";
+    CharacteristicKey["RemainingDuration"] = "RemainingDuration";
+    CharacteristicKey["ResetFilterIndication"] = "ResetFilterIndication";
     CharacteristicKey["RotationSpeed"] = "RotationSpeed";
     CharacteristicKey["Saturation"] = "Saturation";
     CharacteristicKey["SecuritySystemCurrentState"] = "SecuritySystemCurrentState";
     CharacteristicKey["SecuritySystemTargetState"] = "SecuritySystemTargetState";
+    CharacteristicKey["SetDuration"] = "SetDuration";
     CharacteristicKey["SmokeDetected"] = "SmokeDetected";
     CharacteristicKey["StatusActive"] = "StatusActive";
     CharacteristicKey["StatusFault"] = "StatusFault";
     CharacteristicKey["StatusLowBattery"] = "StatusLowBattery";
     CharacteristicKey["StatusTampered"] = "StatusTampered";
     CharacteristicKey["SwingMode"] = "SwingMode";
+    CharacteristicKey["TargetAirPurifierState"] = "TargetAirPurifierState";
     CharacteristicKey["TargetHeaterCoolerState"] = "TargetHeaterCoolerState";
     CharacteristicKey["TargetHeatingCoolingState"] = "TargetHeatingCoolingState";
     CharacteristicKey["TargetRelativeHumidity"] = "TargetRelativeHumidity";
     CharacteristicKey["TargetTemperature"] = "TargetTemperature";
     CharacteristicKey["TemperatureDisplayUnits"] = "TemperatureDisplayUnits";
+    CharacteristicKey["ValveType"] = "ValveType";
 })(CharacteristicKey || (CharacteristicKey = {}));
 export var TemperatureUnits;
 (function (TemperatureUnits) {
     TemperatureUnits["CELSIUS"] = "C";
     TemperatureUnits["FAHRENHEIT"] = "F";
 })(TemperatureUnits || (TemperatureUnits = {}));
+export var ValveType;
+(function (ValveType) {
+    ValveType["GENERIC_VALVE"] = "GENERIC_VALVE";
+    ValveType["IRRIGATION"] = "IRRIGATION";
+    ValveType["SHOWER_HEAD"] = "SHOWER_HEAD";
+    ValveType["WATER_FAUCET"] = "WATER_FAUCET";
+})(ValveType || (ValveType = {}));
 //# sourceMappingURL=enums.js.map

package/dist/model/enums.js.map

@@ -1 +1 @@
-{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/model/enums.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,aAiBX;AAjBD,WAAY,aAAa;IACvB,4DAA2C,CAAA;IAC3C,8DAA6C,CAAA;IAC7C,gDAA+B,CAAA;IAC/B,8CAA6B,CAAA;IAC7B,kDAAiC,CAAA;IACjC,0CAAyB,CAAA;IACzB,wCAAuB,CAAA;IACvB,gDAA+B,CAAA;IAC/B,8CAA6B,CAAA;IAC7B,oDAAmC,CAAA;IACnC,kCAAiB,CAAA;IACjB,kDAAiC,CAAA;IACjC,4CAA2B,CAAA;IAC3B,kCAAiB,CAAA;IACjB,wDAAuC,CAAA;IACvC,0CAAyB,CAAA;AAC3B,CAAC,EAjBW,aAAa,KAAb,aAAa,QAiBxB;AAED,MAAM,CAAN,IAAY,iBA0CX;AA1CD,WAAY,iBAAiB;IAC3B,sCAAiB,CAAA;IACjB,kDAA6B,CAAA;IAC7B,8CAAyB,CAAA;IACzB,oEAA+C,CAAA;IAC/C,8DAAyC,CAAA;IACzC,sEAAiD,CAAA;IACjD,sEAAiD,CAAA;IACjD,gEAA2C,CAAA;IAC3C,wEAAmD,CAAA;IACnD,0DAAqC,CAAA;IACrC,8DAAyC,CAAA;IACzC,gFAA2D,CAAA;IAC3D,0EAAqD,CAAA;IACrD,8EAAyD,CAAA;IACzD,wEAAmD,CAAA;IACnD,8DAAyC,CAAA;IACzC,gFAA2D,CAAA;IAC3D,gCAAW,CAAA;IACX,kDAA6B,CAAA;IAC7B,0DAAqC,CAAA;IACrC,kEAA6C,CAAA;IAC7C,wDAAmC,CAAA;IACnC,sDAAiC,CAAA;IACjC,4DAAuC,CAAA;IACvC,8BAAS,CAAA;IACT,gDAA2B,CAAA;IAC3B,oDAA+B,CAAA;IAC/B,8CAAyB,CAAA;IACzB,8EAAyD,CAAA;IACzD,4EAAuD,CAAA;IACvD,oDAA+B,CAAA;IAC/B,kDAA6B,CAAA;IAC7B,gDAA2B,CAAA;IAC3B,0DAAqC,CAAA;IACrC,sDAAiC,CAAA;IACjC,4CAAuB,CAAA;IACvB,wEAAmD,CAAA;IACnD,4EAAuD,CAAA;IACvD,sEAAiD,CAAA;IACjD,4DAAuC,CAAA;IACvC,wEAAmD,CAAA;AACrD,CAAC,EA1CW,iBAAiB,KAAjB,iBAAiB,QA0C5B;AAED,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,oCAAgB,CAAA;AAClB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B"}
+{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/model/enums.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,aAoBX;AApBD,WAAY,aAAa;IACvB,4CAA2B,CAAA;IAC3B,4DAA2C,CAAA;IAC3C,8DAA6C,CAAA;IAC7C,gDAA+B,CAAA;IAC/B,8CAA6B,CAAA;IAC7B,kDAAiC,CAAA;IACjC,0CAAyB,CAAA;IACzB,wCAAuB,CAAA;IACvB,4CAA2B,CAAA;IAC3B,gDAA+B,CAAA;IAC/B,8CAA6B,CAAA;IAC7B,oDAAmC,CAAA;IACnC,kCAAiB,CAAA;IACjB,kDAAiC,CAAA;IACjC,4CAA2B,CAAA;IAC3B,kCAAiB,CAAA;IACjB,wDAAuC,CAAA;IACvC,0CAAyB,CAAA;IACzB,gCAAe,CAAA;AACjB,CAAC,EApBW,aAAa,KAAb,aAAa,QAoBxB;AAED,MAAM,CAAN,IAAY,SAEX;AAFD,WAAY,SAAS;IACnB,oDAAuC,CAAA;AACzC,CAAC,EAFW,SAAS,KAAT,SAAS,QAEpB;AAED,MAAM,CAAN,IAAY,iBAqDX;AArDD,WAAY,iBAAiB;IAC3B,sCAAiB,CAAA;IACjB,kDAA6B,CAAA;IAC7B,8CAAyB,CAAA;IACzB,oEAA+C,CAAA;IAC/C,8DAAyC,CAAA;IACzC,sEAAiD,CAAA;IACjD,sEAAiD,CAAA;IACjD,gEAA2C,CAAA;IAC3C,wEAAmD,CAAA;IACnD,0DAAqC,CAAA;IACrC,8DAAyC,CAAA;IACzC,gFAA2D,CAAA;IAC3D,0EAAqD,CAAA;IACrD,wEAAmD,CAAA;IACnD,0EAAqD,CAAA;IACrD,8EAAyD,CAAA;IACzD,wEAAmD,CAAA;IACnD,8DAAyC,CAAA;IACzC,sEAAiD,CAAA;IACjD,wDAAmC,CAAA;IACnC,gFAA2D,CAAA;IAC3D,gCAAW,CAAA;IACX,oCAAe,CAAA;IACf,kDAA6B,CAAA;IAC7B,kDAA6B,CAAA;IAC7B,0DAAqC,CAAA;IACrC,kEAA6C,CAAA;IAC7C,wDAAmC,CAAA;IACnC,sDAAiC,CAAA;IACjC,4DAAuC,CAAA;IACvC,8BAAS,CAAA;IACT,gDAA2B,CAAA;IAC3B,4DAAuC,CAAA;IACvC,oEAA+C,CAAA;IAC/C,oDAA+B,CAAA;IAC/B,8CAAyB,CAAA;IACzB,8EAAyD,CAAA;IACzD,4EAAuD,CAAA;IACvD,gDAA2B,CAAA;IAC3B,oDAA+B,CAAA;IAC/B,kDAA6B,CAAA;IAC7B,gDAA2B,CAAA;IAC3B,0DAAqC,CAAA;IACrC,sDAAiC,CAAA;IACjC,4CAAuB,CAAA;IACvB,sEAAiD,CAAA;IACjD,wEAAmD,CAAA;IACnD,4EAAuD,CAAA;IACvD,sEAAiD,CAAA;IACjD,4DAAuC,CAAA;IACvC,wEAAmD,CAAA;IACnD,4CAAuB,CAAA;AACzB,CAAC,EArDW,iBAAiB,KAAjB,iBAAiB,QAqD5B;AAED,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,oCAAgB,CAAA;AAClB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAED,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,4CAA+B,CAAA;IAC/B,sCAAyB,CAAA;IACzB,wCAA2B,CAAA;IAC3B,0CAA6B,CAAA;AAC/B,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB"}

package/dist/model/mqtt.d.ts

@@ -2,19 +2,24 @@ import { PrimitiveTypes } from 'homebridge';
 import { MQTTConfig } from './types.js';
 import { Log } from '../tools/log.js';
 type MQTTMessageHandler = (topic: string, value: PrimitiveTypes) => void;
+type OnConnectCallback = ((client: MQTT) => (void));
 export declare class MQTT {
     private readonly log;
-    private readonly config;
-    private readonly onConnect;
-    private readonly caller;
+    private readonly broker;
+    private readonly options;
+    private static readonly INSTANCES;
+    private readonly onConnectCallbacks;
+    private readonly onConnectMessages;
     private client;
     private shouldReconnect;
     private isReconnecting;
     private reconnectCount;
-    private listeners;
-    constructor(log: Log, config: MQTTConfig, onConnect: () => (void), caller: string);
+    private readonly listeners;
+    static connect(log: Log, config: MQTTConfig | undefined, caller: string, onConnect: OnConnectCallback): MQTT | undefined;
+    private constructor();
+    private get host();
+    private connect;
     teardown(): void;
-    connect(): void;
     subscribe(topic: string, handler: MQTTMessageHandler): void;
     publish(rawTopic: string, value: PrimitiveTypes): void;
     private messageReceived;

package/dist/model/mqtt.js

@@ -1,10 +1,11 @@
+import { createHash } from 'crypto';
 import mqtt from 'mqtt';
 import { strings } from '../i18n/i18n.js';
 import { LogType } from '../tools/log.js';
 import { toPrimitive } from '../tools/primitive.js';
 import { SECOND, MINUTE } from '../tools/time.js';
-import { assert } from '../tools/validation.js';
 const DELAYS = [5 * SECOND, 10 * SECOND, 30 * SECOND, 2 * MINUTE, 5 * MINUTE];
+const DEFAULT_BROKER = 'mqtt://127.0.0.1/';
 function toTopicObject(rawTopic) {
     let base;
     let jsonPath;
@@ -29,61 +30,116 @@ class MQTTListener {
 }
 export class MQTT {
     log;
-    config;
-    onConnect;
-    caller;
-    client = null;
+    broker;
+    options;
+    static INSTANCES = new Map();
+    onConnectCallbacks = [];
+    onConnectMessages = new Map();
+    client = undefined;
     shouldReconnect = false;
     isReconnecting = false;
     reconnectCount = 0;
     listeners = new Map();
-    constructor(log, config, onConnect, caller) {
-        this.log = log;
-        this.config = config;
-        this.onConnect = onConnect;
-        this.caller = caller;
-    }
-    teardown() {
-        this.shouldReconnect = false;
-        if (this.client) {
-            this.client.end(true);
-            this.client = null;
-        }
-    }
-    connect() {
-        if (!assert(this.log, this.caller, this.config, 'broker')) {
-            return;
-        }
-        this.shouldReconnect = true;
+    static connect(log, config = undefined, caller, onConnect) {
         let additionalOptions = {};
+        const configOptions = config?.options ?? '{}';
         try {
-            if (this.config.options) {
-                additionalOptions = JSON.parse(this.config.options);
-            }
+            additionalOptions = JSON.parse(configOptions);
         }
         catch (err) {
-            this.log.error(`${strings.mqtt.badOptions}:\n"${this.config.options}"`, this.caller);
+            log.error(`${strings.mqttClient.badOptions}:\n"${configOptions}"`, this.caller);
+            return;
         }
         const options = {
             reconnectPeriod: 0,
-            username: this.config.username,
-            password: this.config.password,
+            username: config?.username ?? process.env.EASYMQTT_USERNAME,
+            password: config?.password ?? process.env.EASYMQTT_PASSWORD,
             ...additionalOptions,
         };
-        this.client = mqtt.connect(this.config.broker, options);
+        let seed = DEFAULT_BROKER;
+        const broker = config?.broker ?? process.env.EASYMQTT_BROKER ?? DEFAULT_BROKER;
+        try {
+            const url = new URL(broker);
+            url.port = url.port.length ? url.port : '1883';
+            seed = `${url.protocol}//${url.host}|${JSON.stringify(options)}`;
+        }
+        catch (error) {
+            seed = broker;
+        }
+        const id = createHash('md5').update(seed).digest('hex').slice(0, 4);
+        let instance = MQTT.INSTANCES.get(id);
+        if (instance !== undefined) {
+            log.ifVerbose(strings.mqttClient.reuse, caller, id);
+            if (instance.client?.connected) {
+                onConnect(instance);
+            }
+            instance.onConnectCallbacks.push(onConnect);
+            const onConnectMessages = config?.onConnect;
+            if (onConnectMessages !== undefined) {
+                const errorLog = '\n[ { "topic": "example/topic", "message": "example message" } ]';
+                if (!Array.isArray(onConnectMessages)) {
+                    log.error(strings.mqttClient.badMessages, errorLog);
+                }
+                else {
+                    for (const message of onConnectMessages) {
+                        if (message.topic === undefined || message.message === undefined) {
+                            log.error(strings.mqttClient.badMessages, errorLog);
+                            continue;
+                        }
+                        const key = `${message.topic}|${message.message}`;
+                        instance?.onConnectMessages.set(key, message);
+                    }
+                }
+            }
+            return instance;
+        }
+        log.ifVerbose(strings.mqttClient.new, caller, id);
+        instance = new MQTT(log, broker, options);
+        MQTT.INSTANCES.set(id, instance);
+        instance.onConnectCallbacks.push(onConnect);
+        instance.connect();
+        return instance;
+    }
+    constructor(log, broker, options) {
+        this.log = log;
+        this.broker = broker;
+        this.options = options;
+    }
+    get host() {
+        try {
+            const url = new URL(this.broker);
+            return url.host;
+        }
+        catch {
+            return this.broker;
+        }
+    }
+    connect() {
+        this.shouldReconnect = true;
+        this.client = mqtt.connect(this.broker, this.options);
         this.client.on('connect', () => {
-            this.log.ifVerbose(strings.mqtt.connected, this.caller);
-            this.onConnect();
+            this.log.ifVerbose(strings.mqttClient.connected, this.host);
+            this.onConnectCallbacks.forEach(callback => {
+                callback(this);
+            });
+            this.onConnectMessages.forEach(message => {
+                this.publish(message.topic, message.message);
+            });
         });
         this.client.on('message', (topic, message) => this.messageReceived(topic, message.toString()));
         this.client.on('close', () => this.connectionClosed());
         this.client.on('error', (error) => {
-            this.log.ifVerbose(LogType.WARNING, strings.mqtt.clientError, this.caller, error);
+            this.log.ifVerbose(LogType.WARNING, `${strings.mqttClient.error}: ${error}`, this.host);
         });
     }
+    teardown() {
+        this.shouldReconnect = false;
+        this.client?.end(true);
+        this.client = undefined;
+    }
     subscribe(topic, handler) {
-        if (!this.client) {
-            this.log.error(strings.mqtt.notConnected, this.caller);
+        if (!this.client || !this.client.connected) {
+            this.log.error(strings.mqttClient.notConnected, this.host);
             return;
         }
         const mqttListener = new MQTTListener(topic, handler);
@@ -94,7 +150,7 @@ export class MQTT {
     }
     publish(rawTopic, value) {
         if (!this.client || !this.client.connected) {
-            this.log.error(strings.mqtt.notConnected, this.caller);
+            this.log.error(strings.mqttClient.notConnected, this.host);
             return;
         }
         const topic = toTopicObject(rawTopic);
@@ -117,16 +173,16 @@ export class MQTT {
             message = value.toString();
         }
         this.client.publish(topic.base, message);
-        this.log.ifVerbose(strings.mqtt.publish, this.caller, value, topic);
+        this.log.ifVerbose(`${strings.mqttClient.publish} — ${topic.base} ${message}`, this.host);
     }
     messageReceived(topic, message) {
         this.reconnectCount = 0;
         try {
             message = message.trim();
-            this.log.ifVerbose(strings.mqtt.receivedMessage, this.caller, topic, message);
+            this.log.ifVerbose(strings.mqttClient.receivedMessage, this.host, topic, `\n${message}`);
             const listeners = this.listeners.get(topic);
             if (!listeners || listeners.length === 0) {
-                this.log.ifVerbose(strings.mqtt.noListeners, this.caller, topic);
+                this.log.ifVerbose(strings.mqttClient.noListeners, this.host, topic);
                 return;
             }
             for (const listener of listeners) {
@@ -151,11 +207,11 @@ export class MQTT {
             }
         }
         catch (e) {
-            this.log.error(strings.mqtt.parseFailed, this.caller, `\n${message}`);
+            this.log.error(strings.mqttClient.parseFailed, this.host, `\n${message}`);
         }
     }
     connectionClosed() {
-        this.log.ifVerbose(strings.mqtt.connectionClosed, this.caller);
+        this.log.ifVerbose(strings.mqttClient.connectionClosed, this.host);
         this.reconnect();
     }
     async reconnect() {
@@ -165,14 +221,14 @@ export class MQTT {
         this.isReconnecting = true;
         if (this.client) {
             this.client.end(true);
-            this.client = null;
+            this.client = undefined;
         }
         const reconnectDelay = DELAYS[Math.min(this.reconnectCount, DELAYS.length - 1)];
         if (reconnectDelay < MINUTE) {
-            this.log.ifVerbose(strings.mqtt.reconnectInSeconds, this.caller, reconnectDelay / SECOND);
+            this.log.ifVerbose(strings.mqttClient.reconnectSeconds, this.host, reconnectDelay / SECOND);
         }
         else {
-            this.log.ifVerbose(strings.mqtt.reconnectInMinutes, this.caller, reconnectDelay / MINUTE);
+            this.log.ifVerbose(strings.mqttClient.reconnectMinutes, this.host, reconnectDelay / MINUTE);
         }
         this.reconnectCount++;
         setTimeout(() => {

package/dist/model/mqtt.js.map

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

package/dist/model/types.d.ts

@@ -1,7 +1,7 @@
 import { PlatformConfig as HBPlatformConfig } from 'homebridge';
 export type ServiceType = typeof import('homebridge').Service;
 export type CharacteristicType = typeof import('homebridge').Characteristic;
-import { AccessoryType, TemperatureUnits } from './enums.js';
+import { AccessoryType, TemperatureUnits, ValveType } from './enums.js';
 import { Assertable } from '../tools/validation.js';
 export type PlatformConfig = HBPlatformConfig & {
     accessories?: BaseAccessoryConfig[];
@@ -9,6 +9,14 @@ export type PlatformConfig = HBPlatformConfig & {
 export type TemperatureConfig = {
     temperatureUnits?: TemperatureUnits;
 };
+export type AddonConfig = Assertable & {};
+export type FilterMaintenanceConfig = AddonConfig & {
+    topicGetFilterChangeIndication: string;
+    topicGetFilterLifeLevel?: string;
+    topicResetFilterIndication?: string;
+    valueFilterChange: string;
+    valueFilterReset: string;
+};
 type ErrorStatusConfig = {
     topicGetStatusFault?: string;
     topicGetStatusTampered?: string;
@@ -27,15 +35,20 @@ type AdditionalInfoConfig = InfoConfig & {
     serialNumber?: string;
     version?: string;
 };
+export type MQTTMessage = Assertable & {
+    topic: string;
+    message: string;
+};
 export type MQTTConfig = Assertable & {
-    broker: string;
+    broker?: string;
     username?: string;
     password?: string;
     options?: string;
+    onConnect?: MQTTMessage[];
 };
 export type MQTTAccessoryConfig = Assertable & {
-    mqtt: MQTTConfig;
     info: InfoConfig;
+    mqtt?: MQTTConfig;
     customCharacteristics?: CustomCharacteristicConfig[];
     disableLogging: boolean;
 };
@@ -98,6 +111,9 @@ export type LeakSensorConfig = SensorConfig & {
     topicGetLeakDetected: string;
     valueLeakDetected: string;
 };
+export type LightSensorConfig = SensorConfig & {
+    topicGetCurrentAmbientLightLevel: string;
+};
 export type MotionSensorConfig = SensorConfig & {
     topicGetMotionDetected: string;
     valueMotionDetected: string;
@@ -113,50 +129,62 @@ export type SmokeSensorConfig = SensorConfig & {
 export type TemperatureSensorConfig = SensorConfig & TemperatureConfig & {
     topicGetCurrentTemperature: string;
 };
-export type ClimateControlConfig = BaseAccessoryConfig & TemperatureConfig & {
+export type TemperatureControlConfig = BaseAccessoryConfig & TemperatureConfig & {
     topicGetCoolingThresholdTemperature?: string;
     topicGetCurrentTemperature: string;
     topicGetHeatingThresholdTemperature?: string;
     topicSetCoolingThresholdTemperature?: string;
     topicSetHeatingThresholdTemperature?: string;
 };
-export type HeaterCoolerConfig = ClimateControlConfig & {
+export type ThermostatConfig = TemperatureControlConfig & FilterMaintenanceConfig & {
+    topicGetCurrentHeatingCoolingState: string;
+    topicGetCurrentRelativeHumidity?: string;
+    topicGetTargetHeatingCoolingState: string;
+    topicGetTargetRelativeHumidity?: string;
+    topicGetTargetTemperature: string;
+    topicSetTargetHeatingCoolingState: string;
+    topicSetTargetRelativeHumidity?: string;
+    topicSetTargetTemperature: string;
+    valueModeAuto?: string;
+    valueModeCool?: string;
+    valueModeHeat?: string;
+    valueModeOff?: string;
+};
+export type ActiveClimateConfig = TemperatureControlConfig & {
     topicGetActive: string;
-    topicGetCurrentHeaterCoolerState: string;
     topicGetLockPhysicalControls?: string;
     topicGetRotationSpeed?: string;
     topicGetSwingMode?: string;
-    topicGetTargetHeaterCoolerState: string;
     topicSetActive: string;
     topicSetLockPhysicalControls?: string;
     topicSetRotationSpeed?: string;
     topicSetSwingMode?: string;
-    topicSetTargetHeaterCoolerState: string;
     valueControlLock?: string;
     valueControlUnlock?: string;
-    valueModeAuto?: string;
-    valueModeCool?: string;
-    valueModeHeat?: string;
-    valueModeIdle?: string;
-    valueModeInactive?: string;
     valueStateActive: string;
     valueStateInactive: string;
     valueSwingEnabled?: string;
     valueSwingDisabled?: string;
 };
-export type ThermostatConfig = ClimateControlConfig & {
-    topicGetCurrentHeatingCoolingState: string;
-    topicGetCurrentRelativeHumidity?: string;
-    topicGetTargetHeatingCoolingState: string;
-    topicGetTargetRelativeHumidity?: string;
-    topicGetTargetTemperature: string;
-    topicSetTargetHeatingCoolingState: string;
-    topicSetTargetRelativeHumidity?: string;
-    topicSetTargetTemperature: string;
+export type HeaterCoolerConfig = ActiveClimateConfig & FilterMaintenanceConfig & {
+    topicGetCurrentHeaterCoolerState: string;
+    topicGetTargetHeaterCoolerState: string;
+    topicSetTargetHeaterCoolerState: string;
     valueModeAuto?: string;
     valueModeCool?: string;
     valueModeHeat?: string;
-    valueModeOff?: string;
+    valueModeIdle?: string;
+    valueModeInactive?: string;
+};
+export type PurifierConfig = ActiveClimateConfig & FilterMaintenanceConfig & {
+    topicGetCurrentPurifierState: string;
+    topicGetTargetPurifierState: string;
+    topicSetTargetPurifierState: string;
+    valueModeAuto?: string;
+    valueModeIdle?: string;
+    valueModeInactive?: string;
+    valueModeManual?: string;
+    valueModePurifying?: string;
 };
 export type LockConfig = BaseAccessoryConfig & {
     topicGetCurrentLockState: string;
@@ -179,4 +207,22 @@ export type SecurityConfig = BaseAccessoryConfig & ErrorStatusConfig & {
     valueDisarm?: string;
     valueAlarmTriggered?: string;
 };
+export type ValveConfig = BaseAccessoryConfig & {
+    valveType?: ValveType;
+    topicGetStatusFault?: string;
+    topicGetValveActive: string;
+    topicGetValveInUse: string;
+    topicGetValveIsConfigured?: string;
+    topicGetValveRemainingDuration?: string;
+    topicGetValveSetDuration?: string;
+    topicSetValveActive: string;
+    topicSetValveIsConfigured?: string;
+    topicSetValveSetDuration?: string;
+    valueActive: string;
+    valueConfigured?: string;
+    valueFault?: string;
+    valueInactive: string;
+    valueInUse: string;
+    valueNotConfigured?: string;
+};
 export {};

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge Easy MQTT",
   "description": "Homebridge plugin for easy control of MQTT devices",
   "type": "module",
-  "version": "1.4.0-beta.0",
+  "version": "1.4.0-beta.10",
   "homepage": "https://github.com/mpatfield/homebridge-easy-mqtt#readme",
   "repository": {
     "type": "git",

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

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