homebridge-tasmota-control 1.4.0-beta.32 → 1.4.0-beta.34

package/index.js

@@ -6,7 +6,7 @@ import switches from './src/switches.js';
 import lights from './src/lights.js';
 import fans from './src/fans.js';
 import ImpulseGenerator from './src/impulsegenerator.js';
-import { PluginName, PlatformName, ApiCommands, LightKeys } from './src/constants.js';
+import { PluginName, PlatformName } from './src/constants.js';
 
 class tasmotaPlatform {
   constructor(log, config, api) {
@@ -43,11 +43,11 @@ class tasmotaPlatform {
         }
 
         //log config
-        const loadNameFromDevice = deviceConfig.loadNameFromDevice || false;
-        const auth = deviceConfig.auth || false;
         const url = `http://${host}/cm?cmnd=`;
+        const auth = deviceConfig.auth || false;
         const user = deviceConfig.user || '';
         const passwd = deviceConfig.passwd || '';
+        const loadNameFromDevice = deviceConfig.loadNameFromDevice || false;
         const refreshInterval = deviceConfig.refreshInterval * 1000 || 5000;
         const enableDebugMode = deviceConfig.enableDebugMode || false;
         const disableLogDeviceInfo = deviceConfig.disableLogDeviceInfo || false;
@@ -63,28 +63,6 @@ class tasmotaPlatform {
         };
         const debug1 = !enableDebugMode ? false : log.info(`Device: ${host} ${deviceName}, Config: ${JSON.stringify(newConfig, null, 2)}.`);
 
-        //check files exists, if not then create it
-        const postFix = deviceConfig.host.split('.').join('');
-        const defaultHeatingSetTemperatureFile = `${prefDir}/defaultHeatingSetTemperature_${postFix}`;
-        const defaultCoolingSetTemperatureFile = `${prefDir}/defaultCoolingSetTemperature_${postFix}`;
-
-        try {
-          const files = [
-            defaultHeatingSetTemperatureFile,
-            defaultCoolingSetTemperatureFile
-          ];
-
-          files.forEach((file, index) => {
-            if (!existsSync(file)) {
-              const data = ['20', '23'][index]
-              writeFileSync(file, data);
-            }
-          });
-        } catch (error) {
-          log.error(`Device: ${host} ${deviceName}, Prepare files error: ${error}`);
-          return;
-        }
-
         try {
           //get device info
           const deviceInfo = new deviceinfo(url, auth, user, passwd, deviceName, loadNameFromDevice, enableDebugMode, refreshInterval);
@@ -104,11 +82,33 @@ class tasmotaPlatform {
             return;
           }
 
-          log.warn(info.deviceType);
           let device;
           switch (info.deviceType) {
             case 0://mielhvac
+              //check files exists, if not then create it
+              const postFix = deviceConfig.host.split('.').join('');
+              const defaultHeatingSetTemperatureFile = `${prefDir}/defaultHeatingSetTemperature_${postFix}`;
+              const defaultCoolingSetTemperatureFile = `${prefDir}/defaultCoolingSetTemperature_${postFix}`;
+
+              try {
+                const files = [
+                  defaultHeatingSetTemperatureFile,
+                  defaultCoolingSetTemperatureFile
+                ];
+
+                files.forEach((file, index) => {
+                  if (!existsSync(file)) {
+                    const data = ['20', '23'][index]
+                    writeFileSync(file, data);
+                  }
+                });
+              } catch (error) {
+                log.error(`Device: ${host} ${deviceName}, Prepare files error: ${error}`);
+                return;
+              }
+
               device = new mielhvac(api, deviceConfig, info, refreshInterval, defaultHeatingSetTemperatureFile, defaultCoolingSetTemperatureFile);
+              break;
             case 1://switches
               device = new switches(api, deviceConfig, info, refreshInterval);
               break;
@@ -118,6 +118,9 @@ class tasmotaPlatform {
             case 3://fans
               device = new fans(api, deviceConfig, info, refreshInterval);
               break;
+            default:
+              const emitLog = disableLogWarn ? false : log.warn(`Device: ${host} ${deviceName}, unknown device: ${info.deviceType}.`);
+              return;
           }
 
           device.on('publishAccessory', (accessory) => {

package/package.json

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

package/src/deviceinfo.js

@@ -67,7 +67,7 @@ class DeviceInfo extends EventEmitter {
                 serialNumber: addressMac,
                 firmwareRevision: firmwareRevision,
                 relaysCount: friendlyNames.length
-            }
+            };
             return obj;
         } catch (error) {
             throw new Error(`Check info error: ${error}`);

package/src/fans.js

@@ -343,7 +343,7 @@ class Fans extends EventEmitter {
         }
     }
 
-    deviceInfo() {
+    async deviceInfo() {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
@@ -352,6 +352,7 @@ class Fans extends EventEmitter {
         this.emit('devInfo', `Relays: ${this.info.relaysCount}`);
         this.emit('devInfo', `Sensors: ${this.sensorsCount}`);
         this.emit('devInfo', `----------------------------------`);
+        return;
     }
 
     //prepare accessory
@@ -695,7 +696,7 @@ class Fans extends EventEmitter {
             this.emit('success', `Connect Success`)
 
             //check device info 
-            const devInfo = !this.disableLogDeviceInfo ? this.deviceInfo() : false;
+            const devInfo = !this.disableLogDeviceInfo ? await this.deviceInfo() : false;
 
             //start prepare accessory
             if (this.startPrepareAccessory) {

package/src/lights.js

@@ -359,7 +359,7 @@ class Lights extends EventEmitter {
         }
     }
 
-    deviceInfo() {
+    async deviceInfo() {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
@@ -368,6 +368,7 @@ class Lights extends EventEmitter {
         this.emit('devInfo', `Relays: ${this.info.relaysCount}`);
         this.emit('devInfo', `Sensors: ${this.sensorsCount}`);
         this.emit('devInfo', `----------------------------------`);
+        return;
     }
 
     //prepare accessory
@@ -716,7 +717,7 @@ class Lights extends EventEmitter {
             this.emit('success', `Connect Success`)
 
             //check device info 
-            const devInfo = !this.disableLogDeviceInfo ? this.deviceInfo() : false;
+            const devInfo = !this.disableLogDeviceInfo ? await this.deviceInfo() : false;
 
             //start prepare accessory
             if (this.startPrepareAccessory) {

package/src/mielhvac.js

@@ -811,7 +811,7 @@ class MiElHvac extends EventEmitter {
         }
     }
 
-    deviceInfo() {
+    async deviceInfo() {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
@@ -819,6 +819,7 @@ class MiElHvac extends EventEmitter {
         this.emit('devInfo', `Firmware: ${this.info.firmwareRevision}`);
         this.emit('devInfo', `Sensor: MiELHVAC`);
         this.emit('devInfo', `----------------------------------`);
+        return;
     }
 
     //prepare accessory
@@ -1380,7 +1381,7 @@ class MiElHvac extends EventEmitter {
             this.emit('success', `Connect Success`)
 
             //check device info 
-            const devInfo = !this.disableLogDeviceInfo ? this.deviceInfo() : false;
+            const devInfo = !this.disableLogDeviceInfo ? await this.deviceInfo() : false;
 
             //start prepare accessory
             if (this.startPrepareAccessory) {

package/src/switches.js

@@ -312,7 +312,7 @@ class Switches extends EventEmitter {
         }
     }
 
-    deviceInfo() {
+    async deviceInfo() {
         this.emit('devInfo', `----- ${this.info.deviceName} -----`);
         this.emit('devInfo', `Manufacturer: Tasmota`);
         this.emit('devInfo', `Hardware: ${this.info.modelName}`);
@@ -321,6 +321,7 @@ class Switches extends EventEmitter {
         this.emit('devInfo', `Relays: ${this.info.relaysCount}`);
         this.emit('devInfo', `Sensors: ${this.sensorsCount}`);
         this.emit('devInfo', `----------------------------------`);
+        return;
     }
 
     //prepare accessory
@@ -605,7 +606,7 @@ class Switches extends EventEmitter {
             this.emit('success', `Connect Success`)
 
             //check device info 
-            const devInfo = !this.disableLogDeviceInfo ? this.deviceInfo() : false;
+            const devInfo = !this.disableLogDeviceInfo ? await this.deviceInfo() : false;
 
             //start prepare accessory
             if (this.startPrepareAccessory) {