homebridge-tasmota-control 0.3.35 → 0.3.37-beta.2

package/README.md

@@ -1 +1 @@
-# tasmota-outlet
+# tasmota-control

package/index.js

@@ -85,6 +85,7 @@ class tasmotaDevice {
     this.checkDeviceInfo = true;
     this.checkDeviceState = false;
     this.startPrepareAccessory = true;
+
     this.prefDir = path.join(api.user.storagePath(), 'tasmota');
     this.url = `http://${this.host}/cm?user=${this.user}&password=${this.passwd}&cmnd=`
 
@@ -103,19 +104,18 @@ class tasmotaDevice {
     setInterval(function () {
       if (this.checkDeviceInfo) {
         this.getDeviceInfo();
-      }
-      if (this.checkDeviceState) {
+      } else {
         this.updateDeviceState();
       }
     }.bind(this), this.refreshInterval * 1000);
-
-    //start prepare accessory
   }
 
   async getDeviceInfo() {
     this.log.debug('Device: %s %s, requesting Device Info.', this.host, this.name);
     try {
       const response = await this.axiosInstance(STATUS);
+      const debug = this.enableDebugMode ? this.log('Device: %s %s, debug response: %s', this.host, this.name, response.data) : false;
+
       const deviceName = response.data.Status.DeviceName;
       const modelName = response.data.StatusFWR.Hardware;
       const addressMac = response.data.StatusNET.Mac;
@@ -133,7 +133,6 @@ class tasmotaDevice {
       this.firmwareRevision = firmwareRevision;
 
       this.checkDeviceInfo = false;
-      this.updateDeviceState();
     } catch (error) {
       this.log.error('Device: %s %s, Device Info eror: %s, state: Offline, trying to reconnect', this.host, this.name, error);
       this.checkDeviceInfo = true;
@@ -143,15 +142,18 @@ class tasmotaDevice {
   async updateDeviceState() {
     this.log.debug('Device: %s %s, requesting Device state.', this.host, this.name);
     try {
+      const response = await this.axiosInstance(POWER + 0);
+      const debug = this.enableDebugMode ? this.log('Device: %s %s, debug response: %s', this.host, this.name, response.data) : false;
+
+      this.powerState = new Array();
       for (let i = 0; i < this.channelsCount; i++) {
-        const channel = this.channelsCount == 1 ? 'POWER' : 'POWER' + i;
-        const response = await this.axiosInstance(channel);
-        const debug = this.enableDebugMode ? this.log('Device: %s %s, debug response: %s', this.host, this.name, response.data) : false;
-        const powerState = (response.data[channel] != undefined) ? (response.data[channel] == 'ON') : false;
+        const powerState = (response.data[POWER + i] != undefined) ? (response.data[POWER + i] == 'ON') : false;
         if (this.tasmotaServices) {
           this.tasmotaServices[i]
             .updateCharacteristic(Characteristic.OutletInUse, powerState);
         }
+
+        this.powerState.push(powerState)
       }
       this.checkDeviceState = true;
 
@@ -188,7 +190,6 @@ class tasmotaDevice {
       .setCharacteristic(Characteristic.Model, modelName)
       .setCharacteristic(Characteristic.SerialNumber, serialNumber)
       .setCharacteristic(Characteristic.FirmwareRevision, firmwareRevision);
-
     accessory.addService(informationService);
 
     //Prepare service 
@@ -198,24 +199,20 @@ class tasmotaDevice {
       const tasmotaService = new Service.Outlet(accessoryName, `tasmotaService${[i]}`);
       tasmotaService.getCharacteristic(Characteristic.On)
         .onGet(async () => {
-          const channel = this.channelsCount == 1 ? 'POWER' : 'POWER' + i;
-          const response = await this.axiosInstance(channel);
-          const state = (response.data[channel] != undefined) ? (response.data[channel] == 'ON') : false;
+          const state = this.powerState[i];
           const logInfo = this.disableLogInfo ? false : this.log('Device: %s, get state: %s', accessoryName, state ? 'ON' : 'OFF');
           return state;
         })
         .onSet(async (state) => {
           const powerOn = this.channelsCount == 1 ? POWER + ON : POWER + (i + 1) + ON;
           const powerOff = this.channelsCount == 1 ? POWER + OFF : POWER + (i + 1) + OFF;
-          state = state ? powerOn : powerOff;
+          state = state ? POWER + ON : POWER + OFF;
           this.axiosInstance(state);
           const logInfo = this.disableLogInfo ? false : this.log('Device: %s, set state: %s', accessoryName, state ? 'ON' : 'OFF');
         });
       tasmotaService.getCharacteristic(Characteristic.OutletInUse)
         .onGet(async () => {
-          const channel = this.channelsCount == 1 ? 'POWER' : 'POWER' + i;
-          const response = await this.axiosInstance(channel);
-          const state = (response.data[channel] != undefined) ? (response.data[channel] == 'ON') : false;
+          const state = this.powerState[i];
           const logInfo = this.disableLogInfo ? false : this.log('Device: %s, in use: %s', accessoryName, state ? 'YES' : 'NO');
           return state;
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tasmota Control",
   "name": "homebridge-tasmota-control",
-  "version": "0.3.35",
+  "version": "0.3.37-beta.2",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to control Tasmota flashed devices.",
   "license": "MIT",
   "author": "grzegorz914",