homebridge-tauron-elicznik 0.0.2-beta8 → 0.0.2-beta80

package/index.js

@@ -2,16 +2,20 @@
 
 const path = require('path');
 const axios = require('axios');
+const axiosTauronAuth = require('./src/tauronAuth.js');
+const https = require('https');
 const fs = require('fs');
-const fsPromises = require('fs').promises;
-const qs = require('qs')
+const fsPromises = fs.promises;
 
 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 LOGIN_URL = 'https://logowanie.tauron-dystrybucja.pl/login?service=https://elicznik.tauron-dystrybucja.pl';
 const CHARTS_URL = 'https://elicznik.tauron-dystrybucja.pl/index/charts';
+const HEADERS = {
+  'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Firefox/52.0'
+};
 
 let Accessory, Characteristic, Service, Categories, UUID;
 
@@ -130,29 +134,24 @@ class eLicznikDevice {
     this.energyImport = 0;
     this.energyExport = 0;
 
+    const data = {
+      username: this.user,
+      password: this.passwd,
+      service: SERVICE_URL
+    };
+
+    //auth
+    this.tauronAuth = new axiosTauronAuth({
+      data: data
+    });
+
     const prefDir = path.join(api.user.storagePath(), 'eLicznik');
 
     //check if the directory exists, if not then create it
-    if (fs.existsSync(prefDir) == false) {
+    if (!fs.existsSync(prefDir)) {
       fsPromises.mkdir(prefDir);
     }
 
-    const data = qs.stringify({
-      'username': this.user,
-      'password': this.password,
-      'service': CHARTS_URL
-    });
-
-    this.axiosInstance = axios.create({
-      method: 'POST',
-      baseURL: LOGIN_URL,
-      headers: {
-        'content-type': 'application/x-www-form-urlencoded'
-      },
-      data: data,
-      timeout: 5000,
-    });
-
     //Check device state
     setInterval(function () {
       if (this.checkDeviceInfo) {
@@ -191,34 +190,34 @@ class eLicznikDevice {
   async updateDeviceState() {
     this.log.debug('Device: %s %s, requesting Device state.', this.meterId, this.name);
     try {
-      const headers = {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Firefox/52.0'
-      };
+      const url = CHARTS_URL + '?dane[chartYear]=2021&dane[paramType]=year&dane[checkOZE]=on&dane[smartNr]=' + this.meterId;
 
-      const CHART_DATA_URL = 'https://elicznik.tauron-dystrybucja.pl/index/charts?dane[chartYear]=2020&dane[paramType]=year&dane[smartNr]=' + this.meterId + '&dane[checkOZE]=on';
+      const data = {
+        username: this.username,
+        password: this.password,
+        service: SERVICE_URL
+      };
+      const options = {
+        data: data
+      };
+      const response = await axios.post(LOGIN_URL, options);
 
-      const options = qs.stringify({
-        'username': this.user,
-        'password': this.password,
-        'service': CHART_DATA_URL
-      });
+      //const response = await this.tauronAuth.request(url);
 
-      const response = await this.axiosInstance(options);
-      this.log.debug('Device: %s %s, debug response: %s', this.meterId, this.name, response.data);
-      const energyImport = response.data;
-      this.log(response.data)
+      this.log('33333344', response, response.data);
+      const energyImport = 0;
       const energyExport = 0;
       if (this.tauroneLicznikEnergyService) {
         this.tauroneLicznikEnergyService
           .updateCharacteristic(Characteristic.tauroneLicznikEnergyImport, energyImport)
-          .updateCharacteristic(Characteristic.tauroneLicznikEnergyImport, energyExport);
+          .updateCharacteristic(Characteristic.tauroneLicznikEnergyExport, energyExport);
       }
       this.energyImport = energyImport;
       this.energyExport = energyExport;
 
       this.checkDeviceState = true;
     } catch (error) {
-      this.log.error('Device: %s %s, update Device state error: %s, state: Offline', this.meterId, this.name, error);
+      this.log.error('Device: %s %s, update Device state error: %s', this.meterId, this.name, error);
       this.checkDeviceState = false;
       this.checkDeviceInfo = true;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tauron eLicznik",
   "name": "homebridge-tauron-elicznik",
-  "version": "0.0.2-beta8",
+  "version": "0.0.2-beta80",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to read data from Tauron eLicznik.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -19,6 +19,7 @@
   },
   "main": "index.js",
   "files": [
+    "src",
     "index.js",
     "config.schema.json",
     "package.json",

package/src/tauronAuth.js

@@ -0,0 +1,36 @@
+"use strict";
+const axios = require('axios');
+
+const LOGIN_URL = 'https://logowanie.tauron-dystrybucja.pl/login?service=https://elicznik.tauron-dystrybucja.pl';
+const SERVICE_URL = 'https://elicznik.tauron-dystrybucja.pl';
+
+class axiosTauronAuth {
+    constructor({
+        data
+    }) {
+        this.username = data.username;
+        this.password = data.password;
+        this.service = data.service;
+    }
+
+    async request(returnUrl) {
+        try {
+            const data = {
+                username: this.username,
+                password: this.password,
+                service: this.service
+            };
+
+            const options = {
+                data: data
+            };
+            const response = await axios.post(LOGIN_URL, options);
+            returnUrl = response.data;
+
+            return returnUrl;
+        } catch (err) {
+            return err
+        }
+    };
+}
+module.exports = axiosTauronAuth;