iobroker.senec 1.6.15 → 1.6.16

package/README.md

@@ -299,6 +299,9 @@ This channel contains values polled from SENEC App-API.
 
 ## Changelog
 
+### 1.6.16
+* Moved Dashboard to ApiV2. This invalidates existing datapoints under /Dashboard/ and introduces "Dashboard/currently" and "Dashboard/today" due to changes in the API.
+
 ### 1.6.15
 * Maintenance update (dependencies, ...)
 
@@ -332,7 +335,7 @@ This channel contains values polled from SENEC App-API.
 ## License
 MIT License
 
-Copyright (c) 2024 Norbert Bluemle <github@bluemle.org>
+Copyright (c) 2025 Norbert Bluemle <github@bluemle.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/io-package.json

@@ -1,8 +1,21 @@
 {
     "common": {
         "name": "senec",
-        "version": "1.6.15",
+        "version": "1.6.16",
         "news": {
+			"1.6.16": {
+			  "en": "Migrated Dashboard to ApiV2. This invalidates existing datapoints under /Dashboard/ and introduces \"Dashboard/currently\" and \"Dashboard/today\" due to changes in the API.",
+			  "de": "Dashboard auf ApiV2 migriert. Dadurch werden bestehende Datenpunkte unter /Dashboard/ ungültig. Neu sind aufgrund von Änderungen in der API: \\\"Dashboard/current\\\" und \\\"Dashboard/today\\\".",
+			  "ru": "Migrated Dashboard to ApiV2. Это аннулирует существующие точки данных под /Dashboard/ и вводит \\\"Dashboard/currently\\\" и \\\"Dashboard/today\\\" из-за изменений в API.",
+			  "pt": "Painel Migrado para ApiV2. Isso invalida os datapoints existentes em /Dashboard/ e introduz \\\"Dashboard/currently\\\" e \\\"Dashboard/hoje\\\" devido a alterações na API.",
+			  "nl": "Gemigreerd Dashboard naar ApiV2. Dit maakt bestaande datapunten ongeldig onder /Dashboard/ en introduceert \\\"Dashboard/momenteel\\\" en \\\"Dashboard/today\\\" vanwege wijzigingen in de API.",
+			  "fr": "Tableau de bord modifié vers ApiV2. Cela invalide les points de données existants sous /Dashboard/ et introduit \\\"Dashboard/currently\\\" et \\\"Dashboard/today\\\" en raison des changements dans l'API.",
+			  "it": "Migrato Dashboard ad ApiV2. Questo invalida i datapoint esistenti in /Dashboard/ e introduce \\\"Dashboard/currently\\\" e \\\"Dashboard/today\\\" a causa delle modifiche nell'API.",
+			  "es": "Migrated Dashboard to ApiV2. Esto invalida los puntos de datos existentes bajo /Dashboard/ e introduce \\\"Dashboard/currently\\\" y \\\"Dashboard/today\\\" debido a cambios en la API.",
+			  "pl": "Migrated Dashboard do ApiV2. To unieważnia istniejące punkty danych pod / Deska rozdzielcza / i wprowadza\\ \"Deska rozdzielcza / obecnie\\\" i\\ \"Deska rozdzielcza / dzisiaj\\\" ze względu na zmiany w API.",
+			  "uk": "Migrated Dashboard до ApiV2. Це недійсні існуючі точки даних під / панель / і вводить \\ \"Дашборд/поточно\\\" і \\\"Dashboard/today\\\" через зміни в API.",
+			  "zh-cn": "将 Dashboard 移动到 ApiV2. 这使得/Dashboard/下的现有数据点无效,并由于API的改变,引入了\\\"Dashboard/today\\\"和\\\"Dashboard/today\\\"."
+			},
 			"1.6.15": {
 			  "en": "Maintenance update (dependencies, ...)",
 			  "de": "Wartungsupdate (Abhängigkeiten, ..",
@@ -80,19 +93,6 @@
 				  "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.",
-				  "ru": "Улучшенная батарея принудительная загрузка, добавил переключатель в config, чтобы позволить активный контроль прибора.",
-				  "pt": "Carga forçada da bateria melhorada, interruptor adicionado em config para permitir o controle ativo do aparelho.",
-				  "nl": "Geïmproviseerde batterij geforceerde lading, toegevoegd schakelaar in config om actieve controle over goedkeuring toe te staan.",
-				  "fr": "Amélioration du chargement forcé de la batterie, commutateur ajouté dans la configuration pour permettre le contrôle actif de l'appareil.",
-				  "it": "Caricamento forzato della batteria migliorato, interruttore aggiunto in configurazione per consentire il controllo attivo dell'apparecchio.",
-				  "es": "Carga forzada de batería mejorada, interruptor añadido en configuración para permitir el control activo del aparato.",
-				  "pl": "Poprawione baterie wymusiły obciążenie, dodano przełącznik w celu umożliwienia aktywnej kontroli urządzenia.",
-				  "uk": "Покращений акумулятор примусового навантаження, доданий перемикач в настройку, щоб забезпечити активний контроль за приладом.",
-				  "zh-cn": "改善强迫装载的电池,加起来,允许积极控制输电。."
 			}
         },
         "docs": {

package/main.js

@@ -18,8 +18,10 @@ const api_trans = require(__dirname + "/lib/api_trans.js");
 const kiloList = ["W", "Wh"];
 
 const apiUrl = "https://app-gateway.prod.senec.dev/v1/senec";
+const api2Url = "https://app-gateway.prod.senec.dev/v2/senec";
 const apiLoginUrl = apiUrl + "/login";
 const apiSystemsUrl = apiUrl + "/systems";
+const api2SystemsUrl = api2Url + "/systems";
 const apiMonitorUrl = apiUrl + "/monitor";
 const apiKnownSystems = [];
 
@@ -27,6 +29,8 @@ 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":""}}';
 const batteryOff =
 	'{"ENERGY":{"SAFE_CHARGE_FORCE":"","SAFE_CHARGE_PROHIBIT":"u8_01","SAFE_CHARGE_RUNNING":"","LI_STORAGE_MODE_START":"","LI_STORAGE_MODE_STOP":"","LI_STORAGE_MODE_RUNNING":"","STAT_STATE":""}}';
+//const blockDischargeOn = '{"ENERGY":{"SAFE_CHARGE_FORCE":"","SAFE_CHARGE_PROHIBIT":"","SAFE_CHARGE_RUNNING":"","LI_STORAGE_MODE_START":"","LI_STORAGE_MODE_STOP":"","LI_STORAGE_MODE_RUNNING":"","STAT_STATE":""}}';
+//const blockDischargeOff = '{"ENERGY":{"SAFE_CHARGE_FORCE":"","SAFE_CHARGE_PROHIBIT":"","SAFE_CHARGE_RUNNING":"","LI_STORAGE_MODE_START":"","LI_STORAGE_MODE_STOP":"","LI_STORAGE_MODE_RUNNING":"","STAT_STATE":""}}';
 
 let apiConnected = false;
 let lalaConnected = false;
@@ -500,6 +504,7 @@ class Senec extends utils.Adapter {
 	 * @param form to post
 	 */
 	doGet(pUrl, pForm, caller, pollingTimeout, isPost) {
+		this.log.debug("Calling: " + pUrl);
 		return new Promise(function (resolve, reject) {
 			axios({
 				method: isPost ? "post" : "get",
@@ -634,7 +639,8 @@ class Senec extends utils.Adapter {
 		let body = "";
 		try {
 			for (let i = 0; i < apiKnownSystems.length; i++) {
-				const baseUrl = apiSystemsUrl + "/" + apiKnownSystems[i];
+				// const baseUrl = apiSystemsUrl + "/" + apiKnownSystems[i];
+				const baseUrl = api2SystemsUrl + "/" + apiKnownSystems[i];
 				const baseUrlMonitor = apiMonitorUrl + "/" + apiKnownSystems[i];
 				let url = "";
 				const tzObj = await this.getStateAsync("_api.Anlagen." + apiKnownSystems[i] + ".zeitzone");
@@ -655,7 +661,6 @@ class Senec extends utils.Adapter {
 						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);
 				}
@@ -701,23 +706,20 @@ class Senec extends utils.Adapter {
 	async decodeDashboard(system, obj) {
 		const pfx = "_api.Anlagen." + system + ".Dashboard.";
 		for (const [key, value] of Object.entries(obj)) {
-			if (key == "zeitstempel" || key == "electricVehicleConnected") {
+			this.log.debug("(decodeDashboard) Key: " + key + " - Value:" + JSON.stringify(value));
+			if (key == "timestamp" || key == "electricVehicleConnected") {
 				await this.doState(pfx + key, value, "", "", false);
 			} else {
 				for (const [key2, value2] of Object.entries(value)) {
-					await this.doState(
-						pfx + key + "." + key2,
-						Number(value2.wert.toFixed(2)),
-						"",
-						value2.einheit,
-						false,
-					);
-					if (kiloList.includes(value2.einheit)) {
+					this.log.debug("(decodeDashboard) Key2: " + key2 + " - Value: " + JSON.stringify(value2));
+					const keyParts = ParseApi2KeyParts(key2);
+					await this.doState(pfx + key + "." + key2, Number(value2.toFixed(2)), "", keyParts.unit, false);
+					if (kiloList.includes(keyParts.unit)) {
 						await this.doState(
-							pfx + key + "." + key2 + " (k" + value2.einheit + ")",
-							Number((value2.wert / 1000).toFixed(2)),
+							pfx + key + "." + keyParts.prefix + " (k" + keyParts.unit + ")",
+							Number((value2 / 1000).toFixed(2)),
 							"",
-							"k" + value2.einheit,
+							"k" + keyParts.unit,
 							false,
 						);
 					}
@@ -1014,6 +1016,25 @@ const ValueTyping = (key, value) => {
 	}
 };
 
+const ParseApi2KeyParts = (key) => {
+	//const match = key.match(/In([A-Za-z]+)$/);
+	//var unit = match ? match[1] : "";
+	//if (unit == "Percent") unit = "%";
+	//return unit;
+	const match = key.match(/^(.*)In([A-Za-z]+)$/);
+	if (match) {
+		return {
+			prefix: match[1], // part before "In"
+			unit: match[2] === "Percent" ? "%" : match[2], // replace "Percent" with "%"
+		};
+	}
+	return {
+		// default response for error
+		prefix: "unknownKey",
+		unit: "",
+	};
+};
+
 /**
  * Converts float value in hex format to js float32.
  * Also fixes to 2 decimals.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.senec",
-  "version": "1.6.15",
+  "version": "1.6.16",
   "description": "Senec Home",
   "author": {
     "name": "NoBl",
@@ -21,7 +21,7 @@
 	"photovoltaic"
   ],
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "repository": {
     "type": "git",
@@ -29,38 +29,38 @@
   },
   "dependencies": {
     "axios": "^1.7.8",
-    "@iobroker/adapter-core": "^3.2.2"
+    "@iobroker/adapter-core": "^3.2.3"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.8.0",
     "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
-	"@eslint/eslintrc": "^3.2.0",
-	"@eslint/js": "^9.16.0",
 	"@iobroker/adapter-dev": "^1.3.0",
     "@iobroker/testing": "^5.0.0",
-	"@tsconfig/node18": "^18.2.2",
-    "@types/chai": "^4.3.14",
-    "@types/chai-as-promised": "^7.1.8",
+	"@eslint/eslintrc": "^3.2.0",
+	"@eslint/js": "^9.17.0",
+	"@tsconfig/node20": "^20.1.4",
+    "@types/chai": "^4.3.19",
+    "@types/chai-as-promised": "^8.0.1",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.10.7",
     "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",
-    "chai": "^4.5.0",
-    "chai-as-promised": "^8.0.0",
-    "eslint": "^9.16.0",
-	"eslint-config-prettier": "^9.1.0",
+    "chai": "^5.1.2",
+    "chai-as-promised": "^8.0.1",
+    "eslint": "^9.17.0",
+	"eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.2.1",
-	"globals": "^15.12.0",
-    "mocha": "^10.8.2",
+	"globals": "^15.14.0",
+    "mocha": "^11.0.1",
 	"mustache": "^4.2.0",
-	"prettier": "^3.4.1",
+	"prettier": "^3.4.2",
     "proxyquire": "^2.1.3",
     "sinon": "^19.0.2",
-    "sinon-chai": "^3.7.0",
-    "typescript": "~5.7.2"
+    "sinon-chai": "^4.0.0",
+    "typescript": "~5.7.3"
   },
   "main": "main.js",
   "files": [