iobroker.lorawan 1.18.22 → 1.18.24

package/README.md

@@ -23,6 +23,12 @@ 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.24 (2025-11-27)
+* (BenAhrdt) add dataExchange between Adapter and Bridge-Partner (Complex JSON possible)
+
+### 1.18.23 (2025-11-26)
+* (BenAhrdt) Notify Adapter Version to Bridge with connection
+
 ### 1.18.22 (2025-11-26)
 * (BenAhrdt) Bugfix message to brige with discovered device
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.18.22",
+    "version": "1.18.24",
     "news": {
+      "1.18.24": {
+        "en": "add dataExchange between Adapter and Bridge-Partner (Complex JSON possible)",
+        "de": "daten hinzufügen Austausch zwischen Adapter und Bridge-Partner (Komplex JSON möglich)",
+        "ru": "добавить данные Обмен между адаптером и Bridge-Partner (комплекс JSON)",
+        "pt": "adicionar dados Troca entre adaptador e parceiro de ponte (complexo JSON possível)",
+        "nl": "gegevens toevoegen Uitwisseling tussen Adapter en Bridge-Partner (complex JSON mogelijk)",
+        "fr": "ajouter des données Échange entre Adaptateur et Bridge-Partner (Complex JSON possible)",
+        "it": "aggiungere i dati Scambio tra adattatore e Bridge-Partner (Complex JSON possibile)",
+        "es": "añadir datos Intercambio entre Adaptador y Bridge-Partner (Complejo JSON posible)",
+        "pl": "dodaj dane Wymiana między Adapterem a partnerem Bridge- (możliwy kompleks JSON)",
+        "uk": "додати дані Обмін між адаптером і Bridge-Partner (Комплексний JSON можливо)",
+        "zh-cn": "添加数据 适配器与Bridge-Partner之间的交换(可能复杂JSON)"
+      },
+      "1.18.23": {
+        "en": "Notify Adapter Version to Bridge with connection",
+        "de": "Benachrichtigen Adapter Version auf Brücke mit Anschluss",
+        "ru": "Уведомить версию адаптера о подключении к Bridge",
+        "pt": "Notificar versão do adaptador para Ponte com conexão",
+        "nl": "Aanmelden Adapter versie naar Brug met verbinding",
+        "fr": "Avertissez la version adaptateur de Bridge avec connexion",
+        "it": "Notifica versione adattatore a ponte con connessione",
+        "es": "Notify Adapter Version to Bridge with connection",
+        "pl": "Informuj wersję adaptera do mostka z połączeniem",
+        "uk": "Повідомити версію адаптера до мосту з підключенням",
+        "zh-cn": "将适配器版本通知连接桥"
+      },
       "1.18.22": {
         "en": "Bugfix message to brige with discovered device",
         "de": "Bugfix-Nachricht zu brige mit entdecktem Gerät",
@@ -67,32 +93,6 @@
         "pl": "Temat limit bugfix do stanu _ topic",
         "uk": "Виправлення ліміту висихання до стану_topic",
         "zh-cn": "错误fix 将 sitch 话题限制为状态_ title"
-      },
-      "1.18.17": {
-        "en": "Bugfix limit switch closed",
-        "de": "Bugfix Endschalter geschlossen",
-        "ru": "Переключатель Bugfix Limit закрыт",
-        "pt": "Interruptor de limite de correção de erros fechado",
-        "nl": "Bugfix limietschakelaar gesloten",
-        "fr": "Interrupteur limite de bogue fermé",
-        "it": "Interruttore di limite Bugfix chiuso",
-        "es": "Interruptor de límite de fallo cerrado",
-        "pl": "Graniczny wyłącznik Bugfix zamknięty",
-        "uk": "Перемикач ліміту попереку",
-        "zh-cn": "关闭错误修正限制开关"
-      },
-      "1.18.16": {
-        "en": "change cover states into lower case",
-        "de": "änderung der deckelzustände in den unteren fall",
-        "ru": "изменение состояния покрытия в нижнем регистре",
-        "pt": "mudar os estados de cobertura em minúsculas",
-        "nl": "wijzigen dekking staten in kleine geval",
-        "fr": "changement des états de couverture en minuscules",
-        "it": "cambiare gli stati di copertura in caso più basso",
-        "es": "cambiar los estados de cobertura en caso inferior",
-        "pl": "zmiana stanu pokrycia na niższy przypadek",
-        "uk": "змінити обкладинки станів в нижній випадок",
-        "zh-cn": "更改覆盖状态为小写"
       }
     },
     "titleLang": {
@@ -579,6 +579,19 @@
         "def": ""
       },
       "native": {}
+    },
+    {
+      "_id": "bridge.dataExchange",
+      "type": "state",
+      "common": {
+        "type": "string",
+        "role": "json",
+        "name": "dataexchange with bridge",
+        "read": true,
+        "write": true,
+        "def": ""
+      },
+      "native": {}
     }
   ]
 }

package/lib/modules/bridge.js

@@ -260,9 +260,16 @@ class bridgeClass {
 
                 // Check for namespace and write own, oder foreign state
                 if (this.SubscribedTopics[topic].id.startsWith(this.adapter.namespace)) {
-                    await this.adapter.setState(this.SubscribedTopics[topic].id, message);
+                    if (this.SubscribedTopics[topic].dataExchange) {
+                        if (typeof message === 'object') {
+                            message = JSON.stringify(message);
+                        }
+                        await this.adapter.setState(this.SubscribedTopics[topic].id, message);
+                    } else {
+                        await this.adapter.setState(this.SubscribedTopics[topic].id, message);
+                    }
                 } else {
-                    if (message.id && message.val) {
+                    if (this.SubscribedTopics[topic].message) {
                         await this.adapter.setForeignStateAsync(message.id, message.val);
                     } else {
                         await this.adapter.setForeignStateAsync(this.SubscribedTopics[topic].id, message);
@@ -1158,22 +1165,35 @@ class bridgeClass {
         const activeFunction = 'bridge.js - getDiscoveryObject';
         this.adapter.log.debug(`Function ${activeFunction} started.`);
         try {
-            let indexOfStatebegin = changeInfo.id.indexOf(
-                this.adapter.messagehandler.directoryhandler.reachableSubfolders.uplinkDecoded,
-            );
-            if (indexOfStatebegin === -1) {
+            let indexOfStatebegin = -1;
+            // Check for state discover outsid the applications
+            if (options && options.internal) {
+                indexOfStatebegin = changeInfo.id.indexOf(options.internal.folder);
+                indexOfStatebegin = options.internal.folder.length + 1;
+            } else {
                 indexOfStatebegin = changeInfo.id.indexOf(
-                    this.adapter.messagehandler.directoryhandler.reachableSubfolders.downlinkControl,
+                    this.adapter.messagehandler.directoryhandler.reachableSubfolders.uplinkDecoded,
                 );
-                indexOfStatebegin +=
-                    this.adapter.messagehandler.directoryhandler.reachableSubfolders.downlinkControl.length + 1;
-            } else {
-                indexOfStatebegin +=
-                    this.adapter.messagehandler.directoryhandler.reachableSubfolders.uplinkDecoded.length + 1;
+                if (indexOfStatebegin === -1) {
+                    indexOfStatebegin = changeInfo.id.indexOf(
+                        this.adapter.messagehandler.directoryhandler.reachableSubfolders.downlinkControl,
+                    );
+                    indexOfStatebegin +=
+                        this.adapter.messagehandler.directoryhandler.reachableSubfolders.downlinkControl.length + 1;
+                } else {
+                    indexOfStatebegin +=
+                        this.adapter.messagehandler.directoryhandler.reachableSubfolders.uplinkDecoded.length + 1;
+                }
             }
             const StateName = changeInfo.id.substring(indexOfStatebegin, changeInfo.id.length);
+            this.adapter.log.warn(StateName);
             //const normalizedStateName = this.normalizeString(StateName); 08.11.2025 BeSc dont needed anymore with chenge below
-            const DeviceIdentifier = this.getDeviceIdentifier(changeInfo, this.adapter.config.DeviceIdentifiers);
+            let DeviceIdentifier;
+            if (options && options.internal) {
+                DeviceIdentifier = options.internal.deviceidentifier;
+            } else {
+                DeviceIdentifier = this.getDeviceIdentifier(changeInfo, this.adapter.config.DeviceIdentifiers);
+            }
             const normalizedDeviceIdentifier = this.normalizeString(DeviceIdentifier);
             const uniqueString = await this.getUniqueString(
                 `${this.adapter.namespace}.${changeInfo.id}`,
@@ -1668,6 +1688,8 @@ class bridgeClass {
             //this.adapter.log.error(JSON.stringify(this.oldDiscoveredDevices));
             await this.discoverGeneralNotification();
 
+            await this.discoverDataExchange();
+
             // Get all ids in adapterfolder
             // Generate Infos of all devices and decoded folders
             const adapterObjects = await this.adapter.getAdapterObjectsAsync();
@@ -1722,6 +1744,59 @@ class bridgeClass {
         }
     }
 
+    /**
+     * Discovery of DataExchange state
+     */
+    async discoverDataExchange() {
+        const options = {};
+        const id = `${this.adapter.namespace}.bridge.dataExchange`;
+        const deviceObject = await this.adapter.getForeignObjectAsync(id);
+        options.common = deviceObject.common;
+        this.adapter.log.warn(JSON.stringify(options));
+        const changeInfo = await this.adapter.getChangeInfo(id);
+        options.Bridgestate = {
+            discover: true,
+            publish: true,
+            subscribe: true,
+        };
+        options.internal = { folder: `bridge`, deviceidentifier: this.adapter.namespace };
+        const DiscoveryObject = await this.getDiscoveryObject(changeInfo, options);
+        this.assignIdStructure(
+            this.PublishedIds,
+            id,
+            {
+                usedDeviceId: this.adapter.namespace,
+            },
+            DiscoveryObject?.topic,
+            DiscoveryObject?.payload,
+            DiscoveryObject?.payload.state_topic,
+            { dataExchange: true },
+        );
+
+        this.assignTopicStructure(
+            this.SubscribedTopics,
+            DiscoveryObject?.payload.command_topic,
+            {
+                usedDeviceId: this.adapter.namespace,
+            },
+            DiscoveryObject?.topic,
+            DiscoveryObject?.payload,
+            id,
+            { dataExchange: true },
+        );
+        await this.publishDiscovery(id, {
+            topic: DiscoveryObject?.topic,
+            payload: structuredClone(DiscoveryObject?.payload),
+            informations: {
+                usedDeviceId: this.adapter.namespace,
+            },
+        });
+        // Delay for publish new entity
+        setTimeout(async () => {
+            await this.publishId(id, undefined, {});
+        }, 1000);
+    }
+
     /**
      * check discovery for old entries
      */

package/lib/modules/bridgeMqttclient.js

@@ -54,7 +54,7 @@ class bridgeMqttClientClass {
             const notificationId = `${this.adapter.namespace}.${this.adapter.bridge.Words.notification}${this.adapter.bridge.GeneralId}`;
             await this.adapter.bridge?.publishNotification(
                 notificationId,
-                this.adapter.i18nTranslation['connection to bridge is activ'],
+                `${this.adapter.i18nTranslation['connection to bridge is activ']}. Adapterversion: ${this.adapter.version}`,
                 this.adapter.bridge?.Notificationlevel.bridgeConnection,
                 false,
             );

package/main.js

@@ -41,6 +41,9 @@ class Lorawan extends utils.Adapter {
         this.mySystemConfig;
         this.language;
 
+        // Adapter Version
+        this.version;
+
         this.secret = {
             hash: 'feda26376e3d3b38eae8efa48d055754eb0c388d6dbc7ced2ddb5f2f8166f417',
             salt: 'LoRaWANBeScJoFr',
@@ -65,6 +68,10 @@ class Lorawan extends utils.Adapter {
             this.mySystemConfig = await this.getForeignObjectAsync('system.config');
             this.language = this.mySystemConfig?.common.language || 'en';
 
+            // Read aktual Adapterversion
+            const adapterinfos = await this.getForeignObjectAsync(`system.adapter.${this.namespace}`);
+            this.version = adapterinfos?.common.version;
+
             // create downlinkConfigs
             this.downlinkConfighandler = new downlinkConfighandlerClass(this);
 
@@ -707,6 +714,9 @@ class Lorawan extends utils.Adapter {
                                 await this.setState('bridge.debug.payload', payload.val, true);
                             }
                             await this.setState(id, false, true);
+                        } else if (id.endsWith('.bridge.dataExchange')) {
+                            await this.bridge?.publishId(id, state.val, {});
+                            await this.setState(id, state.val, true);
                         }
                     } else {
                         // Query for 0_userdata or alias => states also publish with ack = false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.lorawan",
-  "version": "1.18.22",
+  "version": "1.18.24",
   "description": "converts the desired lora gateway data to a ioBroker structure",
   "author": {
     "name": "BenAhrdt",