homebridge-easy-mqtt 1.3.0-beta.3 → 1.3.0-beta.5

package/dist/homebridge/platform.js

@@ -1,20 +1,7 @@
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
-import { ContactSensorAccessory } from '../accessory/sensor/contact.js';
-import { CO2SensorAccessory } from '../accessory/sensor/carbonDioxide.js';
-import { COSensorAccessory } from '../accessory/sensor/carbonMonoxide.js';
-import { HumiditySensorAccessory } from '../accessory/sensor/humidity.js';
-import { LeakSensorAccessory } from '../accessory/sensor/leak.js';
-import { LightbulbAccessory } from '../accessory/onoff/lightbulb.js';
-import { LockMechanismAccessory } from '../accessory/lock.js';
-import { MotionSensorAccessory } from '../accessory/sensor/motion.js';
-import { OccupancySensorAccessory } from '../accessory/sensor/occupancy.js';
-import { OutletAccessory } from '../accessory/onoff/outlet.js';
-import { SecuritySystemAccessory } from '../accessory/security.js';
-import { SmokeSensorAccessory } from '../accessory/sensor/smoke.js';
-import { SwitchAccessory } from '../accessory/onoff/switch.js';
-import { TemperatureSensorAccessory } from '../accessory/sensor/temperature.js';
+import { GroupAccessory } from '../accessory/abstract/group.js';
+import { createAccessory } from '../accessory/abstract/helper.js';
 import { setLanguage, strings } from '../i18n/i18n.js';
-import { AccessoryType } from '../model/enums.js';
 import { Log } from '../tools/log.js';
 import getVersion from '../tools/version.js';
 import { assert } from '../tools/validation.js';
@@ -52,74 +39,39 @@ export class HomebridgeEasyMQTT {
             this.config.accessories = [];
         }
         const keepIdentifiers = new Set();
+        const groups = new Map();
+        const Service = this.api.hap.Service;
+        const Characteristic = this.api.hap.Characteristic;
         for (const accessoryConfig of this.config.accessories) {
             if (!assert(this.log, PLATFORM_NAME, accessoryConfig, 'info') ||
                 !assert(this.log, PLATFORM_NAME, accessoryConfig.info, 'name', 'type')) {
                 continue;
             }
+            const groupName = accessoryConfig.info.group;
+            if (groupName !== undefined) {
+                const group = groups.get(groupName) ?? [];
+                group.push(accessoryConfig);
+                groups.set(groupName, group);
+                continue;
+            }
             const id = accessoryConfig.info.id ?? `${PLUGIN_NAME}:${accessoryConfig.info.type}:${accessoryConfig.info.name}`;
             const uuid = this.api.hap.uuid.generate(id);
-            let platformAccessory = this.platformAccessories.get(uuid);
-            if (!platformAccessory) {
-                platformAccessory = new this.api.platformAccessory(accessoryConfig.info.name, uuid);
-                platformAccessory.context.identifier = uuid;
-                this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [platformAccessory]);
-                this.platformAccessories.set(uuid, platformAccessory);
-                this.log.always(strings.startup.newAccessory, accessoryConfig.info.name);
-            }
-            const Service = this.api.hap.Service;
-            const Characteristic = this.api.hap.Characteristic;
-            let accessory;
-            switch (accessoryConfig.info.type) {
-                case AccessoryType.CarbonDioxideSensor:
-                    accessory = new CO2SensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.CarbonMonoxideSensor:
-                    accessory = new COSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.ContactSensor:
-                    accessory = new ContactSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.HumiditySensor:
-                    accessory = new HumiditySensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.LeakSensor:
-                    accessory = new LeakSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.Lightbulb:
-                    accessory = new LightbulbAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.LockMechanism:
-                    accessory = new LockMechanismAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.MotionSensor:
-                    accessory = new MotionSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.OccupancySensor:
-                    accessory = new OccupancySensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.Outlet:
-                    accessory = new OutletAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.SecuritySystem:
-                    accessory = new SecuritySystemAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.SmokeSensor:
-                    accessory = new SmokeSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.Switch:
-                    accessory = new SwitchAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                case AccessoryType.TemperatureSensor:
-                    accessory = new TemperatureSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
-                    break;
-                default:
-                    this.log.error(strings.startup.unsupportedType, accessoryConfig.info.type);
-                    continue;
+            const platformAccessory = this.createPlatformAccessory(accessoryConfig.info.name, uuid);
+            const accessory = createAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
+            if (accessory === undefined) {
+                continue;
             }
             keepIdentifiers.add(uuid);
             this.accessories.push(accessory);
         }
+        for (const groupName of groups.keys()) {
+            const uuid = this.api.hap.uuid.generate(groupName);
+            const platformAccessory = this.createPlatformAccessory(groupName, uuid);
+            const configs = groups.get(groupName);
+            const groupAccessory = new GroupAccessory(Service, Characteristic, platformAccessory, this.log, groupName, configs);
+            keepIdentifiers.add(uuid);
+            this.accessories.push(groupAccessory);
+        }
         this.platformAccessories.forEach(accessory => {
             if (!keepIdentifiers.has(accessory.context.identifier)) {
                 this.removeCachedAccessory(accessory);
@@ -128,6 +80,17 @@ export class HomebridgeEasyMQTT {
         const randIndex = Math.floor(Math.random() * strings.startup.welcome.length);
         this.log.always(strings.startup.complete, strings.startup.welcome[randIndex]);
     }
+    createPlatformAccessory(name, uuid) {
+        let platformAccessory = this.platformAccessories.get(uuid);
+        if (!platformAccessory) {
+            platformAccessory = new this.api.platformAccessory(name, uuid);
+            platformAccessory.context.identifier = uuid;
+            this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [platformAccessory]);
+            this.platformAccessories.set(uuid, platformAccessory);
+            this.log.always(strings.startup.newAccessory, name);
+        }
+        return platformAccessory;
+    }
     removeCachedAccessory(accessory) {
         this.log.always(strings.startup.removeAccessory, accessory.displayName);
         this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);

package/dist/homebridge/platform.js.map

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

package/dist/homebridge-ui/public/index.html

@@ -24,4 +24,4 @@
 
 <footer id="footer" class="text-center" style="display: none; font-style: italic; font-size: 0.9em;" i18n="required"></footer>
 
-<script src="ui.js?v=1.3.0-beta.3"></script>
+<script src="ui.js?v=1.3.0-beta.5"></script>

package/dist/homebridge-ui/public/ui.js

@@ -1 +1 @@
-"use strict";(()=>{var u={arrow:"&rarr;",easy_mqtt:"Easy MQTT",github:'<a target="_blank" href="https://github.com/mpatfield/homebridge-easy-mqtt/">GitHub</a>'};function g(n){document.querySelectorAll("[i18n]").forEach(t=>{let o=t.getAttribute("i18n"),r=n.config[o],e=t.getAttribute("i18n_replace");e&&(r=r.replace("%s",u[e])),t.innerHTML=r})}function f(n){let t=["span","label","legend","option","p"];Array.from(window.parent.document.querySelectorAll(t.join(","))).sort((r,e)=>t.indexOf(r.tagName.toLowerCase())-t.indexOf(e.tagName.toLowerCase())).forEach(r=>{let e=r.innerHTML;e=e.replaceAll(/\$\{config\.(title|description|enumNames)\.([^}]+)\}/g,(s,i,a)=>n.config[i]&&typeof n.config[i]=="object"&&a in n.config[i]?n.config[i][a]:s),r.innerHTML!==e&&(r.innerHTML=e)})}function d(n){let t=Array.from(window.parent.document.querySelectorAll("fieldset legend"));for(let o of t){let e=o.closest("fieldset")?.querySelector('input[type="text"][name="name"]');e&&o.textContent!==(e.value||n.config.title.accessory)&&(o.textContent=e.value!==""?e.value:n.config.title.accessory),e&&!e.dataset.accessoryNameListener&&(e.addEventListener("input",()=>d(n)),e.dataset.accessoryNameListener="true")}}function c(){if(typeof crypto<"u"){if(crypto.randomUUID)return crypto.randomUUID();if(crypto.getRandomValues)return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=crypto.getRandomValues(new Uint8Array(1))[0]&15;return(n==="x"?t:t&3|8).toString(16)})}return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=Math.random()*16|0;return(n==="x"?t:t&3|8).toString(16)})}function m(n){let t=!1;n.accessories?.forEach(o=>{if(o.info.id===void 0){let r=c();o.info.id=r,t=!0}}),t&&homebridge.updatePluginConfig([n])}async function x(n){let t=!1;for(let o of n)for(let r of o.accessories??[]){if(r.info.type!=="LockMechanism")continue;let e=r;e.topicGetLockCurrentState!==void 0&&(e.topicGetCurrentLockState=e.topicGetLockCurrentState,e.topicGetLockCurrentState=void 0,t=!0),e.topicGetLockTargetState!==void 0&&(e.topicGetTargetLockState=e.topicGetLockTargetState,e.topicGetLockTargetState=void 0,t=!0),e.topicSetTargetState!==void 0&&(e.topicSetTargetLockState=e.topicSetTargetState,e.topicSetTargetState=void 0,t=!0)}t&&await homebridge.updatePluginConfig(n)}function l(n){document.getElementById("pageIntro").style.display="none",document.getElementById("support").style.display="block",document.getElementById("footer").style.display="block",new MutationObserver(()=>{f(n),d(n)}).observe(window.parent.document.body,{childList:!0,subtree:!0}),homebridge.showSchemaForm(),homebridge.addEventListener("configChanged",o=>{let r=o.data;r.length&&m(r[0])}),homebridge.hideSpinner()}function S(n){document.getElementById("introContinue").addEventListener("click",async()=>{l(n)}),document.getElementById("pageIntro").style.display="block",homebridge.hideSpinner()}homebridge.showSpinner();(async()=>{let n=await homebridge.i18nCurrentLang(),t=await homebridge.request("i18n",n);g(t);let o=await homebridge.getPluginConfig();o.length?(await x(o),l(t)):(await homebridge.updatePluginConfig([{name:u.easy_mqtt}]),S(t))})();})();
+"use strict";(()=>{var u={arrow:"&rarr;",easy_mqtt:"Easy MQTT",github:'<a target="_blank" href="https://github.com/mpatfield/homebridge-easy-mqtt/">GitHub</a>'};function s(n){document.querySelectorAll("[i18n]").forEach(t=>{let o=t.getAttribute("i18n"),r=n.config[o],e=t.getAttribute("i18n_replace");e&&(r=r.replace("%s",u[e])),t.innerHTML=r})}function m(n){let t=["span","label","legend","option","p"];Array.from(window.parent.document.querySelectorAll(t.join(","))).sort((r,e)=>t.indexOf(r.tagName.toLowerCase())-t.indexOf(e.tagName.toLowerCase())).forEach(r=>{let e=r.innerHTML;e=e.replaceAll(/\$\{config\.(title|description|enumNames)\.([^}]+)\}/g,(g,a,i)=>n.config[a]&&typeof n.config[a]=="object"&&i in n.config[a]?n.config[a][i]:g),r.innerHTML!==e&&(r.innerHTML=e)})}function d(n){let t=Array.from(window.parent.document.querySelectorAll("fieldset legend"));for(let o of t){let e=o.closest("fieldset")?.querySelector('input[type="text"][name="name"]');e&&o.textContent!==(e.value||n.config.title.accessory)&&(o.textContent=e.value!==""?e.value:n.config.title.accessory),e&&!e.dataset.accessoryNameListener&&(e.addEventListener("input",()=>d(n)),e.dataset.accessoryNameListener="true")}}function f(){if(typeof crypto<"u"){if(crypto.randomUUID)return crypto.randomUUID();if(crypto.getRandomValues)return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=crypto.getRandomValues(new Uint8Array(1))[0]&15;return(n==="x"?t:t&3|8).toString(16)})}return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=Math.random()*16|0;return(n==="x"?t:t&3|8).toString(16)})}function x(n){let t=!1;n.accessories?.forEach(o=>{if(o.info.id===void 0){let r=f();o.info.id=r,t=!0}}),t&&homebridge.updatePluginConfig([n])}async function S(n){let t=!1;for(let o of n)for(let r of o.accessories??[]){if(r.info.type!=="LockMechanism")continue;let e=r;e.topicGetLockCurrentState!==void 0&&(e.topicGetCurrentLockState=e.topicGetLockCurrentState,e.topicGetLockCurrentState=void 0,t=!0),e.topicGetLockTargetState!==void 0&&(e.topicGetTargetLockState=e.topicGetLockTargetState,e.topicGetLockTargetState=void 0,t=!0),e.topicSetTargetState!==void 0&&(e.topicSetTargetLockState=e.topicSetTargetState,e.topicSetTargetState=void 0,t=!0)}t&&await homebridge.updatePluginConfig(n)}function l(n){document.getElementById("pageIntro").style.display="none",document.getElementById("support").style.display="block",document.getElementById("footer").style.display="block",new MutationObserver(()=>{m(n),d(n)}).observe(window.parent.document.body,{childList:!0,subtree:!0}),homebridge.showSchemaForm(),homebridge.addEventListener("configChanged",o=>{let r=o.data;r.length&&x(r[0])}),homebridge.hideSpinner()}function c(n){document.getElementById("introContinue").addEventListener("click",async()=>{l(n)}),document.getElementById("pageIntro").style.display="block",homebridge.hideSpinner()}homebridge.showSpinner();(async()=>{let n=await homebridge.i18nCurrentLang(),t=await homebridge.request("i18n",n);s(t);let o=await homebridge.getPluginConfig();o.length?(await S(o),l(t)):(await homebridge.updatePluginConfig([{name:u.easy_mqtt}]),c(t))})();})();

package/dist/i18n/en.d.ts

@@ -1,6 +1,5 @@
 declare const en: {
     accessory: {
-        badNumericValue: string;
         batteryLevel: string;
         batteryLow: string;
         batteryNotLow: string;
@@ -8,6 +7,11 @@ declare const en: {
         statusActive: string;
         statusInactive: string;
     };
+    climate: {
+        badTemperatureValue: string;
+        humidityUpdate: string;
+        temperatureUpdate: string;
+    };
     config: {
         continue: string;
         required: string;
@@ -35,6 +39,7 @@ declare const en: {
             securitySystem: string;
             smokeSensor: string;
             temperatureSensor: string;
+            thermostat: string;
         };
         title: {
             accessory: string;
@@ -44,6 +49,7 @@ declare const en: {
             options: string;
             password: string;
             sourceUnits: string;
+            group: string;
             topicGetBatteryLevel: string;
             topicGetBatteryLow: string;
             topicGetStatusActive: string;
@@ -79,6 +85,18 @@ declare const en: {
             topicGetOccupancyDetected: string;
             topicGetSmokeDetected: string;
             topicGetCurrentRelativeHumidity: string;
+            topicGetCoolingThresholdTemperature: string;
+            topicGetCurrentHeatingCoolingState: string;
+            topicGetCurrentRelativeHumidityOptional: string;
+            topicGetHeatingThresholdTemperature: string;
+            topicGetTargetHeatingCoolingState: string;
+            topicGetTargetRelativeHumidity: string;
+            topicGetTargetTemperature: string;
+            topicSetCoolingThresholdTemperature: string;
+            topicSetHeatingThresholdTemperature: string;
+            topicSetTargetHeatingCoolingState: string;
+            topicSetTargetRelativeHumidity: string;
+            topicSetTargetTemperature: string;
             topics: string;
             type: string;
             username: string;
@@ -105,6 +123,10 @@ declare const en: {
             valueMotionDetected: string;
             valueOccupancyDetected: string;
             valueSmokeDetected: string;
+            valueModeAuto: string;
+            valueModeCool: string;
+            valueModeHeat: string;
+            valueModeOff: string;
             values: string;
             verbose: string;
         };
@@ -121,20 +143,20 @@ declare const en: {
     };
     lightbulb: {
         brightness: string;
-        futureBrightness: string;
+        brightnessFuture: string;
         hue: string;
-        futureHue: string;
+        hueFuture: string;
         colorTemperature: string;
-        futureColorTemperature: string;
+        colorTemperatureFuture: string;
         saturation: string;
-        futureSaturation: string;
+        saturationFuture: string;
     };
     lock: {
         badValue: string;
-        stateCurrentSecured: string;
-        stateCurrentUnsecured: string;
-        stateFutureSecured: string;
-        stateFutureUnsecured: string;
+        stateSecured: string;
+        stateSecuredFuture: string;
+        stateUnsecured: string;
+        stateUnsecuredFuture: string;
         stateJammed: string;
         stateUnknown: string;
     };
@@ -153,10 +175,10 @@ declare const en: {
         reconnectInSeconds: string;
     };
     onOff: {
-        stateFutureOff: string;
-        stateFutureOn: string;
-        stateOn: string;
         stateOff: string;
+        stateOffFuture: string;
+        stateOn: string;
+        stateOnFuture: string;
         unknownValue: string;
     };
     outlet: {
@@ -167,15 +189,15 @@ declare const en: {
     security: {
         badValue: string;
         noStateValues: string;
-        stateCurrentArmAway: string;
-        stateCurrentArmNight: string;
-        stateCurrentArmStay: string;
-        stateCurrentAlarmTriggered: string;
-        stateCurrentDisarm: string;
-        stateFutureArmAway: string;
-        stateFutureArmNight: string;
-        stateFutureArmStay: string;
-        stateFutureDisarm: string;
+        stateAway: string;
+        stateAwayFuture: string;
+        stateNight: string;
+        stateNightFuture: string;
+        stateStay: string;
+        stateStayFuture: string;
+        stateTriggered: string;
+        stateDisarmed: string;
+        stateDisarmFuture: string;
         stateUnknown: string;
         unknownValue: string;
     };
@@ -196,9 +218,6 @@ declare const en: {
             active: string;
             inactive: string;
         };
-        humidity: {
-            update: string;
-        };
         leak: {
             active: string;
             inactive: string;
@@ -215,10 +234,6 @@ declare const en: {
             active: string;
             inactive: string;
         };
-        temperature: {
-            badValue: string;
-            update: string;
-        };
     };
     startup: {
         complete: string;
@@ -228,5 +243,25 @@ declare const en: {
         unsupportedType: string;
         welcome: string[];
     };
+    thermostat: {
+        badValue: string;
+        coolingThreshold: string;
+        coolingThresholdFuture: string;
+        heatingThreshold: string;
+        heatingThresholdFuture: string;
+        noStateValues: string;
+        humidityFuture: string;
+        stateAutoFuture: string;
+        stateCool: string;
+        stateCoolFuture: string;
+        stateHeat: string;
+        stateHeatFuture: string;
+        stateOff: string;
+        stateOffFuture: string;
+        stateUnknown: string;
+        temperatureTarget: string;
+        temperatureTargetFuture: string;
+        unknownValue: string;
+    };
 };
 export default en;

package/dist/i18n/en.js

@@ -1,6 +1,5 @@
 const en = {
     accessory: {
-        badNumericValue: '%s expected a number for %s but received %s', // accessory name, characteristic name, value
         batteryLevel: '%s battery is at %d%', // accessory name, number
         batteryLow: '%s battery is low', // accessory name
         batteryNotLow: '%s battery is okay', // accessory name
@@ -8,6 +7,11 @@ const en = {
         statusActive: '%s is now available', // accessory name
         statusInactive: '%s is unavailable', // accessory name
     },
+    climate: {
+        badTemperatureValue: '%s expected a number for temperature but received %s', // accessory name, value
+        humidityUpdate: '%s humidity is %d%', // accessory name, number
+        temperatureUpdate: '%s temperature is %d°%s', // accessory name, number, units
+    },
     config: {
         continue: 'Continue %s', // arrow symbol
         required: 'Required fields are marked with an asterisk (*)',
@@ -35,6 +39,7 @@ const en = {
             securitySystem: 'Security System',
             smokeSensor: 'Smoke Sensor',
             temperatureSensor: 'Temperature Sensor',
+            thermostat: 'Thermostat',
         },
         title: {
             accessory: 'Accessory',
@@ -44,6 +49,7 @@ const en = {
             options: 'Options',
             password: 'Password',
             sourceUnits: 'Source Units',
+            group: 'Group',
             topicGetBatteryLevel: 'Get Battery Level',
             topicGetBatteryLow: 'Get Battery Low',
             topicGetStatusActive: 'Get Availability',
@@ -79,6 +85,18 @@ const en = {
             topicGetOccupancyDetected: 'Get Occupancy Detected*',
             topicGetSmokeDetected: 'Get Smoke Detected*',
             topicGetCurrentRelativeHumidity: 'Get Relative Humidity*',
+            topicGetCoolingThresholdTemperature: 'Get Cooling Threshold',
+            topicGetCurrentHeatingCoolingState: 'Get Current Mode*',
+            topicGetCurrentRelativeHumidityOptional: 'Get Relative Humidity',
+            topicGetHeatingThresholdTemperature: 'Get Heating Threshold',
+            topicGetTargetHeatingCoolingState: 'Get Target Mode*',
+            topicGetTargetRelativeHumidity: 'Get Target Humidity',
+            topicGetTargetTemperature: 'Get Target Temperature*',
+            topicSetCoolingThresholdTemperature: 'Set Cooling Threshold',
+            topicSetHeatingThresholdTemperature: 'Set Heating Threshold',
+            topicSetTargetHeatingCoolingState: 'Set Target Mode*',
+            topicSetTargetRelativeHumidity: 'Set Target Humidity ',
+            topicSetTargetTemperature: 'Set Target Temperature*',
             topics: 'Topics',
             type: 'Type',
             username: 'Username',
@@ -105,6 +123,10 @@ const en = {
             valueMotionDetected: 'Motion Detected*',
             valueOccupancyDetected: 'Occupancy Detected*',
             valueSmokeDetected: 'Smoke Detected*',
+            valueModeAuto: 'Auto',
+            valueModeCool: 'Cool',
+            valueModeHeat: 'Heat',
+            valueModeOff: 'Off',
             values: 'Values',
             verbose: 'Additional Logging',
         },
@@ -121,20 +143,20 @@ const en = {
     },
     lightbulb: {
         brightness: '%s brightness is %d%', // accessory name, number
-        futureBrightness: 'Setting %s brightness to %d%…', // accessory name, number
+        brightnessFuture: 'Setting %s brightness to %d%…', // accessory name, number
         hue: '%s hue is %d°', // accessory name, number
-        futureHue: 'Setting %s hue to %d°…', // accessory name, number
+        hueFuture: 'Setting %s hue to %d°…', // accessory name, number
         colorTemperature: '%s color temperature is %dM', // accessory name, number
-        futureColorTemperature: 'Setting %s color temperature to %dM…', // accessory name, number
+        colorTemperatureFuture: 'Setting %s color temperature to %dM…', // accessory name, number
         saturation: '%s saturation is %d%', // accessory name, number
-        futureSaturation: 'Setting %s saturation to %d%…', // accessory name, number
+        saturationFuture: 'Setting %s saturation to %d%…', // accessory name, number
     },
     lock: {
         badValue: '%s unable to determine lock state from %s', // accessory name, value
-        stateCurrentSecured: '%s is locked', // accessory name
-        stateCurrentUnsecured: '%s is unlocked', // accessory name
-        stateFutureSecured: 'Locking %s…', // accessory name
-        stateFutureUnsecured: 'Unlocking %s…', // accessory name
+        stateSecured: '%s is locked', // accessory name
+        stateSecuredFuture: 'Locking %s…', // accessory name
+        stateUnsecured: '%s is unlocked', // accessory name
+        stateUnsecuredFuture: 'Unlocking %s…', // accessory name
         stateJammed: '%s is jammed', // accessory name
         stateUnknown: '%s state is unknown', // accessory name
     },
@@ -153,10 +175,10 @@ const en = {
         reconnectInSeconds: '%s will attempt to reconnect in %s seconds…', // accessory name, number
     },
     onOff: {
-        stateFutureOff: 'Turning off %s…', // accessory name
-        stateFutureOn: 'Turning on %s…', // accessory name
-        stateOn: '%s is on', // accessory name
         stateOff: '%s is off', // accessory name
+        stateOffFuture: 'Turning off %s…', // accessory name
+        stateOn: '%s is on', // accessory name
+        stateOnFuture: 'Turning on %s…', // accessory name
         unknownValue: '%s unable to determine on/off state from %s. Ignoring…', // accessory name, value
     },
     outlet: {
@@ -165,17 +187,17 @@ const en = {
         notInUse: '%s is not in use', // accessory name
     },
     security: {
-        badValue: '%s missing value for security state %s.', // accessory name, value
+        badValue: '%s missing value for security state %s', // accessory name, value
         noStateValues: '%s must have at least one state value defined (Arm Away, Disarm, etc.)', // accessory name
-        stateCurrentArmAway: '%s is armed for away', // accessory name
-        stateCurrentArmNight: '%s is armed for night', // accessory name
-        stateCurrentArmStay: '%s is armed for stay', // accessory name
-        stateCurrentAlarmTriggered: '%s alarm is triggered', // accessory name
-        stateCurrentDisarm: '%s is disarmed', // accessory name
-        stateFutureArmAway: 'Arming %s for away…', // accessory name
-        stateFutureArmNight: 'Arming %s for night…', // accessory name
-        stateFutureArmStay: 'Arming %s for stay…', // accessory name
-        stateFutureDisarm: 'Disarming %s…', // accessory name
+        stateAway: '%s is armed for away', // accessory name
+        stateAwayFuture: 'Arming %s for away…', // accessory name
+        stateNight: '%s is armed for night', // accessory name
+        stateNightFuture: 'Arming %s for night…', // accessory name
+        stateStay: '%s is armed for stay', // accessory name
+        stateStayFuture: 'Arming %s for stay…', // accessory name
+        stateTriggered: '%s alarm is triggered', // accessory name
+        stateDisarmed: '%s is disarmed', // accessory name
+        stateDisarmFuture: 'Disarming %s…', // accessory name
         stateUnknown: '%s state is unknown', // accessory name
         unknownValue: '%s unable to determine security state from value %s. Ignoring…', // accessory name, value
     },
@@ -196,9 +218,6 @@ const en = {
             active: '%s detected contact', // accessory name
             inactive: '%s stopped detecting contact', // accessory name
         },
-        humidity: {
-            update: '%s humidity is %d%', // accessory name, number
-        },
         leak: {
             active: '%s detected a leak', // accessory name
             inactive: '%s stopped detecting leaks', // accessory name
@@ -215,13 +234,9 @@ const en = {
             active: '%s detected smoke', // accessory name
             inactive: '%s stopped detecting smoke', // accessory name
         },
-        temperature: {
-            badValue: '%s expected a number for temperature but received %s', // accessory name, value
-            update: '%s temperature is %s°%s', // accessory name, number, units
-        },
     },
     startup: {
-        complete: '✓ Setup complete.',
+        complete: '✓ Setup complete',
         newAccessory: 'Adding %s', // accessory name
         removeAccessory: 'Removing %s', // accessory name
         restoringAccessory: 'Restoring %s', // accessory name
@@ -232,6 +247,26 @@ const en = {
             'Want to see this plugin in your own language? Please visit https://github.com/mpatfield/homebridge-easy-mqtt/issues/4',
         ],
     },
+    thermostat: {
+        badValue: '%s missing value for thermostat state %s', // accessory name, value
+        coolingThreshold: '%s cooling threshold is %d°%s', // accessory name, number, units
+        coolingThresholdFuture: '%s setting cooling threshold to %d°%s…', // accessory name, number, units
+        heatingThreshold: '%s heating threshold is %d°%s', // accessory name, number, units
+        heatingThresholdFuture: '%s setting heating threshold to %d°%s…', // accessory name, number, units
+        noStateValues: '%s must have at least one state value defined (Off, Heat, Cool)', // accessory name
+        humidityFuture: 'Setting %s humidity to %d%…', // accessory name, number
+        stateAutoFuture: 'Setting %s to auto…', // accessory name
+        stateCool: '%s is set to cool', // accessory name
+        stateCoolFuture: 'Setting %s to cool…', // accessory name
+        stateHeat: '%s is set to heat', // accessory name
+        stateHeatFuture: 'Setting %s to heat…', // accessory name
+        stateOff: '%s is set to off', // accessory name
+        stateOffFuture: 'Turning %s off…', // accessory name
+        stateUnknown: '%s state is unknown', // accessory name
+        temperatureTarget: '%s target temperature is %d°%s', // accessory name, number, units
+        temperatureTargetFuture: '%s setting temperature to %d°%s…', // accessory name, number, units
+        unknownValue: '%s unable to determine thermostat state from value %s. Ignoring…', // accessory name, value
+    },
 };
 export default en;
 //# sourceMappingURL=en.js.map

package/dist/i18n/en.js.map

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