iobroker.lorawan 1.7.1 → 1.8.1

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.8.1 (2025-04-06)
+* (BenAhrdt) chaned format time in device info
+
+### 1.8.0 (2025-04-06)
+* (BenAhrdt) update dependencies and time / timestamp in deviceinfos
+
 ### 1.7.1 (2025-04-06)
 * (BenAhrdt) change timewriting in deviceinfos at chirpstack
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.7.1",
+    "version": "1.8.1",
     "news": {
+      "1.8.1": {
+        "en": "chaned format time in device info",
+        "de": "chaned format time in device info",
+        "ru": "время в формате chaned in device info",
+        "pt": "tempo de formato chaned em informações do dispositivo",
+        "nl": "gechanteerde opmaaktijd in apparaatinformatie",
+        "fr": "temps de format channed dans l'information de l'appareil",
+        "it": "chaned format time in informazioni sul dispositivo",
+        "es": "tiempo de formato enmarcado en la información del dispositivo",
+        "pl": "chaned format time in device info",
+        "uk": "chaned формат часу в пристрої інформація",
+        "zh-cn": "设备信息中显示的格式时间"
+      },
+      "1.8.0": {
+        "en": "update dependencies and time / timestamp in deviceinfos",
+        "de": "aktualisierung von abhängigkeiten und zeit / zeitstempel in deviceinfos",
+        "ru": "зависимости обновления и время / временная метка в deviceinfos",
+        "pt": "dependências de atualização e tempo / timestamp no deviceinfos",
+        "nl": "afhankelijkheden en tijd / tijdstempel in apparaatinfo's bijwerken",
+        "fr": "mettre à jour les dépendances et l'heure / timestamp dans deviceinfos",
+        "it": "aggiornamento dipendenze e tempo / timestamp in deviceinfos",
+        "es": "actualizar las dependencias y el tiempo / timetamp en deviceinfos",
+        "pl": "aktualizacja zależności i czasu / znacznika czasu w deviceinfos",
+        "uk": "оновлення залежностей і часу / часовий апарат",
+        "zh-cn": "更新设备信息中的依赖性和时间/ 时间戳"
+      },
       "1.7.1": {
         "en": "change timewriting in deviceinfos at chirpstack",
         "de": "zeitschreiben in deviceinfos bei chirpstack ändern",
@@ -67,32 +93,6 @@
         "pl": "Ustaw dekodowaną strukturę w deviceInfos (z połączeniem)",
         "uk": "Настроювання декодованої структури в пристроїІнфос (з торговою маркою)",
         "zh-cn": "在设备Infos( 合并) 中设置解码结构"
-      },
-      "1.6.3": {
-        "en": "Names of states changed (Downlink Raw)\nChange setObjectNotExistsAsync to extendObjectAsync for Raw Data",
-        "de": "Namen der geänderten Zustände (Downlink Raw)\nÄnderungssatz ObjectNotExistsAsync erweitert ObjectAsync für Rohdaten",
-        "ru": "Изменились названия государств (Downlink Raw)\nИзменение ObjectNotExistsAsync ObjectAsync для первичных данных",
-        "pt": "Nomes de estados alterados (Downlink Raw)\nConjunto de alterações ObjectNotExistsAsync para estender ObjectAsync para dados brutos",
-        "nl": "Namen van statuss veranderd (Downlink Raw)\nVerander set ObjectNotExistsAsync uit te breiden ObjectAsync voor ruwe gegevens",
-        "fr": "Noms des états modifiés (Downlink Raw)\nModifier l'ensemble ObjetNotExistsAsync pour étendre ObjetAsync pour les données brutes",
-        "it": "I nomi degli stati cambiati (Downlink Raw)\nModifica set ObjectNotExistsAsync per estendere ObjectAsync per dati raw",
-        "es": "Los nombres de los estados cambiaron (Downlink Raw)\nCambio ObjectNotExistsAsync para extender ObjectAsync for Raw Data",
-        "pl": "Zmienione nazwy państw (Downlink Raw)\nZmień zestaw ObjectNotExistsAsync do rozszerzenia ObjectAsync for raw Data",
-        "uk": "Назви змінених держав (Downlink Raw)\nЗмінення Об'єктNotExistsAsync для розширення Об'єктАсинк для сирих даних",
-        "zh-cn": "更改州名( 下link Raw)\n更改设置 要扩展的对象“非外来”Async 原始数据对象同步"
-      },
-      "1.6.2": {
-        "en": "Bugfix creation of deviceinfo",
-        "de": "Bugfix Erstellung von deviceinfo",
-        "ru": "Bugfix создание deviceinfo",
-        "pt": "Criação de Bugfix de deviceinfo",
-        "nl": "Bugfix aanmaken van apparaatinfo",
-        "fr": "Bugfix création de périphériqueinfo",
-        "it": "Bugfix creazione di deviceinfo",
-        "es": "Creación de bugfix del dispositivoinfo",
-        "pl": "Bugfix tworzenie deviceinfo",
-        "uk": "Створення пристроюinfo",
-        "zh-cn": "设备信息的错误修正创建"
       }
     },
     "titleLang": {

package/lib/modules/messagehandler.js

@@ -3,7 +3,7 @@ const { isDeepStrictEqual } = require('util');
 const directorieshandlerClass = require('./directorieshandler');
 const schedule = require('node-schedule');
 const assignhandlerClass = require('./assignhandler');
-const _ = require('lodash');
+const lodash = require('lodash');
 /**
  * handles the message, wich comes from LoRaWAN devices
  */
@@ -196,7 +196,7 @@ class messagehandlerClass {
                             // => Structure
                             const generatedStructure = this.getIdStructure(restId, decodedState.val);
                             // merge the structures
-                            decodedData[changeInfo.deviceEUI].decoded = _.merge(
+                            decodedData[changeInfo.deviceEUI].decoded = lodash.merge(
                                 decodedData[changeInfo.deviceEUI].decoded,
                                 generatedStructure,
                             );
@@ -287,13 +287,30 @@ class messagehandlerClass {
                 case this.adapter.origin.ttn:
                     if (message.uplink_message && message.uplink_message.rx_metadata[0]) {
                         for (const attr in message.uplink_message.decoded_payload) {
-                            this.deviceinformations[changeInfo.deviceEUI].uplink.decoded[attr] =
-                                message.uplink_message.decoded_payload[attr];
+                            if (typeof message.uplink_message.decoded_payload[attr] === 'object') {
+                                // merge the structures
+                                this.deviceinformations[changeInfo.deviceEUI].uplink.decoded[attr] = lodash.merge(
+                                    this.deviceinformations[changeInfo.deviceEUI].uplink.decoded[attr],
+                                    message.uplink_message.decoded_payload[attr],
+                                );
+                            } else {
+                                this.deviceinformations[changeInfo.deviceEUI].uplink.decoded[attr] =
+                                    message.uplink_message.decoded_payload[attr];
+                            }
                         }
-                        this.deviceinformations[changeInfo.deviceEUI].uplink.time =
+
+                        // Generate Timestamp
+                        const Timestamp =
                             typeof message.uplink_message.rx_metadata[0].time === 'number'
                                 ? message.uplink_message.rx_metadata[0].time
                                 : new Date(message.uplink_message.rx_metadata[0].time).valueOf();
+
+                        // time
+                        this.deviceinformations[changeInfo.deviceEUI].uplink.time =
+                            this.generateTimestringFromTimestamp(Timestamp);
+
+                        // timestamp
+                        this.deviceinformations[changeInfo.deviceEUI].uplink.timestamp = Timestamp;
                     }
                     break;
                 case this.adapter.origin.chirpstack:
@@ -303,7 +320,7 @@ class messagehandlerClass {
                             if (this.deviceinformations[changeInfo.deviceEUI].uplink.decoded[attr]) {
                                 if (typeof message.object[attr] === 'object') {
                                     // merge the structures
-                                    this.deviceinformations[changeInfo.deviceEUI].uplink.decoded[attr] = _.merge(
+                                    this.deviceinformations[changeInfo.deviceEUI].uplink.decoded[attr] = lodash.merge(
                                         this.deviceinformations[changeInfo.deviceEUI].uplink.decoded[attr],
                                         message.object[attr],
                                     );
@@ -316,8 +333,16 @@ class messagehandlerClass {
                                     message.object[attr];
                             }
                         }
-                        this.deviceinformations[changeInfo.deviceEUI].uplink.time =
+                        // Generate Timestamp
+                        const Timestamp =
                             typeof message.time === 'number' ? message.time : new Date(message.time).valueOf();
+
+                        // time
+                        this.deviceinformations[changeInfo.deviceEUI].uplink.time =
+                            this.generateTimestringFromTimestamp(Timestamp);
+
+                        // timestamp
+                        this.deviceinformations[changeInfo.deviceEUI].uplink.timestamp = Timestamp;
                     }
                     break;
             }
@@ -327,6 +352,14 @@ class messagehandlerClass {
         }
     }
 
+    // Generate Timestring for deviceInformations
+    /**
+     * @param Timestamp Timestamp, from wich the Timestring has to generated
+     */
+    generateTimestringFromTimestamp(Timestamp) {
+        return `${new Date(Timestamp).toDateString()} ${new Date(Timestamp).toTimeString().substring(0, 8)}`;
+    }
+
     //Add directories at startup (so they are present before next upload)
     /**
      * @param startDirectory directorypath (id)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.lorawan",
-  "version": "1.7.1",
+  "version": "1.8.1",
   "description": "converts the desired lora gateway data to a ioBroker structure",
   "author": {
     "name": "BenAhrdt",
@@ -27,6 +27,7 @@
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.3",
     "easy-crc": "^1.1.0",
+    "lodash": "^4.17.21",
     "mqtt": "^5.10.4",
     "node-schedule": "^2.1.1"
   },
@@ -41,6 +42,7 @@
     "@tsconfig/node18": "^18.2.2",
     "@types/chai": "^4.3.11",
     "@types/chai-as-promised": "^8.0.2",
+    "@types/lodash": "^4.17.16",
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.13.14",
     "@types/proxyquire": "^1.3.31",