iobroker.zigbee2mqtt 2.13.6 → 2.13.11

package/lib/statesController.js

@@ -17,7 +17,7 @@ class StatesController {
             return;
         }
 
-        const device = this.groupCache.concat(this.deviceCache).find(x => x.id == messageObj.topic);
+        const device = this.groupCache.concat(this.deviceCache).find((x) => x.id == messageObj.topic);
         if (device) {
             try {
                 this.setDeviceStateSafely(messageObj, device);
@@ -38,15 +38,14 @@ class StatesController {
         const actionStates = [];
 
         for (const [key, value] of Object.entries(messageObj.payload)) {
-
             if (value === undefined || value === null) {
                 continue;
             }
 
-            let states = device.states.filter(x => x.prop && x.prop == key);
+            let states = device.states.filter((x) => x.prop && x.prop == key);
 
             if (states.length == 0) {
-                states = device.states.filter(x => x.id == key);
+                states = device.states.filter((x) => x.id == key);
             }
 
             if (states.length == 0) {
@@ -54,11 +53,14 @@ class StatesController {
             }
 
             for (const state of states) {
-
                 const stateName = `${device.ieee_address}.${state.id}`;
 
                 // It may be that the state has not yet been created!
-                if (!this.createCache[device.ieee_address] || !this.createCache[device.ieee_address][state.id] || !this.createCache[device.ieee_address][state.id].created == true) {
+                if (
+                    !this.createCache[device.ieee_address] ||
+					!this.createCache[device.ieee_address][state.id] ||
+					!this.createCache[device.ieee_address][state.id].created == true
+                ) {
                     incStatsQueue[incStatsQueue.length] = messageObj;
                     continue;
                 }
@@ -69,6 +71,16 @@ class StatesController {
                         actionStates.push(state);
                     }
                     // Is not an action
+                    // check if its a motion sensor (occupancy state) and if configuration is set to update state every time
+                    // if yes, use setStateSafelyAsync instead of setStateChangedSafelyAsync
+                    else if (
+                        this.adapter.config.allwaysUpdateOccupancyState === true &&
+						state.id === 'occupancy' &&
+						value === true
+                    ) {
+                        await this.setStateSafelyAsync(stateName, value);
+                    }
+                    // end section for motion sensor update
                     else {
                         if (state.getter) {
                             await this.setStateChangedSafelyAsync(stateName, state.getter(messageObj.payload));
@@ -84,19 +96,16 @@ 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 {
+                    } else {
                         await this.setStateSafelyAsync(stateName, state.getter(messageObj.payload));
                     }
-                }
-                else {
+                } else {
                     await this.setStateChangedSafelyAsync(stateName, state.getter(messageObj.payload));
                 }
             } catch (err) {
@@ -179,5 +188,5 @@ class StatesController {
 }
 
 module.exports = {
-    StatesController
-};
+    StatesController,
+};

package/lib/utils.js

@@ -18,7 +18,7 @@ function bulbLevelToAdapterLevel(bulbLevel) {
     // - Bulb level range [2...254] is linearly mapped to adapter level range [1...100].
     if (bulbLevel >= 2) {
         // Perform linear mapping of range [2...254] to [1...100]
-        return (Math.round((bulbLevel - 2) * 99 / 252) + 1);
+        return Math.round(((bulbLevel - 2) * 99) / 252) + 1;
     } else {
         // The bulb is considered off. Even a bulb level of "1" is considered as off.
         return 0;
@@ -34,7 +34,7 @@ function adapterLevelToBulbLevel(adapterLevel) {
     // Please read the comments there regarding the rules applied here for mapping the values.
     if (adapterLevel) {
         // Perform linear mapping of range [1...100] to [2...254]
-        return (Math.round((adapterLevel - 1) * 252 / 99) + 2);
+        return Math.round(((adapterLevel - 1) * 252) / 99) + 2;
     } else {
         // Switch the bulb off. Some bulbs need "0" (IKEA), others "1" (HUE), and according to the
         // ZigBee docs "1" is the "minimum possible level"... we choose "0" here which seems to work.
@@ -69,7 +69,7 @@ function miredKelvinConversion(t) {
  */
 function decimalToHex(decimal, padding) {
     let hex = Number(decimal).toString(16);
-    padding = typeof (padding) === 'undefined' || padding === null ? padding = 2 : padding;
+    padding = typeof padding === 'undefined' || padding === null ? (padding = 2) : padding;
 
     while (hex.length < padding) {
         hex = `0${hex}`;
@@ -101,7 +101,7 @@ function moveArray(source, target) {
 }
 
 function isObject(item) {
-    return (typeof item === 'object' && !Array.isArray(item) && item !== null);
+    return typeof item === 'object' && !Array.isArray(item) && item !== null;
 }
 
 function isJson(item) {
@@ -128,4 +128,4 @@ module.exports = {
     moveArray,
     isObject,
     isJson,
-};
+};

package/lib/websocketController.js

@@ -19,7 +19,7 @@ class WebsocketController {
                 wsURL += `?token=${this.adapter.config.wsToken}`;
             }
 
-            wsClient = new WebSocket(wsURL), { rejectUnauthorized: false };
+            (wsClient = new WebSocket(wsURL)), { rejectUnauthorized: false };
 
             wsClient.on('open', () => {
                 // Send ping to server
@@ -41,9 +41,11 @@ class WebsocketController {
                 }
             });
 
-            wsClient.on('message', () => { });
+            wsClient.on('message', () => {});
 
-            wsClient.on('error', (err) => { this.adapter.log.debug(err); });
+            wsClient.on('error', (err) => {
+                this.adapter.log.debug(err);
+            });
 
             return wsClient;
         } catch (err) {
@@ -96,5 +98,5 @@ class WebsocketController {
 }
 
 module.exports = {
-    WebsocketController
+    WebsocketController,
 };

package/lib/z2mController.js

@@ -20,12 +20,12 @@ class Z2mController {
         const ieee_address = splitedID[2];
         const stateName = splitedID[3];
 
-        const device = this.groupCache.concat(this.deviceCache).find(d => d.ieee_address == ieee_address);
+        const device = this.groupCache.concat(this.deviceCache).find((d) => d.ieee_address == ieee_address);
         if (!device) {
             return;
         }
 
-        const deviceState = device.states.find(s => s.id == stateName);
+        const deviceState = device.states.find((s) => s.id == stateName);
         if (!deviceState) {
             return;
         }
@@ -48,17 +48,18 @@ class Z2mController {
             payload: {
                 [stateID]: stateVal,
             },
-            topic: `${device.id}/set`
+            topic: `${device.id}/set`,
         };
 
         if (stateID == 'send_payload') {
             try {
                 controlObj.payload = JSON.parse(stateVal);
                 this.adapter.setState(id, state, true);
-            }
-            catch (error) {
+            } catch (error) {
                 controlObj.payload = stateVal.replaceAll(' ', '').replaceAll('\n', '');
-                this.adapter.log.warn(`${device.ieee_address} state: ${stateID} error: value passed is not a valid JSON`);
+                this.adapter.log.warn(
+                    `${device.ieee_address} state: ${stateID} error: value passed is not a valid JSON`
+                );
                 this.adapter.log.debug(`${device.ieee_address} states: ${JSON.stringify(controlObj)} error: ${error}`);
                 return;
             }
@@ -69,7 +70,9 @@ class Z2mController {
             for (const option of deviceState.options) {
                 // if optionsValues not set, set it!
                 if (!device.optionsValues[option]) {
-                    const optionValue = (await this.adapter.getStateAsync(`${splitedID[0]}.${splitedID[1]}.${splitedID[2]}.${option}`)).val;
+                    const optionValue = (
+                        await this.adapter.getStateAsync(`${splitedID[0]}.${splitedID[1]}.${splitedID[2]}.${option}`)
+                    ).val;
                     // optionsValues Cache
                     device.optionsValues[option] = optionValue;
                 }
@@ -97,7 +100,11 @@ class Z2mController {
             this.adapter.setState(id, state, true);
         }
         // set stats with the mentioned ids always immediately to ack = true, because these are not reported back by Zigbee2MQTT
-        if (['brightness_move', 'colortemp_move', 'brightness_move', 'brightness_step', 'effect'].includes(deviceState.id)) {
+        if (
+            ['brightness_move', 'colortemp_move', 'brightness_move', 'brightness_step', 'effect'].includes(
+                deviceState.id
+            )
+        ) {
             this.adapter.setState(id, state, true);
         }
 
@@ -109,7 +116,7 @@ class Z2mController {
 
     async proxyZ2MLogs(messageObj) {
         const logMessage = messageObj.payload.message;
-        if (this.logCustomizations.logfilter.some(x => logMessage.includes(x))) {
+        if (this.logCustomizations.logfilter.some((x) => logMessage.includes(x))) {
             return;
         }
 
@@ -127,7 +134,6 @@ class Z2mController {
     }
 }
 
-
 module.exports = {
-    Z2mController: Z2mController
-};
+    Z2mController: Z2mController,
+};

package/main.js

@@ -18,11 +18,10 @@ const StatesController = require('./lib/statesController').StatesController;
 const WebsocketController = require('./lib/websocketController').WebsocketController;
 const MqttServerController = require('./lib/mqttServerController').MqttServerController;
 
-
 let mqttClient;
-// eslint-disable-next-line prefer-const
+
 let deviceCache = [];
-// eslint-disable-next-line prefer-const
+
 let groupCache = [];
 const createCache = {};
 const logCustomizations = { debugDevices: '', logfilter: [] };
@@ -34,7 +33,6 @@ let websocketController;
 let mqttServerController;
 
 class Zigbee2mqtt extends core.Adapter {
-
     constructor(options) {
         super({
             ...options,
@@ -47,7 +45,14 @@ class Zigbee2mqtt extends core.Adapter {
 
     async onReady() {
         statesController = new StatesController(this, deviceCache, groupCache, logCustomizations, createCache);
-        deviceController = new DeviceController(this, deviceCache, groupCache, this.config, logCustomizations, createCache);
+        deviceController = new DeviceController(
+            this,
+            deviceCache,
+            groupCache,
+            this.config,
+            logCustomizations,
+            createCache
+        );
         z2mController = new Z2mController(this, deviceCache, groupCache, logCustomizations);
 
         // Initialize your adapter here
@@ -63,12 +68,16 @@ class Zigbee2mqtt extends core.Adapter {
         const logfilterState = await this.getStateAsync('info.logfilter');
         if (logfilterState && logfilterState.val) {
             // @ts-ignore
-            logCustomizations.logfilter = String(logfilterState.val).split(';').filter(x => x); // filter removes empty strings here
+            logCustomizations.logfilter = String(logfilterState.val)
+                .split(';')
+                .filter((x) => x); // filter removes empty strings here
         }
 
         if (this.config.coordinatorCheck == true) {
             try {
-                schedule.scheduleJob('coordinatorCheck', this.config.coordinatorCheckCron, () => this.onStateChange('manual_trigger._.info.coordinator_check', { ack: false }));
+                schedule.scheduleJob('coordinatorCheck', this.config.coordinatorCheckCron, () =>
+                    this.onStateChange('manual_trigger._.info.coordinator_check', { ack: false })
+                );
             } catch (e) {
                 this.log.error(e);
             }
@@ -83,7 +92,11 @@ class Zigbee2mqtt extends core.Adapter {
                 }
 
                 // MQTT connection settings
-                const mqttClientOptions = { clientId: `ioBroker.zigbee2mqtt_${Math.random().toString(16).slice(2, 8)}`, clean: true, reconnectPeriod: 500 };
+                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) {
@@ -92,19 +105,28 @@ class Zigbee2mqtt extends core.Adapter {
                 }
 
                 // Init connection
-                mqttClient = mqtt.connect(`mqtt://${this.config.externalMqttServerIP}:${this.config.externalMqttServerPort}`, mqttClientOptions);
+                mqttClient = mqtt.connect(
+                    `mqtt://${this.config.externalMqttServerIP}:${this.config.externalMqttServerPort}`,
+                    mqttClientOptions
+                );
             }
             // Internal MQTT-Server
             else {
                 mqttServerController = new MqttServerController(this);
                 await mqttServerController.createMQTTServer();
                 await this.delay(1500);
-                mqttClient = mqtt.connect(`mqtt://${this.config.mqttServerIPBind}:${this.config.mqttServerPort}`, { clientId: `ioBroker.zigbee2mqtt_${Math.random().toString(16).slice(2, 8)}`, clean: true, reconnectPeriod: 500 });
+                mqttClient = mqtt.connect(`mqtt://${this.config.mqttServerIPBind}:${this.config.mqttServerPort}`, {
+                    clientId: `ioBroker.zigbee2mqtt_${Math.random().toString(16).slice(2, 8)}`,
+                    clean: true,
+                    reconnectPeriod: 500,
+                });
             }
 
             // MQTT Client
             mqttClient.on('connect', () => {
-                this.log.info(`Connect to Zigbee2MQTT over ${this.config.connectionType == 'exmqtt' ? 'external mqtt' : 'internal mqtt'} connection.`);
+                this.log.info(
+                    `Connect to Zigbee2MQTT over ${this.config.connectionType == 'exmqtt' ? 'external mqtt' : 'internal mqtt'} connection.`
+                );
             });
 
             mqttClient.subscribe('zigbee2mqtt/#');
@@ -237,7 +259,7 @@ class Zigbee2mqtt extends core.Adapter {
                             // {"payload":{"state":"online"},"topic":"FL.Licht.Links/availability"}  ---->  {"payload":{"available":true},"topic":"FL.Licht.Links"}
                             const newMessage = {
                                 payload: { available: messageObj.payload.state == 'online' },
-                                topic: messageObj.topic.replace('/availability', '')
+                                topic: messageObj.topic.replace('/availability', ''),
                             };
                             statesController.processDeviceMessage(newMessage);
                         }
@@ -328,12 +350,12 @@ class Zigbee2mqtt extends core.Adapter {
                 return;
             }
             if (id.endsWith('info.logfilter')) {
-                logCustomizations.logfilter = state.val.split(';').filter(x => x); // filter removes empty strings here
+                logCustomizations.logfilter = state.val.split(';').filter((x) => x); // filter removes empty strings here
                 this.setState(id, state.val, true);
                 return;
             }
 
-            const message = await z2mController.createZ2MMessage(id, state) || { topic: '', payload: '' };
+            const message = (await z2mController.createZ2MMessage(id, state)) || { topic: '', payload: '' };
 
             if (['exmqtt', 'intmqtt'].includes(this.config.connectionType)) {
                 mqttClient.publish(`zigbee2mqtt/${message.topic}`, JSON.stringify(message.payload));
@@ -344,12 +366,11 @@ class Zigbee2mqtt extends core.Adapter {
     }
 }
 
-
 if (require.main !== module) {
     // Export the constructor in compact mode
     /**
-     * @param {Partial<core.AdapterOptions>} [options={}]
-     */
+	 * @param {Partial<core.AdapterOptions>} [options={}]
+	 */
     module.exports = (options) => new Zigbee2mqtt(options);
 } else {
     // otherwise start the instance directly

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "2.13.6",
+  "version": "2.13.11",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen and Arthur Rupp",
@@ -9,6 +9,8 @@
   "homepage": "https://github.com/arteck/ioBroker.zigbee2mqtt",
   "license": "MIT",
   "keywords": [
+    "zigbee2mqtt",
+    "zigbee",
     "ioBroker",
     "template",
     "Smart Home",
@@ -19,17 +21,17 @@
     "url": "https://github.com/arteck/ioBroker.zigbee2mqtt.git"
   },
   "engines": {
-    "node": ">= 16"
+    "node": ">= 18"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.0.4",
+    "@iobroker/adapter-core": "^3.2.1",
     "@iobroker/dm-utils": "^0.1.9",
-    "aedes": "^0.51.0",
+    "aedes": "^0.51.3",
     "aedes-persistence-nedb": "^2.0.3",
-    "mqtt": "~5.3.5",
+    "mqtt": "^5.9.0",
     "net": "^1.0.2",
     "node-schedule": "^2.1.1",
-    "sharp": "^0.33.1",
+    "sharp": "^0.33.5",
     "ws": "^8.16.0"
   },
   "devDependencies": {
@@ -37,28 +39,28 @@
     "@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",
-    "@iobroker/testing": "^4.1.0",
-    "@tsconfig/node14": "^14.1.0",
+    "@iobroker/adapter-dev": "^1.3.0",
+    "@iobroker/testing": "^4.1.3",
+    "@tsconfig/node14": "^14.1.2",
     "@types/chai": "^4.3.5",
-    "@types/chai-as-promised": "^7.1.8",
-    "@types/mocha": "^10.0.6",
-    "@types/node": "^20.11.24",
-    "@types/node-schedule": "^2.1.5",
+    "@types/chai-as-promised": "^8.0.1",
+    "@types/mocha": "^10.0.7",
+    "@types/node": "^22.7.4",
+    "@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.0",
-    "chai-as-promised": "^7.1.1",
-    "eslint": "^8.57.0",
+    "chai": "^4.4.1",
+    "chai-as-promised": "^8.0.0",
+    "eslint": "^9.11.1",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.2",
-    "mocha": "^10.2.0",
-    "prettier": "^3.2.5",
+    "eslint-plugin-prettier": "^5.2.1",
+    "mocha": "^10.5.2",
+    "prettier": "^3.3.3",
     "proxyquire": "^2.1.3",
-    "sinon": "^17.0.1",
+    "sinon": "^18.0.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.3.3"
+    "typescript": "~5.6.2"
   },
   "main": "main.js",
   "files": [