iobroker.zigbee2mqtt 2.9.0 → 2.10.0

package/lib/utils.js

@@ -118,6 +118,21 @@ function moveArray(source, target) {
     }
 }
 
+function isObject(item) {
+    return (typeof item === 'object' && !Array.isArray(item) && item !== null);
+}
+
+function isJson(item) {
+    let value = typeof item !== 'string' ? JSON.stringify(item) : item;
+    try {
+        value = JSON.parse(value);
+    } catch (e) {
+        return false;
+    }
+
+    return typeof value === 'object' && value !== null;
+}
+
 module.exports = {
     bulbLevelToAdapterLevel,
     adapterLevelToBulbLevel,
@@ -130,4 +145,6 @@ module.exports = {
     getDeviceIcon,
     clearArray,
     moveArray,
+    isObject,
+    isJson,
 };

package/main.js

@@ -1,5 +1,4 @@
 'use strict';
-
 /*
  * Created with @iobroker/create-adapter v2.2.1
  */
@@ -8,6 +7,7 @@
 // you need to create an adapter
 const core = require('@iobroker/adapter-core');
 const mqtt = require('mqtt');
+const utils = require('./lib/utils');
 const checkConfig = require('./lib/check').checkConfig;
 const adapterInfo = require('./lib/messages').adapterInfo;
 const zigbee2mqttInfo = require('./lib/messages').zigbee2mqttInfo;
@@ -72,8 +72,18 @@ class Zigbee2mqtt extends core.Adapter {
                     this.log.warn('Please configure the External MQTT-Server connection!');
                     return;
                 }
-                mqttClient = mqtt.connect(`mqtt://${this.config.externalMqttServerIP}:${this.config.externalMqttServerPort}`, { clientId: `ioBroker.zigbee2mqtt_${Math.random().toString(16).slice(2, 8)}`, clean: true, reconnectPeriod: 500 });
 
+                // MQTT connection settings
+                const mqttClientOptions = { clientId: `ioBroker.zigbee2mqtt_${Math.random().toString(16).slice(2, 8)}`, clean: true, reconnectPeriod: 500 };
+
+                // Set external mqtt credentials
+                if (this.config.externalMqttServerCredentials == true) {
+                    mqttClientOptions.username = this.config.externalMqttServerUsername;
+                    mqttClientOptions.password = this.config.externalMqttServerPassword;
+                }
+
+                // Init connection
+                mqttClient = mqtt.connect(`mqtt://${this.config.externalMqttServerIP}:${this.config.externalMqttServerPort}`, mqttClientOptions);
             }
             // Internal MQTT-Server
             else {
@@ -132,8 +142,12 @@ class Zigbee2mqtt extends core.Adapter {
     }
 
     async messageParse(message) {
+        // If the MQTT output type is set to attribute_and_json, the non-valid JSON must be checked here.
+        if (utils.isJson(message) == false) {
+            return;
+        }
+
         const messageObj = JSON.parse(message);
-        //this.log.debug(JSON.stringify(messageObj));
 
         switch (messageObj.topic) {
             case 'bridge/config':
@@ -214,6 +228,15 @@ class Zigbee2mqtt extends core.Adapter {
                         }
                         // States
                     } else {
+                        // With the MQTT output type attribute_and_json, primitive payloads arrive here that must be discarded.
+                        if (utils.isObject(messageObj.payload) == false) {
+                            return;
+                        }
+                        // If MQTT is used, I have to filter the self-sent 'set' commands.
+                        if (messageObj.topic.endsWith('/set')) {
+                            return;
+                        }
+
                         statesController.processDeviceMessage(messageObj);
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen",
@@ -19,10 +19,10 @@
     "url": "https://github.com/o0shojo0o/ioBroker.zigbee2mqtt.git"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.8",
-    "aedes": "^0.49.0",
+    "@iobroker/adapter-core": "^3.0.3",
+    "aedes": "^0.50.0",
     "aedes-persistence-nedb": "^2.0.3",
-    "mqtt": "^4.3.7",
+    "mqtt": "^5.0.2",
     "net": "^1.0.2",
     "ws": "^8.13.0"
   },
@@ -37,17 +37,17 @@
     "@types/chai": "^4.3.5",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.4.2",
+    "@types/node": "^20.4.8",
     "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "^10.0.15",
+    "@types/sinon": "^10.0.16",
     "@types/sinon-chai": "^3.2.9",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.45.0",
-    "eslint-config-prettier": "^8.8.0",
+    "eslint": "^8.46.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.0",
     "mocha": "^10.2.0",
-    "prettier": "^3.0.0",
+    "prettier": "^3.0.1",
     "proxyquire": "^2.1.3",
     "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",