iobroker.smartfriends 1.2.0-alpha.0 → 1.2.0

package/README.md

@@ -33,8 +33,10 @@ 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.2.0-alpha.0 (2026-01-02)
+### 1.2.0 (2026-01-09)
 
+- (Black-Thunder) Timeout for initial device request was increased
+- (Black-Thunder) Devices without defined device type are ignored
 - (Black-Thunder) Refactored device handling and added support for further device types
 
 ### 1.1.0 (2025-12-28)

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "smartfriends",
-    "version": "1.2.0-alpha.0",
+    "version": "1.2.0",
     "news": {
+      "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\nRefactored Device Handling und zusätzliche Unterstützung für weitere Gerätetypen",
+        "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对设备类型进行重构处理并添加支持"
+      },
+      "1.2.0-alpha.1": {
+        "en": "Timeout for initial device request was increased\nDevices without defined device type are ignored",
+        "de": "Timeout für erste Geräteanfrage wurde erhöht\nGeräte ohne definierten Gerätetyp werden ignoriert",
+        "ru": "Время ожидания первоначального запроса устройства было увеличено\nУстройства без определенного типа устройства игнорируются",
+        "pt": "O tempo limite para a solicitação inicial do dispositivo foi aumentado\nOs dispositivos sem tipo de dispositivo definido são ignorados",
+        "nl": "Tijdslimiet voor het eerste apparaatverzoek werd verhoogd\nApparaten zonder gedefinieerd apparaattype worden genegeerd",
+        "fr": "Le délai pour la demande initiale d'appareil a été augmenté\nLes dispositifs sans type défini sont ignorés",
+        "it": "Timeout per la richiesta iniziale del dispositivo è stato aumentato\nI dispositivi senza tipo di dispositivo definito vengono ignorati",
+        "es": "Se aumentó el tiempo para la solicitud inicial del dispositivo\nLos dispositivos sin tipo de dispositivo definido son ignorados",
+        "pl": "Zwiększono czas na początkowe żądanie urządzenia\nUrządzenia bez określonego typu urządzenia są ignorowane",
+        "uk": "Підвищено запит на початковий пристрій\nПристрої без визначеного типу пристрою ігноруються",
+        "zh-cn": "初始设备请求的超时增加\n没有定义设备类型的设备会被忽略"
+      },
       "1.2.0-alpha.0": {
         "en": "Refactored device handling and added support for further device types",
         "de": "Refactored Device Handling und zusätzliche Unterstützung für weitere Gerätetypen",
@@ -67,19 +93,6 @@
         "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",
-        "ru": "Начальная версия",
-        "pt": "lançamento inicial",
-        "nl": "Eerste uitgave",
-        "fr": "Première version",
-        "it": "Versione iniziale",
-        "es": "Versión inicial",
-        "pl": "Pierwsze wydanie",
-        "zh-cn": "首次出版",
-        "uk": "початковий випуск"
       }
     },
     "titleLang": {

package/lib/SchellenbergBridge.js

@@ -64,7 +64,7 @@ class SchellenbergBridge {
 				this.compatibilityConfigurationVersion,
 				this.languageTranslationVersion,
 			);
-			const response = await this.socket.sendAndRecieveCommand(command, this.loginResponse.sessionID);
+			const response = await this.socket.sendAndReceiveCommand(command, this.loginResponse.sessionID);
 
 			if (!response?.response) {
 				return;
@@ -180,16 +180,20 @@ class SchellenbergBridge {
 				// 3️⃣ Child-Devices unter Master anlegen
 				for (const child of childDevices) {
 					// Nur Devices mit definierbaren States
-					const capabilities = getDeviceCapabilities(child.definition);
 					this.adapter.log.debug(
-						`Device ${child.deviceID}: kind=${child.definition.deviceType.kind}, capabilities=${JSON.stringify(capabilities)}`,
+						`Getting device capabilites from definition: ${JSON.stringify(child.definition)}`,
 					);
+					const capabilities = getDeviceCapabilities(child.definition);
 
 					if (!capabilities.shouldBeCreated) {
 						this.adapter.log.debug(
 							`Skipping device ${child.deviceName} (${child.deviceDesignation}) – no definable states found`,
 						);
 						continue;
+					} else {
+						this.adapter.log.debug(
+							`Device ${child.deviceID}: kind=${child.definition.deviceType.kind}, capabilities=${JSON.stringify(capabilities)}`,
+						);
 					}
 
 					const schellenbergDevice = await this.deviceManager.createDevice({
@@ -397,7 +401,7 @@ class SchellenbergBridge {
 
 	sendAndReceiveCommand(command) {
 		if (this.socket && this.loginResponse && this.loginResponse.sessionID) {
-			return this.socket.sendAndRecieveCommand(command, this.loginResponse.sessionID);
+			return this.socket.sendAndReceiveCommand(command, this.loginResponse.sessionID);
 		}
 
 		this.adapter.log.error("Login to the gateway was not successful yet. Ignoring command.");

package/lib/comunication/CommandFactory.js

@@ -70,7 +70,7 @@ exports.LoginCommand = LoginCommand;
 
 class allNewInfoCommand extends JSONCommand.default {
 	constructor(timestamp, compatibilityConfigurationVersion, languageTranslationVersion) {
-		super("getAllNewInfos");
+		super("getAllNewInfos", 15000); // higher timeout as this command might take longer to receive a response
 		this.timestamp = timestamp;
 		this.compatibilityConfigurationVersion = compatibilityConfigurationVersion;
 		this.languageTranslationVersion = languageTranslationVersion;

package/lib/comunication/SmartSocket.js

@@ -169,16 +169,24 @@ class SmartSocket {
 	//sends command and waits for receive in the promise queue of the message handler
 	//don't know if the output socket of the gateway is in-order, so maybe there needs
 	//to be some checking
-	sendAndRecieveCommand(command, sessionkey) {
-		const localPromise = new Deferred.default(this.adapter, (resolve, reject) => {
-			if (this.internalSocket && command) {
-				this.adapter.log.debug(`Send and receive JSON: ${command.toString(sessionkey)}`);
-				this.internalSocket.write(command.toString(sessionkey));
-				this.internalSocket.write("\n");
-			} else {
-				reject();
-			}
-		});
+	sendAndReceiveCommand(command, sessionkey) {
+		const timeout = command.timeout ?? 5000; // default timeout is 5 sec
+
+		const localPromise = new Deferred.default(
+			this.adapter,
+			(resolve, reject) => {
+				if (this.internalSocket && command) {
+					this.adapter.log.debug(
+						`Send and receive JSON (timeout: ${timeout}ms): ${command.toString(sessionkey)}`,
+					);
+					this.internalSocket.write(command.toString(sessionkey));
+					this.internalSocket.write("\n");
+				} else {
+					reject();
+				}
+			},
+			timeout,
+		);
 		if (this.dataDelegate) {
 			this.dataDelegate.queueUpPromise(localPromise);
 		}

package/lib/comunication/SmartSocketFactory.js

@@ -35,7 +35,7 @@ class SmartSocketFactory {
 					.then(socket => {
 						if (socket) {
 							socket
-								.sendAndRecieveCommand(CommandFactory.default.createHeloCmd(username))
+								.sendAndReceiveCommand(CommandFactory.default.createHeloCmd(username))
 								.then(responseHelo => {
 									if (responseHelo.response) {
 										const parsedResponseHelo = HeloResponse.default.fromObject(
@@ -52,7 +52,7 @@ class SmartSocketFactory {
 												parsedResponseHelo.sessionSalt,
 											);
 											socket
-												.sendAndRecieveCommand(
+												.sendAndReceiveCommand(
 													CommandFactory.default.createLoginCommand(
 														username,
 														digest,

package/lib/comunication/comModel/JSONCommand.js

@@ -8,13 +8,16 @@
 //--------------------------------------------------
 
 class JSONCommand {
-	constructor(method) {
+	constructor(method, timeoutMs = 5000) {
 		this.command = method;
+		this.timeout = timeoutMs;
 	}
+
 	toString(sessionID) {
 		if (sessionID) {
 			this.sessionID = sessionID;
 		}
+
 		return JSON.stringify(this);
 	}
 }

package/lib/devices/DeviceKindCapabilities.js

@@ -6,6 +6,18 @@ const { LevelKinds, SensorKinds, AlarmKinds } = require("./DeviceCapabilityRegis
  * Resolves capabilities from a SmartFriends device definition
  */
 function getDeviceCapabilities(definition) {
+	if (!definition?.deviceType) {
+		return {
+			shouldBeCreated: false,
+			hasWritableStates: false,
+			hasSwitchingValues: false,
+			hasLevel: false,
+			hasSensor: false,
+			hasAlarm: false,
+			configObj: null,
+		};
+	}
+
 	const deviceType = definition?.deviceType ?? {};
 	const kind = deviceType.kind ?? "unknown";
 	const deviceDesignation = definition?.deviceDesignation?.replace(/\${|}/g, "") ?? kind;

package/lib/helpers/Deferred.js

@@ -10,30 +10,38 @@
 //--------------------------------------------------
 
 class Deferred {
-	constructor(adapter, executor) {
+	constructor(adapter, executor, timeoutMs = 5000) {
 		this.adapter = adapter;
+
 		this.timeout = this.adapter.setTimeout(() => {
 			this.reject("timeout");
-		}, 5000);
+		}, timeoutMs);
+
 		this.promise = new Promise((resolve, reject) => {
 			this._resolveSelf = resolve;
 			this._rejectSelf = reject;
 		});
+
 		executor.call(this, this._resolveSelf, this._rejectSelf);
 	}
+
 	then(onfulfilled, onrejected) {
 		return this.promise.then(onfulfilled, onrejected);
 	}
+
 	catch(onrejected) {
 		return this.promise.then(onrejected);
 	}
+
 	finally(onfinally) {
 		return this.promise.finally(onfinally);
 	}
+
 	resolve(val) {
 		this.adapter.clearTimeout(this.timeout);
 		this._resolveSelf(val);
 	}
+
 	reject(reason) {
 		this.adapter.clearTimeout(this.timeout);
 		this._rejectSelf(reason);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.smartfriends",
-  "version": "1.2.0-alpha.0",
+  "version": "1.2.0",
   "description": "smartfriends",
   "author": {
     "name": "Black-Thunder",