iobroker.smartfriends 1.0.0 → 1.1.0-alpha.0

package/LICENSE

@@ -1,34 +1,34 @@
-MIT License
-
-Copyright (c) 2025 Black-Thunder <glwars@aol.de>
-
-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
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
--------------------------------------------------------------------------------
-
-LoPablo/SchellenbergApi (https://github.com/LoPablo/SchellenbergApi)
-
-ISC License
-
-Copyright 2020 Pascâl Hartmann
-
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+MIT License
+
+Copyright (c) 2025 Black-Thunder <glwars@aol.de>
+
+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
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+-------------------------------------------------------------------------------
+
+LoPablo/SchellenbergApi (https://github.com/LoPablo/SchellenbergApi)
+
+ISC License
+
+Copyright 2020 Pascâl Hartmann
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

package/README.md

@@ -1,67 +1,75 @@
-![Logo](admin/smartfriends.png)
-
-# ioBroker.smartfriends
-
-[![NPM version](http://img.shields.io/npm/v/iobroker.smartfriends.svg)](https://www.npmjs.com/package/iobroker.smartfriends)
-[![Downloads](https://img.shields.io/npm/dm/iobroker.smartfriends.svg)](https://www.npmjs.com/package/iobroker.smartfriends)
-![Number of Installations (latest)](http://iobroker.live/badges/smartfriends-installed.svg)
-![Number of Installations (stable)](http://iobroker.live/badges/smartfriends-stable.svg)
-[![Known Vulnerabilities](https://snyk.io/test/github/Black-Thunder/ioBroker.smartfriends/badge.svg)](https://snyk.io/test/github/Black-Thunder/ioBroker.smartfriends)
-
-[![NPM](https://nodei.co/npm/iobroker.smartfriends.png?downloads=true)](https://nodei.co/npm/iobroker.smartfriends/)
-
-[![Test and Release](https://github.com/Black-Thunder/ioBroker.smartfriends/actions/workflows/test-and-release.yml/badge.svg)](https://github.com/Black-Thunder/ioBroker.smartfriends/actions/workflows/test-and-release.yml) [![Reviewdog](https://github.com/Black-Thunder/ioBroker.smartfriends/actions/workflows/code-quality.yml/badge.svg)](https://github.com/Black-Thunder/ioBroker.smartfriends/actions/workflows/code-quality.yml)
-
-## smartfriends adapter for ioBroker
-
-This adapter enables a direct **local integration** of the **SmartFriends Box** (e.g. Smart Friends Box by Schellenberg, ABUS, Paulmann, STEINEL, etc.) into ioBroker – **without using the official cloud**.
-
-The adapter establishes a direct connection to the gateway to control and query devices locally.
-
-## Documentation:
-
-- [English description](https://github.com/Black-Thunder/ioBroker.smartfriends/tree/master/docs/en/smartfriends.md)
-- [Deutsche Beschreibung](https://github.com/Black-Thunder/ioBroker.smartfriends/tree/master/docs/de/smartfriends.md)
-
-## Discussion:
-
-- [ioBroker Forum](https://forum.iobroker.net/topic/83202)
-
-## Changelog
-
-<!--
-	Placeholder for the next version (at the beginning of the line):
-	### __WORK IN PROGRESS__
--->
-
-### 1.0.0 (2025-12-18)
-
-- (Black-Thunder) initial release
-
-## Acknowledgements
-
-Special thanks und credits to [LoPablo](https://github.com/LoPablo/SchellenbergApi) for reverse engineering the API!
-
-## License
-
-MIT License
-
-Copyright (c) 2025 Black-Thunder <glwars@aol.de>
-
-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
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+![Logo](admin/smartfriends.png)
+
+# ioBroker.smartfriends
+
+[![NPM version](http://img.shields.io/npm/v/iobroker.smartfriends.svg)](https://www.npmjs.com/package/iobroker.smartfriends)
+[![Downloads](https://img.shields.io/npm/dm/iobroker.smartfriends.svg)](https://www.npmjs.com/package/iobroker.smartfriends)
+![Number of Installations (latest)](http://iobroker.live/badges/smartfriends-installed.svg)
+![Number of Installations (stable)](http://iobroker.live/badges/smartfriends-stable.svg)
+[![Known Vulnerabilities](https://snyk.io/test/github/Black-Thunder/ioBroker.smartfriends/badge.svg)](https://snyk.io/test/github/Black-Thunder/ioBroker.smartfriends)
+
+[![NPM](https://nodei.co/npm/iobroker.smartfriends.png?downloads=true)](https://nodei.co/npm/iobroker.smartfriends/)
+
+[![Test and Release](https://github.com/Black-Thunder/ioBroker.smartfriends/actions/workflows/test-and-release.yml/badge.svg)](https://github.com/Black-Thunder/ioBroker.smartfriends/actions/workflows/test-and-release.yml) [![Reviewdog](https://github.com/Black-Thunder/ioBroker.smartfriends/actions/workflows/code-quality.yml/badge.svg)](https://github.com/Black-Thunder/ioBroker.smartfriends/actions/workflows/code-quality.yml)
+
+## smartfriends adapter for ioBroker
+
+This adapter enables a direct **local integration** of the **SmartFriends Box** (e.g. Smart Friends Box by Schellenberg, ABUS, Paulmann, STEINEL, etc.) into ioBroker – **without using the official cloud**.
+
+The adapter establishes a direct connection to the gateway to control and query devices locally.
+
+## Documentation:
+
+- [English description](https://github.com/Black-Thunder/ioBroker.smartfriends/tree/master/docs/en/smartfriends.md)
+- [Deutsche Beschreibung](https://github.com/Black-Thunder/ioBroker.smartfriends/tree/master/docs/de/smartfriends.md)
+
+## Discussion:
+
+- [ioBroker Forum](https://forum.iobroker.net/topic/83202)
+
+## Changelog
+
+<!--
+	Placeholder for the next version (at the beginning of the line):
+	### __WORK IN PROGRESS__
+-->
+### 1.1.0-alpha.0 (2025-12-23)
+
+- (Black-Thunder) Refactored device handling: dynamic states, removed type whitelist, grouped devices under master ID
+
+### 1.0.1 (2025-12-20)
+
+- (Black-Thunder) Increased robustness when communicating with the gateway
+- (Black-Thunder) Added new option to ignore certificate errors
+
+### 1.0.0 (2025-12-18)
+
+- (Black-Thunder) initial release
+
+## Acknowledgements
+
+Special thanks und credits to [LoPablo](https://github.com/LoPablo/SchellenbergApi) for reverse engineering the API!
+
+## License
+
+MIT License
+
+Copyright (c) 2025 Black-Thunder <glwars@aol.de>
+
+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
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/io-package.json

@@ -1,8 +1,34 @@
 {
 	"common": {
 		"name": "smartfriends",
-		"version": "1.0.0",
+		"version": "1.1.0-alpha.0",
 		"news": {
+			"1.1.0-alpha.0": {
+				"en": "Refactored device handling: dynamic states, removed type whitelist, grouped devices under master ID",
+				"de": "Überarbeitete Geräteverwaltung: dynamische Zustände, entfernte Typ-Whitelist, gruppierte Geräte unter Master-ID",
+				"ru": "Рефакторированная обработка устройств: динамические состояния, удаленный белый список типов, сгруппированные устройства под идентификатором Master ID",
+				"pt": "Manipulação do dispositivo refatorado: estados dinâmicos, lista branca do tipo removido, dispositivos agrupados sob ID mestre",
+				"nl": "Refactored device handling: dynamische toestanden, verwijderd type whitelist, gegroepeerde apparaten onder master ID",
+				"fr": "Manipulation de l'appareil refacturé : états dynamiques, liste blanche de type enlevé, dispositifs groupés sous Master ID",
+				"it": "Movimentazione del dispositivo refattore: stati dinamici, tipo rimosso whitelist, dispositivi raggruppati sotto master ID",
+				"es": "Manejo de dispositivo refactorizado: estados dinámicos, lista blanca de tipo eliminado, dispositivos agrupados bajo ID maestro",
+				"pl": "Przekształcona obsługa urządzenia: stany dynamiczne, usunięty biały typ, zgrupowane urządzenia pod master ID",
+				"uk": "Рефакторний пристрій обробки: динамічні стани, видалений тип білий список, вбудовані пристрої під магістр ID",
+				"zh-cn": "重构设备处理: 动态状态, 删除类型白名单, 主 ID 下分组设备"
+			},
+			"1.0.1": {
+				"en": "Increased robustness when communicating with the gateway\nAdded new option to ignore certificate errors",
+				"de": "Erhöhte Robustheit bei der Kommunikation mit dem Gateway\nNeue Option hinzugefügt, um Zertifikatsfehler zu ignorieren",
+				"ru": "Повышенная надежность при общении с шлюзом\nДобавлена новая возможность игнорировать ошибки сертификата",
+				"pt": "Maior robustez ao se comunicar com o gateway\nAdicionada nova opção para ignorar erros de certificado",
+				"nl": "Verhoogde robuustheid bij het communiceren met de gateway\nNieuwe optie toegevoegd om certificaatfouten te negeren",
+				"fr": "Une robustesse accrue lors de la communication avec la passerelle\nAjout d'une nouvelle option pour ignorer les erreurs de certificat",
+				"it": "Maggiore robustezza quando si comunica con il gateway\nAggiunta nuova opzione per ignorare gli errori del certificato",
+				"es": "Mayor robustez al comunicarse con la puerta de entrada\nNueva opción para ignorar errores de certificado",
+				"pl": "Większa odporność podczas komunikacji z bramą\nDodano nową opcję do ignorowania błędów certyfikatu",
+				"uk": "Підвищена надійність при спілкуванні з шлюзом\nДодано новий варіант ігнорувати помилки сертифіката",
+				"zh-cn": "与网关沟通时的强度提高\n添加新选项以忽略证书错误"
+			},
 			"1.0.0": {
 				"en": "initial release",
 				"de": "Erstveröffentlichung",

package/lib/SchellenbergBridge.js

@@ -1,25 +1,17 @@
 "use strict";
 
-//--------------------------------------------------
-//Copyright 2020 Pascâl Hartmann
-//See LICENSE File
-//--------------------------------------------------
-//Handles incoming messages from a SmartSocket and
-//emits Events defined in helpers/Events
-//This is an exmaple Class that implements the DataDelegateInterface which is required by the Socket
-//Implement an App in this Fashion
-//--------------------------------------------------
-
 const maxRetries = 3; // number of connection retries when connection was lost
 const reconnectInterval = 10 * 1000; // time (in ms) after which a single new reconnection try should be made
 const retryInterval = 30 * 60 * 1000; // time (in ms) after which new reconnection tries should be made
 
+const commonDefines = require("./helpers/CommonDefines");
 const CommandFactory = require("./comunication/CommandFactory");
 const AllNewDeviceInfos = require("./comunication/comModel/responseBody/AllNewDeviceInfos");
 const JSONResponse = require("./comunication/comModel/JSONResponse");
 const SmartSocketFactory = require("./comunication/SmartSocketFactory");
 const CommonDefines = require("./helpers/CommonDefines");
-const DeviceManager = require("./DeviceManager");
+const DeviceManager = require("./devices/DeviceManager");
+const { SchellenbergMasterDevice } = require("./devices/SchellenbergMasterDevice");
 
 class SchellenbergBridge {
 	constructor(adapter) {
@@ -39,6 +31,7 @@ class SchellenbergBridge {
 		this.retryCounter = 0;
 		this.stopRenewal = false;
 		this.deviceManager = new DeviceManager(this.adapter);
+		this.deviceDefinitions = [];
 	}
 
 	async Connect() {
@@ -72,48 +65,128 @@ class SchellenbergBridge {
 			);
 			const response = await this.socket.sendAndRecieveCommand(command, this.loginResponse.sessionID);
 
-			if (response?.response) {
-				const parsedResponse = AllNewDeviceInfos.default.fromObject(response.response);
-				await this.processAllNewDeviceInfos(parsedResponse);
+			if (!response?.response) {
+				return;
 			}
+
+			const allNewDeviceInfosParsed = AllNewDeviceInfos.default.fromObject(response.response);
+			this.processCompatibilityConfiguration(allNewDeviceInfosParsed);
+			await this.processAllNewDeviceInfos(allNewDeviceInfosParsed);
+			this.processInitialDeviceValues(allNewDeviceInfosParsed);
 		} catch (err) {
 			this.adapter.log.error(`Connection failed: ${err.message}`);
 			this.handleDisconnect();
 		}
 	}
 
+	updateTimestamp(parsed) {
+		if (parsed.currentTimestamp) {
+			this.lastTimestamp = parsed.currentTimestamp;
+			this.adapter.log.debug(`Updated timestamp to ${this.lastTimestamp}`);
+		}
+	}
+
+	processCompatibilityConfiguration(parsed) {
+		if (this.deviceDefinitions?.length) {
+			return;
+		}
+
+		const standards = parsed.newCompatibilityConfiguration?.compatibleRadioStandards ?? [];
+		this.deviceDefinitions = [];
+
+		for (const standard of standards) {
+			for (const def of standard.compatibleDevices ?? []) {
+				if (def.deviceDesignation) {
+					this.deviceDefinitions.push(def);
+				}
+			}
+		}
+
+		this.adapter.log.debug(`Loaded ${this.deviceDefinitions.length} device definitions`);
+	}
+
+	processInitialDeviceValues(parsed) {
+		const values = parsed.newDeviceValues?.values ?? [];
+
+		for (const value of values) {
+			this.handleDeviceValue(value);
+		}
+	}
+
+	handleDeviceValue(deviceValue) {
+		if (!deviceValue || deviceValue.deviceID == null) {
+			this.adapter.log.debug("Invalid device value received, ignoring.");
+			return;
+		}
+
+		this.adapter.log.debug(`Device value update: deviceID=${deviceValue.deviceID}, value=${deviceValue.value}`);
+
+		this.deviceManager.updateDeviceValue(deviceValue);
+	}
+
 	async processAllNewDeviceInfos(response) {
 		try {
-			const newDeviceInfos = response.newDeviceInfos.values;
-			let knownDevices = 0;
+			const deviceInfos = response.newDeviceInfos?.values ?? [];
+			const createdMasters = [];
+
+			// 1️⃣ Child-Devices nach MasterID gruppieren
+			const devicesByMaster = {};
+			for (const device of deviceInfos) {
+				// Definition dynamisch zuweisen
+				device.definition = this.deviceDefinitions.find(d => d.deviceDesignation === device.deviceDesignation);
+				if (!device.definition) {
+					this.adapter.log.debug(
+						`Skipping device ${device.deviceName} (${device.deviceDesignation}) – no definition found`,
+					);
+					continue;
+				}
+
+				const masterId = device.masterDeviceID || device.deviceID;
+				if (!devicesByMaster[masterId]) {
+					devicesByMaster[masterId] = [];
+				}
+				devicesByMaster[masterId].push(device);
+			}
 
-			this.adapter.log.debug(`Received all devices:\r\n${JSON.stringify(newDeviceInfos)}`);
+			// 2️⃣ MasterDevices anlegen
+			for (const [masterId, childDevices] of Object.entries(devicesByMaster)) {
+				const masterName = childDevices[0].masterDeviceName || childDevices[0].deviceName;
+				const masterDevice = new SchellenbergMasterDevice(this.adapter, masterId, masterName, []);
+
+				// 3️⃣ Child-Devices unter Master anlegen
+				for (const child of childDevices) {
+					// Nur Devices mit definierbaren Control-States
+					const hasSwitching = child.definition.deviceType?.switchingValues?.length;
+					const isPosition = child.definition.deviceType?.kind === commonDefines.AdapterStateIDs.Position;
+
+					if (!hasSwitching && !isPosition) {
+						this.adapter.log.debug(
+							`Skipping device ${child.deviceName} (${child.deviceDesignation}) – no definable control states found`,
+						);
+						continue;
+					}
 
-			for (const device of response.newDeviceInfos.values) {
-				if (
-					device.deviceTypClient &&
-					(device.deviceTypClient.includes(CommonDefines.KnownDeviceTypes.AwningEngine.type) ||
-						device.deviceTypClient.includes(CommonDefines.KnownDeviceTypes.RollingShutter.type))
-				) {
-					knownDevices++;
-					await this.deviceManager.createDevice({
-						id: device.deviceID,
-						name: device.deviceName,
-						deviceType: device.deviceTypClient,
-						designation: device.deviceDesignation,
+					const schellenbergDevice = await this.deviceManager.createDevice({
+						id: child.deviceID,
+						name: child.deviceName,
+						deviceType: child.deviceTypClient ?? child.definition.deviceType?.kind ?? "unknown",
+						designation: child.deviceDesignation,
+						definition: child.definition,
+						masterPrefix: `${commonDefines.AdapterDatapointIDs.Devices}.${masterId}`, // States unter Master-Ordner
 					});
-					this.adapter.log.info(
-						`Device created: ${device.deviceName} (Type: ${device.deviceTypClient}, Device ID: ${device.deviceID})`,
-					);
-				} else {
-					this.adapter.log.debug(
-						`Unsupported device type received: ${device.deviceName} (Type: ${device.deviceTypClient}, Device ID: ${device.deviceID}). Ignoring...`,
-					);
+
+					masterDevice.childDevices.push(schellenbergDevice);
+					this.adapter.log.info(`Device created: ${child.deviceName} (ID: ${child.deviceID})`);
+				}
+
+				if (masterDevice.childDevices?.length !== 0) {
+					await masterDevice.createMasterFolder();
+					createdMasters.push(masterDevice);
 				}
 			}
 
 			this.adapter.log.info(
-				`Processed ${newDeviceInfos.length} device(s) and added ${knownDevices} supported device(s). Adapter successfully started.`,
+				`Processed ${deviceInfos.length} device(s), created ${createdMasters.length} master device(s).`,
 			);
 		} catch (error) {
 			this.adapter.log.error(`Error processing devices: ${error.message}`);
@@ -143,76 +216,96 @@ class SchellenbergBridge {
 	}
 
 	handleMessage(data) {
-		if (data) {
-			const parsedResponse = JSONResponse.default.fromJSONString(data);
+		if (!data) {
+			return;
+		}
 
-			if (parsedResponse == null || parsedResponse.responseCode == null) {
-				this.adapter.log.debug("Invalid message received. Skipping...");
-				return;
-			}
+		let parsedResponse;
 
-			this.adapter.log.debug(
-				`Message received: ${parsedResponse.responseMessage} (code: ${parsedResponse.responseCode})`,
+		try {
+			parsedResponse = JSONResponse.default.fromJSONString(data);
+		} catch (e) {
+			this.adapter.log.warn(`Invalid JSON message ignored: ${e.message}`);
+			return;
+		}
+
+		if (parsedResponse == null || parsedResponse.responseCode == null) {
+			this.adapter.log.debug("Invalid message received. Skipping...");
+			return;
+		}
+
+		this.adapter.log.debug(
+			`Message received: ${parsedResponse.responseMessage} (code: ${parsedResponse.responseCode})`,
+		);
+
+		if (parsedResponse.currentTimestamp) {
+			this.adapter.log.debug(`Updated timestamp to ${parsedResponse.currentTimestamp}`);
+			this.lastTimestamp = parsedResponse.currentTimestamp;
+		}
+
+		this.handleResponseCode(parsedResponse);
+	}
+
+	handleResponseCode(parsedResponse) {
+		// Map mit allen Response-Code-Handlern
+		const responseHandlers = {
+			[-1]: r => this.rejectNextPromise(r),
+			[1]: r => {
+				this.retryCounter = 0;
+				this.resolveNextPromise(r);
+			},
+			[2]: r => this.handleUpdate(r),
+			[5]: r => this.handleSpecificResponseCode(r, 5),
+			[84]: _r => this.reconnectWithWarn("TLS/SSL connection to the gateway has been closed."),
+			[91]: _r => this.reconnectWithWarn("Connection to the gateway timed out."),
+			[4]: _r => {}, // Ignored (newCConfig)
+			[7]: _r => {}, // Ignored (newLicense)
+			[8]: _r => {}, // Ignored as it's just an empty message after disconnect because of responseCode=5
+			[15]: _r => {}, // Ignored (showModuleInfo)
+			[16]: _r => {}, // Ignored ('Die Smart Friends Box kann sich mit dem RemoteHome Server nicht verbinden. Überprüfen Sie bitte, ob die Smart Friends Box mit dem Internet verbunden ist.')
+			[20]: _r => {}, // Ignored as it's just an empty message after successful login (message: 'loginFinished')
+			[87]: _r => {}, // Ignored as it's just an empty message after successful login (message: 'loginFinished')
+			[203]: _r => {}, // Ignored time-outs ('Connection timed out')
+		};
+
+		const handler = responseHandlers[parsedResponse.responseCode];
+		if (handler) {
+			handler(parsedResponse);
+		} else {
+			this.adapter.log.error(
+				`Unknown message response code: ${parsedResponse.responseCode} (message: '${parsedResponse.responseMessage}') - Please report this to the developer!`,
 			);
+		}
+	}
 
-			if (parsedResponse.currentTimestamp) {
-				this.adapter.log.debug(`Updated timestamp to ${parsedResponse.currentTimestamp}`);
-				this.lastTimestamp = parsedResponse.currentTimestamp;
-			}
+	handleSpecificResponseCode(parsedResponse, codeNumber) {
+		switch (codeNumber) {
+			case 5: {
+				// Ignore warnings when licenses are expiring soon and update messages
+				const message = String(parsedResponse.responseMessage || "").toLowerCase();
+				const isInformationalPopup = message.includes("folgende lizenzen") || message.includes("update");
 
-			switch (parsedResponse.responseCode) {
-				case -1:
-					this.rejectNextPromise(parsedResponse);
-					break;
-				case 1:
-					this.retryCounter = 0;
-					this.resolveNextPromise(parsedResponse);
-					break;
-				case 2:
-					this.handleUpdate(parsedResponse);
-					break;
-				// Message boxes and disconnections because of multiple login attempts
-				case 5:
-					// Ignore warnings when licenses are expiring soon and update messages
-					if (
-						parsedResponse.responseMessage.toLowerCase().includes("folgende lizenzen") ||
-						parsedResponse.responseMessage.toLowerCase().includes("update")
-					) {
-						break;
-					}
+				if (isInformationalPopup) {
+					return;
+				}
 
-					// Disconnect because of login
-					this.adapter.log.warn(
-						"Connection was closed, because credentials were used to login on a different device or the official app.",
-					);
-					this.reconnect();
-					break;
-				case 84:
-					this.adapter.log.warn("The TLS/SSL connection to the gateway has been closed.");
-					this.reconnect();
-					break;
-				case 91:
-					this.adapter.log.warn("Connection to the gateway timed out.");
-					this.reconnect();
-					break;
-				case 4: // Ignore (newCConfig)
-				case 7: // Ignore (newLicense)
-				case 8: // Ignore as it's just an empty message after disconnect because of responseCode=5
-				case 15: // Ignore (showModuleInfo)
-				case 16: // Ignore ('Die Smart Friends Box kann sich mit dem RemoteHome Server nicht verbinden. Überprüfen Sie bitte, ob die Smart Friends Box mit dem Internet verbunden ist.')
-				case 20: // Ignore as it's just an empty message after successful login (message: 'loginFinished')
-				case 87: // Ignore as it's just an empty message after successful login (message: 'loginFinished')
-				case 203: // Ignore time-outs ('Connection timed out')
-					break;
-				default:
-					this.adapter.log.error(
-						`Unknown message response code: ${parsedResponse.responseCode} (message: '${parsedResponse.responseMessage}') - Please report this to the developer!`,
-					);
-					break;
+				// Disconnect because of login
+				this.adapter.log.warn(
+					"Connection was closed, because credentials were used to login on a different device or the official app.",
+				);
+				this.reconnect();
+				break;
 			}
+			default:
+				break;
 		}
 	}
 
+	reconnectWithWarn(message) {
+		this.adapter.log.warn(message);
+		this.reconnect();
+	}
+
 	reconnect() {
 		this.adapter.setAdapterConnectionState(false);
 
@@ -252,7 +345,7 @@ class SchellenbergBridge {
 
 	async handleLoginMessage(response) {
 		if (response.sessionID && response.hardware && response.macAddress && response.shsVersion) {
-			this.adapter.log.debug("Connection and login to gateway successful.");
+			this.adapter.log.debug(`Connection and login to gateway ${response.hardware} successful.`);
 			this.loginResponse = response;
 			this.retryCounter = 0;
 
@@ -289,14 +382,17 @@ class SchellenbergBridge {
 	}
 
 	handleUpdate(response) {
-		if (response.responseMessage) {
-			switch (response.responseMessage) {
-				case "newDeviceValue":
-					break;
-				case "newDeviceInfo":
-					break;
-				default:
-					break;
+		// new device values
+		if (response.newDeviceValues?.values?.length) {
+			for (const value of response.newDeviceValues.values) {
+				this.handleDeviceValue(value);
+			}
+		}
+
+		// new device infos (optional, für später)
+		if (response.newDeviceInfos?.values?.length) {
+			for (const device of response.newDeviceInfos.values) {
+				this.adapter.log.debug(`New device info received for deviceID=${device.deviceID}`);
 			}
 		}
 	}

package/lib/comunication/comModel/JSONResponse.js

@@ -30,14 +30,11 @@ class JSONResponse {
 		}
 
 		// e.g.: { "currentTimestamp" : 20201210140021, "response" : { "remoteHomeActivated" : true, "remoteHomeStatus" : "notConnected" }, "responseCode" : 1, "responseMessage" : "success" }
-		return new JSONResponse(
-			JSONHelper.default.stringToDate(
-				object.currentTimestamp ? object.currentTimestamp : object.response.currentTimestamp,
-			),
-			object.response,
-			object.responseCode,
-			object.responseMessage,
-		);
+		// also different formats possible, e.g.: { "programmingProcess" : { "context" : "system-update", "items" : [ { "button" : { "kind" : "OK_BUTTON", "requestID" : 12, "text" : "Ja" } }, { "button" : { "kind" : "CANCEL_BUTTON", "requestID" : -4, "text" : "Nein" } } ], "nextCommand" : "changeServerSettings", "target" : "ServerSettingsHandler", "text" : "Die verwendeten App erfordert eine neuere Version der Zentrale.\n\nBitte installieren sie umgehend das neueste Update\nSoll nach updates gesucht werden?", "title" : "${Note}" }, "responseCode" : 6 }
+		const timestampRaw = object?.currentTimestamp ?? object?.response?.currentTimestamp ?? null;
+		const timestamp = timestampRaw ? JSONHelper.default.stringToDate(timestampRaw) : null;
+
+		return new JSONResponse(timestamp, object.response, object.responseCode, object.responseMessage);
 	}
 }
 exports.default = JSONResponse;