iobroker.senec 1.4.0 → 1.4.2

package/README.md

@@ -366,6 +366,12 @@ This channel contains calculated values. Currently these are day/week/month/year
    *Read-only number, which designates the number of wallbox [0..3]. This is only available on systems with configured wallboxes.*
 
 ## Changelog
+### 1.4.2 (NoBl)
+* Added option to use https for connecting to SENEC (only activate if your appliance supports / requires this!)
+
+### 1.4.1 (NoBl)
+* Fix: Autarky calculations are working again.
+
 ### 1.4.0 (NoBl)
 * Added object caching along with some minor code updates. Due to the amount of objects we deal with caching is about mandatory.
 

package/admin/jsonConfig.json

@@ -33,6 +33,37 @@
 			"default": "0.0.0.0",
 			"newLine": true
 		},
+		"useHttps": {
+			"type": "checkbox",
+			"label": {
+				"en": "Use https?",
+				"de": "https verwenden?",
+				"ru": "Используйте https?",
+				"pt": "Usar https?",
+				"nl": "HTP's gebruiken?",
+				"fr": "Utiliser des https ?",
+				"it": "Utilizzare https?",
+				"es": "¿Usar https?",
+				"pl": "Użycie https?",
+				"uk": "Використовуйте HTTPS?",
+				"zh-cn": "使用网址?"
+			},
+			"help": {
+				"en": "Is https required to connect to SENEC? Only check if SENEC supports https already!",
+				"de": "Ist https erforderlich, um mit SENEC zu verbinden? Nur aktivieren, falls SENEC bereits https unterstützt!",
+				"ru": "Необходимо ли подключиться к SENEC? Только проверьте, поддерживает ли SENEC https уже!",
+				"pt": "São necessários https para se conectar ao SENEC? Basta verificar se o SENEC suporta https já!",
+				"nl": "Is HTP's nodig om te verbinden met SENEC? Controleer of SENEC al HTP's steunt!",
+				"fr": "Les https sont-ils nécessaires pour se connecter à SENEC? Vérifiez seulement si SENEC prend déjà en charge https!",
+				"it": "Https è necessario connettersi a SENEC? Controlla solo se SENEC supporta già https!",
+				"es": "¿Se requiere https para conectarse a SENEC? ¡Sólo comprueba si SENEC admite https ya!",
+				"pl": "Czy https musi łączyć się z SENEC? Jeśli SENEC obsługuje https już!",
+				"uk": "Чи потрібен HTTPS для підключення до SENEC? Тільки перевірте, чи підтримує SENEC HTTPS вже!",
+				"zh-cn": "是否需要与ENEC联系? 只有检查有无国界协会支持已经!"
+			},
+			"default": false,
+			"newLine": false
+		},
 		"interval": {
 			"type": "number",
 			"label": {

package/io-package.json

@@ -1,8 +1,34 @@
 {
     "common": {
         "name": "senec",
-        "version": "1.4.0",
+        "version": "1.4.2",
         "news": {
+			"1.4.2": {
+				"en": "Added option to use https for connecting to SENEC (only activate if your appliance supports / requires this!)",
+				"de": "Zusätzliche Option zur Verwendung von https zur Verbindung mit SENEC hinzugefügt (nur aktivieren, wenn Ihr Gerät dies unterstützt / erfordert)",
+				"ru": "Добавлена возможность использования https для подключения к SENEC (только активируйте, если ваше приложение поддерживает / требует этого)",
+				"pt": "Adicionado opção para usar https para conectar-se ao SENEC (apenas ativar se o seu aparelho suporta / requer este)",
+				"nl": "Aangepaste optie om HTP's te gebruiken voor verbinding met SENEC (only geactiveerd als je appliance steunt / vereist dit",
+				"fr": "Ajout de l'option d'utiliser les https pour se connecter à SENEC (seulement activer si votre appareil prend en charge / nécessite ceci) ",
+				"it": "Aggiunta opzione per utilizzare https per il collegamento a SENEC (solo attivare se il tuo elettrodomestici supporta / richiede questo)",
+				"es": "Opción agregada para usar https para conectarse a SENEC (sólo activar si su dispositivo soporta / requiere esto)",
+				"pl": "Dodana opcja do używania https dla połączenia z SENEC (w sposób aktywowana, jeśli dana osoba obsługuje / wymaga to)",
+				"uk": "Додано можливість використовувати HTTPS для підключення до SENEC (тільки активуйте, якщо підтримує додаток / вимагає цього)",
+				"zh-cn": "增加使用连接到SENEC的网站的选择(如果你的可靠支持/要求这样做)"
+			},
+			"1.4.1": {
+				"en": "Autarky calculations are working again.",
+				"de": "Autarkieberechnungen funktionieren wieder.",
+				"ru": "Расчеты Autarky снова работают.",
+				"pt": "Cálculos autarcos estão a funcionar outra vez.",
+				"nl": "Autarische berekeningen werken weer.",
+				"fr": "Les calculs Autarky fonctionnent à nouveau.",
+				"it": "I calcoli autarky funzionano di nuovo.",
+				"es": "Los cálculos autárquicos están funcionando de nuevo.",
+				"pl": "Ponowne obliczenia autarktyczne działają ponownie.",
+				"uk": "Аутарки знову працюють.",
+				"zh-cn": "Autarky的计算正再次工作。."
+			},
 			"1.4.0": {
 				"en": "Added object caching and minor code updates. Due to the amount of objects we deal with caching is about mandatory.",
 				"de": "Objekt-Caching und kleinere Code-Updates hinzugefügt. Aufgrund der Menge an Objekten, die der Adapter bearbeitet, ist Caching zwingend notwendig.",
@@ -61,17 +87,17 @@
             "zh-cn": "塞内克"
         },
         "desc": {
-            "en": "This adapter reads available values from a Senec Home V2.1 system using lala.cgi",
-			"de": "Dieser Adapter liest verfügbare Werte von einem Senec Home V2.1 System mit lala.cgi",
-			"ru": "Этот адаптер читает доступные значения от системы Senec Home V2.1 с использованием lala.cgi",
-			"pt": "Este adaptador lê valores disponíveis de um sistema Senec Home V2.1 usando lala.cgi",
-			"nl": "Deze adapter leest beschikbare waarden van een Senec Home V2.1 systeem met lala",
-			"fr": "Cet adaptateur lit les valeurs disponibles d'un système Senec Home V2.1 en utilisant lala.cgi",
-			"it": "Questo adattatore legge i valori disponibili da un sistema Senec Home V2.1 utilizzando lala.cgi",
-			"es": "Este adaptador lee los valores disponibles de un sistema Senec Home V2.1 utilizando lala.cgi",
-			"pl": "Ten adapter odczytuje dostępne wartości z systemu Senec Home V2.1 używając lala.cgi",
-			"uk": "Цей адаптер читає доступні значення з системи Senec Home V2.1 за допомогою lala.cgi",
-			"zh-cn": "这种适应者用Fla.cgi改为Senec Home V2.1系统可得到的数值。"
+            "en": "This adapter reads available values from a Senec Home V2.1 (and later) system using lala.cgi",
+			"de": "Dieser Adapter liest verfügbare Werte von einem Senec Home V2.1 (und später) System mit lala.cgi",
+			"ru": "Этот адаптер считывает доступные значения от системы Senec Home V2.1 (и позже) с помощью lala.cgi",
+			"pt": "Este adaptador lê valores disponíveis de um sistema Senec Home V2.1 (e posterior) usando lala.cgi",
+			"nl": "Deze adapter leest beschikbare waarden van een Senec Home V21 (en later) systeem met lala",
+			"fr": "Cet adaptateur lit les valeurs disponibles d'un système Senec Home V2.1 (et plus tard) utilisant lala.cgi",
+			"it": "Questo adattatore legge i valori disponibili da un sistema Senec Home V2.1 (e successivamente) utilizzando lala.cgi",
+			"es": "Este adaptador lee los valores disponibles de un sistema Senec Home V2.1 (y más tarde) usando lala.cgi",
+			"pl": "Ta adapter przeczytała dostępne wartości z systemu Senec Home V2.1 (a później) używając lala.cgi",
+			"uk": "Цей адаптер зчитуває доступні значення від Senec Home V2.1 (і пізніше) системи за допомогою lala.cgi",
+			"zh-cn": "这种适应者从Senec Home V2.1(和以后)利用Fla.cgi阅读了可使用的数值。"
         },
         "authors": [
             "NoBl <github@bluemle.org>"
@@ -113,7 +139,8 @@
 		"intervalLow": 60,
 		"pollingTimeout": 5000,
 		"retries": 10,
-		"retrymultiplier": 2
+		"retrymultiplier": 2,
+		"useHttps": false
     },
     "objects": [],
     "instanceObjects": [{

package/main.js

@@ -7,6 +7,7 @@ const state_trans = require(__dirname + '/lib/state_trans.js');
 
 let retry = 0; // retry-counter
 let retryLowPrio = 0; // retry-counter
+let connectVia = "http://";
 
 let unloaded = false;
 
@@ -96,21 +97,26 @@ class Senec extends utils.Adapter {
             this.log.warn("(checkConf) Config retry multiplier " + this.config.retrymultiplier + " not [1..10] seconds. Using default: 2");
             this.config.retrymultiplier = 2;
         }
+		this.log.debug("(checkConf) Configured https-usage: " + this.config.useHttps);
+		if (this.config.useHttps) {
+			connectVia = "https://";
+			this.log.debug("(checkConf) Switching to https ... " + this.config.useHttps);
+		}
     }
 
     /**
      * checks connection to senec service
      */
     async checkConnection() {
-        const url = 'http://' + this.config.senecip + '/lala.cgi';
+        const url = connectVia + this.config.senecip + '/lala.cgi';
         const form = '{"ENERGY":{"STAT_STATE":""}}';
         try {
-            this.log.info('connecting to Senec: ' + this.config.senecip);
+            this.log.info('connecting to Senec: ' + url);
             const body = await this.doGet(url, form, this, this.config.pollingTimeout);
-            this.log.info('connected to Senec: ' + this.config.senecip);
+            this.log.info('connected to Senec: ' + url);
             this.setState('info.connection', true, true);
         } catch (error) {
-            throw new Error("Error connecting to Senec (IP: " + this.config.senecip + "). Exiting! (" + error + ")");
+            throw new Error("Error connecting to Senec (IP: " + connectVia + this.config.senecip + "). Exiting! (" + error + "). Try to toggle https-mode in settings and check FQDN of SENEC appliance.");
         }
     }
 
@@ -168,7 +174,7 @@ class Senec extends utils.Adapter {
         // "PM1OBJ1":{"FREQ":"","U_AC":"","I_AC":"","P_AC":"","P_TOTAL":""},"PM1OBJ2":{"FREQ":"","U_AC":"","I_AC":"","P_AC":"","P_TOTAL":""}
         // "ENERGY":{"STAT_HOURS_OF_OPERATION":"","STAT_DAYS_SINCE_MAINT":"","GUI_BAT_DATA_POWER":"","GUI_BAT_DATA_VOLTAGE":"","GUI_BAT_DATA_CURRENT":"","GUI_BAT_DATA_FUEL_CHARGE":"","GUI_BAT_DATA_OA_CHARGING":"","STAT_SULFAT_CHRG_COUNTER":"","STAT_LIMITED_NET_SKEW":"","STAT_LIMITED_NO_STAND_BY":"","GUI_CAP_TEST_DIS_COUNT":"","GUI_SCHARGE_REMAIN":"","GUI_SCHARGE_ELAPSED":"","GUI_CHARGING_INFO":"","OFFPEAK_DURATION":"","OFFPEAK_RUNNING":"","OFFPEAK_CURRENT":"","OFFPEAK_TARGET":""},"SYS_UPDATE":{"NPU_VER":"","NPU_IMAGE_VERSION":""}}
 
-        const url = 'http://' + this.config.senecip + '/lala.cgi';
+        const url = connectVia + this.config.senecip + '/lala.cgi';
         var form = '{';
 		form += '"BMS":{"CELL_TEMPERATURES_MODULE_A":"","CELL_TEMPERATURES_MODULE_B":"","CELL_TEMPERATURES_MODULE_C":"","CELL_TEMPERATURES_MODULE_D":"","CELL_VOLTAGES_MODULE_A":"","CELL_VOLTAGES_MODULE_B":"","CELL_VOLTAGES_MODULE_C":"","CELL_VOLTAGES_MODULE_D":"","CURRENT":"","SOC":"","SYSTEM_SOC":"","TEMP_MAX":"","TEMP_MIN":"","VOLTAGE":""}';
         form += ',"ENERGY":{"STAT_STATE":"","GUI_BAT_DATA_POWER":"","GUI_INVERTER_POWER":"","GUI_HOUSE_POW":"","GUI_GRID_POW":"","GUI_BAT_DATA_FUEL_CHARGE":"","GUI_CHARGING_INFO":"","GUI_BOOSTING_INFO":"","GUI_BAT_DATA_POWER":"","GUI_BAT_DATA_VOLTAGE":"","GUI_BAT_DATA_CURRENT":"","GUI_BAT_DATA_FUEL_CHARGE":"","GUI_BAT_DATA_OA_CHARGING":"","STAT_LIMITED_NET_SKEW":""}';
@@ -214,7 +220,7 @@ class Senec extends utils.Adapter {
         this.log.info('LowPrio polling ...');
         // we are polling all known objects ...
 
-        const url = 'http://' + this.config.senecip + '/lala.cgi';
+        const url = connectVia + this.config.senecip + '/lala.cgi';
         const form = '{"STATISTIC":{},"ENERGY":{},"FEATURES":{},"LOG":{},"SYS_UPDATE":{},"WIZARD":{},"BMS":{},"BAT1":{},"BAT1OBJ1":{},"BAT1OBJ2":{},"BAT1OBJ2":{},"BAT1OBJ3":{},"BAT1OBJ4":{},"PWR_UNIT":{},"PM1OBJ1":{},"PM1OBJ2":{},"PV1":{},"FACTORY":{},"GRIDCONFIG":{},"EG_CONTROL":{},"RTC":{},"PM1":{},"TEMPMEASURE":{},"DEBUG":{},"SOCKETS":{},"CASC":{},"WALLBOX":{},"CONNX50":{},"STECA":{}}';
 
         try {
@@ -299,6 +305,7 @@ class Senec extends utils.Adapter {
 			val: value,
 			ack: true
 		});
+		await this.checkUpdateSelfStat(name);
 		await this.doDecode(name, value);
 	}
 		
@@ -405,7 +412,7 @@ class Senec extends utils.Adapter {
 				this.log.warn("(Calc) Not updating reference value for: " + name.substring(10) + "! Old RefValue (" + valRef + ") >= new RefValue (" + valCur + "). Impossible situation. If this is intentional, please update via admin!");
 			}
 		} else {
-			this.log.silly("(Calc) Updating " + day +" value for: " + name.substring(10) + ": " + Number((valCur - valRef).toFixed(2)));
+			this.log.debug("(Calc) Updating " + day +" value for: " + name.substring(10) + ": " + Number((valCur - valRef).toFixed(2)));
 			// update today's value
 			await this.doState(key + today, Number((valCur - valRef).toFixed(2)), descToday, unitToday, false);
 		}
@@ -455,9 +462,11 @@ class Senec extends utils.Adapter {
 		}
 		// update today's value - but beware of div/0
 		var newVal = 0;
-		if (valHouseCons > 0) newVal = Number((((valPVGen - valGridExp - valBatCharge + valBatDischarge) / valHouseCons) * 100).toFixed(0));
-		this.log.silly("(Autarky) Updating Autarky " + day +" value for: " + key + today + ": " + newVal);
-		if (valHouseCons > 0) await this.doState(key + today, newVal, descToday, unitToday, false);
+		if (valHouseCons > 0) {
+			newVal = Number((((valPVGen - valGridExp - valBatCharge + valBatDischarge) / valHouseCons) * 100).toFixed(0));
+			this.log.debug("(Autarky) Updating Autarky " + day +" value for: " + key + today + ": " + newVal);
+			await this.doState(key + today, newVal, descToday, unitToday, false);
+		}
 	}
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.senec",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Senec Home",
   "author": {
     "name": "NoBl",
@@ -47,9 +47,9 @@
     "eslint": "^8.47.0",
     "mocha": "^10.2.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^15.0.4",
+    "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "~4.9.5"
+    "typescript": "~5.1.6"
   },
   "main": "main.js",
   "files": [