iobroker.lorawan 1.18.34 → 1.18.36

package/README.md

@@ -23,6 +23,14 @@ 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.36 (2025-11-29)
+* (BenAhrdt) fist possibillity to change unlatch on lock entity
+* (BenAhrdt) Add version to discovery
+* (BenAhrdt) Add via device to discovery
+
+### 1.18.35 (2025-11-28)
+* (BenAhrdt) internal code improovment for better reading
+
 ### 1.18.34 (2025-11-28)
 * (BenAhrdt) translation changed
 

package/admin/i18n/de/translations.json

@@ -133,6 +133,8 @@
 	"applicationId": "Applikations Id",
 	"applicationName": "Applikationsname",
 	"bridge connection": "Verbindungsbenachrichtigungen",
+	"commandForOpen": "Befehl zum Öffnen des Schlosses",
+	"commandForOpenTooltip": "Trage Sie den Befehl ein, der das Schloss öffnet",
 	"confirmed": "bestätigt",
 	"confirmedTooltip": "Wenn Sie den Download mit einer bestätigten Nachricht senden möchten, aktivieren Sie diese Option",
 	"connection to bridge is activ": "Die Verbindung zur Bridge ist aktiv",

package/admin/i18n/en/translations.json

@@ -239,5 +239,7 @@
 	"StateText": "State ID",
 	"LockLockText": "Lock ID",
 	"LockUnlockText": "Unlock ID",
-	"LockOpenText": "Open ID"
+	"LockOpenText": "Open ID",
+	"commandForOpen": "command to open the lock",
+	"commandForOpenTooltip": "set the command, that opens the lock"
 }

package/admin/i18n/es/translations.json

@@ -133,6 +133,8 @@
 	"applicationId": "ID de la aplicación",
 	"applicationName": "Nombre de la aplicación",
 	"bridge connection": "notificaciones de conexión",
+	"commandForOpen": "comando para abrir la cerradura",
+	"commandForOpenTooltip": "configurar el comando que abre la cerradura",
 	"confirmed": "confirmado",
 	"confirmedTooltip": "si desea enviar la descarga con mensaje confirmado habilite esta opción",
 	"connection to bridge is activ": "la conexión al puente está activa",

package/admin/i18n/fr/translations.json

@@ -133,6 +133,8 @@
 	"applicationId": "Identifiant de l'application",
 	"applicationName": "Nom de la demande",
 	"bridge connection": "notifications de connexion",
+	"commandForOpen": "commande pour ouvrir la serrure",
+	"commandForOpenTooltip": "définir la commande qui ouvre le verrou",
 	"confirmed": "confirmé",
 	"confirmedTooltip": "si vous souhaitez envoyer le téléchargement avec un message confirmé, activez cette option",
 	"connection to bridge is activ": "la connexion au pont est active",

package/admin/i18n/it/translations.json

@@ -133,6 +133,8 @@
 	"applicationId": "ID applicazione",
 	"applicationName": "Nome dell'applicazione",
 	"bridge connection": "notifiche di connessione",
+	"commandForOpen": "comando per aprire la serratura",
+	"commandForOpenTooltip": "impostare il comando che apre la serratura",
 	"confirmed": "confermato",
 	"confirmedTooltip": "se desideri inviare il download con messaggio di conferma abilita questa opzione",
 	"connection to bridge is activ": "la connessione al bridge è attiva",

package/admin/i18n/nl/translations.json

@@ -133,6 +133,8 @@
 	"applicationId": "Applicatie-ID",
 	"applicationName": "Applicatienaam",
 	"bridge connection": "verbindingsmeldingen",
+	"commandForOpen": "commando om het slot te openen",
+	"commandForOpenTooltip": "stel het commando in, waarmee het slot wordt geopend",
 	"confirmed": "bevestigd",
 	"confirmedTooltip": "Als u de download met een bevestigd bericht wilt verzenden, schakelt u deze optie in",
 	"connection to bridge is activ": "verbinding met brug is actief",

package/admin/i18n/pl/translations.json

@@ -133,6 +133,8 @@
 	"applicationId": "Identyfikator aplikacji",
 	"applicationName": "Nazwa aplikacji",
 	"bridge connection": "powiadomienia o połączeniu",
+	"commandForOpen": "polecenie otwarcia zamka",
+	"commandForOpenTooltip": "ustaw komendę otwierającą zamek",
 	"confirmed": "potwierdzony",
 	"confirmedTooltip": "jeśli chcesz wysłać plik do pobrania z potwierdzeniem, włącz tę opcję",
 	"connection to bridge is activ": "połączenie z mostem jest aktywne",

package/admin/i18n/pt/translations.json

@@ -133,6 +133,8 @@
 	"applicationId": "ID do aplicativo",
 	"applicationName": "Nome do aplicativo",
 	"bridge connection": "notificações de conexão",
+	"commandForOpen": "comando para abrir a fechadura",
+	"commandForOpenTooltip": "defina o comando que abre a fechadura",
 	"confirmed": "confirmado",
 	"confirmedTooltip": "se quiser enviar o download com mensagem confirmada habilite esta opção",
 	"connection to bridge is activ": "a conexão com a ponte está ativa",

package/admin/i18n/ru/translations.json

@@ -133,6 +133,8 @@
 	"applicationId": "Идентификатор приложения",
 	"applicationName": "Имя приложения",
 	"bridge connection": "уведомления о подключении",
+	"commandForOpen": "команда открытия замка",
+	"commandForOpenTooltip": "задать команду, открывающую замок",
 	"confirmed": "подтвержденный",
 	"confirmedTooltip": "если вы хотите отправить загрузку с подтвержденным сообщением, включите эту опцию",
 	"connection to bridge is activ": "соединение с мостом активно",

package/admin/i18n/uk/translations.json

@@ -133,6 +133,8 @@
 	"applicationId": "Ідентифікатор програми",
 	"applicationName": "Назва програми",
 	"bridge connection": "сповіщення про підключення",
+	"commandForOpen": "команда відкрити замок",
+	"commandForOpenTooltip": "встановити команду, яка відкриває замок",
 	"confirmed": "підтверджено",
 	"confirmedTooltip": "якщо ви хочете надіслати завантаження з підтвердженим повідомленням, увімкніть цю опцію",
 	"connection to bridge is activ": "підключення до мосту активовано",

package/admin/i18n/zh-cn/translations.json

@@ -133,6 +133,8 @@
 	"applicationId": "应用程序 ID",
 	"applicationName": "应用名称",
 	"bridge connection": "连接通知",
+	"commandForOpen": "打开锁的命令",
+	"commandForOpenTooltip": "设置打开锁的命令",
 	"confirmed": "确认的",
 	"confirmedTooltip": "如果您想发送带有确认消息的下载，请启用此选项",
 	"connection to bridge is activ": "与网桥的连接已激活",

package/admin/jsonConfig.json

@@ -2263,6 +2263,25 @@
 							"md": 4,
 							"lg": 4,
 							"xl": 4
+						},
+						{
+							"newLine": true,
+							"type": "autocomplete",
+							"attr": "commandForOpen",
+							"label": "commandForOpen",
+							"options": [{"value": "unlatch", "label": "unlatch (Nuki)"},
+										{"value": "open", "label": "open (Standard)"},
+										{"value": "pull", "label": "pull (Something else)"}],
+							"tooltip": "commandForOpenTooltip",
+							"default": "unlatch",
+							"validator": "if(data.commandForOpen === ''){return false;}else{return true;}",
+							"validatorNoSaveOnError": true,
+							"freeSolo": true,
+							"xs": 12,
+							"sm": 2,
+							"md": 2,
+							"lg": 2,
+							"xl": 2
 						}
 					]
 				}				

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.18.34",
+    "version": "1.18.36",
     "news": {
+      "1.18.36": {
+        "en": "fist possibillity to change unlatch on lock entity\nAdd version to discovery\nAdd via device to discovery",
+        "de": "fist possibillity zu ändern unlatch auf schloss entity\nVersion zur Entdeckung hinzufügen\nÜber das Gerät zur Entdeckung hinzufügen",
+        "ru": "fist possibillity - изменить unlatch на lock entity\nДобавить версию к Discovery\nДобавить через устройство к открытию",
+        "pt": "possibilidade do punho para mudar a desacoplamento na entidade de bloqueio\nAdicionar versão à descoberta\nAdicionar via dispositivo à descoberta",
+        "nl": "fist mogelijkheid om unlatch te veranderen op slot entiteit\nVersie toevoegen aan ontdekking\nVoeg via apparaat toe aan ontdekking",
+        "fr": "possibillity du poing pour changer le déblocage sur l'entité de verrouillage\nAjouter une version à la découverte\nAjouter via périphérique à la découverte",
+        "it": "possibilità di cambiare unlatch su entità di blocco\nAggiungere la versione alla scoperta\nAggiungere tramite dispositivo alla scoperta",
+        "es": "fist possibillity to change unlatch on lock entity\nAñadir versión al descubrimiento\nAñadir vía dispositivo al descubrimiento",
+        "pl": "fist possibilty to change unlatch on lock entity\nDodaj wersję do odkrycia\nDodaj przez urządzenie do odkrycia",
+        "uk": "fist possibillity змінити unlatch на суб'єкті блокування\nДодати версію для відкриття\nДодати через пристрій для відкриття",
+        "zh-cn": "在锁实体上更改未匹配的拳头特性\n在发现中添加版本\n通过设备添加到发现"
+      },
+      "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",
@@ -67,32 +93,6 @@
         "pl": "ustawienie danych Wymiana na 2 entitie (FromIob & Tolob)",
         "uk": "налаштування даних Обмін до 2 entitie (З альбомуIob & ToIob)",
         "zh-cn": "设置数据 交换到2个内置( FromIob & ToIob)"
-      },
-      "1.18.29": {
-        "en": "set ack = true, before push dataExchange",
-        "de": "ack = true, bevor Sie Daten drücken Wechselkurs",
-        "ru": "set ack = true, перед push-данными обмен",
-        "pt": "definir ack = true, antes de empurrar dados Bolsa",
-        "nl": "set ack = true, voor push data Beurs",
-        "fr": "set ack = true, avant de pousser les données Échange",
-        "it": "set ack = true, prima di spingere i dati Scambi",
-        "es": "set ack = true, antes de presionar datos Cambio",
-        "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": "如果值由桥来设定, 则将注释“ 从桥” 指定为状态"
       }
     },
     "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);
                 }
 
@@ -1304,16 +1303,21 @@ class bridgeClass {
             if (typeof DiscoveryObject.payload !== 'string') {
                 // Payload is not empty => discover
                 const normalizedDeficeIdentifier = DiscoveryObject.payload.device.identifiers[0];
+
+                // add via Device in case, there is no attribute
+                if (!DiscoveryObject.payload.device.via_device) {
+                    DiscoveryObject.payload.device.via_device = this.normalizeString(this.adapter.namespace);
+                }
+                // Add Version
+                DiscoveryObject.payload.device.sw_version = this.adapter.version;
+
                 // New Device
                 if (!this.discoveredDevices[normalizedDeficeIdentifier]) {
                     this.discoveredDevices[normalizedDeficeIdentifier] = {};
                     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;
@@ -3055,7 +3059,7 @@ class bridgeClass {
                 Lock.command = {};
                 setAssign.LOCK = { id: config.LockIds.command, val: 'lock' };
                 setAssign.UNLOCK = { id: config.LockIds.command, val: 'unlock' };
-                setAssign.OPEN = { id: config.LockIds.command, val: 'unlatch' };
+                setAssign.OPEN = { id: config.LockIds.command, val: config.commandForOpen };
                 Lock.command.DeviceIdentifier = (await this.getParentNameing(config.LockIds.command))?.parentName;
             }
 

package/package.json

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