iobroker.lorawan 1.17.16 → 1.17.17

package/README.md

@@ -23,6 +23,10 @@ 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.17 (2025-10-04)
+* (BenAhrdt) serialize appending Data on NextSend
+* (BenAhrdt) update assignhandler (SensorTemperature)
+
 ### 1.17.16 (2025-09-25)
 * (BenAhrdt) bring state_off topic to humidifier
 
@@ -666,7 +670,7 @@ For now there is documentation in English here: https://wiki.hafenmeister.de
 ## License
 MIT License
 
-Copyright (c) 2025 BenAhrdt <bsahrdt@gmail.com>
+Copyright (c) 2025 BenAhrdt <bsahrdt@gmail.com>  
 Copyright (c) 2025 Joerg Froehner <LoraWan@hafenmeister.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.17.16",
+    "version": "1.17.17",
     "news": {
+      "1.17.17": {
+        "en": "serialize appending Data on NextSend\nupdate assignhandler (SensorTemperature)",
+        "de": "serialisieren Appending Data auf NextSend\nupdate assignhandler (SensorTemperatur)",
+        "ru": "сериализировать добавленные данные в NextSend\nраспределитель обновлений (SensorTemperature)",
+        "pt": "serialize anexando dados no NextSend\natualizar assignhandler (SensorTemperature)",
+        "nl": "serialiseren toevoegen van gegevens op NextSend\nupdate awardhandler (SensorTemperatuur)",
+        "fr": "sérialiser l'ajout de données sur NextSend\nmettre à jour le gestionnaire d'attribution (SensorTemperature)",
+        "it": "serializzare i dati di appending su NextSend\naggiornamento assegnatore (SensorTemperature)",
+        "es": "serializar los datos pendientes en NextSend\n(SensorTemperature)",
+        "pl": "serializuj przypisywanie danych na nextSend\naktualizuj urządzenie sterujące (SensorTemperatura)",
+        "uk": "сертифікувати дані додатків на NextSend\nоновлення assignhandler (SensorTemperature)",
+        "zh-cn": "序列化下一端的数据\n更新指派手( 传感器)"
+      },
       "1.17.16": {
         "en": "bring state_off topic to humidifier",
         "de": "state_off-thema zur befeuchtung bringen",
@@ -80,19 +93,6 @@
         "pl": "nie wypełniaj Downlinks w przypadku niewdrożonego rodzaju wiadomości\nrodzaj idów json zmienionych na ciąg",
         "uk": "не заповнити Попередження у разі невиконання типу повідомлення\nтип json ids змінився на рядок",
         "zh-cn": "不填满 未执行消息类型时的下行链接\n更改为字符串的 json id 类型"
-      },
-      "1.17.10": {
-        "en": "Update topics und qnique ids",
-        "de": "Update-Themen und qnique ids",
-        "ru": "Обновление тем und qnique ids",
-        "pt": "Atualizar tópicos e IDs do qnique",
-        "nl": "Onderwerpen en qnique-id's bijwerken",
-        "fr": "Mettre à jour les sujets et les ids qnique",
-        "it": "Aggiornare gli argomenti und qnique ids",
-        "es": "Actualizar temas und qnique ids",
-        "pl": "Aktualizacja tematów i idów qnique",
-        "uk": "Оновлення тем und qnique ids",
-        "zh-cn": "更新主题 und qnique ids"
       }
     },
     "titleLang": {

package/lib/modules/assignhandler.js

@@ -197,6 +197,16 @@ class assignhandlerClass {
                     },
                 },
             },
+            KeepAliveTime: {
+                approvedFolders: {
+                    'uplink.decoded': {
+                        assignfunction: this.commonAssign,
+                        common: {
+                            unit: 'min',
+                        },
+                    },
+                },
+            },
             Light: {
                 approvedFolders: {
                     'uplink.decoded': {
@@ -374,6 +384,7 @@ class assignhandlerClass {
                         assignfunction: this.commonAssign,
                         common: {
                             role: 'value.temperature',
+                            unit: '°C',
                         },
                     },
                 },

package/main.js

@@ -34,6 +34,8 @@ class Lorawan extends utils.Adapter {
             chirpstack: 'chirpstack',
         };
 
+        this.NextSendLocks = new Map(); // key -> Promise-chain
+
         // Simulation variables
         this.simulation = {};
         this.mySystemConfig;
@@ -765,22 +767,55 @@ class Lorawan extends utils.Adapter {
         this.log.debug(`Function ${activeFunction} started.`);
         try {
             const idFolderNextSend = `${changeInfo.objectStartDirectory}.${this.messagehandler?.directoryhandler.reachableSubfolders.downlinkNextSend}`;
-            if (
-                changeInfo.bestMatchForDeviceType &&
-                this.downlinkConfighandler?.activeDownlinkConfigs[changeInfo.bestMatchForDeviceType].sendWithUplink ===
-                    'enabled & collect'
-            ) {
-                const nextSend = await this.getStateAsync(`${idFolderNextSend}.hex`);
-                if (nextSend?.val !== '0') {
-                    payloadInHex = nextSend?.val + payloadInHex;
+            const stateId = `${idFolderNextSend}.hex`;
+
+            // Serialize (also simple write without append)
+            await this.withLock(this.NextSendLocks, stateId, async () => {
+                let toWrite = payloadInHex;
+                if (
+                    changeInfo.bestMatchForDeviceType &&
+                    this.downlinkConfighandler?.activeDownlinkConfigs?.[changeInfo.bestMatchForDeviceType]
+                        .sendWithUplink === 'enabled & collect'
+                ) {
+                    const nextSend = await this.getStateAsync(stateId);
+                    if (nextSend?.val !== '0') {
+                        toWrite = nextSend?.val + toWrite;
+                    }
                 }
-            }
-            await this.setState(`${idFolderNextSend}.hex`, payloadInHex, true);
+                await this.setState(stateId, toWrite, true);
+            });
         } catch (error) {
             this.log.error(`error at ${activeFunction}:  ${error}`);
         }
     }
 
+    // Serialize functions
+    async withLock(locksMap, key, fn) {
+        const activeFunction = 'main.js - withLock';
+        this.log.debug(`Function ${activeFunction} started.`);
+        const prev = locksMap.get(key) || Promise.resolve();
+
+        // fn erst starten, wenn prev fertig ist (egal ob ok oder Fehler)
+        const next = prev.then(
+            () => Promise.resolve().then(fn),
+            () => Promise.resolve().then(fn),
+        );
+
+        // stored wartet auf next, fängt aber Fehler intern ab (Kette reißt nicht)
+        const stored = next.catch(() => {});
+        locksMap.set(key, stored);
+
+        try {
+            // Ergebnis/Fehler an Aufrufer weitergeben
+            return await next;
+        } finally {
+            // vorsichtig aufräumen: nur löschen, wenn kein neuer Job dazwischenkam
+            if (locksMap.get(key) === stored) {
+                locksMap.delete(key);
+            }
+        }
+    }
+
     async sendDownlink(topic, message, changeInfo) {
         const activeFunction = 'main.js - sendDownlink';
         this.log.debug(`Function ${activeFunction} started.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.lorawan",
-  "version": "1.17.16",
+  "version": "1.17.17",
   "description": "converts the desired lora gateway data to a ioBroker structure",
   "author": {
     "name": "BenAhrdt",
@@ -28,7 +28,7 @@
     "@iobroker/adapter-core": "^3.3.2",
     "easy-crc": "^1.1.0",
     "lodash": "^4.17.21",
-    "mqtt": "^5.14.0",
+    "mqtt": "^5.14.1",
     "node-schedule": "^2.1.1"
   },
   "devDependencies": {
@@ -36,13 +36,13 @@
     "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
-    "@iobroker/adapter-dev": "^1.4.0",
-    "@iobroker/eslint-config": "^2.1.0",
+    "@iobroker/adapter-dev": "^1.5.0",
+    "@iobroker/eslint-config": "^2.2.0",
     "@iobroker/testing": "^5.1.1",
     "@tsconfig/node20": "^20.1.6",
     "@types/lodash": "^4.17.20",
-    "@types/node": "^24.3.0",
-    "typescript": "~5.9.2"
+    "@types/node": "^24.6.1",
+    "typescript": "~5.9.3"
   },
   "main": "main.js",
   "files": [