iobroker.lorawan 1.20.22 → 1.20.24

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.24 (2026-01-28)
+* (BenAhrdt) change info Form to Detail button
+
+### 1.20.23 (2026-01-28)
+* (BenAhrdt) change role display and icons
+
 ### 1.20.22 (2026-01-27)
 * (BenAhrdt) change preasure quere to pressure
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.20.22",
+    "version": "1.20.24",
     "news": {
+      "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",
+        "ru": "изменить отображение ролей и иконки",
+        "pt": "alterar a exibição de funções e ícones",
+        "nl": "rolweergave en pictogrammen wijzigen",
+        "fr": "modifier l'affichage des rôles et les icônes",
+        "it": "modifica visualizzazione del ruolo e icone",
+        "es": "función de cambio de visualización e iconos",
+        "pl": "zmienić wyświetlacz ról i ikony",
+        "uk": "змінити відображення ролі та іконки",
+        "zh-cn": "更改角色显示和图标"
+      },
       "1.20.22": {
         "en": "change preasure quere to pressure",
         "de": "voreinstellungsanfrage zum druck ändern",
@@ -67,32 +93,6 @@
         "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": "执行 设备细节"
-      },
-      "1.20.16": {
-        "en": "add informations to device Manager",
-        "de": "informationen zum Gerätemanager hinzufügen",
-        "ru": "добавление информации в диспетчер устройств",
-        "pt": "adicionar informações ao gerenciador de dispositivos",
-        "nl": "informatie toevoegen aan apparaatbeheer",
-        "fr": "ajouter des informations au gestionnaire de périphériques",
-        "it": "aggiungere informazioni al gestore del dispositivo",
-        "es": "añadir información al administrador del dispositivo",
-        "pl": "dodać informacje do urządzenia Manager",
-        "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);
@@ -149,6 +150,8 @@ class LoRaWANDeviceManagement extends DeviceManagement {
                 return possibleIcons.door;
             } else if (deviceValue.detectedRoles['sensor.window']) {
                 return possibleIcons.window;
+            } else if (deviceValue.detectedRoles['sensor.contact']) {
+                return `/adapter/${this.adapter.name}/icons/sensor.contact.png`;
             } else if (deviceValue.detectedRoles['value.temperature']) {
                 if (deviceValue.detectedRoles['value.pressure']) {
                     return possibleIcons.weatherCurrent;
@@ -159,7 +162,7 @@ class LoRaWANDeviceManagement extends DeviceManagement {
                 return possibleIcons.temperature;
             }
         }
-        return 'node'; //`/adapter/${this.adapter.name}/icons/Node.png`; //${value.object.common.icon}`,
+        return possibleIcons.hub5; //`/adapter/${this.adapter.name}/icons/Node.png`; //${value.object.common.icon}`,
     }
 
     /**
@@ -247,8 +250,9 @@ 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(
             this.adapter.objectStore.devices[id].informations.lastUplink.state.ts,
         ).toLocaleString('de-DE', {
@@ -285,8 +289,6 @@ class LoRaWANDeviceManagement extends DeviceManagement {
                 size: 16,
                 data: lastJoinedLc,
             };
-        } else {
-            this.adapter.log.warn(JSON.stringify(this.adapter.objectStore.devices[id].join));
         }
 
         generalItems['uplinkDecodedHeader'] = {
@@ -309,13 +311,16 @@ class LoRaWANDeviceManagement extends DeviceManagement {
                 continue;
             }
             for (const subfolder in value) {
+                if (!subfolder.startsWith('uplink') && subfolder !== 'downlink.control') {
+                    continue;
+                }
                 if (!subfolders[subfolder]) {
                     subfolders[subfolder] = {};
                 }
-                subfolders[subfolder][key] = true;
+                subfolders[subfolder][key] = value[subfolder];
             }
         }
-        subfolders = Object.fromEntries(Object.entries(subfolders).sort(([a], [b]) => a.localeCompare(b)));
+        subfolders = this.sortObjectDeep(subfolders);
         const roleItems = {};
         for (const subfolder in subfolders) {
             roleItems[subfolder] = {
@@ -324,17 +329,15 @@ class LoRaWANDeviceManagement extends DeviceManagement {
                 text: subfolder,
                 size: 3,
             };
-            let detectedRoles = '';
-            detectedRoles += Object.keys(subfolders[subfolder])
-                .sort((a, b) => a.localeCompare(b))
-                .join('  --  ');
-
-            roleItems[`${subfolder}_Roles`] = {
-                newLine: true,
-                type: 'staticText',
-                text: detectedRoles,
-                size: 10,
+            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;
         }
         const schema = {
             type: 'tabs',
@@ -354,18 +357,35 @@ class LoRaWANDeviceManagement extends DeviceManagement {
 
         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);
         const options = {
-            data: {
-                uplinkDecoded: JSON.stringify(
-                    deviceInfo[id].uplink.decoded,
-                    Object.keys(deviceInfo[id].uplink.decoded).sort(),
-                    2,
-                ),
-            },
+            data,
             title: this.adapter.i18nTranslation['Info of this device'],
         };
         await context.showForm(schema, options);
         return { refresh: true };
+    } Outcommented at 28.01.2026 (use Details)*/
+
+    /**
+     *
+     * @param object Object to sort
+     */
+    sortObjectDeep(object) {
+        if (Array.isArray(object)) {
+            return object.map(this.sortObjectDeep);
+        }
+
+        if (object !== null && typeof object === 'object') {
+            return Object.keys(object)
+                .sort((a, b) => a.localeCompare(b))
+                .reduce((acc, key) => {
+                    acc[key] = this.sortObjectDeep(object[key]);
+                    return acc;
+                }, {});
+        }
+
+        return object;
     }
 
     /**
@@ -373,7 +393,10 @@ class LoRaWANDeviceManagement extends DeviceManagement {
      * @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', {
@@ -410,22 +433,20 @@ class LoRaWANDeviceManagement extends DeviceManagement {
                 size: 16,
                 data: lastJoinedLc,
             };
-        } else {
-            this.adapter.log.warn(JSON.stringify(this.adapter.objectStore.devices[id].join));
         }
 
-        let deviceInfo = await this.adapter.getStateAsync('info.deviceinformations');
-        deviceInfo = JSON.parse(deviceInfo.val);
-        const data = JSON.stringify(
-            deviceInfo[id].uplink.decoded,
-            Object.keys(deviceInfo[id].uplink.decoded).sort(),
-            2,
-        );
-        generalItems['Uplink_decoded'] = {
+        generalItems['uplinkDecodedHeader'] = {
+            newLine: true,
+            type: 'header',
+            text: 'Uplink Decoded',
+            size: 3,
+        };
+
+        generalItems['uplinkDecoded'] = {
             type: 'text',
-            defaultSendTo: `BS:sendBack:${data}`,
             readOnly: true,
             minRows: 10,
+            maxRows: 40,
         };
 
         let subfolders = {};
@@ -434,13 +455,18 @@ class LoRaWANDeviceManagement extends DeviceManagement {
                 continue;
             }
             for (const subfolder in value) {
+                if (!subfolder.startsWith('uplink') && subfolder !== 'downlink.control') {
+                    continue;
+                }
                 if (!subfolders[subfolder]) {
                     subfolders[subfolder] = {};
                 }
-                subfolders[subfolder][key] = true;
+                subfolders[subfolder][key] = value[subfolder];
             }
         }
-        subfolders = Object.fromEntries(Object.entries(subfolders).sort(([a], [b]) => a.localeCompare(b)));
+        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] = {
@@ -448,46 +474,40 @@ class LoRaWANDeviceManagement extends DeviceManagement {
                 type: 'header',
                 text: subfolder,
                 size: 3,
-                xs: 12,
-                sm: 12,
-                md: 12,
-                lg: 12,
-                xl: 12,
             };
-            let detectedRoles = '';
-            detectedRoles += Object.keys(subfolders[subfolder])
-                .sort((a, b) => a.localeCompare(b))
-                .join('  --  ');
-
-            roleItems[`${subfolder}_Roles`] = {
-                newLine: true,
-                type: 'staticText',
-                text: detectedRoles,
-                size: 10,
+            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;
         }
-        return {
-            id,
-            schema: {
-                type: 'tabs',
-                items: {
-                    generalTab: {
-                        type: 'panel',
-                        label: 'generalInformations',
-                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                        // @ts-expect-error
-                        items: generalItems,
-                    },
-                    roleTab: {
-                        type: 'panel',
-                        label: 'detectedRoles',
-                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                        // @ts-expect-error
-                        items: roleItems,
-                    },
+        // 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 };
     }
 }
 

package/package.json

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