iobroker.zigbee2mqtt 3.0.3 → 3.0.5

package/README.md

@@ -22,6 +22,14 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
 [Adapter Documentation](https://github.com/arteck/ioBroker.zigbee2mqtt/blob/main/docs/wiki.md)
 
 ## Changelog
+### 3.0.5 (2025-05-29)
+-   (arteck) add additional folder for some devices (like smoke detector)
+-   (arteck) state.js cleanup
+-   (arteck) set available State to true if device message include last_seen status
+
+### 3.0.4 (2025-05-11)
+-   (arteck) update admin
+
 ### 3.0.3 (2025-02-03)
 -   (arteck) corr illuminance (del illuminance_raw)
 -   (arteck) indicator.alarm.flood

package/admin/i18n/de/translations.json

@@ -44,6 +44,7 @@
     "Time of the automatic check": "Zeitpunkt der automatischen Prüfung",
     "More information": "Mehr Informationen",
     "Expert Settings. Please only use if you know what you're doing": "Expert Einstellungen. Bitte nur verwenden, wenn Du weisst was du machst",
-	"Allways update state for occupancy when message arrives from zigbee2mqtt server (Only for true state). Increases load on ioBroker System" : "Aktualisiert immer den Status für die Bewegung, wenn eine Nachricht vom zigbee2mqtt-Server eintrifft (nur bei true). Erhöht die Last auf dem ioBroker"
-}
+  	"Allways update state for occupancy when message arrives from zigbee2mqtt server (Only for true state). Increases load on ioBroker System" : "Aktualisiert immer den Status für die Bewegung, wenn eine Nachricht vom zigbee2mqtt-Server eintrifft (nur bei true). Erhöht die Last auf dem ioBroker",
+    "Allways update available state when message included last_seen status": "Aktualisiert immer den available Status, wenn die Nachricht last_seen Status enthält"
+
 }

package/admin/i18n/en/translations.json

@@ -44,5 +44,6 @@
 	"Time of the automatic check": "Time of the automatic check",
 	"More information": "More information",
 	"Expert Settings. Please only use if you know what you're doing": "Expert Settings. Please only use if you know what you're doing",
-	"Allways update state for occupancy when message arrives from zigbee2mqtt server (Only for true state). Increases load on ioBroker System" : "Allways update state for occupancy when message arrives from zigbee2mqtt server (Only for true state). Increases load on ioBroker System"
+	"Allways update state for occupancy when message arrives from zigbee2mqtt server (Only for true state). Increases load on ioBroker System" : "Allways update state for occupancy when message arrives from zigbee2mqtt server (Only for true state). Increases load on ioBroker System",
+	"Allways update available state when message included last_seen status": "Allways update available state when message included last_seen status"
 }

package/admin/i18n/fr/translations.json

@@ -42,5 +42,6 @@
     "Automatic check for missing routers in the coordinator memory.": "Vérification automatique des routeurs manquants dans la mémoire du coordinateur.",
     "With which log level should a negative search be logged?": "Avec quel niveau de journalisation une recherche négative doit-elle être enregistrée ?",
     "Time of the automatic check": "Heure du contrôle automatique",
-    "More information": "Plus d'information"
+    "More information": "Plus d'information",
+    "Allways update available state when message included last_seen status": "Mettre à jour l'état disponible lorsque le message inclut le statut last_seen"
 }

package/admin/i18n/it/translations.json

@@ -42,5 +42,6 @@
     "Automatic check for missing routers in the coordinator memory.": "Controllo automatico della presenza di router mancanti nella memoria del coordinatore.",
     "With which log level should a negative search be logged?": "Con quale livello di registro deve essere registrata una ricerca negativa?",
     "Time of the automatic check": "Orario del controllo automatico",
-    "More information": "Maggiori informazioni"
+    "More information": "Maggiori informazioni",
+    "Allways update available state when message included last_seen status": "Aggiorna sempre lo stato disponibile quando il messaggio include lo stato last_seen"
 }

package/admin/i18n/nl/translations.json

@@ -42,5 +42,6 @@
     "Automatic check for missing routers in the coordinator memory.": "Automatische controle op ontbrekende routers in het coördinatorgeheugen.",
     "With which log level should a negative search be logged?": "Met welk logniveau moet een negatieve zoekopdracht worden geregistreerd?",
     "Time of the automatic check": "Tijdstip van de automatische controle",
-    "More information": "Meer informatie"
+    "More information": "Meer informatie",
+    "Allways update available state when message included last_seen status": "Altijd de beschikbare status bijwerken wanneer het bericht de last_seen-status bevat"
 }

package/admin/i18n/pl/translations.json

@@ -42,5 +42,6 @@
     "Automatic check for missing routers in the coordinator memory.": "Automatyczne sprawdzanie brakujących routerów w pamięci koordynatora.",
     "With which log level should a negative search be logged?": "Na jakim poziomie rejestrowania należy rejestrować wyszukiwanie wykluczające?",
     "Time of the automatic check": "Czas automatycznego sprawdzenia",
-    "More information": "Więcej informacji"
+    "More information": "Więcej informacji",
+    "Allways update available state when message included last_seen status": "Zawsze aktualizuj available stan, gdy wiadomość zawiera status last_seen"
 }

package/admin/i18n/pt/translations.json

@@ -42,5 +42,6 @@
     "Automatic check for missing routers in the coordinator memory.": "Verificação automática de roteadores ausentes na memória do coordenador.",
     "With which log level should a negative search be logged?": "Com qual nível de log uma pesquisa negativa deve ser registrada?",
     "Time of the automatic check": "Hora da verificação automática",
-    "More information": "Mais Informações"
+    "More information": "Mais Informações",
+    "Allways update available state when message included last_seen status": "Sempre atualize o estado disponível quando a mensagem incluir o status last_seen"
 }

package/admin/i18n/ru/translations.json

@@ -42,5 +42,6 @@
     "Automatic check for missing routers in the coordinator memory.": "Автоматическая проверка отсутствия роутеров в памяти координатора.",
     "With which log level should a negative search be logged?": "На каком уровне журнала следует регистрировать отрицательный поиск?",
     "Time of the automatic check": "Время автоматической проверки",
-    "More information": "Больше информации"
+    "More information": "Больше информации",
+    "Allways update available state when message included last_seen status": "Всегда обновляйте доступное состояние, когда сообщение включает статус last_seen"
 }

package/admin/i18n/uk/translations.json

@@ -42,5 +42,6 @@
     "Automatic check for missing routers in the coordinator memory.": "Автоматична перевірка відсутності роутерів в пам'яті координатора.",
     "With which log level should a negative search be logged?": "На якому рівні журналу слід реєструвати негативний пошук?",
     "Time of the automatic check": "Час автоматичної перевірки",
-    "More information": "Більше інформації"
+    "More information": "Більше інформації",
+    "Allways update available state when message included last_seen status": "Завжди оновлюйте доступний стан, коли повідомлення містить статус last_seen"
 }

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

@@ -42,5 +42,6 @@
     "Automatic check for missing routers in the coordinator memory.": "自动检查协调器内存中丢失的路由器。",
     "With which log level should a negative search be logged?": "应该使用哪个日志级别来记录负面搜索？",
     "Time of the automatic check": "自动检查时间",
-    "More information": "更多信息"
+    "More information": "更多信息",
+    "Allways update available state when message included last_seen status": "当消息包含 last_seen 状态时，总是更新可用状态",
 }

package/admin/jsonConfig.json

@@ -10,7 +10,11 @@
 		},
 		"connectionType": {
 			"label": "Select connection to Zigbee2MQTT",
-			"sm": 5,
+			"xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"type": "select",
 			"options": [
 				{
@@ -31,11 +35,21 @@
 		"spacer01": {
 			"type": "staticText",
 			"text": "",
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"newLine": true
 		},
 		"wsHeader": {
 			"type": "staticText",
 			"text": "Configure your Zigbee2MQTT connection",
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"newLine": true
 		},
 		"wsScheme": {
@@ -52,11 +66,21 @@
 				}
 			],
 			"newLine": true,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"hidden": "data.connectionType != 'ws'"
 		},
 		"wsServerIP": {
 			"type": "text",
 			"label": "Websocket IP-Address",
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"newLine": false,
 			"hidden": "data.connectionType != 'ws'"
 		},
@@ -64,18 +88,33 @@
 			"type": "number",
 			"label": "Websocket Port",
 			"newLine": false,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"hidden": "data.connectionType != 'ws'"
 		},
 		"wsTokenEnabled": {
 			"type": "checkbox",
 			"label": "Use Auth-Token",
 			"newLine": true,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"hidden": "data.connectionType != 'ws'"
 		},
 		"wsToken": {
 			"type": "password",
 			"label": "Auth-Token (special characters are not supported)",
 			"newLine": true,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"lg": 5,
 			"hidden": "data.wsTokenEnabled != true || data.connectionType != 'ws'"
 		},
@@ -83,36 +122,66 @@
 			"type": "checkbox",
 			"label": "Create a dummy MQTT-Server for Zigbee2MQTT",
 			"newLine": true,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"hidden": "data.connectionType != 'ws'"
 		},
 		"externalMqttServerIP": {
 			"type": "text",
 			"label": "External MQTT-Server IP-Address",
 			"newLine": true,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"hidden": "data.connectionType != 'exmqtt'"
 		},
 		"externalMqttServerPort": {
 			"type": "number",
 			"label": "External MQTT-Server Port",
 			"newLine": false,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"hidden": "data.connectionType != 'exmqtt'"
 		},
 		"externalMqttServerCredentials": {
 			"type": "checkbox",
 			"label": "Use MQTT Credentials",
 			"newLine": true,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"hidden": "data.connectionType != 'exmqtt'"
 		},
 		"externalMqttServerUsername": {
 			"type": "text",
 			"label": "MQTT Username",
 			"newLine": true,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"hidden": "data.externalMqttServerCredentials != true ||data.connectionType != 'exmqtt'"
 		},
 		"externalMqttServerPassword": {
 			"type": "password",
 			"label": "MQTT Password",
 			"newLine": false,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"visible": true,
 			"hidden": "data.externalMqttServerCredentials != true ||data.connectionType != 'exmqtt'"
 		},
@@ -120,12 +189,22 @@
 			"type": "ip",
 			"label": "MQTT-Server IP-Address bind",
 			"listenOnAllPorts": true,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"newLine": true,
 			"hidden": "data.connectionType == 'exmqtt' || data.dummyMqtt == false && data.connectionType == 'ws'"
 		},
 		"mqttServerPort": {
 			"type": "number",
 			"label": "MQTT-Server Port",
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"newLine": false,
 			"hidden": "data.connectionType == 'exmqtt' || data.dummyMqtt == false && data.connectionType == 'ws'"
 		},
@@ -154,16 +233,31 @@
 					"value": "https"
 				}
 			],
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"newLine": true
 		},
 		"webUIServer": {
 			"type": "text",
 			"label": "WebUi Address",
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"newLine": false
 		},
 		"webUIPort": {
 			"type": "number",
 			"label": "WebUi Port",
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"newLine": false
 		},
 		"spacer03": {
@@ -237,6 +331,11 @@
 			"type": "number",
 			"label": "Size of the object icons in pixels",
 			"min": 8,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"newLine": true
 		},
 		"otherHeader": {
@@ -283,6 +382,11 @@
 				}
 			],
 			"newLine": true,
+      "xs": 12,
+      "sm": 12,
+      "md": 6,
+      "lg": 4,
+      "xl": 4,
 			"hidden": "data.coordinatorCheck != true"
 		},
 		"coordinatorCheckCron": {
@@ -320,6 +424,11 @@
 			"type": "checkbox",
 			"label": "Allways update state for occupancy when message arrives from zigbee2mqtt server (Only for true state). Increases load on ioBroker System",
 			"newLine": true
+		},
+		"allwaysUpdateAvailableState": {
+			"type": "checkbox",
+			"label": "Allways update available state when message included last_seen status",
+			"newLine": true
 		}
 	}
 }

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "zigbee2mqtt",
-    "version": "3.0.3",
+    "version": "3.0.5",
     "news": {
+      "3.0.5": {
+        "en": "add additional folder for some devices (like smoke detector)\nstate.js cleanup\nset available State to true if device message include last_seen status",
+        "de": "zusätzliche ordner für einige geräte hinzufügen (wie rauchmelder)\nstate.js cleanup\neingestellt verfügbar Zustand, um wahr zu sein, wenn die Gerätenachricht last_seen status enthält",
+        "ru": "добавьте дополнительную папку для некоторых устройств (например, детектор дыма)\nочистка state.js\nустановленное состояние истинно, если сообщение устройства включает в себя статус last_seen",
+        "pt": "adicionar pasta adicional para alguns dispositivos (como detector de fumaça)\nlimpeza state.js\nset available Estado para true se a mensagem do dispositivo incluir status last_seen",
+        "nl": "extra map toevoegen voor sommige apparaten (zoals rookmelder)\nstate.js opruimen\nbeschikbare status instellen op true als apparaatbericht laatste_geziene status bevat",
+        "fr": "ajouter un dossier supplémentaire pour certains appareils (comme le détecteur de fumée)\nétat.js nettoyage\ndéfinir l'État disponible à true si le message de périphérique inclut le statut last_seen",
+        "it": "aggiungere cartella aggiuntiva per alcuni dispositivi (come rilevatore di fumo)\nstato.js pulizia\nse il messaggio del dispositivo include lo stato di last_seen",
+        "es": "añadir carpeta adicional para algunos dispositivos (como detector de humos)\nestado.js limpieza\nestado disponible para ver si el mensaje del dispositivo incluye el estado de último visto",
+        "pl": "dodaj dodatkowy folder dla niektórych urządzeń (np. czujnik dymu)\nstan. js cleanup\nustaw dostępny stan na true jeśli wiadomość urządzenia zawiera status last _ seen",
+        "uk": "додати додаткову папку для деяких пристроїв (наприклад, детектор диму)\nстан.js cleanup\nвстановити доступну державу, якщо повідомлення про пристрій включають статус останнього_seen",
+        "zh-cn": "为一些设备添加额外的文件夹( 如烟雾探测器)\n状态.js 清理\n如果设备消息包含最后的_ Seenn 状态, 将可用状态设定为 true"
+      },
+      "3.0.4": {
+        "en": "update admin",
+        "de": "admin",
+        "ru": "обновление admin",
+        "pt": "atualização admin",
+        "nl": "admin bijwerken",
+        "fr": "mettre à jour l'administrateur",
+        "it": "aggiornamento",
+        "es": "actualización admin",
+        "pl": "aktualizacja admin",
+        "uk": "оновлення адмін",
+        "zh-cn": "更新管理员"
+      },
       "3.0.3": {
         "en": "corr illuminance (del illuminance_raw)\nindicator.alarm.flood",
         "de": "korr illuminance (del illuminance_raw)\nindikator.alarm.flood",
@@ -67,32 +93,6 @@
         "pl": "corr package.json",
         "uk": "english, українська, français..",
         "zh-cn": "corr 软件包.json"
-      },
-      "2.13.10": {
-        "en": "update dependecy\nadd available object for groups",
-        "de": "aktualisierung abhängigkeit\nobjekt für gruppen hinzufügen",
-        "ru": "обновление\nдобавить доступный объект для групп",
-        "pt": "atualização\nadicionar objeto disponível para grupos",
-        "nl": "afhankelijkheid bijwerken\nbeschikbaar object voor groepen toevoegen",
-        "fr": "mettre à jour la dépendance\najouter un objet disponible pour les groupes",
-        "it": "aggiornamento dipendenza\naggiungere oggetto disponibile per gruppi",
-        "es": "dependencia de actualización\nañadir objeto disponible para grupos",
-        "pl": "aktualizacja zależności\ndodaj dostępny obiekt dla grup",
-        "uk": "оновлення залежності\nдодати доступний об'єкт для груп",
-        "zh-cn": "更新依赖性\n为组添加可用对象"
-      },
-      "2.13.9": {
-        "en": "fix lint\nupdate dependecy",
-        "de": "lint zu entfernen\naktualisierung abhängigkeit",
-        "ru": "фиксация линта\nобновление",
-        "pt": "forro de correção\natualização",
-        "nl": "fix pluis\nafhankelijkheid bijwerken",
-        "fr": "fixer le lint\nmettre à jour la dépendance",
-        "it": "fissaggio lunetta\naggiornamento dipendenza",
-        "es": "\ndependencia de actualización",
-        "pl": "fix lint\naktualizacja zależności",
-        "uk": "засупу 10 ток\nоновлення залежності",
-        "zh-cn": "修正线\n更新依赖性"
       }
     },
     "messages": [
@@ -226,9 +226,10 @@
     ],
     "globalDependencies": [
       {
-        "admin": ">=5.1.13"
+        "admin": ">=6.6.14"
       }
-    ]
+    ],
+    "installedFrom": "iobroker.zigbee2mqtt@3.0.4"
   },
   "native": {
     "connectionType": "ws",
@@ -263,7 +264,8 @@
     "coordinatorCheck": false,
     "coordinatorCheckLogLvl": "info",
     "coordinatorCheckCron": "0 3 * * *",
-    "allwaysUpdateOccupancyState": false
+    "allwaysUpdateOccupancyState": false,
+    "allwaysUpdateAvailableState": false
   },
   "protectedNative": [
     "externalMqttServerPassword",

package/lib/deviceController.js

@@ -1,4 +1,4 @@
-const states = require('./states').states;
+const statesDefs = require('./states').states;
 const createDeviceFromExposes = require('./exposes').createDeviceFromExposes;
 const utils = require('./utils');
 const colors = require('./colors.js');
@@ -55,10 +55,10 @@ class DeviceController {
             icon: undefined, //  await imageController.getDeviceIcon(devicesMessag), device.definition.model
             optionsValues: {},
             states: [
-                states.available,
-                states.brightness,
-                states.colortemp_move,
-                states.transition,
+                statesDefs.available,
+                statesDefs.brightness,
+                statesDefs.colortemp_move,
+                statesDefs.transition,
                 {
                     id: 'state',
                     prob: 'state',

package/lib/exposes.js

@@ -1144,7 +1144,7 @@ async function createDeviceFromExposes(devicesMessag, adapter) {
                                 break;
 
                             case 'battery_low':
-                                state = statesDefs.heiman_batt_low;
+                                state = statesDefs.batt_low_t_f;
                                 break;
 
                             case 'tamper':
@@ -1152,7 +1152,7 @@ async function createDeviceFromExposes(devicesMessag, adapter) {
                                 break;
 
                             case 'water_leak':
-                                state = statesDefs.water_detected;
+                                state = statesDefs.water_leak;
                                 break;
 
                             case 'lock':
@@ -1220,10 +1220,10 @@ async function createDeviceFromExposes(devicesMessag, adapter) {
                                 pushToStates(statesDefs.climate_running_mode, prop.access);
                                 break;
                             case 'local_temperature':
-                                pushToStates(statesDefs.hvacThermostat_local_temp, prop.access);
+                                pushToStates(statesDefs.local_temperature, prop.access);
                                 break;
                             case 'local_temperature_calibration':
-                                pushToStates(statesDefs.hvacThermostat_local_temp_calibration, prop.access);
+                                pushToStates(statesDefs.local_temperature_calibration, prop.access);
                                 break;
                             default:
                                 {