homebridge-tasmota-control 1.6.15-beta.30 → 1.6.15-beta.32

package/package.json

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

package/src/fans.js

@@ -2,6 +2,7 @@ import { promises as fsPromises } from 'fs';
 import axios from 'axios';
 import EventEmitter from 'events';
 import ImpulseGenerator from './impulsegenerator.js';
+import Functions from './functions.js';
 import { ApiCommands } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
@@ -27,12 +28,13 @@ class Fans extends EventEmitter {
         this.disableLogInfo = config.disableLogInfo || false;
         this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
         this.refreshInterval = refreshInterval;
+        this.functions = new Functions();
 
         //axios instance
         const url = `http://${config.host}/cm?cmnd=`;
         this.axiosInstance = axios.create({
             baseURL: url,
-            timeout: 10000,
+            timeout: 15000,
             withCredentials: config.auth,
             auth: {
                 username: config.user,
@@ -40,27 +42,33 @@ class Fans extends EventEmitter {
             }
         });
 
-        //impulse generator
-        this.call = false;
+        //lock flags
+        this.locks = {
+            checkState: false,
+        };
         this.impulseGenerator = new ImpulseGenerator()
-            .on('checkDeviceState', async () => {
-                if (this.call) return;
-
-                try {
-                    this.call = true;
-                    await this.checkDeviceState();
-                    this.call = false;
-                } catch (error) {
-                    this.call = false;
-                    this.emit('error', `Inpulse generator error: ${error}`);
-                };
-            })
+            .on('checkState', () => this.handleWithLock('checkState', async () => {
+                await this.checkState();
+            }))
             .on('state', (state) => {
                 this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
             });
     }
 
-    async checkDeviceState() {
+    async handleWithLock(lockKey, fn) {
+        if (this.locks[lockKey]) return;
+
+        this.locks[lockKey] = true;
+        try {
+            await fn();
+        } catch (error) {
+            this.emit('error', `Inpulse generator error: ${error}`);
+        } finally {
+            this.locks[lockKey] = false;
+        }
+    }
+
+    async checkState() {
         if (this.enableDebugMode) this.emit('debug', `Requesting status`);
         try {
             //power status
@@ -151,30 +159,10 @@ class Fans extends EventEmitter {
         }
     }
 
-    async saveData(path, data) {
-        try {
-            data = JSON.stringify(data, null, 2);
-            await fsPromises.writeFile(path, data);
-            if (this.enableDebugMode) this.emit('debug', `Saved data: ${data}`);
-            return true;
-        } catch (error) {
-            throw new Error(`Save data error: ${error}`);
-        }
-    }
-
-    async readData(path) {
-        try {
-            const data = await fsPromises.readFile(path);
-            return data;
-        } catch (error) {
-            throw new Error(`Read data error: ${error}`);
-        }
-    }
-
     async startImpulseGenerator() {
         try {
             //start impulse generator 
-            const timers = [{ name: 'checkDeviceState', sampling: this.refreshInterval }];
+            const timers = [{ name: 'checkState', sampling: this.refreshInterval }];
             await this.impulseGenerator.start(timers);
             return true;
         } catch (error) {
@@ -528,7 +516,7 @@ class Fans extends EventEmitter {
     async start() {
         try {
             //check device state 
-            await this.checkDeviceState();
+            await this.checkState();
 
             //connect to deice success
             this.emit('success', `Connect Success`)

package/src/functions.js

@@ -0,0 +1,31 @@
+import { promises as fsPromises } from 'fs';
+
+class Functions {
+    constructor(config) {
+    }
+
+    async saveData(path, data) {
+        try {
+            data = JSON.stringify(data, null, 2);
+            await fsPromises.writeFile(path, data);
+            return true;
+        } catch (error) {
+            throw new Error(`Save data error: ${error}`);
+        }
+    }
+
+    async readData(path) {
+        try {
+            const data = await fsPromises.readFile(path);
+            return data;
+        } catch (error) {
+            throw new Error(`Read data error: ${error}`);
+        }
+    }
+
+    async scaleValue(value, inMin, inMax, outMin, outMax) {
+        const scaledValue = parseFloat((((Math.max(inMin, Math.min(inMax, value)) - inMin) * (outMax - outMin)) / (inMax - inMin) + outMin).toFixed(0));
+        return scaledValue;
+    }
+}
+export default Functions

package/src/lights.js

@@ -2,6 +2,7 @@ import { promises as fsPromises } from 'fs';
 import axios from 'axios';
 import EventEmitter from 'events';
 import ImpulseGenerator from './impulsegenerator.js';
+import Functions from './functions.js';
 import { ApiCommands } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
@@ -26,12 +27,13 @@ class Lights extends EventEmitter {
         this.disableLogInfo = config.disableLogInfo || false;
         this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
         this.refreshInterval = refreshInterval;
+        this.functions = new Functions();
 
         //axios instance
         const url = `http://${config.host}/cm?cmnd=`;
         this.axiosInstance = axios.create({
             baseURL: url,
-            timeout: 10000,
+            timeout: 15000,
             withCredentials: config.auth,
             auth: {
                 username: config.user,
@@ -39,26 +41,33 @@ class Lights extends EventEmitter {
             }
         });
 
-        this.call = false;
+        //lock flags
+        this.locks = {
+            checkState: false,
+        };
         this.impulseGenerator = new ImpulseGenerator()
-            .on('checkDeviceState', async () => {
-                if (this.call) return;
-
-                try {
-                    this.call = true;
-                    await this.checkDeviceState();
-                    this.call = false;
-                } catch (error) {
-                    this.call = false;
-                    this.emit('error', `Inpulse generator error: ${error}`);
-                };
-            })
+            .on('checkState', () => this.handleWithLock('checkState', async () => {
+                await this.checkState();
+            }))
             .on('state', (state) => {
                 this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
             });
     }
 
-    async checkDeviceState() {
+    async handleWithLock(lockKey, fn) {
+        if (this.locks[lockKey]) return;
+
+        this.locks[lockKey] = true;
+        try {
+            await fn();
+        } catch (error) {
+            this.emit('error', `Inpulse generator error: ${error}`);
+        } finally {
+            this.locks[lockKey] = false;
+        }
+    }
+
+    async checkState() {
         if (this.enableDebugMode) this.emit('debug', `Requesting status`);
         try {
             //power status
@@ -95,7 +104,7 @@ class Lights extends EventEmitter {
 
                     //color temperature scale tasmota 153..500 to homekit 140..500
                     const colorTemp = statusSts.CT ?? false;
-                    const colorTemperature = colorTemp !== false ? await this.scaleValue(colorTemp, 153, 500, 140, 500) : false;
+                    const colorTemperature = colorTemp !== false ? await this.functions.scaleValue(colorTemp, 153, 500, 140, 500) : false;
 
                     //hasb color map to array number
                     const hsbColor = statusSts.HSBColor ? statusSts.HSBColor.split(',').map((value) => Number(value.trim())) : false;
@@ -158,35 +167,10 @@ class Lights extends EventEmitter {
         }
     }
 
-    async scaleValue(value, inMin, inMax, outMin, outMax) {
-        const scaledValue = parseFloat((((Math.max(inMin, Math.min(inMax, value)) - inMin) * (outMax - outMin)) / (inMax - inMin) + outMin).toFixed(0));
-        return scaledValue;
-    }
-
-    async saveData(path, data) {
-        try {
-            data = JSON.stringify(data, null, 2);
-            await fsPromises.writeFile(path, data);
-            if (this.enableDebugMode) this.emit('debug', `Saved data: ${data}`);
-            return true;
-        } catch (error) {
-            throw new Error(`Save data error: ${error}`);
-        }
-    }
-
-    async readData(path) {
-        try {
-            const data = await fsPromises.readFile(path);
-            return data;
-        } catch (error) {
-            throw new Error(`Read data error: ${error}`);
-        }
-    }
-
     async startImpulseGenerator() {
         try {
             //start impulse generator 
-            const timers = [{ name: 'checkDeviceState', sampling: this.refreshInterval }];
+            const timers = [{ name: 'checkState', sampling: this.refreshInterval }];
             await this.impulseGenerator.start(timers);
             return true;
         } catch (error) {
@@ -280,7 +264,7 @@ class Lights extends EventEmitter {
                             })
                             .onSet(async (value) => {
                                 try {
-                                    value = await this.scaleValue(value, 140, 500, 153, 500);
+                                    value = await this.functions.scaleValue(value, 140, 500, 153, 500);
                                     const colorTemperature = `${ApiCommands.ColorTemperature}${value}`; //153..500
                                     await this.axiosInstance.get(colorTemperature);
                                     if (!this.disableLogInfo) this.emit('info', `${friendlyName}, set color temperatur: ${value}`);
@@ -335,7 +319,7 @@ class Lights extends EventEmitter {
     async start() {
         try {
             //check device state 
-            await this.checkDeviceState();
+            await this.checkState();
 
             //connect to deice success
             this.emit('success', `Connect Success`)

package/src/mielhvac.js

@@ -2,6 +2,7 @@ import { promises as fsPromises } from 'fs';
 import axios from 'axios';
 import EventEmitter from 'events';
 import ImpulseGenerator from './impulsegenerator.js';
+import Functions from './functions.js';
 import { ApiCommands, MiElHVAC, TemperatureDisplayUnits } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
@@ -40,8 +41,8 @@ class MiElHvac extends EventEmitter {
         const presets = miElHvac.presets || [];
         this.presetsConfigured = [];
         for (const preset of presets) {
-            const displayType = preset.displayType ?? 0;
-            if (displayType === 0) {
+            const displayType = preset.displayType;
+            if (!displayType) {
                 continue;
             }
 
@@ -60,8 +61,8 @@ class MiElHvac extends EventEmitter {
         const buttons = miElHvac.buttons || [];
         this.buttonsConfigured = [];
         for (const button of buttons) {
-            const displayType = button.displayType ?? 0;
-            if (displayType === 0) {
+            const displayType = button.displayType;
+            if (!displayType) {
                 continue;
             }
 
@@ -80,8 +81,8 @@ class MiElHvac extends EventEmitter {
         const sensors = miElHvac.sensors || [];
         this.sensorsConfigured = [];
         for (const sensor of sensors) {
-            const displayType = sensor.displayType ?? 0;
-            if (displayType === 0) {
+            const displayType = sensor.displayType;
+            if (!displayType) {
                 continue;
             }
 
@@ -118,12 +119,13 @@ class MiElHvac extends EventEmitter {
         this.mielHvac = {};
         this.previousStateSwingV = 'auto';
         this.previousStateSwingH = 'center';
+        this.functions = new Functions();
 
         //axios instance
         const url = `http://${config.host}/cm?cmnd=`;
         this.axiosInstance = axios.create({
             baseURL: url,
-            timeout: 10000,
+            timeout: 15000,
             withCredentials: config.auth,
             auth: {
                 username: config.user,
@@ -144,39 +146,37 @@ class MiElHvac extends EventEmitter {
             });
         }
 
-        //impulse generator
-        this.call = false;
-        this.call1 = false;
+        //lock flags
+        this.locks = {
+            checkState: false,
+            updateRemoteTemp: false,
+        };
         this.impulseGenerator = new ImpulseGenerator()
-            .on('checkDeviceState', async () => {
-                if (this.call) return;
-
-                try {
-                    this.call = true;
-                    await this.checkDeviceState();
-                    this.call = false;
-                } catch (error) {
-                    this.call = false;
-                    this.emit('error', `Inpulse generator error: ${error}`);
-                };
-            })
-            .on('updateRemoteTemp', async () => {
-                if (this.call1) return;
-
-                try {
-                    this.call1 = true;
-                    await this.updateRemoteTemp();
-                } catch (error) {
-                    this.call1 = false;
-                    this.emit('error', `Impulse generator error: ${error}`);
-                }
-            })
+            .on('checkState', () => this.handleWithLock('checkState', async () => {
+                await this.checkState();
+            }))
+            .on('updateRemoteTemp', () => this.handleWithLock('updateRemoteTemp', async () => {
+                await this.checkState();
+            }))
             .on('state', (state) => {
                 this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
             });
     }
 
-    async checkDeviceState() {
+    async handleWithLock(lockKey, fn) {
+        if (this.locks[lockKey]) return;
+
+        this.locks[lockKey] = true;
+        try {
+            await fn();
+        } catch (error) {
+            this.emit('error', `Inpulse generator error: ${error}`);
+        } finally {
+            this.locks[lockKey] = false;
+        }
+    }
+
+    async checkState() {
         if (this.enableDebugMode) this.emit('debug', `Requesting status`);
         try {
             //power status
@@ -232,8 +232,8 @@ class MiElHvac extends EventEmitter {
             const operationEnergy = miElHvac.OperationEnergy ?? 0;
             const operationStatus = miElHvac.OperationStatus ?? 'Unknown';
             const swingMode = vaneVerticalDirection === 'swing' && vaneHorizontalDirection === 'swing' ? 1 : 0;
-            const defaultCoolingSetTemperature = parseFloat(await this.readData(this.info.defaultCoolingSetTemperatureFile));
-            const defaultHeatingSetTemperature = parseFloat(await this.readData(this.info.defaultHeatingSetTemperatureFile));
+            const defaultCoolingSetTemperature = parseFloat(await this.functions.readData(this.info.defaultCoolingSetTemperatureFile));
+            const defaultHeatingSetTemperature = parseFloat(await this.functions.readData(this.info.defaultHeatingSetTemperatureFile));
             const remoteTemperatureSensorState = miElHvac.RemoteTemperatureSensorState ?? false; //ON, OFF
             const remoteTemperatureSensorAutoClearTime = miElHvac.RemoteTemperatureSensorAutoClearTime ?? 0; //time in ms
 
@@ -721,30 +721,10 @@ class MiElHvac extends EventEmitter {
         }
     }
 
-    async saveData(path, data) {
-        try {
-            data = JSON.stringify(data, null, 2);
-            await fsPromises.writeFile(path, data);
-            if (this.enableDebugMode) this.emit('debug', `Saved data: ${data}`);
-            return true;
-        } catch (error) {
-            throw new Error(`Save data error: ${error}`);
-        }
-    }
-
-    async readData(path) {
-        try {
-            const data = await fsPromises.readFile(path);
-            return data;
-        } catch (error) {
-            throw new Error(`Read data error: ${error}`);
-        }
-    }
-
     async startImpulseGenerator() {
         try {
             //start impulse generator 
-            const timers = [{ name: 'checkDeviceState', sampling: this.refreshInterval }];
+            const timers = [{ name: 'checkState', sampling: this.refreshInterval }];
             if (this.remoteTemperatureSensorEnable) timers.push({ name: 'updateRemoteTemp', sampling: this.remoteTemperatureSensorRefreshInterval });
             await this.impulseGenerator.start(timers);
             return true;
@@ -934,7 +914,7 @@ class MiElHvac extends EventEmitter {
                 .onSet(async (value) => {
                     try {
                         if (this.mielHvac.targetOperationMode === 0) {
-                            await this.saveData(this.info.defaultCoolingSetTemperatureFile, value);
+                            await this.functions.saveData(this.info.defaultCoolingSetTemperatureFile, value);
                             value = (value + this.info.mielHvac.defaultHeatingSetTemperature) / 2;
                         }
 
@@ -959,7 +939,7 @@ class MiElHvac extends EventEmitter {
                     .onSet(async (value) => {
                         try {
                             if (this.mielHvac.targetOperationMode === 0) {
-                                await this.saveData(this.info.defaultHeatingSetTemperatureFile, value);
+                                await this.functions.saveData(this.info.defaultHeatingSetTemperatureFile, value);
                                 value = (value + this.info.mielHvac.defaultCoolingSetTemperature) / 2;
                             }
 
@@ -1254,7 +1234,7 @@ class MiElHvac extends EventEmitter {
     async start() {
         try {
             //check device state 
-            const checkState = await this.checkDeviceState();
+            const checkState = await this.checkState();
             if (!checkState) return null;
 
             //connect to deice success

package/src/sensors.js

@@ -2,6 +2,7 @@ import { promises as fsPromises } from 'fs';
 import axios from 'axios';
 import EventEmitter from 'events';
 import ImpulseGenerator from './impulsegenerator.js';
+import Functions from './functions.js';
 import { ApiCommands, SensorKeys } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
@@ -25,6 +26,7 @@ class Sensors extends EventEmitter {
         this.disableLogInfo = config.disableLogInfo || false;
         this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
         this.refreshInterval = refreshInterval;
+        this.functions = new Functions();
 
         //sensors
         this.sensorsCount = 0;
@@ -33,7 +35,7 @@ class Sensors extends EventEmitter {
         const url = `http://${config.host}/cm?cmnd=`;
         this.axiosInstance = axios.create({
             baseURL: url,
-            timeout: 10000,
+            timeout: 15000,
             withCredentials: config.auth,
             auth: {
                 username: config.user,
@@ -41,27 +43,33 @@ class Sensors extends EventEmitter {
             }
         });
 
-        //impulse generator
-        this.call = false;
+        //lock flags
+        this.locks = {
+            checkState: false,
+        };
         this.impulseGenerator = new ImpulseGenerator()
-            .on('checkDeviceState', async () => {
-                if (this.call) return;
-
-                try {
-                    this.call = true;
-                    await this.checkDeviceState();
-                    this.call = false;
-                } catch (error) {
-                    this.call = false;
-                    this.emit('error', `Inpulse generator error: ${error}`);
-                };
-            })
+            .on('checkState', () => this.handleWithLock('checkState', async () => {
+                await this.checkState();
+            }))
             .on('state', (state) => {
                 this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
             });
     }
 
-    async checkDeviceState() {
+    async handleWithLock(lockKey, fn) {
+        if (this.locks[lockKey]) return;
+
+        this.locks[lockKey] = true;
+        try {
+            await fn();
+        } catch (error) {
+            this.emit('error', `Inpulse generator error: ${error}`);
+        } finally {
+            this.locks[lockKey] = false;
+        }
+    }
+
+    async checkState() {
         if (this.enableDebugMode) this.emit('debug', `Requesting status`);
         try {
             //sensor status
@@ -189,30 +197,10 @@ class Sensors extends EventEmitter {
         }
     }
 
-    async saveData(path, data) {
-        try {
-            data = JSON.stringify(data, null, 2);
-            await fsPromises.writeFile(path, data);
-            if (this.enableDebugMode) this.emit('debug', `Saved data: ${data}`);
-            return true;
-        } catch (error) {
-            throw new Error(`Save data error: ${error}`);
-        }
-    }
-
-    async readData(path) {
-        try {
-            const data = await fsPromises.readFile(path);
-            return data;
-        } catch (error) {
-            throw new Error(`Read data error: ${error}`);
-        }
-    }
-
     async startImpulseGenerator() {
         try {
             //start impulse generator 
-            const timers = [{ name: 'checkDeviceState', sampling: this.refreshInterval }];
+            const timers = [{ name: 'checkState', sampling: this.refreshInterval }];
             await this.impulseGenerator.start(timers);
             return true;
         } catch (error) {
@@ -538,7 +526,7 @@ class Sensors extends EventEmitter {
     async start() {
         try {
             //check device state 
-            await this.checkDeviceState();
+            await this.checkState();
 
             //connect to deice success
             this.emit('success', `Connect Success`)

package/src/switches.js

@@ -2,6 +2,7 @@ import { promises as fsPromises } from 'fs';
 import axios from 'axios';
 import EventEmitter from 'events';
 import ImpulseGenerator from './impulsegenerator.js';
+import Functions from './functions.js';
 import { ApiCommands } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
@@ -27,12 +28,13 @@ class Switches extends EventEmitter {
         this.disableLogInfo = config.disableLogInfo || false;
         this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
         this.refreshInterval = refreshInterval;
+        this.functions = new Functions();
 
         //axios instance
         const url = `http://${config.host}/cm?cmnd=`;
         this.axiosInstance = axios.create({
             baseURL: url,
-            timeout: 10000,
+            timeout: 15000,
             withCredentials: config.auth,
             auth: {
                 username: config.user,
@@ -40,27 +42,33 @@ class Switches extends EventEmitter {
             }
         });
 
-        //impulse generator
-        this.call = false;
+        //lock flags
+        this.locks = {
+            checkState: false,
+        };
         this.impulseGenerator = new ImpulseGenerator()
-            .on('checkDeviceState', async () => {
-                if (this.call) return;
-
-                try {
-                    this.call = true;
-                    await this.checkDeviceState();
-                    this.call = false;
-                } catch (error) {
-                    this.call = false;
-                    this.emit('error', `Inpulse generator error: ${error}`);
-                };
-            })
+            .on('checkState', () => this.handleWithLock('checkState', async () => {
+                await this.checkState();
+            }))
             .on('state', (state) => {
                 this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
             });
     }
 
-    async checkDeviceState() {
+    async handleWithLock(lockKey, fn) {
+        if (this.locks[lockKey]) return;
+
+        this.locks[lockKey] = true;
+        try {
+            await fn();
+        } catch (error) {
+            this.emit('error', `Inpulse generator error: ${error}`);
+        } finally {
+            this.locks[lockKey] = false;
+        }
+    }
+
+    async checkState() {
         if (this.enableDebugMode) this.emit('debug', `Requesting status`);
         try {
             //power status
@@ -107,30 +115,10 @@ class Switches extends EventEmitter {
         }
     }
 
-    async saveData(path, data) {
-        try {
-            data = JSON.stringify(data, null, 2);
-            await fsPromises.writeFile(path, data);
-            if (this.enableDebugMode) this.emit('debug', `Saved data: ${data}`);
-            return true;
-        } catch (error) {
-            throw new Error(`Save data error: ${error}`);
-        }
-    }
-
-    async readData(path) {
-        try {
-            const data = await fsPromises.readFile(path);
-            return data;
-        } catch (error) {
-            throw new Error(`Read data error: ${error}`);
-        }
-    }
-
     async startImpulseGenerator() {
         try {
             //start impulse generator 
-            const timers = [{ name: 'checkDeviceState', sampling: this.refreshInterval }];
+            const timers = [{ name: 'checkState', sampling: this.refreshInterval }];
             await this.impulseGenerator.start(timers);
             return true;
         } catch (error) {
@@ -215,7 +203,7 @@ class Switches extends EventEmitter {
     async start() {
         try {
             //check device state 
-            await this.checkDeviceState();
+            await this.checkState();
 
             //connect to deice success
             this.emit('success', `Connect Success`)