homebridge-tauron-elicznik 0.0.2-beta18 → 0.0.2-beta21

package/index.js

@@ -2,9 +2,9 @@
 
 const path = require('path');
 const axios = require('axios');
+const tauroneLicznikAuth = require('./src/tauroneLicznikAuth.js');
 const fs = require('fs');
 const fsPromises = require('fs').promises;
-const https = require('https');
 
 const PLUGIN_NAME = 'homebridge-tauron-elicznik';
 const PLATFORM_NAME = 'tauroneLicznik';
@@ -180,25 +180,25 @@ class eLicznikDevice {
     try {
       const CHART_DATA_URL = CHARTS_URL + '?dane[chartYear]=2020&dane[paramType]=year&dane[smartNr]=' + this.meterId + '&dane[checkOZE]=on';
 
-      const data = {
-        'username': this.user,
-        'password': this.password,
-        "service": SERVICE_URL
-      };
-  
-      const response1 = await axios.request({
-        method: 'POST',
-        url: LOGIN_URL,
-        data: data,
-        headers: HEADERS,
-        httpsAgent: new https.Agent({
-          rejectUnauthorized: false
-        }),
+      const elicznikAuth = new tauroneLicznikAuth({
+        username: this.user,
+        password: this.password,
+        service: SERVICE_URL
       });
+
+      const options = {
+        headers: {
+          Accept: HEADERS
+        },
+        method: 'POST',
+        url: CHART_DATA_URL
+      }
+
+      const response1 = await elicznikAuth.request(options);
       this.log(response1.data)
 
       this.log.debug('Device: %s %s, debug response: %s', this.meterId, this.name, response.data);
-      const energyImport = response.data;
+      const energyImport = 0;
       this.log(response.data)
       const energyExport = 0;
       if (this.tauroneLicznikEnergyService) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tauron eLicznik",
   "name": "homebridge-tauron-elicznik",
-  "version": "0.0.2-beta18",
+  "version": "0.0.2-beta21",
   "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/tauroneLicznikAuth.js

@@ -0,0 +1,23 @@
+"use strict";
+const https = require('https');
+const axios = require('axios');
+let count = 0;
+
+class tauroneLicznikAuth {
+    constructor({
+        username,
+        password,
+        service
+    }) {
+        this.user = username;
+        this.passwd = password;
+        this.service = service;
+    }
+
+    async request(options) {
+        try {
+            return await axios.request(options);
+        } catch (err) {}
+    };
+}
+module.exports = tauroneLicznikAuth;