homebridge-tasmota-control 1.4.0-beta.26 → 1.4.0-beta.28

package/index.js

@@ -1,6 +1,6 @@
 import { join } from 'path';
 import { mkdirSync, existsSync, writeFileSync } from 'fs';
-import axios from 'axios';
+import deviceinfo from './src/deviceinfo.js';
 import mielhvac from './src/mielhvac.js';
 import switches from './src/switches.js';
 import lights from './src/lights.js';
@@ -43,15 +43,13 @@ class tasmotaPlatform {
         }
 
         //log config
-        this.name = deviceName;
-        this.loadNameFromDevice = deviceConfig.loadNameFromDevice || false;
+        const loadNameFromDevice = deviceConfig.loadNameFromDevice || false;
         const auth = deviceConfig.auth || false;
         const url = `http://${host}/cm?cmnd=`;
         const user = deviceConfig.user || '';
         const passwd = deviceConfig.passwd || '';
         const refreshInterval = deviceConfig.refreshInterval * 1000 || 5000;
         const enableDebugMode = deviceConfig.enableDebugMode || false;
-        this.enableDebugMode = enableDebugMode;
         const disableLogDeviceInfo = deviceConfig.disableLogDeviceInfo || false;
         const disableLogInfo = deviceConfig.disableLogInfo || false;
         const disableLogSuccess = deviceConfig.disableLogSuccess || false;
@@ -87,21 +85,20 @@ class tasmotaPlatform {
           return;
         }
 
-        //axios instance
-        this.axiosInstance = axios.create({
-          method: 'GET',
-          baseURL: url,
-          timeout: refreshInterval > 10000 ? 10000 : refreshInterval,
-          withCredentials: auth,
-          auth: {
-            username: user,
-            password: passwd
-          }
-        });
-
         try {
           //get device info
-          const info = await this.getDeviceInfo();
+          const deviceInfo = new deviceinfo(url, auth, user, passwd, deviceName, loadNameFromDevice, enableDebugMode, refreshInterval);
+          info.on('debug', (debug) => {
+            const emitLog = !enableDebugMode ? false : log.info(`Device: ${host} ${deviceName}, debug: ${debug}.`);
+          })
+            .on('warn', (warn) => {
+              const emitLog = disableLogWarn ? false : log.warn(`Device: ${host} ${deviceName}, ${warn}.`);
+            })
+            .on('error', (error) => {
+              const emitLog = disableLogError ? false : log.error(`Device: ${host} ${deviceName}, ${error}.`);
+            });
+
+          const info = await info.getInfo();
           if (!info.serialNumber) {
             this.emit('warn', `Serial number not found`);
             return;
@@ -173,58 +170,6 @@ class tasmotaPlatform {
   configureAccessory(accessory) {
     this.accessories.push(accessory);
   }
-
-  async getDeviceInfo() {
-    const debug = this.enableDebugMode ? this.emit('debug', `Requesting info`) : false;
-    try {
-      const deviceInfoData = await this.axiosInstance(ApiCommands.Status);
-      const deviceInfo = deviceInfoData.data ?? {};
-      const debug = this.enableDebugMode ? this.emit('debug', `Info: ${JSON.stringify(deviceInfo, null, 2)}`) : false;
-      await new Promise(resolve => setTimeout(resolve, 250));
-
-      //status
-      const friendlyNames = [];
-      const status = deviceInfo.Status ?? {};
-      const deviceName = this.loadNameFromDevice ? status.DeviceName ?? 'Unknown' : this.name;
-      const friendlyName = status.FriendlyName ?? [];
-      const relaysName = Array.isArray(friendlyName) ? friendlyName : [friendlyName];
-      for (const relayName of relaysName) {
-        const name = relayName ?? 'Unknown'
-        friendlyNames.push(name);
-      }
-
-      //status FWR
-      const statusFwr = deviceInfo.StatusFWR ?? {};
-      const firmwareRevision = statusFwr.Version ?? 'Unknown';
-      const modelName = statusFwr.Hardware ?? 'Unknown';
-
-      //status NET
-      const statusNet = deviceInfo.StatusNET ?? {};
-      const addressMac = statusNet.Mac ?? false;
-
-      //status SNS
-      const statusSns = deviceInfo.StatusSNS ?? {};
-      const statusSnsKeys = Object.keys(statusSns);
-
-      //status STS
-      const statusSts = deviceInfo.StatusSTS ?? {};
-      const statusStsKeys = Object.keys(statusSts);
-      const deviceType = statusSnsKeys.includes('MiElHVAC') ? 0 : statusStsKeys.some(key => LightKeys.includes(key)) ? 2 : statusStsKeys.includes('FanSpeed') ? 3 : 1;
-      const obj = {
-        deviceType: deviceType,
-        deviceName: deviceName,
-        friendlyNames: friendlyNames,
-        modelName: modelName,
-        serialNumber: addressMac,
-        firmwareRevision: firmwareRevision,
-        relaysCount: friendlyNames.length
-      }
-      return obj;
-    } catch (error) {
-      throw new Error(`Check info error: ${error}`);
-    }
-  }
-
 }
 
 export default (api) => {

package/package.json

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

package/src/deviceinfo.js

@@ -0,0 +1,77 @@
+import axios from 'axios';
+import EventEmitter from 'events';
+import { ApiCommands, LightKeys } from './constants.js';
+
+class DeviceInfo extends EventEmitter {
+    constructor(url, auth, user, passwd, deviceName, loadNameFromDevice, enableDebugMode, refreshInterval) {
+        super();
+        this.name = deviceName
+        this.loadNameFromDevice = loadNameFromDevice;
+        this.enableDebugMode = enableDebugMode;
+
+        //axios instance
+        this.axiosInstance = axios.create({
+            method: 'GET',
+            baseURL: url,
+            timeout: refreshInterval > 10000 ? 10000 : refreshInterval,
+            withCredentials: auth,
+            auth: {
+                username: user,
+                password: passwd
+            }
+        });
+
+    }
+
+    async getInfo() {
+        const debug = this.enableDebugMode ? this.emit('debug', `Requesting info`) : false;
+        try {
+            const deviceInfoData = await this.axiosInstance(ApiCommands.Status);
+            const deviceInfo = deviceInfoData.data ?? {};
+            const debug = this.enableDebugMode ? this.emit('debug', `Info: ${JSON.stringify(deviceInfo, null, 2)}`) : false;
+            await new Promise(resolve => setTimeout(resolve, 250));
+
+            //status
+            const friendlyNames = [];
+            const status = deviceInfo.Status ?? {};
+            const deviceName = this.loadNameFromDevice ? status.DeviceName ?? 'Unknown' : this.name;
+            const friendlyName = status.FriendlyName ?? [];
+            const relaysName = Array.isArray(friendlyName) ? friendlyName : [friendlyName];
+            for (const relayName of relaysName) {
+                const name = relayName ?? 'Unknown'
+                friendlyNames.push(name);
+            }
+
+            //status FWR
+            const statusFwr = deviceInfo.StatusFWR ?? {};
+            const firmwareRevision = statusFwr.Version ?? 'Unknown';
+            const modelName = statusFwr.Hardware ?? 'Unknown';
+
+            //status NET
+            const statusNet = deviceInfo.StatusNET ?? {};
+            const addressMac = statusNet.Mac ?? false;
+
+            //status SNS
+            const statusSns = deviceInfo.StatusSNS ?? {};
+            const statusSnsKeys = Object.keys(statusSns);
+
+            //status STS
+            const statusSts = deviceInfo.StatusSTS ?? {};
+            const statusStsKeys = Object.keys(statusSts);
+            const deviceType = statusSnsKeys.includes('MiElHVAC') ? 0 : statusStsKeys.some(key => LightKeys.includes(key)) ? 2 : statusStsKeys.includes('FanSpeed') ? 3 : 1;
+            const obj = {
+                deviceType: deviceType,
+                deviceName: deviceName,
+                friendlyNames: friendlyNames,
+                modelName: modelName,
+                serialNumber: addressMac,
+                firmwareRevision: firmwareRevision,
+                relaysCount: friendlyNames.length
+            }
+            return obj;
+        } catch (error) {
+            throw new Error(`Check info error: ${error}`);
+        }
+    }
+}
+export default DeviceInfo;

package/src/fans.js

@@ -5,7 +5,7 @@ import ImpulseGenerator from './impulsegenerator.js';
 import { ApiCommands, SensorKeys } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
-class TasmotaDevice extends EventEmitter {
+class Fans extends EventEmitter {
     constructor(api, config, info, refreshInterval) {
         super();
 
@@ -710,4 +710,4 @@ class TasmotaDevice extends EventEmitter {
         }
     }
 }
-export default TasmotaDevice;
+export default Fans;

package/src/lights.js

@@ -5,7 +5,7 @@ import ImpulseGenerator from './impulsegenerator.js';
 import { ApiCommands, SensorKeys } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
-class TasmotaDevice extends EventEmitter {
+class Lights extends EventEmitter {
     constructor(api, config, info, refreshInterval) {
         super();
 
@@ -731,4 +731,4 @@ class TasmotaDevice extends EventEmitter {
         }
     }
 }
-export default TasmotaDevice;
+export default Lights;

package/src/mielhvac.js

@@ -5,7 +5,7 @@ import ImpulseGenerator from './impulsegenerator.js';
 import { ApiCommands, MiElHVAC, TemperatureDisplayUnits } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
-class TasmotaDevice extends EventEmitter {
+class MiElHvac extends EventEmitter {
     constructor(api, config, info, refreshInterval, defaultHeatingSetTemperatureFile, defaultCoolingSetTemperatureFile) {
         super();
 
@@ -1395,4 +1395,4 @@ class TasmotaDevice extends EventEmitter {
         }
     }
 }
-export default TasmotaDevice;
+export default MiElHvac;

package/src/switches.js

@@ -5,7 +5,7 @@ import ImpulseGenerator from './impulsegenerator.js';
 import { ApiCommands, SensorKeys } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
-class TasmotaDevice extends EventEmitter {
+class Switches extends EventEmitter {
     constructor(api, config, info, refreshInterval) {
         super();
 
@@ -620,4 +620,4 @@ class TasmotaDevice extends EventEmitter {
         }
     }
 }
-export default TasmotaDevice;
+export default Switches;