iobroker.lorawan 1.17.10 → 1.17.12

package/README.md

@@ -23,6 +23,15 @@ 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.17.12 (2025-09-24)
+* (BenAhrdt) Virtual Mode in default selected for Climate Entities
+* (BenAhrdt) improve hidden attribute for climate entitie in LoRaWAN
+* (BenAhrdt) change discovery delete {} => ''
+
+### 1.17.11 (2025-09-23)
+* (BenAhrdt) dont fillDownlinks in case of not implemented messagetype
+* (BenAhrdt) type of json ids changed to string
+
 ### 1.17.10 (2025-09-23)
 * (BenAhrdt) Update topics und qnique ids
 

package/admin/jsonConfig.json

@@ -1409,6 +1409,7 @@
 							"label": "Device",
 							"default": "*",
 							"jsonData": "{\"application\":\"${data.ModeApplication}\"}",
+							"hidden": "data.ModeApplication === 'NotPresent'",
 							"command": "getDevicesForClimateConfig",
 							"alsoDependsOn":[
                         		"ModeApplication"
@@ -1424,6 +1425,7 @@
 							"attr": "ModeFolder",
 							"label": "Folder",
 							"default": "uplink.decoded",
+							"hidden": "data.ModeApplication === 'NotPresent'",
 							"options": [
 								{"label":"uplink.decoded","value":"uplink.decoded"}
 							],
@@ -1440,6 +1442,7 @@
 							"default": "No State selected",
 							"jsonData": "{\"application\":\"${data.ModeApplication}\",\"device\":\"${data.ModeDevice}\",\"folder\":\"${data.ModeFolder}\"}",
 							"command": "getStatesForClimateConfig",
+							"hidden": "data.ModeApplication === 'NotPresent'",
 							"noTranslation": true,
 							"alsoDependsOn":[
                         		"ModeApplication",
@@ -1546,7 +1549,7 @@
 							"attr": "VirtualMode",
 							"label": "VirtualMode",
 							"tooltip": "VirtualModeTooltip",
-							"default": false,
+							"default": true,
 							"xs": 12,
 							"sm": 2,
 							"md": 2,

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.17.10",
+    "version": "1.17.12",
     "news": {
+      "1.17.12": {
+        "en": "Virtual Mode in default selected for Climate Entities\nimprove hidden attribute for climate entitie in LoRaWAN\nchange discovery delete {} => ''",
+        "de": "Virtueller Modus in Standardeinstellung für Climate Entities\nverbessern Sie das versteckte Attribut für den Klimaschutz in LoRaWAN\nänderung der entdeckung löschen {} => ' '",
+        "ru": "Виртуальный режим по умолчанию выбран для климатических объектов\nулучшение скрытого атрибута для климатического объекта в LoRaWAN\nобнаружение изменений удалить {} => \"",
+        "pt": "Modo Virtual por omissão seleccionado para Entidades Climáticas\nmelhorar o atributo oculto para o clima em LoRaWAN\nalterar a descoberta apagar {} => ' '",
+        "nl": "Virtuele modus in standaard geselecteerd voor klimaatentiteiten\nverbeteren verborgen attribuut voor klimaat entitie in LoRaWAN\nde ontdekking wijzigen delete {} => ' '",
+        "fr": "Mode virtuel par défaut sélectionné pour les entités climatiques\naméliorer l'attribut caché pour entitie climatique dans LoRaWAN\nmodifier découverte supprimer {} => ' '",
+        "it": "Modalità virtuale in default selezionata per le Entità Climatiche\nmigliorare l'attributo nascosto per il clima in LoRaWAN\ncambiamento scoperta eliminare {} = > ' '",
+        "es": "Modo virtual por defecto seleccionado para Entidades climáticas\nmejorar el atributo oculto para el aislamiento climático en LoRaWAN\ncambio de descubrimiento eliminar {} = confianza ' '",
+        "pl": "Tryb wirtualny domyślnie wybrany dla podmiotów klimatycznych\npoprawić ukryte atrybuty dla klimatu w LoRaWAN\nzmień odkrycie usuń {} = > ''",
+        "uk": "Віртуальний режим за замовчуванням, вибраний для кліматичних обов'язків\nпокращуйте прихований атрибут для ентіту клімату в LoRaWAN\nвидалити зміни {} => ' р",
+        "zh-cn": "为气候实体选择默认的虚拟模式\n改善LoRaWAN中气候内涵的隐藏属性\n更改发现删除 {}}  '"
+      },
+      "1.17.11": {
+        "en": "dont fillDownlinks in case of not implemented messagetype\ntype of json ids changed to string",
+        "de": "nicht ausfüllen Downlinks bei nicht implementiertem Nachrichtentyp\nart der json ids geändert in string",
+        "ru": "не заполнять Downlinks в случае нереализованного типа сообщения\nтип json ids изменили на строку",
+        "pt": "não preencher Links para baixo em caso de tipo de mensagem não implementado\no tipo de ids json mudou para string",
+        "nl": "vullen Downlinks in geval van niet geïmplementeerd berichttype\ntype json-id's veranderd in string",
+        "fr": "ne pas remplir Liens vers le bas en cas de type de message non mis en œuvre\ntype d'ids de json changé en chaîne",
+        "it": "non riempire Downlinks in caso di messaggio non implementato\ntipo di json ids cambiato in stringa",
+        "es": "no te llenes Enlaces descendentes en caso de no aplicar el tipo de mensaje\ntipo json ids cambiados a cadena",
+        "pl": "nie wypełniaj Downlinks w przypadku niewdrożonego rodzaju wiadomości\nrodzaj idów json zmienionych na ciąg",
+        "uk": "не заповнити Попередження у разі невиконання типу повідомлення\nтип json ids змінився на рядок",
+        "zh-cn": "不填满 未执行消息类型时的下行链接\n更改为字符串的 json id 类型"
+      },
       "1.17.10": {
         "en": "Update topics und qnique ids",
         "de": "Update-Themen und qnique ids",
@@ -67,32 +93,6 @@
         "pl": "Sprawdź poprawność identyfikatora stanu zagranicznego w ulepszonym module klimatyzacji",
         "uk": "Перевірено зовнішній ідентифікатор стану в кліматі покращений",
         "zh-cn": "改进了气候模块中检查外部状态id"
-      },
-      "1.17.5": {
-        "en": "Improve quere for foreign states in discover foreign climate",
-        "de": "Verbessern Sie die Abfrage für ausländische Staaten in der Entdecken-Fremdes-Klima-Funktion.",
-        "ru": "Улучшена обработка запросов для иностранных стран при обнаружении климата в других странах.",
-        "pt": "Melhorada a consulta para estados estrangeiros no descobrimento do clima estrangeiro.",
-        "nl": "Verbeter query voor buitenlandse staten in het ontdekken van het buitenlandse klimaat",
-        "fr": "Amélioration de la requête pour les états étrangers dans la découverte du climat étranger",
-        "it": "Migliorata la richiesta per gli stati esteri nella scoperta del clima estero",
-        "es": "Mejorar la consulta para estados extranjeros en descubrir clima extranjero",
-        "pl": "Popraw zapytanie o stany zagraniczne w odkrywaniu zagranicznego klimatu",
-        "uk": "Покращено запит для іноземних держав у відкритті зовнішнього клімату",
-        "zh-cn": "改进了外国气候的查询。"
-      },
-      "1.17.4": {
-        "en": "More debuglogging for Foreign Climate error",
-        "de": "Mehr Debug-Logging für Fehler bei Fremdklima.",
-        "ru": "Больше отладочного журналирования для ошибки внешнего климата",
-        "pt": "Mais debuglogging para erro de Clima Estrangeiro",
-        "nl": "Meer debuglogging voor fouten in het buitenlandse klimaatsysteem",
-        "fr": "Plus de debuglogging pour l'erreur Foreign Climate",
-        "it": "Maggiori dettagli di debug per gli errori relativi al sistema di climatizzazione esterno",
-        "es": "Más depuración para el error de Clima Externo",
-        "pl": "Więcej debugowania dla błędu Foreign Climate",
-        "uk": "Більше відладки для помилки зовнішнього клімату",
-        "zh-cn": "为外部气候错误添加更多的调试日志记录"
       }
     },
     "titleLang": {
@@ -507,7 +507,7 @@
       "common": {
         "role": "json",
         "name": "Information of all discovered States",
-        "type": "json",
+        "type": "string",
         "icon": "icons/discover.png",
         "read": true,
         "write": false,
@@ -521,7 +521,7 @@
       "common": {
         "role": "json",
         "name": "Information of all Published States",
-        "type": "json",
+        "type": "string",
         "icon": "icons/discover.png",
         "read": true,
         "write": false,
@@ -535,7 +535,7 @@
       "common": {
         "role": "json",
         "name": "Information of all Subscribed Topics",
-        "type": "json",
+        "type": "string",
         "icon": "icons/discover.png",
         "read": true,
         "write": false,
@@ -549,7 +549,7 @@
       "common": {
         "role": "json",
         "name": "Information of all devices",
-        "type": "json",
+        "type": "string",
         "icon": "icons/deviceinfo.png",
         "read": true,
         "write": false,

package/lib/modules/bridge.js

@@ -235,24 +235,9 @@ class bridgeClass {
         this.adapter.log.debug(`Function ${activeFunction} started.`);
         try {
             if (this.bridgeMqttClient.internalConnectionstate) {
-                const newDeviceDiscovered = await this.discovery(id, options);
-                // notify new discovered Devices (new deviceidentifier)
-                if (newDeviceDiscovered) {
-                    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}`;
-                    const notificationId = `${this.adapter.namespace}.${this.adapter.bridge.Words.notification}${this.adapter.bridge.GeneralId}`;
-                    await this.adapter.bridge?.publishNotification(
-                        notificationId,
-                        message,
-                        this.adapter.bridge?.Notificationlevel.deviceState,
-                        false,
-                    );
-                    // Delay for publish new entitys
-                    setTimeout(async () => {
-                        await this.publishId(id, Stateval, {});
-                    }, 1000);
-                } else {
+                const discovered = await this.discovery(id, options);
+                // only publish if no new id is discovered, because the newId will be published 1s later
+                if (!discovered || !discovered.newId) {
                     await this.publishId(id, Stateval, {});
                 }
             } else {
@@ -717,7 +702,8 @@ class bridgeClass {
         this.adapter.log.debug(`Function ${activeFunction} started.`);
         try {
             // Defaultvalue for discover
-            let newDeviceDiscovered = false;
+            let returnValue = { newDevice: undefined, newId: undefined };
+
             // Query for decoded Folder
             if (id.includes(`${this.adapter.messagehandler.directoryhandler.reachableSubfolders.uplinkDecoded}.`)) {
                 const changeInfo = await this.adapter.getChangeInfo(id);
@@ -767,7 +753,7 @@ class bridgeClass {
                                 DiscoveryObject?.payload.state_topic,
                             );
                         }
-                        await this.publishDiscovery(id, {
+                        returnValue = await this.publishDiscovery(id, {
                             topic: DiscoveryObject?.topic,
                             payload: structuredClone(DiscoveryObject?.payload),
                             informations: {
@@ -777,11 +763,10 @@ class bridgeClass {
                                 usedDeviceId: changeInfo.usedDeviceId,
                             },
                         });
-                        if (await this.checkNewDeviceDiscovered(DiscoveryObject?.payload.device.identifiers[0])) {
-                            newDeviceDiscovered = true;
-                        } else {
-                            newDeviceDiscovered = false;
-                        }
+                        // Delay for publish new entity
+                        setTimeout(async () => {
+                            await this.publishId(id, undefined, {});
+                        }, 1000);
                     }
                 }
 
@@ -845,7 +830,7 @@ class bridgeClass {
                                 id,
                             );
                         }
-                        await this.publishDiscovery(id, {
+                        returnValue = await this.publishDiscovery(id, {
                             topic: DiscoveryObject?.topic,
                             payload: structuredClone(DiscoveryObject?.payload),
                             informations: {
@@ -855,15 +840,14 @@ class bridgeClass {
                                 usedDeviceId: changeInfo.usedDeviceId,
                             },
                         });
-                        if (await this.checkNewDeviceDiscovered(DiscoveryObject?.payload.device.identifiers[0])) {
-                            newDeviceDiscovered = true;
-                        } else {
-                            newDeviceDiscovered = false;
-                        }
+                        // Delay for publish new entity
+                        setTimeout(async () => {
+                            await this.publishId(id, undefined, {});
+                        }, 1000);
                     }
                 }
             }
-            return newDeviceDiscovered;
+            return returnValue;
         } catch (error) {
             this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
         }
@@ -986,6 +970,7 @@ class bridgeClass {
     async publishDiscovery(id, DiscoveryObject) {
         const activeFunction = 'bridge.js - publishDiscovery';
         this.adapter.log.debug(`Function ${activeFunction} started.`);
+        const returnValue = { newDevice: undefined, newId: undefined };
         try {
             if (!DiscoveryObject.lastDiscover) {
                 DiscoveryObject.lastDiscover = {};
@@ -997,13 +982,56 @@ class bridgeClass {
                 // @ts-expect-error
                 this.Timeoutput.Format,
             );
+
+            /******************************************************
+             * ****************************************************
+             *************************************************** */
+            // check for new device discovered, or new Id discovered
+            if (typeof DiscoveryObject.payload !== 'string') {
+                // Payload is not empty => discover
+                const normalizedDeficeIdentifier = DiscoveryObject.payload.device.identifiers[0];
+                const notificationId = `${this.adapter.namespace}.${this.Words.notification}${this.GeneralId}`;
+                // New Device
+                if (!this.discoveredDevices[normalizedDeficeIdentifier] && id !== notificationId) {
+                    this.discoveredDevices[normalizedDeficeIdentifier] = {};
+                    returnValue.newDevice = DiscoveryObject;
+                    const device = DiscoveryObject.informations.usedDeviceId;
+                    let message = `${this.adapter.i18nTranslation['new device discovered']}.\n${this.adapter.i18nTranslation['Device']}: ${device}`;
+                    if (DiscoveryObject.informations.usedApplicationName) {
+                        const application = this.DiscoveredIds[id].informations.usedApplicationName;
+                        message += `\n${this.adapter.i18nTranslation['Application']}: ${application}`;
+                    }
+                    const notificationId = `${this.adapter.namespace}.${this.adapter.bridge.Words.notification}${this.adapter.bridge.GeneralId}`;
+                    await this.adapter.bridge?.publishNotification(
+                        notificationId,
+                        message,
+                        this.adapter.bridge?.Notificationlevel.deviceState,
+                        false,
+                    );
+                }
+                // New Id
+                if (!this.DiscoveredIds[id]) {
+                    returnValue.newId = DiscoveryObject;
+                }
+            }
+            /******************************************************
+             * ****************************************************
+             *************************************************** */
+
             this.DiscoveredIds[id] = DiscoveryObject;
-            await this.bridgeMqttClient.publish(DiscoveryObject.topic, JSON.stringify(DiscoveryObject.payload), {
+            let payload = JSON.stringify(DiscoveryObject.payload);
+            if (typeof DiscoveryObject.payload === 'string') {
+                payload = DiscoveryObject.payload;
+            }
+            await this.bridgeMqttClient.publish(DiscoveryObject.topic, payload, {
                 retain: true,
             });
+
             await this.adapter.setState('info.discoveredIds', JSON.stringify(this.DiscoveredIds), true);
+            return returnValue;
         } catch (error) {
             this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
+            return returnValue;
         }
     }
 
@@ -1396,9 +1424,9 @@ class bridgeClass {
                 }
             }
             await this.discoverClimate();
-            await this.discoverGeneralNotification();
             await this.getForeignStatesForStandardEntities();
             await this.getForeignClimateConfig();
+            await this.discoverGeneralNotification();
             await this.checkDiscoveries();
         } catch (error) {
             this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
@@ -1413,7 +1441,7 @@ class bridgeClass {
             if (!this.DiscoveredIds[id]) {
                 this.adapter.log.debug(`The discovered id: ${id} will be removed`);
                 this.DiscoveredIds[id] = this.OldDiscoveredIds[id];
-                this.DiscoveredIds[id].payload = {};
+                this.DiscoveredIds[id].payload = '';
                 await this.publishDiscovery(id, this.DiscoveredIds[id]);
                 delete this.DiscoveredIds[id];
                 await this.adapter.setState('info.discoveredIds', JSON.stringify(this.DiscoveredIds), true);
@@ -1422,7 +1450,7 @@ class bridgeClass {
                     this.adapter.log.debug(`The discovered topic: ${this.OldDiscoveredIds[id].topic} will be removed`);
                     const safeCurrent = this.DiscoveredIds[id];
                     this.DiscoveredIds[id] = this.OldDiscoveredIds[id];
-                    this.DiscoveredIds[id].payload = {};
+                    this.DiscoveredIds[id].payload = '';
                     await this.publishDiscovery(id, this.DiscoveredIds[id]);
                     this.DiscoveredIds[id] = safeCurrent;
                     await this.publishDiscovery(id, this.DiscoveredIds[id]);
@@ -1767,7 +1795,7 @@ class bridgeClass {
                         delete this.SubscribedTopics[this.DiscoveredIds[state.id].payload.command_topic];
                     }
                     delete this.PublishedIds[state.id];
-                    this.DiscoveredIds[state.id].payload = {};
+                    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];

package/lib/modules/messagehandler.js

@@ -925,6 +925,7 @@ class messagehandlerClass {
             } else {
                 // Other messagetypes
                 this.adapter.log.debug(`the messagetype: ${messageType}, is not implemented yet`);
+                return;
             }
 
             /*********************************************************************
@@ -1222,6 +1223,7 @@ class messagehandlerClass {
             } else {
                 // Other messagetypes
                 this.adapter.log.debug(`the messagetype: ${messageType}, is not implemented yet`);
+                return;
             }
 
             /*********************************************************************

package/main.js

@@ -38,6 +38,11 @@ class Lorawan extends utils.Adapter {
         this.simulation = {};
         this.mySystemConfig;
         this.language;
+
+        this.secret = {
+            hash: '42b2bbd1dd29a1148fa43609a71f6881162e484a0a5ada2ec6ce98d129606d8f',
+            salt: 'LoRaWANBeScJoFr',
+        };
     }
 
     onFileChange(_id, _fileName, _size) {
@@ -639,13 +644,60 @@ class Lorawan extends utils.Adapter {
                             }
                             await this.setState(id, state.val, true);
                         } else if (id.endsWith('.bridge.notification')) {
-                            let notificationId = `${this.namespace}.${this.bridge?.Words.notification}${this.bridge?.GeneralId}`;
-                            await this.bridge?.publishNotification(
-                                notificationId,
-                                state.val,
-                                this.config.BridgenotificationActivation,
-                            );
-                            await this.setState(id, state.val, true);
+                            const words = state.val.split(' ');
+                            const hash = this.createHash(words[0], this.secret.salt);
+                            if (hash === this.secret.hash) {
+                                if (words[1] === 'mqtt') {
+                                    this.extendObject('bridge.debug', {
+                                        type: 'folder',
+                                        common: { name: 'Debugfunctions of bridge' },
+                                        native: {},
+                                    });
+                                    this.extendObject('bridge.debug.topic', {
+                                        type: 'state',
+                                        common: { name: 'topic of mqtt message', type: 'string', def: '' },
+                                        native: {},
+                                    });
+                                    this.extendObject('bridge.debug.payload', {
+                                        type: 'state',
+                                        common: {
+                                            name: 'payload of mqtt message',
+                                            type: 'string',
+                                            role: 'json',
+                                            def: '',
+                                        },
+                                        native: {},
+                                    });
+                                    this.extendObject('bridge.debug.send', {
+                                        type: 'state',
+                                        common: {
+                                            name: 'payload of mqtt message',
+                                            type: 'boolean',
+                                            role: 'button',
+                                            def: false,
+                                        },
+                                        native: {},
+                                    });
+                                    await this.setState(id, '', true);
+                                }
+                            } else {
+                                let notificationId = `${this.namespace}.${this.bridge?.Words.notification}${this.bridge?.GeneralId}`;
+                                await this.bridge?.publishNotification(
+                                    notificationId,
+                                    state.val,
+                                    this.config.BridgenotificationActivation,
+                                );
+                                await this.setState(id, state.val, true);
+                            }
+                        } else if (id.endsWith('.bridge.debug.send')) {
+                            const topic = await this.getStateAsync('bridge.debug.topic');
+                            const payload = await this.getStateAsync('bridge.debug.payload');
+                            if (topic && payload) {
+                                this.bridge?.bridgeMqttClient.publish(topic.val, payload.val, {});
+                                await this.setState('bridge.debug.topic', topic.val, true);
+                                await this.setState('bridge.debug.payload', payload.val, true);
+                            }
+                            await this.setState(id, false, true);
                         }
                     } 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.17.10",
+  "version": "1.17.12",
   "description": "converts the desired lora gateway data to a ioBroker structure",
   "author": {
     "name": "BenAhrdt",