iobroker.lorawan 1.20.23 → 1.20.25

package/README.md

@@ -23,6 +23,12 @@ 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.20.25 (2026-01-28)
+* (BenAhrdt) improve number of role detection
+
+### 1.20.24 (2026-01-28)
+* (BenAhrdt) change info Form to Detail button
+
 ### 1.20.23 (2026-01-28)
 * (BenAhrdt) change role display and icons
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.20.23",
+    "version": "1.20.25",
     "news": {
+      "1.20.25": {
+        "en": "improve number of role detection",
+        "de": "verbesserung der anzahl der rollenerkennung",
+        "ru": "улучшение обнаружения ролей",
+        "pt": "melhorar o número de detecção de funções",
+        "nl": "het aantal roldetectie verbeteren",
+        "fr": "améliorer le nombre de détections de rôles",
+        "it": "migliorare il numero di rilevamento del ruolo",
+        "es": "mejorar el número de detección de funciones",
+        "pl": "zwiększenie liczby wykrywanych ról",
+        "uk": "поліпшення кількості визначення ролі",
+        "zh-cn": "改进角色检测数量"
+      },
+      "1.20.24": {
+        "en": "change info Form to Detail button",
+        "de": "änderungen Formular zum Detail Knopf",
+        "ru": "изменить информацию Форма для детализации кнопки",
+        "pt": "alterar informações Botão de Formulário para Detalhe",
+        "nl": "info wijzigen Vorm naar detailknop",
+        "fr": "modifier les informations Formulaire au bouton Détail",
+        "it": "cambiare le informazioni Modulo per Dettaglio pulsante",
+        "es": "cambio de información Forma al botón Detalle",
+        "pl": "zmiana informacji Format do przycisku Szczegóły",
+        "uk": "зміна інформації Форма для докладної кнопки",
+        "zh-cn": "更改信息 详细按钮的窗体"
+      },
       "1.20.23": {
         "en": "change role display and icons",
         "de": "rollenanzeige und icons ändern",
@@ -67,32 +93,6 @@
         "pl": "bugfix incon set",
         "uk": "виправлення помилок",
         "zh-cn": "装入套装错误"
-      },
-      "1.20.18": {
-        "en": "bugfix nameing incomingTopic",
-        "de": "bugfix Nameing eingehend Thema",
-        "ru": "bugfix Имя входящего Тема",
-        "pt": "correcção de erros a dar entrada Tópico",
-        "nl": "bugfix-naam binnenkomend Onderwerp",
-        "fr": "bugfix nominant entrant Thème",
-        "it": "bugfix nome in arrivo Argomento",
-        "es": "bugfix nombre entrante Tema",
-        "pl": "nadchodzące nazewnictwo bugfix Temat",
-        "uk": "виправлення ім'я користувача Головна",
-        "zh-cn": "正在接收错误修正名称 专题"
-      },
-      "1.20.17": {
-        "en": "implement Device details",
-        "de": "durchführung Gerätedetails",
-        "ru": "осуществлять Детали устройства",
-        "pt": "implementar Detalhes do dispositivo",
-        "nl": "implementeren Apparaatdetails",
-        "fr": "mise en œuvre Détails du périphérique",
-        "it": "attuazione Dettagli del dispositivo",
-        "es": "aplicación Detalles del dispositivo",
-        "pl": "wdrożenie Szczegóły dotyczące urządzenia",
-        "uk": "реалізація Деталі пристрою",
-        "zh-cn": "执行 设备细节"
       }
     },
     "titleLang": {

package/lib/modules/deviceManager.js

@@ -16,6 +16,7 @@ class LoRaWANDeviceManagement extends DeviceManagement {
         this.adapter = adapter;
         this.x = adapter;
     }
+
     /**
      * List all LoRaWAN devices
      */
@@ -23,36 +24,36 @@ class LoRaWANDeviceManagement extends DeviceManagement {
     // @ts-expect-error
     async listDevices() {
         const arrDevices = [];
-        for (const [key, value] of Object.entries(this.adapter.objectStore.devices)) {
+        for (const [devEUI, deviceValue] of Object.entries(this.adapter.objectStore.devices)) {
             // Check for logging
-            this.adapter.log[this.adapter.logtypes.listDevices]?.(`List device started for device: ${key}`);
+            this.adapter.log[this.adapter.logtypes.listDevices]?.(`List device started for device: ${devEUI}`);
             const res = {
-                id: key,
-                name: value.object.common.name,
-                icon: await this.getIcon(value),
+                id: devEUI,
+                name: deviceValue.object.common.name,
+                icon: await this.getIcon(deviceValue),
                 manufacturer: 'LoRaWAN',
-                model: value.informations ? value.informations.devicetype.state.val : undefined, // - ${value.uplink.remaining.rxInfo[0].rssi.ts}`,
-                status: await this.getStatus(value),
-                hasDetails: false,
+                model: deviceValue.informations ? deviceValue.informations.devicetype.state.val : undefined, // - ${value.uplink.remaining.rxInfo[0].rssi.ts}`,
+                status: await this.getStatus(deviceValue),
+                hasDetails: true,
                 actions: [
                     {
                         id: 'rename',
                         icon: 'edit',
                         description: this.adapter.i18nTranslation['Rename this device'],
-                        handler: async (_id, context) => await this.handleRenameDevice(_id, context, value),
+                        handler: async (_id, context) => await this.handleRenameDevice(_id, context, deviceValue),
                     },
                     {
                         id: 'config',
                         icon: 'settings',
                         description: this.adapter.i18nTranslation['Config this device'],
-                        handler: async (_id, context) => await this.handleConfigDevice(_id, context, value),
+                        handler: async (_id, context) => await this.handleConfigDevice(_id, context, deviceValue),
                     },
-                    {
+                    /* {
                         id: 'Info',
                         icon: 'lines',
                         description: this.adapter.i18nTranslation['Info of this device'],
                         handler: async (_id, context) => await this.handleInfo(_id, context),
-                    },
+                    }, Outcommented at 28.01.2026 (use Details)*/
                 ],
             };
             arrDevices.push(res);
@@ -249,7 +250,7 @@ class LoRaWANDeviceManagement extends DeviceManagement {
      * @param id ID to rename
      * @param context context sendet from Backend
      */
-    async handleInfo(id, context) {
+    /*async handleInfo(id, context) {
         const generalItems = {};
         const data = {};
         const lastUplinkTs = new Date(
@@ -364,7 +365,7 @@ class LoRaWANDeviceManagement extends DeviceManagement {
         };
         await context.showForm(schema, options);
         return { refresh: true };
-    }
+    } Outcommented at 28.01.2026 (use Details)*/
 
     /**
      *
@@ -386,6 +387,128 @@ class LoRaWANDeviceManagement extends DeviceManagement {
 
         return object;
     }
+
+    /**
+     * @param {string} id ID from device
+     * @returns {Promise<import('@iobroker/dm-utils').DeviceDetails>} return the right value
+     */
+    async getDeviceDetails(id) {
+        // eslint-disable-next-line jsdoc/check-tag-names
+        /** @type {Record<string, import('@iobroker/dm-utils').ConfigItemAny>} */
+        const generalItems = {};
+        const data = {};
+        const lastUplinkTs = new Date(
+            this.adapter.objectStore.devices[id].informations.lastUplink.state.ts,
+        ).toLocaleString('de-DE', {
+            weekday: 'long', // Mo
+            year: 'numeric', // 2026
+            month: '2-digit', // 01
+            day: '2-digit', // 24
+            hour: '2-digit', // 14
+            minute: '2-digit', // 32
+            second: '2-digit', // 10
+        });
+        generalItems['Timestamp_value'] = {
+            type: 'staticInfo',
+            label: 'LastUplink',
+            size: 16,
+            data: lastUplinkTs,
+        };
+        if (this.adapter.objectStore.devices[id].join?.raw?.json?.state?.lc) {
+            const lastJoinedLc = new Date(this.adapter.objectStore.devices[id].join.raw.json.state.lc).toLocaleString(
+                'de-DE',
+                {
+                    weekday: 'long', // Mo
+                    year: 'numeric', // 2026
+                    month: '2-digit', // 01
+                    day: '2-digit', // 24
+                    hour: '2-digit', // 14
+                    minute: '2-digit', // 32
+                    second: '2-digit', // 10
+                },
+            );
+            generalItems['Join_value'] = {
+                type: 'staticInfo',
+                label: 'lastJoined',
+                size: 16,
+                data: lastJoinedLc,
+            };
+        }
+
+        generalItems['uplinkDecodedHeader'] = {
+            newLine: true,
+            type: 'header',
+            text: 'Uplink Decoded',
+            size: 3,
+        };
+
+        generalItems['uplinkDecoded'] = {
+            type: 'text',
+            readOnly: true,
+            minRows: 10,
+            maxRows: 40,
+        };
+
+        let subfolders = {};
+        for (const [key, value] of Object.entries(this.adapter.objectStore.devices[id].detectedRoles)) {
+            if (key === 'state') {
+                continue;
+            }
+            for (const subfolder in value) {
+                if (!subfolder.startsWith('uplink') && subfolder !== 'downlink.control') {
+                    continue;
+                }
+                if (!subfolders[subfolder]) {
+                    subfolders[subfolder] = {};
+                }
+                subfolders[subfolder][key] = value[subfolder];
+            }
+        }
+        subfolders = this.sortObjectDeep(subfolders);
+        // eslint-disable-next-line jsdoc/check-tag-names
+        /** @type {Record<string, import('@iobroker/dm-utils').ConfigItemAny>} */
+        const roleItems = {};
+        for (const subfolder in subfolders) {
+            roleItems[subfolder] = {
+                newLine: true,
+                type: 'header',
+                text: subfolder,
+                size: 3,
+            };
+            const detectedRoles = Object.entries(subfolders[subfolder])
+                .map(([key, value]) => `${key}(${value})`)
+                .join('     ');
+            roleItems[`${subfolder.replace(/\./g, '_')}Roles`] = {
+                type: 'text',
+                minRows: 2,
+                readOnly: true,
+            };
+            data[`${subfolder.replace(/\./g, '_')}Roles`] = detectedRoles;
+        }
+        // eslint-disable-next-line jsdoc/check-tag-names
+        /** @type {import('@iobroker/dm-utils').JsonFormSchema} */
+        const schema = {
+            type: 'tabs',
+            items: {
+                generalTab: {
+                    type: 'panel',
+                    label: 'generalInformations',
+                    items: generalItems,
+                },
+                roleTab: {
+                    type: 'panel',
+                    label: 'detectedRoles',
+                    items: roleItems,
+                },
+            },
+        };
+
+        let deviceInfo = await this.adapter.getStateAsync('info.deviceinformations');
+        deviceInfo = JSON.parse(deviceInfo.val);
+        const sortedUplinkDecoded = this.sortObjectDeep(deviceInfo[id].uplink.decoded);
+        data.uplinkDecoded = JSON.stringify(sortedUplinkDecoded, null, 2);
+        return { id, schema, data };
+    }
 }
 
 module.exports = LoRaWANDeviceManagement;

package/lib/modules/objectStore.js

@@ -102,16 +102,24 @@ class objectStoreClass {
                         if (payload.object) {
                             // Just Quere if role is not undefined
                             if (payload.object.common.role !== undefined) {
-                                if (!deviceObject[deviceId].detectedRoles) {
-                                    deviceObject[deviceId].detectedRoles = {};
-                                }
-                                if (!deviceObject[deviceId].detectedRoles[payload.object.common.role]) {
-                                    deviceObject[deviceId].detectedRoles[payload.object.common.role] = {};
-                                }
-                                if (!deviceObject[deviceId].detectedRoles[payload.object.common.role][idSubfolder]) {
-                                    deviceObject[deviceId].detectedRoles[payload.object.common.role][idSubfolder] = 1;
-                                } else {
-                                    deviceObject[deviceId].detectedRoles[payload.object.common.role][idSubfolder] += 1;
+                                if (!idObject[id].roleDetected) {
+                                    if (!deviceObject[deviceId].detectedRoles) {
+                                        deviceObject[deviceId].detectedRoles = {};
+                                    }
+                                    if (!deviceObject[deviceId].detectedRoles[payload.object.common.role]) {
+                                        deviceObject[deviceId].detectedRoles[payload.object.common.role] = {};
+                                    }
+                                    if (
+                                        !deviceObject[deviceId].detectedRoles[payload.object.common.role][idSubfolder]
+                                    ) {
+                                        deviceObject[deviceId].detectedRoles[payload.object.common.role][idSubfolder] =
+                                            1;
+                                    } else {
+                                        deviceObject[deviceId].detectedRoles[payload.object.common.role][idSubfolder] +=
+                                            1;
+                                    }
+                                    // Role for DeviceAssignes
+                                    idObject[id].roleDetected = true;
                                 }
                                 if (Object.hasOwn(this.roleAssignToDeviceInformations, payload.object.common.role)) {
                                     roleAssign = this.roleAssignToDeviceInformations[payload.object.common.role];

package/main.js

@@ -906,7 +906,7 @@ class Lorawan extends utils.Adapter {
                                             role: 'json',
                                             read: true,
                                             write: true,
-                                            def: '',
+                                            def: 'applications, devices, currentIds',
                                         },
                                         native: {},
                                     });

package/package.json

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