homebridge-tauron-elicznik 0.0.2-beta93 → 0.0.3-beta.2

package/index.js

@@ -3,6 +3,7 @@
 const path = require('path');
 const fs = require('fs');
 const fsPromises = fs.promises;
+const axios = require('axios');
 
 const PLUGIN_NAME = 'homebridge-tauron-elicznik';
 const PLATFORM_NAME = 'tauroneLicznik';
@@ -147,11 +148,6 @@ class eLicznikDevice {
         this.updateDeviceState();
       }
     }.bind(this), this.refreshInterval * 1000);
-
-    //start prepare accessory
-    if (this.startPrepareAccessory) {
-      this.prepareAccessory();
-    }
   }
 
   async getDeviceInfo() {
@@ -176,18 +172,20 @@ class eLicznikDevice {
   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 payload = {
-        username: this.user,
-        password: this.passwd,
-        service: SERVICE_URL
-      };
+      const url = `${CHARTS_URL}?dane[chartYear]=2021&dane[paramType]=year&dane[checkOZE]=on&dane[smartNr]=${this.meterId}`;
       const options = {
         method: 'POST',
-        data: payload,
-        headers: HEADERS
+        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) {
@@ -199,6 +197,11 @@ class eLicznikDevice {
       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;
@@ -235,8 +238,8 @@ class eLicznikDevice {
     //Prepare service 
     this.log.debug('prepareTauroneLicznikService');
     //power and energy
-    this.tauroneLicznikEnergyService = new Service.tauroneLicznikEnergyService('Meter ' + this.meterId, 'tauroneLicznikEnergyService');
-    this.tauroneLicznikEnergyService.getCharacteristic(Characteristic.tauroneLicznikEnergyImport)
+    this.tauroneLicznikService = new Service.tauroneLicznikEnergyService(`Meter ${this.meterId}`, 'tauroneLicznikEnergyService');
+    this.tauroneLicznikService.getCharacteristic(Characteristic.tauroneLicznikEnergyImport)
       .onGet(async () => {
         const value = this.energyImport;
         if (!this.disableLogInfo) {
@@ -244,7 +247,7 @@ class eLicznikDevice {
         }
         return value;
       });
-    this.tauroneLicznikEnergyService.getCharacteristic(Characteristic.tauroneLicznikEnergyExport)
+    this.tauroneLicznikService.getCharacteristic(Characteristic.tauroneLicznikEnergyExport)
       .onGet(async () => {
         const value = this.energyExport;
         if (!this.disableLogInfo) {

package/package.json

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