homebridge-tasmota-control 1.6.0 → 1.6.1-beta.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tasmota Control",
   "name": "homebridge-tasmota-control",
-  "version": "1.6.0",
+  "version": "1.6.1-beta.0",
   "description": "Homebridge plugin to control Tasmota flashed devices.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/sensors.js

@@ -114,7 +114,7 @@ class Sensors extends EventEmitter {
                         carbonDioxyde: sensorData.CarbonDioxyde,
                         ambientLight: sensorData.Ambient,
                         motion: sensorData.Motion
-                    }
+                    };
                     if (obj.tempUnit === 'C') {
                         obj.tempUnit = '°C';
                     }
@@ -134,7 +134,7 @@ class Sensors extends EventEmitter {
                         factor: sensorData.Factor,
                         frequency: sensorData.Frequency,
                         load: sensorData.Load,
-                    }
+                    };
                     const sensor = key === 'ENERGY' ? { ...obj, ...obj1 } : obj;
                     const debug1 = this.enableDebugMode ? this.emit('debug', `Sensor: ${JSON.stringify(sensor, null, 2)}`) : false;
 
@@ -148,32 +148,57 @@ class Sensors extends EventEmitter {
                     for (let i = 0; i < this.sensorsCount; i++) {
                         const sensor = this.sensors[i];
 
-                        this.sensorTemperatureServices?.[i]?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.temperature);
-                        this.sensorReferenceTemperatureServices?.[i]?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.referenceTemperature);
-                        this.sensorObjTemperatureServices?.[i]?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.objTemperature);
-                        this.sensorAmbTemperatureServices?.[i]?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.ambTemperature);
-                        this.sensorDewPointTemperatureServices?.[i]?.updateCharacteristic(Characteristic.CurrentTemperature, sensor.dewPointTemperature);
-                        this.sensorHumidityServices?.[i]?.updateCharacteristic(Characteristic.CurrentRelativeHumidity, sensor.humidity);
+                        const update = (service, charName, value) => {
+                            const characteristic = service?.[i]?.Characteristic?.[charName];
+                            if (characteristic && Characteristic?.[charName]) {
+                                characteristic.updateCharacteristic(Characteristic[charName], value);
+                            }
+                        };
+
+                        //temperature
+                        update(this.sensorTemperatureServices, 'CurrentTemperature', sensor.temperature);
+                        update(this.sensorReferenceTemperatureServices, 'CurrentTemperature', sensor.referenceTemperature);
+                        update(this.sensorObjTemperatureServices, 'CurrentTemperature', sensor.objTemperature);
+                        update(this.sensorAmbTemperatureServices, 'CurrentTemperature', sensor.ambTemperature);
+                        update(this.sensorDewPointTemperatureServices, 'CurrentTemperature', sensor.dewPointTemperature);
 
+                        //humidity
+                        update(this.sensorHumidityServices, 'CurrentRelativeHumidity', sensor.humidity);
+
+                        //co₂
                         const co2Service = this.sensorCarbonDioxydeServices?.[i];
-                        co2Service?.updateCharacteristic(Characteristic.CarbonDioxideDetected, sensor.carbonDioxyde > 1000);
-                        co2Service?.updateCharacteristic(Characteristic.CarbonDioxideLevel, sensor.carbonDioxyde);
-                        co2Service?.updateCharacteristic(Characteristic.CarbonDioxidePeakLevel, sensor.carbonDioxyde);
+                        update(this.sensorCarbonDioxydeServices, 'CarbonDioxideDetected', sensor.carbonDioxyde > 1000);
+                        update(this.sensorCarbonDioxydeServices, 'CarbonDioxideLevel', sensor.carbonDioxyde);
+                        update(this.sensorCarbonDioxydeServices, 'CarbonDioxidePeakLevel', sensor.carbonDioxyde);
 
-                        this.sensorAmbientLightServices?.[i]?.updateCharacteristic(Characteristic.CurrentAmbientLightLevel, sensor.ambientLight);
-                        this.sensorMotionServices?.[i]?.updateCharacteristic(Characteristic.MotionDetected, sensor.motion);
+                        //ambient light
+                        update(this.sensorAmbientLightServices, 'CurrentAmbientLightLevel', sensor.ambientLight);
 
+                        //motion
+                        update(this.sensorMotionServices, 'MotionDetected', sensor.motion);
 
                         //energy
-                        const fields = [
-                            'Power', 'ApparentPower', 'ReactivePower', 'EnergyToday', 'EnergyLastDay',
-                            'EnergyLifetime', 'Current', 'Voltage', 'Factor', 'Frequency', 'ReadingTime'
-                        ];
-                        const characteristic = this.sensorEnergyServices?.[i]?.Characteristic;
-                        for (const key of fields) {
-                            characteristic?.[key]?.updateCharacteristic(Characteristic[key], sensor[key.toLowerCase()]);
+                        const energyFields = {
+                            Power: 'power',
+                            ApparentPower: 'apparentpower',
+                            ReactivePower: 'reactivepower',
+                            EnergyToday: 'energytoday',
+                            EnergyLastDay: 'energylastday',
+                            EnergyLifetime: 'energylifetime',
+                            Current: 'current',
+                            Voltage: 'voltage',
+                            Factor: 'factor',
+                            Frequency: 'frequency',
+                            ReadingTime: 'readingtime'
+                        };
+
+                        const energyService = this.sensorEnergyServices?.[i]?.Characteristic;
+                        for (const [charName, sensorKey] of Object.entries(energyFields)) {
+                            const value = sensor[sensorKey];
+                            if (energyService?.[charName] && Characteristic?.[charName] !== undefined) {
+                                energyService[charName].updateCharacteristic(Characteristic[charName], value);
+                            }
                         }
-
                     }
                 }
             }
@@ -249,6 +274,16 @@ class Sensors extends EventEmitter {
             //Prepare services 
             if (this.sensorsCount > 0) {
                 const debug = this.enableDebugMode ? this.emit('debug', `Prepare Sensor Services`) : false;
+                this.sensorTemperatureServices = [];
+                this.sensorReferenceTemperatureServices = [];
+                this.sensorObjTemperatureServices = [];
+                this.sensorAmbTemperatureServices = [];
+                this.sensorDewPointTemperatureServices = [];
+                this.sensorHumidityServices = [];
+                this.sensorCarbonDioxydeServices = [];
+                this.sensorAmbientLightServices = [];
+                this.sensorMotionServices = [];
+                this.sensorEnergyServices = [];
 
                 //temperature
                 let i = 0;
@@ -256,7 +291,6 @@ class Sensors extends EventEmitter {
                     const sensorName = sensor.name;
                     if (sensor.temperature) {
                         const debug = this.enableDebugMode ? this.emit('debug', `Prepare Temperature Sensor Services`) : false;
-                        this.sensorTemperatureServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Temperature` : `${sensorName} Temperature`;
                         const sensorTemperatureService = accessory.addService(Service.TemperatureSensor, serviceName, `Temperature Sensor ${i}`);
                         sensorTemperatureService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -273,7 +307,6 @@ class Sensors extends EventEmitter {
                     //reference temperature
                     if (sensor.referenceTemperature) {
                         const debug = this.enableDebugMode ? this.emit('debug', `Prepare Reference Temperature Sensor Services`) : false;
-                        this.sensorReferenceTemperatureServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Reference Temperature` : `${sensorName} Reference Temperature`;
                         const sensorReferenceTemperatureService = accessory.addService(Service.TemperatureSensor, serviceName, `Reference Temperature Sensor ${i}`);
                         sensorReferenceTemperatureService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -290,7 +323,6 @@ class Sensors extends EventEmitter {
                     //object temperature
                     if (sensor.objTemperature) {
                         const debug = this.enableDebugMode ? this.emit('debug', `Prepare Obj Temperature Sensor Services`) : false;
-                        this.sensorObjTemperatureServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Obj Temperature` : `${sensorName} Obj Temperature`;
                         const sensorObjTemperatureService = accessory.addService(Service.TemperatureSensor, serviceName, `Obj Temperature Sensor ${i}`);
                         sensorObjTemperatureService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -307,7 +339,6 @@ class Sensors extends EventEmitter {
                     //ambient temperature
                     if (sensor.ambTemperature) {
                         const debug = this.enableDebugMode ? this.emit('debug', `Prepare Amb Temperature Sensor Services`) : false;
-                        this.sensorAmbTemperatureServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Amb Temperature` : `${sensorName} Amb Temperature`;
                         const sensorAmbTemperatureService = accessory.addService(Service.TemperatureSensor, serviceName, `Amb Temperature Sensor ${i}`);
                         sensorAmbTemperatureService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -324,7 +355,6 @@ class Sensors extends EventEmitter {
                     //dew point temperature
                     if (sensor.dewPointTemperature) {
                         const debug = this.enableDebugMode ? this.emit('debug', `Prepare Dew Point Temperature Sensor Services`) : false;
-                        this.sensorDewPointTemperatureServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Dew Point` : `${sensorName} Dew Point`;
                         const sensorDewPointTemperatureService = accessory.addService(Service.TemperatureSensor, serviceName, `Dew Point Temperature Sensor ${i}`);
                         sensorDewPointTemperatureService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -341,7 +371,6 @@ class Sensors extends EventEmitter {
                     //humidity
                     if (sensor.humidity) {
                         const debug = this.enableDebugMode ? this.emit('debug', `Prepare Humidity Sensor Services`) : false;
-                        this.sensorHumidityServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Humidity` : `${sensorName} Humidity`;
                         const sensorHumidityService = accessory.addService(Service.HumiditySensor, serviceName, `Humidity Sensor ${i}`);
                         sensorHumidityService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -362,7 +391,6 @@ class Sensors extends EventEmitter {
                     //carbon dioxyde
                     if (sensor.carbonDioxyde) {
                         const debug = this.enableDebugMode ? this.emit('debug', `Prepare Carbon Dioxyde Sensor Services`) : false;
-                        this.sensorCarbonDioxydeServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Carbon Dioxyde` : `${sensorName} Carbon Dioxyde`;
                         const sensorCarbonDioxydeService = accessory.addService(Service.CarbonDioxideSensor, serviceName, `Carbon Dioxyde Sensor ${i}`);
                         sensorCarbonDioxydeService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -391,7 +419,6 @@ class Sensors extends EventEmitter {
                     //ambient light
                     if (sensor.ambientLight) {
                         const debug = this.enableDebugMode ? this.emit('debug', `Prepare Ambient Light Sensor Services`) : false;
-                        this.sensorAmbientLightServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Ambient Light` : `${sensorName} Ambient Light`;
                         const sensorAmbientLightService = accessory.addService(Service.LightSensor, serviceName, `Ambient Light Sensor ${i}`);
                         sensorAmbientLightService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -408,7 +435,6 @@ class Sensors extends EventEmitter {
                     //motion
                     if (sensor.motion) {
                         const debug = this.enableDebugMode ? this.emit('debug', `Prepare Motion Sensor Services`) : false;
-                        this.sensorMotionServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Motion` : `${sensorName} Motion`;
                         const sensorMotionService = accessory.addService(Service.MotionSensor, serviceName, `Motion Sensor ${i}`);
                         sensorMotionService.addOptionalCharacteristic(Characteristic.ConfiguredName);
@@ -425,7 +451,6 @@ class Sensors extends EventEmitter {
                     //energy
                     if (sensor.name === 'ENERGY') {
                         const debug4 = this.enableDebugMode ? this.emit('debug', `Prepare Power And Energy Service`) : false;
-                        this.sensorEnergyServices = [];
                         const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName}` : `${sensorName} Sensor`;
                         const energyService = accessory.addService(Service.PowerAndEnergyService, serviceName, `Energy Sensor ${i}`);
                         energyService.setCharacteristic(Characteristic.ConfiguredName, serviceName);