iobroker.zigbee2mqtt 2.13.4 → 2.13.6

package/lib/statesController.js

@@ -35,6 +35,8 @@ class StatesController {
             this.adapter.log.warn(`--->>> fromZ2M -> ${device.ieee_address} states: ${JSON.stringify(messageObj)}`);
         }
 
+        const actionStates = [];
+
         for (const [key, value] of Object.entries(messageObj.payload)) {
 
             if (value === undefined || value === null) {
@@ -64,17 +66,7 @@ class StatesController {
                 try {
                     //  Is an action
                     if (state.prop && state.prop == 'action') {
-                        if (state.isEvent && state.isEvent == true) {
-                            if (state.type == 'boolean') {
-                                await this.setStateWithTimeoutAsync(stateName, state.getter(messageObj.payload), 450);
-                            }
-                            else {
-                                await this.setStateSafelyAsync(stateName, state.getter(messageObj.payload));
-                            }
-                        }
-                        else {
-                            await this.setStateChangedSafelyAsync(stateName, state.getter(messageObj.payload));
-                        }
+                        actionStates.push(state);
                     }
                     // Is not an action
                     else {
@@ -90,6 +82,28 @@ class StatesController {
                 }
             }
         }
+
+        for (const state of actionStates) {
+
+            const stateName = `${device.ieee_address}.${state.id}`;
+
+            try {
+                if (state.isEvent && state.isEvent == true) {
+                    if (state.type == 'boolean') {
+                        await this.setStateWithTimeoutAsync(stateName, state.getter(messageObj.payload), 450);
+                    }
+                    else {
+                        await this.setStateSafelyAsync(stateName, state.getter(messageObj.payload));
+                    }
+                }
+                else {
+                    await this.setStateChangedSafelyAsync(stateName, state.getter(messageObj.payload));
+                }
+            } catch (err) {
+                incStatsQueue[incStatsQueue.length] = messageObj;
+                this.adapter.log.debug(`Can not set ${stateName}, queue state in incStatsQueue!`);
+            }
+        }
     }
 
     async setStateSafelyAsync(stateName, value) {

package/main.js

@@ -265,7 +265,7 @@ class Zigbee2mqtt extends core.Adapter {
             if (mqttClient && !mqttClient.closed) {
                 try {
                     if (mqttClient) {
-                        mqttClient.close();
+                        mqttClient.end();
                     }
                 } catch (e) {
                     this.log.error(e);
@@ -354,4 +354,4 @@ if (require.main !== module) {
 } else {
     // otherwise start the instance directly
     new Zigbee2mqtt();
-}
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "2.13.4",
+  "version": "2.13.6",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
-    "name": "Dennis Rathjen",
-    "email": "dennis.rathjen@outlook.de"
+    "name": "Dennis Rathjen and Arthur Rupp",
+    "email": "arteck@outlook.com"
   },
-  "homepage": "https://github.com/o0shojo0o/ioBroker.zigbee2mqtt",
+  "homepage": "https://github.com/arteck/ioBroker.zigbee2mqtt",
   "license": "MIT",
   "keywords": [
     "ioBroker",
@@ -16,24 +16,25 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/o0shojo0o/ioBroker.zigbee2mqtt.git"
+    "url": "https://github.com/arteck/ioBroker.zigbee2mqtt.git"
   },
   "engines": {
     "node": ">= 16"
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.0.4",
-    "aedes": "^0.50.0",
+    "@iobroker/dm-utils": "^0.1.9",
+    "aedes": "^0.51.0",
     "aedes-persistence-nedb": "^2.0.3",
-    "mqtt": "~5.1.4",
+    "mqtt": "~5.3.5",
     "net": "^1.0.2",
     "node-schedule": "^2.1.1",
-    "sharp": "^0.32.6",
-    "ws": "^8.13.0"
+    "sharp": "^0.33.1",
+    "ws": "^8.16.0"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.7.0",
-    "@alcalzone/release-script-plugin-iobroker": "^3.6.0",
+    "@alcalzone/release-script-plugin-iobroker": "^3.7.0",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
     "@iobroker/adapter-dev": "^1.2.0",
@@ -41,23 +42,23 @@
     "@tsconfig/node14": "^14.1.0",
     "@types/chai": "^4.3.5",
     "@types/chai-as-promised": "^7.1.8",
-    "@types/mocha": "^10.0.2",
-    "@types/node": "^20.8.10",
-    "@types/node-schedule": "^2.1.0",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^20.11.24",
+    "@types/node-schedule": "^2.1.5",
     "@types/proxyquire": "^1.3.31",
-    "@types/sinon": "^10.0.16",
-    "@types/sinon-chai": "^3.2.9",
-    "chai": "^4.3.8",
+    "@types/sinon": "^17.0.3",
+    "@types/sinon-chai": "^3.2.12",
+    "chai": "^4.4.0",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.50.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.2",
     "mocha": "^10.2.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.2.5",
     "proxyquire": "^2.1.3",
-    "sinon": "^16.0.0",
+    "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "main": "main.js",
   "files": [
@@ -80,7 +81,7 @@
     "release": "release-script"
   },
   "bugs": {
-    "url": "https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues"
+    "url": "https://github.com/arteck/ioBroker.zigbee2mqtt/issues"
   },
   "readmeFilename": "README.md"
 }