iobroker.senec 1.6.3 → 1.6.5

package/README.md

@@ -366,6 +366,13 @@ 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.6.5 (NoBl)
+* Added AllTime Statistics (trigger initial calculations in adapter settings)
+* https is now default for new instances
+
+### 1.6.4 (NoBl)
+* Bugfix (numbers are numbers again)
+
 ### 1.6.3 (NoBl)
 * Code optimization
 

package/admin/jsonConfig.json

@@ -83,7 +83,7 @@
 						"uk": "Чи потрібен HTTPS для підключення до SENEC? Тільки перевірте, чи підтримує SENEC HTTPS вже!",
 						"zh-cn": "是否需要与ENEC联系? 只有检查有无国界协会支持已经!"
 					},
-					"default": false,
+					"default": true,
 					"newLine": false
 				},
 				"interval": {
@@ -1242,6 +1242,40 @@
 					"max": 1440,
 					"newLine": true
 				},
+				"api_alltimeRebuild": {
+					"type": "checkbox",
+					"sm": 12,
+                    "md": 6,
+                    "lg": 6,
+					"label": {
+						"en": "Rebuild AllTime history (one-time)",
+						"de": "Gesamthistorie neu berechnen (einmalig)",
+						"ru": "Восстановление истории AllTime (один раз)",
+						"pt": "Reconstruir história AllTime (um tempo)",
+						"nl": "Herbouw AllTime geschiedenis (1-time)",
+						"fr": "Rebuild AllTime history (une fois)",
+						"it": "Ricostruire la storia di AllTime (una volta)",
+						"es": "Recuperar historia de AllTime (una sola vez)",
+						"pl": "Rebuild All Time history (ang.)",
+						"uk": "Історія (один раз)",
+						"zh-cn": "废除所有制度的历史(一次性)"
+					},
+					"help": {
+						"en": "Check this if you want the adapter to rebuild history values back to date of installation.",
+						"de": "Aktivieren, falls der Adapter die Historienwerte seit Installation neu berechnen soll.",
+						"ru": "Проверьте это, если вы хотите, чтобы адаптер восстановить значения истории обратно к дате установки.",
+						"pt": "Verifique se deseja que o adaptador reconstrua os valores do histórico de volta à data da instalação.",
+						"nl": "Controleer dit als je wilt dat de adapter de geschiedeniswaarden herbouwt tot datum van installatie.",
+						"fr": "Vérifiez ceci si vous voulez que l'adaptateur reconstruise les valeurs d'histoire à la date d'installation.",
+						"it": "Controllare questo se si desidera che l'adattatore per ricostruire i valori storici fino alla data di installazione.",
+						"es": "Revise esto si desea que el adaptador reconstruya los valores de historia hasta la fecha de instalación.",
+						"pl": "Umożliwia to, czy chcesz adapterowi odbudować wartości historyczne do daty instalacji.",
+						"uk": "Перевірте це, якщо ви хочете перебудувати значення історії назад до дати установки.",
+						"zh-cn": "如果你想适应者重建历史价值,那么我们就会感到惊讶。."
+					},
+					"default": false,
+					"newLine": true
+				},
 			}
 		}
 	}

package/io-package.json

@@ -1,8 +1,34 @@
 {
     "common": {
         "name": "senec",
-        "version": "1.6.3",
+        "version": "1.6.5",
         "news": {
+			"1.6.5": {
+				"en": "Added AllTime Statistics (trigger initial calculations in adapter settings), https is now default for new instances.",
+				"de": "AllTime Statistiken hinzugefügt (initiale Berechnung bitte in den Adapter-Einstellungen aktivieren), https ist jetzt Standard für neue Instanzen.",
+				"ru": "Добавлена статистика AllTime (trigger начальные расчеты в настройках адаптера), https теперь по умолчанию для новых инстанций.",
+				"pt": "Adicionado AllTime Statistics ( cálculos iniciais de gatilho em configurações de adaptador), https agora é padrão para novas instâncias.",
+				"nl": "Toegevoegd AllTime Statistieken (trigger initialen berekeningen in adapter settings\" \"htps is nu default voor nieuwe instanties.",
+				"fr": "Ajout de AllTime Statistics (trigger initial calculations in adapt settings), https est maintenant par défaut pour de nouveaux cas.",
+				"it": "Aggiunta AllTime Statistics (configurazioni iniziali del trigger nelle impostazioni dell'adattatore), https è ora predefinito per nuove istanze.",
+				"es": "Añadido AllTime Statistics (trigger inicial calculations in adapter settings), https ahora es predeterminado para nuevas instancias.",
+				"pl": "Added AllTime Statistics (trigger początkowych obliczeń w ustawieniach adapterów), https jest obecnie domyślny do nowych instancji.",
+				"uk": "Додано AllTime Статистика (тригер початкових обчислень в налаштуваннях адаптера), HTTPS тепер за замовчуванням для нових екземплярів.",
+				"zh-cn": "加上《所有制度统计》(在适应环境中的过份初步计算),目前,新情况目前有缺陷。."
+			},
+			"1.6.4": {
+				"en": "Numbers are numbers again",
+				"de": "Zahlen sind wieder Zahlen",
+				"ru": "Номера снова",
+				"pt": "Os números são números novamente",
+				"nl": "Nummers zijn weer getallen",
+				"fr": "Les nombres sont de nouveau des nombres",
+				"it": "I numeri sono di nuovo numeri",
+				"es": "Números son números de nuevo",
+				"pl": "Liczby są ponownie numerami",
+				"uk": "Кількість чисел знову",
+				"zh-cn": "数字再次编号"
+			},
 			"1.6.3": {
 				"en": "Bugfixes for API reading.",
 				"de": "Bugfixes im API Handling.",
@@ -192,7 +218,7 @@
 		"pollingTimeout": 5000,
 		"retries": 10,
 		"retrymultiplier": 2,
-		"useHttps": false,
+		"useHttps": true,
 		"disclaimer": false,
 		"highPrio_BMS": "",
 		"highPrio_BMS_active": false,
@@ -223,7 +249,8 @@
 		"highPrio_TEMPMEASURE": "",
 		"highPrio_TEMPMEASURE_active": false,
 		"api_use": false,
-		"api_interval": 5
+		"api_interval": 5,
+		"api_alltimeRebuild": false
     },
 	"nativeEncrypted": {
         "api_mail": "",

package/main.js

@@ -292,12 +292,12 @@ class Senec extends utils.Adapter {
 				apiKnownSystems.push(systemId);
 				for (const[key2, value2] of Object.entries(value)) {
 					if (typeof value2 === "object") 
-						this.doState(pfx + systemId + "." + key2, JSON.stringify(value2), "", "", false);
+						await this.doState(pfx + systemId + "." + key2, JSON.stringify(value2), "", "", false);
 					else 
-						this.doState(pfx + systemId + "." + key2, value2, "", "", false);
+						await this.doState(pfx + systemId + "." + key2, value2, "", "", false);
 				}
 			}
-			this.doState(pfx + 'IDs', JSON.stringify(apiKnownSystems), "Anlagen IDs", "", false);
+			await this.doState(pfx + 'IDs', JSON.stringify(apiKnownSystems), "Anlagen IDs", "", false);
         } catch (error) {
             throw new Error("Error reading Systems Information from Senec AppAPI. (" + error + ").");
         }
@@ -409,7 +409,7 @@ class Senec extends utils.Adapter {
 		var body = "";
 		try {
 			for (let i = 0; i < apiKnownSystems.length; i++) {
-				const baseUrl = apiSystemsUrl + "/" + apiKnownSystems[i]
+				const baseUrl = apiSystemsUrl + "/" + apiKnownSystems[i];
 				var url = "";
 				const tzObj = await this.getStateAsync("_api.Anlagen." + apiKnownSystems[i] + ".zeitzone");
 				const tz = tzObj ? encodeURIComponent(tzObj.val) : encodeURIComponent("Europe/Berlin");
@@ -420,17 +420,14 @@ class Senec extends utils.Adapter {
 				await this.decodeDashboard(apiKnownSystems[i], JSON.parse(body));
 				
 				for (let[key, value] of dates.entries()) {
-					// statistik today
+					// statistik for period
 					url = baseUrl + "/statistik?periode=" + api_trans[key].api + "&datum=" + value + "&locale=de_DE&timezone=" + tz;
 					body = await this.doGet(url, "", this, this.config.pollingTimeout, false);
 					await this.decodeStatistik(apiKnownSystems[i], JSON.parse(body), api_trans[key].dp);
 				}
 				
-				// // wallboxes - only if wallbox exists? - Without: error 500
-				//var url = apiSystemsUrl + "/" + apiKnownSystems[i] + "/wallboxes/1";
-				//body = await this.doGet(url, "", this, this.config.pollingTimeout, false);
-				//this.log.info("Abilities: " + body);
-				//await this.decodeWallbox(apiKnownSystems[i], JSON.parse(body));
+				if (this.config.api_alltimeRebuild) await this.rebuildAllTimeHistory(apiKnownSystems[i]);
+				
 			}
 			retry = 0;
 			if (unloaded) return;
@@ -447,16 +444,19 @@ class Senec extends utils.Adapter {
         }
 	}
 	
+	/**
+	 * Decodes Dashboard information from SENEC App API
+	 */
 	async decodeDashboard(system, obj) {
 		const pfx = "_api.Anlagen." + system + ".Dashboard.";
 		for (const[key, value] of Object.entries(obj)) {
 			if (key == "zeitstempel" || key == "electricVehicleConnected") {
-				this.doState(pfx + key, value, "", "", false);
+				await this.doState(pfx + key, value, "", "", false);
 			} else {
 				for (const[key2, value2] of Object.entries(value)) {
-					this.doState(pfx + key + "." + key2, (value2.wert).toFixed(2), "", value2.einheit, false);
+					await this.doState(pfx + key + "." + key2, Number((value2.wert).toFixed(2)), "", value2.einheit, false);
 					if (kiloList.includes(value2.einheit)) {
-						this.doState(pfx + key + "." + key2 + " (k" + value2.einheit + ")", (value2.wert / 1000).toFixed(2), "", "k" + value2.einheit, false);
+						await this.doState(pfx + key + "." + key2 + " (k" + value2.einheit + ")", Number((value2.wert / 1000).toFixed(2)), "", "k" + value2.einheit, false);
 					}
 				}
 			}
@@ -464,21 +464,105 @@ class Senec extends utils.Adapter {
 		
 	}
 	
+	/**
+	 * Decodes Statistik information from SENEC App API
+	 */
 	async decodeStatistik(system, obj, period) {
 		const pfx = "_api.Anlagen." + system + ".Statistik." + period + ".";
 		for (const[key, value] of Object.entries(obj.aggregation)) {
 			// only reading 'aggregation' - no interest in fine granular information
 			if (key == "startzeitpunkt") {
-				this.doState(pfx + key, value, "", "", false);
+				await this.doState(pfx + key, value, "", "", false);
 			} else {
-				this.doState(pfx + key, (value.wert).toFixed(2), "", value.einheit, false);
-				if (kiloList.includes(value.einheit)) {
-					this.doState(pfx + key + " (k"+ value.einheit + ")", (value.wert / 1000).toFixed(2), "", "k" + value.einheit, false);
+				if (!this.config.api_alltimeRebuild) { // don't update DPs if we are AllTime-Rebuild-Process 
+					await this.doState(pfx + key, Number((value.wert).toFixed(2)), "", value.einheit, false);
+					if (kiloList.includes(value.einheit)) {
+						await this.doState(pfx + key + " (k"+ value.einheit + ")", Number((value.wert / 1000).toFixed(2)), "", "k" + value.einheit, false);
+					}
+				}
+				if (period == api_trans["THIS_YEAR"].dp) await this.insertAllTimeHistory(system, key, new Date(obj.aggregation.startzeitpunkt).getFullYear(), Number((value.wert).toFixed(0)), value.einheit);
+			}
+		}
+		const autarky = Number((((obj.aggregation.stromerzeugung.wert - obj.aggregation.netzeinspeisung.wert - obj.aggregation.speicherbeladung.wert + obj.aggregation.speicherentnahme.wert) / obj.aggregation.stromverbrauch.wert) * 100).toFixed(2));
+		await this.doState(pfx + "Autarkie", autarky, "", "%", false);
+		await this.updateAllTimeHistory(system);
+	}
+	
+	/**
+	 * inserts a value for a given key and year into AllTimeValueStore
+	 */
+	async insertAllTimeHistory(system, key, year, value, einheit) {
+		const pfx = "_api.Anlagen." + system + ".Statistik.AllTime.";
+		const valueStore = pfx + "valueStore";
+		const statsObj = await this.getStateAsync(valueStore);
+		const stats = statsObj ? JSON.parse(statsObj.val) : {};
+		if (!stats[key]) stats[key] = {};
+		if (!stats[key][year]) stats[key][year] = {};
+		stats[key][year] = value;
+		stats[key]["einheit"] = einheit;
+		await this.doState(valueStore, JSON.stringify(stats), "", "", false);
+	}
+	
+	/**
+	 * Updated AllTimeHistory based on what we have in our AllTimeValueStore
+	 */
+	async updateAllTimeHistory(system) {
+		const pfx = "_api.Anlagen." + system + ".Statistik.AllTime.";
+		const valueStore = pfx + "valueStore";
+		const statsObj = await this.getStateAsync(valueStore);
+		const stats = statsObj ? JSON.parse(statsObj.val) : {};
+		const sums = {};
+		for (const[key, value] of Object.entries(stats)) {
+			var einheit = "";
+			var sum = 0.0;
+			for (const[key2, value2] of Object.entries(value)) {
+				if (key2 == "einheit") {
+					einheit = value2;
+				} else {
+					sum += value2;
 				}
 			}
+			sums[key] = sum;
+			if (kiloList.includes(einheit)) {
+				await this.doState(pfx + key, Number((sum / 1000).toFixed(0)), "", "k" + einheit, false);
+			} else {
+				await this.doState(pfx + key, Number(sum.toFixed(0)), "", einheit, false);
+			}
+		}
+		const autarky = Number((((sums.stromerzeugung - sums.netzeinspeisung - sums.speicherbeladung + sums.speicherentnahme) / sums.stromverbrauch) * 100).toFixed(0));
+		await this.doState(pfx + "Autarkie", autarky, "", "%", false);
+	}
+	
+	/**
+	 * Rebuilds AllTimeHistory from SENEC App API
+	 */
+	async rebuildAllTimeHistory(system) {
+		if (!this.config.api_use || !apiConnected) {
+			this.log.info('Usage of SENEC App API not configured or not connected.');
+			return;
 		}
-		const autarky = (((obj.aggregation.stromerzeugung.wert - obj.aggregation.netzeinspeisung.wert - obj.aggregation.speicherbeladung.wert + obj.aggregation.speicherentnahme.wert) / obj.aggregation.stromverbrauch.wert) * 100).toFixed(2);
-		this.doState(pfx + "Autarkie", autarky, "", "%", false);
+		
+		this.log.info("Rebuilding AllTime History ...");
+		var year = new Date(new Date().getFullYear() - 1, 1, 1).toISOString().split('T')[0]; // starting last year, because we already got current year covered
+		var body = "";
+		try {
+			while (new Date(year).getFullYear() > 2008) { // senec was founded in 2009 by Mathias Hammer as Deutsche Energieversorgung GmbH (DEV) - so no way we have older data :)
+				this.log.info("Rebuilding AllTime History - Year: " + new Date(year).getFullYear());
+				const baseUrl = apiSystemsUrl + "/" + system
+				var url = "";
+				const tzObj = await this.getStateAsync("_api.Anlagen." + system + ".zeitzone");
+				const tz = tzObj ? encodeURIComponent(tzObj.val) : encodeURIComponent("Europe/Berlin");
+				url = baseUrl + "/statistik?periode=JAHR&datum=" + year + "&locale=de_DE&timezone=" + tz;
+				body = await this.doGet(url, "", this, this.config.pollingTimeout, false);
+				await this.decodeStatistik(system, JSON.parse(body), api_trans["THIS_YEAR"].dp);
+				year = new Date(new Date(year).getFullYear() - 1, 1, 1).toISOString().split('T')[0];
+				if (unloaded) return;
+			}
+		} catch (error) {
+			this.log.info("Rebuild ended.");
+        }
+		this.log.info("Restarting ...");
+		this.extendForeignObject(`system.adapter.${this.namespace}`, {native: {api_alltimeRebuild: false}});
 	}
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.senec",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "Senec Home",
   "author": {
     "name": "NoBl",
@@ -35,21 +35,21 @@
 	"@iobroker/adapter-dev": "^1.2.0",
     "@iobroker/testing": "^4.1.0",
 	"@tsconfig/node14": "^14.1.0",
-    "@types/chai": "^4.3.5",
-    "@types/chai-as-promised": "^7.1.5",
+    "@types/chai": "^4.3.6",
+    "@types/chai-as-promised": "^7.1.6",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.5.7",
+    "@types/node": "^20.5.9",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.16",
     "@types/sinon-chai": "^3.2.9",
     "chai": "^4.3.8",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.47.0",
+    "eslint": "^8.48.0",
     "mocha": "^10.2.0",
     "proxyquire": "^2.1.3",
     "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.1.6"
+    "typescript": "~5.2.2"
   },
   "main": "main.js",
   "files": [