iobroker.senec 1.3.10 → 1.4.1

package/README.md

@@ -366,53 +366,18 @@ 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.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.
+
 ### 1.3.10 (NoBl)
 * Fixed wrong Unit for STATISTIC.LIVE_WB_ENERGY
 * Updated to json Admin UI
 * Technical Updates
 * Added more state_attr definitions
 
-### 1.3.9 (Nobl)
-* Added (some) Wallbox Datapoints to high-prio polling
-* Added more state definitions
-
-### 1.3.8 (NoBl)
-* Removed (unnecessary) admin tab
-
-### 1.3.7 (NoBl, noffycws, git-ZeR0)
-* Updates to state translations (new values when SENEC turned off appliances)
-* Added state definitions
-* Added high priority datapoints: temperatures, voltages, ... to better monitor safety relevant data
-
-### 1.3.6 (NoBl)
-* Fixed log.warning error
-
-### 1.3.5 (NoBl)
-* Added more state attributes (if you have updated descriptions or anything, please open an issue!)
-* Workaround in case SENEC reports bogus request data
-
-### 1.3.4 (NoBl)
-* Moved from request to axios
-* Added more state attributes (if you have updated descriptions or anything, please open an issue!)
-
-### 1.3.3 (NoBl)
-* Updated to current template.
-
-### 1.3.2 (NoBl)
-* Autarky without decimal places (again). They are causing more updates than we really need.
-* Autarky values won't reset to 0 at change of timeframe (day, week, ...) anymore. They are calculated based on reference values anyways.
-* Ensuring that only values meant to be changeable by user are defined so (attribute changes upon the next update of value)
-
-### 1.3.1 (NoBl) 20210513
-* Added calculation of autarky for day/week/month/year
-
-### 1.3.0 (NoBl) 20210509
-* Rewrote translations handling
-* Added translations for wallbox status.
-* Translated status get an extra datapoint with _Text as postfix. Former translations that didn't add an extra dp will now revert to their numeric representation and add the _Text DP.
-* Translations are now handled via lib/state_trans.js for all 3 languages available in the senec system (german, english, italian).
-* Language used is decided by the language of the SENEC appliance.
-
 ### [Former Updates](CHANGELOG_old.md)
 
 ## License

package/io-package.json

@@ -1,8 +1,34 @@
 {
     "common": {
         "name": "senec",
-        "version": "1.3.10",
+        "version": "1.4.1",
         "news": {
+			"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.",
+				"ru": "Добавлена кэшировка объекта и незначительные обновления кода. В связи с количеством объектов, с которыми мы занимаемся кэшированием, является обязательным.",
+				"pt": "Adicionado cache de objeto e pequenas atualizações de código. Devido à quantidade de objetos que lidamos com caching é sobre obrigatória.",
+				"nl": "Toegevoegd voorwerp caching en kleine code updates. Gezien de hoeveelheid objecten die we met caching hebben, gaat het over verplichting.",
+				"fr": "Ajout de cache d'objet et de mises à jour de code mineur. En raison de la quantité d'objets que nous traitons avec le cache est environ obligatoire.",
+				"it": "Aggiunti caching oggetto e aggiornamenti di codice minori. A causa della quantità di oggetti che abbiamo a che fare con il caching è circa obbligatorio.",
+				"es": "Añadido objeto caching y actualizaciones de código menor. Debido a la cantidad de objetos que tratamos con el caché es sobre obligatorio.",
+				"pl": "Dodany obiekt caching i drobnych aktualizacji kodu. Ze względu na ilość przedmiotów, które traktują z cachingiem, dotyczy obowiązkowych.",
+				"uk": "Додано кешування об'єкта та оновлення коду неповного розміру. У зв'язку з кількістю об'єктів, які ми маємо справу з кешуванням, є обов'язковим.",
+				"zh-cn": "添加了目标包和小法典的更新。 由于我们所处理的物品数量是强制性的。."
+			},
 			"1.3.10": {
 				"en": "Fixed wrong Unit for STATISTIC.LIVE_WB_ENERGY, added more state_attr. Moved to json admin UI and other technical updates.",
 				"de": "Fehler behoben Einheit für STATISTIC.LIVE_WB_ENERGY, hinzugefügt mehr state_attr. Umgezogen zu json admin UI und anderen technischen Updates.",
@@ -48,17 +74,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>"

package/main.js

@@ -1,13 +1,17 @@
 'use strict';
 
 const utils = require('@iobroker/adapter-core');
-const axios = require('axios');
+const axios = require('axios').default;
 const state_attr = require(__dirname + '/lib/state_attr.js');
 const state_trans = require(__dirname + '/lib/state_trans.js');
 
 let retry = 0; // retry-counter
 let retryLowPrio = 0; // retry-counter
 
+let unloaded = false;
+
+const knownObjects = {};
+
 class Senec extends utils.Adapter {
 
     /**
@@ -47,6 +51,7 @@ class Senec extends utils.Adapter {
      */
     onUnload(callback) {
         try {
+			unloaded = true;
             if (this.timer) {
                 clearTimeout(this.timer);
             }
@@ -114,7 +119,7 @@ class Senec extends utils.Adapter {
      * @param url to read from
      * @param form to post
      */
-	async doGet(pUrl, pForm, caller, pollingTimeout) {
+	doGet(pUrl, pForm, caller, pollingTimeout) {
 		return new Promise(function (resolve, reject) {
 			axios({
 				method: 'post',
@@ -187,6 +192,7 @@ class Senec extends utils.Adapter {
             await this.evalPoll(obj);
 
             retry = 0;
+			if (unloaded) return;
             this.timer = setTimeout(() => this.readSenecV21(), this.config.interval * 1000);
         } catch (error) {
             if ((retry == this.config.retries) && this.config.retries < 999) {
@@ -224,6 +230,7 @@ class Senec extends utils.Adapter {
             await this.evalPoll(obj);
 
             retryLowPrio = 0;
+			if (unloaded) return;
             this.timerLowPrio = setTimeout(() => this.readSenecV21LowPrio(), this.config.intervalLow * 1000 * 60);
         } catch (error) {
             if ((retryLowPrio == this.config.retries) && this.config.retries < 999) {
@@ -247,50 +254,51 @@ class Senec extends utils.Adapter {
 			return;
 		}
 		this.log.silly('(doState) Update: ' + name + ': ' + value);
-        await this.setObjectNotExistsAsync(name, {
-            type: 'state',
-            common: {
-                name: description,
-                type: typeof(value),
-                role: 'value',
-                unit: unit,
-                read: true,
-                write: write
-            },
-            native: {}
-        });
-		
+       
+		const valueType = value !== null && value !== undefined ? typeof value : "mixed";
+	
 		// Check object for changes:
-		var obj = await this.getObjectAsync(name);
-		if (obj.common.name != description) {
-			this.log.debug("(doState) Updating object: " + name + " (desc): " + obj.common.name + " -> " + description);
-			await this.extendObject(name, {common: {name: description}});
-		}
-		if (obj.common.type != typeof(value)) {
-			this.log.debug("(doState) Updating object: " + name + " (type): " + obj.common.type + " -> " + typeof(value));
-			await this.extendObject(name, {common: {type: typeof(value)}});
-		}
-		if (obj.common.unit != unit) {
-			this.log.debug("(doState) Updating object: " + name + " (unit): " + obj.common.unit + " -> " + unit);
-			await this.extendObject(name, {common: {unit: unit}});
-		}
-		if (obj.common.write != write) {
-			this.log.debug("(doState) Updating object: " + name + " (write): " + obj.common.write + " -> " + write);
-			await this.extendObject(name, {common: {write: write}});
-		}
-
-        var oldState = await this.getStateAsync(name);
-        if (oldState) {
-            if (oldState.val === value) {
-				await this.checkUpdateSelfStat(name);
-                return;
+		const obj = knownObjects[name] ? knownObjects[name] : await this.getObjectAsync(name);
+		if (obj) {
+			const newCommon = {};
+			if (obj.common.name !== description) {
+				this.log.debug("(doState) Updating object: " + name + " (desc): " + obj.common.name + " -> " + description);
+				newCommon.name = description;
 			}
-            this.log.debug('(doState) Update: ' + name + ': ' + oldState.val + ' -> ' + value);
-        }
-        await this.setStateAsync(name, {
-            val: value,
-            ack: true
-        });
+			if (obj.common.type !== valueType) {
+				this.log.debug("(doState) Updating object: " + name + " (type): " + obj.common.type + " -> " + typeof value);
+				newCommon.type = valueType;
+			}
+			if (obj.common.unit !== unit) {
+				this.log.debug("(doState) Updating object: " + name + " (unit): " + obj.common.unit + " -> " + unit);
+				newCommon.unit = unit;
+			}
+			if (obj.common.write !== write) {
+				this.log.debug("(doState) Updating object: " + name + " (write): " + obj.common.write + " -> " + write);
+				newCommon.write = write;
+			}
+			if (Object.keys(newCommon).length > 0) {
+				await this.extendObjectAsync(name, { common: newCommon });
+			}
+		} else {
+			knownObjects[name] = {
+				type: "state",
+				common: {
+					name: description,
+					type: valueType,
+					role: "value",
+					unit: unit,
+					read: true,
+					write: write
+				},
+				native: {}
+			};
+			await this.setObjectNotExistsAsync(name, knownObjects[name]);
+		}
+		await this.setStateChangedAsync(name, {
+			val: value,
+			ack: true
+		});
 		await this.checkUpdateSelfStat(name);
 		await this.doDecode(name, value);
 	}
@@ -332,8 +340,9 @@ class Senec extends utils.Adapter {
 	 * creates / updates the state.
 	 */
     async evalPoll(obj) {
-        for (let[key1, value1]of Object.entries(obj)) {
-            for (let[key2, value2]of Object.entries(value1)) {
+		if (unloaded) return;
+        for (const[key1, value1] of Object.entries(obj)) {
+            for (const[key2, value2] of Object.entries(value1)) {
                 if (value2 !== "VARIABLE_NOT_FOUND" && key2 !== "OBJECT_NOT_FOUND") {
                     const key = key1 + '.' + key2;
                     if (state_attr[key] === undefined) {
@@ -397,7 +406,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);
 		}
@@ -447,9 +456,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);
+		}
 	}
 
 }
@@ -474,7 +485,7 @@ const ValueTyping = (key, value) => {
     } else if (isIP) {
         return DecToIP(value);
     } else if (multiply !== 1) {
-        return (value *= multiply).toFixed(2);
+        return parseFloat((value * multiply).toFixed(2));
     } else {
         return value;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.senec",
-  "version": "1.3.10",
+  "version": "1.4.1",
   "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": [