iobroker.lorawan 1.17.14 → 1.17.16

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.17.16 (2025-09-25)
+* (BenAhrdt) bring state_off topic to humidifier
+
+### 1.17.15 (2025-09-25)
+* (BenAhrdt) notifi new discover in case of oldDiscoveredDevices
+* (BenAhrdt) bugfix debug logging
+
 ### 1.17.14 (2025-09-24)
 * (BenAhrdt) add humidifier to foreign States
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.17.14",
+    "version": "1.17.16",
     "news": {
+      "1.17.16": {
+        "en": "bring state_off topic to humidifier",
+        "de": "state_off-thema zur befeuchtung bringen",
+        "ru": "скачать игру state_off для humidifier",
+        "pt": "trazer o tópico state_off para o umidificador",
+        "nl": "status_off onderwerp naar bevochtiger brengen",
+        "fr": "apporter le sujet état_off à l'humidificateur",
+        "it": "portare argomento state_off a umidificatore",
+        "es": "traer el tema state_off a humidificador",
+        "pl": "przynieść state _ off temat do nawilżacza",
+        "uk": "принести стан_вимкнути тему для зволоження",
+        "zh-cn": "将状态切换为潮湿器"
+      },
+      "1.17.15": {
+        "en": "notifi new discover in case of oldDiscoveredDevices\nbugfix debug logging",
+        "de": "notifi neu entdecken bei oldDiscoveredDevices\nbugfix debug protokollierung",
+        "ru": "уведомить новое открытие в случае старых обнаруженных устройств\nрегистрация отладчиков",
+        "pt": "notifi nova descoberta no caso de dispositivos antigosdescoberta\nregistro de depuração de bugfix",
+        "nl": "notifi nieuwe ontdekking in het geval van oudeDiscoverdDevices\nbugfix debug logging",
+        "fr": "notifi nouveau découverte en cas d'ancienDiscoveredDevices\nbugfix debug loging",
+        "it": "notifi nuova scoperta in caso di vecchiDiscoveredDevices\nbugfix debug logging",
+        "es": "notifi new discover in case of oldDiscoveredDevices\nbugfix debug logging",
+        "pl": "notifi nowe odkrycie w przypadku old DiscoveredDevices\nlogowanie debugfix",
+        "uk": "неідентифікувати нове відкриття у разі виникнення застарілих\nзареєструватися",
+        "zh-cn": "旧发现器的新发现\n调试日志"
+      },
       "1.17.14": {
         "en": "add humidifier to foreign States",
         "de": "fügen Sie Befeuchter für ausländische Staaten hinzu",
@@ -67,32 +93,6 @@
         "pl": "Aktualizacja tematów i idów qnique",
         "uk": "Оновлення тем und qnique ids",
         "zh-cn": "更新主题 und qnique ids"
-      },
-      "1.17.9": {
-        "en": "setdefault defiveidentifier for lorawan bridge function to used Device Id",
-        "de": "Setzen Sie den Standardgerätekennzeichner für die LoRaWAN-Bridge-Funktion auf die Verwendung der Geräte-ID.",
-        "ru": "Установите идентификатор устройства по умолчанию для функции моста LoRaWAN, чтобы использовать идентификатор устройства.",
-        "pt": "Defina o identificador padrão do dispositivo para a função de ponte LoRaWAN usando o ID do dispositivo.",
-        "nl": "Stel standaard apparaatidentificatie in voor LoRaWAN Bridge-functie om het apparaat-ID te gebruiken",
-        "fr": "Définir l'identifiant par défaut du périphérique pour la fonction de pont LoRaWAN pour utiliser l'identifiant du périphérique.",
-        "it": "Impostare l'identificatore predefinito del dispositivo per la funzione del ponte LoRaWAN in modo da utilizzare l'ID del dispositivo.",
-        "es": "Establecer el identificador predeterminado del dispositivo para la función de puente LoRaWAN para usar el ID del dispositivo",
-        "pl": "Ustaw domyślny identyfikator urządzenia dla funkcji mostka LoRaWAN na użyty identyfikator urządzenia",
-        "uk": "Встановлено значення за замовчуванням ідентифікатора пристрою для функції моста LoRaWAN на Device Id.",
-        "zh-cn": "将LoRaWAN桥接功能的setdefault设备标识符设置为使用设备ID。"
-      },
-      "1.17.8": {
-        "en": "normalize [] () & {} into _",
-        "de": "normalize [] () & {} into _",
-        "ru": "Нормализовать [] () & {} в _",
-        "pt": "Normalizar [] () & {} para _",
-        "nl": "normalize [] () & {} into _",
-        "fr": "normaliser [] () & {} en _",
-        "it": "normalizzare [] () & {} in _",
-        "es": "Normalizar [] () & {} en _.",
-        "pl": "zamień [] () & {} na _",
-        "uk": "нормалізувати [] () & {} у _",
-        "zh-cn": "将[]（）和{}转换为_"
       }
     },
     "titleLang": {

package/lib/modules/bridge.js

@@ -76,6 +76,7 @@ class bridgeClass {
             },
         };
         this.discoveredDevices = {};
+        this.oldDiscoveredDevices = {};
 
         // Unitmapping zur Zuweisung der passenden Unit, wenn diese falsch geschrieben ist
         this.unitMap = {
@@ -275,27 +276,6 @@ class bridgeClass {
         }
     }
 
-    /*********************************************************************
-     * *************** Discover Device Notifications *********************
-     * ******************************************************************/
-
-    /**
-     * @param normalizedDeficeIdentifier identifier od device
-     */
-    async checkNewDeviceDiscovered(normalizedDeficeIdentifier) {
-        const activeFunction = 'bridge.js checkNewDeviceDiscovered';
-        this.adapter.log.debug(`Function ${activeFunction} started.`);
-        try {
-            if (!this.discoveredDevices[normalizedDeficeIdentifier]) {
-                this.discoveredDevices[normalizedDeficeIdentifier] = {};
-                return true;
-            }
-            return false;
-        } catch (error) {
-            this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
-        }
-    }
-
     /*********************************************************************
      * ******************** Discover Notification ************************
      * ******************************************************************/
@@ -993,24 +973,34 @@ class bridgeClass {
             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) {
+                if (!this.discoveredDevices[normalizedDeficeIdentifier]) {
                     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 = DiscoveryObject.informations.usedApplicationName;
-                        message += `\n${this.adapter.i18nTranslation['Application']}: ${application}`;
+                    if (!this.oldDiscoveredDevices[normalizedDeficeIdentifier]) {
+                        // Only messegae with ne fiscovered dewvice, if not in old discovered devices
+                        returnValue.newDevice = DiscoveryObject;
+                        let device = 'unknown';
+                        if (DiscoveryObject.informations.usedDeviceId) {
+                            device = DiscoveryObject.informations.usedDeviceId;
+                        } else if (
+                            DiscoveryObject.informations.target &&
+                            DiscoveryObject.informations.target.usedDeviceId
+                        ) {
+                            device = DiscoveryObject.informations.target.usedDeviceId;
+                        }
+                        let message = `${this.adapter.i18nTranslation['new device discovered']}.\n${this.adapter.i18nTranslation['Device']}: ${device}`;
+                        if (DiscoveryObject.informations.usedApplicationName) {
+                            const application = DiscoveryObject.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,
+                        );
                     }
-                    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]) {
@@ -1404,6 +1394,9 @@ class bridgeClass {
         try {
             // get old Discovered ids
             this.OldDiscoveredIds = JSON.parse((await this.adapter.getStateAsync('info.discoveredIds')).val);
+            this.oldDiscoveredDevices = this.generateOldDevices(this.OldDiscoveredIds);
+            //this.adapter.log.error(JSON.stringify(this.oldDiscoveredDevices));
+            await this.discoverGeneralNotification();
 
             // Get all ids in adapterfolder
             // Generate Infos of all devices and decoded folders
@@ -1430,38 +1423,67 @@ class bridgeClass {
             await this.getForeignStatesForStandardEntities();
             await this.getForeignClimateConfig();
             await this.getForeignHumidifierConfig();
-            await this.discoverGeneralNotification();
             await this.checkDiscoveries();
         } catch (error) {
             this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
         }
     }
 
+    /**
+     * @param oldDiscoveredIds Ids wiche are discovered last time that Adapter runs
+     */
+    generateOldDevices(oldDiscoveredIds) {
+        const activeFunction = 'bridge.js - generateOldDevices';
+        this.adapter.log.debug(`Function ${activeFunction} started.`);
+        try {
+            const oldDevices = {};
+            for (const id of Object.values(oldDiscoveredIds)) {
+                const normalizedDeviceidentifier = id.payload.device.identifiers[0];
+                if (!oldDevices[normalizedDeviceidentifier]) {
+                    oldDevices[normalizedDeviceidentifier] = {};
+                }
+            }
+            return oldDevices;
+        } catch (error) {
+            this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
+            return {};
+        }
+    }
+
     /**
      * check discovery for old entries
      */
     async checkDiscoveries() {
-        for (const id in this.OldDiscoveredIds) {
-            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 = '';
-                await this.publishDiscovery(id, this.DiscoveredIds[id]);
-                this.adapter.log.error('Löschen 1');
-                delete this.DiscoveredIds[id];
-                await this.adapter.setState('info.discoveredIds', JSON.stringify(this.DiscoveredIds), true);
-            } else {
-                if (this.DiscoveredIds[id].topic !== this.OldDiscoveredIds[id].topic) {
-                    this.adapter.log.debug(`The discovered topic: ${this.OldDiscoveredIds[id].topic} will be removed`);
-                    const safeCurrent = this.DiscoveredIds[id];
+        const activeFunction = 'bridge.js - checkDiscoveries';
+        this.adapter.log.debug(`Function ${activeFunction} started.`);
+        try {
+            for (const id in this.OldDiscoveredIds) {
+                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 = '';
                     await this.publishDiscovery(id, this.DiscoveredIds[id]);
-                    this.adapter.log.error('Löschen 2');
-                    this.DiscoveredIds[id] = safeCurrent;
-                    await this.publishDiscovery(id, this.DiscoveredIds[id]);
+                    delete this.DiscoveredIds[id];
+                    delete this.OldDiscoveredIds[id];
+                    await this.adapter.setState('info.discoveredIds', JSON.stringify(this.DiscoveredIds), true);
+                } else {
+                    if (this.DiscoveredIds[id].topic !== this.OldDiscoveredIds[id].topic) {
+                        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 = '';
+                        await this.publishDiscovery(id, this.DiscoveredIds[id]);
+                        this.DiscoveredIds[id] = safeCurrent;
+                        await this.publishDiscovery(id, this.DiscoveredIds[id]);
+                    }
                 }
             }
+            //Assign new Discoverd Devices to Old
+            this.oldDiscoveredDevices = structuredClone(this.discoveredDevices);
+        } catch (error) {
+            this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
         }
     }
     // create schedule Jobs for online and historic values
@@ -1607,7 +1629,7 @@ class bridgeClass {
                 this.SubscribedTopics,
                 `${target.Topic}${this.EndingSet}`,
                 {
-                    deviceId: target.DeviceIdentifier,
+                    usedDeviceId: target.DeviceIdentifier,
                 },
                 DiscoveryTopic,
                 DiscoveryPayload,
@@ -1619,7 +1641,7 @@ class bridgeClass {
                 this.SubscribedTopics,
                 `${mode.Topic}${this.EndingSet}`,
                 {
-                    deviceId: mode.DeviceIdentifier,
+                    usedDeviceId: mode.DeviceIdentifier,
                 },
                 DiscoveryTopic,
                 DiscoveryPayload,
@@ -1632,7 +1654,7 @@ class bridgeClass {
                 this.PublishedIds,
                 config.climateIds.target,
                 {
-                    deviceId: target.DeviceIdentifier,
+                    usedDeviceId: target.DeviceIdentifier,
                 },
                 DiscoveryTopic,
                 DiscoveryPayload,
@@ -1644,7 +1666,7 @@ class bridgeClass {
                 this.PublishedIds,
                 config.climateIds.act,
                 {
-                    deviceId: act.DeviceIdentifier,
+                    usedDeviceId: act.DeviceIdentifier,
                 },
                 DiscoveryTopic,
                 DiscoveryPayload,
@@ -1656,7 +1678,7 @@ class bridgeClass {
                 this.PublishedIds,
                 config.climateIds.mode,
                 {
-                    deviceId: mode.DeviceIdentifier,
+                    usedDeviceId: mode.DeviceIdentifier,
                 },
                 DiscoveryTopic,
                 DiscoveryPayload,
@@ -1674,13 +1696,13 @@ class bridgeClass {
                 payload: structuredClone(DiscoveryPayload),
                 informations: {
                     target: {
-                        deviceId: target.DeviceIdentifier,
+                        usedDeviceId: target.DeviceIdentifier,
                     },
                     act: {
-                        deviceId: act.DeviceIdentifier,
+                        usedDeviceId: act.DeviceIdentifier,
                     },
                     mode: {
-                        deviceId: mode.DeviceIdentifier,
+                        usedDeviceId: mode.DeviceIdentifier,
                     },
                 },
             });
@@ -1821,6 +1843,8 @@ class bridgeClass {
                 device_class: `${entityType}`,
                 state_topic: `${onOff.Topic}${this.EndingState}`,
                 command_topic: `${onOff.Topic}${this.EndingSet}`,
+                state_on: 'true',
+                state_off: 'false',
                 payload_on: 'true',
                 payload_off: 'false',
                 min_humidity: target.min ? target.min : 0,
@@ -1837,7 +1861,7 @@ class bridgeClass {
                 this.SubscribedTopics,
                 `${onOff.Topic}${this.EndingSet}`,
                 {
-                    deviceId: onOff.DeviceIdentifier,
+                    usedDeviceId: onOff.DeviceIdentifier,
                 },
                 DiscoveryTopic,
                 DiscoveryPayload,
@@ -1849,7 +1873,7 @@ class bridgeClass {
                 this.SubscribedTopics,
                 `${target.Topic}${this.EndingSet}`,
                 {
-                    deviceId: target.DeviceIdentifier,
+                    usedDeviceId: target.DeviceIdentifier,
                 },
                 DiscoveryTopic,
                 DiscoveryPayload,
@@ -1862,7 +1886,7 @@ class bridgeClass {
                 this.PublishedIds,
                 config.HumidifierIds.onOff,
                 {
-                    deviceId: onOff.DeviceIdentifier,
+                    usedDeviceId: onOff.DeviceIdentifier,
                 },
                 DiscoveryTopic,
                 DiscoveryPayload,
@@ -1874,7 +1898,7 @@ class bridgeClass {
                 this.PublishedIds,
                 config.HumidifierIds.target,
                 {
-                    deviceId: target.DeviceIdentifier,
+                    usedDeviceId: target.DeviceIdentifier,
                 },
                 DiscoveryTopic,
                 DiscoveryPayload,
@@ -1886,7 +1910,7 @@ class bridgeClass {
                 this.PublishedIds,
                 config.HumidifierIds.act,
                 {
-                    deviceId: act.DeviceIdentifier,
+                    usedDeviceId: act.DeviceIdentifier,
                 },
                 DiscoveryTopic,
                 DiscoveryPayload,
@@ -1894,14 +1918,14 @@ class bridgeClass {
             );
             const informations = {
                 onOff: {
-                    deviceId: onOff.DeviceIdentifier,
+                    usedDeviceId: onOff.DeviceIdentifier,
                 },
                 target: {
-                    deviceId: target.DeviceIdentifier,
+                    usedDeviceId: target.DeviceIdentifier,
                 },
             };
             if (config.WithAct) {
-                informations.act = { deviceId: act.DeviceIdentifier };
+                informations.act = { usedDeviceId: act.DeviceIdentifier };
             }
             // Publishing the discover message
             await this.publishDiscovery(Id, {

package/package.json

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