iobroker.lorawan 1.18.18 → 1.18.20

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.20 (2025-11-26)
+* (BenAhrdt) Dont write discovery multiple in internal object (in case of reconnect bridge)
+
+### 1.18.19 (2025-11-26)
+* (BenAhrdt) possibility to publish one id in spezial and normal entity
+
 ### 1.18.18 (2025-11-25)
 * (BenAhrdt) Bugfix limit sitch topic to state_topic
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.18.18",
+    "version": "1.18.20",
     "news": {
+      "1.18.20": {
+        "en": "Dont write discovery multiple in internal object (in case of reconnect bridge)",
+        "de": "Schreibe nicht mehrere Entdeckungen im internen Objekt (im Falle der Wiederverbindungsbrücke)",
+        "ru": "Не записывайте открытие множественного числа во внутренний объект (в случае повторного подключения моста)",
+        "pt": "Não escreva múltiplas descobertas em objeto interno (no caso de reconectar ponte)",
+        "nl": "Niet schrijven ontdekking meerdere in interne object (in het geval van reconnect brug)",
+        "fr": "Ne pas écrire la découverte multiple dans l'objet interne (en cas de reconnect pont)",
+        "it": "Non scrivere la scoperta multipla in oggetto interno (in caso di riconnettere il ponte)",
+        "es": "No escriba descubrimiento múltiple en objeto interno (en caso de puente de reconexión)",
+        "pl": "Nie pisz wielokrotnego odkrycia w obiekcie wewnętrznym (w przypadku ponownego podłączenia mostu)",
+        "uk": "Не писати відкриття декількох в внутрішньому об'єкті (у разі відключення мосту)",
+        "zh-cn": "不要在内部对象中写入多个发现( 如果是重联桥)"
+      },
+      "1.18.19": {
+        "en": "possibility to publish one id in spezial and normal entity",
+        "de": "möglichkeit, eine id in spezial und normal zu veröffentlichen",
+        "ru": "возможность публикации одного идентификатора в пространственной и нормальной сущности",
+        "pt": "possibilidade de publicar um id em entidade específica e normal",
+        "nl": "mogelijkheid om één id te publiceren in een specifieke en normale entiteit",
+        "fr": "possibilité de publier un id en entité spezial et normale",
+        "it": "possibilità di pubblicare un id in entità spezial e normale",
+        "es": "posibilidad de publicar una id en entidad espacial y normal",
+        "pl": "możliwość opublikowania jednego identyfikatora w jednostce spezialnej i normalnej",
+        "uk": "можливість опублікувати одну ідентифікацію в спорідненому і нормальному суб’єкті",
+        "zh-cn": "在普通实体中公布一个标识的可能性"
+      },
       "1.18.18": {
         "en": "Bugfix limit sitch topic to state_topic",
         "de": "Bugfix limit sitch Thema zu state_topic",
@@ -67,32 +93,6 @@
         "pl": "dodaj pokrycie do specjalnych urządzeń",
         "uk": "додати чохол на спеціальні пристрої",
         "zh-cn": "将封面添加到特殊设备"
-      },
-      "1.18.13": {
-        "en": "Bugfix: wrong subscribtion of fx ids",
-        "de": "Bugfix: falsche Anmeldung von fx ids",
-        "ru": "Bugfix: неправильная подписка на fx ids",
-        "pt": "Correção de Bugfix: subscrita errada de fx ids",
-        "nl": "Bugfix: verkeerde subscriptie van fx ids",
-        "fr": "Bugfix : mauvaise subscribtion des ids fx",
-        "it": "Bugfix: sottoscrizione sbagliata di fx ids",
-        "es": "Bugfix: la subscripción incorrecta de los ids de fx",
-        "pl": "Bugfix: błędna subskrypcja fix ids",
-        "uk": "Помилки: неправильне підсобнення попелиці",
-        "zh-cn": "错误fix: fx ID 的子缩写错误"
-      },
-      "1.18.12": {
-        "en": "Bugfix fx in case of number",
-        "de": "Bugfix fx bei Anzahl",
-        "ru": "Bugfix fx в случае номера",
-        "pt": "Bugfix fx em caso de número",
-        "nl": "Bugfix fx bij aantal",
-        "fr": "Bugfix fx en cas de nombre",
-        "it": "Bugfix fx in caso di numero",
-        "es": "Fx Bugfix en caso de número",
-        "pl": "Bugfix fx w przypadku liczby",
-        "uk": "Виправлення помилок при кількості",
-        "zh-cn": "如果出现数字, 错误fx"
       }
     },
     "titleLang": {

package/lib/modules/bridge.js

@@ -753,72 +753,159 @@ class bridgeClass {
                     }
                 }
 
-                if (this.PublishedIds[id].light) {
-                    val = {};
-                    val.state = (await this.adapter.getForeignStateAsync(this.PublishedIds[id].LightIds.onOff)).val;
-                    val.state = val.state === true ? 'ON' : 'OFF';
-                    if (this.PublishedIds[id].LightIds.brightness) {
-                        val.brightness = (
-                            await this.adapter.getForeignStateAsync(this.PublishedIds[id].LightIds.brightness)
+                // Iterate the state_topics
+                for (const publishTopic in this.PublishedIds[id].publish) {
+                    if (this.PublishedIds[id].publish[publishTopic].light) {
+                        val = {};
+                        val.state = (
+                            await this.adapter.getForeignStateAsync(
+                                this.PublishedIds[id].publish[publishTopic].publish[publishTopic].LightIds.onOff,
+                            )
                         ).val;
+                        val.state = val.state === true ? 'ON' : 'OFF';
+                        if (this.PublishedIds[id].publish[publishTopic].LightIds.brightness) {
+                            val.brightness = (
+                                await this.adapter.getForeignStateAsync(
+                                    this.PublishedIds[id].publish[publishTopic].LightIds.brightness,
+                                )
+                            ).val;
+                        }
+                        if (this.PublishedIds[id].publish[publishTopic].LightIds.color) {
+                            val.color_mode = 'rgb';
+                            val.color = this.hexToRgb(
+                                (
+                                    await this.adapter.getForeignStateAsync(
+                                        this.PublishedIds[id].publish[publishTopic].LightIds.color,
+                                    )
+                                ).val,
+                            );
+                        }
+                        if (this.PublishedIds[id].publish[publishTopic].LightIds.effects) {
+                            const effect = (
+                                await this.adapter.getForeignStateAsync(
+                                    this.PublishedIds[id].publish[publishTopic].LightIds.effects,
+                                )
+                            ).val;
+                            val.effect = '';
+                            if (this.PublishedIds[id].publish[publishTopic].effects[effect]) {
+                                val.effect = this.PublishedIds[id].publish[publishTopic].effects[effect];
+                            }
+                        }
                     }
-                    if (this.PublishedIds[id].LightIds.color) {
-                        val.color_mode = 'rgb';
-                        val.color = this.hexToRgb(
-                            (await this.adapter.getForeignStateAsync(this.PublishedIds[id].LightIds.color)).val,
-                        );
+
+                    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];
+                            } else {
+                                val = '';
+                            }
+                        }
                     }
-                    if (this.PublishedIds[id].LightIds.effects) {
-                        const effect = (await this.adapter.getForeignStateAsync(this.PublishedIds[id].LightIds.effects))
-                            .val;
-                        val.effect = '';
-                        if (this.PublishedIds[id].effects[effect]) {
-                            val.effect = this.PublishedIds[id].effects[effect];
+
+                    // safe old values (5 last values)
+                    if (this.PublishedIds[id].publish[publishTopic].values) {
+                        if (!this.PublishedIds[id].publish[publishTopic].oldValues) {
+                            this.PublishedIds[id].publish[publishTopic].oldValues = [];
+                        }
+                        if (this.PublishedIds[id].publish[publishTopic].oldValues.length >= this.MaxValueCount) {
+                            this.PublishedIds[id].publish[publishTopic].oldValues.pop();
                         }
+                        this.PublishedIds[id].publish[publishTopic].oldValues.unshift(
+                            structuredClone(this.PublishedIds[id].publish[publishTopic].values),
+                        );
+                    }
+                    if (!this.PublishedIds[id].publish[publishTopic].values) {
+                        this.PublishedIds[id].publish[publishTopic].values = {};
+                    }
+                    this.PublishedIds[id].publish[publishTopic].values.val = val;
+                    this.PublishedIds[id].publish[publishTopic].values.ts = Date.now();
+                    this.PublishedIds[id].publish[publishTopic].values.time = new Date(Date.now()).toLocaleString(
+                        this.Timeoutput.Argument,
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        // @ts-expect-error
+                        this.Timeoutput.Format,
+                    );
+                    if (typeof val !== 'string') {
+                        val = JSON.stringify(val);
+                    }
+                    if (!options) {
+                        options = { retain: true };
+                    } else if (options.retain === undefined) {
+                        options.retain = true;
                     }
+                    await this.bridgeMqttClient.publish(publishTopic, val, options);
+                    await this.adapter.setState('info.publishedIds', JSON.stringify(this.PublishedIds), true);
                 }
 
-                if (this.PublishedIds[id].cover) {
-                    if (this.PublishedIds[id].message) {
-                        if (this.PublishedIds[id].message[val]) {
-                            val = this.PublishedIds[id].message[val];
-                        } else {
-                            val = '';
+                /* alt 26.11.2025 
+                    if (this.PublishedIds[id].light) {
+                        val = {};
+                        val.state = (await this.adapter.getForeignStateAsync(this.PublishedIds[id].LightIds.onOff)).val;
+                        val.state = val.state === true ? 'ON' : 'OFF';
+                        if (this.PublishedIds[id].LightIds.brightness) {
+                            val.brightness = (
+                                await this.adapter.getForeignStateAsync(this.PublishedIds[id].LightIds.brightness)
+                            ).val;
+                        }
+                        if (this.PublishedIds[id].LightIds.color) {
+                            val.color_mode = 'rgb';
+                            val.color = this.hexToRgb(
+                                (await this.adapter.getForeignStateAsync(this.PublishedIds[id].LightIds.color)).val,
+                            );
+                        }
+                        if (this.PublishedIds[id].LightIds.effects) {
+                            const effect = (await this.adapter.getForeignStateAsync(this.PublishedIds[id].LightIds.effects))
+                                .val;
+                            val.effect = '';
+                            if (this.PublishedIds[id].effects[effect]) {
+                                val.effect = this.PublishedIds[id].effects[effect];
+                            }
                         }
                     }
-                }
 
-                // safe old values (5 last values)
-                if (this.PublishedIds[id].values) {
-                    if (!this.PublishedIds[id].oldValues) {
-                        this.PublishedIds[id].oldValues = [];
+                    if (this.PublishedIds[id].cover) {
+                        if (this.PublishedIds[id].message) {
+                            if (this.PublishedIds[id].message[val]) {
+                                val = this.PublishedIds[id].message[val];
+                            } else {
+                                val = '';
+                            }
+                        }
                     }
-                    if (this.PublishedIds[id].oldValues.length >= this.MaxValueCount) {
-                        this.PublishedIds[id].oldValues.pop();
+
+                    // safe old values (5 last values)
+                    if (this.PublishedIds[id].values) {
+                        if (!this.PublishedIds[id].oldValues) {
+                            this.PublishedIds[id].oldValues = [];
+                        }
+                        if (this.PublishedIds[id].oldValues.length >= this.MaxValueCount) {
+                            this.PublishedIds[id].oldValues.pop();
+                        }
+                        this.PublishedIds[id].oldValues.unshift(structuredClone(this.PublishedIds[id].values));
                     }
-                    this.PublishedIds[id].oldValues.unshift(structuredClone(this.PublishedIds[id].values));
-                }
-                if (!this.PublishedIds[id].values) {
-                    this.PublishedIds[id].values = {};
-                }
-                this.PublishedIds[id].values.val = val;
-                this.PublishedIds[id].values.ts = Date.now();
-                this.PublishedIds[id].values.time = new Date(Date.now()).toLocaleString(
-                    this.Timeoutput.Argument,
-                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                    // @ts-expect-error
-                    this.Timeoutput.Format,
-                );
-                if (typeof val !== 'string') {
-                    val = JSON.stringify(val);
-                }
-                if (!options) {
-                    options = { retain: true };
-                } else if (options.retain === undefined) {
-                    options.retain = true;
-                }
-                await this.bridgeMqttClient.publish(this.PublishedIds[id].state_topic, val, options);
-                await this.adapter.setState('info.publishedIds', JSON.stringify(this.PublishedIds), true);
+                    if (!this.PublishedIds[id].values) {
+                        this.PublishedIds[id].values = {};
+                    }
+                    this.PublishedIds[id].values.val = val;
+                    this.PublishedIds[id].values.ts = Date.now();
+                    this.PublishedIds[id].values.time = new Date(Date.now()).toLocaleString(
+                        this.Timeoutput.Argument,
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        // @ts-expect-error
+                        this.Timeoutput.Format,
+                    );
+                    if (typeof val !== 'string') {
+                        val = JSON.stringify(val);
+                    }
+                    if (!options) {
+                        options = { retain: true };
+                    } else if (options.retain === undefined) {
+                        options.retain = true;
+                    }
+                    await this.bridgeMqttClient.publish(this.PublishedIds[id].state_topic, val, options);
+                    await this.adapter.setState('info.publishedIds', JSON.stringify(this.PublishedIds), true);
+            */
             } else {
                 this.adapter.log.debug(`Id ${id} is not set for publish.`);
             }
@@ -1004,12 +1091,13 @@ class bridgeClass {
      */
     assignIdStructure(assignObject, indexId, informations, topic, payload, state_topic, options) {
         if (!assignObject[indexId]) {
-            assignObject[indexId] = { discovery: [] };
+            assignObject[indexId] = { discovery: [], publish: {} };
         }
         assignObject[indexId].discovery.push({
             topic: topic,
             payload: structuredClone(payload),
         });
+        /* alt 26.11.2025
         assignObject[indexId].state_topic = state_topic;
         assignObject[indexId].informations = structuredClone(informations);
         if (options) {
@@ -1017,6 +1105,16 @@ class bridgeClass {
                 assignObject[indexId][option] = options[option];
             }
         }
+        */
+        if (!assignObject[indexId].publish[state_topic]) {
+            assignObject[indexId].publish[state_topic] = {};
+            assignObject[indexId].publish[state_topic].informations = structuredClone(informations);
+            if (options) {
+                for (const option in options) {
+                    assignObject[indexId].publish[state_topic][option] = options[option];
+                }
+            }
+        }
     }
 
     /*********************************************************************
@@ -1567,6 +1665,11 @@ class bridgeClass {
             // get old Discovered ids
             this.OldDiscoveredIds = JSON.parse((await this.adapter.getStateAsync('info.discoveredIds')).val);
             this.oldDiscoveredDevices = this.generateOldDevices(this.OldDiscoveredIds);
+            // Clear object of all subscribed Ids and published Topics
+            this.SubscribedTopics = {};
+            this.PublishedIds = {};
+            this.Notifications = {};
+
             //this.adapter.log.error(JSON.stringify(this.oldDiscoveredDevices));
             await this.discoverGeneralNotification();
 

package/package.json

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