iobroker.zigbee2mqtt 2.6.0 → 2.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -0
- package/admin/i18n/de/translations.json +5 -2
- package/admin/i18n/en/translations.json +4 -1
- package/admin/i18n/es/translations.json +4 -1
- package/admin/i18n/fr/translations.json +4 -1
- package/admin/i18n/it/translations.json +13 -10
- package/admin/i18n/nl/translations.json +12 -9
- package/admin/i18n/pl/translations.json +10 -7
- package/admin/i18n/pt/translations.json +11 -8
- package/admin/i18n/ru/translations.json +4 -1
- package/admin/i18n/uk/translations.json +4 -1
- package/admin/i18n/zh-cn/translations.json +13 -10
- package/admin/jsonConfig.json +19 -1
- package/io-package.json +32 -29
- package/lib/deviceController.js +38 -5
- package/lib/exposes.js +24 -0
- package/lib/messages.js +1 -0
- package/lib/websocketController.js +8 -2
- package/main.js +24 -4
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -32,6 +32,18 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
|
|
|
32
32
|
Placeholder for the next version (at the beginning of the line):
|
|
33
33
|
### **WORK IN PROGRESS**
|
|
34
34
|
-->
|
|
35
|
+
### 2.7.1 (2023-01-24)
|
|
36
|
+
|
|
37
|
+
- (o0shojo0o) added option for use folder description
|
|
38
|
+
- (o0shojo0o) use the iobroker device folder description for device description or events
|
|
39
|
+
|
|
40
|
+
### 2.7.0 (2023-01-18)
|
|
41
|
+
|
|
42
|
+
- (o0shojo0o) added support for wildcard actions (eg. *_single) ([#116](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/116))
|
|
43
|
+
- (o0shojo0o) added error handling optimizations ([more](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1382038679))
|
|
44
|
+
- (o0shojo0o) added option `auth_token` for websocket connection ([#112](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/112))
|
|
45
|
+
- (o0shojo0o) websocket timeout increased
|
|
46
|
+
|
|
35
47
|
### 2.6.0 (2023-01-10)
|
|
36
48
|
|
|
37
49
|
- (o0shojo0o) added state `transition` for transition overwrite (-1 disabled overwrite) ([#101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101))
|
|
@@ -22,5 +22,8 @@
|
|
|
22
22
|
"Other configurations": "Andere Konfigurationen",
|
|
23
23
|
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT Protokolle zu ioBroker Protokollen",
|
|
24
24
|
"Brightness move should also turn the light on or off": "Brightness move soll auch das Licht ein- oder ausschalten",
|
|
25
|
-
"Brightness step should also turn the light on or off": "Brightness step soll auch das Licht ein- oder ausschalten"
|
|
26
|
-
|
|
25
|
+
"Brightness step should also turn the light on or off": "Brightness step soll auch das Licht ein- oder ausschalten",
|
|
26
|
+
"Use Auth-Token": "Auth-Token verwenden",
|
|
27
|
+
"Auth-Token (special characters are not supported)": "Auth-Token (Sonderzeichen werden nicht unterstützt)",
|
|
28
|
+
"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "Die Ereignisse wie „Gerät entfernt“ oder „Deaktiviert“ werden in der Beschreibung statt im Namen angezeigt."
|
|
29
|
+
}
|
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
"Configure your Zigbee2MQTT connection": "Configure your Zigbee2MQTT connection",
|
|
9
9
|
"Websocket IP-Address": "Websocket IP-Address",
|
|
10
10
|
"Websocket Port": "Websocket Port",
|
|
11
|
+
"Use Auth-Token": "Use Auth-Token",
|
|
12
|
+
"Auth-Token (special characters are not supported)": "Auth-Token (special characters are not supported)",
|
|
11
13
|
"Create a dummy MQTT-Server for Zigbee2MQTT": "Create a dummy MQTT-Server for Zigbee2MQTT",
|
|
12
14
|
"External MQTT-Server IP-Address": "External MQTT-Server IP-Address",
|
|
13
15
|
"External MQTT-Server Port": "External MQTT-Server Port",
|
|
@@ -22,5 +24,6 @@
|
|
|
22
24
|
"Other configurations": "Other configurations",
|
|
23
25
|
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logs to ioBroker logs",
|
|
24
26
|
"Brightness move should also turn the light on or off": "Brightness move should also turn the light on or off",
|
|
25
|
-
"Brightness step should also turn the light on or off": "Brightness step should also turn the light on or off"
|
|
27
|
+
"Brightness step should also turn the light on or off": "Brightness step should also turn the light on or off",
|
|
28
|
+
"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name."
|
|
26
29
|
}
|
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
"Configure your Zigbee2MQTT connection": "Configura tu conexión Zigbee2MQTT",
|
|
9
9
|
"Websocket IP-Address": "Dirección IP de Websocket",
|
|
10
10
|
"Websocket Port": "puerto websocket",
|
|
11
|
+
"Use Auth-Token": "Usar token de autenticación",
|
|
12
|
+
"Auth-Token (special characters are not supported)": "Auth-Token (los caracteres especiales no son compatibles)",
|
|
11
13
|
"Create a dummy MQTT-Server for Zigbee2MQTT": "Cree un servidor MQTT ficticio para Zigbee2MQTT",
|
|
12
14
|
"External MQTT-Server IP-Address": "Dirección IP del servidor MQTT externo",
|
|
13
15
|
"External MQTT-Server Port": "Puerto de servidor MQTT externo",
|
|
@@ -22,5 +24,6 @@
|
|
|
22
24
|
"Other configurations": "Otras configuraciones",
|
|
23
25
|
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy de registros Zigbee2MQTT a registros de ioBroker",
|
|
24
26
|
"Brightness move should also turn the light on or off": "El movimiento de brillo también debe encender o apagar la luz",
|
|
25
|
-
"Brightness step should also turn the light on or off": "El paso de brillo también debe encender o apagar la luz"
|
|
27
|
+
"Brightness step should also turn the light on or off": "El paso de brillo también debe encender o apagar la luz",
|
|
28
|
+
"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "Los eventos como 'Dispositivo eliminado' o 'Deshabilitado' se muestran en la descripción en lugar del nombre."
|
|
26
29
|
}
|
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
"Configure your Zigbee2MQTT connection": "Configurez votre connexion Zigbee2MQTT",
|
|
9
9
|
"Websocket IP-Address": "Adresse IP Websocket",
|
|
10
10
|
"Websocket Port": "Port WebSocket",
|
|
11
|
+
"Use Auth-Token": "Utiliser le jeton d'authentification",
|
|
12
|
+
"Auth-Token (special characters are not supported)": "Auth-Token (les caractères spéciaux ne sont pas pris en charge)",
|
|
11
13
|
"Create a dummy MQTT-Server for Zigbee2MQTT": "Créer un serveur MQTT factice pour Zigbee2MQTT",
|
|
12
14
|
"External MQTT-Server IP-Address": "Adresse IP du serveur MQTT externe",
|
|
13
15
|
"External MQTT-Server Port": "Port serveur MQTT externe",
|
|
@@ -22,5 +24,6 @@
|
|
|
22
24
|
"Other configurations": "Autres configurations",
|
|
23
25
|
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT se connecte aux journaux ioBroker",
|
|
24
26
|
"Brightness move should also turn the light on or off": "Le mouvement de luminosité devrait également allumer ou éteindre la lumière",
|
|
25
|
-
"Brightness step should also turn the light on or off": "L'étape de luminosité devrait également allumer ou éteindre la lumière"
|
|
27
|
+
"Brightness step should also turn the light on or off": "L'étape de luminosité devrait également allumer ou éteindre la lumière",
|
|
28
|
+
"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "Les événements tels que 'Appareil supprimé' ou 'Désactivé' sont affichés dans la description plutôt que dans le nom."
|
|
26
29
|
}
|
|
@@ -2,25 +2,28 @@
|
|
|
2
2
|
"zigbee2mqtt adapter settings": "Impostazioni dell'adattatore per zigbee2mqtt",
|
|
3
3
|
"Select and configure your Zigbee2MQTT connection": "Seleziona e configura la connessione Zigbee2MQTT",
|
|
4
4
|
"Select connection to Zigbee2MQTT": "Seleziona la connessione a Zigbee2MQTT",
|
|
5
|
-
"Websocket": "
|
|
5
|
+
"Websocket": "Presa web",
|
|
6
6
|
"External MQTT-Server (Experimental)": "Server MQTT esterno (sperimentale)",
|
|
7
7
|
"Internal MQTT-Server (Experimental)": "Server MQTT interno (sperimentale)",
|
|
8
8
|
"Configure your Zigbee2MQTT connection": "Configura la tua connessione Zigbee2MQTT",
|
|
9
9
|
"Websocket IP-Address": "Indirizzo IP WebSocket",
|
|
10
|
-
"Websocket Port": "Porta
|
|
10
|
+
"Websocket Port": "Porta websocket",
|
|
11
|
+
"Use Auth-Token": "Usa token di autenticazione",
|
|
12
|
+
"Auth-Token (special characters are not supported)": "Auth-Token (i caratteri speciali non sono supportati)",
|
|
11
13
|
"Create a dummy MQTT-Server for Zigbee2MQTT": "Crea un server MQTT fittizio per Zigbee2MQTT",
|
|
12
14
|
"External MQTT-Server IP-Address": "Indirizzo IP del server MQTT esterno",
|
|
13
|
-
"External MQTT-Server Port": "Porta
|
|
14
|
-
"MQTT-Server IP-Address bind": "
|
|
15
|
-
"MQTT-Server Port": "Porta server MQTT",
|
|
15
|
+
"External MQTT-Server Port": "Porta server MQTT esterna",
|
|
16
|
+
"MQTT-Server IP-Address bind": "Binding dell'indirizzo IP del server MQTT",
|
|
17
|
+
"MQTT-Server Port": "Porta del server MQTT",
|
|
16
18
|
"Configure your Zigbee2MQTT WebUi connection": "Configura la connessione Zigbee2MQTT WebUi",
|
|
17
19
|
"WebUi Address": "Indirizzo WebUi",
|
|
18
20
|
"WebUi Port": "Porta WebUi",
|
|
19
|
-
"Color configurations": "Configurazioni colore",
|
|
21
|
+
"Color configurations": "Configurazioni di colore",
|
|
20
22
|
"Color temperature sync with color": "Sincronizzazione della temperatura del colore con il colore",
|
|
21
|
-
"Use Kelvin instead of mired for the color temps": "Usa Kelvin invece di mired per le temperature
|
|
23
|
+
"Use Kelvin instead of mired for the color temps": "Usa Kelvin invece di mired per le temperature del colore",
|
|
22
24
|
"Other configurations": "Altre configurazioni",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "
|
|
24
|
-
"Brightness move should also turn the light on or off": "
|
|
25
|
-
"Brightness step should also turn the light on or off": "Il passo di luminosità dovrebbe anche accendere o spegnere la luce"
|
|
25
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Il proxy Zigbee2MQTT registra nei registri ioBroker",
|
|
26
|
+
"Brightness move should also turn the light on or off": "Lo spostamento della luminosità dovrebbe anche accendere o spegnere la luce",
|
|
27
|
+
"Brightness step should also turn the light on or off": "Il passo di luminosità dovrebbe anche accendere o spegnere la luce",
|
|
28
|
+
"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "Gli eventi come \"Dispositivo rimosso\" o \"Disabilitato\" vengono visualizzati nella descrizione anziché nel nome."
|
|
26
29
|
}
|
|
@@ -1,26 +1,29 @@
|
|
|
1
1
|
{
|
|
2
2
|
"zigbee2mqtt adapter settings": "Adapterinstellingen voor zigbee2mqtt",
|
|
3
|
-
"Select and configure your Zigbee2MQTT connection": "Selecteer en configureer Zigbee2MQTT-verbinding",
|
|
3
|
+
"Select and configure your Zigbee2MQTT connection": "Selecteer en configureer de Zigbee2MQTT-verbinding",
|
|
4
4
|
"Select connection to Zigbee2MQTT": "Selecteer verbinding met Zigbee2MQTT",
|
|
5
5
|
"Websocket": "Websocket",
|
|
6
6
|
"External MQTT-Server (Experimental)": "Externe MQTT-server (experimenteel)",
|
|
7
7
|
"Internal MQTT-Server (Experimental)": "Interne MQTT-server (experimenteel)",
|
|
8
|
-
"Configure your Zigbee2MQTT connection": "Configureer
|
|
8
|
+
"Configure your Zigbee2MQTT connection": "Configureer je Zigbee2MQTT-verbinding",
|
|
9
9
|
"Websocket IP-Address": "Websocket IP-adres",
|
|
10
10
|
"Websocket Port": "Websocket-poort",
|
|
11
|
+
"Use Auth-Token": "Gebruik Auth-Token",
|
|
12
|
+
"Auth-Token (special characters are not supported)": "Auth-Token (speciale tekens worden niet ondersteund)",
|
|
11
13
|
"Create a dummy MQTT-Server for Zigbee2MQTT": "Maak een dummy MQTT-server voor Zigbee2MQTT",
|
|
12
14
|
"External MQTT-Server IP-Address": "Extern MQTT-server IP-adres",
|
|
13
15
|
"External MQTT-Server Port": "Externe MQTT-serverpoort",
|
|
14
|
-
"MQTT-Server IP-Address bind": "MQTT-server IP-adres
|
|
16
|
+
"MQTT-Server IP-Address bind": "MQTT-server IP-adres binding",
|
|
15
17
|
"MQTT-Server Port": "MQTT-serverpoort",
|
|
16
|
-
"Configure your Zigbee2MQTT WebUi connection": "Configureer Zigbee2MQTT WebUi-verbinding",
|
|
18
|
+
"Configure your Zigbee2MQTT WebUi connection": "Configureer de Zigbee2MQTT WebUi-verbinding",
|
|
17
19
|
"WebUi Address": "WebUi-adres",
|
|
18
20
|
"WebUi Port": "WebUi-poort",
|
|
19
|
-
"Color configurations": "
|
|
20
|
-
"Color temperature sync with color": "
|
|
21
|
+
"Color configurations": "Kleur configuraties",
|
|
22
|
+
"Color temperature sync with color": "Kleurtemperatuursynchronisatie met kleur",
|
|
21
23
|
"Use Kelvin instead of mired for the color temps": "Gebruik Kelvin in plaats van mired voor de kleurtemperaturen",
|
|
22
24
|
"Other configurations": "Andere configuraties",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logt
|
|
24
|
-
"Brightness move should also turn the light on or off": "Helderheidsbeweging
|
|
25
|
-
"Brightness step should also turn the light on or off": "De helderheidsstap moet het licht ook in- of uitschakelen"
|
|
25
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logt naar ioBroker-logboeken",
|
|
26
|
+
"Brightness move should also turn the light on or off": "Helderheidsbeweging zou ook het licht aan of uit moeten zetten",
|
|
27
|
+
"Brightness step should also turn the light on or off": "De helderheidsstap moet het licht ook in- of uitschakelen",
|
|
28
|
+
"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "De gebeurtenissen zoals 'Apparaat verwijderd' of 'Uitgeschakeld' worden weergegeven in de beschrijving in plaats van in de naam."
|
|
26
29
|
}
|
|
@@ -6,21 +6,24 @@
|
|
|
6
6
|
"External MQTT-Server (Experimental)": "Zewnętrzny serwer MQTT (eksperymentalny)",
|
|
7
7
|
"Internal MQTT-Server (Experimental)": "Wewnętrzny serwer MQTT (eksperymentalny)",
|
|
8
8
|
"Configure your Zigbee2MQTT connection": "Skonfiguruj połączenie Zigbee2MQTT",
|
|
9
|
-
"Websocket IP-Address": "Adres IP gniazda
|
|
10
|
-
"Websocket Port": "
|
|
11
|
-
"
|
|
9
|
+
"Websocket IP-Address": "Adres IP gniazda internetowego",
|
|
10
|
+
"Websocket Port": "Gniazdo sieciowe",
|
|
11
|
+
"Use Auth-Token": "Użyj tokena uwierzytelniającego",
|
|
12
|
+
"Auth-Token (special characters are not supported)": "Auth-Token (znaki specjalne nie są obsługiwane)",
|
|
13
|
+
"Create a dummy MQTT-Server for Zigbee2MQTT": "Utwórz fikcyjny serwer MQTT dla Zigbee2MQTT",
|
|
12
14
|
"External MQTT-Server IP-Address": "Adres IP zewnętrznego serwera MQTT",
|
|
13
15
|
"External MQTT-Server Port": "Zewnętrzny port serwera MQTT",
|
|
14
|
-
"MQTT-Server IP-Address bind": "Powiązanie adresu IP serwera MQTT
|
|
16
|
+
"MQTT-Server IP-Address bind": "Powiązanie adresu IP serwera MQTT",
|
|
15
17
|
"MQTT-Server Port": "Port serwera MQTT",
|
|
16
18
|
"Configure your Zigbee2MQTT WebUi connection": "Skonfiguruj połączenie Zigbee2MQTT WebUi",
|
|
17
19
|
"WebUi Address": "Adres WebUI",
|
|
18
20
|
"WebUi Port": "Port WebUI",
|
|
19
21
|
"Color configurations": "Konfiguracje kolorów",
|
|
20
22
|
"Color temperature sync with color": "Synchronizacja temperatury barwowej z kolorem",
|
|
21
|
-
"Use Kelvin instead of mired for the color temps": "Użyj Kelvina zamiast
|
|
23
|
+
"Use Kelvin instead of mired for the color temps": "Użyj Kelvina zamiast pogrążonego dla temp. kolorów",
|
|
22
24
|
"Other configurations": "Inne konfiguracje",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT loguje do logów ioBroker",
|
|
25
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT loguje się do logów ioBroker",
|
|
24
26
|
"Brightness move should also turn the light on or off": "Ruch jasności powinien również włączać lub wyłączać światło",
|
|
25
|
-
"Brightness step should also turn the light on or off": "Krok jasności powinien również włączać lub wyłączać światło"
|
|
27
|
+
"Brightness step should also turn the light on or off": "Krok jasności powinien również włączać lub wyłączać światło",
|
|
28
|
+
"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "Zdarzenia takie jak „Urządzenie usunięte” lub „Wyłączone” są wyświetlane w opisie zamiast w nazwie."
|
|
26
29
|
}
|
|
@@ -1,26 +1,29 @@
|
|
|
1
1
|
{
|
|
2
2
|
"zigbee2mqtt adapter settings": "Configurações do adaptador para zigbee2mqtt",
|
|
3
3
|
"Select and configure your Zigbee2MQTT connection": "Selecione e configure a conexão Zigbee2MQTT",
|
|
4
|
-
"Select connection to Zigbee2MQTT": "Selecione a conexão com
|
|
4
|
+
"Select connection to Zigbee2MQTT": "Selecione a conexão com Zigbee2MQTT",
|
|
5
5
|
"Websocket": "Websocket",
|
|
6
6
|
"External MQTT-Server (Experimental)": "Servidor MQTT Externo (Experimental)",
|
|
7
7
|
"Internal MQTT-Server (Experimental)": "Servidor MQTT Interno (Experimental)",
|
|
8
8
|
"Configure your Zigbee2MQTT connection": "Configure sua conexão Zigbee2MQTT",
|
|
9
9
|
"Websocket IP-Address": "Endereço IP do Websocket",
|
|
10
10
|
"Websocket Port": "Porta Websocket",
|
|
11
|
+
"Use Auth-Token": "Usar token de autenticação",
|
|
12
|
+
"Auth-Token (special characters are not supported)": "Auth-Token (caracteres especiais não são suportados)",
|
|
11
13
|
"Create a dummy MQTT-Server for Zigbee2MQTT": "Crie um servidor MQTT fictício para Zigbee2MQTT",
|
|
12
14
|
"External MQTT-Server IP-Address": "Endereço IP do servidor MQTT externo",
|
|
13
15
|
"External MQTT-Server Port": "Porta externa do servidor MQTT",
|
|
14
|
-
"MQTT-Server IP-Address bind": "
|
|
15
|
-
"MQTT-Server Port": "Porta do
|
|
16
|
+
"MQTT-Server IP-Address bind": "Vinculação de endereço IP do servidor MQTT",
|
|
17
|
+
"MQTT-Server Port": "Porta do Servidor MQTT",
|
|
16
18
|
"Configure your Zigbee2MQTT WebUi connection": "Configurar conexão Zigbee2MQTT WebUi",
|
|
17
|
-
"WebUi Address": "Endereço
|
|
19
|
+
"WebUi Address": "Endereço WebUI",
|
|
18
20
|
"WebUi Port": "Porta WebUI",
|
|
19
21
|
"Color configurations": "Configurações de cores",
|
|
20
|
-
"Color temperature sync with color": "Sincronização
|
|
21
|
-
"Use Kelvin instead of mired for the color temps": "Use Kelvin em vez de
|
|
22
|
+
"Color temperature sync with color": "Sincronização de temperatura de cor com cores",
|
|
23
|
+
"Use Kelvin instead of mired for the color temps": "Use Kelvin em vez de mired para as temperaturas de cor",
|
|
22
24
|
"Other configurations": "Outras configurações",
|
|
23
|
-
"Proxy Zigbee2MQTT logs to ioBroker logs": "
|
|
25
|
+
"Proxy Zigbee2MQTT logs to ioBroker logs": "Logs proxy Zigbee2MQTT para logs ioBroker",
|
|
24
26
|
"Brightness move should also turn the light on or off": "O movimento de brilho também deve ligar ou desligar a luz",
|
|
25
|
-
"Brightness step should also turn the light on or off": "A etapa de brilho também deve ligar ou desligar a luz"
|
|
27
|
+
"Brightness step should also turn the light on or off": "A etapa de brilho também deve ligar ou desligar a luz",
|
|
28
|
+
"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "Os eventos como 'Dispositivo removido' ou 'Desativado' são exibidos na descrição em vez de no nome."
|
|
26
29
|
}
|
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
"Configure your Zigbee2MQTT connection": "Настройте соединение Zigbee2MQTT",
|
|
9
9
|
"Websocket IP-Address": "IP-адрес веб-сокета",
|
|
10
10
|
"Websocket Port": "Порт веб-сокета",
|
|
11
|
+
"Use Auth-Token": "Использовать авторизационный токен",
|
|
12
|
+
"Auth-Token (special characters are not supported)": "Auth-Token (специальные символы не поддерживаются)",
|
|
11
13
|
"Create a dummy MQTT-Server for Zigbee2MQTT": "Создайте фиктивный MQTT-сервер для Zigbee2MQTT",
|
|
12
14
|
"External MQTT-Server IP-Address": "IP-адрес внешнего MQTT-сервера",
|
|
13
15
|
"External MQTT-Server Port": "Порт внешнего MQTT-сервера",
|
|
@@ -22,5 +24,6 @@
|
|
|
22
24
|
"Other configurations": "Другие конфигурации",
|
|
23
25
|
"Proxy Zigbee2MQTT logs to ioBroker logs": "Проксировать журналы Zigbee2MQTT в журналы ioBroker",
|
|
24
26
|
"Brightness move should also turn the light on or off": "Изменение яркости также должно включать или выключать свет.",
|
|
25
|
-
"Brightness step should also turn the light on or off": "Шаг яркости также должен включать или выключать свет."
|
|
27
|
+
"Brightness step should also turn the light on or off": "Шаг яркости также должен включать или выключать свет.",
|
|
28
|
+
"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "Такие события, как «Устройство удалено» или «Отключено», отображаются в описании, а не в названии."
|
|
26
29
|
}
|
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
"Configure your Zigbee2MQTT connection": "Налаштуйте підключення Zigbee2MQTT",
|
|
9
9
|
"Websocket IP-Address": "IP-адреса Websocket",
|
|
10
10
|
"Websocket Port": "Порт Websocket",
|
|
11
|
+
"Use Auth-Token": "Використовуйте Auth-Token",
|
|
12
|
+
"Auth-Token (special characters are not supported)": "Auth-Token (спеціальні символи не підтримуються)",
|
|
11
13
|
"Create a dummy MQTT-Server for Zigbee2MQTT": "Створіть фіктивний MQTT-сервер для Zigbee2MQTT",
|
|
12
14
|
"External MQTT-Server IP-Address": "IP-адреса зовнішнього MQTT-сервера",
|
|
13
15
|
"External MQTT-Server Port": "Зовнішній порт MQTT-сервера",
|
|
@@ -22,5 +24,6 @@
|
|
|
22
24
|
"Other configurations": "Інші конфігурації",
|
|
23
25
|
"Proxy Zigbee2MQTT logs to ioBroker logs": "Журнали проксі Zigbee2MQTT до журналів ioBroker",
|
|
24
26
|
"Brightness move should also turn the light on or off": "Переміщення яскравості також повинно вмикати або вимикати світло",
|
|
25
|
-
"Brightness step should also turn the light on or off": "Крок яскравості також повинен вмикати або вимикати світло"
|
|
27
|
+
"Brightness step should also turn the light on or off": "Крок яскравості також повинен вмикати або вимикати світло",
|
|
28
|
+
"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "Такі події, як «Пристрій видалено» або «Вимкнено», відображаються в описі, а не в назві."
|
|
26
29
|
}
|
|
@@ -1,26 +1,29 @@
|
|
|
1
1
|
{
|
|
2
2
|
"zigbee2mqtt adapter settings": "zigbee2mqtt 的适配器设置",
|
|
3
|
-
"Select and configure your Zigbee2MQTT connection": "
|
|
4
|
-
"Select connection to Zigbee2MQTT": "
|
|
3
|
+
"Select and configure your Zigbee2MQTT connection": "选择并配置 Zigbee2MQTT 连接",
|
|
4
|
+
"Select connection to Zigbee2MQTT": "选择与 Zigbee2MQTT 的连接",
|
|
5
5
|
"Websocket": "网络套接字",
|
|
6
|
-
"External MQTT-Server (Experimental)": "外部 MQTT
|
|
6
|
+
"External MQTT-Server (Experimental)": "外部 MQTT 服务器（实验性）",
|
|
7
7
|
"Internal MQTT-Server (Experimental)": "内部 MQTT 服务器（实验性）",
|
|
8
8
|
"Configure your Zigbee2MQTT connection": "配置您的 Zigbee2MQTT 连接",
|
|
9
9
|
"Websocket IP-Address": "Websocket IP 地址",
|
|
10
10
|
"Websocket Port": "Websocket 端口",
|
|
11
|
-
"
|
|
12
|
-
"
|
|
11
|
+
"Use Auth-Token": "使用授权令牌",
|
|
12
|
+
"Auth-Token (special characters are not supported)": "Auth-Token（不支持特殊字符）",
|
|
13
|
+
"Create a dummy MQTT-Server for Zigbee2MQTT": "为 Zigbee2MQTT 创建虚拟 MQTT 服务器",
|
|
14
|
+
"External MQTT-Server IP-Address": "外部 MQTT 服务器 IP 地址",
|
|
13
15
|
"External MQTT-Server Port": "外部 MQTT 服务器端口",
|
|
14
|
-
"MQTT-Server IP-Address bind": "MQTT-服务器
|
|
16
|
+
"MQTT-Server IP-Address bind": "MQTT-服务器IP地址绑定",
|
|
15
17
|
"MQTT-Server Port": "MQTT-服务器端口",
|
|
16
18
|
"Configure your Zigbee2MQTT WebUi connection": "配置 Zigbee2MQTT WebUi 连接",
|
|
17
|
-
"WebUi Address": "
|
|
18
|
-
"WebUi Port": "
|
|
19
|
+
"WebUi Address": "WebUi地址",
|
|
20
|
+
"WebUi Port": "WebUi端口",
|
|
19
21
|
"Color configurations": "颜色配置",
|
|
20
22
|
"Color temperature sync with color": "色温与颜色同步",
|
|
21
|
-
"Use Kelvin instead of mired for the color temps": "使用 Kelvin 而不是 mired
|
|
23
|
+
"Use Kelvin instead of mired for the color temps": "使用 Kelvin 而不是 mired 的色温",
|
|
22
24
|
"Other configurations": "其他配置",
|
|
23
25
|
"Proxy Zigbee2MQTT logs to ioBroker logs": "代理 Zigbee2MQTT 日志到 ioBroker 日志",
|
|
24
26
|
"Brightness move should also turn the light on or off": "亮度移动也应该打开或关闭灯",
|
|
25
|
-
"Brightness step should also turn the light on or off": "亮度步骤也应该打开或关闭灯"
|
|
27
|
+
"Brightness step should also turn the light on or off": "亮度步骤也应该打开或关闭灯",
|
|
28
|
+
"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "“设备已移除”或“已禁用”等事件显示在描述中而不是名称中。"
|
|
26
29
|
}
|
package/admin/jsonConfig.json
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
},
|
|
11
11
|
"connectionType": {
|
|
12
12
|
"label": "Select connection to Zigbee2MQTT",
|
|
13
|
-
"sm":
|
|
13
|
+
"sm": 5,
|
|
14
14
|
"type": "select",
|
|
15
15
|
"options": [
|
|
16
16
|
{
|
|
@@ -50,6 +50,19 @@
|
|
|
50
50
|
"newLine": false,
|
|
51
51
|
"hidden": "data.connectionType != 'ws'"
|
|
52
52
|
},
|
|
53
|
+
"wsTokenEnabled": {
|
|
54
|
+
"type": "checkbox",
|
|
55
|
+
"label": "Use Auth-Token",
|
|
56
|
+
"newLine": true,
|
|
57
|
+
"hidden": "data.connectionType != 'ws'"
|
|
58
|
+
},
|
|
59
|
+
"wsToken": {
|
|
60
|
+
"type": "password",
|
|
61
|
+
"label": "Auth-Token (special characters are not supported)",
|
|
62
|
+
"newLine": true,
|
|
63
|
+
"lg": 5,
|
|
64
|
+
"hidden": "data.wsTokenEnabled != true || data.connectionType != 'ws'"
|
|
65
|
+
},
|
|
53
66
|
"dummyMqtt": {
|
|
54
67
|
"type": "checkbox",
|
|
55
68
|
"label": "Create a dummy MQTT-Server for Zigbee2MQTT",
|
|
@@ -158,6 +171,11 @@
|
|
|
158
171
|
"type": "checkbox",
|
|
159
172
|
"label": "Proxy Zigbee2MQTT logs to ioBroker logs",
|
|
160
173
|
"newLine": true
|
|
174
|
+
},
|
|
175
|
+
"useEventInDesc": {
|
|
176
|
+
"type": "checkbox",
|
|
177
|
+
"label": "The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.",
|
|
178
|
+
"newLine": true
|
|
161
179
|
}
|
|
162
180
|
}
|
|
163
181
|
}
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,34 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "zigbee2mqtt",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.7.1",
|
|
5
5
|
"news": {
|
|
6
|
+
"2.7.1": {
|
|
7
|
+
"en": "added option for use folder description\nuse the iobroker device folder description for device description or events",
|
|
8
|
+
"de": "zusatzoption für die ordnerbeschreibung\ndie beschreibung des iobroker geräteordners für gerätebeschreibung oder ereignisse",
|
|
9
|
+
"ru": "добавлена опция для использования описания папки\nиспользуйте описание папки iobroker для описания устройства или событий",
|
|
10
|
+
"pt": "opção adicionada para a descrição da pasta de uso\nuse a descrição da pasta do dispositivo iobroker para descrição do dispositivo ou eventos",
|
|
11
|
+
"nl": "voegde de optie toe voor gebruik van de beschrijving\ngebruik de beschrijving van het iobroker apparaat voor beschrijving of gebeurtenissen",
|
|
12
|
+
"fr": "option ajoutée pour la description du dossier d'utilisation\nutiliser la description du dossier de périphérique iobroker pour la description de périphérique ou les événements",
|
|
13
|
+
"it": "opzione aggiunta per l'uso descrizione della cartella\nutilizzare la descrizione della cartella del dispositivo iobroker per la descrizione o gli eventi del dispositivo",
|
|
14
|
+
"es": "opción adicional para la descripción de la carpeta de uso\nutilizar la descripción de la carpeta del dispositivo iobroker para la descripción del dispositivo o eventos",
|
|
15
|
+
"pl": "dodać opcję do opisu folder\nużywanie iobrokerowego opisu danych dla opisu urządzenia lub zdarzeń",
|
|
16
|
+
"uk": "доданий варіант для опису папок\nвикористовувати опис папки іоброкера для опису пристрою або подій",
|
|
17
|
+
"zh-cn": "增加使用时说明的选择\n对装置说明或事件使用零散器装置的描述"
|
|
18
|
+
},
|
|
19
|
+
"2.7.0": {
|
|
20
|
+
"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",
|
|
21
|
+
"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",
|
|
22
|
+
"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 увеличился",
|
|
23
|
+
"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",
|
|
24
|
+
"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",
|
|
25
|
+
"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é",
|
|
26
|
+
"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",
|
|
27
|
+
"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ó",
|
|
28
|
+
"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ł",
|
|
29
|
+
"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 час",
|
|
30
|
+
"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网页"
|
|
31
|
+
},
|
|
6
32
|
"2.6.0": {
|
|
7
33
|
"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",
|
|
8
34
|
"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",
|
|
@@ -67,32 +93,6 @@
|
|
|
67
93
|
"pl": "ustanowić dostęp do przyjaznej nazwy. zawierać",
|
|
68
94
|
"uk": "застосувати доступність при дружній_ім`я `/` в наявності",
|
|
69
95
|
"zh-cn": "f 在友好的情况下,可提供“/”一词 内载"
|
|
70
|
-
},
|
|
71
|
-
"2.4.2": {
|
|
72
|
-
"en": "added correct handling of `move_to_saturation`, `hue_move` and `brightness_move_to_level` ([#68](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/68))\nfix when `friendly_name` `/` contains",
|
|
73
|
-
"de": "die korrekte Handhabung von move_to_saturation, hue_move und bright_move_to_level [#68](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/68)\nbei freundlich_name `/` enthält",
|
|
74
|
-
"ru": "добавлена правильная обработка move_to_saturation, hue_move и brightness_move_to_level [#68](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/68)\nисправить, когда friendly_name `/` содержит",
|
|
75
|
-
"pt": "adicionado manuseio correto de move_to_saturation, hue_move e brilho_move_to_level [#68](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/68)\ncorrigir quando friendly_name `/` contém",
|
|
76
|
-
"nl": "voegde de juiste behandeling van verplaatsing, huemove and brightnessmovetolevel 68) (httub /0shojoo-0-Bio-Broctrotqusts)\nvertaling: _",
|
|
77
|
-
"fr": "ajouté correct handling of move_to_saturation, hue_move and brightness_move_to_level [#68](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/68)\nfixer lorsque friendly_name `/` contient",
|
|
78
|
-
"it": "aggiunto corretta gestione di move_to_saturation, hue_move e luminosità_move_to_level [#68](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/68)\nfissare quando amichevole_name `/` contiene",
|
|
79
|
-
"es": "añadido correcto manejo de move_to_saturation, hue_move and brightness_move_to_level [#68](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/68)\narreglar cuando friendly_name `/ contiene",
|
|
80
|
-
"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ć",
|
|
81
|
-
"uk": "додано правильну обробку рухом_to_saturation, hue_move_move_to_level [#68](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/68)\nфіксація при дружній_ім`я `/` в наявності",
|
|
82
|
-
"zh-cn": "进一步正确地处理搬迁问题:流向、障碍和光明_move_to_级[#68](http://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/68)\nfix 友好时的名称:“/” 内载"
|
|
83
|
-
},
|
|
84
|
-
"2.4.1": {
|
|
85
|
-
"en": "fix based on [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
|
|
86
|
-
"de": "(https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
|
|
87
|
-
"ru": "исправить на [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
|
|
88
|
-
"pt": "correção com base em [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#comment-1316656378)",
|
|
89
|
-
"nl": "quality over Quantity Releases Vertaling:",
|
|
90
|
-
"fr": "fix based on [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
|
|
91
|
-
"it": "fix based on [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
|
|
92
|
-
"es": "fijado basado en [review](https://github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656378)",
|
|
93
|
-
"pl": "recenzent oparty na przeglądzie (https:/github.com/ioBroker/ioBroker.repositories/pull/1976#issuecomment-1316656363636378)",
|
|
94
|
-
"uk": "javaScript licenses API Веб-сайт Go1.13.8",
|
|
95
|
-
"zh-cn": "fix 基于[审查](http://github.com/ioBroker/ioBroker.reories/pull/1976#issuement-1316656378)"
|
|
96
96
|
}
|
|
97
97
|
},
|
|
98
98
|
"titleLang": {
|
|
@@ -141,7 +141,7 @@
|
|
|
141
141
|
"readme": "https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/blob/main/README.md",
|
|
142
142
|
"loglevel": "info",
|
|
143
143
|
"mode": "daemon",
|
|
144
|
-
"type": "
|
|
144
|
+
"type": "hardware",
|
|
145
145
|
"compact": true,
|
|
146
146
|
"connectionType": "local",
|
|
147
147
|
"dataSource": "push",
|
|
@@ -184,6 +184,8 @@
|
|
|
184
184
|
"connectionType": "ws",
|
|
185
185
|
"wsServerIP": "",
|
|
186
186
|
"wsServerPort": 8080,
|
|
187
|
+
"wsTokenEnabled": false,
|
|
188
|
+
"wsToken": "",
|
|
187
189
|
"dummyMqtt": false,
|
|
188
190
|
"externalMqttServerIP": "",
|
|
189
191
|
"externalMqttServerPort": 1883,
|
|
@@ -197,7 +199,8 @@
|
|
|
197
199
|
"useKelvin": false,
|
|
198
200
|
"colorTempSyncColor": false,
|
|
199
201
|
"brightnessMoveOnOff": false,
|
|
200
|
-
"brightnessStepOnOff": false
|
|
202
|
+
"brightnessStepOnOff": false,
|
|
203
|
+
"useEventInDesc": true
|
|
201
204
|
},
|
|
202
205
|
"objects": [],
|
|
203
206
|
"instanceObjects": [
|
package/lib/deviceController.js
CHANGED
|
@@ -207,22 +207,31 @@ class DeviceController {
|
|
|
207
207
|
|
|
208
208
|
async createOrUpdateDevices() {
|
|
209
209
|
for (const device of this.groupCache.concat(this.deviceCache)) {
|
|
210
|
-
let deviceName =
|
|
210
|
+
let deviceName = await this.getDeviceName(device);
|
|
211
|
+
let description = await this.getDeviceDescription(device);
|
|
211
212
|
|
|
212
213
|
if (deviceName == '' && device.description) {
|
|
213
214
|
deviceName = device.description;
|
|
215
|
+
description = '';
|
|
214
216
|
}
|
|
215
217
|
|
|
216
218
|
// Manipulate deviceName if the device is disabled, so the update of the device is triggered as well
|
|
217
219
|
if (device.disabled && device.disabled == true) {
|
|
218
|
-
|
|
220
|
+
if (this.config.useEventInDesc == true) {
|
|
221
|
+
description = 'Device is disabled!';
|
|
222
|
+
}
|
|
223
|
+
else {
|
|
224
|
+
deviceName = `[Disabled] ${deviceName}`;
|
|
225
|
+
}
|
|
226
|
+
|
|
219
227
|
}
|
|
220
228
|
|
|
221
|
-
if (!this.createCache[device.ieee_address] || this.createCache[device.ieee_address].name != deviceName) {
|
|
229
|
+
if (!this.createCache[device.ieee_address] || this.createCache[device.ieee_address].name != deviceName || this.createCache[device.ieee_address].description != description) {
|
|
222
230
|
const deviceObj = {
|
|
223
231
|
type: 'device',
|
|
224
232
|
common: {
|
|
225
233
|
name: deviceName,
|
|
234
|
+
desc: description
|
|
226
235
|
},
|
|
227
236
|
|
|
228
237
|
native: {}
|
|
@@ -242,7 +251,7 @@ class DeviceController {
|
|
|
242
251
|
|
|
243
252
|
//@ts-ignore
|
|
244
253
|
await this.adapter.extendObjectAsync(device.ieee_address, deviceObj);
|
|
245
|
-
this.createCache[device.ieee_address] = { name: deviceName };
|
|
254
|
+
this.createCache[device.ieee_address] = { name: deviceName, description: description };
|
|
246
255
|
}
|
|
247
256
|
|
|
248
257
|
// Here it is checked whether the scenes match the current data from z2m.
|
|
@@ -280,6 +289,8 @@ class DeviceController {
|
|
|
280
289
|
|
|
281
290
|
processRemoveEvent(messageObj) {
|
|
282
291
|
let ieee_address = undefined;
|
|
292
|
+
let description = '';
|
|
293
|
+
let deviceName = '';
|
|
283
294
|
if (messageObj.payload && messageObj.payload.type == 'device_leave') {
|
|
284
295
|
ieee_address = messageObj.payload.data.ieee_address;
|
|
285
296
|
}
|
|
@@ -289,12 +300,26 @@ class DeviceController {
|
|
|
289
300
|
const device = this.deviceCache.find(x => x.id == messageObj.payload.data.id);
|
|
290
301
|
if (device) {
|
|
291
302
|
ieee_address = device.ieee_address;
|
|
303
|
+
deviceName = this.getDeviceName(device);
|
|
292
304
|
}
|
|
293
305
|
}
|
|
294
306
|
|
|
295
307
|
if (ieee_address != undefined) {
|
|
296
308
|
this.adapter.setState(`${ieee_address}.available`, false, true);
|
|
297
|
-
this.
|
|
309
|
+
deviceName = this.createCache[ieee_address].name;
|
|
310
|
+
|
|
311
|
+
if (this.config.useEventInDesc == true) {
|
|
312
|
+
description = 'Device was removed!';
|
|
313
|
+
}
|
|
314
|
+
else {
|
|
315
|
+
deviceName = `[Removed] ${deviceName}`;
|
|
316
|
+
}
|
|
317
|
+
this.adapter.extendObject(`${ieee_address}`, {
|
|
318
|
+
common: {
|
|
319
|
+
name: deviceName,
|
|
320
|
+
desc: description
|
|
321
|
+
}
|
|
322
|
+
});
|
|
298
323
|
delete this.createCache[ieee_address];
|
|
299
324
|
}
|
|
300
325
|
}
|
|
@@ -326,6 +351,14 @@ class DeviceController {
|
|
|
326
351
|
}
|
|
327
352
|
return iobState;
|
|
328
353
|
}
|
|
354
|
+
|
|
355
|
+
getDeviceName(device) {
|
|
356
|
+
return device.id == device.ieee_address ? '' : device.id;
|
|
357
|
+
}
|
|
358
|
+
|
|
359
|
+
getDeviceDescription(device) {
|
|
360
|
+
return device.description ? device.description : '';
|
|
361
|
+
}
|
|
329
362
|
}
|
|
330
363
|
|
|
331
364
|
module.exports = {
|
package/lib/exposes.js
CHANGED
|
@@ -632,6 +632,30 @@ function createDeviceFromExposes(devicesMessag, config) {
|
|
|
632
632
|
break;
|
|
633
633
|
}
|
|
634
634
|
|
|
635
|
+
// Support for DIYRuZ Device
|
|
636
|
+
const wildcardValues = expose.values.filter(x => x.startsWith('*'));
|
|
637
|
+
if (wildcardValues && wildcardValues.length > 0) {
|
|
638
|
+
for (const endpointName of [...new Set(definition.exposes.filter(x => x.endpoint).map(x => x.endpoint))]) {
|
|
639
|
+
for (const value of wildcardValues) {
|
|
640
|
+
const actionName = value.replace('*', endpointName);
|
|
641
|
+
pushToStates({
|
|
642
|
+
id: actionName,
|
|
643
|
+
prop: 'action',
|
|
644
|
+
name: `Triggered action ${value.replace('*_', endpointName)}`,
|
|
645
|
+
icon: undefined,
|
|
646
|
+
role: 'button',
|
|
647
|
+
write: false,
|
|
648
|
+
read: true,
|
|
649
|
+
type: 'boolean',
|
|
650
|
+
def: false,
|
|
651
|
+
isEvent: true,
|
|
652
|
+
getter: payload => (payload.action === actionName) ? true : undefined,
|
|
653
|
+
}, expose.access);
|
|
654
|
+
}
|
|
655
|
+
}
|
|
656
|
+
break;
|
|
657
|
+
}
|
|
658
|
+
|
|
635
659
|
const hasHold = expose.values.find((actionName) => actionName.includes('hold'));
|
|
636
660
|
const hasRelease = expose.values.find((actionName) => actionName.includes('release'));
|
|
637
661
|
|
package/lib/messages.js
CHANGED
|
@@ -7,6 +7,7 @@ async function adapterInfo(config, log) {
|
|
|
7
7
|
if (config.connectionType == 'ws') {
|
|
8
8
|
log.info(`|| Zigbee2MQTT Websocket Server: ${config.wsServerIP}`);
|
|
9
9
|
log.info(`|| Zigbee2MQTT Websocket Port: ${config.wsServerPort}`);
|
|
10
|
+
log.info(`|| Zigbee2MQTT Websocket Auth-Token: ${config.wsTokenEnabled ? 'use' : 'unused'}`);
|
|
10
11
|
log.info(`|| Zigbee2MQTT Websocket Dummy MQTT-Server: ${config.dummyMqtt ? 'activated' : 'deactivated'}`);
|
|
11
12
|
if (config.dummyMqtt == true) {
|
|
12
13
|
log.info(`|| Zigbee2MQTT Dummy MQTT IP-Bind: ${config.mqttServerIPBind}`);
|
|
@@ -13,7 +13,13 @@ class WebsocketController {
|
|
|
13
13
|
|
|
14
14
|
initWsClient() {
|
|
15
15
|
try {
|
|
16
|
-
|
|
16
|
+
let wsURL = `ws://${this.adapter.config.wsServerIP}:${this.adapter.config.wsServerPort}/api`;
|
|
17
|
+
|
|
18
|
+
if (this.adapter.config.wsTokenEnabled == true) {
|
|
19
|
+
wsURL += `?token=${this.adapter.config.wsToken}`;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
wsClient = new WebSocket(wsURL);
|
|
17
23
|
|
|
18
24
|
wsClient.on('open', () => {
|
|
19
25
|
// Send ping to server
|
|
@@ -66,7 +72,7 @@ class WebsocketController {
|
|
|
66
72
|
pingTimeout = setTimeout(() => {
|
|
67
73
|
this.adapter.log.warn('Websocked connection timed out');
|
|
68
74
|
wsClient.terminate();
|
|
69
|
-
}, wsHeartbeatIntervall +
|
|
75
|
+
}, wsHeartbeatIntervall + 3000);
|
|
70
76
|
}
|
|
71
77
|
|
|
72
78
|
async autoRestart() {
|
package/main.js
CHANGED
|
@@ -128,7 +128,6 @@ class Zigbee2mqtt extends core.Adapter {
|
|
|
128
128
|
wsClient.on('close', async () => {
|
|
129
129
|
this.setStateChanged('info.connection', false, true);
|
|
130
130
|
await statesController.setAllAvailableToFalse();
|
|
131
|
-
this.log.warn('Websocket disconnected');
|
|
132
131
|
});
|
|
133
132
|
}
|
|
134
133
|
|
|
@@ -224,15 +223,36 @@ class Zigbee2mqtt extends core.Adapter {
|
|
|
224
223
|
if (mqttClient && !mqttClient.closed) {
|
|
225
224
|
mqttClient.close();
|
|
226
225
|
}
|
|
227
|
-
mqttServerController.closeServer();
|
|
228
226
|
websocketController.closeConnection();
|
|
227
|
+
} catch (e) {
|
|
228
|
+
this.log.error(e);
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
try {
|
|
232
|
+
mqttServerController.closeServer();
|
|
233
|
+
} catch (e) {
|
|
234
|
+
this.log.error(e);
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
try {
|
|
229
238
|
await statesController.setAllAvailableToFalse();
|
|
239
|
+
} catch (e) {
|
|
240
|
+
this.log.error(e);
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
try {
|
|
230
244
|
await websocketController.allTimerClear();
|
|
245
|
+
} catch (e) {
|
|
246
|
+
this.log.error(e);
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
try {
|
|
231
250
|
await statesController.allTimerClear();
|
|
232
|
-
callback();
|
|
233
251
|
} catch (e) {
|
|
234
|
-
|
|
252
|
+
this.log.error(e);
|
|
235
253
|
}
|
|
254
|
+
|
|
255
|
+
callback();
|
|
236
256
|
}
|
|
237
257
|
|
|
238
258
|
async onStateChange(id, state) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.zigbee2mqtt",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.7.1",
|
|
4
4
|
"description": "Zigbee2MQTT adapter for ioBroker",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Dennis Rathjen",
|
|
@@ -42,11 +42,11 @@
|
|
|
42
42
|
"@types/sinon-chai": "^3.2.9",
|
|
43
43
|
"chai": "^4.3.7",
|
|
44
44
|
"chai-as-promised": "^7.1.1",
|
|
45
|
-
"eslint": "^8.
|
|
45
|
+
"eslint": "^8.32.0",
|
|
46
46
|
"eslint-config-prettier": "^8.6.0",
|
|
47
47
|
"eslint-plugin-prettier": "^4.2.1",
|
|
48
48
|
"mocha": "^10.2.0",
|
|
49
|
-
"prettier": "^2.8.
|
|
49
|
+
"prettier": "^2.8.3",
|
|
50
50
|
"proxyquire": "^2.1.3",
|
|
51
51
|
"sinon": "^15.0.1",
|
|
52
52
|
"sinon-chai": "^3.7.0",
|