homebridge-tauron-elicznik 0.0.2-beta42 → 0.0.2-beta43

package/index.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const path = require('path');
+const axios = require('axios');
 const fs = require('fs');
 const fsPromises = require('fs').promises;
-const pyshell = require('python-shell');
 
 const PLUGIN_NAME = 'homebridge-tauron-elicznik';
 const PLATFORM_NAME = 'tauroneLicznik';
@@ -170,17 +170,6 @@ class eLicznikDevice {
   async updateDeviceState() {
     this.log.debug('Device: %s %s, requesting Device state.', this.meterId, this.name);
     try {
-      var options = {
-        mode: 'text',
-        pythonOptions: ['-u'],
-        args: [this.user, this.passwd, this.meterId]
-      };
-
-      pyshell.PythonShell.run(__dirname + '/src/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());
-      });
 
       const energyImport = 0;
       const energyExport = 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Tauron eLicznik",
   "name": "homebridge-tauron-elicznik",
-  "version": "0.0.2-beta42",
+  "version": "0.0.2-beta43",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to read data from Tauron eLicznik.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -19,7 +19,6 @@
   },
   "main": "index.js",
   "files": [
-    "src",
     "index.js",
     "config.schema.json",
     "package.json",
@@ -32,7 +31,7 @@
     "homebridge": ">=1.3.0"
   },
   "dependencies": {
-    "python-shell": "^3.0.0"
+    "axios": "^0.21.4"
   },
   "keywords": [
     "homebridge",

package/src/elicznik.py

@@ -1,57 +0,0 @@
-#!/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)