iobroker.zigbee2mqtt 2.13.11 → 3.0.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024  Arthur Rupp <arteck@outlook.com>,
+Copyright (c) 2025  Arthur Rupp <arteck@outlook.com>,
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -22,6 +22,9 @@ 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.0 (2025-01-04)
+-   (arteck) adaptation z2m 2.x
+
 ### 2.13.11 (2024-10-17)
 -   (arteck) corr package.json
 
@@ -254,7 +257,7 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
 
 MIT License
 
-Copyright (c) 2024 Arthur Rupp <arteck@outlook.com>,
+Copyright (c) 2025 Arthur Rupp <arteck@outlook.com>,
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/admin/i18n/de/translations.json

@@ -42,5 +42,8 @@
     "Automatic check for missing routers in the coordinator memory.": "Automatische Prüfung auf fehlende Router im Speicher des Koordinators.",
     "With which log level should a negative search be logged?": "Mit welcher Loglevel soll ein negatives Suchergebnis protokolliert werden?",
     "Time of the automatic check": "Zeitpunkt der automatischen Prüfung",
-    "More information": "Mehr Informationen"
+    "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"
+}
 }

package/admin/i18n/en/translations.json

@@ -42,5 +42,7 @@
 	"Automatic check for missing routers in the coordinator memory.": "Automatic check for missing routers in the coordinator memory.",
 	"With which log level should a negative search be logged?": "With which log level should a negative search be logged?",
 	"Time of the automatic check": "Time of the automatic check",
-	"More information": "More information"
+	"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"
 }

package/admin/jsonConfig.json

@@ -113,6 +113,7 @@
 			"type": "password",
 			"label": "MQTT Password",
 			"newLine": false,
+			"visible": true,
 			"hidden": "data.externalMqttServerCredentials != true ||data.connectionType != 'exmqtt'"
 		},
 		"mqttServerIPBind": {

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee2mqtt",
-    "version": "2.13.11",
+    "version": "3.0.0",
     "news": {
+      "3.0.0": {
+        "en": "adaptation z2m 2.x",
+        "de": "anpassung z2m 2.x",
+        "ru": "адаптация z2m 2.x",
+        "pt": "adaptação z2m 2.x",
+        "nl": "aanpassing z2m 2.x",
+        "fr": "adaptation z2m 2.x",
+        "it": "adattamento z2m 2.x",
+        "es": "adaptación z2m 2.x",
+        "pl": "adaptacja z2m 2.x",
+        "uk": "адаптація z2m 2.x",
+        "zh-cn": "适应z2m 2.x"
+      },
       "2.13.11": {
         "en": "corr package.json",
         "de": "korr paket.json",
@@ -67,32 +80,6 @@
         "pl": "zasadnicza zależność\naktualizacja zależności\nWłącz zawsze aktualizację obłożenia, jeśli jest prawdziwe",
         "uk": "сердечник\nоновлення залежності\nУвімкнути можливість постійно оновлюватися, якщо правда",
         "zh-cn": "核心依赖性\n更新依赖性\n启用若为真则总是更新占用"
-      },
-      "2.13.6": {
-        "en": "update dependecy",
-        "de": "aktualisierung abhängigkeit",
-        "ru": "обновление",
-        "pt": "atualização",
-        "nl": "afhankelijkheid bijwerken",
-        "fr": "mettre à jour la dépendance",
-        "it": "aggiornamento dipendenza",
-        "es": "dependencia de actualización",
-        "pl": "aktualizacja zależności",
-        "uk": "оновлення залежності",
-        "zh-cn": "更新依赖性"
-      },
-      "2.13.5": {
-        "en": "fixed mqttClient.end()",
-        "de": "mqttClient.end()",
-        "ru": "фиксированный mqtClient.end()",
-        "pt": "fixo mqttClient.end()",
-        "nl": "vaste mqttClient.end()",
-        "fr": "mqttClient.end() fixe",
-        "it": "fisso mqttClient.end()",
-        "es": "mqttClient.end()",
-        "pl": "stałe mqttClient.end ()",
-        "uk": "фіксований mqttClient.end()",
-        "zh-cn": "固定的 mqttClient.end ()"
       }
     },
     "messages": [
@@ -100,35 +87,35 @@
         "condition": {
           "operand": "and",
           "rules": [
-            "oldVersion<2.10.0",
-            "newVersion>=2.10.0"
+            "oldVersion<=2.13.11",
+            "newVersion>=3.0.0"
           ]
         },
         "title": {
-          "en": "Important notice!",
-          "de": "Wichtiger Hinweis!",
-          "ru": "Важное замечание!",
-          "pt": "Notícia importante!",
-          "nl": "Belangrijke mededeling!",
-          "fr": "Avis important!",
-          "it": "Avviso IMPORTANTE!",
-          "es": "¡Noticia importante!",
-          "pl": "Ważna uwaga!",
-          "uk": "Важливе повідомлення!",
-          "zh-cn": "重要的提醒！"
+          "en": "Important notice! zigbee2mqtt 2.0",
+          "de": "Wichtiger Hinweis! zigbee2mqtt 2.0",
+          "ru": "Важное замечание! zigbee2mqtt 2.0",
+          "pt": "Notícia importante! zigbee2mqtt 2.0",
+          "nl": "Belangrijke mededeling! zigbee2mqtt 2.0",
+          "fr": "Avis important! zigbee2mqtt 2.0",
+          "it": "Avviso IMPORTANTE! zigbee2mqtt 2.0",
+          "es": "¡Noticia importante! zigbee2mqtt 2.0",
+          "pl": "Ważna uwaga! zigbee2mqtt 2.0",
+          "uk": "Важливе повідомлення! zigbee2mqtt 2.0",
+          "zh-cn": "重要的提醒！ zigbee2mqtt 2.0"
         },
         "text": {
-          "en": "After the update, the Websocket Auth-Token must be set again, if used.",
-          "de": "Nach dem Update muss der Websocket Auth-Token, falls verwendet, erneut gesetzt werden.",
-          "ru": "После обновления необходимо снова установить Auth-Token Websocket, если он используется.",
-          "pt": "Após a atualização, o Websocket Auth-Token deve ser configurado novamente, caso seja utilizado.",
-          "nl": "Na de update moet het Websocket Auth-Token, indien gebruikt, opnieuw worden ingesteld.",
-          "fr": "Après la mise à jour, le jeton d'authentification Websocket doit être à nouveau défini, s'il est utilisé.",
-          "it": "Dopo l'aggiornamento, il Websocket Auth-Token deve essere reimpostato, se utilizzato.",
-          "es": "Después de la actualización, el token de autenticación de Websocket debe configurarse nuevamente, si se usa.",
-          "pl": "Po aktualizacji należy ponownie ustawić Websocket Auth-Token, jeśli jest używany.",
-          "uk": "Після оновлення Websocket Auth-Token має бути встановлено знову, якщо він використовується.",
-          "zh-cn": "更新后，如果使用 Websocket Auth-Token，则必须重新设置。"
+          "en": "check zigbee2mqtt notification, for breaking changes\n (link: https://github.com/Koenkk/zigbee2mqtt/discussions/24198). \nhere are some object renamed and you have to adjust your scripts",
+          "de": "Prüfen Sie die zigbee2mqtt-Benachrichtigung, um Änderungen zu erkennen \n(Link: https://github.com/Koenkk/zigbee2mqtt/discussions/24198). \nEs wurden einige Objekte umbenannt und Sie müssen Ihre Skripte anpassen",
+          "ru": "проверьте уведомление zigbee2mqtt об изменениях\n (ссылка: https://github.com/Koenkk/zigbee2mqtt/discussions/24198). \nгде некоторые объекты переименованы, и вам придется скорректировать свои скрипты",
+          "pt": "verifique a notificação do zigbee2mqtt, para alterações de última hora \n(ligação: https://github.com/Koenkk/zigbee2mqtt/discussions/24198). \nAlguns objectos foram renomeados e é necessário ajustar os scripts",
+          "nl": "controleer de zigbee2mqtt melding voor wijzigingen \n(link: https://github.com/Koenkk/zigbee2mqtt/discussions/24198). \nEr zijn enkele objecten hernoemd en je moet je scripts aanpassen",
+          "fr": "Vérifiez la notification de zigbee2mqtt, pour les changements importants \n(lien : https://github.com/Koenkk/zigbee2mqtt/discussions/24198). \nIl y a des objets renommés et vous devez ajuster vos scripts.",
+          "it": "controllare la notifica di zigbee2mqtt, per le modifiche di rottura \n(link: https://github.com/Koenkk/zigbee2mqtt/discussions/24198). \nAlcuni oggetti sono stati rinominati e occorre modificare gli script.",
+          "es": "revisa la notificación de zigbee2mqtt, para cambios de última hora\n (enlace: https://github.com/Koenkk/zigbee2mqtt/discussions/24198). \nHay algunos objetos renombrados y tienes que ajustar tus scripts.",
+          "pl": "sprawdź powiadomienie zigbee2mqtt, aby uzyskać informacje o zmianach\n (link: https://github.com/Koenkk/zigbee2mqtt/discussions/24198). \nZmieniono nazwy niektórych obiektów i należy dostosować skrypty.",
+          "uk": "перевірте сповіщення zigbee2mqtt на наявність змін\n (посилання: https://github.com/Koenkk/zigbee2mqtt/discussions/24198). \nдеякі об'єкти перейменовано, і вам доведеться скоригувати свої скрипти",
+          "zh-cn": "check zigbee2mqtt notification, for breaking changes\n (link: https://github.com/Koenkk/zigbee2mqtt/discussions/24198). \nhere are some object renamed and you have to adjust your scripts"
         },
         "level": "warn",
         "buttons": [

package/lib/check.js

@@ -1,39 +1,48 @@
-function checkConfig(config, log) {
+function checkConfig(config, log, version) {
     const checkAPIOptions = {
         legacy_api_enabled: config.advanced.legacy_api != false,
         legacy_availability_payload_enabled: config.advanced.legacy_availability_payload != false,
-        device_legacy_enabled: config.device_options.legacy != false,
-        payload_contains_not_json: config.advanced.output != 'attribute_and_json' && config.advanced.output != 'json',
+        device_legacy_enabled: config.device_options.legacy != false
     };
 
-    if (Object.values(checkAPIOptions).filter((x) => x == true).length > 0) {
-        log.error('===================================================');
-        log.error('===================================================');
-        if (checkAPIOptions.legacy_api_enabled == true) {
-            log.error('Legacy api is activated, so the adapter can not work correctly!!!');
-            log.error('Please add the following lines to your Zigbee2MQTT configuration.yaml:');
-            log.error('advanced:');
-            log.error(' legacy_api: false');
-            log.error('');
-        }
-        if (checkAPIOptions.legacy_availability_payload_enabled == true) {
-            log.error(
-                'Legacy Availability Payload is activated, thus the adapter cannot represent the availability of the devices!!!'
-            );
-            log.error('Please add the following lines to your Zigbee2MQTT configuration.yaml:');
-            log.error('advanced:');
-            log.error('legacy_availability_payload: false');
-            log.error('');
-        }
-        if (checkAPIOptions.device_legacy_enabled == true) {
-            log.error(
-                'Device Legacy Payload is activated, therefore the adapter may process the states of the devices correctly!!!'
-            );
-            log.error('Please add the following lines to your Zigbee2MQTT configuration.yaml:');
-            log.error('device_options:');
-            log.error(' legacy: false');
+    const checkAPIOptionsOutput = {
+        payload_contains_not_json: config.advanced.output != 'attribute_and_json' && config.advanced.output != 'json'
+    };
+
+    if (version.startsWith('1.')) {      // wird in version 2.x immer auf false gesetzt sein
+        if (Object.values(checkAPIOptions).filter((x) => x == true).length > 0) {
+            log.error('===================================================');
+            log.error('===================================================');
+            if (checkAPIOptions.legacy_api_enabled == true) {
+                log.error('Legacy api is activated, so the adapter can not work correctly!!!');
+                log.error('Please add the following lines to your Zigbee2MQTT configuration.yaml:');
+                log.error('advanced:');
+                log.error(' legacy_api: false');
+                log.error('');
+            }
+            if (checkAPIOptions.legacy_availability_payload_enabled == true) {
+                log.error(
+                    'Legacy Availability Payload is activated, thus the adapter cannot represent the availability of the devices!!!'
+                );
+                log.error('Please add the following lines to your Zigbee2MQTT configuration.yaml:');
+                log.error('advanced:');
+                log.error('legacy_availability_payload: false');
+                log.error('');
+            }
+            if (checkAPIOptions.device_legacy_enabled == true) {
+                log.error(
+                    'Device Legacy Payload is activated, therefore the adapter may process the states of the devices correctly!!!'
+                );
+                log.error('Please add the following lines to your Zigbee2MQTT configuration.yaml:');
+                log.error('device_options:');
+                log.error(' legacy: false');
+            }
+            log.error('===================================================');
         }
-        if (checkAPIOptions.payload_contains_not_json == true) {
+    }
+    if (Object.values(checkAPIOptionsOutput).filter((x) => x == true).length > 0) {
+        if (checkAPIOptions.payload_contains_not_json == true ) {
+            log.error('===================================================');
             log.error(
                 'MQTT output type must "attribute_and_json" or "json" , therefore the adapter may process the states of the devices correctly!!!'
             );
@@ -44,9 +53,8 @@ function checkConfig(config, log) {
             log.error('advanced:');
             log.error(' output: attribute_and_json');
             log.error('');
+            log.error('===================================================');
         }
-        log.error('===================================================');
-        log.error('===================================================');
     }
 }
 

package/lib/deviceController.js

@@ -146,9 +146,9 @@ class DeviceController {
                     write: true,
                     read: true,
                     type: 'number',
-                    min: this.config.useKelvin == true ? utils.miredKelvinConversion(500) : 150,
-                    max: this.config.useKelvin == true ? utils.miredKelvinConversion(150) : 500,
-                    def: this.config.useKelvin == true ? utils.miredKelvinConversion(150) : 500,
+                    min: this.config.useKelvin == true ? utils.miredKelvinConversion(550) : 150,
+                    max: this.config.useKelvin == true ? utils.miredKelvinConversion(153) : 500,
+                    def: this.config.useKelvin == true ? utils.miredKelvinConversion(153) : 500,
                     unit: this.config.useKelvin == true ? 'K' : 'mired',
                     setter: (value) => {
                         return utils.toMired(value);

package/lib/imageController.js

@@ -56,12 +56,17 @@ class ImageController {
         }
         // If not donwload image
         else {
-            let iconUrl = this.getZ2mDeviceImage(device);
-            if (!iconUrl) {
-                iconUrl = this.getSlsDeviceImage(device);
-            }
+            let iconUrl = this.getSlsDeviceImage(device);
+
             this.adapter.log.info(`Download image for device model: ${device.definition.model}`);
-            await this.downloadIcon(this.adapter, iconUrl, this.adapter.namespace);
+
+	    try {
+            	await this.downloadIcon(this.adapter, iconUrl, this.adapter.namespace);
+	    } catch (err) {
+                iconUrl = this.getZ2mDeviceImage(device);
+                await this.downloadIcon(this.adapter, iconUrl, this.adapter.namespace);
+	    }
+
             iconFileName = this.getFileNameWithExtension(iconUrl);
         }
 

package/main.js

@@ -190,7 +190,7 @@ class Zigbee2mqtt extends core.Adapter {
             case 'bridge/info':
                 if (showInfo) {
                     zigbee2mqttInfo(messageObj.payload, this.log);
-                    checkConfig(messageObj.payload.config, this.log);
+                    checkConfig(messageObj.payload.config, this.log, messageObj.payload.version);
                     showInfo = false;
                 }
                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "2.13.11",
+  "version": "3.0.0",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen and Arthur Rupp",
@@ -24,11 +24,11 @@
     "node": ">= 18"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.2.1",
-    "@iobroker/dm-utils": "^0.1.9",
+    "@iobroker/adapter-core": "^3.2.3",
+    "@iobroker/dm-utils": "^0.6.9",
     "aedes": "^0.51.3",
     "aedes-persistence-nedb": "^2.0.3",
-    "mqtt": "^5.9.0",
+    "mqtt": "^5.10.3",
     "net": "^1.0.2",
     "node-schedule": "^2.1.1",
     "sharp": "^0.33.5",
@@ -44,23 +44,23 @@
     "@tsconfig/node14": "^14.1.2",
     "@types/chai": "^4.3.5",
     "@types/chai-as-promised": "^8.0.1",
-    "@types/mocha": "^10.0.7",
-    "@types/node": "^22.7.4",
+    "@types/mocha": "^10.0.9",
+    "@types/node": "^22.10.3",
     "@types/node-schedule": "^2.1.7",
     "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",
     "chai": "^4.4.1",
-    "chai-as-promised": "^8.0.0",
-    "eslint": "^9.11.1",
+    "chai-as-promised": "^8.0.1",
+    "eslint": "^9.16.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "mocha": "^10.5.2",
-    "prettier": "^3.3.3",
+    "mocha": "^11.0.1",
+    "prettier": "^3.4.2",
     "proxyquire": "^2.1.3",
-    "sinon": "^18.0.0",
+    "sinon": "^19.0.2",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.6.2"
+    "typescript": "~5.7.2"
   },
   "main": "main.js",
   "files": [