homebridge-tauron-elicznik 0.0.3-beta.1 → 0.0.3-beta.10

package/index.js

@@ -4,16 +4,14 @@ const path = require('path');
 const fs = require('fs');
 const fsPromises = fs.promises;
 const axios = require('axios');
+const https = require('https');
 
 const PLUGIN_NAME = 'homebridge-tauron-elicznik';
 const PLATFORM_NAME = 'tauroneLicznik';
 
-const SERVICE_URL = 'https://elicznik.tauron-dystrybucja.pl';
-const LOGIN_URL = 'https://logowanie.tauron-dystrybucja.pl/login';
-const CHARTS_URL = 'https://elicznik.tauron-dystrybucja.pl/index/charts';
-const HEADERS = {
-  'content-type': 'application/x-www-form-urlencoded'
-};
+const url = 'https://logowanie.tauron-dystrybucja.pl/login';
+const chartUrl = 'https://elicznik.tauron-dystrybucja.pl/index/charts';
+const headers = { 'cache-control': 'no-cache' };
 
 let Accessory, Characteristic, Service, Categories, UUID;
 
@@ -57,7 +55,7 @@ module.exports = (api) => {
   Characteristic.tauroneLicznikEnergyExport = tauroneLicznikEnergyExport;
 
   class tauroneLicznikEnergyService extends Service {
-    constructor(displayName, subtype, ) {
+    constructor(displayName, subtype,) {
       super(displayName, '00000001-000A-1000-8000-0026BB765291', subtype);
       // Mandatory Characteristics
       this.addCharacteristic(Characteristic.tauroneLicznikEnergyImport);
@@ -140,73 +138,86 @@ class eLicznikDevice {
     }
 
     //Check device state
-    setInterval(function () {
+    setInterval(() => {
       if (this.checkDeviceInfo) {
         this.getDeviceInfo();
       }
       if (this.checkDeviceState) {
         this.updateDeviceState();
       }
-    }.bind(this), this.refreshInterval * 1000);
+    }, 30000);
   }
 
-  async getDeviceInfo() {
+  getDeviceInfo() {
     this.log.debug('Device: %s %s, requesting Device Info.', this.meterId, this.name);
-    try {
-      this.log('-------- %s --------', this.name);
-      this.log('Manufacturer: %s', this.manufacturer);
-      this.log('Model: %s', this.modelName);
-      this.log('Meter Id: %s', this.meterId);
-      this.log('Serialnr: %s', this.serialNumber);
-      this.log('Firmware: %s', this.firmwareRevision);
-      this.log('----------------------------------');
-
-      this.checkDeviceInfo = false;
-      this.updateDeviceState();
-    } catch (error) {
-      this.log.error('Device: %s %s, Device Info eror: %s, state: Offline, trying to reconnect', this.meterId, this.name, error);
-      this.checkDeviceInfo = true;
-    }
+
+    this.log('-------- %s --------', this.name);
+    this.log('Manufacturer: %s', this.manufacturer);
+    this.log('Model: %s', this.modelName);
+    this.log('Meter Id: %s', this.meterId);
+    this.log('Serialnr: %s', this.serialNumber);
+    this.log('Firmware: %s', this.firmwareRevision);
+    this.log('----------------------------------');
+
+    this.checkDeviceInfo = false;
+    this.updateDeviceState();
   }
 
   async updateDeviceState() {
     this.log.debug('Device: %s %s, requesting Device state.', this.meterId, this.name);
-    try {
-      const url = `${CHARTS_URL}?dane[chartYear]=2021&dane[paramType]=year&dane[checkOZE]=on&dane[smartNr]=${this.meterId}`;
-      const options = {
-        method: 'POST',
-        url: url
-      };
-
-      const login = await axios.post(LOGIN_URL, {
-        username: this.user,
-        password: this.passwd,
-      });
-      this.log('hhhhhhhh', login)
-      const data = await axios.post(options);
-      this.log('gggggggg', data.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;
 
-      //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;
+    // Add login details & meter ID here:
+    const payload = {
+      'username': username,
+      'password': password,
+      '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'
+      })
+    });
+
+    axiosInstance.post(url, payload, { headers: headers })
+      .then((response) => {
+        const chart_year = {
+          "dane[chartYear]": 2020,
+          "dane[paramType]": "year",
+          "dane[smartNr]": meter_id,
+          "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;
+
+        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;
+      });
   }
 
   //Prepare accessory
@@ -238,7 +249,7 @@ class eLicznikDevice {
     //Prepare service 
     this.log.debug('prepareTauroneLicznikService');
     //power and energy
-    this.tauroneLicznikEnergyService = new Service.tauroneLicznikEnergyService('Meter ' + this.meterId, 'tauroneLicznikEnergyService');
+    this.tauroneLicznikEnergyService = new Service.tauroneLicznikEnergyService(`Meter ${this.meterId}`, 'tauroneLicznikEnergyService');
     this.tauroneLicznikEnergyService.getCharacteristic(Characteristic.tauroneLicznikEnergyImport)
       .onGet(async () => {
         const value = this.energyImport;

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tauron eLicznik",
   "name": "homebridge-tauron-elicznik",
-  "version": "0.0.3-beta.1",
+  "version": "0.0.3-beta.10",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to read data from Tauron eLicznik.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -28,10 +28,10 @@
   ],
   "engines": {
     "node": ">=14.0.0",
-    "homebridge": ">=1.3.0"
+    "homebridge": ">=1.4.0"
   },
   "dependencies": {
-    "axios": ">=0.25.0"
+    "axios": ">=1.2.1"
   },
   "keywords": [
     "homebridge",