iobroker.lorawan 1.18.1 → 1.18.2

package/README.md

@@ -23,6 +23,9 @@ For now there is documentation in English here: https://wiki.hafenmeister.de
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 1.18.2 (2025-11-04)
+* (BenAhrdt) Change Topicformat from device_state to device/state
+
 ### 1.18.1 (2025-11-03)
 * (BenAhrdt) Add Bridge Type Smarthome
 * (BenAhrdt) Bugfix subscribed Topics

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.18.1",
+    "version": "1.18.2",
     "news": {
+      "1.18.2": {
+        "en": "Change Topicformat from device_state to device/state",
+        "de": "Topicformat von device_state zu device/state ändern",
+        "ru": "Изменить Тематический формат с device_state на device/state",
+        "pt": "Alterar o formato do tópico do dispositivo_ estado para o dispositivo/estado",
+        "nl": "Topicformat van device_state naar apparaat/staat wijzigen",
+        "fr": "Changer le format du sujet de device_state vers device/state",
+        "it": "Cambia formato di argomento da dispositivo_stato a dispositivo/stato",
+        "es": "Cambiar Topicformat de dispositivo_state a dispositivo/estado",
+        "pl": "Zmień format tematu z urządzenia _ state na urządzenie / stan",
+        "uk": "Зміна Themeformat від device_state до пристрою/state",
+        "zh-cn": "将主题格式从设备_状态更改为设备/状态"
+      },
       "1.18.1": {
         "en": "Add Bridge Type Smarthome\nBugfix subscribed Topics\nBugfix on case of objectid starts with '.'",
         "de": "Bridge Type Smarthome hinzufügen\nBugfix abonniert Themen\nBugfix auf Fall von objectid beginnt mit '. '",
@@ -80,19 +93,6 @@
         "pl": "przynieść state _ off temat do nawilżacza",
         "uk": "принести стан_вимкнути тему для зволоження",
         "zh-cn": "将状态切换为潮湿器"
-      },
-      "1.17.15": {
-        "en": "notifi new discover in case of oldDiscoveredDevices\nbugfix debug logging",
-        "de": "notifi neu entdecken bei oldDiscoveredDevices\nbugfix debug protokollierung",
-        "ru": "уведомить новое открытие в случае старых обнаруженных устройств\nрегистрация отладчиков",
-        "pt": "notifi nova descoberta no caso de dispositivos antigosdescoberta\nregistro de depuração de bugfix",
-        "nl": "notifi nieuwe ontdekking in het geval van oudeDiscoverdDevices\nbugfix debug logging",
-        "fr": "notifi nouveau découverte en cas d'ancienDiscoveredDevices\nbugfix debug loging",
-        "it": "notifi nuova scoperta in caso di vecchiDiscoveredDevices\nbugfix debug logging",
-        "es": "notifi new discover in case of oldDiscoveredDevices\nbugfix debug logging",
-        "pl": "notifi nowe odkrycie w przypadku old DiscoveredDevices\nlogowanie debugfix",
-        "uk": "неідентифікувати нове відкриття у разі виникнення застарілих\nзареєструватися",
-        "zh-cn": "旧发现器的新发现\n调试日志"
       }
     },
     "titleLang": {

package/lib/modules/bridge.js

@@ -371,7 +371,7 @@ class bridgeClass {
                     );
                     target.normalizedDeficeIdentifier = this.normalizeString(target.DeviceIdentifier);
                     target.uniqueString = await this.getUniqueString(config.climateIds.target, target.DeviceIdentifier);
-                    target.Topic = `${this.bridgeMqttClient.BridgePrefix}${target.uniqueString}`.toLowerCase();
+                    target.Topic = `${this.bridgeMqttClient.BridgePrefix}${target.uniqueString?.path}`.toLowerCase();
 
                     //Min und Max holen
                     const targetObject = await this.adapter.getObjectAsync(config.climateIds.target);
@@ -391,7 +391,7 @@ class bridgeClass {
                     );
                     act.normalizedDeficeIndetifier = this.normalizeString(act.DeviceIdentifier);
                     act.uniqueString = await this.getUniqueString(config.climateIds.act, act.DeviceIdentifier);
-                    act.Topic = `${this.bridgeMqttClient.BridgePrefix}${act.uniqueString}`.toLowerCase();
+                    act.Topic = `${this.bridgeMqttClient.BridgePrefix}${act.uniqueString?.path}`.toLowerCase();
 
                     // Mode
                     const mode = {};
@@ -402,19 +402,19 @@ class bridgeClass {
                     );
                     mode.normalizedDeviceIdentifier = this.normalizeString(mode.DeviceIdentifier);
                     mode.uniqueString = await this.getUniqueString(config.climateIds.mode, mode.DeviceIdentifier);
-                    mode.Topic = `${this.bridgeMqttClient.BridgePrefix}${mode.uniqueString}`.toLowerCase();
+                    mode.Topic = `${this.bridgeMqttClient.BridgePrefix}${mode.uniqueString?.path}`.toLowerCase();
 
-                    const climateUniquString = await this.getUniqueString(
+                    const climateUniqueString = await this.getUniqueString(
                         `${this.adapter.namespace}.${config.ClimateName}`,
                         target.DeviceIdentifier,
                     );
                     const DiscoveryTopic =
-                        `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${this.ClimateEntityType}/${climateUniquString}/config`.toLowerCase();
+                        `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${this.ClimateEntityType}/${climateUniqueString?.path}/config`.toLowerCase();
                     const indexLastDotTarget = config.climateIds.target.lastIndexOf('.');
                     const Id = config.climateIds.target.substring(0, indexLastDotTarget) + this.EndingVirtualClimate;
                     const DiscoveryPayload = {
                         name: config.ClimateName,
-                        unique_id: `${climateUniquString}`.toLowerCase(),
+                        unique_id: `${climateUniqueString?.flat}`.toLowerCase(),
                         device: {
                             identifiers: [target.normalizedDeficeIdentifier.toLowerCase()],
                             name: target.DeviceIdentifier,
@@ -916,12 +916,12 @@ class bridgeClass {
                 `${this.adapter.namespace}.${changeInfo.id}`,
                 DeviceIdentifier,
             );
-            const Topic = `${this.bridgeMqttClient.BridgePrefix}${uniqueString}`.toLowerCase();
+            const Topic = `${this.bridgeMqttClient.BridgePrefix}${uniqueString?.path}`.toLowerCase();
 
             const EntityType = await this.getEntityType(options);
             const AdditionalAttributes = await this.getStateAttributes(options.common, EntityType);
             const DiscoveryTopic =
-                `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${EntityType}/${uniqueString}/config`.toLowerCase();
+                `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${EntityType}/${uniqueString?.path}/config`.toLowerCase();
             const DiscoveryPayload = {
                 name: StateName,
                 unique_id: `${normalizedDeviceIdentifier}_${normalizedStateName}`.toLowerCase(),
@@ -1573,7 +1573,7 @@ class bridgeClass {
             const target = {};
             target.DeviceIdentifier = (await this.getParentNameing(config.climateIds.target))?.parentName;
             target.uniqueString = await this.getUniqueString(config.climateIds.target, target.DeviceIdentifier);
-            target.Topic = `${this.bridgeMqttClient.BridgePrefix}${target.uniqueString}`.toLowerCase();
+            target.Topic = `${this.bridgeMqttClient.BridgePrefix}${target.uniqueString?.path}`.toLowerCase();
 
             //Min und Max holen
             const targetObject = await this.adapter.getForeignObjectAsync(config.climateIds.target);
@@ -1588,26 +1588,26 @@ class bridgeClass {
             const act = {};
             act.DeviceIdentifier = (await this.getParentNameing(config.climateIds.act))?.parentName;
             act.uniqueString = await this.getUniqueString(config.climateIds.act, act.DeviceIdentifier);
-            act.Topic = `${this.bridgeMqttClient.BridgePrefix}${act.uniqueString}`.toLowerCase();
+            act.Topic = `${this.bridgeMqttClient.BridgePrefix}${act.uniqueString?.path}`.toLowerCase();
 
             // Mode
             const mode = {};
             mode.DeviceIdentifier = (await this.getParentNameing(config.climateIds.mode))?.parentName;
             mode.uniqueString = await this.getUniqueString(config.climateIds.mode, mode.DeviceIdentifier);
-            mode.Topic = `${this.bridgeMqttClient.BridgePrefix}${mode.uniqueString}`.toLowerCase();
+            mode.Topic = `${this.bridgeMqttClient.BridgePrefix}${mode.uniqueString?.path}`.toLowerCase();
 
-            const climateUniquString = await this.getUniqueString(
+            const climateUniqueString = await this.getUniqueString(
                 `${this.adapter.namespace}.${config.ClimateName}`,
                 target.DeviceIdentifier,
             );
             const DiscoveryTopic =
-                `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${this.ClimateEntityType}/${climateUniquString}/config`.toLowerCase();
+                `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${this.ClimateEntityType}/${climateUniqueString?.path}/config`.toLowerCase();
             const indexLastDotTarget = config.climateIds.target.lastIndexOf('.');
             const Id = config.climateIds.target.substring(0, indexLastDotTarget) + this.EndingVirtualClimate;
 
             const DiscoveryPayload = {
                 name: config.ClimateName,
-                unique_id: `${climateUniquString}`.toLowerCase(),
+                unique_id: `${climateUniqueString?.flat}`.toLowerCase(),
                 device: {
                     identifiers: [this.normalizeString(target.DeviceIdentifier).toLowerCase()],
                     name: target.DeviceIdentifier,
@@ -1801,13 +1801,13 @@ class bridgeClass {
             const onOff = {};
             onOff.DeviceIdentifier = (await this.getParentNameing(config.HumidifierIds.onOff))?.parentName;
             onOff.uniqueString = await this.getUniqueString(config.HumidifierIds.onOff, onOff.DeviceIdentifier);
-            onOff.Topic = `${this.bridgeMqttClient.BridgePrefix}${onOff.uniqueString}`.toLowerCase();
+            onOff.Topic = `${this.bridgeMqttClient.BridgePrefix}${onOff.uniqueString?.path}`.toLowerCase();
 
             // Target
             const target = {};
             target.DeviceIdentifier = (await this.getParentNameing(config.HumidifierIds.target))?.parentName;
             target.uniqueString = await this.getUniqueString(config.HumidifierIds.target, target.DeviceIdentifier);
-            target.Topic = `${this.bridgeMqttClient.BridgePrefix}${target.uniqueString}`.toLowerCase();
+            target.Topic = `${this.bridgeMqttClient.BridgePrefix}${target.uniqueString?.path}`.toLowerCase();
 
             //Min und Max holen
             const targetObject = await this.adapter.getForeignObjectAsync(config.HumidifierIds.target);
@@ -1822,21 +1822,21 @@ class bridgeClass {
             const act = {};
             act.DeviceIdentifier = (await this.getParentNameing(config.HumidifierIds.act))?.parentName;
             act.uniqueString = await this.getUniqueString(config.HumidifierIds.act, act.DeviceIdentifier);
-            act.Topic = `${this.bridgeMqttClient.BridgePrefix}${act.uniqueString}`.toLowerCase();
+            act.Topic = `${this.bridgeMqttClient.BridgePrefix}${act.uniqueString?.path}`.toLowerCase();
 
-            const humidifierUniquString = await this.getUniqueString(
+            const humidifierUniqueString = await this.getUniqueString(
                 `${this.adapter.namespace}.${config.HumidifierName}`,
                 target.DeviceIdentifier,
             );
             const entityType = config.Humidifier ? this.HumidifierEntityType : this.DeHumidifierEntityType;
             const DiscoveryTopic =
-                `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${this.HumidifierEntityType}/${humidifierUniquString}/config`.toLowerCase();
+                `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${this.HumidifierEntityType}/${humidifierUniqueString?.path}/config`.toLowerCase();
             const indexLastDotTarget = config.HumidifierIds.target.lastIndexOf('.');
             const Id = config.HumidifierIds.target.substring(0, indexLastDotTarget) + this.EndingVirtualHumidifier;
 
             const DiscoveryPayload = {
                 name: config.HumidifierName,
-                unique_id: `${humidifierUniquString}`.toLowerCase(),
+                unique_id: `${humidifierUniqueString?.flat}`.toLowerCase(),
                 device: {
                     identifiers: [this.normalizeString(target.DeviceIdentifier).toLowerCase()],
                     name: target.DeviceIdentifier,
@@ -2138,16 +2138,16 @@ class bridgeClass {
             const uniqueString = await this.getUniqueString(id, deviceIdentifier);
             /*const topic =
                 `${this.bridgeMqttClient.BridgePrefix}${normalizedDeviceIdentifier}/${normalizedStateName}`.toLowerCase();*/
-            const topic = `${this.bridgeMqttClient.BridgePrefix}${uniqueString}`.toLowerCase();
+            const topic = `${this.bridgeMqttClient.BridgePrefix}${uniqueString?.path}`.toLowerCase();
             const EntityType = await this.getEntityType(options);
             const AdditionalAttributes = await this.getStateAttributes(options.common, EntityType);
             /*const discoveryTopic =
                 `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${EntityType}/${normalizedDeviceIdentifier}/${normalizedStateName}/config`.toLowerCase();*/
             const discoveryTopic =
-                `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${EntityType}/${uniqueString}/config`.toLowerCase();
+                `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${EntityType}/${uniqueString?.path}/config`.toLowerCase();
             const discoveryPayload = {
                 name: statename,
-                unique_id: `${uniqueString}`.toLowerCase(),
+                unique_id: `${uniqueString?.flat}`.toLowerCase(),
                 device: { identifiers: [normalizedDeviceIdentifier.toLowerCase()], name: deviceIdentifier },
             };
             // Add Topics
@@ -2211,7 +2211,11 @@ class bridgeClass {
         const activeFunction = 'bridge.js - getUniqueString';
         this.adapter.log.debug(`Function ${activeFunction} started.`);
         try {
-            return `${this.normalizeString(deviceidentifier)}_${this.normalizeString(id)}`;
+            const unique = {
+                flat: `${this.normalizeString(deviceidentifier)}_${this.normalizeString(id)}`,
+                path: `${this.normalizeString(deviceidentifier)}/${this.normalizeString(id)}`,
+            };
+            return unique;
         } catch (error) {
             this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
         }

package/lib/modules/bridgeMqttclient.js

@@ -131,7 +131,7 @@ class bridgeMqttClientClass {
      */
     getSubscribtionArray() {
         // Subscribe to the ending of set (with different counts of sublevels 2 -10)
-        return [`${this.BridgePrefix}+/set`];
+        return [`${this.BridgePrefix}+/set`, `${this.BridgePrefix}+/+/set`];
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.lorawan",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "description": "converts the desired lora gateway data to a ioBroker structure",
   "author": {
     "name": "BenAhrdt",
@@ -32,10 +32,10 @@
     "node-schedule": "^2.1.1"
   },
   "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",
+    "@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/eslint-config": "^2.2.0",
     "@iobroker/testing": "^5.1.1",