iobroker.zigbee2mqtt 2.5.0 → 2.7.0

package/README.md

@@ -32,6 +32,21 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 2.7.0 (2023-01-18)
+
+-   (o0shojo0o) added support for  wildcard actions (eg. *_single) ([#116](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/116))
+-   (o0shojo0o) added error handling optimizations ([more](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1382038679))
+-   (o0shojo0o) added option `auth_token` for websocket connection ([#112](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/112))
+-   (o0shojo0o) websocket timeout increased
+
+### 2.6.0 (2023-01-10)
+
+-   (o0shojo0o) added state `transition` for transition overwrite (-1 disabled overwrite) ([#101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101))
+-   (o0shojo0o) consideration of the description when creating the friendly name ([#105](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/105))
+-   (o0shojo0o) added state `effect` for groups ([#101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101))
+-   (o0shojo0o) fix state contact
+-   (o0shojo0o) added handling for disabled devices
+
 ### 2.5.0 (2023-01-02)
 
 -   (o0shojo0o) added option `Brightness step should also turn the light on or off`
@@ -40,7 +55,7 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
 
 ### 2.4.5 (2022-12-20)
 
--   (o0shojo0o) extend 'text' for 'action' ([#84](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/84))
+-   (o0shojo0o) extend `text` for `action` ([#84](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/84))
 
 ### 2.4.4 (2022-12-06)
 

package/admin/i18n/de/translations.json

@@ -22,5 +22,7 @@
     "Other configurations": "Andere Konfigurationen",
     "Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT Protokolle zu ioBroker Protokollen",
     "Brightness move should also turn the light on or off": "Brightness move soll auch das Licht ein- oder ausschalten",
-    "Brightness step should also turn the light on or off": "Brightness step soll auch das Licht ein- oder ausschalten"
+    "Brightness step should also turn the light on or off": "Brightness step soll auch das Licht ein- oder ausschalten",
+    "Use Auth-Token": "Auth-Token verwenden",
+    "Auth-Token (special characters are not supported)": "Auth-Token (Sonderzeichen werden nicht unterstützt)"
 }

package/admin/i18n/en/translations.json

@@ -8,6 +8,8 @@
 	"Configure your Zigbee2MQTT connection": "Configure your Zigbee2MQTT connection",
 	"Websocket IP-Address": "Websocket IP-Address",
 	"Websocket Port": "Websocket Port",
+	"Use Auth-Token": "Use Auth-Token",
+	"Auth-Token (special characters are not supported)": "Auth-Token (special characters are not supported)",
 	"Create a dummy MQTT-Server for Zigbee2MQTT": "Create a dummy MQTT-Server for Zigbee2MQTT",
 	"External MQTT-Server IP-Address": "External MQTT-Server IP-Address",
 	"External MQTT-Server Port": "External MQTT-Server Port",

package/admin/i18n/es/translations.json

@@ -8,6 +8,8 @@
     "Configure your Zigbee2MQTT connection": "Configura tu conexión Zigbee2MQTT",
     "Websocket IP-Address": "Dirección IP de Websocket",
     "Websocket Port": "puerto websocket",
+    "Use Auth-Token": "Usar token de autenticación",
+    "Auth-Token (special characters are not supported)": "Auth-Token (los caracteres especiales no son compatibles)",
     "Create a dummy MQTT-Server for Zigbee2MQTT": "Cree un servidor MQTT ficticio para Zigbee2MQTT",
     "External MQTT-Server IP-Address": "Dirección IP del servidor MQTT externo",
     "External MQTT-Server Port": "Puerto de servidor MQTT externo",

package/admin/i18n/fr/translations.json

@@ -8,6 +8,8 @@
     "Configure your Zigbee2MQTT connection": "Configurez votre connexion Zigbee2MQTT",
     "Websocket IP-Address": "Adresse IP Websocket",
     "Websocket Port": "Port WebSocket",
+    "Use Auth-Token": "Utiliser le jeton d'authentification",
+    "Auth-Token (special characters are not supported)": "Auth-Token (les caractères spéciaux ne sont pas pris en charge)",
     "Create a dummy MQTT-Server for Zigbee2MQTT": "Créer un serveur MQTT factice pour Zigbee2MQTT",
     "External MQTT-Server IP-Address": "Adresse IP du serveur MQTT externe",
     "External MQTT-Server Port": "Port serveur MQTT externe",

package/admin/i18n/it/translations.json

@@ -2,25 +2,27 @@
     "zigbee2mqtt adapter settings": "Impostazioni dell'adattatore per zigbee2mqtt",
     "Select and configure your Zigbee2MQTT connection": "Seleziona e configura la connessione Zigbee2MQTT",
     "Select connection to Zigbee2MQTT": "Seleziona la connessione a Zigbee2MQTT",
-    "Websocket": "presa web",
+    "Websocket": "Presa web",
     "External MQTT-Server (Experimental)": "Server MQTT esterno (sperimentale)",
     "Internal MQTT-Server (Experimental)": "Server MQTT interno (sperimentale)",
     "Configure your Zigbee2MQTT connection": "Configura la tua connessione Zigbee2MQTT",
     "Websocket IP-Address": "Indirizzo IP WebSocket",
-    "Websocket Port": "Porta WebSocket",
+    "Websocket Port": "Porta websocket",
+    "Use Auth-Token": "Usa token di autenticazione",
+    "Auth-Token (special characters are not supported)": "Auth-Token (i caratteri speciali non sono supportati)",
     "Create a dummy MQTT-Server for Zigbee2MQTT": "Crea un server MQTT fittizio per Zigbee2MQTT",
     "External MQTT-Server IP-Address": "Indirizzo IP del server MQTT esterno",
-    "External MQTT-Server Port": "Porta del server MQTT esterno",
-    "MQTT-Server IP-Address bind": "Bind dell'indirizzo IP del server MQTT",
-    "MQTT-Server Port": "Porta server MQTT",
+    "External MQTT-Server Port": "Porta server MQTT esterna",
+    "MQTT-Server IP-Address bind": "Binding dell'indirizzo IP del server MQTT",
+    "MQTT-Server Port": "Porta del server MQTT",
     "Configure your Zigbee2MQTT WebUi connection": "Configura la connessione Zigbee2MQTT WebUi",
     "WebUi Address": "Indirizzo WebUi",
     "WebUi Port": "Porta WebUi",
-    "Color configurations": "Configurazioni colore",
+    "Color configurations": "Configurazioni di colore",
     "Color temperature sync with color": "Sincronizzazione della temperatura del colore con il colore",
-    "Use Kelvin instead of mired for the color temps": "Usa Kelvin invece di mired per le temperature di colore",
+    "Use Kelvin instead of mired for the color temps": "Usa Kelvin invece di mired per le temperature del colore",
     "Other configurations": "Altre configurazioni",
-    "Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT registra nei registri di ioBroker",
-    "Brightness move should also turn the light on or off": "Il movimento della luminosità dovrebbe anche accendere o spegnere la luce",
+    "Proxy Zigbee2MQTT logs to ioBroker logs": "Il proxy Zigbee2MQTT registra nei registri ioBroker",
+    "Brightness move should also turn the light on or off": "Lo spostamento della luminosità dovrebbe anche accendere o spegnere la luce",
     "Brightness step should also turn the light on or off": "Il passo di luminosità dovrebbe anche accendere o spegnere la luce"
 }

package/admin/i18n/nl/translations.json

@@ -1,26 +1,28 @@
 {
     "zigbee2mqtt adapter settings": "Adapterinstellingen voor zigbee2mqtt",
-    "Select and configure your Zigbee2MQTT connection": "Selecteer en configureer Zigbee2MQTT-verbinding",
+    "Select and configure your Zigbee2MQTT connection": "Selecteer en configureer de Zigbee2MQTT-verbinding",
     "Select connection to Zigbee2MQTT": "Selecteer verbinding met Zigbee2MQTT",
     "Websocket": "Websocket",
     "External MQTT-Server (Experimental)": "Externe MQTT-server (experimenteel)",
     "Internal MQTT-Server (Experimental)": "Interne MQTT-server (experimenteel)",
-    "Configure your Zigbee2MQTT connection": "Configureer uw Zigbee2MQTT-verbinding",
+    "Configure your Zigbee2MQTT connection": "Configureer je Zigbee2MQTT-verbinding",
     "Websocket IP-Address": "Websocket IP-adres",
     "Websocket Port": "Websocket-poort",
+    "Use Auth-Token": "Gebruik Auth-Token",
+    "Auth-Token (special characters are not supported)": "Auth-Token (speciale tekens worden niet ondersteund)",
     "Create a dummy MQTT-Server for Zigbee2MQTT": "Maak een dummy MQTT-server voor Zigbee2MQTT",
     "External MQTT-Server IP-Address": "Extern MQTT-server IP-adres",
     "External MQTT-Server Port": "Externe MQTT-serverpoort",
-    "MQTT-Server IP-Address bind": "MQTT-server IP-adres binden",
+    "MQTT-Server IP-Address bind": "MQTT-server IP-adres binding",
     "MQTT-Server Port": "MQTT-serverpoort",
-    "Configure your Zigbee2MQTT WebUi connection": "Configureer Zigbee2MQTT WebUi-verbinding",
+    "Configure your Zigbee2MQTT WebUi connection": "Configureer de Zigbee2MQTT WebUi-verbinding",
     "WebUi Address": "WebUi-adres",
     "WebUi Port": "WebUi-poort",
-    "Color configurations": "Kleurconfiguraties",
-    "Color temperature sync with color": "Synchronisatie van kleurtemperatuur met kleur",
+    "Color configurations": "Kleur configuraties",
+    "Color temperature sync with color": "Kleurtemperatuursynchronisatie met kleur",
     "Use Kelvin instead of mired for the color temps": "Gebruik Kelvin in plaats van mired voor de kleurtemperaturen",
     "Other configurations": "Andere configuraties",
-    "Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logt in op ioBroker logs",
-    "Brightness move should also turn the light on or off": "Helderheidsbeweging moet ook het licht aan- of uitzetten",
+    "Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logt naar ioBroker-logboeken",
+    "Brightness move should also turn the light on or off": "Helderheidsbeweging zou ook het licht aan of uit moeten zetten",
     "Brightness step should also turn the light on or off": "De helderheidsstap moet het licht ook in- of uitschakelen"
 }

package/admin/i18n/pl/translations.json

@@ -6,21 +6,23 @@
     "External MQTT-Server (Experimental)": "Zewnętrzny serwer MQTT (eksperymentalny)",
     "Internal MQTT-Server (Experimental)": "Wewnętrzny serwer MQTT (eksperymentalny)",
     "Configure your Zigbee2MQTT connection": "Skonfiguruj połączenie Zigbee2MQTT",
-    "Websocket IP-Address": "Adres IP gniazda sieciowego",
-    "Websocket Port": "Port gniazda sieciowego",
-    "Create a dummy MQTT-Server for Zigbee2MQTT": "Utwórz atrapę serwera MQTT dla Zigbee2MQTT",
+    "Websocket IP-Address": "Adres IP gniazda internetowego",
+    "Websocket Port": "Gniazdo sieciowe",
+    "Use Auth-Token": "Użyj tokena uwierzytelniającego",
+    "Auth-Token (special characters are not supported)": "Auth-Token (znaki specjalne nie są obsługiwane)",
+    "Create a dummy MQTT-Server for Zigbee2MQTT": "Utwórz fikcyjny serwer MQTT dla Zigbee2MQTT",
     "External MQTT-Server IP-Address": "Adres IP zewnętrznego serwera MQTT",
     "External MQTT-Server Port": "Zewnętrzny port serwera MQTT",
-    "MQTT-Server IP-Address bind": "Powiązanie adresu IP serwera MQTT-serwera",
+    "MQTT-Server IP-Address bind": "Powiązanie adresu IP serwera MQTT",
     "MQTT-Server Port": "Port serwera MQTT",
     "Configure your Zigbee2MQTT WebUi connection": "Skonfiguruj połączenie Zigbee2MQTT WebUi",
     "WebUi Address": "Adres WebUI",
     "WebUi Port": "Port WebUI",
     "Color configurations": "Konfiguracje kolorów",
     "Color temperature sync with color": "Synchronizacja temperatury barwowej z kolorem",
-    "Use Kelvin instead of mired for the color temps": "Użyj Kelvina zamiast mired dla temperatury kolorów",
+    "Use Kelvin instead of mired for the color temps": "Użyj Kelvina zamiast pogrążonego dla temp. kolorów",
     "Other configurations": "Inne konfiguracje",
-    "Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT loguje do logów ioBroker",
+    "Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT loguje się do logów ioBroker",
     "Brightness move should also turn the light on or off": "Ruch jasności powinien również włączać lub wyłączać światło",
     "Brightness step should also turn the light on or off": "Krok jasności powinien również włączać lub wyłączać światło"
 }

package/admin/i18n/pt/translations.json

@@ -1,26 +1,28 @@
 {
     "zigbee2mqtt adapter settings": "Configurações do adaptador para zigbee2mqtt",
     "Select and configure your Zigbee2MQTT connection": "Selecione e configure a conexão Zigbee2MQTT",
-    "Select connection to Zigbee2MQTT": "Selecione a conexão com o Zigbee2MQTT",
+    "Select connection to Zigbee2MQTT": "Selecione a conexão com Zigbee2MQTT",
     "Websocket": "Websocket",
     "External MQTT-Server (Experimental)": "Servidor MQTT Externo (Experimental)",
     "Internal MQTT-Server (Experimental)": "Servidor MQTT Interno (Experimental)",
     "Configure your Zigbee2MQTT connection": "Configure sua conexão Zigbee2MQTT",
     "Websocket IP-Address": "Endereço IP do Websocket",
     "Websocket Port": "Porta Websocket",
+    "Use Auth-Token": "Usar token de autenticação",
+    "Auth-Token (special characters are not supported)": "Auth-Token (caracteres especiais não são suportados)",
     "Create a dummy MQTT-Server for Zigbee2MQTT": "Crie um servidor MQTT fictício para Zigbee2MQTT",
     "External MQTT-Server IP-Address": "Endereço IP do servidor MQTT externo",
     "External MQTT-Server Port": "Porta externa do servidor MQTT",
-    "MQTT-Server IP-Address bind": "Ligação de endereço IP do servidor MQTT",
-    "MQTT-Server Port": "Porta do servidor MQTT",
+    "MQTT-Server IP-Address bind": "Vinculação de endereço IP do servidor MQTT",
+    "MQTT-Server Port": "Porta do Servidor MQTT",
     "Configure your Zigbee2MQTT WebUi connection": "Configurar conexão Zigbee2MQTT WebUi",
-    "WebUi Address": "Endereço WebUi",
+    "WebUi Address": "Endereço WebUI",
     "WebUi Port": "Porta WebUI",
     "Color configurations": "Configurações de cores",
-    "Color temperature sync with color": "Sincronização da temperatura de cor com a cor",
-    "Use Kelvin instead of mired for the color temps": "Use Kelvin em vez de atolado para as temperaturas de cor",
+    "Color temperature sync with color": "Sincronização de temperatura de cor com cores",
+    "Use Kelvin instead of mired for the color temps": "Use Kelvin em vez de mired para as temperaturas de cor",
     "Other configurations": "Outras configurações",
-    "Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logs para logs ioBroker",
+    "Proxy Zigbee2MQTT logs to ioBroker logs": "Logs proxy Zigbee2MQTT para logs ioBroker",
     "Brightness move should also turn the light on or off": "O movimento de brilho também deve ligar ou desligar a luz",
     "Brightness step should also turn the light on or off": "A etapa de brilho também deve ligar ou desligar a luz"
 }

package/admin/i18n/ru/translations.json

@@ -8,6 +8,8 @@
     "Configure your Zigbee2MQTT connection": "Настройте соединение Zigbee2MQTT",
     "Websocket IP-Address": "IP-адрес веб-сокета",
     "Websocket Port": "Порт веб-сокета",
+    "Use Auth-Token": "Использовать авторизационный токен",
+    "Auth-Token (special characters are not supported)": "Auth-Token (специальные символы не поддерживаются)",
     "Create a dummy MQTT-Server for Zigbee2MQTT": "Создайте фиктивный MQTT-сервер для Zigbee2MQTT",
     "External MQTT-Server IP-Address": "IP-адрес внешнего MQTT-сервера",
     "External MQTT-Server Port": "Порт внешнего MQTT-сервера",

package/admin/i18n/uk/translations.json

@@ -8,6 +8,8 @@
     "Configure your Zigbee2MQTT connection": "Налаштуйте підключення Zigbee2MQTT",
     "Websocket IP-Address": "IP-адреса Websocket",
     "Websocket Port": "Порт Websocket",
+    "Use Auth-Token": "Використовуйте Auth-Token",
+    "Auth-Token (special characters are not supported)": "Auth-Token (спеціальні символи не підтримуються)",
     "Create a dummy MQTT-Server for Zigbee2MQTT": "Створіть фіктивний MQTT-сервер для Zigbee2MQTT",
     "External MQTT-Server IP-Address": "IP-адреса зовнішнього MQTT-сервера",
     "External MQTT-Server Port": "Зовнішній порт MQTT-сервера",

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

@@ -1,24 +1,26 @@
 {
     "zigbee2mqtt adapter settings": "zigbee2mqtt 的适配器设置",
-    "Select and configure your Zigbee2MQTT connection": "选择和配置 Zigbee2MQTT 连接",
-    "Select connection to Zigbee2MQTT": "选择连接到 Zigbee2MQTT",
+    "Select and configure your Zigbee2MQTT connection": "选择并配置 Zigbee2MQTT 连接",
+    "Select connection to Zigbee2MQTT": "选择与 Zigbee2MQTT 的连接",
     "Websocket": "网络套接字",
-    "External MQTT-Server (Experimental)": "外部 MQTT-Server（实验性）",
+    "External MQTT-Server (Experimental)": "外部 MQTT 服务器（实验性）",
     "Internal MQTT-Server (Experimental)": "内部 MQTT 服务器（实验性）",
     "Configure your Zigbee2MQTT connection": "配置您的 Zigbee2MQTT 连接",
     "Websocket IP-Address": "Websocket IP 地址",
     "Websocket Port": "Websocket 端口",
-    "Create a dummy MQTT-Server for Zigbee2MQTT": "为 Zigbee2MQTT 创建一个虚拟 MQTT 服务器",
-    "External MQTT-Server IP-Address": "外部 MQTT-服务器 IP 地址",
+    "Use Auth-Token": "使用授权令牌",
+    "Auth-Token (special characters are not supported)": "Auth-Token（不支持特殊字符）",
+    "Create a dummy MQTT-Server for Zigbee2MQTT": "为 Zigbee2MQTT 创建虚拟 MQTT 服务器",
+    "External MQTT-Server IP-Address": "外部 MQTT 服务器 IP 地址",
     "External MQTT-Server Port": "外部 MQTT 服务器端口",
-    "MQTT-Server IP-Address bind": "MQTT-服务器 IP 地址绑定",
+    "MQTT-Server IP-Address bind": "MQTT-服务器IP地址绑定",
     "MQTT-Server Port": "MQTT-服务器端口",
     "Configure your Zigbee2MQTT WebUi connection": "配置 Zigbee2MQTT WebUi 连接",
-    "WebUi Address": "网页界面地址",
-    "WebUi Port": "WebUI 端口",
+    "WebUi Address": "WebUi地址",
+    "WebUi Port": "WebUi端口",
     "Color configurations": "颜色配置",
     "Color temperature sync with color": "色温与颜色同步",
-    "Use Kelvin instead of mired for the color temps": "使用 Kelvin 而不是 mired 作为色温",
+    "Use Kelvin instead of mired for the color temps": "使用 Kelvin 而不是 mired 的色温",
     "Other configurations": "其他配置",
     "Proxy Zigbee2MQTT logs to ioBroker logs": "代理 Zigbee2MQTT 日志到 ioBroker 日志",
     "Brightness move should also turn the light on or off": "亮度移动也应该打开或关闭灯",

package/admin/jsonConfig.json

@@ -50,6 +50,19 @@
 			"newLine": false,
 			"hidden": "data.connectionType != 'ws'"
 		},
+		"wsTokenEnabled": {
+			"type": "checkbox",
+			"label": "Use Auth-Token",
+			"newLine": true,
+			"hidden": "data.connectionType != 'ws'"
+		},
+		"wsToken": {
+			"type": "password",
+			"label": "Auth-Token (special characters are not supported)",
+			"newLine": true,
+			"lg": 2,
+			"hidden": "data.wsTokenEnabled != true || data.connectionType != 'ws'"
+		},
 		"dummyMqtt": {
 			"type": "checkbox",
 			"label": "Create a dummy MQTT-Server for Zigbee2MQTT",

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "zigbee2mqtt",
-    "version": "2.5.0",
+    "version": "2.7.0",
     "news": {
+      "2.7.0": {
+        "en": "added support for  wildcard actions (eg. *_single) ([#116](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/116))\nadded error handling optimizations ([more](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1382038679))\nadded option `auth_token` for websocket connection ([#112](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/112))\nwebsocket timeout increased",
+        "de": "unterstützung für Wildcard-Aktionen (z.B. *_single) [#116](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/116)\nfehlerbehandlungsoptimierungen [mehr](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1382038679)\nzusatzoption auth_token für Websocket-Verbindung [#112](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/112)\nwebsocket timeout erhöht",
+        "ru": "добавлена поддержка действий дикой карты (например *_один) [#116](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/116)\nдобавлены оптимизации обработки ошибок [more](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1382038679)\nдобавлена опция auth_token для подключения к сети [#112](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/112)\ntimeout websocket увеличился",
+        "pt": "apoio adicional para ações curingas (por exemplo: *_single) [#116](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/116)\notimizações adicionais de manuseio de erros [mais](https://github.com/ioBroker/ioBroker.repositories/pull/1976#comment-1382038679)\nadicionado opção auth_token para conexão websocket [#112](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/112)\ntimeout do websocket aumentou",
+        "nl": "voegde ondersteuning toe voor wilde kaarten\nerror toegevoegd aan het omgaan met optimisaties / 1976 #isscombentub.comioBroker /ioBroker / iProker / 1976 3896 389\nvoegde optie toegevoegd voor websocket connectie [Ghtub.com/oshoo/ioBroker\nwebsocket time-out verhoogd",
+        "fr": "ajout d ' un appui aux actions de wildcard (par exemple *_single) [#116](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/116)\noptimisation de la gestion des erreurs [plus](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1382038679)\noption ajoutée auth_token for websocket connection [#112](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/112)\nwebsocket timeout augmenté",
+        "it": "[#116](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/116)\n[continua](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1382038679)\nopzione aggiunta auth_token per collegamento websocket [#112](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/112)\nwebsocket timeout aumentato",
+        "es": "[#116](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/116)\n[más](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1382038679)\nañadida la opción auth_token para la conexión websocket [#112](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/112)\ntiempo de websocket aumentó",
+        "pl": "dodano wsparcie dla działań na rzecz dzikich kart (eg. *_single) #116(https:/github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/116)\ndodano optymalizację błędów (https:/github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1382038679)\nauth_token for websocket connection #112(https:/github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/112)\nczas dostępu do stron internetowych wzrastał",
+        "uk": "додана підтримка дій дикої картки (наприклад, *_single) [#116](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/116)\nдодано оптимізацію обробки помилок [більше](https://github.com/ioBroker/ioBroker.repositories/pull/1976#productcomment-1382038679)\nдодано опцію auth_token для підключення websocket [#112](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/112)\nwebsocket час",
+        "zh-cn": "对野生卡行动(第 *_single)[第116](http://github.com/oshojo0o/ioBroker.zigbee2mqt/issues/116))的支持\n新增的错误处理优化[(http://github.com/ioBroker/ioBroker.reories/pull/1976#issuement-1382038679)\n添加以下选择:网站联系(第112号)(http://github.com/oshojo0o/ioBroker.zigbee2mqt/issues/112)\n网页"
+      },
+      "2.6.0": {
+        "en": "added state `transition` for transition overwrite (-1 disabled overwrite) ([#101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101))\nconsideration of the description when creating the friendly name ([#105](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/105))\nadded state `effect` for groups ([#101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101))\nfix state contact\nadded handling for disabled devices",
+        "de": "hinzugefügter Zustandsübergang für Übergangsüberschreiben -(1 behinderte Überschreiben) #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101)\nberücksichtigung der Beschreibung bei der Erstellung des freundlichen Namens #[105](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/105)\nzusätzliche staatliche Wirkung für Gruppen #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/101)\nkontakt mit dem status\nzusätzliches handling für behinderte",
+        "ru": "добавлен государственный переход для перехода переписать -(1 отключен перезапись) #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101)\nрассмотрение описания при создании дружественного имени #[105](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/105)\nдобавлен государственный эффект для групп #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101)\nисправить государственный контакт\nдобавлена обработка для инвалидов",
+        "pt": "adicionado transição de estado para a transição sobreescrita -(1 sobreescrita desativada) #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101)\nconsideração da descrição ao criar o nome amigável #[105](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/105)\nadicionado efeito estatal para grupos #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101)\ncorrigir contato estado\nmanuseio adicionado para dispositivos com deficiência",
+        "nl": "voegde staatsoverschrijving toe voor overschrijving overschrijving - (1 gehandicapte overschrijving) (1) (1 gehandicapte overschrijving)\noverweeg de beschrijving als het creëren van de vriendelijke naam £10:\nvoegde toegevoegd staats effect voor groepen £101, httub.com/oshojoo/ioBroker\nvertaling:\nvoegde toegevoegd voor gehandicapte apparaten",
+        "fr": "transition de l ' État pour la surécriture de transition -(1 surécriture désactivée) #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/101)\nexamen de la description lors de la création du nom amical #[105](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/105)\neffet d ' État ajouté pour les groupes #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/101)\ncontact étatique\nmanipulation supplémentaire pour les dispositifs handicapés",
+        "it": "aggiunto passaggio di stato per overwrite di transizione -(1 overwrite disabilitato) #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/101)\nconsiderazione della descrizione quando si crea il nome amichevole #[105](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/105)\neffetto stato aggiunto per gruppi #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/101)\nfix contatto stato\nmanipolazione aggiuntiva per dispositivi disabili",
+        "es": "añadida transición estatal para la sobreescritura de transición -(1 invalidez sobreescritura) #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101)\nexamen de la descripción al crear el nombre amistoso #[105](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/105)\nañadido efecto estatal para los grupos #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101)\narreglar contacto estado\nmanejo añadido para dispositivos discapacitados",
+        "pl": "dodano przejście stanowe na przepisanie -(1 disabled overwrite) #101(https:/github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101)\nrezultatem tego opisu było stworzenie przyjaznej nazwy #105 (https:/github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/105)\ndodano efekt stanowy dla grup #101 (https:/github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101)\nkontakt państwowy\nobsługa urządzeń dla osób niepełnosprawnych",
+        "uk": "додано державний перехід для переходу перезапису -(1 вимкнено перезапис) #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101)\nрозгляд опису при створенні дружньої назви #[105](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/products/105)\nдодано державний ефект для груп #[101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101)\nфіксувати державний контакт\nдодана обробка для пристроїв відключення",
+        "zh-cn": "此外,国家向过渡过渡的过渡——《残疾》第[101]号(http://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/101)\n在建立友好名称编号(http://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/105)时,审议说明\n第[101]号(http://github.com/oshojo0o/ioBroker.zigbee2mqt/issues/101)\nfix 国家联络点\nd. 增加处理残疾装置"
+      },
       "2.5.0": {
         "en": "added option `Brightness step should also turn the light on or off`\nadded handling of `brightness_step` ([#96](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/96))\nstates processing more flexible designed ([#94](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/94))",
         "de": "zusätzliche Option `Brightness Schritt sollte auch das Licht ein- oder ausschalten `\nzusätzliches Handling der Helligkeit_step #[96](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/96)\nzustände, die flexibler gestaltet sind #[94](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/94)",
@@ -67,32 +93,6 @@
         "pl": "(Prawdziwa obsługa ruchu_to_saturation, hue_move and brightness_move_to_level #68(https:/github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/68)\nustanowić się, gdy przyjaźnić nazwisko/'. zawierać",
         "uk": "додано правильну обробку рухом_to_saturation, hue_move_move_to_level [#68](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/68)\nфіксація при дружній_ім`я `/` в наявності",
         "zh-cn": "进一步正确地处理搬迁问题:流向、障碍和光明_move_to_级[#68](http://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/68)\nfix 友好时的名称:“/” 内载"
-      },
-      "2.4.1": {
-        "en": "fix based on [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
-        "de": "(https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
-        "ru": "исправить на [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
-        "pt": "correção com base em [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#comment-1316656378)",
-        "nl": "quality over Quantity Releases Vertaling:",
-        "fr": "fix based on [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
-        "it": "fix based on [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
-        "es": "fijado basado en [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
-        "pl": "recenzent oparty na przeglądzie (https:/github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656363636378)",
-        "uk": "javaScript licenses API Веб-сайт Go1.13.8",
-        "zh-cn": "fix 基于[审查](http://github.com/ioBroker/ioBroker.reories/pull/1976#issuement-1316656378)"
-      },
-      "2.4.0": {
-        "en": "fix for devices with multiple endpoints ([#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/57)).\nadded option `Brightness move should also turn the light on or off`\nadded state toggle for groups \nmore dynamic during data point creation ([#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48)).",
-        "de": "fix für Geräte mit mehreren Endpunkten [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/57).\nzusätzliche Option `Brightness move sollte auch das Licht ein- oder ausschalten `\nzusatzzustandswinkel für gruppen\nmehr Dynamik bei der Erstellung von Datenpunkten [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/48).",
-        "ru": "исправить для устройств с несколькими точками [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/57).\nдобавленная опция `Перемещение яркости должно также повернуть свет на или вне`\nдобавлена государственная очка для групп\nболее динамично во время создания данных [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48).",
-        "pt": "correção para dispositivos com múltiplos endpoints [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/57).\nopção adicionada `Brightness move também deve ligar ou desligar a luz`\nadicionado conjunto de estado para grupos\nmais dinâmico durante a criação do ponto de dados [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48).",
-        "nl": "vertaling:.\nvoegde optie 'Brightness zet ook het licht aan of uit'\nvertaling:\ndynamischer tijdens datapunt 48: github.com/oshojoo/ioBroker.",
-        "fr": "correction des dispositifs comportant plusieurs paramètres [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/57).\noption ajoutée `Brightness move should also turn the light on or off`\nla lutte de l'état pour les groupes\nplus dynamique lors de la création de points de données [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/48).",
-        "it": "fix per dispositivi con più endpoint [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/57).\nopzione aggiunta `Brightness movimento dovrebbe anche accendere o spegnere la luce `\ntoggle di stato aggiunto per gruppi\npiù dinamica durante la creazione di data point [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/48).",
-        "es": "fix for devices with multiple endpoints [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/57).\nopción agregada `El movimiento de la rectitud también debe encender o apagar la luz &apos\nañadido a la lucha estatal para grupos\nmás dinámica durante la creación de puntos de datos [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48).",
-        "pl": "urządzenia z wieloma punktami końcowymi (#57(https:/github.com/o0shojo0/ioBroker.zigbee2mqtt/issues/57).\ndodano również możliwość wykonania ruchu `Brightness'\ndodać stan dla grup\ndynamiczny w czasie tworzenia danych (#48)(https:/github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48).",
-        "uk": "виправлення для пристроїв з декількома кінцевими точками [#57](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/57).\nдоданий варіант `Брайтний рух також повинен перетворювати світло або вимкнути`\nдодано державний контроль за групами\nбільш динамічний при створенні точки даних [#48](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/48).",
-        "zh-cn": "fix 有多个最终用户的装置[第57号](http://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/57).\n增加“权利流动”的选择,也应该改变“或”以外的照明。\n加入集团的州\n在数据点创建期间,增加活力[第48](http://github.com/oshojo0o/ioBroker.zigbee2mqt/issues/48)."
       }
     },
     "titleLang": {
@@ -141,7 +141,7 @@
     "readme": "https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/blob/main/README.md",
     "loglevel": "info",
     "mode": "daemon",
-    "type": "lighting",
+    "type": "hardware",
     "compact": true,
     "connectionType": "local",
     "dataSource": "push",
@@ -184,6 +184,8 @@
     "connectionType": "ws",
     "wsServerIP": "",
     "wsServerPort": 8080,
+    "wsTokenEnabled": false,
+    "wsToken": "",
     "dummyMqtt": false,
     "externalMqttServerIP": "",
     "externalMqttServerPort": 1883,

package/lib/deviceController.js

@@ -1,5 +1,5 @@
 const states = require('./states').states;
-const defineDeviceFromExposes = require('./exposes').defineDeviceFromExposes;
+const createDeviceFromExposes = require('./exposes').createDeviceFromExposes;
 const utils = require('./utils');
 const colors = require('./colors.js');
 const rgb = require('./rgb.js');
@@ -15,23 +15,21 @@ class DeviceController {
         this.createCache = createCache;
     }
 
-    async createDeviceDefinitions(exposes) {
+    async createDeviceDefinitions(devicesMessage) {
         utils.clearArray(this.deviceCache);
-        for (const expose of exposes) {
-            if (expose.definition != null) {
-                // search for scenes in the endpoints and build them into an array
-                let scenes = [];
-                for (const key in expose.endpoints) {
-                    if (expose.endpoints[key].scenes) {
-                        scenes = scenes.concat(expose.endpoints[key].scenes);
-                    }
-                }
-                if (this.logCustomizations.debugDevices.includes(expose.ieee_address)) {
-                    this.adapter.log.warn(`--->>> fromZ2M -> ${expose.ieee_address} exposes: ${JSON.stringify(expose)}`);
-                }
+        for (const devicesMessag of devicesMessage) {
+            if (this.logCustomizations.debugDevices.includes(devicesMessag.ieee_address)) {
+                this.adapter.log.warn(`--->>> fromZ2M -> ${devicesMessag.ieee_address} exposes: ${JSON.stringify(devicesMessag)}`);
+            }
+
+            if (devicesMessag.definition != null) {
                 // if the device is already present in the cache, remove it
-                this.removeDeviceByIeee(this.deviceCache, expose.ieee_address);
-                defineDeviceFromExposes(this.deviceCache, expose.friendly_name, expose.ieee_address, expose.definition, expose.power_source, scenes, this.config);
+                this.removeDeviceByIeee(this.deviceCache, devicesMessag.ieee_address);
+
+                if (devicesMessag.definition.exposes) {
+                    const newDevice = createDeviceFromExposes(devicesMessag, this.config);
+                    this.deviceCache.push(newDevice);
+                }
             }
         }
     }
@@ -44,10 +42,25 @@ class DeviceController {
             id: groupID,
             ieee_address: ieee_address,
             icon: undefined,
+            optionsValues: {},
             states: [
-                states.state,
                 states.brightness,
                 states.colortemp_move,
+                states.transition,
+                {
+                    id: 'state',
+                    prob: 'state',
+                    name: 'Switch state',
+                    options: ['transition'],
+                    icon: undefined,
+                    role: 'switch',
+                    write: true,
+                    read: true,
+                    type: 'boolean',
+                    def: false,
+                    getter: payload => (payload.state === 'ON'),
+                    setter: (value) => (value) ? 'ON' : 'OFF',
+                },
                 {
                     id: 'brightness_move',
                     prop: brmPropName,
@@ -61,7 +74,6 @@ class DeviceController {
                     max: 50,
                     def: 0
                 },
-
                 {
                     id: 'brightness_step',
                     prop: brsPropName,
@@ -79,6 +91,7 @@ class DeviceController {
                     id: 'color',
                     prop: 'color',
                     name: 'Color',
+                    options: ['transition'],
                     icon: undefined,
                     role: 'level.color.rgb',
                     write: true,
@@ -110,6 +123,7 @@ class DeviceController {
                     id: 'colortemp',
                     prop: 'color_temp',
                     name: 'Color temperature',
+                    options: ['transition'],
                     icon: undefined,
                     role: 'level.color.temperature',
                     write: true,
@@ -136,6 +150,7 @@ class DeviceController {
                 {
                     id: 'state_toggle',
                     name: 'Toggle the state',
+                    options: ['transition'],
                     icon: undefined,
                     role: 'button',
                     write: true,
@@ -144,7 +159,19 @@ class DeviceController {
                     setattr: 'state',
                     def: true,
                     setter: (value) => (value) ? 'TOGGLE' : undefined
-                }
+                },
+                {
+                    id: 'effect',
+                    name: 'Triggers an effect on the light (e.g. make light blink for a few seconds)',
+                    prop: 'effect',
+                    icon: undefined,
+                    role: 'state',
+                    write: true,
+                    read: true,
+                    type: 'string',
+                    def: '',
+                    states: { blink: 'blink', breathe: 'breathe', okay: 'okay', channel_change: 'channel_change', finish_effect: 'finish_effect', stop_effect: 'stop_effect' }
+                },
             ],
         };
 
@@ -180,7 +207,17 @@ class DeviceController {
 
     async createOrUpdateDevices() {
         for (const device of this.groupCache.concat(this.deviceCache)) {
-            const deviceName = device.id == device.ieee_address ? '' : device.id;
+            let deviceName = device.id == device.ieee_address ? '' : device.id;
+
+            if (deviceName == '' && device.description) {
+                deviceName = device.description;
+            }
+
+            // Manipulate deviceName if the device is disabled, so the update of the device is triggered as well
+            if (device.disabled && device.disabled == true) {
+                deviceName = `[Disabled] ${deviceName}`;
+            }
+
             if (!this.createCache[device.ieee_address] || this.createCache[device.ieee_address].name != deviceName) {
                 const deviceObj = {
                     type: 'device',
@@ -191,11 +228,17 @@ class DeviceController {
                     native: {}
                 };
 
-                if (!device.ieee_address.includes('group_')) {
+                // Only the onlineId is set if the device is not disabled and is not a group
+                if (!device.ieee_address.includes('group_') && (!device.disabled || device.disabled == false)) {
                     deviceObj.common.statusStates = {
                         onlineId: `${this.adapter.name}.${this.adapter.instance}.${device.ieee_address}.available`
                     };
                 }
+                else {
+                    deviceObj.common.statusStates = {
+                        onlineId: ''
+                    };
+                }
 
                 //@ts-ignore
                 await this.adapter.extendObjectAsync(device.ieee_address, deviceObj);
@@ -266,6 +309,7 @@ class DeviceController {
     async copyAndCleanStateObj(state) {
         const iobState = { ...state };
         const blacklistedKeys = [
+            'prop',
             'setter',
             'setterOpt',
             'getter',
@@ -275,6 +319,7 @@ class DeviceController {
             'isOption',
             'inOptions',
             'isEvent',
+            'options',
         ];
         for (const blacklistedKey of blacklistedKeys) {
             delete iobState[blacklistedKey];

package/lib/exposes.js

@@ -164,8 +164,16 @@ function genState(expose, role, name, desc) {
     return state;
 }
 
-function createFromExposes(deviceID, ieee_address, definitions, power_source, scenes, config) {
+function createDeviceFromExposes(devicesMessag, config) {
     const states = [];
+    let scenes = [];
+    const deviceID = devicesMessag.friendly_name;
+    const ieee_address = devicesMessag.ieee_address;
+    const definition = devicesMessag.definition;
+    const power_source = devicesMessag.power_source;
+    const disabled = devicesMessag.disabled && devicesMessag.disabled == true;
+    const description = devicesMessag.description ? devicesMessag.description : undefined;
+
     function pushToStates(state, access) {
         if (state === undefined) {
             return 0;
@@ -278,7 +286,14 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
         }
     }
 
-    for (const expose of definitions.exposes) {
+    // search for scenes in the endpoints and build them into an array
+    for (const key in devicesMessag.endpoints) {
+        if (devicesMessag.endpoints[key].scenes) {
+            scenes = scenes.concat(devicesMessag.endpoints[key].scenes);
+        }
+    }
+
+    for (const expose of definition.exposes) {
         let state;
 
         switch (expose.type) {
@@ -290,6 +305,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                             pushToStates({
                                 id: stateName,
                                 name: `Switch state ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+                                options: ['transition'],
                                 icon: undefined,
                                 role: 'switch',
                                 write: true,
@@ -306,6 +322,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                                     id: `${stateName}_toggle`,
                                     prop: `${stateName}_toggle`,
                                     name: `Toggle state of the ${stateName}`,
+                                    options: ['transition'],
                                     icon: undefined,
                                     role: 'button',
                                     write: true,
@@ -323,6 +340,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                             pushToStates({
                                 id: stateName,
                                 name: `Brightness ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+                                options: ['transition'],
                                 icon: undefined,
                                 role: 'level.dimmer',
                                 write: true,
@@ -331,7 +349,6 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                                 min: 0, // ignore expose.value_min
                                 max: 100, // ignore expose.value_max
                                 def: 100,
-                                inOptions: true,
                                 unit: '%',
                                 getter: (value) => {
                                     return utils.bulbLevelToAdapterLevel(value[stateName]);
@@ -361,6 +378,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                                 id: `${stateName}_step`,
                                 prop: brspropName,
                                 name: 'Increases or decreases brightness by X steps',
+                                options: ['transition'],
                                 icon: undefined,
                                 role: 'state',
                                 write: true,
@@ -380,6 +398,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                                 id: stateName,
                                 prop: propName,
                                 name: `Color temperature ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+                                options: ['transition'],
                                 icon: undefined,
                                 role: 'level.color.temperature',
                                 write: true,
@@ -425,6 +444,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                             pushToStates({
                                 id: stateName,
                                 name: `Color ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+                                options: ['transition'],
                                 icon: undefined,
                                 role: 'level.color.rgb',
                                 write: true,
@@ -464,6 +484,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                             pushToStates({
                                 id: stateName,
                                 name: `Color ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+                                options: ['transition'],
                                 icon: undefined,
                                 role: 'level.color.rgb',
                                 write: true,
@@ -504,8 +525,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                             break;
                     }
                 }
-                // First don't create a transition_time datapoint, this will be set in the backend
-                //pushToStates(statesDefs.transition_time, 2);
+                pushToStates(statesDefs.transition, z2mAccess.SET);
                 break;
 
             case 'switch':
@@ -612,6 +632,30 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                             break;
                         }
 
+                        // Support for DIYRuZ Device
+                        const wildcardValues = expose.values.filter(x => x.startsWith('*'));
+                        if (wildcardValues && wildcardValues.length > 0) {
+                            for (const endpointName of [...new Set(definition.exposes.filter(x => x.endpoint).map(x => x.endpoint))]) {
+                                for (const value of wildcardValues) {
+                                    const actionName = value.replace('*', endpointName);
+                                    pushToStates({
+                                        id: actionName,
+                                        prop: 'action',
+                                        name: `Triggered action ${value.replace('*_', endpointName)}`,
+                                        icon: undefined,
+                                        role: 'button',
+                                        write: false,
+                                        read: true,
+                                        type: 'boolean',
+                                        def: false,
+                                        isEvent: true,
+                                        getter: payload => (payload.action === actionName) ? true : undefined,
+                                    }, expose.access);
+                                }
+                            }
+                            break;
+                        }
+
                         const hasHold = expose.values.find((actionName) => actionName.includes('hold'));
                         const hasRelease = expose.values.find((actionName) => actionName.includes('release'));
 
@@ -802,7 +846,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
                             }
                         }
                         // Can the device simulated_brightness?
-                        if (definitions.options && definitions.options.find(x => x.property == 'simulated_brightness')) {
+                        if (definition.options && definition.options.find(x => x.property == 'simulated_brightness')) {
                             pushToStates(statesDefs.simulated_brightness, z2mAccess.STATE);
                         }
                         state = null;
@@ -964,7 +1008,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
 
     // If necessary, add states defined for this device model.
     // Unfortunately this is necessary for some device models because they do not adhere to the standard
-    for (const state of getNonGenDevStatesDefs(definitions.model)) {
+    for (const state of getNonGenDevStatesDefs(definition.model)) {
         pushToStates(state, state.write ? z2mAccess.SET : z2mAccess.STATE);
     }
 
@@ -991,19 +1035,16 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
         id: deviceID,
         ieee_address: ieee_address,
         power_source: power_source,
+        disabled: disabled,
+        description: description,
+        optionsValues: {},
         states: states,
     };
 
     return newDevice;
 }
 
-function defineDeviceFromExposes(devices, deviceID, ieee_address, definitions, power_source, scenes, config) {
-    if (definitions.hasOwnProperty('exposes')) {
-        const newDevice = createFromExposes(deviceID, ieee_address, definitions, power_source, scenes, config);
-        devices.push(newDevice);
-    }
-}
 
 module.exports = {
-    defineDeviceFromExposes: defineDeviceFromExposes,
+    createDeviceFromExposes: createDeviceFromExposes,
 };

package/lib/messages.js

@@ -7,6 +7,7 @@ async function adapterInfo(config, log) {
     if (config.connectionType == 'ws') {
         log.info(`|| Zigbee2MQTT Websocket Server: ${config.wsServerIP}`);
         log.info(`|| Zigbee2MQTT Websocket Port: ${config.wsServerPort}`);
+        log.info(`|| Zigbee2MQTT Websocket Auth-Token: ${config.wsTokenEnabled ? 'use' : 'unused'}`);
         log.info(`|| Zigbee2MQTT Websocket Dummy MQTT-Server: ${config.dummyMqtt ? 'activated' : 'deactivated'}`);
         if (config.dummyMqtt == true) {
             log.info(`|| Zigbee2MQTT Dummy MQTT IP-Bind: ${config.mqttServerIPBind}`);

package/lib/states.js

@@ -144,6 +144,7 @@ const states = {
     brightness: {
         id: 'brightness',
         name: 'Brightness',
+        options: ['transition'],
         icon: undefined,
         role: 'level.dimmer',
         write: true,
@@ -189,6 +190,22 @@ const states = {
         def: 0
     },
 
+    transition: {
+        id: 'transition',
+        prop: 'transition',
+        name: 'Transition time overwrite (-1 disabled)',
+        icon: undefined,
+        role: 'state',
+        write: true,
+        read: false,
+        type: 'number',
+        unit: 'sec',
+        min: -1,
+        max: 65535,
+        def: -1,
+        isOption: true
+    },
+
     //#################################################################
     device_query: { // button to trigger device read
         id: 'device_query',
@@ -781,6 +798,7 @@ const states = {
     },
     contact: {
         id: 'contact',
+        prop: 'contact',
         name: 'Contact event',
         icon: undefined,
         role: 'state',
@@ -1327,17 +1345,6 @@ const states = {
             }
         },
     },
-    transition_time: {
-        id: 'transition_time',
-        name: 'Transition time',
-        icon: undefined,
-        role: 'state',
-        write: true,
-        read: false,
-        type: 'number',
-        unit: 'sec',
-        isOption: true,
-    },
     operation_mode: {
         id: 'decoupled',
         prop: 'operation_mode',

package/lib/websocketController.js

@@ -13,7 +13,13 @@ class WebsocketController {
 
     initWsClient() {
         try {
-            wsClient = new WebSocket(`ws://${this.adapter.config.wsServerIP}:${this.adapter.config.wsServerPort}/api`);
+            let wsURL = `ws://${this.adapter.config.wsServerIP}:${this.adapter.config.wsServerPort}/api`;
+
+            if (this.adapter.config.wsTokenEnabled == true) {
+                wsURL += `?token=${this.adapter.config.wsToken}`;
+            }
+
+            wsClient = new WebSocket(wsURL);
 
             wsClient.on('open', () => {
                 // Send ping to server
@@ -66,7 +72,7 @@ class WebsocketController {
         pingTimeout = setTimeout(() => {
             this.adapter.log.warn('Websocked connection timed out');
             wsClient.terminate();
-        }, wsHeartbeatIntervall + 1000);
+        }, wsHeartbeatIntervall + 3000);
     }
 
     async autoRestart() {

package/lib/z2mController.js

@@ -40,23 +40,53 @@ class Z2mController {
             stateID = deviceState.setattr;
         }
 
-
         const controlObj = {
             payload: {
-                [stateID]: stateVal
+                [stateID]: stateVal,
             },
             topic: `${device.id}/set`
         };
 
-        // set stats with the mentioned role or ids always immediately to ack = true, because these are not reported back by Zigbee2MQTT
-        if (['button'].includes(deviceState.role) || ['brightness_move', 'colortemp_move', 'brightness_move', 'brightness_step', 'effect'].includes(deviceState.id)) {
+        // if available read option and set payload
+        if (deviceState.options) {
+            for (const option of deviceState.options) {
+                // if optionsValues not set, set it!
+                if (!device.optionsValues[option]) {
+                    const optionValue = (await this.adapter.getStateAsync(`${splitedID[0]}.${splitedID[1]}.${splitedID[2]}.${option}`)).val;
+                    // optionsValues Cache
+                    device.optionsValues[option] = optionValue;
+                }
+
+                // if transition value == -1 it will be ignored. -1 stands for no overwrite!
+                if (option == 'transition' && device.optionsValues[option] == -1) {
+                    continue;
+                }
+
+                controlObj.payload[option] = device.optionsValues[option];
+            }
+        }
+
+        // If an option datapoint has been set, it does not have to be sent.
+        // This is confirmed directly by the adapter (ack = true)
+        if (deviceState.isOption && deviceState.isOption == true) {
+            // set optionsValues 'Cache'
+            device.optionsValues[stateName] = state.val;
+            this.adapter.setState(id, state, true);
+            return;
+        }
+
+        // set stats with the mentioned roles or always immediately to ack = true, because these are not reported back by Zigbee2MQTT
+        if (['button'].includes(deviceState.role)) {
+            this.adapter.setState(id, state, true);
+        }
+        // set stats with the mentioned ids always immediately to ack = true, because these are not reported back by Zigbee2MQTT
+        if (['brightness_move', 'colortemp_move', 'brightness_move', 'brightness_step', 'effect'].includes(deviceState.id)) {
             this.adapter.setState(id, state, true);
         }
 
         if (this.logCustomizations.debugDevices.includes(device.ieee_address)) {
             this.adapter.log.warn(`<<<--- toZ2M -> ${device.ieee_address} states: ${JSON.stringify(controlObj)}`);
         }
-
         return controlObj;
     }
 
@@ -80,6 +110,7 @@ class Z2mController {
     }
 }
 
+
 module.exports = {
     Z2mController: Z2mController
 };

package/main.js

@@ -128,7 +128,6 @@ class Zigbee2mqtt extends core.Adapter {
         wsClient.on('close', async () => {
             this.setStateChanged('info.connection', false, true);
             await statesController.setAllAvailableToFalse();
-            this.log.warn('Websocket disconnected');
         });
     }
 
@@ -169,6 +168,8 @@ class Zigbee2mqtt extends core.Adapter {
             case 'bridge/response/device/remove':
                 deviceController.processRemoveEvent(messageObj);
                 break;
+            case 'bridge/response/device/options':
+                break;
             case 'bridge/extensions':
                 break;
             case 'bridge/logging':
@@ -222,15 +223,36 @@ class Zigbee2mqtt extends core.Adapter {
             if (mqttClient && !mqttClient.closed) {
                 mqttClient.close();
             }
-            mqttServerController.closeServer();
             websocketController.closeConnection();
+        } catch (e) {
+            this.log.error(e);
+        }
+
+        try {
+            mqttServerController.closeServer();
+        } catch (e) {
+            this.log.error(e);
+        }
+
+        try {
             await statesController.setAllAvailableToFalse();
+        } catch (e) {
+            this.log.error(e);
+        }
+
+        try {
             await websocketController.allTimerClear();
+        } catch (e) {
+            this.log.error(e);
+        }
+
+        try {
             await statesController.allTimerClear();
-            callback();
         } catch (e) {
-            callback();
+            this.log.error(e);
         }
+
+        callback();
     }
 
     async onStateChange(id, state) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen",
@@ -24,7 +24,7 @@
     "aedes-persistence-nedb": "^2.0.3",
     "mqtt": "^4.3.7",
     "net": "^1.0.2",
-    "ws": "^8.11.0"
+    "ws": "^8.12.0"
   },
   "devDependencies": {
     "@alcalzone/release-script-plugin-iobroker": "^3.5.9",
@@ -43,10 +43,10 @@
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.31.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
     "mocha": "^10.2.0",
-    "prettier": "^2.8.1",
+    "prettier": "^2.8.3",
     "proxyquire": "^2.1.3",
     "sinon": "^15.0.1",
     "sinon-chai": "^3.7.0",