homebridge-tauron-elicznik 0.0.3-beta.6 → 0.0.3-beta.8

package/index.js

@@ -3,18 +3,14 @@
 const path = require('path');
 const fs = require('fs');
 const fsPromises = fs.promises;
-const axios = require('axios');
-const https = require('https');
+const request = require('request-promise');
 
 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;
 
@@ -58,7 +54,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);
@@ -141,14 +137,14 @@ class eLicznikDevice {
     }
 
     //Check device state
-    setInterval(function () {
+    setInterval(() => {
       if (this.checkDeviceInfo) {
         this.getDeviceInfo();
       }
       if (this.checkDeviceState) {
         this.updateDeviceState();
       }
-    }.bind(this), this.refreshInterval * 1000);
+    }, 30000);
   }
 
   getDeviceInfo() {
@@ -168,22 +164,36 @@ class eLicznikDevice {
 
   async updateDeviceState() {
     this.log.debug('Device: %s %s, requesting Device state.', this.meterId, this.name);
+
     try {
-      const url = `${CHARTS_URL}?dane[chartYear]=2022&dane[paramType]=year&dane[checkOZE]=on&dane[smartNr]=${this.meterId}`;
-      const options = {
-        method: 'POST',
-        url: url
+      // Add login details & meter ID here:
+      const username = this.user;
+      const password = this.passwd;
+      const meterId = this.meterId;
+
+      const payload = {
+        username,
+        password,
+        service: 'https://elicznik.tauron-dystrybucja.pl'
       };
 
-      const token = Buffer.from(`${this.user}:${this.passwd}`, 'utf8').toString('base64')
-      const login = axios.post(LOGIN_URL, {
-        headers: {
-          'Authorization': `Basic ${token}`
-        }
-      });
-      this.log('hhhhhhhh', login)
-      //const data = await axios(options);
-      //this.log('gggggggg', data.data)
+      const chartYear = {
+        'dane[chartYear]': 2021,
+        'dane[paramType]': 'year',
+        'dane[smartNr]': meterId,
+        'dane[checkOZE]': 'on'
+      };
+
+      // Log in to the TAURON eLicznik website
+      await request.post({ url, form: payload, headers });
+      await request.post({ url, form: payload, headers });
+
+      // Retrieve data for the specified meter ID
+      const response = await request.post({ url: chartUrl, form: chartYear, headers });
+      const jsonData = JSON.parse(response);
+
+      // Print the JSON data
+      this.log('Device: %s, update Device state: %s', this.name, jsonData);
 
       const energyImport = 0;
       const energyExport = 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tauron eLicznik",
   "name": "homebridge-tauron-elicznik",
-  "version": "0.0.3-beta.6",
+  "version": "0.0.3-beta.8",
   "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"
+    "request-promise": ">=4.2.6"
   },
   "keywords": [
     "homebridge",