iobroker.smartfriends 1.3.5 → 1.3.6-alpha.1

package/README.md

@@ -33,6 +33,11 @@ The adapter establishes a direct connection to the gateway to control and query
 	Placeholder for the next version (at the beginning of the line):
 	### __WORK IN PROGRESS__
 -->
+### 1.3.6-alpha.1 (2026-03-02)
+
+- (Black-Thunder) Connection and reconnection logic to the gateway was refactored
+- (Black-Thunder) Adapter requires admin version >=7.6.20 now
+
 ### 1.3.5 (2026-02-24)
 
 - (Black-Thunder) Additional logging when connection parameters are incorrect was added

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "smartfriends",
-    "version": "1.3.5",
+    "version": "1.3.6-alpha.1",
     "news": {
+      "1.3.6-alpha.1": {
+        "en": "Connection and reconnection logic to the gateway was refactored\nAdapter requires admin version >=7.6.20 now",
+        "de": "Verbindungs- und Wiederverbindungslogik zum Gateway wurde überarbeitet\nAdapter erfordert nun Admin-Version >=7.6.20",
+        "ru": "Логика подключения и переподключения к шлюзу была рефакторирована\nАдаптер требует админ версии >=7.6.20",
+        "pt": "A lógica de conexão e reconexão ao gateway foi refactorada\nAdaptador requer versão de administrador >= 7.6.20 agora",
+        "nl": "Verbinding en herverbinding logica met de gateway werd gerefactored\nAdapter vereist admin-versie < 7.6.20 nu",
+        "fr": "La logique de connexion et de reconnection à la passerelle a été remaniée\nAdaptateur nécessite une version admin >=7.6.20 maintenant",
+        "it": "La logica di connessione e di riconnessione al gateway è stata rifatto\nL'adattatore richiede la versione di amministratore >=7.6.20 ora",
+        "es": "La lógica de conexión y reconexión a la puerta de entrada fue refactorizada\nAdaptador requiere la versión de administración",
+        "pl": "Połączenie i ponowne podłączenie logiki do bramy zostało zrefakturowane\nAdapter wymaga wersji admin > = 7.6.20",
+        "uk": "З'єднання і відключення логіки до шлюзу було рефакторовано\nАдаптер вимагає адмін версії >=7.6.20 тепер",
+        "zh-cn": "连接和重新连接到网关的逻辑被重构\n适配器需要管理员版本 \\\\ 7.6.20 现在"
+      },
+      "1.3.6-alpha.0": {
+        "en": "Connection and reconnection logic to the gateway was refactored",
+        "de": "Verbindungs- und Wiederverbindungslogik zum Gateway wurde überarbeitet",
+        "ru": "Логика подключения и переподключения к шлюзу была рефакторирована",
+        "pt": "A lógica de conexão e reconexão ao gateway foi refactorada",
+        "nl": "Verbinding en herverbinding logica met de gateway werd gerefactored",
+        "fr": "La logique de connexion et de reconnection à la passerelle a été remaniée",
+        "it": "La logica di connessione e di riconnessione al gateway è stata rifatto",
+        "es": "La lógica de conexión y reconexión a la puerta de entrada fue refactorizada",
+        "pl": "Połączenie i ponowne podłączenie logiki do bramy zostało zrefakturowane",
+        "uk": "З'єднання і відключення логіки до шлюзу було рефакторовано",
+        "zh-cn": "连接和重新连接到网关的逻辑被重构"
+      },
       "1.3.5": {
         "en": "Additional logging when connection parameters are incorrect was added\nValidation of the adapter configuration in the GUI was added",
         "de": "Zusätzliche Protokollierung eingefügt, wenn Verbindungsparameter inkorrekt sind\nValidierung der Adapterkonfiguration in der GUI wurde hinzugefügt",
@@ -67,32 +93,6 @@
         "pl": "Zaktualizowano uzależnienia",
         "uk": "Залежність оновлено",
         "zh-cn": "附属关系得到更新"
-      },
-      "1.3.0": {
-        "en": "Support for further device types was added\nUmlauts in device names are now correctly parsed",
-        "de": "Unterstützung für weitere Gerätetypen wurde hinzugefügt\nUmlaute in Gerätenamen werden nun korrekt dargestellt",
-        "ru": "Добавлена поддержка дополнительных типов устройств\nУмлауты в названиях устройств теперь правильно разобраны",
-        "pt": "Foi adicionado suporte para outros tipos de dispositivos\nUmlauts em nomes de dispositivos agora são corretamente analisados",
-        "nl": "Ondersteuning voor andere apparaattypes is toegevoegd\nUmlauts in apparaatnamen zijn nu correct ontleed",
-        "fr": "Un soutien pour d'autres types d'appareils a été ajouté\nUmlauts dans les noms de périphériques sont maintenant correctement analysés",
-        "it": "È stato aggiunto il supporto per ulteriori tipi di dispositivo\nI nomi dei dispositivi sono ora correttamente analizzati",
-        "es": "Se agregó soporte para nuevos tipos de dispositivos\nUmlauts en los nombres de los dispositivos ahora se analizan correctamente",
-        "pl": "Dodano wsparcie dla innych typów urządzeń\nKlauty w nazwach urządzeń są teraz poprawnie przefiltrowane",
-        "uk": "Додана підтримка подальших типів пристроїв\nУмлаути в назвах пристроїв тепер правильно припаровані",
-        "zh-cn": "添加了对更多设备类型的支持\n设备名称中的 Umlaut 现已正确解析"
-      },
-      "1.2.0": {
-        "en": "Timeout for initial device request was increased\nDevices without defined device type are ignored\nRefactored device handling and added support for further device types",
-        "de": "Timeout für erste Geräteanfrage wurde erhöht\nGeräte ohne definierten Gerätetyp werden ignoriert\nVerarbeitung der Geräte wurde überarbeitet und Unterstützung für weitere Gerätetypen hinzugefügt",
-        "ru": "Время ожидания первоначального запроса устройства было увеличено\nУстройства без определенного типа устройства игнорируются\nРефакторированная обработка устройств и дополнительная поддержка для других типов устройств",
-        "pt": "O tempo limite para a solicitação inicial do dispositivo foi aumentado\nOs dispositivos sem tipo de dispositivo definido são ignorados\nManipulação do dispositivo refatorizado e suporte adicional para outros tipos de dispositivo",
-        "nl": "Tijdslimiet voor het eerste apparaatverzoek werd verhoogd\nApparaten zonder gedefinieerd apparaattype worden genegeerd\nRefactored device handling en toegevoegde ondersteuning voor andere apparaattypes",
-        "fr": "Le délai pour la demande initiale d'appareil a été augmenté\nLes dispositifs sans type défini sont ignorés\nManipulation de l'appareil refactoré et support supplémentaire pour d'autres types d'appareil",
-        "it": "Timeout per la richiesta iniziale del dispositivo è stato aumentato\nI dispositivi senza tipo di dispositivo definito vengono ignorati\nGestione del dispositivo e supporto aggiunto per ulteriori tipi di dispositivo",
-        "es": "Se aumentó el tiempo para la solicitud inicial del dispositivo\nLos dispositivos sin tipo de dispositivo definido son ignorados\nManejo de dispositivo refactorizado y soporte añadido para nuevos tipos de dispositivos",
-        "pl": "Zwiększono czas na początkowe żądanie urządzenia\nUrządzenia bez określonego typu urządzenia są ignorowane\nZmieniona obsługa urządzenia i dodana obsługa dla innych typów urządzeń",
-        "uk": "Підвищено запит на початковий пристрій\nПристрої без визначеного типу пристрою ігноруються\nРефакторний пристрій обробки та додано підтримку для подальших типів пристроїв",
-        "zh-cn": "初始设备请求的超时增加\n没有定义设备类型的设备会被忽略\n对设备类型进行重构处理并添加支持"
       }
     },
     "titleLang": {
@@ -154,7 +154,7 @@
     ],
     "globalDependencies": [
       {
-        "admin": ">=7.6.17"
+        "admin": ">=7.6.20"
       }
     ],
     "tier": 2

package/lib/SchellenbergBridge.js

@@ -30,12 +30,17 @@ class SchellenbergBridge {
 		this.compatibilityConfigurationVersion = "0";
 		this.languageTranslationVersion = "0";
 		this.retryCounter = 0;
-		this.stopRenewal = false;
 		this.deviceManager = new DeviceManager(this.adapter);
 		this.deviceDefinitions = [];
+		this.connectionStatus = commonDefines.ConnectionStatus.IDLE;
 	}
 
 	async Connect() {
+		if (this.connectionStatus === commonDefines.ConnectionStatus.CONNECTING) {
+			return;
+		}
+		this.connectionStatus = commonDefines.ConnectionStatus.CONNECTING;
+
 		try {
 			const socket = await SmartSocketFactory.default.createSocketAndLogin(
 				this.adapter,
@@ -56,9 +61,11 @@ class SchellenbergBridge {
 				throw new Error("Invalid socket or login response");
 			}
 
+			this.retryCounter = 0;
+			this.connectionStatus = commonDefines.ConnectionStatus.CONNECTED;
 			this.adapter.setAdapterConnectionState(true);
-			this.adapter.log.info("Querying all devices...");
 
+			this.adapter.log.info("Connected successfully. Querying all devices...");
 			const command = CommandFactory.default.createAllNewInfoCmd(
 				this.lastTimestamp,
 				this.compatibilityConfigurationVersion,
@@ -77,7 +84,10 @@ class SchellenbergBridge {
 		} catch (err) {
 			const msg = err?.responseMessage || err.message || JSON.stringify(err);
 			this.adapter.log.error(`Connection failed: ${msg}`);
-			this.handleDisconnect();
+
+			this.connectionStatus = commonDefines.ConnectionStatus.IDLE;
+
+			this.scheduleReconnect();
 		}
 	}
 
@@ -127,7 +137,7 @@ class SchellenbergBridge {
 	}
 
 	handleDeviceInfo(deviceInfo) {
-		if (!deviceInfo || deviceInfo.deviceName || !deviceInfo.deviceDesignation) {
+		if (!deviceInfo || !deviceInfo.deviceName || !deviceInfo.deviceDesignation) {
 			this.adapter.log.debug("Invalid device info received, ignoring.");
 			return;
 		}
@@ -228,18 +238,38 @@ class SchellenbergBridge {
 		}
 	}
 
-	handleDisconnect() {
+	handleDisconnect(manual = false) {
+		if (
+			this.connectionStatus === commonDefines.ConnectionStatus.WAITING_RETRY ||
+			this.connectionStatus === commonDefines.ConnectionStatus.CONNECTING
+		) {
+			return;
+		}
+
+		this.adapter.log.debug("handleDisconnect() was called. Rejecting all queued promises and stopping keep alive.");
 		this.adapter.setAdapterConnectionState(false);
-		this.adapter.log.debug("Handle Disconnect was called. Rejecting all queued promises and stopping keep alive.");
+		this.connectionStatus = commonDefines.ConnectionStatus.IDLE;
+
 		this.promiseQueue.forEach(entry => {
-			entry.reject("Socket disconnected");
+			entry.reject(new Error("Socket disconnected"));
 		});
+		this.promiseQueue = [];
 
-		this.stopRenewal = true;
 		if (this.socket) {
 			this.socket.stopKeepAlive();
 			this.socket = null;
 		}
+
+		if (this.reconnectTimer) {
+			this.adapter.clearTimeout(this.reconnectTimer);
+			this.reconnectTimer = null;
+		}
+
+		this.loginResponse = null;
+
+		if (!manual) {
+			this.scheduleReconnect();
+		}
 	}
 
 	handleMessage(data) {
@@ -273,7 +303,6 @@ class SchellenbergBridge {
 		const responseHandlers = {
 			[-1]: r => this.handleErrorResponse(r),
 			[1]: r => {
-				this.retryCounter = 0;
 				this.resolveNextPromise(r);
 				this.updateTimestamp(r);
 			},
@@ -322,7 +351,7 @@ class SchellenbergBridge {
 					"Connection was closed, because credentials were used to login on a different device or the official app.",
 				);
 
-				this.reconnect();
+				this.scheduleReconnect();
 				break;
 			}
 			default:
@@ -360,22 +389,36 @@ class SchellenbergBridge {
 
 	reconnectWithWarn(message) {
 		this.adapter.log.warn(message);
-		this.reconnect();
+		this.handleDisconnect();
 	}
 
-	reconnect() {
-		this.adapter.setAdapterConnectionState(false);
+	scheduleReconnect() {
+		if (this.connectionStatus === commonDefines.ConnectionStatus.WAITING_RETRY) {
+			return;
+		}
+
+		const delay = this.retryCounter < maxRetries ? reconnectInterval : retryInterval;
 
 		if (this.retryCounter < maxRetries) {
 			this.retryCounter++;
-			this.adapter.log.warn(`Reconnecting (try ${this.retryCounter} of ${maxRetries})...`);
-			this.adapter.setTimeout(() => this.Connect(), reconnectInterval);
-		} else {
-			this.adapter.log.warn(
-				`Connection to gateway lost, connection temporarily disabled! Trying again in ${retryInterval / (60 * 1000)} minutes.`,
-			);
-			this.adapter.setTimeout(() => this.Connect(), retryInterval);
 		}
+
+		this.connectionStatus = commonDefines.ConnectionStatus.WAITING_RETRY;
+
+		this.adapter.log.warn(
+			this.retryCounter <= maxRetries
+				? `Reconnecting (try ${this.retryCounter} of ${maxRetries})...`
+				: `Gateway offline. Retrying in ${delay / 60000} minutes.`,
+		);
+
+		if (this.reconnectTimer) {
+			this.adapter.clearTimeout(this.reconnectTimer);
+		}
+
+		this.reconnectTimer = this.adapter.setTimeout(() => {
+			this.reconnectTimer = null;
+			this.Connect();
+		}, delay);
 	}
 
 	queueUpPromise(promise) {
@@ -449,16 +492,5 @@ class SchellenbergBridge {
 			}
 		}
 	}
-
-	renewSocket(reason) {
-		if (this.stopRenewal) {
-			return;
-		}
-
-		this.adapter.log.warn(`Socket renewal was requested with reason: ${reason}`);
-		this.adapter.setTimeout(() => {
-			this.Connect();
-		}, 1000);
-	}
 }
 exports.SchellenbergBridge = SchellenbergBridge;

package/lib/comunication/SmartSocket.js

@@ -109,20 +109,17 @@ class SmartSocket {
 				}
 			});
 			this.internalSocket.on("timeout", () => {
-				this.adapter.log.warn("Socket timed out");
-				this.adapter.setTimeout(() => {
-					if (this.dataDelegate) {
-						this.dataDelegate.renewSocket("Timeout");
-					}
-				}, 1000);
+				this.adapter.log.warn("Socket timeout (no activity).");
+
+				// Nur Keepalive schicken statt reconnect
+				if (this.dataDelegate && this.dataDelegate.sendCommand) {
+					this.adapter.log.debug("Sending keepalive due to socket timeout.");
+					this.dataDelegate.sendCommand(CommandFactory.default.createKeepAliveCmd());
+				}
 			});
 			this.internalSocket.on("end", () => {
+				// just log end event, as close event will be triggered afterwards and handle the disconnect
 				this.adapter.log.warn("Socket ended");
-				setImmediate(() => {
-					if (this.dataDelegate) {
-						this.dataDelegate.handleDisconnect();
-					}
-				});
 			});
 			this.internalSocket.on("close", () => {
 				this.adapter.log.warn("Socket closed");

package/lib/devices/DeviceManager.js

@@ -106,7 +106,9 @@ class DeviceManager {
 
 			await this.adapter.setStateAsync(id, false, true);
 		} catch (error) {
-			this.log.error(`Error in handleStateChange: ${error.responseMessage}`);
+			this.log.error(
+				`Error in handleStateChange(id=${id}, state=${JSON.stringify(state)}): ${error?.message || JSON.stringify(error)}`,
+			);
 		}
 	}
 
@@ -120,7 +122,9 @@ class DeviceManager {
 
 			await this.bridge.sendAndReceiveCommand(commandFactory.default.createSetDeviceValueCmd(deviceId, value));
 		} catch (error) {
-			this.log.error(`Error in sendDeviceCommand: ${error.responseMessage}`);
+			this.log.error(
+				`Error in sendDeviceCommand(deviceId=${deviceId}, value=${value}): ${error?.message || JSON.stringify(error)}`,
+			);
 			throw error;
 		}
 	}

package/lib/helpers/CommonDefines.js

@@ -20,3 +20,10 @@ exports.AdapterStateIDs = Object.freeze({
 	// devices.XXX.control
 	Position: "position",
 });
+
+exports.ConnectionStatus = {
+	IDLE: "idle",
+	CONNECTING: "connecting",
+	CONNECTED: "connected",
+	WAITING_RETRY: "waiting_retry",
+};

package/main.js

@@ -223,7 +223,7 @@ class Smartfriends extends utils.Adapter {
 	onUnload(callback) {
 		try {
 			if (SchellenbergBridge != null) {
-				SchellenbergBridge.handleDisconnect();
+				SchellenbergBridge.handleDisconnect(true);
 			}
 
 			this.setAdapterConnectionState(false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.smartfriends",
-  "version": "1.3.5",
+  "version": "1.3.6-alpha.1",
   "description": "smartfriends",
   "author": {
     "name": "Black-Thunder",
@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@alcalzone/release-script": "^5.1.1",
-    "@alcalzone/release-script-plugin-iobroker": "^5.1.1",
+    "@alcalzone/release-script-plugin-iobroker": "^5.1.2",
     "@alcalzone/release-script-plugin-license": "^5.1.1",
     "@alcalzone/release-script-plugin-manual-review": "^5.1.1",
     "@iobroker/adapter-dev": "^1.5.0",