iobroker.lorawan 1.18.54 → 1.18.56

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.18.56 (2025-12-30)
+* (BenAhrdt) remoove namespace twice remooved
+* (BenAhrdt) serialize getConfigStates
+
+### 1.18.55 (2025-12-29)
+* (BenAhrdt) bugfix folderinclusion
+
 ### 1.18.54 (2025-12-29)
 * (BenAhrdt) add '.' to folders in config selection
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.18.54",
+    "version": "1.18.56",
     "news": {
+      "1.18.56": {
+        "en": "remoove namespace twice remooved\nserialize getConfigStates",
+        "de": "remoove namespace zweimal remooved\nserialisieren getConfigStates",
+        "ru": "remoove namespace дважды удаляется\nсерийный GetConfigStates",
+        "pt": "remoove namespace duas vezes remooved\nserialize getConfigStates",
+        "nl": "naamruimte twee keer verplaatsen\nserialiseren getConfigStates",
+        "fr": "remove namespace deux fois removed\nsérialiser getConfigStates",
+        "it": "rimoove namespace due volte rimuovi\nserializzare ottenereConfigStates",
+        "es": "remoove namespace dos remooved\nserialize getConfigStates",
+        "pl": "remoove namespace two remooved\nserialize getConfigurations",
+        "uk": "remoove namespace двічі remooved\nсертифіковано getConfigStates",
+        "zh-cn": "两次重新移动命名空间\n序列化获取配置状态"
+      },
+      "1.18.55": {
+        "en": "bugfix folderinclusion",
+        "de": "bugfix ordnerinclusion",
+        "ru": "bugfix включение папок",
+        "pt": "inclusão de pastas de correção de erros",
+        "nl": "bugfix-map-integratie",
+        "fr": "bugfix dossierinclusion",
+        "it": "bugfix folderinclusione",
+        "es": "carpeta bugfixinclusion",
+        "pl": "włączenie folderu bugfix",
+        "uk": "папка прикусу",
+        "zh-cn": "包含错误文件夹"
+      },
       "1.18.54": {
         "en": "add '.' to folders in config selection",
         "de": "fügen sie '.' in ordner in config auswahl",
@@ -67,32 +93,6 @@
         "pl": "filtr w trybie debugowania (narzędzie dev)",
         "uk": "фільтр в режимі Debug (розробний інструмент)",
         "zh-cn": "调试模式中的过滤器( dev 工具)"
-      },
-      "1.18.49": {
-        "en": "Read and send always all light attributes",
-        "de": "Lesen und senden Sie immer alle Licht-Attribute",
-        "ru": "Читайте и отправляйте всегда все световые атрибуты",
-        "pt": "Ler e enviar sempre todos os atributos de luz",
-        "nl": "Lees en stuur altijd alle lichtattributen",
-        "fr": "Lire et envoyer toujours tous les attributs de lumière",
-        "it": "Leggi e invia sempre tutti gli attributi leggeri",
-        "es": "Lea y envíe siempre todos los atributos de luz",
-        "pl": "Czytaj i wysyłaj zawsze wszystkie atrybuty światła",
-        "uk": "Читайте і надсилайте завжди всі атрибути світла",
-        "zh-cn": "读取并发送所有光属性"
-      },
-      "1.18.48": {
-        "en": "Set the selection to usedNames (application and device)",
-        "de": "Setzen Sie die Auswahl auf gebrauchtNamen (Anwendung und Gerät)",
-        "ru": "Установите выбор используемых имен (приложения и устройства)",
-        "pt": "Define a seleção para nomes usados (aplicação e dispositivo)",
-        "nl": "De selectie instellen op gebruikte Namen (toepassing en apparaat)",
-        "fr": "Définissez la sélection aux noms utilisés (application et périphérique)",
-        "it": "Impostare la selezione per i nomi utilizzati (applicazione e dispositivo)",
-        "es": "Establecer la selección para utilizarNames (aplicación y dispositivo)",
-        "pl": "Ustaw wybór na używane Nazwy (aplikacja i urządzenie)",
-        "uk": "Налаштуйте вибір для використанняНазви (застосування та пристрій)",
-        "zh-cn": "将选中区域设定为使用的名称( 应用程序和设备)"
       }
     },
     "titleLang": {

package/lib/modules/bridge.js

@@ -993,7 +993,9 @@ class bridgeClass {
                             (changeInfo.applicationId === config.Application || config.Application === '*') &&
                             (changeInfo.deviceEUI === config.Device || config.Device === '*') &&
                             (id.includes(`.${config.Folder}.`) || config.Folder === '*') &&
-                            (id.includes(`.decoded.${config.State}`) || config.State === '*')
+                            (config.State === '*' ||
+                                (config.State.endsWith('.') && id.includes(`.decoded.${config.State}`)) ||
+                                (!config.State.endsWith('.') && id.endsWith(`.decoded.${config.State}`)))
                         ) {
                             Bridgestate.discover = !config.exclude;
                             Bridgestate.publish = true;
@@ -1065,7 +1067,9 @@ class bridgeClass {
                             (changeInfo.applicationId === config.Application || config.Application === '*') &&
                             (changeInfo.deviceEUI === config.Device || config.Device === '*') &&
                             (id.includes(`.${config.Folder}.`) || config.Folder === '*') &&
-                            (id.includes(`.control.${config.State}`) || config.State === '*')
+                            (config.State === '*' ||
+                                (config.State.endsWith('.') && id.includes(`.control.${config.State}`)) ||
+                                (!config.State.endsWith('.') && id.endsWith(`.control.${config.State}`)))
                         ) {
                             Bridgestate.discover = !config.exclude;
                             Bridgestate.publish = config.publish;

package/main.js

@@ -48,6 +48,10 @@ class Lorawan extends utils.Adapter {
             hash: 'f3988f71e0d6248fbf690c414bcb46b0500c3a8b3ec9adb9c66be2774ec12291',
             salt: 'LoRaWANBeScJoFr',
         };
+
+        // Serialize getStateConfig
+        this._configQueue = Promise.resolve();
+        this._changeInfoCache = new Map();
     }
 
     onFileChange(_id, _fileName, _size) {
@@ -1427,54 +1431,56 @@ class Lorawan extends utils.Adapter {
                     }
                 } else if (obj.command === 'getStatesForConfig' || obj.command === 'getStatesForClimateConfig') {
                     try {
-                        let myCount = 0;
-                        const states = [];
-                        const possibleTypes = { state: true };
-                        if (obj.command === 'getStatesForConfig') {
-                            states[myCount] = { label: '* (Wildcard)', value: '*' };
-                            myCount++;
-                            possibleTypes.folder = true;
-                        }
-                        const currentStates = {};
-                        const adapterObjects = await this.getAdapterObjectsAsync();
-                        for (const adapterObject of Object.values(adapterObjects)) {
-                            if (
-                                possibleTypes[adapterObject.type] === true &&
-                                (adapterObject._id.includes(obj.message.application) ||
-                                    obj.message.application === '*') &&
-                                (adapterObject._id.includes(obj.message.device) || obj.message.device === '*') &&
-                                (adapterObject._id.includes(obj.message.folder) ||
-                                    (obj.message.folder === '*' &&
-                                        (adapterObject._id.includes('uplink.decoded') ||
-                                            adapterObject._id.includes('downlink.control'))))
-                            ) {
-                                adapterObject._id = this.removeNamespace(adapterObject._id);
-                                const changeInfo = await this.getChangeInfo(adapterObject._id);
-                                //if uplink decoded => changed State with folder
-                                let fullStatename = changeInfo?.changedState;
-                                if (changeInfo?.allElements.length > 6) {
-                                    fullStatename = '';
-                                    for (let i = 5; i < changeInfo?.allElements.length; i++) {
-                                        if (fullStatename !== '') {
-                                            fullStatename += '.';
+                        await this.runSerializedMessage(async () => {
+                            let myCount = 0;
+                            const states = [];
+                            const possibleTypes = { state: true };
+                            if (obj.command === 'getStatesForConfig') {
+                                states[myCount] = { label: '* (Wildcard)', value: '*' };
+                                myCount++;
+                                possibleTypes.folder = true;
+                            }
+                            const currentStates = {};
+                            const adapterObjects = await this.getAdapterObjectsAsync();
+                            for (const adapterObject of Object.values(adapterObjects)) {
+                                if (
+                                    possibleTypes[adapterObject.type] === true &&
+                                    (adapterObject._id.includes(obj.message.application) ||
+                                        obj.message.application === '*') &&
+                                    (adapterObject._id.includes(obj.message.device) || obj.message.device === '*') &&
+                                    (adapterObject._id.includes(obj.message.folder) ||
+                                        (obj.message.folder === '*' &&
+                                            (adapterObject._id.includes('uplink.decoded') ||
+                                                adapterObject._id.includes('downlink.control'))))
+                                ) {
+                                    //adapterObject._id = this.removeNamespace(adapterObject._id); remooved 30.122025
+                                    const changeInfo = await this.getChangeInfoCached(adapterObject._id);
+                                    //if uplink decoded => changed State with folder
+                                    let fullStatename = changeInfo?.changedState;
+                                    if (changeInfo?.allElements.length > 6) {
+                                        fullStatename = '';
+                                        for (let i = 5; i < changeInfo?.allElements.length; i++) {
+                                            if (fullStatename !== '') {
+                                                fullStatename += '.';
+                                            }
+                                            fullStatename += changeInfo?.allElements[i];
                                         }
-                                        fullStatename += changeInfo?.allElements[i];
                                     }
-                                }
-                                if (adapterObject.type === 'folder') {
-                                    fullStatename += '.';
-                                }
-                                const label = fullStatename;
-                                const value = fullStatename;
-                                if (!currentStates[value]) {
-                                    currentStates[value] = value;
-                                    states[myCount] = { label: label, value: value };
-                                    myCount++;
+                                    if (adapterObject.type === 'folder') {
+                                        fullStatename += '.';
+                                    }
+                                    const label = fullStatename;
+                                    const value = fullStatename;
+                                    if (!currentStates[value]) {
+                                        currentStates[value] = value;
+                                        states[myCount] = { label: label, value: value };
+                                        myCount++;
+                                    }
                                 }
                             }
-                        }
-                        states.sort(this.sortByLabel);
-                        this.sendTo(obj.from, obj.command, states, obj.callback);
+                            states.sort(this.sortByLabel);
+                            this.sendTo(obj.from, obj.command, states, obj.callback);
+                        });
                     } catch (error) {
                         this.log.error(error);
                     }
@@ -1613,6 +1619,36 @@ class Lorawan extends utils.Adapter {
         }
         return false;
     }
+
+    async runSerializedMessage(fn) {
+        const run = async () => fn();
+
+        // Queue verlängern
+        const next = this._configQueue.then(run, run);
+
+        // Queue immer weiterführen, Fehler schlucken
+        this._configQueue = next.catch(() => {});
+
+        return next;
+    }
+
+    async getChangeInfoCached(id) {
+        const cleanId = this.removeNamespace(id);
+        const now = Date.now();
+
+        const cached = this._changeInfoCache.get(cleanId);
+        if (cached && cached.expires > now) {
+            return cached.value;
+        }
+
+        const value = await this.getChangeInfo(cleanId);
+        this._changeInfoCache.set(cleanId, {
+            value,
+            expires: now + 30_000, // 10 Sekunden
+        });
+
+        return value;
+    }
 }
 
 if (require.main !== module) {

package/package.json

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