iobroker.lorawan 1.18.29 → 1.18.31

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.31 (2025-11-27)
+* (BenAhrdt) Bugfix state at light effekts in case of 0
+
+### 1.18.30 (2025-11-27)
+* (BenAhrdt) setting dataExchange to 2 entitie (FromIob & ToIob)
+
 ### 1.18.29 (2025-11-27)
 * (BenAhrdt) set ack = true, before push dataExchange
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.18.29",
+    "version": "1.18.31",
     "news": {
+      "1.18.31": {
+        "en": "Bugfix state at light effekts in case of 0",
+        "de": "Bugfix Zustand bei Lichteffekten bei 0",
+        "ru": "Состояние Bugfix на световых эффектах в случае 0",
+        "pt": "Estado de correção de erros em efekts de luz em caso de 0",
+        "nl": "Bugfix toestand bij lichte effekts in geval van 0",
+        "fr": "État Bugfix aux effects légers en cas de 0",
+        "it": "Bugfix stato alla luce effekts in caso di 0",
+        "es": "Estado de Bugfix en effekts luz en caso de 0",
+        "pl": "Stan bugfix w lekkich effekts w przypadku 0",
+        "uk": "Стан Бугфікса при легких діях при 0",
+        "zh-cn": "0 时在 effekts 时发生错误"
+      },
+      "1.18.30": {
+        "en": "setting dataExchange to 2 entitie (FromIob & ToIob)",
+        "de": "daten ausgeben Austausch zu 2 Teilnehmern (FromIob & ToIob)",
+        "ru": "настройка данных Обмен на 2 entitie (FromIob & ToIob)",
+        "pt": "que define os dados Troca para 2 entitie (FromIob & Tolob)",
+        "nl": "gegevens instellen Uitwisseling naar 2 ondernemingen (FromIob & Toiob)",
+        "fr": "définir les données Échange avec 2 entreprises (FromIob & TOIob)",
+        "it": "impostazione dei dati Scambio a 2 enti (DaIob & ToIob)",
+        "es": "de datos Intercambio a 2 entitie (Desde Iob & ToIob)",
+        "pl": "ustawienie danych Wymiana na 2 entitie (FromIob & Tolob)",
+        "uk": "налаштування даних Обмін до 2 entitie (З альбомуIob & ToIob)",
+        "zh-cn": "设置数据 交换到2个内置( FromIob & ToIob)"
+      },
       "1.18.29": {
         "en": "set ack = true, before push dataExchange",
         "de": "ack = true, bevor Sie Daten drücken Wechselkurs",
@@ -67,32 +93,6 @@
         "pl": "usunąć logowanie do testowania",
         "uk": "видалення загартування для тестування",
         "zh-cn": "删除用于测试的日志"
-      },
-      "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": "将适配器版本通知连接桥"
       }
     },
     "titleLang": {
@@ -581,17 +581,30 @@
       "native": {}
     },
     {
-      "_id": "bridge.dataExchange",
+      "_id": "bridge.dataFromIob",
       "type": "state",
       "common": {
         "type": "string",
         "role": "json",
-        "name": "dataexchange with bridge",
+        "name": "data to bridge",
         "read": true,
         "write": true,
         "def": ""
       },
       "native": {}
+    },
+    {
+      "_id": "bridge.dataToIob",
+      "type": "state",
+      "common": {
+        "type": "string",
+        "role": "json",
+        "name": "data from bridge",
+        "read": true,
+        "write": false,
+        "def": ""
+      },
+      "native": {}
     }
   ]
 }

package/lib/modules/bridge.js

@@ -241,9 +241,7 @@ class bridgeClass {
                         });
                     }
                     if (message.effect) {
-                        const effect = this.SubscribedTopics[topic].effects[message.effect]
-                            ? this.SubscribedTopics[topic].effects[message.effect]
-                            : '';
+                        const effect = this.SubscribedTopics[topic].effects[message.effect] ?? '';
                         await this.adapter.setForeignStateAsync(this.SubscribedTopics[topic].LightIds.effects, {
                             val: effect,
                             c: 'from bridge',
@@ -1231,6 +1229,9 @@ class bridgeClass {
                 device: { identifiers: [normalizedDeviceIdentifier.toLowerCase()], name: DeviceIdentifier },
             };
             // Add Topics
+            if (options.internal && options.internal.forceUpdate) {
+                DiscoveryPayload.force_update = true;
+            }
             DiscoveryPayload.state_topic = `${Topic}${this.EndingState}`;
             if (options.Bridgestate.subscribe) {
                 DiscoveryPayload.command_topic = `${Topic}${this.EndingSet}`;
@@ -1768,17 +1769,17 @@ class bridgeClass {
      */
     async discoverDataExchange() {
         const options = {};
-        const id = `${this.adapter.namespace}.bridge.dataExchange`;
-        const deviceObject = await this.adapter.getForeignObjectAsync(id);
+        let id = `${this.adapter.namespace}.bridge.dataFromIob`;
+        let deviceObject = await this.adapter.getForeignObjectAsync(id);
         options.common = deviceObject.common;
-        const changeInfo = await this.adapter.getChangeInfo(id);
+        let changeInfo = await this.adapter.getChangeInfo(id);
         options.Bridgestate = {
             discover: true,
             publish: true,
-            subscribe: true,
+            subscribe: false,
         };
-        options.internal = { folder: `bridge`, deviceidentifier: this.adapter.namespace };
-        const DiscoveryObject = await this.getDiscoveryObject(changeInfo, options);
+        options.internal = { folder: `bridge`, deviceidentifier: this.adapter.namespace, forceUpdate: true };
+        let DiscoveryObject = await this.getDiscoveryObject(changeInfo, options);
         this.assignIdStructure(
             this.PublishedIds,
             id,
@@ -1791,6 +1792,30 @@ class bridgeClass {
             { 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);
+
+        id = `${this.adapter.namespace}.bridge.dataToIob`;
+        deviceObject = await this.adapter.getForeignObjectAsync(id);
+        options.common = deviceObject.common;
+        changeInfo = await this.adapter.getChangeInfo(id);
+        options.Bridgestate = {
+            discover: true,
+            publish: false,
+            subscribe: true,
+        };
+        options.internal = { folder: `bridge`, deviceidentifier: this.adapter.namespace };
+        DiscoveryObject = await this.getDiscoveryObject(changeInfo, options);
+
         this.assignTopicStructure(
             this.SubscribedTopics,
             DiscoveryObject?.payload.command_topic,

package/main.js

@@ -714,7 +714,7 @@ 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')) {
+                        } else if (id.endsWith('.bridge.dataFromIob')) {
                             if (this.bridge) {
                                 await this.setState(id, state.val, true);
                                 await this.bridge.publishId(id, state.val, {});

package/package.json

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