homebridge-tauron-elicznik 0.0.2-beta32 → 0.0.2-beta36

package/index.js

@@ -1,21 +1,13 @@
 'use strict';
 
 const path = require('path');
-const axios = require('axios');
 const fs = require('fs');
 const fsPromises = require('fs').promises;
-const https = require('https');
+const pyshell = require('python-shell');
 
 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 = {
-  "cache-control": "no-cache"
-}
-
 let Accessory, Characteristic, Service, Categories, UUID;
 
 module.exports = (api) => {
@@ -178,31 +170,18 @@ class eLicznikDevice {
   async updateDeviceState() {
     this.log.debug('Device: %s %s, requesting Device state.', this.meterId, this.name);
     try {
-      const CHART_DATA_URL = CHARTS_URL + '?dane[chartYear]=2020&dane[paramType]=year&dane[smartNr]=' + this.meterId + '&dane[checkOZE]=on';
-
-      const options = {
-        method: 'POST',
-        baseURL: LOGIN_URL,
-        data: {
-          username: this.user,
-          password: this.password,
-          service: SERVICE_URL
-        },
-        httpsAgent: new https.Agent({
-          rejectUnauthorized: false
-        })
+      var options = {
+        mode: 'text',
+        pythonOptions: ['-u'],
+        scriptPath: './src/',
+        args: [this.user, this.passwd, this.meterId]
       };
-      const response = await axios(options);
-      this.log(response)
 
-      const options1 = {
-        method: 'POST',
-        url: CHART_DATA_URL,
-        headers: HEADERS
-      }
-
-      const response1 = await axios(options1);
-      this.log(response1)
+      pyshell.PythonShell.run('elicznik.py', options, function (err, results) {
+        if (err) throw err;
+        // results is an array consisting of messages collected during execution
+        console.log('results: %j', results.toString());
+      });
 
       this.log.debug('Device: %s %s, debug response: %s', this.meterId, this.name, response1);
       const energyImport = 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tauron eLicznik",
   "name": "homebridge-tauron-elicznik",
-  "version": "0.0.2-beta32",
+  "version": "0.0.2-beta36",
   "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",
@@ -31,7 +32,7 @@
     "homebridge": ">=1.3.0"
   },
   "dependencies": {
-    "axios": "^0.21.4"
+    "python-shell": "^3.0.0"
   },
   "keywords": [
     "homebridge",
@@ -44,4 +45,4 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   }
-}
+}

package/src/elicznik.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+
+import sys
+import requests
+from requests import adapters
+import ssl
+from urllib3 import poolmanager
+import datetime
+
+# Add login details & meter ID here:
+username = sys.argv[0]
+password = sys.argv[1]
+meter_id = sys.argv[2]
+
+payload = {
+    'username': username,
+    'password': password,
+    'service': 'https://elicznik.tauron-dystrybucja.pl'
+}
+
+url = 'https://logowanie.tauron-dystrybucja.pl/login'
+charturl = 'https://elicznik.tauron-dystrybucja.pl/index/charts'
+headers = {'cache-control': 'no-cache'}
+
+
+class TLSAdapter(adapters.HTTPAdapter):
+
+    def init_poolmanager(self, connections, maxsize, block=False):
+        """Create and initialize the urllib3 PoolManager."""
+        ctx = ssl.create_default_context()
+        ctx.set_ciphers('DEFAULT@SECLEVEL=1')
+        self.poolmanager = poolmanager.PoolManager(
+            num_pools=connections,
+            maxsize=maxsize,
+            block=block,
+            ssl_version=ssl.PROTOCOL_TLS,
+            ssl_context=ctx)
+
+
+session = requests.session()
+session.mount('https://', TLSAdapter())
+
+p = session.request("POST", url, data=payload, headers=headers)
+p = session.request("POST", url, data=payload, headers=headers)
+
+chart_year = {
+    # change timedelta to get data from another days (1 for yesterday)
+    "dane[chartYear]": 2020,
+    "dane[paramType]": "year",
+    "dane[smartNr]": meter_id,
+    # comment if don't want generated energy data in JSON output:
+    "dane[checkOZE]": "on"
+}
+
+r = session.request("POST", charturl, data=chart_year, headers=headers)
+
+print(r.text)