homebridge-tasmota-control 1.7.10-beta.0 → 1.7.10-beta.2

package/index.js

@@ -48,7 +48,9 @@ class tasmotaPlatform {
         const user = device.user || '';
         const passwd = device.passwd || '';
         const loadNameFromDevice = device.loadNameFromDevice || false;
-        const refreshInterval = (device.refreshInterval ?? 5000) * 1000;
+        const remoteTemperatureSensorEnable = device.miElHvac?.remoteTemperatureSensor?.enable;
+        const remoteTemperatureSensorRefreshInterval = (device.miElHvac?.remoteTemperatureSensor?.refreshInterval ?? 5) * 1000;
+        const refreshInterval = (device.refreshInterval ?? 5) * 1000;
 
         //log
         const logLevel = {
@@ -115,19 +117,19 @@ class tasmotaPlatform {
                   let deviceType;
                   switch (type) {
                     case 0: //mielhvac
-                      deviceType = new MiElHvac(api, device, info, serialNumber, refreshInterval);
+                      deviceType = new MiElHvac(api, device, info, serialNumber);
                       break;
                     case 1: //switches
-                      deviceType = new Switches(api, device, info, serialNumber, refreshInterval);
+                      deviceType = new Switches(api, device, info, serialNumber);
                       break;
                     case 2: //lights
-                      deviceType = new Lights(api, device, info, serialNumber, refreshInterval);
+                      deviceType = new Lights(api, device, info, serialNumber);
                       break;
                     case 3: //fans
-                      deviceType = new Fans(api, device, info, serialNumber, refreshInterval);
+                      deviceType = new Fans(api, device, info, serialNumber);
                       break;
                     case 4: //sensors
-                      deviceType = new Sensors(api, device, info, serialNumber, refreshInterval);
+                      deviceType = new Sensors(api, device, info, serialNumber);
                       break;
                     default:
                       if (logLevel.warn) log.warn(`Device: ${host} ${deviceName}, unknown device: ${info.deviceTypes}.`);
@@ -146,8 +148,13 @@ class tasmotaPlatform {
                     api.publishExternalAccessories(PluginName, [accessory]);
                     if (logLevel.success) log.success(`Device: ${host} ${deviceName}, Published as external accessory.`);
 
-                    await impulseGenerator.stop();
-                    await deviceType.startImpulseGenerator();
+                    //start impulse generator
+                    const timers = [{ name: 'checkState', sampling: refreshInterval }];
+                    if (remoteTemperatureSensorEnable) timers.push({ name: 'updateRemoteTemp', sampling: remoteTemperatureSensorRefreshInterval });
+                    await deviceType.impulseGenerator(true, timers);
+
+                    //stop impulse generator
+                    await impulseGenerator.state(false);
                   }
 
                   i++;
@@ -160,7 +167,7 @@ class tasmotaPlatform {
             });
 
           //start impulse generator
-          await impulseGenerator.start([{ name: 'start', sampling: 60000 }]);
+          await impulseGenerator.state(true, [{ name: 'start', sampling: 120000 }]);
         } catch (error) {
           if (logLevel.error) log.error(`Device: ${host} ${deviceName}, Did finish launching error: ${error.message ?? error}.`);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tasmota Control",
   "name": "homebridge-tasmota-control",
-  "version": "1.7.10-beta.0",
+  "version": "1.7.10-beta.2",
   "description": "Homebridge plugin to control Tasmota flashed devices.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -34,7 +34,7 @@
     "node": "^20 || ^22 || ^24 || ^25"
   },
   "dependencies": {
-    "axios": "^1.13.1"
+    "axios": "^1.13.2"
   },
   "keywords": [
     "homebridge",

package/src/fans.js

@@ -6,7 +6,7 @@ import { ApiCommands } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class Fans extends EventEmitter {
-    constructor(api, config, info, serialNumber, refreshInterval) {
+    constructor(api, config, info, serialNumber) {
         super();
 
         Accessory = api.platformAccessory;
@@ -26,7 +26,6 @@ class Fans extends EventEmitter {
         this.enableDebugMode = config.enableDebugMode || false;
         this.disableLogInfo = config.disableLogInfo || false;
         this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
-        this.refreshInterval = refreshInterval;
         this.functions = new Functions();
 
         //axios instance
@@ -50,7 +49,7 @@ class Fans extends EventEmitter {
                 await this.checkState();
             }))
             .on('state', (state) => {
-                this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
+                this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
             });
     }
 
@@ -156,17 +155,6 @@ class Fans extends EventEmitter {
         }
     }
 
-    async startImpulseGenerator() {
-        try {
-            //start impulse generator 
-            const timers = [{ name: 'checkState', sampling: this.refreshInterval }];
-            await this.impulseGenerator.start(timers);
-            return true;
-        } catch (error) {
-            throw new Error(`Impulse generator start error: ${error}`);
-        }
-    }
-
     async deviceInfo() {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);

package/src/impulsegenerator.js

@@ -7,46 +7,34 @@ class ImpulseGenerator extends EventEmitter {
         this.timers = [];
     }
 
-    async start(timers) {
-        if (this.timersState) {
-            this.state(true);
-            return true;
+    async state(state, timers = []) {
+        // Stop current timers before new start
+        if (this.timersState && state) {
+            await this.state(false);
         }
 
-        this.timers = [];
-
-        for (const timer of timers) {
-            this.emit(timer.name);
-
-            const interval = setInterval(() => {
-                this.emit(timer.name);
-            }, timer.sampling);
+        if (state) {
+            if (!Array.isArray(timers)) throw new Error('Timers must be an array');
 
-            this.timers.push(interval);
-        }
+            for (const { name, sampling } of timers) {
+                if (!name || !sampling) continue;
 
-        this.state(true);
-        return true;
-    }
+                this.emit(name);
 
-    async stop() {
-        if (!this.timersState) {
-            this.state(false);
-            return true;
-        }
+                const interval = setInterval(() => {
+                    this.emit(name);
+                }, sampling);
 
-        for (const timer of this.timers) {
-            clearInterval(timer);
+                this.timers.push(interval);
+            }
+        } else {
+            this.timers.forEach(clearInterval);
+            this.timers = [];
         }
 
-        this.timers = [];
-        this.state(false);
-        return true;
-    }
-
-    state(state) {
         this.timersState = state;
         this.emit('state', state);
+        return true;
     }
 }
 

package/src/lights.js

@@ -6,7 +6,7 @@ import { ApiCommands } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class Lights extends EventEmitter {
-    constructor(api, config, info, serialNumber, refreshInterval) {
+    constructor(api, config, info, serialNumber) {
         super();
 
         Accessory = api.platformAccessory;
@@ -25,7 +25,6 @@ class Lights extends EventEmitter {
         this.enableDebugMode = config.enableDebugMode || false;
         this.disableLogInfo = config.disableLogInfo || false;
         this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
-        this.refreshInterval = refreshInterval;
         this.functions = new Functions();
 
         //axios instance
@@ -47,7 +46,7 @@ class Lights extends EventEmitter {
                 await this.checkState();
             }))
             .on('state', (state) => {
-                this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
+                this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
             });
     }
 
@@ -153,11 +152,10 @@ class Lights extends EventEmitter {
         }
     }
 
-    async startImpulseGenerator() {
+    async startStopImpulseGenerator(state, timers = []) {
         try {
             //start impulse generator 
-            const timers = [{ name: 'checkState', sampling: this.refreshInterval }];
-            await this.impulseGenerator.start(timers);
+            await this.melCloudAta.impulseGenerator.state(state, timers)
             return true;
         } catch (error) {
             throw new Error(`Impulse generator start error: ${error}`);

package/src/mielhvac.js

@@ -6,7 +6,7 @@ import { ApiCommands, MiElHVAC, TemperatureDisplayUnits } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class MiElHvac extends EventEmitter {
-    constructor(api, config, info, serialNumber, refreshInterval) {
+    constructor(api, config, info, serialNumber) {
         super();
 
         Accessory = api.platformAccessory;
@@ -29,72 +29,40 @@ class MiElHvac extends EventEmitter {
         const remoteTemperatureSensor = miElHvac.remoteTemperatureSensor ?? {};
         const remoteTemperatureSensorEnable = remoteTemperatureSensor.enable || false;
         const remoteTemperatureSensorPath = remoteTemperatureSensor.path;
-        const remoteTemperatureSensorRefreshInterval = remoteTemperatureSensor.refreshInterval * 1000 || 5000;
         const remoteTemperatureSensorAuth = remoteTemperatureSensor.auth || false;
         const remoteTemperatureSensorUser = remoteTemperatureSensor.user;
         const remoteTemperatureSensorPasswd = remoteTemperatureSensor.passwd;
         this.remoteTemperatureSensorEnable = remoteTemperatureSensorEnable;
-        this.remoteTemperatureSensorRefreshInterval = remoteTemperatureSensorRefreshInterval;
 
         //presets
-        const presets = miElHvac.presets || [];
-        this.presetsConfigured = [];
-        for (const preset of presets) {
-            const displayType = preset.displayType;
-            if (!displayType) {
-                continue;
-            }
-
-            const presetyServiceType = ['', Service.Outlet, Service.Switch, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][displayType];
-            const presetCharacteristicType = ['', Characteristic.On, Characteristic.On, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][displayType];
-            preset.serviceType = presetyServiceType;
-            preset.characteristicType = presetCharacteristicType;
+        this.presets = (miElHvac.presets || []).filter(preset => (preset.displayType ?? 0) > 0);
+        for (const preset of this.presets) {
+            preset.serviceType = [null, Service.Outlet, Service.Switch, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][preset.displayType];
+            preset.characteristicType = [null, Characteristic.On, Characteristic.On, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][preset.displayType];
             preset.name = preset.name || 'Preset';
             preset.state = false;
             preset.previousSettings = {};
-            this.presetsConfigured.push(preset);
         }
-        this.presetsConfiguredCount = this.presetsConfigured.length || 0;
 
         //buttons
-        const buttons = miElHvac.buttons || [];
-        this.buttonsConfigured = [];
-        for (const button of buttons) {
-            const displayType = button.displayType;
-            if (!displayType) {
-                continue;
-            }
-
-            const buttonServiceType = ['', Service.Outlet, Service.Switch][displayType];
-            const buttonCharacteristicType = ['', Characteristic.On, Characteristic.On][displayType];
-            button.serviceType = buttonServiceType;
-            button.characteristicType = buttonCharacteristicType;
+        this.buttons = (miElHvac.buttons || []).filter(button => (button.displayType ?? 0) > 0);
+        for (const button of this.buttons) {
+            button.serviceType = [null, Service.Outlet, Service.Switch][button.displayType];
+            button.characteristicType = [null, Characteristic.On, Characteristic.On][button.displayType];
             button.name = button.name || 'Button';
             button.state = false;
             button.previousValue = null;
-            this.buttonsConfigured.push(button);
         }
-        this.buttonsConfiguredCount = this.buttonsConfigured.length || 0;
 
         //sensors
-        const sensors = miElHvac.sensors || [];
-        this.sensorsConfigured = [];
-        for (const sensor of sensors) {
-            const displayType = sensor.displayType;
-            if (!displayType) {
-                continue;
-            }
-
-            const sensorServiceType = ['', Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][displayType];
-            const sensorCharacteristicType = ['', Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][displayType];
-            sensor.serviceType = sensorServiceType;
-            sensor.characteristicType = sensorCharacteristicType;
+        this.sensors = (miElHvac.sensors || []).filter(sensor => (sensor.displayType ?? 0) > 0);
+        for (const sensor of this.sensors) {
+            sensor.serviceType = [null, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][sensor.displayType];
+            sensor.characteristicType = [null, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][sensor.displayType];
             sensor.name = sensor.name || 'Sensor';
             sensor.state = false;
             sensor.previousValue = null;
-            this.sensorsConfigured.push(sensor);
         }
-        this.sensorsConfiguredCount = this.sensorsConfigured.length || 0;
 
         //frost protect
         const frostProtect = miElHvac.frostProtect ?? {};
@@ -112,7 +80,6 @@ class MiElHvac extends EventEmitter {
         this.enableDebugMode = config.enableDebugMode || false;
         this.disableLogInfo = config.disableLogInfo || false;
         this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
-        this.refreshInterval = refreshInterval;
 
         //mielhvac
         this.mielHvac = {};
@@ -158,7 +125,7 @@ class MiElHvac extends EventEmitter {
                 await this.checkState();
             }))
             .on('state', (state) => {
-                this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
+                this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
             });
     }
 
@@ -434,8 +401,8 @@ class MiElHvac extends EventEmitter {
             }
 
             // Update presets state
-            if (this.presetsConfiguredCount > 0) {
-                this.presetsConfigured.forEach((preset, index) => {
+            if (this.presets.length > 0) {
+                this.presets.forEach((preset, index) => {
                     let iseeMode = operationMode;
                     if (iseeMode === 'heat_isee') iseeMode = 'heat';
                     else if (iseeMode === 'dry_isee') iseeMode = 'dry';
@@ -452,7 +419,7 @@ class MiElHvac extends EventEmitter {
                 });
             }
 
-            if (this.buttonsConfiguredCount > 0) {
+            if (this.buttons.length > 0) {
                 const modeMap = {
                     0: () => power === 1,
                     1: () => power && ['heat', 'heat_isee'].includes(operationMode),
@@ -521,7 +488,7 @@ class MiElHvac extends EventEmitter {
                     63: 'on', //nightmode
                 };
 
-                this.buttonsConfigured.forEach((button, index) => {
+                this.buttons.forEach((button, index) => {
                     const mode = button.mode;
                     let state = false;
 
@@ -550,14 +517,14 @@ class MiElHvac extends EventEmitter {
                 });
             }
 
-            if (this.sensorsConfiguredCount > 0) {
+            if (this.sensors.length > 0) {
                 const powerOn = power === 1;
 
                 // Helper: match by value with power check
                 const is = (val, match) => powerOn && val === match;
                 const isOneOf = (val, matches) => powerOn && matches.includes(val);
 
-                this.sensorsConfigured.forEach((sensor, index) => {
+                this.sensors.forEach((sensor, index) => {
                     const mode = sensor.mode;
 
                     const sensorStates = {
@@ -691,18 +658,6 @@ class MiElHvac extends EventEmitter {
         }
     }
 
-    async startImpulseGenerator() {
-        try {
-            //start impulse generator 
-            const timers = [{ name: 'checkState', sampling: this.refreshInterval }];
-            if (this.remoteTemperatureSensorEnable) timers.push({ name: 'updateRemoteTemp', sampling: this.remoteTemperatureSensorRefreshInterval });
-            await this.impulseGenerator.start(timers);
-            return true;
-        } catch (error) {
-            throw new Error(`Impulse generator start error: ${error}`);
-        }
-    }
-
     async deviceInfo() {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);
@@ -952,11 +907,11 @@ class MiElHvac extends EventEmitter {
             accessory.addService(this.miElHvacService);
 
             //presets services
-            if (this.presetsConfiguredCount > 0) {
+            if (this.presets.length > 0) {
                 if (this.enableDebugMode) this.emit('debug', 'Prepare presets services');
                 this.presetsServices = [];
 
-                this.presetsConfigured.forEach((preset, index) => {
+                this.presets.forEach((preset, index) => {
                     const { name: presetName, namePrefix, serviceType, characteristicType, mode, setTemp, fanSpeed, swingV, swingH } = preset;
                     const serviceName = namePrefix ? `${accessoryName} ${presetName}` : presetName;
 
@@ -1004,11 +959,11 @@ class MiElHvac extends EventEmitter {
             }
 
 
-            if (this.buttonsConfiguredCount > 0) {
+            if (this.buttons.length > 0) {
                 if (this.enableDebugMode) this.emit('debug', 'Prepare buttons services');
                 this.buttonsServices = [];
 
-                this.buttonsConfigured.forEach((button, index) => {
+                this.buttons.forEach((button, index) => {
                     const { mode, name: buttonName, namePrefix, serviceType, characteristicType } = button;
                     const serviceName = namePrefix ? `${accessoryName} ${buttonName}` : buttonName;
 
@@ -1127,13 +1082,12 @@ class MiElHvac extends EventEmitter {
                 });
             }
 
-
             //sensors services
-            if (this.sensorsConfiguredCount > 0) {
+            if (this.sensors.length > 0) {
                 if (this.enableDebugMode) this.emit('debug', `Prepare sensors services`);
                 this.sensorsServices = [];
 
-                this.sensorsConfigured.forEach((sensor, index) => {
+                this.sensors.forEach((sensor, index) => {
                     //get sensor name
                     const sensorName = sensor.name;
 

package/src/sensors.js

@@ -6,7 +6,7 @@ import { ApiCommands, SensorKeys } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class Sensors extends EventEmitter {
-    constructor(api, config, info, serialNumber, refreshInterval) {
+    constructor(api, config, info, serialNumber) {
         super();
 
         Accessory = api.platformAccessory;
@@ -24,7 +24,6 @@ class Sensors extends EventEmitter {
         this.enableDebugMode = config.enableDebugMode || false;
         this.disableLogInfo = config.disableLogInfo || false;
         this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
-        this.refreshInterval = refreshInterval;
         this.functions = new Functions();
 
         //sensors
@@ -49,7 +48,7 @@ class Sensors extends EventEmitter {
                 await this.checkState();
             }))
             .on('state', (state) => {
-                this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
+                this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
             });
     }
 
@@ -192,17 +191,6 @@ class Sensors extends EventEmitter {
         }
     }
 
-    async startImpulseGenerator() {
-        try {
-            //start impulse generator 
-            const timers = [{ name: 'checkState', sampling: this.refreshInterval }];
-            await this.impulseGenerator.start(timers);
-            return true;
-        } catch (error) {
-            throw new Error(`Impulse generator start error: ${error}`);
-        }
-    }
-
     async deviceInfo() {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);

package/src/switches.js

@@ -6,7 +6,7 @@ import { ApiCommands } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class Switches extends EventEmitter {
-    constructor(api, config, info, serialNumber, refreshInterval) {
+    constructor(api, config, info, serialNumber) {
         super();
 
         Accessory = api.platformAccessory;
@@ -26,7 +26,6 @@ class Switches extends EventEmitter {
         this.enableDebugMode = config.enableDebugMode || false;
         this.disableLogInfo = config.disableLogInfo || false;
         this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
-        this.refreshInterval = refreshInterval;
         this.functions = new Functions();
 
         //axios instance
@@ -48,7 +47,7 @@ class Switches extends EventEmitter {
                 await this.checkState();
             }))
             .on('state', (state) => {
-                this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
+                this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
             });
     }
 
@@ -108,17 +107,6 @@ class Switches extends EventEmitter {
         }
     }
 
-    async startImpulseGenerator() {
-        try {
-            //start impulse generator 
-            const timers = [{ name: 'checkState', sampling: this.refreshInterval }];
-            await this.impulseGenerator.start(timers);
-            return true;
-        } catch (error) {
-            throw new Error(`Impulse generator start error: ${error}`);
-        }
-    }
-
     async deviceInfo() {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);