iobroker.lorawan 1.16.5 → 1.16.7

package/README.md

@@ -23,6 +23,13 @@ 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.16.7 (2025-09-17)
+* (BenAhrdt) Bugfix deleting discovered devices
+* (BenAhrdt) build in devug logging to find bug in devicename
+
+### 1.16.6 (2025-09-17)
+* (BenAhrdt) Change detection of new Discovery from LoRaWAN devices
+
 ### 1.16.5 (2025-09-17)
 * (BenAhrdt) Bugfix in notifications to Bridge (new device dicovered) => namespace not set
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.16.5",
+    "version": "1.16.7",
     "news": {
+      "1.16.7": {
+        "en": "Bugfix deleting discovered devices\nbuild in devug logging to find bug in devicename",
+        "de": "Fehlerbehebung beim Löschen entdeckter Geräte\nFüge Debug-Logging hinzu, um Fehler im Gerätenamen zu finden.",
+        "ru": "Исправлена ошибка удаления обнаруженных устройств.\nДобавлена отладочная запись для поиска ошибок в имени устройства.",
+        "pt": "Correção de bug ao excluir dispositivos descobertos\nAdicionar registro de depuração para encontrar bugs no nome do dispositivo",
+        "nl": "Bugfix voor het verwijderen van ontdekte apparaten\nBouw debug logging in om bugs in apparaatnaam te vinden",
+        "fr": "Correction de bug suppression des périphériques découverts\nIntégration du journal de débogage pour trouver des bugs dans le nom du périphérique",
+        "it": "Correzione bug eliminazione dispositivi scoperti\nImplementare il logging di debug per trovare bug nel nome del dispositivo",
+        "es": "Corrección de errores al eliminar dispositivos descubiertos.\nImplementación de registro de depuración para encontrar errores en el nombre del dispositivo",
+        "pl": "Naprawiono błąd usuwania odkrytych urządzeń.\nZaimplementowano logowanie debugowania w celu znalezienia błędu w nazwie urządzenia.",
+        "uk": "Виправлено помилку видалення виявлених пристроїв.\nВбудоване відлагодження для пошуку помилки в імені пристрою.",
+        "zh-cn": "修复删除已发现设备时出现的问题\n构建调试日志以查找设备名称中的错误"
+      },
+      "1.16.6": {
+        "en": "Change detection of new Discovery from LoRaWAN devices",
+        "de": "Änderung der Erkennung neuer Entdeckungen von LoRaWAN-Geräten",
+        "ru": "Обнаружение изменений новых устройств LoRaWAN",
+        "pt": "Detecção de novos dispositivos LoRaWAN na Descoberta",
+        "nl": "Wijziging in detectie van nieuwe Discovery van LoRaWAN apparaten",
+        "fr": "Détection des nouvelles découvertes des dispositifs LoRaWAN",
+        "it": "Rilevamento delle nuove scoperte dei dispositivi LoRaWAN",
+        "es": "Detección de cambios de nuevos dispositivos de descubrimiento de LoRaWAN",
+        "pl": "Wykrywanie zmian w nowym Discovery urządzeń LoRaWAN",
+        "uk": "Виявлення нових пристроїв Discovery з LoRaWAN",
+        "zh-cn": "更改LoRaWAN设备的新发现检测"
+      },
       "1.16.5": {
         "en": "Bugfix in notifications to Bridge (new device dicovered) => namespace not set",
         "de": "Fehlerbehebung bei Benachrichtigungen an Bridge (neues Gerät erkannt) => Namespace nicht festgelegt",
@@ -67,32 +93,6 @@
         "pl": "naprawiono błąd z przestrzenią nazw również w powiadomieniach",
         "uk": "виправлення помилки простору імен також за допомогою сповіщень",
         "zh-cn": "修复命名空间通知问题"
-      },
-      "1.16.0": {
-        "en": "possibility to insert foreign states to bridge by using enum.functions.bridge",
-        "de": "Möglichkeit, externe Zustände über enum.functions.bridge in die Bridge einzufügen.",
-        "ru": "Возможность вставки внешних состояний в мост путем использования enum.functions.bridge",
-        "pt": "possibilidade de inserir estados estrangeiros na ponte usando enum.functions.bridge",
-        "nl": "Mogelijkheid om externe toestanden in de brug in te voegen door gebruik te maken van enum.functions.bridge.",
-        "fr": "possibilité d'insérer des états étrangers dans le pont en utilisant enum.functions.bridge",
-        "it": "Possibilità di inserire stati esterni al bridge utilizzando enum.functions.bridge",
-        "es": "Posibilidad de insertar estados extranjeros en el puente utilizando enum.functions.bridge",
-        "pl": "możliwość wstawienia stanów zewnętrznych do mostka za pomocą enum.functions.bridge",
-        "uk": "Можливість додавання зовнішніх станів до моста за допомогою enum.functions.bridge",
-        "zh-cn": "通过使用enum.functions.bridge功能，可以将外部状态插入到桥接器中。"
-      },
-      "1.15.8": {
-        "en": "remove await from some callings",
-        "de": "Entferne das „await“ aus einigen Aufrufen.",
-        "ru": "Удалите ожидание (await) из некоторых вызовов",
-        "pt": "remover await de algumas chamadas",
-        "nl": "Verwijder 'await' uit enkele aanroepen.",
-        "fr": "supprimer l'attente de certains appels",
-        "it": "Rimuovere l'attesa da alcune chiamate.",
-        "es": "eliminar await de algunas llamadas",
-        "pl": "Usuń oczekiwanie (await) z niektórych wywołań.",
-        "uk": "видаліть await із деяких викликів",
-        "zh-cn": "从部分调用中删除 await"
       }
     },
     "titleLang": {

package/lib/modules/bridge.js

@@ -234,12 +234,9 @@ class bridgeClass {
         this.adapter.log.debug(`Function ${activeFunction} started.`);
         try {
             if (this.bridgeMqttClient.internalConnectionstate) {
-                const countBefore = Object.keys(this.Notifications).length;
-                await this.discovery(id, options);
-                // notify new discovered Devices (Notification count changed)
-                // On startup this ist mostly true, but the genereal notification id will set later.
-                // So there is no notificaton published to Bridge
-                if (countBefore !== Object.keys(this.Notifications).length) {
+                const newNotification = await this.discovery(id, options);
+                // notify new discovered Devices (new notification)
+                if (newNotification) {
                     const device = this.DiscoveredIds[id].informations.usedDeviceId;
                     const application = this.DiscoveredIds[id].informations.usedApplicationName;
                     const message = `${this.adapter.i18nTranslation['new device discovered']}.\n${this.adapter.i18nTranslation['Device']}: ${device}\n${this.adapter.i18nTranslation['Application']}: ${application}`;
@@ -280,10 +277,10 @@ class bridgeClass {
             if (!this.CheckedIds[id] || (options && options.forceDiscovery)) {
                 this.CheckedIds[id] = {};
                 this.adapter.log.debug(`discover the id ${id}`);
-                await this.buildDiscovery(id, options);
-            } else {
-                this.adapter.log.debug(`${id} allready checked for discovery`);
+                return await this.buildDiscovery(id, options);
             }
+            this.adapter.log.debug(`${id} allready checked for discovery`);
+            return false;
         } catch (error) {
             this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
         }
@@ -398,7 +395,9 @@ class bridgeClass {
                         usedDeviceId: changeInfo.usedDeviceId,
                     },
                 });
+                return true;
             }
+            return false;
         } catch (error) {
             this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
         }
@@ -817,6 +816,8 @@ class bridgeClass {
         const activeFunction = 'bridge.js - buildDiscovery';
         this.adapter.log.debug(`Function ${activeFunction} started.`);
         try {
+            // Defaultvalue for discover
+            let newNotification = false;
             // Query for decoded Folder
             if (id.includes(`${this.adapter.messagehandler.directoryhandler.reachableSubfolders.uplinkDecoded}.`)) {
                 const changeInfo = await this.adapter.getChangeInfo(id);
@@ -876,7 +877,11 @@ class bridgeClass {
                                 usedDeviceId: changeInfo.usedDeviceId,
                             },
                         });
-                        await this.discoverDeviceNotifications(changeInfo);
+                        if (await this.discoverDeviceNotifications(changeInfo)) {
+                            newNotification = true;
+                        } else {
+                            newNotification = false;
+                        }
                     }
                 }
 
@@ -950,10 +955,15 @@ class bridgeClass {
                                 usedDeviceId: changeInfo.usedDeviceId,
                             },
                         });
-                        await this.discoverDeviceNotifications(changeInfo);
+                        if (await this.discoverDeviceNotifications(changeInfo)) {
+                            newNotification = true;
+                        } else {
+                            newNotification = false;
+                        }
                     }
                 }
             }
+            return newNotification;
         } catch (error) {
             this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
         }
@@ -1579,35 +1589,41 @@ class bridgeClass {
      * @param clear clear the ids from internal memory
      */
     async discoverForeignRange(id, clear = false) {
-        const params = {
-            startkey: id,
-            endkey: `${id}.\u9999`,
-        };
-        if (!clear) {
-            this.ForeignBridgeMembers[id] = id;
-        } else {
-            delete this.ForeignBridgeMembers[id];
-        }
-        const states = await this.adapter.getObjectViewAsync('system', 'state', params);
-        for (const state of states.rows) {
+        const activeFunction = 'bridge.js - discoverForeignRange';
+        this.adapter.log.debug(`Function ${activeFunction} started.`);
+        try {
+            const params = {
+                startkey: id,
+                endkey: `${id}.\u9999`,
+            };
             if (!clear) {
-                const common = state.value.common;
-                await this.discoverForeignStandardEntity(state.id, { common: common });
+                this.ForeignBridgeMembers[id] = id;
             } else {
-                if (
-                    this.DiscoveredIds[id] &&
-                    this.DiscoveredIds[id].payload &&
-                    this.DiscoveredIds[id].payload.command_topic
-                ) {
-                    delete this.SubscribedTopics[this.DiscoveredIds[id].payload.command_topic];
+                delete this.ForeignBridgeMembers[id];
+            }
+            const states = await this.adapter.getObjectViewAsync('system', 'state', params);
+            for (const state of states.rows) {
+                if (!clear) {
+                    const common = state.value.common;
+                    await this.discoverForeignStandardEntity(state.id, { common: common });
+                } else {
+                    if (
+                        this.DiscoveredIds[state.id] &&
+                        this.DiscoveredIds[state.id].payload &&
+                        this.DiscoveredIds[state.id].payload.command_topic
+                    ) {
+                        delete this.SubscribedTopics[this.DiscoveredIds[state.id].payload.command_topic];
+                    }
+                    delete this.PublishedIds[state.id];
+                    this.DiscoveredIds[state.id].payload = {};
+                    await this.adapter.unsubscribeForeignStatesAsync(state.id);
+                    await this.publishDiscovery(state.id, this.DiscoveredIds[state.id]);
+                    delete this.DiscoveredIds[state.id];
+                    await this.adapter.setState('info.discoveredIds', JSON.stringify(this.DiscoveredIds), true);
                 }
-                delete this.PublishedIds[id];
-                this.DiscoveredIds[id].payload = {};
-                await this.adapter.unsubscribeForeignStatesAsync(id);
-                await this.publishDiscovery(id, this.DiscoveredIds[id]);
-                delete this.DiscoveredIds[id];
-                await this.adapter.setState('info.discoveredIds', JSON.stringify(this.DiscoveredIds), true);
             }
+        } catch (error) {
+            this.adapter.log.error(`error at ${activeFunction}:  ${error} - id: ${id} - clear: ${clear}`);
         }
     }
 
@@ -1623,21 +1639,39 @@ class bridgeClass {
             let partentId = '';
             let parentName = '';
             const parentDevice = await this.getParentDevice(id);
-            if (typeof parentDevice === 'string') {
+            if (typeof parentDevice !== 'object') {
+                this.adapter.log.debug(`Parentdevice: ${parentDevice}`);
                 const parentChannel = await this.getParentChannel(id);
-                if (typeof parentChannel === 'string') {
-                    partentId = parentChannel;
+                if (typeof parentChannel !== 'object') {
+                    if (parentChannel === undefined) {
+                        const indexOfFistDot = id.indexOf('.');
+                        const indexOfSecondDot = id.indexOf('.', indexOfFistDot);
+                        partentId = id.substring(0, indexOfSecondDot);
+                    } else {
+                        partentId = parentChannel;
+                    }
                     parentName = partentId;
                 } else {
+                    this.adapter.log.debug(`Parentchannel: ${JSON.stringify(parentChannel)}`);
                     partentId = parentChannel._id;
-                    parentName = parentChannel.common.name;
+                    if (typeof parentChannel.common.name === 'string') {
+                        parentName = parentChannel.common.name;
+                    } else {
+                        parentName = parentChannel.common.name.de;
+                    }
                 }
             } else {
+                this.adapter.log.debug(`Parentdevice: ${JSON.stringify(parentDevice)}`);
                 partentId = parentDevice._id;
-                parentName = parentDevice.common.name;
+                if (typeof parentDevice.common.name === 'string') {
+                    parentName = parentDevice.common.name;
+                } else {
+                    parentName = parentDevice.common.name.de;
+                }
             }
             const deviceIdentifier = parentName;
             const statename = id.substring(partentId.length + 1, id.length);
+            this.adapter.log.debug(`Assigned - deviceIdentifier: ${deviceIdentifier} - statename: ${statename}`);
             options.Bridgestate = {
                 publish: options.common.read,
                 subscribe: options.common.write,

package/main.js

@@ -422,26 +422,31 @@ class Lorawan extends utils.Adapter {
      */
     async onObjectChange(id, obj) {
         this.log.debug(`${id} is changed into ${JSON.stringify(obj.common)}`);
-
-        // Only work, if bridge is activ
-        if (this.bridge) {
-            // Erzeugen der HA Bridged für Control
-            // check for new Entry
-            const members = obj.common.members;
-            for (const member of members) {
-                if (!this.bridge.ForeignBridgeMembers[member]) {
-                    await this.bridge?.discoverForeignRange(member);
-                    return;
+        const activeFunction = 'main.js - onObjectChange';
+        this.log.debug(`Function ${activeFunction} started.`);
+        try {
+            // Only work, if bridge is activ
+            if (this.bridge) {
+                // Erzeugen der HA Bridged für Control
+                // check for new Entry
+                const members = obj.common.members;
+                for (const member of members) {
+                    if (!this.bridge.ForeignBridgeMembers[member]) {
+                        await this.bridge?.discoverForeignRange(member);
+                        return;
+                    }
                 }
-            }
 
-            // check for Entry removed
-            for (const member of Object.values(this.bridge.ForeignBridgeMembers)) {
-                if (!members.includes(member)) {
-                    await this.bridge.discoverForeignRange(member, true);
-                    return;
+                // check for Entry removed
+                for (const member of Object.values(this.bridge.ForeignBridgeMembers)) {
+                    if (!members.includes(member)) {
+                        await this.bridge.discoverForeignRange(member, true);
+                        return;
+                    }
                 }
             }
+        } catch (error) {
+            this.log.error(`error at ${activeFunction}:  ${error}`);
         }
     }
 

package/package.json

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