iobroker.lorawan 1.18.27 → 1.18.29

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.29 (2025-11-27)
+* (BenAhrdt) set ack = true, before push dataExchange
+
+### 1.18.28 (2025-11-27)
+* (BenAhrdt) assign comment 'from bridge' to state, if the value is set by bridge
+
 ### 1.18.27 (2025-11-27)
 * (BenAhrdt) wright incomming dataexchange with ack = true
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.18.27",
+    "version": "1.18.29",
     "news": {
+      "1.18.29": {
+        "en": "set ack = true, before push dataExchange",
+        "de": "ack = true, bevor Sie Daten drücken Wechselkurs",
+        "ru": "set ack = true, перед push-данными обмен",
+        "pt": "definir ack = true, antes de empurrar dados Bolsa",
+        "nl": "set ack = true, voor push data Beurs",
+        "fr": "set ack = true, avant de pousser les données Échange",
+        "it": "set ack = true, prima di spingere i dati Scambi",
+        "es": "set ack = true, antes de presionar datos Cambio",
+        "pl": "set ack = true, przed push data Giełda",
+        "uk": "встановити ack = true, перш ніж натиснути дані Обмін",
+        "zh-cn": "在按下数据前设置 ack = true 交换"
+      },
+      "1.18.28": {
+        "en": "assign comment 'from bridge' to state, if the value is set by bridge",
+        "de": "kommentar 'von der brücke' zum zustand zuordnen, wenn der wert von der brücke gesetzt wird",
+        "ru": "присвоить комментарий «от моста» государству, если значение установлено мостом",
+        "pt": "atribuir o comentário 'da ponte' ao estado, se o valor for definido pela ponte",
+        "nl": "commentaar 'van brug' toewijzen aan status, als de waarde door brug wordt ingesteld",
+        "fr": "assigner le commentaire 'from bridge' à l'état, si la valeur est définie par bridge",
+        "it": "assegnare commento 'da ponte' a stato, se il valore è impostato da ponte",
+        "es": "asignar comentario 'de puente' a estado, si el valor se establece por puente",
+        "pl": "przypisz komentarz \"z mostu\" do stanu, jeśli wartość jest ustawiona przez most",
+        "uk": "призначте коментар «з місту» до держави, якщо значення встановлене містом",
+        "zh-cn": "如果值由桥来设定, 则将注释“ 从桥” 指定为状态"
+      },
       "1.18.27": {
         "en": "wright incomming dataexchange with ack = true",
         "de": "wright incoming dataexchange mit ack = true",
@@ -67,32 +93,6 @@
         "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",
-        "ru": "Сообщение Bugfix с обнаруженным устройством",
-        "pt": "Mensagem de correção de erros para o brige com o dispositivo descoberto",
-        "nl": "Bugfix-bericht naar Brugge met ontdekt apparaat",
-        "fr": "Message de bogue pour bricker avec le périphérique découvert",
-        "it": "Messaggio di Bugfix a brige con dispositivo scoperto",
-        "es": "Mensaje de Bugfix para cerrar con dispositivo descubierto",
-        "pl": "Komunikat Bugfix do przepłukiwania z odkrytym urządzeniem",
-        "uk": "Повідомлень про помилку при відкритті пристрою",
-        "zh-cn": "用已发现的设备绑定错误修正消息"
-      },
-      "1.18.21": {
-        "en": "Bugfix reading value for light in puslish",
-        "de": "Bugfix Lesewert für Licht in puslish",
-        "ru": "Bugfix значение чтения для света в puslish",
-        "pt": "Valor de leitura de erros para a luz em puslish",
-        "nl": "Bugfix leeswaarde voor licht in het Nederlands",
-        "fr": "Valeur de lecture Bugfix pour la lumière en puslish",
-        "it": "Bugfix valore di lettura per la luce in inglese",
-        "es": "Valor de lectura de Bugfix para luz en puslish",
-        "pl": "Wartość odczytu bugfix dla światła w pussish",
-        "uk": "Помилки для читання значення для світла в puslish",
-        "zh-cn": "Puslish 中的光线错误修正读值"
       }
     },
     "titleLang": {

package/lib/modules/bridge.js

@@ -222,33 +222,39 @@ class bridgeClass {
                 if (this.SubscribedTopics[topic].light) {
                     if (message.state) {
                         message.state = message.state === 'ON' ? true : false;
-                        await this.adapter.setForeignStateAsync(
-                            this.SubscribedTopics[topic].LightIds.onOff,
-                            message.state,
-                        );
+                        await this.adapter.setForeignStateAsync(this.SubscribedTopics[topic].LightIds.onOff, {
+                            val: message.state,
+                            c: 'from bridge',
+                        });
                     }
                     if (message.brightness) {
-                        await this.adapter.setForeignStateAsync(
-                            this.SubscribedTopics[topic].LightIds.brightness,
-                            message.brightness,
-                        );
+                        await this.adapter.setForeignStateAsync(this.SubscribedTopics[topic].LightIds.brightness, {
+                            val: message.brightness,
+                            c: 'from bridge',
+                        });
                     }
                     if (message.color) {
                         const color = this.rgbToHex(message.color);
-                        await this.adapter.setForeignStateAsync(this.SubscribedTopics[topic].LightIds.color, color);
+                        await this.adapter.setForeignStateAsync(this.SubscribedTopics[topic].LightIds.color, {
+                            val: color,
+                            c: 'from bridge',
+                        });
                     }
                     if (message.effect) {
                         const effect = this.SubscribedTopics[topic].effects[message.effect]
                             ? this.SubscribedTopics[topic].effects[message.effect]
                             : '';
-                        await this.adapter.setForeignStateAsync(this.SubscribedTopics[topic].LightIds.effects, effect);
+                        await this.adapter.setForeignStateAsync(this.SubscribedTopics[topic].LightIds.effects, {
+                            val: effect,
+                            c: 'from bridge',
+                        });
                     }
                     return;
                 }
                 if (this.SubscribedTopics[topic].cover) {
-                    if (this.SubscribedTopics[topic].message) {
-                        if (this.SubscribedTopics[topic].message[message]) {
-                            message = this.SubscribedTopics[topic].message[message];
+                    if (this.SubscribedTopics[topic].messageAssign) {
+                        if (this.SubscribedTopics[topic].messageAssign[message]) {
+                            message = this.SubscribedTopics[topic].messageAssign[message];
                         } else {
                             this.adapter.log.warn(
                                 `Incomming Message: ${message} at topic: ${topic} can not be found in possible values.`,
@@ -264,18 +270,32 @@ class bridgeClass {
                         if (typeof message === 'object') {
                             message = JSON.stringify(message);
                         }
-                        await this.adapter.setState(this.SubscribedTopics[topic].id, message, true);
+                        await this.adapter.setState(
+                            this.SubscribedTopics[topic].id,
+                            { val: message, c: 'from bridge' },
+                            true,
+                        );
                     } else {
-                        await this.adapter.setState(this.SubscribedTopics[topic].id, message);
+                        await this.adapter.setState(this.SubscribedTopics[topic].id, {
+                            val: message,
+                            c: 'from bridge',
+                        });
                     }
                 } else {
-                    if (this.SubscribedTopics[topic].message) {
-                        await this.adapter.setForeignStateAsync(message.id, message.val);
+                    if (this.SubscribedTopics[topic].messageAssign) {
+                        await this.adapter.setForeignStateAsync(message.id, { val: message.val, c: 'from bridge' });
                     } else {
-                        await this.adapter.setForeignStateAsync(this.SubscribedTopics[topic].id, message);
+                        await this.adapter.setForeignStateAsync(this.SubscribedTopics[topic].id, {
+                            val: message,
+                            c: 'from bridge',
+                        });
                     }
                 }
-                await this.adapter.setState('info.subscribedTopics', JSON.stringify(this.SubscribedTopics), true);
+                await this.adapter.setState(
+                    'info.subscribedTopics',
+                    { val: JSON.stringify(this.SubscribedTopics), c: 'from bridge' },
+                    true,
+                );
             } else {
                 this.adapter.log.debug(`The received Topic ${topic} is not subscribed`);
             }
@@ -801,9 +821,9 @@ class bridgeClass {
                     }
 
                     if (this.PublishedIds[id].publish[publishTopic].cover) {
-                        if (this.PublishedIds[id].publish[publishTopic].message) {
-                            if (this.PublishedIds[id].publish[publishTopic].message[val]) {
-                                val = this.PublishedIds[id].publish[publishTopic].message[val];
+                        if (this.PublishedIds[id].publish[publishTopic].messageAssign) {
+                            if (this.PublishedIds[id].publish[publishTopic].messageAssign[val]) {
+                                val = this.PublishedIds[id].publish[publishTopic].messageAssign[val];
                             } else {
                                 val = '';
                             }
@@ -2771,7 +2791,7 @@ class bridgeClass {
                 DiscoveryTopic,
                 DiscoveryPayload,
                 Id,
-                { cover: true, command: true, message: setAssign },
+                { cover: true, command: true, messageAssign: setAssign },
             );
 
             // Position
@@ -2801,7 +2821,7 @@ class bridgeClass {
                     DiscoveryTopic,
                     DiscoveryPayload,
                     `${coverTopic}${this.EndingState}`,
-                    { cover: true, message: { true: 'OPEN' } },
+                    { cover: true, messageAssign: { true: 'OPEN' } },
                 );
             }
 
@@ -2816,7 +2836,7 @@ class bridgeClass {
                     DiscoveryTopic,
                     DiscoveryPayload,
                     `${coverTopic}${this.EndingState}`,
-                    { cover: true, message: { true: 'CLOSE' } },
+                    { cover: true, messageAssign: { true: 'CLOSE' } },
                 );
             }
 
@@ -2831,7 +2851,7 @@ class bridgeClass {
                     DiscoveryTopic,
                     DiscoveryPayload,
                     `${coverTopic}${this.EndingState}`,
-                    { cover: true, message: { true: 'STOP' } },
+                    { cover: true, messageAssign: { true: 'STOP' } },
                 );
             }
 
@@ -2878,7 +2898,7 @@ class bridgeClass {
                     DiscoveryTopic,
                     DiscoveryPayload,
                     `${coverTopic}${this.EndingState}`,
-                    { cover: true, message: { [openKey]: 'open', [closingKey]: 'closing' } },
+                    { cover: true, messageAssign: { [openKey]: 'open', [closingKey]: 'closing' } },
                 );
             }
 
@@ -2897,7 +2917,7 @@ class bridgeClass {
                     `${coverTopic}${this.EndingState}`,
                     {
                         cover: true,
-                        message: { [closedKey]: 'closed', [openingKey]: 'opening' },
+                        messageAssign: { [closedKey]: 'closed', [openingKey]: 'opening' },
                     },
                 );
             }

package/main.js

@@ -715,8 +715,10 @@ class Lorawan extends utils.Adapter {
                             }
                             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);
+                            if (this.bridge) {
+                                await this.setState(id, state.val, true);
+                                await this.bridge.publishId(id, state.val, {});
+                            }
                         }
                     } 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.27",
+  "version": "1.18.29",
   "description": "converts the desired lora gateway data to a ioBroker structure",
   "author": {
     "name": "BenAhrdt",