iobroker.senec 1.6.16 → 2.0.0

package/LICENSE

@@ -1,9 +1,7 @@
-Copyright (c) 2024 NoBl <github@bluemle.org>
+Copyright (c) 2020-2026 NoBl <github@bluemle.org>
 
 MIT License
 
-Copyright (c) 2024 Author <author@mail.com>
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

package/README.md

@@ -299,6 +299,13 @@ This channel contains values polled from SENEC App-API.
 
 ## Changelog
 
+### 2.0.0 (maett81, NoBl)
+* Updated to use new SENEC API via mein-senec.de - Thanks to @maett81
+* Some code and dependency housekeeping
+
+### 1.6.17
+* License update
+
 ### 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.
 
@@ -335,7 +342,7 @@ This channel contains values polled from SENEC App-API.
 ## License
 MIT License
 
-Copyright (c) 2025 Norbert Bluemle <github@bluemle.org>
+Copyright (c) 2020-2026 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,34 @@
 {
     "common": {
         "name": "senec",
-        "version": "1.6.16",
+        "version": "2.0.0",
         "news": {
+			"2.0.0": {
+				"en": "Update to use API via mein-senec.de (Thanks to maett81)",
+				"de": "Aktualisierung der API über mein-senec.de (Danke an maett81)",
+				"ru": "Использование API через mein-senec.de (перенаправлено с «Maett81»)",
+				"pt": "Atualizar para usar API via mein-senec.de (Graças a Maett81)",
+				"nl": "Update om API te gebruiken via mein-senec.de (Dankzij maett81)",
+				"fr": "Mise à jour pour utiliser l'API via mein-senec.de (Merci à maett81)",
+				"it": "Aggiornamento all'utilizzo API tramite mein-senec.de (Grazie a maett81)",
+				"es": "Actualización para utilizar API a través de mein-senec.de (Gracias a maett81)",
+				"pl": "Aktualizacja do użycia API poprzez mein- senec.de (Dzięki maett81)",
+				"uk": "Update to use API через mein-senec.de (Шанки до maett81)",
+				"zh-cn": "通过 mein-senec.de 使用 API 的更新 (谢谢Maett81)"
+			},
+			"1.6.17": {
+				  "en": "License update",
+				  "de": "Lizenz-Update",
+				  "ru": "Обновление лицензии",
+				  "pt": "Atualização da licença",
+				  "nl": "Licentie-update",
+				  "fr": "Mise à jour de licence",
+				  "it": "Aggiornamento della licenza",
+				  "es": "Actualización de la licencia",
+				  "pl": "Aktualizacja licencji",
+				  "uk": "Оновлення ліцензії",
+				  "zh-cn": "许可证更新"
+			},
 			"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\\\".",
@@ -67,32 +93,6 @@
 				"pl": "Aktualizacja licencji",
 				"uk": "Оновлена ліцензія",
 				"zh-cn": "更新许可证"
-			},
-			"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": "九. 一切制度"
 			}
         },
         "docs": {
@@ -153,12 +153,12 @@
 		},
         "dependencies": [
 			{
-                "js-controller": ">=5.0.19"
+                "js-controller": ">=6.0.11"
             }
         ],
 	        "globalDependencies": [
 	            {
-	                "admin": ">=5.1.13"
+	                "admin": ">=7.6.17"
 	            }
 	        ]
     },
@@ -197,7 +197,7 @@
 		"api_interval": 5,
 		"api_alltimeRebuild": false
     },
-	"nativeEncrypted": {
+	"encryptedNative": {
         "api_mail": "",
         "api_pwd": ""
     },

package/main.js

@@ -12,29 +12,29 @@ const utils = require("@iobroker/adapter-core");
 const axios = require("axios").default;
 axios.defaults.headers.post["Content-Type"] = "application/json";
 
+const tough = require("tough-cookie");
+const cheerio = require("cheerio");
+let wrapper;
+(async () => {
+	wrapper = (await import("axios-cookiejar-support")).wrapper;
+})();
+
 const state_attr = require(__dirname + "/lib/state_attr.js");
 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.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 apiLoginUrl = "https://mein-senec.de/endkunde/oauth2/authorization/endkunde-portal";
 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":""}}';
 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 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;
-let apiLoginToken = "";
 let connectVia = "http://";
 
 const allKnownObjects = new Set([
@@ -119,8 +119,8 @@ class Senec extends utils.Adapter {
 				this.log.info("Usage of SENEC App API configured.");
 				await this.initSenecAppApi();
 				if (apiConnected) {
-					await this.getApiSystems();
-					await this.pollSenecAppApi(0); // App API
+					await this.getWebApiSystems();
+					await this.pollSenecWebApi(0); // Web API
 				}
 			} else {
 				this.log.warn(
@@ -451,50 +451,135 @@ class Senec extends utils.Adapter {
 			this.log.info("Usage of SENEC App API not configured. Not using it");
 			return;
 		}
-		this.log.info("connecting to Senec App API: " + apiLoginUrl);
-		const loginData = JSON.stringify({
-			password: this.config.api_pwd,
-			username: this.config.api_mail,
-		});
+		/** new for WEB API */
+		this.log.info("Connecting to SENEC Portal (mein-senec.de) login...");
+
 		try {
-			const body = await this.doGet(apiLoginUrl, loginData, this, this.config.pollingTimeout, true);
-			this.log.info("connected to Senec AppAPI.");
-			apiLoginToken = JSON.parse(body).token;
+			// create cookie jar and a wrapped axios client that keeps cookies
+			const jar = new tough.CookieJar();
+			const webClient = wrapper(
+				axios.create({
+					jar,
+					withCredentials: true,
+					//httpsAgent: agent,
+					headers: {
+						"User-Agent": "Mozilla/5.0 (iobroker-senec-adapter)",
+					},
+					timeout: this.config.pollingTimeout || 5000,
+					maxRedirects: 5,
+					validateStatus: () => true,
+				}),
+			);
+
+			// STEP 1: fetch login page
+			this.log.info("STEP 1: fetch login portal page...");
+			const resp1 = await webClient.get(apiLoginUrl);
+			this.log.debug("Portal GET status: " + resp1.status);
+			this.log.silly(
+				"Portal GET response url: " + (resp1.request && resp1.request.res ? resp1.request.res.responseUrl : ""),
+			);
+
+			// parse form
+			const $ = cheerio.load(resp1.data);
+			const form = $("form#kc-form-login");
+			if (!form.length) {
+				throw new Error("Login form not found on portal page");
+			}
+			const actionAttr = form.attr("action");
+			const actionUrl = new URL(actionAttr, resp1.request.res.responseUrl).href;
+
+			// collect hidden inputs
+			const formData = {};
+			form.find("input").each((i, el) => {
+				const name = $(el).attr("name");
+				const value = $(el).attr("value") || "";
+				if (name) formData[name] = value;
+			});
+			formData.username = this.config.api_mail;
+			formData.password = this.config.api_pwd;
+
+			this.log.debug("Posting login to Keycloak action URL: " + actionUrl);
+
+			const resp2 = await webClient.post(actionUrl, new URLSearchParams(formData).toString(), {
+				headers: {
+					"Content-Type": "application/x-www-form-urlencoded",
+					Referer: resp1.request.res.responseUrl,
+				},
+				maxRedirects: 5,
+				validateStatus: () => true,
+			});
+
+			this.log.debug("Login POST status: " + resp2.status);
+			// check cookies in jar
+			const cookies = await jar.getCookies("https://mein-senec.de");
+			this.log.debug("Cookies after login: " + cookies.map((c) => c.cookieString()).join("; "));
+
+			if (resp2.status >= 400) {
+				throw new Error("Portal login failed: " + resp2.status);
+			}
+
+			// store web client for subsequent portal requests
+			this.senecWebClient = webClient;
+			this.senecWebJar = jar;
 			apiConnected = true;
-			axios.defaults.headers.get["authorization"] = apiLoginToken;
+			this.log.info("Connected to SENEC Portal via web login.");
 		} catch (error) {
 			apiConnected = false;
-			throw new Error("Error connecting to Senec AppAPI. Exiting! (" + error + ").");
+			this.log.error("Error connecting to SENEC Portal: " + error);
+			throw new Error("Error connecting to SENEC Portal. (" + error + ")");
 		}
+		/** end new WEB API */
 	}
 
 	/**
 	 * Reads system data from senec app api
+	 *
+	 * Replaced: reads portal status overview and creates _api.Portal.Overview
 	 */
-	async getApiSystems() {
-		const pfx = "_api.Anlagen.";
-		if (!this.config.api_use || !apiConnected) {
-			this.log.info("Usage of SENEC App API not configured or not connected.");
+	async getWebApiSystems() {
+		const pfx = "_api.Portal.Profile.";
+		if (!this.config.api_use || !apiConnected || !this.senecWebClient) {
+			this.log.info("Usage of SENEC Portal not configured or not connected.");
 			return;
 		}
-		this.log.info("Reading Systems Information from Senec App API " + apiSystemsUrl);
+		this.log.info("Reading Systems Information from SENEC Portal (status overview)");
+
+		const PROFILE_SETTINGS = "https://mein-senec.de/endkunde/api/settings/getProfileSettings";
+
 		try {
-			const body = await this.doGet(apiSystemsUrl, "", this, this.config.pollingTimeout, false);
-			this.log.info("Read Systems Information from Senec AppAPI.");
-			const obj = JSON.parse(body);
+			const resp = await this.senecWebClient.get(PROFILE_SETTINGS);
+			if (resp.status !== 200) {
+				throw new Error("Profile Settings returned HTTP " + resp.status);
+			}
+			const obj = resp.data;
+
+			// try to populate profile settings
+			apiKnownSystems.length = 0;
+
 			for (const [key, value] of Object.entries(obj)) {
-				this.log.debug("ApiPull: " + key + ":" + JSON.stringify(value));
-				const systemId = value.id;
-				apiKnownSystems.push(systemId);
-				for (const [key2, value2] of Object.entries(value)) {
-					if (typeof value2 === "object")
-						await this.doState(pfx + systemId + "." + key2, JSON.stringify(value2), "", "", false);
-					else await this.doState(pfx + systemId + "." + key2, value2, "", "", false);
+				if (key == "id") apiKnownSystems.push(value);
+				if (key == "land" || key == "sprache") {
+					for (const [key2, value2] of Object.entries(value)) {
+						this.log.debug("profileSetting: " + pfx + key + "." + key2 + ":" + value);
+						await this.doState(pfx + key + "." + key2, JSON.stringify(value2), "", "", false);
+					}
+				} else {
+					this.log.debug("profileSetting: " + pfx + key + ":" + value);
+					await this.doState(pfx + key, value, "", "", false);
 				}
 			}
-			await this.doState(pfx + "IDs", JSON.stringify(apiKnownSystems), "Anlagen IDs", "", false);
+
+			/*
+			** ensure uniqueness, if there are multiple systems
+			const uniq = [...new Set(apiKnownSystems)];
+			apiKnownSystems.length = 0;
+			uniq.forEach((x) => apiKnownSystems.push(x));
+			*/
+
+			this.log.info("Detected systems from portal overview: " + JSON.stringify(apiKnownSystems));
+			//await this.doState(pfx + "IDs", JSON.stringify(apiKnownSystems), "Portal detected system IDs", "", false);
 		} catch (error) {
-			throw new Error("Error reading Systems Information from Senec AppAPI. (" + error + ").");
+			throw new Error("Error reading Systems Information from SENEC Portal. (" + error + ").");
 		}
 	}
 
@@ -573,6 +658,7 @@ class Senec extends utils.Adapter {
 				this.log.info("(Poll) Double escapes autofixed! Body out: " + body);
 			}
 			const obj = JSON.parse(body, reviverNumParse);
+			this.log.debug("(Poll) Parsed object: " + JSON.stringify(obj));
 			await this.evalPoll(obj);
 
 			retry = 0;
@@ -618,61 +704,103 @@ class Senec extends utils.Adapter {
 	}
 
 	/**
-	 * Read values from Senec App API
+	 * Read values from Senec App API (replaced to query the mein-senec portal endpoints)
 	 */
-	async pollSenecAppApi(retry) {
-		if (!this.config.api_use || !apiConnected) {
-			this.log.info("Usage of SENEC App API not configured or not connected.");
+	async pollSenecWebApi(retry) {
+		if (!this.config.api_use || !apiConnected || !this.senecWebClient) {
+			this.log.info("Usage of SENEC Portal not configured or not connected.");
 			return;
 		}
+
 		const interval = this.config.api_interval * 60000;
-		const dates = new Map([
-			["THIS_DAY", new Date().toISOString().split("T")[0]],
-			["LAST_DAY", new Date(new Date().setDate(new Date().getDate() - 1)).toISOString().split("T")[0]],
-			["THIS_MONTH", new Date().toISOString().split("T")[0]],
-			["LAST_MONTH", new Date(new Date().setDate(0)).toISOString().split("T")[0]],
-			["THIS_YEAR", new Date().toISOString().split("T")[0]],
-			["LAST_YEAR", new Date(new Date().getFullYear() - 1, 1, 1).toISOString().split("T")[0]],
-		]);
-
-		this.log.debug("Polling API ...");
-		let body = "";
+		const base = "https://mein-senec.de/endkunde/api/status";
+		const endpoints = {
+			statusoverview: base + "/getstatusoverview.php?anlageNummer=0",
+			technischeDaten: base + "/technischeDaten?anlageNummer=0",
+			status24: base + "/getstatus24.php?anlageNummer=0",
+			autarky: base + "/getautarky.php?anlageNummer=0",
+			accustate: base + "/getaccustate.php?anlageNummer=0",
+			accusavings: base + "/getaccusavings.php?anlageNummer=0",
+		};
+		// also interesting endpoints:
+
+		// also prepare getstatus types
+		const statusTypes = ["accuexport", "accuimport", "gridexport", "gridimport", "powergenerated", "consumption"];
+
+		this.log.debug("Polling Portal API ...");
+
 		try {
-			for (let i = 0; i < apiKnownSystems.length; 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");
-				const tz = tzObj ? encodeURIComponent(tzObj.val) : encodeURIComponent("Europe/Berlin");
-
-				// dashboard
-				url = baseUrl + "/dashboard";
-				body = await this.doGet(url, "", this, this.config.pollingTimeout, false);
-				await this.decodeDashboard(apiKnownSystems[i], JSON.parse(body));
-
-				for (const [key, value] of dates.entries()) {
-					// statistik for period
-					url =
-						baseUrlMonitor +
-						"/data?period=" +
-						api_trans[key].api +
-						"&date=" +
-						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);
+			// statusoverview
+			let r = await this.senecWebClient.get(endpoints.statusoverview);
+			if (r.status === 200) {
+				await this.decodeStatusOverview(r.data);
+			} else {
+				this.log.warn("statusoverview returned HTTP " + r.status);
+			}
+
+			// technischeDaten
+			r = await this.senecWebClient.get(endpoints.technischeDaten);
+			if (r.status === 200) {
+				await this.decodeTechnischeDaten(r.data);
+			} else {
+				this.log.warn("technischeDaten returned HTTP " + r.status);
+			}
+
+			// status24
+			r = await this.senecWebClient.get(endpoints.status24);
+			if (r.status === 200) {
+				await this.decodeStatus24(r.data);
+			} else {
+				this.log.warn("stats24 returned HTTP " + r.status);
+			}
+
+			// autarky
+			r = await this.senecWebClient.get(endpoints.autarky);
+			if (r.status === 200) {
+				await this.decodeAutarky(r.data);
+			} else {
+				this.log.warn("autarky returned HTTP " + r.status);
+			}
+
+			// accustate
+			r = await this.senecWebClient.get(endpoints.accustate);
+			if (r.status === 200) {
+				await this.decodeAccuState(r.data);
+			} else {
+				this.log.warn("accustate returned HTTP " + r.status);
+			}
+
+			// accusavings
+			r = await this.senecWebClient.get(endpoints.accusavings);
+			if (r.status === 200) {
+				await this.decodeAccuSavings(r.data);
+			} else {
+				this.log.warn("accusavings returned HTTP " + r.status);
+			}
+
+			// getstatus with many types
+			for (let i = 0; i < statusTypes.length; i++) {
+				const t = statusTypes[i];
+				const url = base + "/getstatus.php?type=" + encodeURIComponent(t) + "&period=all&anlageNummer=0";
+				try {
+					const res = await this.senecWebClient.get(url);
+					if (res.status === 200) {
+						await this.decodeStatus(res.data, t);
+					} else {
+						this.log.warn("getstatus(" + t + ") returned HTTP " + res.status);
+					}
+				} catch (err) {
+					this.log.warn("Error fetching getstatus(" + t + "): " + err);
 				}
-				if (this.config.api_alltimeRebuild) await this.rebuildAllTimeHistory(apiKnownSystems[i]);
 			}
+
 			retry = 0;
 			if (unloaded) return;
-			this.timerAPI = setTimeout(() => this.pollSenecAppApi(retry), interval);
+			this.timerAPI = setTimeout(() => this.pollSenecWebApi(retry), interval);
 		} catch (error) {
 			if (retry == this.config.retries && this.config.retries < 999) {
 				this.log.error(
-					"Error reading from Senec AppAPI. Retried " +
+					"Error reading from SENEC Portal. Retried " +
 						retry +
 						" times. Giving up now. Check config and restart adapter. (" +
 						error +
@@ -682,101 +810,266 @@ class Senec extends utils.Adapter {
 			} else {
 				retry += 1;
 				this.log.warn(
-					"Error reading from Senec AppAPI. Retry " +
+					"Error reading from SENEC Portal. Retry " +
 						retry +
 						"/" +
 						this.config.retries +
 						" in " +
-						(interval * this.config.retrymultiplier * retry) / 1000 +
+						(this.config.api_interval * 60000 * this.config.retrymultiplier * retry) / 1000 +
 						" seconds! (" +
 						error +
 						")",
 				);
 				this.timerAPI = setTimeout(
-					() => this.pollSenecAppApi(retry),
-					interval * this.config.retrymultiplier * retry,
+					() => this.pollSenecWebApi(retry),
+					this.config.api_interval * 60000 * this.config.retrymultiplier * retry,
 				);
 			}
 		}
 	}
 
 	/**
-	 * Decodes Dashboard information from SENEC App API
+	 * Decodes StatusOverview from WebAPI
 	 */
-	async decodeDashboard(system, obj) {
-		const pfx = "_api.Anlagen." + system + ".Dashboard.";
+	async decodeStatusOverview(obj) {
+		const pfx = "_api.Portal.StatusOverview.";
+		// store raw data
+		//await this.doState(pfx + "_json", JSON.stringify(obj), "Portal Status Overview", "", false);
 		for (const [key, value] of Object.entries(obj)) {
-			this.log.debug("(decodeDashboard) Key: " + key + " - Value:" + JSON.stringify(value));
-			if (key == "timestamp" || key == "electricVehicleConnected") {
-				await this.doState(pfx + key, value, "", "", false);
-			} else {
+			if (
+				key == "wartungsplan" ||
+				key === "gridimport" ||
+				key === "gridexport" ||
+				key === "powergenerated" ||
+				key === "consumption" ||
+				key === "accuexport" ||
+				key === "accuimport" ||
+				key === "acculevel"
+			) {
 				for (const [key2, value2] of Object.entries(value)) {
-					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 + "." + keyParts.prefix + " (k" + keyParts.unit + ")",
-							Number((value2 / 1000).toFixed(2)),
-							"",
-							"k" + keyParts.unit,
-							false,
-						);
-					}
+					if (key2 == "possibleMaintenanceTypes") continue; // skip this one
+					this.log.debug("decodeStatusOverview: " + pfx + key + "." + key2 + ":" + value);
+					await this.doState(
+						pfx + key + "." + key2,
+						ValueTyping(key2, JSON.stringify(value2)),
+						"",
+						"",
+						false,
+					);
 				}
+			} else if (key === "lastupdated") {
+				const date = new Date(value);
+				this.log.debug("decodeStatusOverview: " + pfx + key + ":" + date.toString());
+				await this.doState(pfx + key, date.toString(), "", "", false);
+			} else {
+				if (key === "suppressedNotificationIds") continue; // skip this one - empty array
+				this.log.debug("decodeStatusOverview: " + pfx + key + ":" + value);
+				await this.doState(pfx + key, ValueTyping(key, value), "", "", false);
 			}
 		}
 	}
 
 	/**
-	 * Decodes Statistik information from SENEC App API
+	 * Decodes technischeDaten from WebAPI
 	 */
-	async decodeStatistik(system, obj, period) {
-		if (obj == null || obj == undefined || obj.aggregation == null || obj.aggregation == undefined) return; // could happen (e.g.) if we pull information for "last year" when the appliance isn't that old yet
-		const pfx = "_api.Anlagen." + system + ".Statistik." + period + ".";
-		for (const [key, value] of Object.entries(obj.aggregation)) {
-			this.log.debug("decodeStatistic: " + pfx + key + ":" + value);
-			// only reading 'aggregation' - no interest in fine granular information
-			if (key == "startDate") {
+	async decodeTechnischeDaten(obj) {
+		const pfx = "_api.Portal.TechnischeDaten.";
+		// store raw data
+		//await this.doState(pfx + "_json", JSON.stringify(obj), "Portal Status Overview", "", false);
+		for (const [key, value] of Object.entries(obj)) {
+			if (key == "installationsdatum") {
+				const date = new Date(value);
+				this.log.debug("decodeTechnischeDaten: " + pfx + key + ":" + date.toString());
+				await this.doState(pfx + key, date.toString(), "", "", false);
+			} else {
+				this.log.debug("decodeTechnischeDaten: " + pfx + key + ":" + value);
 				await this.doState(pfx + key, value, "", "", false);
+			}
+		}
+	}
+
+	/**
+	 * Decodes Status24 from WebAPI
+	 */
+	async decodeStatus24(obj) {
+		const pfx = "_api.Portal.Status24.";
+		// store raw data
+		await this.doState(pfx + "json", JSON.stringify(obj), "Portal Status24", "", false);
+		for (const [key, value] of Object.entries(obj)) {
+			if (key === "val") {
+				const accuExportArr = value[0];
+				const accuImportArr = value[1];
+				const gridExportArr = value[2];
+				const gridImportArr = value[3];
+				const powergeneratedArr = value[4];
+				const consumptionArr = value[5];
+
+				// AccuExport
+				let i = 0;
+				for (const [ts, val] of accuExportArr) {
+					i++;
+					const dateStr = new Date(ts).toString();
+					await this.doState(pfx + "AccuExport." + i + ".ts", dateStr, "Timestampe", "", false);
+					await this.doState(pfx + "AccuExport." + i + ".value", Number(val.toFixed(3)), "", "", false);
+				}
+				await this.doState(pfx + "AccuExport.json", JSON.stringify(accuExportArr), "", "", false);
+
+				// AccuImport
+				i = 0;
+				for (const [ts, val] of accuImportArr) {
+					i++;
+					const dateStr = new Date(ts).toString();
+					await this.doState(pfx + "AccuImport." + i + ".ts", dateStr, "Timestampe", "", false);
+					await this.doState(pfx + "AccuImport." + i + ".value", Number(val.toFixed(3)), "", "", false);
+				}
+				await this.doState(pfx + "AccuImport.json", JSON.stringify(accuImportArr), "", "", false);
+
+				// GridExport
+				i = 0;
+				for (const [ts, val] of gridExportArr) {
+					i++;
+					const dateStr = new Date(ts).toString();
+					await this.doState(pfx + "GridExport." + i + ".ts", dateStr, "Timestampe", "", false);
+					await this.doState(pfx + "GridExport." + i + ".value", Number(val.toFixed(3)), "", "", false);
+				}
+				await this.doState(pfx + "GridExport.json", JSON.stringify(gridExportArr), "", "", false);
+
+				// GridImport
+				i = 0;
+				for (const [ts, val] of gridImportArr) {
+					i++;
+					const dateStr = new Date(ts).toString();
+					await this.doState(pfx + "GridImport." + i + ".ts", dateStr, "Timestampe", "", false);
+					await this.doState(pfx + "GridImport." + i + ".value", Number(val.toFixed(3)), "", "", false);
+				}
+				await this.doState(pfx + "GridImport.json", JSON.stringify(gridImportArr), "", "", false);
+
+				// PowerGenerated
+				i = 0;
+				for (const [ts, val] of powergeneratedArr) {
+					i++;
+					const dateStr = new Date(ts).toString();
+					await this.doState(pfx + "PowerGenerated." + i + ".ts", dateStr, "Timestampe", "", false);
+					await this.doState(pfx + "PowerGenerated." + i + ".value", Number(val.toFixed(3)), "", "", false);
+				}
+				await this.doState(pfx + "PowerGenerated.json", JSON.stringify(powergeneratedArr), "", "", false);
+
+				// Consumption
+				i = 0;
+				for (const [ts, val] of consumptionArr) {
+					i++;
+					const dateStr = new Date(ts).toString();
+					await this.doState(pfx + "Consumption." + i + ".ts", dateStr, "Timestamp", "", false);
+					await this.doState(pfx + "Consumption." + i + ".value", Number(val.toFixed(3)), "", "", false);
+				}
+				await this.doState(pfx + "Consumption.json", JSON.stringify(consumptionArr), "", "", false);
 			} else {
-				if (!this.config.api_alltimeRebuild) {
-					// don't update DPs if we are AllTime-Rebuild-Process
-					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,
-						);
-					}
+				await this.doState(pfx + key, ValueTyping(key, value), "", "", false);
+			}
+		}
+	}
+
+	/**
+	 * Decodes decodeAutarky from WebAPI	*
+	 */
+	async decodeAutarky(obj) {
+		const pfx = "_api.Portal.Autarky.";
+		// store raw data
+		//await this.doState(pfx + "_json", JSON.stringify(obj), "Portal Autarky", "", false);
+		for (const [key, value] of Object.entries(obj)) {
+			this.log.debug("decodeAutarky: " + pfx + key + ":" + value);
+			await this.doState(pfx + key, ValueTyping(key, value), "", "%", false);
+		}
+	}
+
+	/**
+	 * Decodes AccuState from WebAPI
+	 */
+	async decodeAccuState(obj) {
+		const pfx = "_api.Portal.AccuState.";
+		// store raw json
+		//await this.doState(pfx + "_json", JSON.stringify(obj), "Portal Accu State", "", false);
+		for (const [key, value] of Object.entries(obj)) {
+			if (key === "val") {
+				const voltageArr = value[0];
+				const currentArr = value[1];
+
+				// Voltage
+				let i = 0;
+				for (const [ts, val] of voltageArr) {
+					i++;
+					const dateStr = new Date(ts).toString();
+					await this.doState(pfx + "Voltage." + i + ".ts", dateStr, "Timestamp", "", false);
+					await this.doState(pfx + "Voltage." + i + ".value", Number(val.toFixed(3)), "Voltage", "V", false);
 				}
-				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,
-					);
+
+				// Current
+				i = 0;
+				for (const [ts, val] of currentArr) {
+					i++;
+					const dateStr = new Date(ts).toString();
+					await this.doState(pfx + "Current." + i + ".ts", dateStr, "Timestampe", "", false);
+					await this.doState(pfx + "Current." + i + ".value", Number(val.toFixed(3)), "Power", "A", false);
+				}
+			} else if (key === "lastupdated") {
+				await this.doState(pfx + key, new Date(value).toString(), "Last updated", "", false);
+			} else {
+				await this.doState(pfx + key, ValueTyping(key, value), "", "", false);
 			}
 		}
-		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);
+	}
+
+	/**
+	 * Decodes AccuSavings from WebAPI
+	 */
+	async decodeAccuSavings(obj) {
+		const pfx = "_api.Portal.AccuSavings.";
+		// store raw json
+		//await this.doState(pfx + "_json", JSON.stringify(obj), "Portal Accu Savings", "", false);
+		for (const [key, value] of Object.entries(obj)) {
+			if (key == "lastupdated") {
+				await this.doState(pfx + key, new Date(value).toString(), "Last Update", "", false);
+			} else {
+				await this.doState(pfx + key, ValueTyping(key, value), "", "", false);
+			}
+		}
+	}
+
+	/**
+	 * Decodes Status from WebAPI
+	 */
+	async decodeStatus(obj, typ) {
+		const pfx = "_api.Portal.Status." + typ + ".";
+		// store raw json
+		//await this.doState(pfx + "_json", JSON.stringify(obj), "Portal Status", "", false);
+		for (const [key, value] of Object.entries(obj)) {
+			if (key == "val") {
+				// includes six arrays for the last 24 hours for different metrics (order? : accu import, accu export, grid import, grid export, power generated, consumption)
+				const yearly = await this.decodeYearlyValues(value);
+				for (const [year, aggregation] of Object.entries(yearly)) {
+					await this.doState(pfx + year, Number(aggregation.toFixed(3)), "", "", false);
+				}
+			} else if (key == "lastupdated") {
+				await this.doState(pfx + key, new Date(value).toString(), "Last Updated", "", false);
+			} else {
+				await this.doState(pfx + key, ValueTyping(key, value), "", "", false);
+			}
+		}
+	}
+
+	/**
+	 * Converts SENEC yearly arrays into {year: value} object.
+	 */
+	async decodeYearlyValues(val) {
+		if (!val || !Array.isArray(val)) return {};
+
+		const result = {};
+
+		for (const [ts, value] of val) {
+			const year = new Date(ts).getFullYear(); // get year from timestamp
+			result[year] = Number(value.toFixed(3)); // round to 3 decimal places
 		}
-		await this.updateAllTimeHistory(system);
+		return result;
 	}
 
 	/**
@@ -835,40 +1128,6 @@ class Senec extends utils.Adapter {
 		}
 	}
 
-	/**
-	 * 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;
-		}
-
-		this.log.info("Rebuilding AllTime History ...");
-		let year = new Date(new Date().getFullYear() - 1, 1, 1).toISOString().split("T")[0]; // starting last year, because we already got current year covered
-		let 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 = apiMonitorUrl + "/" + system;
-				let url = "";
-				const tzObj = await this.getStateAsync("_api.Anlagen." + system + ".zeitzone");
-				const tz = tzObj ? encodeURIComponent(tzObj.val) : encodeURIComponent("Europe/Berlin");
-				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];
-				if (unloaded) return;
-			}
-		} catch (error) {
-			this.log.info("Rebuild ended: " + error);
-		}
-		this.log.info("Restarting ...");
-		this.extendForeignObject(`system.adapter.${this.namespace}`, { native: { api_alltimeRebuild: false } });
-	}
-
 	/**
 	 * sets a state's value and creates the state if it doesn't exist yet
 	 */
@@ -1016,24 +1275,24 @@ 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: "",
-	};
-};
+// 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.senec",
-  "version": "1.6.16",
+  "version": "2.0.0",
   "description": "Senec Home",
   "author": {
     "name": "NoBl",
@@ -28,39 +28,32 @@
     "url": "https://github.com/nobl/ioBroker.senec.git"
   },
   "dependencies": {
-    "axios": "^1.7.8",
-    "@iobroker/adapter-core": "^3.2.3"
+	  "@iobroker/adapter-core": "^3.3.2",
+	  "axios": "^1.13.4",
+	  "axios-cookiejar-support": "^6.0.5",
+	  "cheerio": "^1.2.0",
+	  "tough-cookie": "^6.0.0"
   },
   "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",
-	"@iobroker/adapter-dev": "^1.3.0",
-    "@iobroker/testing": "^5.0.0",
-	"@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.7",
+    "@alcalzone/release-script": "^5.0.0",
+    "@alcalzone/release-script-plugin-iobroker": "^4.0.0",
+    "@alcalzone/release-script-plugin-license": "^4.0.0",
+    "@alcalzone/release-script-plugin-manual-review": "^4.0.0",
+	"@iobroker/adapter-dev": "^1.5.0",
+    "@iobroker/testing": "^5.2.2",
+	"@eslint/eslintrc": "^3.3.3",
+	"@eslint/js": "^9.39.2",
+	"@tsconfig/node20": "^20.1.8",
+    "@types/node": "^25.2.0",
     "@types/proxyquire": "^1.3.31",
-    "@types/sinon": "^17.0.3",
-    "@types/sinon-chai": "^3.2.12",
-    "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.14.0",
-    "mocha": "^11.0.1",
+    "eslint": "^9.39.2",
+	"eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.5",
+	"globals": "^17.3.0",
 	"mustache": "^4.2.0",
-	"prettier": "^3.4.2",
+	"prettier": "^3.8.1",
     "proxyquire": "^2.1.3",
-    "sinon": "^19.0.2",
-    "sinon-chai": "^4.0.0",
-    "typescript": "~5.7.3"
+    "typescript": "~5.9.3"
   },
   "main": "main.js",
   "files": [