iobroker.lorawan 1.18.44 → 1.18.46

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.18.46 (2025-12-06)
+* (BenAhrdt) CustomSend has been extended to include the option of direct push.
+
+### 1.18.45 (2025-12-04)
+* (BenAhrdt) improve showing Adapter state (yellw / green)
+
 ### 1.18.44 (2025-12-02)
 * (BenAhrdt) add mixed to possible value types in config
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.18.44",
+    "version": "1.18.46",
     "news": {
+      "1.18.46": {
+        "en": "CustomSend has been extended to include the option of direct push.",
+        "de": "CustomSend wurde erweitert, um die Möglichkeit der direkten Push.",
+        "ru": "CustomSend был расширен, чтобы включить возможность прямого толчка.",
+        "pt": "O CustomSend foi estendido para incluir a opção de push direto.",
+        "nl": "AangepastVerzenden is uitgebreid met de optie van directe push.",
+        "fr": "CustomSend a été étendu pour inclure l'option de poussée directe.",
+        "it": "CustomSend è stato esteso per includere l'opzione di spinta diretta.",
+        "es": "CustomSend se ha ampliado para incluir la opción de empuje directo.",
+        "pl": "CustomSend został rozszerzony o opcję bezpośredniego pchnięcia.",
+        "uk": "CustomSend було розширено, щоб включити опцію прямого натискання.",
+        "zh-cn": "CustomSend已被扩展,以包括直接推动的选择."
+      },
+      "1.18.45": {
+        "en": "improve showing Adapter state (yellw / green)",
+        "de": "verbesserung des Adapterzustands (gelb / grün)",
+        "ru": "улучшение отображения состояния адаптера (yellw / green)",
+        "pt": "melhorar mostrando o estado do adaptador (Yellw / verde)",
+        "nl": "verbetering van de stand van de adapter (geel / groen)",
+        "fr": "améliorer l'état de l'adaptateur (yellw / vert)",
+        "it": "migliorare lo stato dell'adattatore di visualizzazione (yellw / green)",
+        "es": "mejorar la visualización del estado del adaptador (yellw / verde)",
+        "pl": "poprawić wyświetlanie stanu Adapter (yellw / green)",
+        "uk": "поліпшення демонстрації стану адаптера (жовтий / зелений)",
+        "zh-cn": "改进显示适配器状态( yallw / 绿色)"
+      },
       "1.18.44": {
         "en": "add mixed to possible value types in config",
         "de": "hinzufügen zu möglichen werttypen in config",
@@ -67,32 +93,6 @@
         "pl": "zmień hasz",
         "uk": "зміна хеш",
         "zh-cn": "变化散列"
-      },
-      "1.18.39": {
-        "en": "build more roles for contactsensors, in case of role. (window, door, gate ...)",
-        "de": "bauen mehr rollen für kontaktsensoren, im falle der rolle. (fenster, tür, tor ...)",
-        "ru": "построить больше ролей для контактенсоров, в случае роли. (окно, дверь, ворота...)",
-        "pt": "constrói mais papéis para os agentes de contacto, em caso de papel. (janela, porta, portão...)",
-        "nl": "meer rollen voor contactpersonen te creëren, in geval van rol. (raam, deur, poort ...)",
-        "fr": "construire plus de rôles pour les capteurs de contacts, en cas de rôle. (fenêtre, porte, portail...)",
-        "it": "costruire più ruoli per i sensori di contatto, in caso di ruolo. (finestra, porta, cancello ...)",
-        "es": "crear más roles para los contactensores, en caso de papel. (ventana, puerta, puerta...)",
-        "pl": "budować więcej ról dla czujników kontaktu, w przypadku roli. (okno, drzwi, brama...)",
-        "uk": "будувати більше ролей для контакторів, у разі ролі. (вікно, двері, ворота ...)",
-        "zh-cn": "为联系人建立更多的角色,如果是角色的话。 (窗,门,门"
-      },
-      "1.18.38": {
-        "en": "add device class to cover in config",
-        "de": "geräteklasse in config hinzufügen",
-        "ru": "добавить класс устройства для покрытия в конфигурацию",
-        "pt": "adicionar a classe do dispositivo para cobrir na configuração",
-        "nl": "apparaatklasse toevoegen om in config te dekken",
-        "fr": "ajouter la classe de périphérique pour couvrir la configuration",
-        "it": "aggiungere classe di dispositivo per coprire in configurazione",
-        "es": "añadir clase de dispositivo para cubrir en config",
-        "pl": "dodaj klasę urządzenia do pokrycia w konfiguracji",
-        "uk": "додати клас пристрою для обкладинки в налаштування",
-        "zh-cn": "在配置中添加要覆盖的设备类"
       }
     },
     "titleLang": {

package/lib/modules/bridgeMqttclient.js

@@ -78,11 +78,11 @@ class bridgeMqttClientClass {
             }
         });
 
-        this.client.on('close', () => {
+        this.client.on('close', async () => {
             if (this.internalConnectionstate) {
                 this.adapter.log.info(`Connection to Bridge is closed.`);
             }
-            this.adapter.setState('info.bridgeConnection', false, true);
+            await this.adapter.setState('info.bridgeConnection', false, true);
             if (this.adapter.config.notificationActivation === 'notification') {
                 this.adapter.registerNotification(
                     'lorawan',
@@ -90,6 +90,8 @@ class bridgeMqttClientClass {
                     this.adapter.i18nTranslation['connection to bridge is closed'],
                 );
             }
+            const connectionInfo = await this.adapter.getConnectionInfo();
+            await this.adapter.setState('info.connection', connectionInfo, true);
             this.internalConnectionstate = false;
         });
 

package/main.js

@@ -539,36 +539,51 @@ class Lorawan extends utils.Adapter {
                                         ];
                                     const Statevalues = state.val.split(',');
                                     const StateElements = {
-                                        PayloadInHex: Statevalues[0].toUpperCase(),
-                                        Port: Statevalues[1] ? parseInt(Statevalues[1]) : downlinkConfig.port,
-                                        Confirmed: Statevalues[2]
-                                            ? Statevalues[2] === 'true'
-                                                ? true
-                                                : false
-                                            : downlinkConfig.confirmed,
-                                        Priority: Statevalues[3] ? Statevalues[3] : downlinkConfig.priority,
+                                        payloadInHex: Statevalues[0].toUpperCase(),
+                                        port: downlinkConfig.port,
+                                        confirmed: downlinkConfig.confirmed,
+                                        priority: downlinkConfig.priority,
+                                        push: false,
                                     };
-                                    // Query for righte type
+                                    // Assign writen values
+                                    for (const element in Statevalues) {
+                                        if (Statevalues[element] === 'push') {
+                                            StateElements.push = true;
+                                            break;
+                                        }
+                                        if (element === '1') {
+                                            StateElements.port = Number(Statevalues[element]);
+                                        } else if (element === '2') {
+                                            StateElements.confirmed = Statevalues[element] === 'true' ? true : false;
+                                        } else if (element === '3') {
+                                            StateElements.priority = Statevalues[element];
+                                        }
+                                    }
+                                    // Query about th correct type
                                     this.log.debug('The following values are detected at input of custom send state');
                                     for (const element of Object.values(StateElements)) {
                                         this.log.debug(typeof element);
                                         this.log.debug(element);
                                     }
-                                    // Write into nextSend
-                                    await this.writeNextSend(changeInfo, StateElements.PayloadInHex);
+                                    // write into NextSend, or push directly
+                                    if (!StateElements.push) {
+                                        // Write into nextSend
+                                        await this.writeNextSend(changeInfo, StateElements.payloadInHex);
+                                    }
                                     if (
                                         !changeInfo?.bestMatchForDeviceType ||
                                         this.downlinkConfighandler?.activeDownlinkConfigs[
                                             changeInfo.bestMatchForDeviceType
-                                        ].sendWithUplink === 'disabled'
+                                        ].sendWithUplink === 'disabled' ||
+                                        StateElements.push
                                     ) {
                                         const downlink = this.downlinkConfighandler?.getDownlink(
                                             {
-                                                port: StateElements.Port,
-                                                confirmed: StateElements.Confirmed,
-                                                priority: StateElements.Priority,
+                                                port: StateElements.port,
+                                                confirmed: StateElements.confirmed,
+                                                priority: StateElements.priority,
                                             },
-                                            StateElements.PayloadInHex,
+                                            StateElements.payloadInHex,
                                             changeInfo,
                                         );
                                         if (downlink !== undefined) {
@@ -1507,7 +1522,7 @@ class Lorawan extends utils.Adapter {
     }
 
     async getConnectionInfo() {
-        if (this.config.ipUrl === '' || this.mqttClient?.internalConnectionstate) {
+        if (this.config.origin === 'off' || this.mqttClient?.internalConnectionstate) {
             if (this.config.BridgeType === 'off' || this.bridge?.bridgeMqttClient?.internalConnectionstate) {
                 return true;
             }

package/package.json

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