iobroker.lorawan 1.16.6 → 1.16.8

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.8 (2025-09-17)
+* (BenAhrdt) Bring enum selection in config
+
+### 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
 

package/admin/i18n/de/translations.json

@@ -159,5 +159,7 @@
     "connection to bridge is activ": "Die Verbindung zur Bridge ist aktiv",
     "connection to bridge is closed": "Die Verbindung zur Bridge ist geschlossen",
     "new device discovered": "Neues Gerät discovered",
-    "Adapter will be stoped": "Der LoRaWAN Bridge Adapter wurde gestoppt"
+    "Adapter will be stoped": "Der LoRaWAN Bridge Adapter wurde gestoppt",
+    "BridgeEnum": "Bridge enum",
+    "BridgeEnumTooltip": "Wählen Sie eine enum (Kategorie) aus, die verwendet werden soll, um Adapter fremde States zur Bridge zu übertragen"
 }

package/admin/i18n/en/translations.json

@@ -159,5 +159,7 @@
 	"connection to bridge is activ": "connection to bridge is activ",
 	"connection to bridge is closed": "connection to bridge will be closed",
 	"new device discovered": "new device discovered",
-	"Adapter will be stoped": "The LoRaWAN Bridge Adapter will be stoped"
+	"Adapter will be stoped": "The LoRaWAN Bridge Adapter will be stoped",
+	"BridgeEnum": "Bridge Enum",
+	"BridgeEnumTooltip": "Select an enum, that is used for bringing foreign states to the bridge"
 }

package/admin/i18n/es/translations.json

@@ -159,5 +159,7 @@
     "connection to bridge is activ": "La conexión al puente es activado",
     "connection to bridge is closed": "La conexión al puente se cerrará",
     "new device discovered": "nuevo dispositivo descubierto",
-    "Adapter will be stoped": "El adaptador del puente Lorawan se detendrá"
+    "Adapter will be stoped": "El adaptador del puente Lorawan se detendrá",
+    "BridgeEnum": "Enum de puente",
+    "BridgeEnumTooltip": "Seleccione una enumación, que se usa para llevar estados extranjeros al puente"
 }

package/admin/i18n/fr/translations.json

@@ -159,5 +159,7 @@
     "connection to bridge is activ": "La connexion au pont est activ",
     "connection to bridge is closed": "La connexion au pont sera fermée",
     "new device discovered": "Nouvel appareil découvert",
-    "Adapter will be stoped": "L'adaptateur de pont Lorawan sera arrêté"
+    "Adapter will be stoped": "L'adaptateur de pont Lorawan sera arrêté",
+    "BridgeEnum": "Énumération du pont",
+    "BridgeEnumTooltip": "Sélectionnez une énumération, qui est utilisée pour amener des états étrangers au pont"
 }

package/admin/i18n/it/translations.json

@@ -159,5 +159,7 @@
     "connection to bridge is activ": "La connessione a bridge è attiva",
     "connection to bridge is closed": "La connessione al ponte sarà chiusa",
     "new device discovered": "Nuovo dispositivo scoperto",
-    "Adapter will be stoped": "L'adattatore del ponte Lorawan sarà fermato"
+    "Adapter will be stoped": "L'adattatore del ponte Lorawan sarà fermato",
+    "BridgeEnum": "Ponte enum",
+    "BridgeEnumTooltip": "Seleziona un enum, che viene utilizzato per portare stati stranieri sul ponte"
 }

package/admin/i18n/nl/translations.json

@@ -159,5 +159,7 @@
     "connection to bridge is activ": "Verbinding met Bridge is activ",
     "connection to bridge is closed": "Verbinding met Bridge wordt gesloten",
     "new device discovered": "Nieuw apparaat ontdekt",
-    "Adapter will be stoped": "De Lorawan Bridge -adapter wordt gestopt"
+    "Adapter will be stoped": "De Lorawan Bridge -adapter wordt gestopt",
+    "BridgeEnum": "Brug -opsomming",
+    "BridgeEnumTooltip": "Selecteer een opsomming, dat wordt gebruikt om buitenlandse staten naar de brug te brengen"
 }

package/admin/i18n/pl/translations.json

@@ -159,5 +159,7 @@
     "connection to bridge is activ": "Połączenie z mostem jest aktywne",
     "connection to bridge is closed": "Połączenie z mostem zostanie zamknięte",
     "new device discovered": "odkryte nowe urządzenie",
-    "Adapter will be stoped": "Adapter mostu Lorawan zostanie zatrzymany"
+    "Adapter will be stoped": "Adapter mostu Lorawan zostanie zatrzymany",
+    "BridgeEnum": "Most Enum",
+    "BridgeEnumTooltip": "Wybierz enum, które służy do przeniesienia obcego państw na most"
 }

package/admin/i18n/pt/translations.json

@@ -159,5 +159,7 @@
     "connection to bridge is activ": "A conexão com a ponte é ativista",
     "connection to bridge is closed": "A conexão com a ponte será fechada",
     "new device discovered": "novo dispositivo descoberto",
-    "Adapter will be stoped": "O adaptador da ponte Lorawan será interrompido"
+    "Adapter will be stoped": "O adaptador da ponte Lorawan será interrompido",
+    "BridgeEnum": "Enumeração da ponte",
+    "BridgeEnumTooltip": "Selecione uma enumeração, usada para trazer estados estrangeiros para a ponte"
 }

package/admin/i18n/ru/translations.json

@@ -159,5 +159,7 @@
     "connection to bridge is activ": "Соединение с мостом является активацией",
     "connection to bridge is closed": "Соединение с мостом будет закрыто",
     "new device discovered": "Новое устройство обнаружено",
-    "Adapter will be stoped": "Адаптер моста Лораван будет остановлен"
+    "Adapter will be stoped": "Адаптер моста Лораван будет остановлен",
+    "BridgeEnum": "Мост enum",
+    "BridgeEnumTooltip": "Выберите перечисление, которое используется для привлечения иностранных государств на мост"
 }

package/admin/i18n/uk/translations.json

@@ -159,5 +159,7 @@
     "connection to bridge is activ": "Підключення до мосту активується",
     "connection to bridge is closed": "Підключення до мосту буде закрито",
     "new device discovered": "Виявлений новий пристрій",
-    "Adapter will be stoped": "Адаптер мосту Лоравана буде зупинено"
+    "Adapter will be stoped": "Адаптер мосту Лоравана буде зупинено",
+    "BridgeEnum": "Мост",
+    "BridgeEnumTooltip": "Виберіть Enum, який використовується для залучення іноземних держав до мосту"
 }

package/admin/i18n/zh-cn/translations.json

@@ -159,5 +159,7 @@
     "connection to bridge is activ": "连接到桥梁是激活",
     "connection to bridge is closed": "连接到桥梁将关闭",
     "new device discovered": "发现了新设备",
-    "Adapter will be stoped": "Lorawan桥适配器将停止"
+    "Adapter will be stoped": "Lorawan桥适配器将停止",
+    "BridgeEnum": "桥梁枚举",
+    "BridgeEnumTooltip": "选择一个枚举，用于将外国带到桥梁"
 }

package/admin/jsonConfig.json

@@ -783,7 +783,21 @@
                     "md": 2,
                     "lg": 2,
                     "xl": 2
-                  },
+            	},				
+				"BridgeEnum": {
+					"type": "selectSendTo",
+					"label": "BridgeEnum",
+					"tooltip": "BridgeEnumTooltip",
+					"default": "",
+					"jsonData": "{}",
+					"command": "getEnums",
+					"hidden": "data.BridgeType === 'off'",
+					"xs": 12,
+					"sm": 5,
+					"md": 5,
+					"lg": 5,
+					"xl": 5
+				},
 				"BridgenotificationActivation":{
 					"newLine": true,
 					"type": "select",

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.16.6",
+    "version": "1.16.8",
     "news": {
+      "1.16.8": {
+        "en": "Bring enum selection in config",
+        "de": "Fügen Sie die Auswahlmöglichkeit für Aufzählungen in der Konfiguration hinzu.",
+        "ru": "Добавлена возможность выбора значения из перечисления в настройках",
+        "pt": "Trazer seleção de enumeração na configuração",
+        "nl": "Breng de enum-selectie in de configuratie",
+        "fr": "Apporter la sélection d'énumération dans la configuration",
+        "it": "Porta la selezione dell'enum nella configurazione",
+        "es": "Traer selección de enum en la configuración",
+        "pl": "Przynieś wybór enum w konfiguracji",
+        "uk": "Додано вибір типу даних \"enum\" в налаштуваннях (config).",
+        "zh-cn": "在配置中添加枚举选择"
+      },
+      "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",
@@ -67,32 +93,6 @@
         "pl": "Poprawka błędu: przestrzeń nazw również wywoływana przez funkcję work z directoryhandler",
         "uk": "виправлено помилку у просторі імен також шляхом виклику роботи з обробника директорій",
         "zh-cn": "通过调用`directoryhandler`来修复了`namespace`问题。"
-      },
-      "1.16.1": {
-        "en": "bugfix namespace also by notifications",
-        "de": "Fehlerbehebung Namespace auch bei Benachrichtigungen",
-        "ru": "исправлена ошибка с пространством имён также для уведомлений",
-        "pt": "Correção de bug no namespace também por notificações.",
-        "nl": "bugfix namespace ook bij meldingen",
-        "fr": "Correction d'un bug concernant les notifications de namespace.",
-        "it": "Risolto bug anche per i namespace nelle notifiche",
-        "es": "Corrección de error en el espacio de nombres también por notificaciones.",
-        "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功能，可以将外部状态插入到桥接器中。"
       }
     },
     "titleLang": {
@@ -422,6 +422,7 @@
     "BridgeType": "off",
     "EnableRefresh": true,
     "RefreshDiscoveryCronJob": "0 * * * *",
+    "BridgeEnum": "",
     "BridgenotificationActivation": "allNotifications, brdigeConnection, newDiscover, deviceState",
     "BridgeDevicenotificationActivation": "allNotifications, brdigeConnection, newDiscover, deviceState",
     "DeviceIdentifiers": [

package/lib/modules/bridge.js

@@ -1571,12 +1571,14 @@ class bridgeClass {
         const activeFunction = 'bridge.js - getForeignStatesForStandardEntities';
         this.adapter.log.debug(`Function ${activeFunction} started.`);
         try {
-            const idBridgefunction = 'enum.functions.bridge';
-            await this.adapter.subscribeForeignObjectsAsync('enum.functions.bridge');
-            const bridgeElements = await this.adapter.getForeignObjectAsync(idBridgefunction);
-            if (bridgeElements) {
-                for (const member of bridgeElements.common.members) {
-                    await this.discoverForeignRange(member);
+            const idBridgefunction = this.adapter.config.BridgeEnum;
+            if (idBridgefunction !== '') {
+                await this.adapter.subscribeForeignObjectsAsync(idBridgefunction);
+                const bridgeElements = await this.adapter.getForeignObjectAsync(idBridgefunction);
+                if (bridgeElements) {
+                    for (const member of bridgeElements.common.members) {
+                        await this.discoverForeignRange(member);
+                    }
                 }
             }
         } catch (error) {
@@ -1589,35 +1591,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}`);
         }
     }
 
@@ -1633,21 +1641,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

@@ -34,6 +34,8 @@ class Lorawan extends utils.Adapter {
 
         // Simulation variables
         this.simulation = {};
+        this.mySystemConfig;
+        this.language;
     }
 
     onFileChange(_id, _fileName, _size) {
@@ -50,6 +52,10 @@ class Lorawan extends utils.Adapter {
             // read system translation out of i18n translation
             this.i18nTranslation = await this.geti18nTranslation();
 
+            // get systemconfig and configued language
+            this.mySystemConfig = await this.getForeignObjectAsync('system.config');
+            this.language = this.mySystemConfig?.common.language || 'en';
+
             // create downlinkConfigs
             this.downlinkConfighandler = new downlinkConfighandlerClass(this);
 
@@ -422,26 +428,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}`);
         }
     }
 
@@ -1219,6 +1230,27 @@ class Lorawan extends utils.Adapter {
                     } catch (error) {
                         this.log.error(error);
                     }
+                } else if (obj.command === 'getEnums') {
+                    try {
+                        const enums = [{ label: 'No Enum selected', value: '*' }];
+                        const enumList = await this.getEnumsAsync();
+                        for (const enumtyp of Object.values(enumList)) {
+                            for (const myEnum of Object.values(enumtyp)) {
+                                const value = myEnum._id;
+                                let label = myEnum.common.name;
+                                if (typeof label !== 'string') {
+                                    if (this.language) {
+                                        label = myEnum.common.name[this.language];
+                                    }
+                                }
+                                label += ` (${myEnum._id.substring(5, myEnum._id.length)})`;
+                                enums.push({ label: label.toString(), value: value });
+                            }
+                        }
+                        this.sendTo(obj.from, obj.command, enums, obj.callback);
+                    } catch (error) {
+                        this.log.error(error);
+                    }
                 } else {
                     const result = { error: true, message: 'No message matched', received: obj.message };
                     if (obj.callback) {

package/package.json

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