iobroker.smartfriends 1.2.0 → 1.3.0-alpha.0

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.0-alpha.0 (2026-01-10)
+
+- (Black-Thunder) Support for further device types was added
+- (Black-Thunder) Umlauts in device names are now correctly parsed
+
 ### 1.2.0 (2026-01-09)
 
 - (Black-Thunder) Timeout for initial device request was increased

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "smartfriends",
-    "version": "1.2.0",
+    "version": "1.3.0-alpha.0",
     "news": {
+      "1.3.0-alpha.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\nRefactored Device Handling und zusätzliche Unterstützung für weitere Gerätetypen",
@@ -80,19 +93,6 @@
         "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添加新选项以忽略证书错误"
       }
     },
     "titleLang": {

package/lib/devices/DeviceCapabilityRegistry.js

@@ -29,13 +29,21 @@ const LevelKinds = {
  */
 const SensorKinds = {
 	thermometer: {
-		role: "level.temperature",
+		role: "value.temperature",
 		desc: "Measured temperature",
 		unit: "°C",
 		defaultMin: -90,
 		defaultMax: 60,
 		defaultStep: 0.5,
 	},
+	luminanceDetector: {
+		role: "value.brightness ",
+		desc: "Measured brightness",
+		unit: "lux",
+		defaultMin: 0,
+		defaultMax: 150000,
+		defaultStep: 1,
+	},
 	volume: {
 		role: "value.rain",
 		desc: "Measured rain volume",
@@ -44,8 +52,18 @@ const SensorKinds = {
 		defaultMax: 350,
 		defaultStep: 1,
 	},
-	// generic sensor kind for different types of weather sensors (e.g. atmospheric pressure, wind speed, etc.)
-	weather: {
+	batteryLevel: {
+		role: "value.battery",
+		desc: "Battery level",
+		unit: "%",
+		defaultMin: 0,
+		defaultMax: 100,
+		defaultStep: 1,
+	},
+	// some devices are defined as "kind": "default", so this is a fallback
+	// generic sensor kind for different types of sensors (e.g. atmospheric pressure, wind speed, etc.)
+	genericSensor: {
+		kind: "measuredValue",
 		role: "value",
 		desc: "Measured value",
 		unit: "",
@@ -54,17 +72,50 @@ const SensorKinds = {
 
 /**
  * Declarative registry for device kinds that provide
- * an alarm information
+ * an enumerated information
  */
-const AlarmKinds = {
+const EnumStateKinds = {
 	failureStatus: {
 		role: "value",
 		desc: "Error code of the device",
 	},
+	smokeDetector: {
+		role: "sensor.alarm.fire",
+		desc: "Smoke detector state",
+	},
+	signal: {
+		kind: "rssi", // rename to make the purpose of the state clearer
+		role: "value",
+		desc: "Signal strength (RSSI)",
+	},
+	floodDetector: {
+		role: "sensor.alarm.flood",
+		desc: "Flood detector state",
+	},
+	genericEnum: {
+		role: "value",
+		desc: "Enumerated state",
+	},
+};
+
+/**
+ * Declarative registry for device kinds that provide thermostat controls
+ */
+const ThermostatKinds = {
+	thermostat: {
+		kind: "targetTemperature", // rename to make the purpose of the state clearer
+		role: "level.temperature",
+		desc: "Target temperature",
+		unit: "°C",
+		defaultMin: 5,
+		defaultMax: 28,
+		defaultStep: 0.5,
+	},
 };
 
 module.exports = {
-	AlarmKinds,
 	LevelKinds,
 	SensorKinds,
+	EnumStateKinds,
+	ThermostatKinds,
 };

package/lib/devices/DeviceKindCapabilities.js

@@ -1,6 +1,7 @@
 "use strict";
 
-const { LevelKinds, SensorKinds, AlarmKinds } = require("./DeviceCapabilityRegistry");
+const { resolveEnumKind } = require("./EnumKindResolver");
+const { LevelKinds, SensorKinds, EnumStateKinds, ThermostatKinds } = require("./DeviceCapabilityRegistry");
 
 /**
  * Resolves capabilities from a SmartFriends device definition
@@ -10,76 +11,104 @@ function getDeviceCapabilities(definition) {
 		return {
 			shouldBeCreated: false,
 			hasWritableStates: false,
-			hasSwitchingValues: false,
-			hasLevel: false,
-			hasSensor: false,
-			hasAlarm: false,
 			configObj: null,
 		};
 	}
 
-	const deviceType = definition?.deviceType ?? {};
+	const deviceType = definition.deviceType;
 	const kind = deviceType.kind ?? "unknown";
-	const deviceDesignation = definition?.deviceDesignation?.replace(/\${|}/g, "") ?? kind;
 	const model = deviceType.model ?? "unknown";
+	const type = deviceType.type;
+	const name = (definition.deviceDesignation ?? kind).replace(/\${|}/g, "");
+	const configObj = { kind, name };
 
+	// SwitchingValues → always win
 	const switchingValues = Array.isArray(deviceType.switchingValues) ? deviceType.switchingValues : [];
-
 	const hasSwitchingValues = switchingValues.length > 0;
-	let configObj = {
-		kind,
-		name: deviceDesignation,
-	};
 
+	// Level actuators
 	const levelConfig = LevelKinds[kind] ?? null;
-	const sensorConfig = (SensorKinds[kind] && model == "analog") ?? null; // only sensor type "analog" contains measurable values
-	const alarmConfig = AlarmKinds[kind] ?? null;
+
+	// Thermostat
+	const thermostatConfig = type === "actuator" && model === "analog" ? (ThermostatKinds[kind] ?? null) : null;
+
+	// Analog sensors
+	let sensorConfig = null;
+	if (type === "sensor" && model === "analog") {
+		if (SensorKinds[kind]) {
+			// Known sensor kind
+			sensorConfig = SensorKinds[kind];
+		} else if (kind === "default") {
+			// Generic fallback fo default kind
+			sensorConfig = SensorKinds.genericSensor;
+		}
+	}
+
+	// Enum sensors (textOptions)
+	let enumStateConfig = null;
+	if (
+		type === "sensor" &&
+		model === "text" &&
+		Array.isArray(deviceType.textOptions) &&
+		deviceType.textOptions.some(opt => opt && typeof opt === "object" && "name" in opt)
+	) {
+		const enumKind = resolveEnumKind(definition, deviceType);
+		enumStateConfig = EnumStateKinds[enumKind] ?? EnumStateKinds.genericEnum;
+	}
 
 	if (levelConfig) {
-		configObj = {
-			...configObj,
+		Object.assign(configObj, {
+			kind: levelConfig.kind ?? configObj.kind,
 			role: levelConfig.role,
 			desc: levelConfig.desc,
 			unit: levelConfig.unit,
 			min: deviceType.min ?? levelConfig.defaultMin,
 			max: deviceType.max ?? levelConfig.defaultMax,
 			step: deviceType.step ?? levelConfig.defaultStep,
-		};
+		});
+	} else if (thermostatConfig) {
+		Object.assign(configObj, {
+			kind: thermostatConfig.kind ?? configObj.kind,
+			role: thermostatConfig.role,
+			desc: thermostatConfig.desc,
+			unit: thermostatConfig.unit,
+			min: deviceType.min ?? thermostatConfig.defaultMin,
+			max: deviceType.max ?? thermostatConfig.defaultMax,
+			step: deviceType.step ?? thermostatConfig.defaultStep,
+		});
 	} else if (sensorConfig) {
-		configObj = {
-			...configObj,
+		Object.assign(configObj, {
+			kind: sensorConfig.kind ?? configObj.kind,
 			role: sensorConfig.role,
 			desc: sensorConfig.desc,
 			unit: sensorConfig.unit,
 			min: deviceType.min ?? sensorConfig.defaultMin,
 			max: deviceType.max ?? sensorConfig.defaultMax,
 			step: deviceType.step ?? sensorConfig.defaultStep,
-		};
-	} else if (alarmConfig) {
-		configObj = {
-			...configObj,
-			role: alarmConfig.role,
-			desc: alarmConfig.desc,
-		};
-
-		// map "textOptions" (if present) into configObj as enumerated states
-		if (deviceType.textOptions && Array.isArray(deviceType.textOptions) && deviceType.textOptions.length > 0) {
-			configObj.states = deviceType.textOptions.reduce((acc, opt) => {
-				acc[opt.value] = `${opt.state} (${opt.name.replace(/\${|}/g, "")})`;
+		});
+	} else if (enumStateConfig) {
+		Object.assign(configObj, {
+			kind: enumStateConfig.kind ?? configObj.kind,
+			role: enumStateConfig.role,
+			desc: enumStateConfig.desc,
+			states: deviceType.textOptions.reduce((acc, opt) => {
+				acc[opt.value] = opt.name.replace(/\${|}/g, "");
 				return acc;
-			}, {});
-		}
+			}, {}),
+		});
 	}
 
 	return {
 		// state creation decision
-		shouldBeCreated: hasSwitchingValues || !!levelConfig || !!sensorConfig || !!alarmConfig,
-		hasWritableStates: hasSwitchingValues || !!levelConfig,
+		shouldBeCreated:
+			hasSwitchingValues || !!levelConfig || !!thermostatConfig || !!sensorConfig || !!enumStateConfig,
+		hasWritableStates: hasSwitchingValues || !!levelConfig || !!thermostatConfig,
 		// metadata for builders
 		hasSwitchingValues,
 		hasLevel: !!levelConfig,
+		hasThermostat: !!thermostatConfig,
 		hasSensor: !!sensorConfig,
-		hasAlarm: !!alarmConfig,
+		hasEnumState: !!enumStateConfig,
 		// config object for state creation
 		configObj: configObj,
 	};

package/lib/devices/EnumKindResolver.js

@@ -0,0 +1,37 @@
+"use strict";
+
+/**
+ * Resolves semantic enum type for devices with
+ * model=text + textOptions
+ */
+function resolveEnumKind(definition, deviceType) {
+	const designation = definition.deviceDesignation ?? "";
+	const kind = definition.kind ?? "";
+	const options = deviceType.textOptions ?? [];
+
+	// RSSI / signal strength
+	if (designation.includes("Rssi")) {
+		return "signal";
+	}
+
+	// Failure status
+	if (kind.includes("failureStatus")) {
+		return "failureStatus";
+	}
+
+	// Smoke detector
+	if (options.some(o => /smoke/i.test(o.valueState ?? ""))) {
+		return "smokeDetector";
+	}
+
+	// Flood / water
+	if (options.some(o => /water|flood/i.test(o.valueState ?? ""))) {
+		return "floodDetector";
+	}
+
+	return "genericEnum";
+}
+
+module.exports = {
+	resolveEnumKind,
+};

package/lib/devices/SchellenbergDevice.js

@@ -26,10 +26,12 @@ class SchellenbergDevice {
 
 		devicePrefix = devicePrefix.replace(this.adapter.FORBIDDEN_CHARS, "");
 
+		// Umlauts are Unicode-escaped and need to be parsed here
+		const rawName = this.name.replace(/\${|}/g, "");
 		await this.adapter.setObjectNotExistsAsync(devicePrefix, {
 			type: "channel",
 			common: {
-				name: this.name,
+				name: JSON.parse(`"${rawName.replace(/\\\\/g, "\\")}"`),
 			},
 			native: {},
 		});
@@ -92,8 +94,8 @@ class SchellenbergDevice {
 			await this.createSensorState(infoPrefix, capabilities.configObj);
 		}
 
-		if (capabilities.hasAlarm) {
-			await this.createAlarmState(infoPrefix, capabilities.configObj);
+		if (capabilities.hasEnumState) {
+			await this.createEnumState(infoPrefix, capabilities.configObj);
 		}
 		//#endregion
 
@@ -118,6 +120,10 @@ class SchellenbergDevice {
 			if (capabilities.hasLevel) {
 				await this.createLevelState(controlPrefix, capabilities.configObj);
 			}
+
+			if (capabilities.hasThermostat) {
+				await this.createThermostatState(controlPrefix, capabilities.configObj);
+			}
 		}
 		//#endregion
 
@@ -168,6 +174,25 @@ class SchellenbergDevice {
 		});
 	}
 
+	async createThermostatState(statePrefix, thermostatConfigObj) {
+		await this.adapter.setObjectNotExistsAsync(`${statePrefix}${thermostatConfigObj.kind}`, {
+			type: "state",
+			common: {
+				name: thermostatConfigObj.kind,
+				desc: thermostatConfigObj.desc,
+				type: "number",
+				role: thermostatConfigObj.role,
+				read: true,
+				write: true,
+				min: thermostatConfigObj.min,
+				max: thermostatConfigObj.max,
+				step: thermostatConfigObj.step,
+				unit: thermostatConfigObj.unit,
+			},
+			native: {},
+		});
+	}
+
 	async createSensorState(statePrefix, sensorConfigObj) {
 		await this.adapter.setObjectNotExistsAsync(`${statePrefix}${sensorConfigObj.kind}`, {
 			type: "state",
@@ -188,17 +213,17 @@ class SchellenbergDevice {
 		});
 	}
 
-	async createAlarmState(statePrefix, alarmConfigObj) {
-		await this.adapter.setObjectNotExistsAsync(`${statePrefix}${alarmConfigObj.kind}`, {
+	async createEnumState(statePrefix, enumConfigObj) {
+		await this.adapter.setObjectNotExistsAsync(`${statePrefix}${enumConfigObj.kind}`, {
 			type: "state",
 			common: {
-				name: alarmConfigObj.kind,
-				desc: alarmConfigObj.desc,
+				name: enumConfigObj.kind,
+				desc: enumConfigObj.desc,
 				type: "number",
-				role: alarmConfigObj.role,
+				role: enumConfigObj.role,
 				read: true,
 				write: false,
-				states: alarmConfigObj.states,
+				states: enumConfigObj.states,
 			},
 			native: {},
 		});
@@ -253,15 +278,11 @@ class SchellenbergDevice {
 			return;
 		}
 
-		if (capabilities.hasLevel) {
+		if (capabilities.hasLevel || capabilities.hasThermostat) {
 			await this.setDeviceStateValue(controlPrefix, capabilities.configObj, value);
 		}
 
-		if (capabilities.hasSensor) {
-			await this.setDeviceStateValue(infoPrefix, capabilities.configObj, value);
-		}
-
-		if (capabilities.hasAlarm) {
+		if (capabilities.hasSensor || capabilities.hasEnumState) {
 			await this.setDeviceStateValue(infoPrefix, capabilities.configObj, value);
 		}
 	}

package/lib/devices/SchellenbergMasterDevice.js

@@ -10,9 +10,12 @@ class SchellenbergMasterDevice {
 
 	async createMasterFolder() {
 		const masterPrefix = `${commonDefines.AdapterDatapointIDs.Devices}.${this.id.replace(this.adapter.FORBIDDEN_CHARS, "")}`;
+
+		// Umlauts are Unicode-escaped and need to be parsed here
+		const rawName = this.name.replace(/\${|}/g, "");
 		await this.adapter.setObjectNotExistsAsync(masterPrefix, {
 			type: "channel",
-			common: { name: this.name },
+			common: { name: JSON.parse(`"${rawName.replace(/\\\\/g, "\\")}"`) },
 			native: {},
 		});
 

package/package.json

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