iobroker.lorawan 1.18.33 → 1.18.35

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.35 (2025-11-28)
+* (BenAhrdt) internal code improovment for better reading
+
+### 1.18.34 (2025-11-28)
+* (BenAhrdt) translation changed
+
 ### 1.18.33 (2025-11-28)
 * (BenAhrdt) change state in Lock entity
 

package/admin/i18n/de/translations.json

@@ -88,8 +88,8 @@
 	"LoRaWAN Network Service is disconnected": "Der Lorawan Netzwerkdienst ist getrennt",
 	"LoRaWAN device is back online": "Folgendes Lorawan Gerät ist wieder online",
 	"LoRaWAN device is offline": "Folgendes Lorawan Gerät ist offline",
-	"LockHeader": "Definieren Sie Zustände für eine Sperrentität",
-	"LockInformation": "Hier können Sie ein Array von Sperrdefinitionen definieren",
+	"LockHeader": "Definieren Sie Zustände für eine Lock-Entität",
+	"LockInformation": "Hier können Sie ein Array von Lockdefinitionen definieren",
 	"LockLockText": "Verriegeln Id",
 	"LockNameText": "Entitätsname",
 	"LockOpen": "offen",

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.18.33",
+    "version": "1.18.35",
     "news": {
+      "1.18.35": {
+        "en": "internal code improovment for better reading",
+        "de": "interner code improovement für besseres lesen",
+        "ru": "импровизация внутреннего кода для лучшего чтения",
+        "pt": "improvisação de código interno para melhor leitura",
+        "nl": "interne code improvisatie voor beter lezen",
+        "fr": "imprégnation du code interne pour une meilleure lecture",
+        "it": "codice interno improovment per una migliore lettura",
+        "es": "improvimento de código interno para una mejor lectura",
+        "pl": "improwizacja kodu wewnętrznego dla lepszego czytania",
+        "uk": "внутрішня обробка коду для кращого читання",
+        "zh-cn": "内部代码即兴读取"
+      },
+      "1.18.34": {
+        "en": "translation changed",
+        "de": "übersetzung geändert",
+        "ru": "перевод изменился",
+        "pt": "tradução alterada",
+        "nl": "vertaling gewijzigd",
+        "fr": "traduction changée",
+        "it": "traduzione cambiata",
+        "es": "traducción modificada",
+        "pl": "zmienione tłumaczenie",
+        "uk": "зміни перекладу",
+        "zh-cn": "翻译更改"
+      },
       "1.18.33": {
         "en": "change state in Lock entity",
         "de": "änderungszustand in Sperreinrichtung",
@@ -67,32 +93,6 @@
         "pl": "set ack = true, przed push data Giełda",
         "uk": "встановити ack = true, перш ніж натиснути дані Обмін",
         "zh-cn": "在按下数据前设置 ack = true 交换"
-      },
-      "1.18.28": {
-        "en": "assign comment 'from bridge' to state, if the value is set by bridge",
-        "de": "kommentar 'von der brücke' zum zustand zuordnen, wenn der wert von der brücke gesetzt wird",
-        "ru": "присвоить комментарий «от моста» государству, если значение установлено мостом",
-        "pt": "atribuir o comentário 'da ponte' ao estado, se o valor for definido pela ponte",
-        "nl": "commentaar 'van brug' toewijzen aan status, als de waarde door brug wordt ingesteld",
-        "fr": "assigner le commentaire 'from bridge' à l'état, si la valeur est définie par bridge",
-        "it": "assegnare commento 'da ponte' a stato, se il valore è impostato da ponte",
-        "es": "asignar comentario 'de puente' a estado, si el valor se establece por puente",
-        "pl": "przypisz komentarz \"z mostu\" do stanu, jeśli wartość jest ustawiona przez most",
-        "uk": "призначте коментар «з місту» до держави, якщо значення встановлене містом",
-        "zh-cn": "如果值由桥来设定, 则将注释“ 从桥” 指定为状态"
-      },
-      "1.18.27": {
-        "en": "wright incomming dataexchange with ack = true",
-        "de": "wright incoming dataexchange mit ack = true",
-        "ru": "wright incomming dataexchange with ack = истинное",
-        "pt": "wright incomming datachange with ack = true",
-        "nl": "wright incoming dataexchange with ack = true",
-        "fr": "wright avec l'échange de données avec ack = true",
-        "it": "wright incomming dataexchange con ack = true",
-        "es": "wright incomming dataexchange con ack = verdadero",
-        "pl": "wright incomming datachange with ack = true",
-        "uk": "wright incomming dataexchange with ack = true",
-        "zh-cn": "wright 以 ack = true 输入数据交换"
       }
     },
     "titleLang": {

package/lib/modules/bridge.js

@@ -221,6 +221,8 @@ class bridgeClass {
                     await this.publishId(this.SubscribedTopics[topic].id, message, {});
                     return;
                 }
+
+                // Light
                 if (this.SubscribedTopics[topic].light) {
                     if (message.state) {
                         message.state = message.state === 'ON' ? true : false;
@@ -253,6 +255,8 @@ class bridgeClass {
                     }
                     return;
                 }
+
+                // Cover
                 if (this.SubscribedTopics[topic].cover) {
                     if (this.SubscribedTopics[topic].messageAssign) {
                         if (this.SubscribedTopics[topic].messageAssign[message]) {
@@ -265,6 +269,8 @@ class bridgeClass {
                         }
                     }
                 }
+
+                // Lock
                 if (this.SubscribedTopics[topic].lock) {
                     if (this.SubscribedTopics[topic].messageAssign) {
                         if (this.SubscribedTopics[topic].messageAssign[message]) {
@@ -280,6 +286,7 @@ class bridgeClass {
 
                 // Check for namespace and write own, oder foreign state
                 if (this.SubscribedTopics[topic].id.startsWith(this.adapter.namespace)) {
+                    // Special DataExchange
                     if (this.SubscribedTopics[topic].dataExchange) {
                         if (typeof message === 'object') {
                             message = JSON.stringify(message);
@@ -289,15 +296,19 @@ class bridgeClass {
                             { val: message, c: 'from bridge' },
                             true,
                         );
+                        // All Adapter internal States
                     } else {
                         await this.adapter.setState(this.SubscribedTopics[topic].id, {
                             val: message,
                             c: 'from bridge',
                         });
                     }
+                    // Foreign States
                 } else {
+                    // Assignable Topics => id & val
                     if (this.SubscribedTopics[topic].messageAssign) {
                         await this.adapter.setForeignStateAsync(message.id, { val: message.val, c: 'from bridge' });
+                        // Write in the desired id
                     } else {
                         await this.adapter.setForeignStateAsync(this.SubscribedTopics[topic].id, {
                             val: message,
@@ -795,59 +806,49 @@ class bridgeClass {
                 }
 
                 // Iterate the state_topics
-                for (const publishTopic in this.PublishedIds[id].publish) {
-                    if (this.PublishedIds[id].publish[publishTopic].light) {
+                for (const element in this.PublishedIds[id].publish) {
+                    const topic = element;
+                    const publish = this.PublishedIds[id].publish[element];
+
+                    // Light
+                    if (publish.light) {
                         val = {};
-                        val.state = (
-                            await this.adapter.getForeignStateAsync(
-                                this.PublishedIds[id].publish[publishTopic].LightIds.onOff,
-                            )
-                        ).val;
+                        val.state = (await this.adapter.getForeignStateAsync(publish.LightIds.onOff)).val;
                         val.state = val.state === true ? 'ON' : 'OFF';
-                        if (this.PublishedIds[id].publish[publishTopic].LightIds.brightness) {
-                            val.brightness = (
-                                await this.adapter.getForeignStateAsync(
-                                    this.PublishedIds[id].publish[publishTopic].LightIds.brightness,
-                                )
-                            ).val;
+                        if (publish.LightIds.brightness) {
+                            val.brightness = (await this.adapter.getForeignStateAsync(publish.LightIds.brightness)).val;
                         }
-                        if (this.PublishedIds[id].publish[publishTopic].LightIds.color) {
+                        if (publish.LightIds.color) {
                             val.color_mode = 'rgb';
                             val.color = this.hexToRgb(
-                                (
-                                    await this.adapter.getForeignStateAsync(
-                                        this.PublishedIds[id].publish[publishTopic].LightIds.color,
-                                    )
-                                ).val,
+                                (await this.adapter.getForeignStateAsync(publish.LightIds.color)).val,
                             );
                         }
-                        if (this.PublishedIds[id].publish[publishTopic].LightIds.effects) {
-                            const effect = (
-                                await this.adapter.getForeignStateAsync(
-                                    this.PublishedIds[id].publish[publishTopic].LightIds.effects,
-                                )
-                            ).val;
+                        if (publish.LightIds.effects) {
+                            const effect = (await this.adapter.getForeignStateAsync(publish.LightIds.effects)).val;
                             val.effect = '';
-                            if (this.PublishedIds[id].publish[publishTopic].effects[effect]) {
-                                val.effect = this.PublishedIds[id].publish[publishTopic].effects[effect];
+                            if (publish.effects[effect]) {
+                                val.effect = publish.effects[effect];
                             }
                         }
                     }
 
-                    if (this.PublishedIds[id].publish[publishTopic].cover) {
-                        if (this.PublishedIds[id].publish[publishTopic].messageAssign) {
-                            if (this.PublishedIds[id].publish[publishTopic].messageAssign[val]) {
-                                val = this.PublishedIds[id].publish[publishTopic].messageAssign[val];
+                    // Cover
+                    if (publish.cover) {
+                        if (publish.messageAssign) {
+                            if (publish.messageAssign[val]) {
+                                val = publish.messageAssign[val];
                             } else {
                                 return;
                             }
                         }
                     }
 
-                    if (this.PublishedIds[id].publish[publishTopic].lock) {
-                        if (this.PublishedIds[id].publish[publishTopic].messageAssign) {
-                            if (this.PublishedIds[id].publish[publishTopic].messageAssign[val]) {
-                                val = this.PublishedIds[id].publish[publishTopic].messageAssign[val];
+                    // Lock
+                    if (publish.lock) {
+                        if (publish.messageAssign) {
+                            if (publish.messageAssign[val]) {
+                                val = publish.messageAssign[val];
                             } else {
                                 return;
                             }
@@ -855,23 +856,21 @@ class bridgeClass {
                     }
 
                     // safe old values (5 last values)
-                    if (this.PublishedIds[id].publish[publishTopic].values) {
-                        if (!this.PublishedIds[id].publish[publishTopic].oldValues) {
-                            this.PublishedIds[id].publish[publishTopic].oldValues = [];
+                    if (publish.values) {
+                        if (!publish.oldValues) {
+                            publish.oldValues = [];
                         }
-                        if (this.PublishedIds[id].publish[publishTopic].oldValues.length >= this.MaxValueCount) {
-                            this.PublishedIds[id].publish[publishTopic].oldValues.pop();
+                        if (publish.oldValues.length >= this.MaxValueCount) {
+                            publish.oldValues.pop();
                         }
-                        this.PublishedIds[id].publish[publishTopic].oldValues.unshift(
-                            structuredClone(this.PublishedIds[id].publish[publishTopic].values),
-                        );
+                        publish.oldValues.unshift(structuredClone(publish.values));
                     }
-                    if (!this.PublishedIds[id].publish[publishTopic].values) {
-                        this.PublishedIds[id].publish[publishTopic].values = {};
+                    if (!publish.values) {
+                        publish.values = {};
                     }
-                    this.PublishedIds[id].publish[publishTopic].values.val = val;
-                    this.PublishedIds[id].publish[publishTopic].values.ts = Date.now();
-                    this.PublishedIds[id].publish[publishTopic].values.time = new Date(Date.now()).toLocaleString(
+                    publish.values.val = val;
+                    publish.values.ts = Date.now();
+                    publish.values.time = new Date(Date.now()).toLocaleString(
                         this.Timeoutput.Argument,
                         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                         // @ts-expect-error
@@ -885,7 +884,7 @@ class bridgeClass {
                     } else if (options.retain === undefined) {
                         options.retain = true;
                     }
-                    await this.bridgeMqttClient.publish(publishTopic, val, options);
+                    await this.bridgeMqttClient.publish(topic, val, options);
                     await this.adapter.setState('info.publishedIds', JSON.stringify(this.PublishedIds), true);
                 }
 
@@ -1310,10 +1309,7 @@ class bridgeClass {
                     if (!this.oldDiscoveredDevices[normalizedDeficeIdentifier]) {
                         // Only messegae with ne fiscovered dewvice, if not in old discovered devices
                         returnValue.newDevice = DiscoveryObject;
-                        let device =
-                            DiscoveryObject.informations.usedDeviceId ??
-                            DiscoveryObject.informations[0]?.usedDeviceId ??
-                            'unknown';
+                        let device = DiscoveryObject.payload.device.name;
                         let message = `${this.adapter.i18nTranslation['new device discovered']}.\n${this.adapter.i18nTranslation['Device']}: ${device}`;
                         if (DiscoveryObject.informations.usedApplicationName) {
                             const application = DiscoveryObject.informations.usedApplicationName;

package/package.json

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