iobroker.senec 1.6.9 → 1.6.11

package/README.md

@@ -298,6 +298,15 @@ This channel contains values polled from SENEC App-API.
 
 
 ## Changelog
+
+### 1.6.11 (NoBl)
+* Moving from Senec App API 3.12.0 to 4.3.3 (thanks to oakdesign@github for providing the new API!)
+* This WILL invalidate all current API datapoints in the Statistik branch. Easiest solution to this: Delete the Statistik branch.
+* Remember to force a rebuild of historic data in adapter settings!
+
+### 1.6.10 (NoBl)
+* Bugfix for AllTimeHistory (should work again)
+
 ### 1.6.9 (NoBl)
 * Added switch in config to enable active control of appliance (you will need activate this, if you want to control the appliance via the adapter)
 * Improved handling of forced loading (please report if we need more appliance-states covered by this)

package/io-package.json

@@ -1,8 +1,34 @@
 {
     "common": {
         "name": "senec",
-        "version": "1.6.9",
+        "version": "1.6.11",
         "news": {
+			"1.6.11": {
+				"en": "Moving from Senec App API 3.12.0 to 4.3.3 (thanks to oakdesign@github for providing the new API!). This WILL invalidate all current API datapoints in the Statistik branch. Easiest solution to this: Delete the Statistik branch. Remember to force a rebuild of historic data in adapter settings!",
+				"de": "Update der Senec App API 3.12.0 auf 4.3.3 (Dank an Oakdesign@github für die Analyse der neuen API.)! Dadurch werden leider alle aktuellen API-Datenpunkte im Statistik-Zweig ungültig. Einfachste Lösung hierfür: Den gesamten Statistik-Zweig löschen. Beachten: Die Gesamthistorie muss neu berechnet werden (Parameter in den Adaptereinstellungen)!",
+				"ru": "Переезд с Senec App API 3.12.0 до 4.3.3 (спасибо oakdesign@github для предоставления нового API.)! Это недействит все текущие точки API в филиале Statistik. Самое легкое решение для этого: Удалите филиал Statistik. Не забудьте заставить восстановить исторические данные в настройках адаптера!",
+				"pt": "Movendo de Senec App API 3.12.0 para 4.3.3 (graças para oakdesign@github para fornecer a nova API.)! Esta WILL invalida todos os datapoints API atuais no ramo Statistik. Solução mais fácil para isso: Excluir o ramo Statistik. Lembre-se de forçar uma reconstrução de dados históricos em configurações de adaptador!",
+				"nl": "Verhuizen van Senec App API 3.12.0 tot 4.3.3.3 uur tot Oakdesign @github voor de nieuwe API. Dit zal alle huidige API gegevens in de Statistik Branch invaliden. Verwijder de statistik tak. Vergeet niet een herbouw van historische gegevens te forceren in adapter settings!",
+				"fr": "Déplacement de Senec App API 3.12.0 à 4.3.3 (merci à Oakdesign@github pour fournir la nouvelle API.)! Ce WILL invalide tous les points de données API actuels dans la branche Statistik. Solution la plus facile à cela: Supprimer la branche Statistik. N'oubliez pas de forcer une reconstruction des données historiques dans les réglages d'adaptateur!",
+				"it": "Passando da Senec App API 3.12.0 a 4.3.3 (grazie a Oakdesign@github per fornire la nuova API.)! Questo WILL invalida tutti i datapoint API attuali nel ramo Statistik. Soluzione più semplice a questo: Elimina il ramo Statistik. Ricordatevi di forzare una ricostruzione dei dati storici nelle impostazioni dell'adattatore!",
+				"es": "Moving from Senec App API 3.12.0 to 4.3.3 (gracias a oakdesign@github para proporcionar la nueva API.)! Esto invalidará todos los puntos de datos actuales de la API en la rama Statistik. Solución más fácil: Eliminar la rama Statistik. Recuerde forzar una reconstrucción de datos históricos en la configuración del adaptador!",
+				"pl": "Przewidując się z interfejsu Senec App API 3,12.0 to 4.3.3 (dodatki do dębowego @github dla zapewnienia nowego API). WILL uszkodził wszystkie aktualne punkty danych API w oddziale Statistik. Najwięcej rozwiązań do tego: Dete the Statistik branch. Pamiętaj, aby odbudować historyczne dane w ustawieniach adapterów!",
+				"uk": "Переміщення від Senec App API 3.12.0 до 4.3.3 (завдяки до дубdesign@github для надання нового API.)! Це недійсне використання всіх поточних точок даних API у відділенні Statistik. Найсвіжіші рішення для цього: Видаліть статутне відділення. Пам'ятайте, що змусити перебудувати історичні дані в налаштуваннях адаптера!",
+				"zh-cn": "Moving from Senecapp API3.12.0 to 4.3.3 (as to oakdesign@github for the new API.!) 本协会在斯塔特斯科分处停止了目前所有阿联酋数据点。 最容易解决这一问题:删除斯塔特主义分支。 重新成员在适应环境中重建历史数据!"
+			},
+			"1.6.10": {
+				  "en": "Bugfix for AllTimeHistory",
+				  "de": "Bugfix für AllTimeHistory",
+				  "ru": "Bugfix для AllTimeИстория",
+				  "pt": "Bugfix para AllTimeHistory",
+				  "nl": "Bugfix voor AllTimeHistory",
+				  "fr": "Bugfix pour AllTimeHistory",
+				  "it": "Bugfix per AllTimeHistory",
+				  "es": "Bugfix para AllTimeHistory",
+				  "pl": "Bugfix for AllTimeHistory (ang.)",
+				  "uk": "Виправлення помилок для AllTimeHistory",
+				  "zh-cn": "九. 一切制度"
+			},
 			"1.6.9": {
 				  "en": "Improved battery forced loading, added switch in config to allow active control of appliance.",
 				  "de": "Manuelles Laden verbessert, zusätzlicher Schalter in Config, um aktive Steuerung des Gerätes zu erlauben.",

package/lib/api_trans.js

@@ -1,26 +1,26 @@
 const api_trans = {
 	'THIS_DAY': {
-		api: 'TAG',
+		api: 'DAY',
 		dp:	'Today'
 	},
 	'LAST_DAY': {
-		api: 'TAG',
+		api: 'DAY',
 		dp:	'Yesterday'
 	},
 	'THIS_MONTH': {
-		api: 'MONAT',
+		api: 'MONTH',
 		dp:	'This Month'
 	},
 	'LAST_MONTH': {
-		api: 'MONAT',
+		api: 'MONTH',
 		dp:	'Last Month'
 	},
 	'THIS_YEAR': {
-		api: 'JAHR',
+		api: 'YEAR',
 		dp:	'This Year'
 	},
 	'LAST_YEAR': {
-		api: 'JAHR',
+		api: 'YEAR',
 		dp:	'Last Year'
 	}
 

package/main.js

@@ -17,9 +17,10 @@ const state_trans = require(__dirname + '/lib/state_trans.js');
 const api_trans = require(__dirname + '/lib/api_trans.js');
 const kiloList = ["W", "Wh"];
 
-const apiUrl = "https://app-gateway-prod.senecops.com/v1/senec";
+const apiUrl = "https://app-gateway.prod.senec.dev/v1/senec";
 const apiLoginUrl = apiUrl + "/login";
-const apiSystemsUrl = apiUrl + "/anlagen";
+const apiSystemsUrl = apiUrl + "/systems";
+const apiMonitorUrl = apiUrl + "/monitor";
 const apiKnownSystems = []
 
 const batteryOn = '{"ENERGY":{"SAFE_CHARGE_FORCE":"u8_01","SAFE_CHARGE_PROHIBIT":"","SAFE_CHARGE_RUNNING":"","LI_STORAGE_MODE_START":"","LI_STORAGE_MODE_STOP":"","LI_STORAGE_MODE_RUNNING":"","STAT_STATE":""}}';
@@ -473,6 +474,7 @@ class Senec extends utils.Adapter {
 		try {
 			for (let i = 0; i < apiKnownSystems.length; i++) {
 				const baseUrl = apiSystemsUrl + "/" + apiKnownSystems[i];
+				const baseUrlMonitor = apiMonitorUrl + "/" + apiKnownSystems[i];
 				var url = "";
 				const tzObj = await this.getStateAsync("_api.Anlagen." + apiKnownSystems[i] + ".zeitzone");
 				const tz = tzObj ? encodeURIComponent(tzObj.val) : encodeURIComponent("Europe/Berlin");
@@ -484,7 +486,8 @@ class Senec extends utils.Adapter {
 				
 				for (let[key, value] of dates.entries()) {
 					// statistik for period
-					url = baseUrl + "/statistik?periode=" + api_trans[key].api + "&datum=" + value + "&locale=de_DE&timezone=" + tz;
+					url = baseUrlMonitor + "/data?period=" + api_trans[key].api + "&date=" + value + "&locale=de_DE&timezone=" + tz;
+					this.log.debug("Calling: " + url);
 					body = await this.doGet(url, "", this, this.config.pollingTimeout, false);
 					await this.decodeStatistik(apiKnownSystems[i], JSON.parse(body), api_trans[key].dp);
 				}
@@ -535,20 +538,20 @@ class Senec extends utils.Adapter {
 		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") {
+			if (key == "startDate") {
 				await this.doState(pfx + key, value, "", "", false);
 			} else {
 				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);
+					await this.doState(pfx + key, Number((value.value).toFixed(2)), "", value.unit, false);
+					if (kiloList.includes(value.unit)) {
+						await this.doState(pfx + key + " (k"+ value.unit + ")", Number((value.value / 1000).toFixed(2)), "", "k" + value.unit, 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);
+				if (period == api_trans["THIS_YEAR"].dp) await this.insertAllTimeHistory(system, key, new Date(obj.aggregation.startDate).getFullYear(), Number((value.value).toFixed(0)), value.unit);
 			}
 		}
-		if (obj.aggregation.stromverbrauch.wert != 0) {
-			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));
+		if (obj.aggregation.totalUsage.value != 0) {
+			const autarky = Number((((obj.aggregation.generation.value - obj.aggregation.gridFeedIn.value - obj.aggregation.storageLoad.value + obj.aggregation.storageConsumption.value) / obj.aggregation.totalUsage.value) * 100).toFixed(2));
 			await this.doState(pfx + "Autarkie", autarky, "", "%", false);
 		}
 		await this.updateAllTimeHistory(system);
@@ -558,8 +561,9 @@ class Senec extends utils.Adapter {
 	 * inserts a value for a given key and year into AllTimeValueStore
 	 */
 	async insertAllTimeHistory(system, key, year, value, einheit) {
+		this.log.debug("Insert AllTimeHistory: " + system + "/" + "key" + "/" + year + "/" + value + "/" + einheit);
 		if (key === '__proto__' || key === 'constructor' || key === 'prototype') return; // Security fix
-		if (!isNaN(year) || !isNaN(value)) return; // Security fix
+		if (isNaN(year) || isNaN(value)) return; // Security fix
 		const pfx = "_api.Anlagen." + system + ".Statistik.AllTime.";
 		const valueStore = pfx + "valueStore";
 		const statsObj = await this.getStateAsync(valueStore);
@@ -597,8 +601,8 @@ class Senec extends utils.Adapter {
 				await this.doState(pfx + key, Number(sum.toFixed(0)), "", einheit, false);
 			}
 		}
-		if (sums.stromverbrauch != 0) {
-			const autarky = Number((((sums.stromerzeugung - sums.netzeinspeisung - sums.speicherbeladung + sums.speicherentnahme) / sums.stromverbrauch) * 100).toFixed(0));
+		if (sums.totalUsage != 0) {
+			const autarky = Number((((sums.generation - sums.gridFeedIn - sums.storageLoad + sums.storageConsumption) / sums.totalUsage) * 100).toFixed(0));
 			await this.doState(pfx + "Autarkie", autarky, "", "%", false);
 		}
 	}
@@ -618,11 +622,12 @@ class Senec extends utils.Adapter {
 		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
+				const baseUrl = apiMonitorUrl + "/" + 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;
+				url = baseUrl + "/data?period=YEAR&date=" + year + "&locale=de_DE&timezone=" + tz;
+				this.log.debug("Polling: " + url);
 				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];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.senec",
-  "version": "1.6.9",
+  "version": "1.6.11",
   "description": "Senec Home",
   "author": {
     "name": "NoBl",
@@ -27,7 +27,7 @@
     "url": "https://github.com/nobl/ioBroker.senec.git"
   },
   "dependencies": {
-    "axios": "^1.4.0",
+    "axios": "^1.6.0",
     "@iobroker/adapter-core": "^2.6.8"
   },
   "devDependencies": {
@@ -39,18 +39,18 @@
     "@iobroker/testing": "^4.1.0",
 	"@tsconfig/node14": "^14.1.0",
     "@types/chai": "^4.3.6",
-    "@types/chai-as-promised": "^7.1.6",
+    "@types/chai-as-promised": "^7.1.7",
     "@types/mocha": "^10.0.2",
-    "@types/node": "^20.8.0",
-    "@types/proxyquire": "^1.3.29",
+    "@types/node": "^20.8.10",
+    "@types/proxyquire": "^1.3.30",
     "@types/sinon": "^10.0.16",
-    "@types/sinon-chai": "^3.2.9",
+    "@types/sinon-chai": "^3.2.11",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.50.0",
     "mocha": "^10.2.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^16.0.0",
+    "sinon": "^17.0.0",
     "sinon-chai": "^3.7.0",
     "typescript": "~5.2.2"
   },