homebridge-tauron-elicznik 0.0.3-beta.12 → 0.0.3-beta.14

package/index.js

@@ -10,7 +10,7 @@ const PLUGIN_NAME = 'homebridge-tauron-elicznik';
 const PLATFORM_NAME = 'tauroneLicznik';
 
 const url = 'https://logowanie.tauron-dystrybucja.pl/login';
-const chartUrl = 'https://elicznik.tauron-dystrybucja.pl/index/charts';
+const charturl = 'https://elicznik.tauron-dystrybucja.pl/index/charts';
 const headers = { 'cache-control': 'no-cache' };
 
 let Accessory, Characteristic, Service, Categories, UUID;
@@ -137,6 +137,12 @@ class eLicznikDevice {
       fsPromises.mkdir(prefDir);
     }
 
+    this.axiosInstance = axios.create({
+      httpsAgent: new https.Agent({
+        ciphers: 'DEFAULT@SECLEVEL=1'
+      })
+    });
+
     //Check device state
     setInterval(() => {
       if (this.checkDeviceInfo) {
@@ -166,58 +172,46 @@ class eLicznikDevice {
   async updateDeviceState() {
     this.log.debug('Device: %s %s, requesting Device state.', this.meterId, this.name);
 
-    // Add login details & meter ID here:
-    const payload = {
-      'username': this.user,
-      'password': this.passwd,
-      'service': 'https://elicznik.tauron-dystrybucja.pl'
-    }
-
-    const url = 'https://logowanie.tauron-dystrybucja.pl/login';
-    const charturl = 'https://elicznik.tauron-dystrybucja.pl/index/charts';
-    const headers = { 'cache-control': 'no-cache' };
-
-    const axiosInstance = axios.create({
-      httpsAgent: new https.Agent({
-        ciphers: 'DEFAULT@SECLEVEL=1'
-      })
-    });
+    try {
+      // Add login details & meter ID here:
+      const payload = {
+        'username': this.user,
+        'password': this.passwd,
+        'service': 'https://elicznik.tauron-dystrybucja.pl'
+      }
 
-    axiosInstance.post(url, payload, { headers: headers })
-      .then((response) => {
-        const chart_year = {
-          "dane[chartYear]": 2020,
-          "dane[paramType]": "year",
-          "dane[smartNr]": this.meterId,
-          "dane[checkOZE]": "on"
-        };
-        return axiosInstance.post(charturl, chart_year, { headers: headers });
-      })
-      .then((response) => {
-        this.log('Device: %s, update Device state: %s', this.name, response.data);
-
-        const energyImport = 0;
-        const energyExport = 0;
-        if (this.tauroneLicznikEnergyService) {
-          this.tauroneLicznikEnergyService
-            .updateCharacteristic(Characteristic.tauroneLicznikEnergyImport, energyImport)
-            .updateCharacteristic(Characteristic.tauroneLicznikEnergyExport, energyExport);
-        }
-        this.energyImport = energyImport;
-        this.energyExport = energyExport;
+      const chart_year = {
+        "dane[chartYear]": 2020,
+        "dane[paramType]": "year",
+        "dane[smartNr]": this.meterId,
+        "dane[checkOZE]": "on"
+      };
+
+      const response = await this.axiosInstance.post(url, payload, { headers: headers });
+      const response1 = await this.axiosInstance.post(charturl, chart_year, { headers: headers });
+      this.log('Device: %s, update Device state: %s', this.name, response1.data);
+
+      const energyImport = 0;
+      const energyExport = 0;
+      if (this.tauroneLicznikEnergyService) {
+        this.tauroneLicznikEnergyService
+          .updateCharacteristic(Characteristic.tauroneLicznikEnergyImport, energyImport)
+          .updateCharacteristic(Characteristic.tauroneLicznikEnergyExport, energyExport);
+      }
+      this.energyImport = energyImport;
+      this.energyExport = energyExport;
 
-        this.checkDeviceState = true;
+      this.checkDeviceState = true;
 
-        //start prepare accessory
-        if (this.startPrepareAccessory) {
-          //this.prepareAccessory();
-        }
-      })
-      .catch((error) => {
-        this.log.error('Device: %s, update Device state error: %s', this.name, error);
-        this.checkDeviceState = false;
-        this.checkDeviceInfo = true;
-      });
+      //start prepare accessory
+      if (this.startPrepareAccessory) {
+        //this.prepareAccessory();
+      }
+    } catch (error) {
+      this.log.error('Device: %s %s, update Device state error: %s', this.meterId, this.name, error);
+      this.checkDeviceState = false;
+      this.checkDeviceInfo = true;
+    };
   }
 
   //Prepare accessory

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tauron eLicznik",
   "name": "homebridge-tauron-elicznik",
-  "version": "0.0.3-beta.12",
+  "version": "0.0.3-beta.14",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to read data from Tauron eLicznik.",
   "license": "MIT",
   "author": "grzegorz914",