iobroker.lorawan 1.14.7 → 1.14.8

package/README.md

@@ -23,6 +23,10 @@ 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.14.8 (2025-09-13)
+* (BenAhrdt) Add general, offline and online Notifications to the discovered devices
+* (BenAhrdt) Add general Notifications to device called namespace of the Adapter
+
 ### 1.14.7 (2025-09-12)
 * (BenAhrdt) Add Folders for Target Temperature in Heating Events
 * (BenAhrdt) correct unit handling & Max valueCount in Tab

package/admin/jsonConfig.json

@@ -784,6 +784,22 @@
                     "lg": 2,
                     "xl": 2
                   },
+				"BridgenotificationActivation":{
+					"type": "select",
+					"label": "notificationActivation",
+					"hidden": "data.BridgeType === 'off'",
+					"tooltip": "notificationActivationTooltip",
+					"options": [
+						{"label":"notification","value":"notification"},
+						{"label":"no notification","value":"no notification"}
+					],
+					"default": "notification",
+					"xs": 12,
+					"sm": 3,
+					"md": 3,
+					"lg": 3,
+					"xl": 3
+				},
 				"_BridgeServersettingsHeader": {
 					"newLine": true,
 					"type": "header",

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.14.7",
+    "version": "1.14.8",
     "news": {
+      "1.14.8": {
+        "en": "Add general, offline and online notifications to the discovered devices\nAdd general notifications to device called namespace of the adapter",
+        "de": "Allgemeine, Offline- und Online-Benachrichtigungen zu den erkannten Geräten hinzufügen\nAllgemeine Benachrichtigungen zum Gerät namens Namespace des Adapters hinzufügen",
+        "ru": "Добавлены общие, офлайн и онлайн уведомления для обнаруженных устройств\nДобавлены общие уведомления к устройству с именем namespace адаптера",
+        "pt": "Adicionar notificações gerais, offline e online aos dispositivos descobertos\nAdicionar notificações gerais ao dispositivo chamado namespace do adaptador",
+        "nl": "Algemene, offline en online meldingen toevoegen aan de gedetecteerde apparaten\nAlgemene meldingen toevoegen aan apparaat genaamd namespace van de adapter",
+        "fr": "Ajouter des notifications générales, hors ligne et en ligne aux périphériques découverts\nAjouter des notifications générales à l'appareil appelé espace de noms de l'adaptateur",
+        "it": "Aggiungere notifiche generali, offline e online ai dispositivi scoperti\nAggiungere notifiche generali al dispositivo chiamato namespace dell'adattatore",
+        "es": "Agregar notificaciones generales, fuera de línea y en línea a los dispositivos descubiertos\nAgregar notificaciones generales al dispositivo llamado namespace del adaptador",
+        "pl": "Dodano ogólne powiadomienia offline i online do wykrytych urządzeń\nDodano ogólne powiadomienia do urządzenia o nazwie namespace adaptera",
+        "uk": "Додано загальні, офлайн та онлайн сповіщення до виявлених пристроїв\nДодано загальні сповіщення до пристрою під назвою namespace адаптера",
+        "zh-cn": "为发现的设备添加常规、离线和在线通知\n为名为适配器命名空间的设备添加常规通知"
+      },
       "1.14.7": {
         "en": "Add folders for target temperature in heating events\nCorrect unit handling and max value count in tab",
         "de": "Ordner für Solltemperatur in Heizungsevents hinzufügen\nKorrekte Einheitenbehandlung und maximale Wertanzahl im Tab",
@@ -80,19 +93,6 @@
         "pl": "Poprawka błędu climate current_temperature topic",
         "uk": "Виправлення помилки в climate current_temperature topic",
         "zh-cn": "修复 climate current_temperature topic 的错误"
-      },
-      "1.14.1": {
-        "en": "Bugfix unique_id of climate entities",
-        "de": "Bugfix unique_id von Climate-Entities",
-        "ru": "Исправлена ошибка unique_id для climate entities",
-        "pt": "Correção de bug no unique_id de entidades de clima",
-        "nl": "Bugfix unique_id van climate entities",
-        "fr": "Correction de bug du unique_id des entités de climat",
-        "it": "Correzione bug unique_id delle entità climate",
-        "es": "Corrección de error en unique_id de entidades de clima",
-        "pl": "Poprawka błędu unique_id dla encji klimatycznych",
-        "uk": "Виправлення помилки unique_id для сутностей клімату",
-        "zh-cn": "修复气候实体的 unique_id 错误"
       }
     },
     "titleLang": {
@@ -358,6 +358,7 @@
     "BridgeType": "off",
     "EnableRefresh": true,
     "RefreshDiscoveryCronJob": "0 * * * *",
+    "BridgenotificationActivation": "notification",
     "DeviceIdentifiers": [
       {
         "DeviceIdentifier": "usedApplicationName"

package/lib/modules/bridge.js

@@ -25,6 +25,7 @@ class bridgeClass {
         this.SubscribedTopics = {};
         this.PublishedIds = {};
         this.VitualIds = {};
+        this.Notifications = {};
         this.BridgeDiscoveryPrefix = {
             HA: 'homeassistant/',
         };
@@ -34,8 +35,20 @@ class bridgeClass {
         this.EndingState = '/state';
         this.EndingVirtualClimate = '.virtual_climate';
         this.EndingVirtualMode = '.virtual_mode';
+        this.NotificationId = '.notification';
+        this.GeneralId = '.general';
+        this.OfflineId = '.offline';
+        this.OnlineId = '.online';
+        this.EndingNotification = '.notification';
         this.ClimateEntityType = 'climate';
+        this.NotificationEntityType = 'device_automation';
         this.MaxValueCount = 5;
+        this.Words = {
+            notification: 'notification',
+            general: 'general',
+            offline: 'offline',
+            online: 'online',
+        };
 
         // Timeoutput always like german view
         this.Timeoutput = {
@@ -247,6 +260,147 @@ class bridgeClass {
         }
     }
 
+    /*********************************************************************
+     * *************** Discover Device Notifications *********************
+     * ******************************************************************/
+
+    /**
+     * @param changeInfo changeInfo for the device
+     */
+    async discoverDeviceNotifications(changeInfo) {
+        const activeFunction = 'discoverDeviceNotifications';
+        this.adapter.log.debug(`Function ${activeFunction} started.`);
+        try {
+            const notificationId = `${changeInfo.objectStartDirectory}${this.NotificationId}${this.GeneralId}`;
+            if (!this.Notifications[notificationId]) {
+                const deviceIdentifier = this.getDeviceIdentifier(changeInfo, this.adapter.config.DeviceIdentifiers);
+                const normalizedDeviceIdentifier = this.normalizeString(deviceIdentifier);
+                const general = {
+                    topic: `${this.bridgeMqttClient.BridgePrefix}${normalizedDeviceIdentifier}/${this.Words.notification}_${this.Words.general}${this.EndingState}`.toLowerCase(),
+                    notificationId: notificationId,
+                };
+                let discoveryobject = this.getNotificationDiscoveryObject(deviceIdentifier, this.Words.general);
+                this.Notifications[general.notificationId] = {};
+                if (!this.PublishedIds[general.notificationId]) {
+                    this.PublishedIds[general.notificationId] = { discovery: [] };
+                }
+                this.PublishedIds[general.notificationId].discovery.push({
+                    topic: discoveryobject?.topic,
+                    payload: structuredClone(discoveryobject?.payload),
+                });
+                this.PublishedIds[general.notificationId].state_topic = discoveryobject?.payload.topic;
+                await this.publishDiscovery(general.notificationId, {
+                    topic: discoveryobject?.topic,
+                    payload: structuredClone(discoveryobject?.payload),
+                });
+
+                // offline
+                const offline = {
+                    topic: `${this.bridgeMqttClient.BridgePrefix}${normalizedDeviceIdentifier}/${this.Words.notification}_${this.Words.offline}${this.EndingState}`.toLowerCase(),
+                    notificationId: `${changeInfo.objectStartDirectory}${this.NotificationId}${this.OfflineId}`,
+                };
+                discoveryobject = this.getNotificationDiscoveryObject(deviceIdentifier, this.Words.offline);
+                this.Notifications[offline.notificationId] = {};
+                if (!this.PublishedIds[offline.notificationId]) {
+                    this.PublishedIds[offline.notificationId] = { discovery: [] };
+                }
+                this.PublishedIds[offline.notificationId].discovery.push({
+                    topic: discoveryobject?.topic,
+                    payload: structuredClone(discoveryobject?.payload),
+                });
+                this.PublishedIds[offline.notificationId].state_topic = discoveryobject?.payload.topic;
+                await this.publishDiscovery(offline.notificationId, {
+                    topic: discoveryobject?.topic,
+                    payload: structuredClone(discoveryobject?.payload),
+                });
+
+                // online
+                const online = {
+                    topic: `${this.bridgeMqttClient.BridgePrefix}${normalizedDeviceIdentifier}/${this.Words.notification}_${this.Words.online}${this.EndingState}`.toLowerCase(),
+                    notificationId: `${changeInfo.objectStartDirectory}${this.NotificationId}${this.OnlineId}`,
+                };
+                discoveryobject = this.getNotificationDiscoveryObject(deviceIdentifier, this.Words.online);
+                this.Notifications[online.notificationId] = {};
+                if (!this.PublishedIds[online.notificationId]) {
+                    this.PublishedIds[online.notificationId] = { discovery: [] };
+                }
+                this.PublishedIds[online.notificationId].discovery.push({
+                    topic: discoveryobject?.topic,
+                    payload: structuredClone(discoveryobject?.payload),
+                });
+                this.PublishedIds[online.notificationId].state_topic = discoveryobject?.payload.topic;
+                await this.publishDiscovery(online.notificationId, {
+                    topic: discoveryobject?.topic,
+                    payload: structuredClone(discoveryobject?.payload),
+                });
+            }
+        } catch (error) {
+            this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
+        }
+    }
+
+    /*********************************************************************
+     * ******************** Discover Notification ************************
+     * ******************************************************************/
+
+    /**
+     *  Discover Notifications to Bridge
+     */
+    async discoverGeneralNotification() {
+        const activeFunction = 'discoverGeneralNotification';
+        this.adapter.log.debug(`Function ${activeFunction} started.`);
+        try {
+            const notificationId = `${this.Words.notification}${this.GeneralId}`;
+            if (!this.Notifications[notificationId]) {
+                const discoveryobject = this.getNotificationDiscoveryObject(this.adapter.namespace, this.Words.general);
+                this.Notifications[notificationId] = {};
+                if (!this.PublishedIds[notificationId]) {
+                    this.PublishedIds[notificationId] = { discovery: [] };
+                }
+                this.PublishedIds[notificationId].discovery.push({
+                    topic: discoveryobject?.topic,
+                    payload: structuredClone(discoveryobject?.payload),
+                });
+                this.PublishedIds[notificationId].state_topic = discoveryobject?.payload.topic;
+                await this.publishDiscovery(notificationId, {
+                    topic: discoveryobject?.topic,
+                    payload: structuredClone(discoveryobject?.payload),
+                });
+            }
+        } catch (error) {
+            this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
+        }
+    }
+
+    /*********************************************************************
+     * **************** Get Notification Discovery Object ****************
+     * ******************************************************************/
+
+    /**
+     * @param deviceIdentifier deviceidentifiere for the desired device
+     * @param notificationType notificationtype for the discoveryobject
+     */
+    getNotificationDiscoveryObject(deviceIdentifier, notificationType) {
+        const activeFunction = 'getNotificationDiscoveryObject';
+        this.adapter.log.debug(`Function ${activeFunction} started.`);
+        try {
+            const normalizedDeviceIdentifier = this.normalizeString(deviceIdentifier);
+            const discoveryobject = {
+                topic: `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${this.NotificationEntityType}/${normalizedDeviceIdentifier}/${this.Words.notification}_${notificationType}/config`.toLowerCase(),
+                payload: {
+                    automation_type: 'trigger',
+                    topic: `${this.bridgeMqttClient.BridgePrefix}${normalizedDeviceIdentifier}/${this.Words.notification}_${notificationType}${this.EndingState}`.toLowerCase(),
+                    type: 'notification',
+                    subtype: notificationType,
+                    device: { identifiers: [normalizedDeviceIdentifier.toLowerCase()], name: deviceIdentifier },
+                },
+            };
+            return discoveryobject;
+        } catch (error) {
+            this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
+        }
+    }
+
     /*********************************************************************
      * ********************** Discover Climate ***************************
      * ******************************************************************/
@@ -271,9 +425,9 @@ class bridgeClass {
                         target.changeInfo,
                         this.adapter.config.DeviceIdentifiers,
                     );
-                    target.normalizedDeficeIdentifier = await this.normalizeString(target.DeviceIdentifier);
+                    target.normalizedDeficeIdentifier = this.normalizeString(target.DeviceIdentifier);
                     target.Topic =
-                        `${this.bridgeMqttClient.BridgePrefix}${target.normalizedDeficeIdentifier}/${target.changeInfo.changedState}`.toLocaleLowerCase();
+                        `${this.bridgeMqttClient.BridgePrefix}${target.normalizedDeficeIdentifier}/${target.changeInfo.changedState}`.toLowerCase();
 
                     //Min und Max holen
                     const targetObject = await this.adapter.getObjectAsync(config.climateIds.target);
@@ -302,13 +456,13 @@ class bridgeClass {
                         mode.changeInfo,
                         this.adapter.config.DeviceIdentifiers,
                     );
-                    mode.normalizedDeviceIdentifier = await this.normalizeString(mode.DeviceIdentifier);
+                    mode.normalizedDeviceIdentifier = this.normalizeString(mode.DeviceIdentifier);
                     mode.Topic =
                         `${this.bridgeMqttClient.BridgePrefix}${mode.normalizedDeviceIdentifier}/${mode.changeInfo.changedState}`.toLowerCase();
 
-                    const normalizedClimateName = await this.normalizeString(config.ClimateName);
+                    const normalizedClimateName = this.normalizeString(config.ClimateName);
                     const DiscoveryTopic =
-                        `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${this.ClimateEntityType}/${target.normalizedDeficeIdentifier}/${normalizedClimateName}/config`.toLocaleLowerCase();
+                        `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${this.ClimateEntityType}/${target.normalizedDeficeIdentifier}/${normalizedClimateName}/config`.toLowerCase();
                     const indexLastDotTarget = config.climateIds.target.lastIndexOf('.');
                     const Id = config.climateIds.target.substring(0, indexLastDotTarget) + this.EndingVirtualClimate;
                     const DiscoveryPayload = {
@@ -611,6 +765,9 @@ class bridgeClass {
                                 usedDeviceId: changeInfo.usedDeviceId,
                             },
                         });
+                        if (this.adapter.config.BridgenotificationActivation === 'notification') {
+                            await this.discoverDeviceNotifications(changeInfo);
+                        }
                     }
                 }
 
@@ -686,6 +843,9 @@ class bridgeClass {
                                 usedDeviceId: changeInfo.usedDeviceId,
                             },
                         });
+                        if (this.adapter.config.BridgenotificationActivation === 'notification') {
+                            await this.discoverDeviceNotifications(changeInfo);
+                        }
                     }
                 }
             }
@@ -721,14 +881,14 @@ class bridgeClass {
             }
             const StateName = changeInfo.id.substring(indexOfStatebegin, changeInfo.id.length);
             const normalizedStateName = this.normalizeString(StateName);
-            const DeviceIdentifier = await this.getDeviceIdentifier(changeInfo, this.adapter.config.DeviceIdentifiers);
-            const normalizedDeviceIdentifier = await this.normalizeString(DeviceIdentifier);
+            const DeviceIdentifier = this.getDeviceIdentifier(changeInfo, this.adapter.config.DeviceIdentifiers);
+            const normalizedDeviceIdentifier = this.normalizeString(DeviceIdentifier);
             const Topic =
-                `${this.bridgeMqttClient.BridgePrefix}${normalizedDeviceIdentifier}/${normalizedStateName}`.toLocaleLowerCase();
+                `${this.bridgeMqttClient.BridgePrefix}${normalizedDeviceIdentifier}/${normalizedStateName}`.toLowerCase();
             const EntityType = await this.getEntityType(options);
             const AdditionalAttributes = await this.getStateAttributes(options.common, EntityType);
             const DiscoveryTopic =
-                `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${EntityType}/${normalizedDeviceIdentifier}/${normalizedStateName}/config`.toLocaleLowerCase();
+                `${this.BridgeDiscoveryPrefix[this.adapter.config.BridgeType]}${EntityType}/${normalizedDeviceIdentifier}/${normalizedStateName}/config`.toLowerCase();
             const DiscoveryPayload = {
                 name: StateName,
                 unique_id: `${normalizedDeviceIdentifier}_${normalizedStateName}`.toLowerCase(),
@@ -1156,6 +1316,9 @@ class bridgeClass {
                 }
             }
             await this.discoverClimate();
+            if (this.adapter.config.BridgenotificationActivation === 'notification') {
+                await this.discoverGeneralNotification();
+            }
         } catch (error) {
             this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
         }

package/lib/modules/bridgeMqttclient.js

@@ -18,7 +18,7 @@ class bridgeMqttClientClass {
         });
 
         // Prefix for publish and subscrip
-        this.BridgePrefix = 'lorawan/';
+        this.BridgePrefix = `${this.adapter.namespace}/`.replace(/\./g, '_');
 
         // Variables for correct connection (disconnection) notification / logging
         this.internalConnectionstate = false;
@@ -42,6 +42,12 @@ class bridgeMqttClientClass {
 
             await this.adapter.bridge.checkAllStatesForBridgeWork({ forceDiscovery: true });
             this.adapter.bridge.createScheduleJobs();
+            if (this.adapter.config.BridgenotificationActivation === 'notification' && this.adapter.bridge) {
+                const devicename = `${this.adapter.bridge.Words.notification}${this.adapter.bridge.GeneralId}`;
+                if (this.adapter.bridge.Notifications[devicename]) {
+                    this.adapter.bridge.publishId(devicename, `Connection to Bridge is active.`);
+                }
+            }
         });
 
         this.client.on('disconnect', () => {

package/lib/modules/directorieshandler.js

@@ -296,11 +296,18 @@ class directorieshandlerClass {
                                             // create changeinfo and register notification
                                             const changeInfo = await this.adapter.getChangeInfo(objectId);
                                             if (changeInfo) {
+                                                const message = `The LoRaWAN device ${changeInfo.usedDeviceId} in the application ${changeInfo.usedApplicationName} is back online`;
                                                 this.adapter.registerNotification(
                                                     'lorawan',
                                                     'Lorawan device back online',
-                                                    `The LoRaWAN device ${changeInfo.usedDeviceId} in the application ${changeInfo.usedApplicationName} is back online`,
+                                                    message,
                                                 );
+                                                if (this.adapter.bridge) {
+                                                    const notificationId = `${changeInfo.applicationId}.devices.${changeInfo.deviceEUI}${this.adapter.bridge.NotificationId}${this.adapter.bridge.OnlineId}`;
+                                                    if (this.adapter.bridge.Notifications[notificationId]) {
+                                                        this.adapter.bridge.publishId(notificationId, message);
+                                                    }
+                                                }
                                             }
                                         }
                                     }

package/lib/modules/messagehandler.js

@@ -80,11 +80,17 @@ class messagehandlerClass {
                                     // create changeinfo and register notification
                                     const changeInfo = await this.adapter.getChangeInfo(adapterObject._id);
                                     if (changeInfo) {
-                                        this.adapter.registerNotification(
-                                            'lorawan',
-                                            'LoRaWAN device offline',
-                                            `The LoRaWAN device ${changeInfo.usedDeviceId} in the application ${changeInfo.usedApplicationName} is offline`,
-                                        );
+                                        const message = `The LoRaWAN device ${changeInfo.usedDeviceId} in the application ${changeInfo.usedApplicationName} is offline`;
+                                        this.adapter.registerNotification('lorawan', 'LoRaWAN device offline', message);
+                                        if (
+                                            this.adapter.config.BridgenotificationActivation === 'notification' &&
+                                            this.adapter.bridge
+                                        ) {
+                                            const notificationId = `${changeInfo.applicationId}.devices.${changeInfo.deviceEUI}${this.adapter.bridge.NotificationId}${this.adapter.bridge.OfflineId}`;
+                                            if (this.adapter.bridge.Notifications[notificationId]) {
+                                                this.adapter.bridge.publishId(notificationId, message);
+                                            }
+                                        }
                                     }
                                 }
                             }

package/main.js

@@ -382,6 +382,14 @@ class Lorawan extends utils.Adapter {
      */
     onUnload(callback) {
         try {
+            // Ausgabe der Nachrichtg, dass der Adapter beendet wird
+            if (this.config.BridgenotificationActivation === 'notification' && this.bridge) {
+                const devicename = `${this.bridge?.Words.notification}${this.bridge?.GeneralId}`;
+                if (this.bridge?.Notifications[devicename]) {
+                    this.bridge?.publishId(devicename, `Connection to Bridge will be closed.`);
+                }
+            }
+
             // clear timeout (for simulation)
             if (this.simulation.timeout) {
                 this.clearTimeout(this.simulation.timeout);

package/package.json

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