iobroker.sonoff 3.2.1 → 3.3.0

package/lib/server.js

@@ -7,18 +7,18 @@ const types = require('./datapoints');
 // const heapdump = require('heapdump');
 const hueCalc = true;
 // var heapTest = 0;
-const FORBIDDEN_CHARS = /[\]\[*,;'"`<>\\?]/g;
+const FORBIDDEN_CHARS = /[\]\\[*,;'"`<>\\?]/g;
 const mappingClients = {};
 
 /*
-* HSV to RGB color conversion
-*
-* H runs from 0 to 360 degrees
-* S and V run from 0 to 100
-*
-* Ported from the excellent java algorithm by Eugene Vishnevsky at:
-* http://www.cs.rit.edu/~ncs/color/t_convert.html
-*/
+ * HSV to RGB color conversion
+ *
+ * H runs from 0 to 360 degrees
+ * S and V run from 0 to 100
+ *
+ * Ported from the excellent java algorithm by Eugene Vishnevsky at:
+ * http://www.cs.rit.edu/~ncs/color/t_convert.html
+ */
 function hsvToRgb(h, s, v) {
     let r, g, b;
     let i;
@@ -39,11 +39,7 @@ function hsvToRgb(h, s, v) {
     if (s === 0) {
         // Achromatic (grey)
         r = g = b = v;
-        return [
-            Math.round(r * 255),
-            Math.round(g * 255),
-            Math.round(b * 255)
-        ];
+        return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)];
     }
 
     h /= 60; // sector 0 to 5
@@ -90,11 +86,7 @@ function hsvToRgb(h, s, v) {
             b = q;
     }
 
-    return [
-        Math.round(r * 255),
-        Math.round(g * 255),
-        Math.round(b * 255)
-    ];
+    return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)];
 }
 
 function componentToHex(c) {
@@ -109,10 +101,17 @@ function toPaddedHexString(num, len) {
         }
     }
     const str = num.toString(16);
-    if (str.length >= len) return str;
+    if (str.length >= len) {
+        return str;
+    }
     return '0'.repeat(len - str.length) + str;
 }
 
+/**
+ * MQTT Server constructor
+ *
+ * @param {object} adapter - The ioBroker adapter instance
+ */
 function MQTTServer(adapter) {
     if (!(this instanceof MQTTServer)) {
         return new MQTTServer(adapter);
@@ -126,7 +125,7 @@ function MQTTServer(adapter) {
     let taskCallbacks = [];
     let messageId = 1;
     let persistentSessions = {};
-    let resending   = false;
+    let resending = false;
     let resendTimer = null;
 
     const cacheAddedObjects = {};
@@ -162,7 +161,7 @@ function MQTTServer(adapter) {
         }
     };
 
-/*
+    /*
     memwatch.on('leak', (info) => {
         //console.error('Memory leak detected:\n', info);
         adapter.log.info('Memory leak detected:\n', info);
@@ -175,7 +174,7 @@ function MQTTServer(adapter) {
         });
     });
  */
-/*
+    /*
     memwatch.on('stats', function(stats) {
         adapter.log.info("stats:",stats);
     });
@@ -185,9 +184,21 @@ function MQTTServer(adapter) {
         //adapter.log.info('color write: '+ val);
         const stateId = 'Color';
         if (clients[channelId] && clients[channelId]._map && clients[channelId]._map[stateId]) {
-            setImmediate(sendState2Client, clients[channelId], clients[channelId]._map[stateId] || 'cmnd/sonoff/Color', val, adapter.config.defaultQoS);
+            setImmediate(
+                sendState2Client,
+                clients[channelId],
+                clients[channelId]._map[stateId] || 'cmnd/sonoff/Color',
+                val,
+                adapter.config.defaultQoS,
+            );
         } else if (clients[channelId] && clients[channelId]._fallBackName) {
-            setImmediate(sendState2Client, clients[channelId], `cmnd/${clients[channelId]._fallBackName}/${stateId}`, val, adapter.config.defaultQoS);
+            setImmediate(
+                sendState2Client,
+                clients[channelId],
+                `cmnd/${clients[channelId]._fallBackName}/${stateId}`,
+                val,
+                adapter.config.defaultQoS,
+            );
         } else {
             adapter.log.warn(`Unknown mapping for "${stateId}"`);
         }
@@ -199,19 +210,86 @@ function MQTTServer(adapter) {
             return adapter.log.debug('Empty power was ignored');
         }
         if (clients[channelId]._map && clients[channelId]._map[stateId]) {
-            setImmediate(sendState2Client, clients[channelId], clients[channelId]._map[stateId] || 'cmnd/sonoff/POWER', val ? 'ON' : 'OFF', adapter.config.defaultQoS);
+            setImmediate(
+                sendState2Client,
+                clients[channelId],
+                clients[channelId]._map[stateId] || 'cmnd/sonoff/POWER',
+                val ? 'ON' : 'OFF',
+                adapter.config.defaultQoS,
+            );
         } else if (clients[channelId]._fallBackName) {
-            setImmediate(sendState2Client, clients[channelId], `cmnd/${clients[channelId]._fallBackName}/${stateId}`, val, adapter.config.defaultQoS);
+            setImmediate(
+                sendState2Client,
+                clients[channelId],
+                `cmnd/${clients[channelId]._fallBackName}/${stateId}`,
+                val,
+                adapter.config.defaultQoS,
+            );
         } else {
             adapter.log.warn(`Unknown mapping for "${stateId}"`);
         }
     }
 
+    function setZbSendCommand(channelId, deviceId, attribute, val) {
+        // Send Zigbee command via ZbSend
+        const zbSendCommand = JSON.stringify({
+            device: deviceId,
+            send: {
+                [attribute]: val,
+            },
+        });
+
+        if (clients[channelId] && clients[channelId]._fallBackName) {
+            setImmediate(
+                sendState2Client,
+                clients[channelId],
+                `cmnd/${clients[channelId]._fallBackName}/ZbSend`,
+                zbSendCommand,
+                adapter.config.defaultQoS,
+            );
+        } else {
+            adapter.log.warn(`Cannot send ZbSend command for device ${deviceId}: client not found`);
+        }
+    }
+
+    /**
+     * Transform shutter state names to correct Tasmota command format
+     * e.g., "Shutter1_Position" -> "ShutterPosition1"
+     * e.g., "Shutter1_Tilt" -> "ShutterTilt1"
+     *
+     * @param {string} stateId - The original state ID to transform
+     * @returns {string} The transformed state ID for Tasmota commands
+     */
+    function transformShutterStateId(stateId) {
+        const shutterMatch = stateId.match(/^Shutter(\d+)_(Position|Direction|Target|Tilt)$/);
+        if (shutterMatch) {
+            const shutterNumber = shutterMatch[1];
+            const command = shutterMatch[2];
+            return `Shutter${command}${shutterNumber}`;
+        }
+        return stateId;
+    }
+
     function setStateImmediate(channelId, stateId, val) {
+        // Transform shutter state names to correct Tasmota command format
+        const transformedStateId = transformShutterStateId(stateId);
+
         if (clients[channelId] && clients[channelId]._map && clients[channelId]._map[stateId]) {
-            setImmediate(sendState2Client, clients[channelId], clients[channelId]._map[stateId] || (`cmnd/sonoff/${stateId}`), val, adapter.config.defaultQoS);
+            setImmediate(
+                sendState2Client,
+                clients[channelId],
+                clients[channelId]._map[stateId] || `cmnd/sonoff/${transformedStateId}`,
+                val,
+                adapter.config.defaultQoS,
+            );
         } else if (clients[channelId] && clients[channelId]._fallBackName) {
-            setImmediate(sendState2Client, clients[channelId], `cmnd/${clients[channelId]._fallBackName}/${stateId}`, val, adapter.config.defaultQoS);
+            setImmediate(
+                sendState2Client,
+                clients[channelId],
+                `cmnd/${clients[channelId]._fallBackName}/${transformedStateId}`,
+                val,
+                adapter.config.defaultQoS,
+            );
         } else {
             adapter.log.warn(`Unknown mapping for "${stateId}"`);
         }
@@ -228,7 +306,7 @@ function MQTTServer(adapter) {
             val = undefined;
         }
         if (val !== undefined) {
-            task.cb    = _setState;
+            task.cb = _setState;
             task.cbArg = val;
         }
         tasks.push(task);
@@ -240,19 +318,37 @@ function MQTTServer(adapter) {
         if (tasks.length === 1) {
             processTasks();
         }
-	}
+    }
 
-    const specVars = ['Red', 'Green', 'Blue', 'WW', 'CW', 'Color', 'RGB_POWER', 'WW_POWER', 'CW_POWER', 'Hue', 'Saturation'];
+    const specVars = [
+        'Red',
+        'Green',
+        'Blue',
+        'WW',
+        'CW',
+        'Color',
+        'RGB_POWER',
+        'WW_POWER',
+        'CW_POWER',
+        'Hue',
+        'Saturation',
+    ];
     function onStateChangedColors(id, state, channelId, stateId) {
         if (!channelId) {
-            let parts  = id.split('.');
-            stateId    = parts.pop();
-
-            if (stateId === 'level' || stateId === 'state' || stateId === 'red' || stateId === 'blue' || stateId === 'green') {
+            let parts = id.split('.');
+            stateId = parts.pop();
+
+            if (
+                stateId === 'level' ||
+                stateId === 'state' ||
+                stateId === 'red' ||
+                stateId === 'blue' ||
+                stateId === 'green'
+            ) {
                 stateId = `${parts.pop()}.${stateId}`;
             }
 
-            channelId  = parts.splice(2, parts.length).join('.');
+            channelId = parts.splice(2, parts.length).join('.');
         }
         const ledModeIdExor = `${adapter.namespace}.${channelId}.modeLedExor`;
         if (cachedModeExor[ledModeIdExor] === undefined) {
@@ -278,7 +374,9 @@ function MQTTServer(adapter) {
                 if (!obj) {
                     adapter.log.warn(`Invalid rgbww obj for ${id}`);
                 } else if (typeof state.val !== 'string') {
-                    adapter.log.warn(`Invalid rgbww state value for ${id} : ${JSON.stringify(state.val)} needs to be a string`);
+                    adapter.log.warn(
+                        `Invalid rgbww state value for ${id} : ${JSON.stringify(state.val)} needs to be a string`,
+                    );
                 } else {
                     const role = obj.common.role;
                     let color;
@@ -311,13 +409,13 @@ function MQTTServer(adapter) {
                     const hidE = id.split('.');
                     const deviceDesc = `${hidE[0]}.${hidE[1]}.${hidE[2]}`;
                     let idAlive = `${deviceDesc}.Red`;
-                    adapter.setState(idAlive, 100 * parseInt(color.substring(0, 2), 16) / 255, true);
+                    adapter.setState(idAlive, (100 * parseInt(color.substring(0, 2), 16)) / 255, true);
 
                     idAlive = `${deviceDesc}.Green`;
-                    adapter.setState(idAlive, 100 * parseInt(color.substring(2, 4), 16) / 255, true);
+                    adapter.setState(idAlive, (100 * parseInt(color.substring(2, 4), 16)) / 255, true);
 
                     idAlive = `${deviceDesc}.Blue`;
-                    adapter.setState(idAlive, 100 * parseInt(color.substring(4, 6), 16) / 255, true);
+                    adapter.setState(idAlive, (100 * parseInt(color.substring(4, 6), 16)) / 255, true);
                 }
             });
         } else {
@@ -325,8 +423,10 @@ function MQTTServer(adapter) {
             const deviceDesc = `${hidE[0]}.${hidE[1]}.${hidE[2]}`;
             if (stateId.match(/Red\d?/)) {
                 // set red component
-                if (state.val > 100) state.val = 100;
-                const red = toPaddedHexString(Math.floor(255 * state.val / 100), 2);
+                if (state.val > 100) {
+                    state.val = 100;
+                }
+                const red = toPaddedHexString(Math.floor((255 * state.val) / 100), 2);
                 const idAlive = `${deviceDesc}.Color`;
                 adapter.getForeignState(idAlive, (err, state) => {
                     if (!state) {
@@ -339,11 +439,12 @@ function MQTTServer(adapter) {
                     adapter.setState(idAlive, `#${out}`, false);
                     setColor(channelId, out);
                 });
-            } else
-            if (stateId.match(/Green\d?/)) {
+            } else if (stateId.match(/Green\d?/)) {
                 // set green component
-                if (state.val > 100) state.val = 100;
-                const green = toPaddedHexString(Math.floor(255 * state.val / 100), 2);
+                if (state.val > 100) {
+                    state.val = 100;
+                }
+                const green = toPaddedHexString(Math.floor((255 * state.val) / 100), 2);
                 const idAlive = `${deviceDesc}.Color`;
                 adapter.getForeignState(idAlive, (err, state) => {
                     if (!state) {
@@ -356,11 +457,12 @@ function MQTTServer(adapter) {
                     adapter.setState(idAlive, `#${out}`, false);
                     setColor(channelId, out);
                 });
-            } else
-            if (stateId.match(/Blue\d?/)) {
+            } else if (stateId.match(/Blue\d?/)) {
                 // set blue component
-                if (state.val > 100) state.val = 100;
-                const blue = toPaddedHexString(Math.floor(255 * state.val / 100), 2);
+                if (state.val > 100) {
+                    state.val = 100;
+                }
+                const blue = toPaddedHexString(Math.floor((255 * state.val) / 100), 2);
                 const idAlive = `${deviceDesc}.Color`;
                 adapter.getForeignState(idAlive, (err, state) => {
                     if (!state) {
@@ -373,8 +475,7 @@ function MQTTServer(adapter) {
                     adapter.setState(idAlive, `#${out}`, false);
                     setColor(channelId, out);
                 });
-            } else
-            if (stateId.match(/RGB_POWER\d?/)) {
+            } else if (stateId.match(/RGB_POWER\d?/)) {
                 // set ww component
                 const rgbpow = state.val === 'true' || state.val === true || state.val === 1 || state.val === '1';
                 const idAlive = `${deviceDesc}.Color`;
@@ -407,16 +508,16 @@ function MQTTServer(adapter) {
                     setColor(channelId, out);
                     adapter.setState(idAlive, `#${out}`, false);
                     if (rgbpow) {
-                        setPower(channelId, true)
+                        setPower(channelId, true);
                     }
                     // if led_mode&1, exor white leds
-
                 });
-            } else
-            // calc hue + saturation params to rgb
-            if (hueCalc && stateId.match(/Hue\d?/)) {
+            } else if (hueCalc && stateId.match(/Hue\d?/)) {
+                // calc hue + saturation params to rgb
                 let hue = state.val;
-                if (hue > 359) hue = 359;
+                if (hue > 359) {
+                    hue = 359;
+                }
                 // recalc color by hue
                 const idAlive = `${deviceDesc}.Dimmer`;
                 adapter.getForeignState(idAlive, (err, state) => {
@@ -441,10 +542,11 @@ function MQTTServer(adapter) {
                         });
                     }
                 });
-            } else
-            if (hueCalc && stateId.match(/Saturation\d?/)) {
+            } else if (hueCalc && stateId.match(/Saturation\d?/)) {
                 let sat = state.val;
-                if (sat > 100) sat = 100;
+                if (sat > 100) {
+                    sat = 100;
+                }
                 // recalc color by saturation
                 const idAlive = `${deviceDesc}.Dimmer`;
                 adapter.getForeignState(idAlive, (err, state) => {
@@ -488,7 +590,8 @@ function MQTTServer(adapter) {
 
                         if (stateId.match(/WW_POWER\d?/)) {
                             // set ww component
-                            const wwpow = state.val === 'true' || state.val === true || state.val === 1 || state.val === '1';
+                            const wwpow =
+                                state.val === 'true' || state.val === true || state.val === 1 || state.val === '1';
                             const idAlive = `${deviceDesc}.Color`;
                             adapter.getForeignState(idAlive, (err, state) => {
                                 if (!state) {
@@ -506,24 +609,24 @@ function MQTTServer(adapter) {
                                     //adapter.log.info('reset white');
                                     out = `000000${ww}`;
                                     let idAlive = `${deviceDesc}.RGB_POWER`;
-                                    adapter.setState(idAlive,false, false);
+                                    adapter.setState(idAlive, false, false);
                                 }
 
                                 let idAlive = `${deviceDesc}.Color`;
-                                adapter.setState(idAlive,`#${out}`, false);
+                                adapter.setState(idAlive, `#${out}`, false);
                                 setColor(channelId, out);
 
                                 // set ww channel
                                 idAlive = `${deviceDesc}.WW`;
-                                adapter.setState(idAlive, 100 * parseInt(out.substring(6, 8), 16) / 255, true);
+                                adapter.setState(idAlive, (100 * parseInt(out.substring(6, 8), 16)) / 255, true);
 
                                 // in case POWER is off, switch it on
-                                wwpow && setPower(channelId, true)
+                                wwpow && setPower(channelId, true);
                             });
-                        } else
-                        if (stateId.match(/CW_POWER\d?/)) {
+                        } else if (stateId.match(/CW_POWER\d?/)) {
                             // set ww component
-                            const cwpow = state.val === 'true' || state.val === true || state.val === 1 || state.val === '1';
+                            const cwpow =
+                                state.val === 'true' || state.val === true || state.val === 1 || state.val === '1';
                             const idAlive = `${deviceDesc}.Color`;
                             adapter.getForeignState(idAlive, (err, state) => {
                                 if (!state) {
@@ -550,7 +653,7 @@ function MQTTServer(adapter) {
 
                                 // set cw channel
                                 idAlive = `${deviceDesc}.CW`;
-                                adapter.setState(idAlive, 100 * parseInt(out.substring(6, 8), 16) / 255, true);
+                                adapter.setState(idAlive, (100 * parseInt(out.substring(6, 8), 16)) / 255, true);
 
                                 // in case POWER is off, switch it on
                                 if (cwpow) {
@@ -558,10 +661,9 @@ function MQTTServer(adapter) {
                                     adapter.setState(idAlive, true, false);
                                 }
                             });
-                        } else
-                        if (stateId.match(/WW\d?/)) {
+                        } else if (stateId.match(/WW\d?/)) {
                             // set ww component
-                            const ww = toPaddedHexString(Math.floor(255 * state.val / 100), 2);
+                            const ww = toPaddedHexString(Math.floor((255 * state.val) / 100), 2);
                             const idAlive = `${deviceDesc}.Color`;
                             adapter.getForeignState(idAlive, (err, state) => {
                                 if (!state) {
@@ -573,10 +675,9 @@ function MQTTServer(adapter) {
                                 const out = color.substring(0, wwindex) + ww;
                                 setColor(channelId, out);
                             });
-                        } else
-                        if (stateId.match(/CW\d?/)) {
+                        } else if (stateId.match(/CW\d?/)) {
                             // set ww component
-                            const cw = toPaddedHexString(Math.floor(255 * state.val / 100), 2);
+                            const cw = toPaddedHexString(Math.floor((255 * state.val) / 100), 2);
                             const idAlive = `${deviceDesc}.Color`;
                             adapter.getForeignState(idAlive, (err, state) => {
                                 if (!state) {
@@ -599,9 +700,30 @@ function MQTTServer(adapter) {
         adapter.log.debug(`onStateChange ${id}: ${JSON.stringify(state)}`);
         if (server && state && !state.ack) {
             // find client.id
-            let parts       = id.split('.');
-            const stateId   = parts.pop();
+            let parts = id.split('.');
+            const stateId = parts.pop();
             const channelId = parts.splice(2, parts.length).join('.');
+
+            // Check if this is a Zigbee device state change
+            // Pattern: ZbReceived_DEVICEID_ATTRIBUTE (e.g., ZbReceived_0x0856_Power)
+            const zbMatch = stateId.match(/^ZbReceived_([^_]+)_(Power|Dimmer)$/);
+            if (zbMatch && clients[mappingClients[channelId]]) {
+                const deviceId = zbMatch[1];
+                const attribute = zbMatch[2];
+                let zbValue;
+
+                // Convert values for Zigbee commands
+                if (attribute === 'Power') {
+                    zbValue = state.val ? '1' : '0';
+                } else if (attribute === 'Dimmer') {
+                    zbValue = state.val;
+                }
+
+                adapter.log.debug(`Sending ZbSend command for device ${deviceId}: ${attribute}=${zbValue}`);
+                setZbSendCommand(mappingClients[channelId], deviceId, attribute, zbValue);
+                return;
+            }
+
             if (clients[mappingClients[channelId]]) {
                 // check for special led-stripe vars
                 if (!specVars.includes(stateId)) {
@@ -616,10 +738,18 @@ function MQTTServer(adapter) {
                                     setStateImmediate(mappingClients[channelId], stateId, state.val ? 'ON' : 'OFF');
                                     break;
                                 case 'number':
-                                    setStateImmediate(mappingClients[channelId], stateId, state.val === null ? '' : state.val.toString());
+                                    setStateImmediate(
+                                        mappingClients[channelId],
+                                        stateId,
+                                        state.val === null ? '' : state.val.toString(),
+                                    );
                                     break;
                                 case 'string':
-                                    setStateImmediate(mappingClients[channelId], stateId, (state.val === null) ? '' : state.val.toString());
+                                    setStateImmediate(
+                                        mappingClients[channelId],
+                                        stateId,
+                                        state.val === null ? '' : state.val.toString(),
+                                    );
                                     break;
                             }
                         }
@@ -634,7 +764,9 @@ function MQTTServer(adapter) {
                 // or state = false
                 // or state.ack = true
                 // or clients[channelId] = false
-                adapter.log.warn(`Client "${channelId}" not connected`);
+                if (!adapter.config.ignoreNotConnectedWarnings) {
+                    adapter.log.info(`Client "${channelId}" not connected`);
+                }
 
                 /*
                  if (!clients[channelId]) {
@@ -679,9 +811,9 @@ function MQTTServer(adapter) {
                             task.data = JSON.parse(JSON.stringify(task.data)); // copy
                             delete task.data.common.storeMap;
                         }
-                        adapter.setForeignObject(task.id, task.data, (err) => {
+                        adapter.setForeignObject(task.id, task.data, err => {
                             if (err) {
-                                adapter.log.warn(`New object creation error: ${err.message}`)
+                                adapter.log.warn(`New object creation error: ${err.message}`);
                             } else {
                                 adapter.log.info(`New object created: ${task.id}`);
                             }
@@ -702,7 +834,7 @@ function MQTTServer(adapter) {
                         }
                         adapter.setForeignObject(task.id, obj, err => {
                             if (err) {
-                                adapter.log.warn(`Object update error: ${err.message}`)
+                                adapter.log.warn(`Object update error: ${err.message}`);
                             } else {
                                 adapter.log.info(`Object updated: ${task.id}`);
                             }
@@ -787,14 +919,14 @@ function MQTTServer(adapter) {
             _id: id,
             common: {
                 name: client.id,
-                desc: ''
+                desc: '',
             },
             native: {
-                clientId: client.id
+                clientId: client.id,
             },
-            type: 'channel'
+            type: 'channel',
         };
-        tasks.push({type: 'addObject', id: obj._id, data: obj});
+        tasks.push({ type: 'addObject', id: obj._id, data: obj });
 
         obj = {
             _id: `${id}.alive`,
@@ -803,11 +935,11 @@ function MQTTServer(adapter) {
                 role: 'indicator.reachable',
                 read: true,
                 write: false,
-                name: `${client.id} alive`
+                name: `${client.id} alive`,
             },
-            type: 'state'
+            type: 'state',
         };
-        tasks.push({type: 'addObject', id: obj._id, data: obj});
+        tasks.push({ type: 'addObject', id: obj._id, data: obj });
         if (isStart) {
             processTasks(callback);
         } else {
@@ -830,7 +962,7 @@ function MQTTServer(adapter) {
                             role: 'indicator.reachable',
                             type: 'boolean',
                             read: true,
-                            write: false
+                            write: false,
                         },
                         native: {
                             ip: clients[id].stream.remoteAddress,
@@ -838,9 +970,10 @@ function MQTTServer(adapter) {
                         },
                     });
                 } else {
-                    if (clients[id] &&
+                    if (
+                        clients[id] &&
                         (clientObj.native.port !== clients[id].stream.remotePort ||
-                        clientObj.native.ip !== clients[id].stream.remoteAddress)
+                            clientObj.native.ip !== clients[id].stream.remoteAddress)
                     ) {
                         clientObj.native.port = clients[id].stream.remotePort;
                         clientObj.native.ip = clients[id].stream.remoteAddress;
@@ -887,8 +1020,8 @@ function MQTTServer(adapter) {
             retain = undefined;
         }
         adapter.log.debug(`Send to "${client.id}": ${topic} = ${state}`);
-        client.publish({topic: topic, payload: state, qos: qos, retain: retain, messageId: messageId++}, cb);
-        messageId &= 0xFFFFFFFF;
+        client.publish({ topic: topic, payload: state, qos: qos, retain: retain, messageId: messageId++ }, cb);
+        messageId &= 0xffffffff;
     }
 
     function resendMessages2Client(client, messages, i) {
@@ -897,7 +1030,9 @@ function MQTTServer(adapter) {
             try {
                 messages[i].ts = Date.now();
                 messages[i].count++;
-                adapter.log.debug(`Client [${client.id}] resend messages on connect: ${messages[i].topic} = ${messages[i].payload}`);
+                adapter.log.debug(
+                    `Client [${client.id}] resend messages on connect: ${messages[i].topic} = ${messages[i].payload}`,
+                );
                 if (messages[i].cmd === 'publish') {
                     client.publish(messages[i]);
                 }
@@ -915,18 +1050,20 @@ function MQTTServer(adapter) {
         }
     }
 
-    function addObject(attr, client, prefix, path) {
-        let replaceAttr = types[attr].replace || attr;
+    function addObject(typeKey, client, prefix, path) {
+        // Extract the actual attribute name for the state ID construction
+        const attr = typeKey.includes('_') && path.length > 0 ? typeKey.split('_').pop() : typeKey;
+        let replaceAttr = types[typeKey].replace || attr;
         let id = `${adapter.namespace}.${client.iobId}.${prefix ? `${prefix}.` : ''}${path.length ? `${path.join('_')}_` : ''}${replaceAttr.replace(FORBIDDEN_CHARS, '_')}`;
         let obj = {
             type: 'addObject',
             id: id,
             data: {
                 _id: id,
-                common: Object.assign({}, types[attr]),
+                common: Object.assign({}, types[typeKey]),
                 native: {},
-                type: 'state'
-            }
+                type: 'state',
+            },
         };
         obj.data.common.name = `${client.id} ${prefix ? `${prefix} ` : ''}${path.length ? `${path.join(' ')} ` : ''} ${replaceAttr}`;
         return obj;
@@ -946,15 +1083,24 @@ function MQTTServer(adapter) {
             });
         }
 
-        path   = path || [];
+        path = path || [];
         prefix = prefix || '';
 
+        // Extract pressure and temperature units if available at this level for nested data
+        const pressureUnit = data.PressureUnit || (unit && typeof unit === 'object' ? unit.pressureUnit : undefined);
+        const tempUnit = data.TempUnit || (unit && typeof unit === 'object' ? unit.tempUnit : undefined);
+
         for (let attr in data) {
-            if (!data.hasOwnProperty(attr)) {
+            if (!Object.prototype.hasOwnProperty.call(data, attr)) {
                 adapter.log.warn(`[${client.id}] attr error: ${attr}${data[attr]}`);
                 continue;
             }
 
+            // Skip unit fields - they are used for dynamic unit override, not as states
+            if (attr === 'TempUnit' || attr === 'PressureUnit') {
+                continue;
+            }
+
             if (typeof data[attr] === 'object') {
                 // check for arrays
                 if (types[attr]) {
@@ -975,8 +1121,8 @@ function MQTTServer(adapter) {
                                     _id: id,
                                     common: Object.assign({}, types[attr]),
                                     native: {},
-                                    type: 'state'
-                                }
+                                    type: 'state',
+                                },
                             };
                             obj.data.common.name = `${client.id} ${prefix ? `${prefix} ` : ''}${path.length ? `${path.join(' ')} ` : ''} ${replaceAttr}`;
                             obj.data.common.type = typeof val;
@@ -988,29 +1134,45 @@ function MQTTServer(adapter) {
                     } else {
                         let nPath = Object.assign([], path);
                         nPath.push(attr.replace(FORBIDDEN_CHARS, '_'));
-                        checkData(client, topic, prefix, data[attr], unit, nPath);
+                        const nestedUnits = pressureUnit || tempUnit ? { pressureUnit, tempUnit } : unit;
+                        checkData(client, topic, prefix, data[attr], nestedUnits, nPath);
                         nPath = undefined;
                     }
                 } else {
                     let nPath = Object.assign([], path);
                     nPath.push(attr.replace(FORBIDDEN_CHARS, '_'));
+                    const nestedUnits = pressureUnit || tempUnit ? { pressureUnit, tempUnit } : unit;
                     if (adapter.config.OBJ_TREE) {
-                        checkData(client, topic, `${prefix}.${nPath}`, data[attr], unit);
+                        checkData(client, topic, `${prefix}.${nPath}`, data[attr], nestedUnits);
                     } else {
-                        checkData(client, topic, prefix, data[attr], unit, nPath);
+                        checkData(client, topic, prefix, data[attr], nestedUnits, nPath);
                     }
                     nPath = undefined;
                 }
-            } else if (types[attr]) {
+            } else if (types[attr] || (path.length > 0 && types[`${path.join('_')}_${attr}`])) {
                 let allowReadColors;
 
+                // Check for path-based type definition first, then fallback to simple attr type
+                const typeKey =
+                    path.length > 0 && types[`${path.join('_')}_${attr}`] ? `${path.join('_')}_${attr}` : attr;
+
                 // create object
-                const obj = addObject(attr, client, prefix, path);
-                let replaceAttr = types[attr].replace || attr;
+                const obj = addObject(typeKey, client, prefix, path);
+                let replaceAttr = types[typeKey].replace || attr;
 
                 if (obj.data.common.storeMap) {
                     delete obj.data.common.storeMap;
-                    client._map[replaceAttr] = topic.replace(/$\w+\//, 'cmnd/').replace(/\/\w+$/, `/${replaceAttr}`);
+                    client._map[replaceAttr] = topic.replace(/^\w+\//, 'cmnd/').replace(/\/\w+$/, `/${replaceAttr}`);
+                }
+
+                // handle dynamic pressure unit override
+                if (attr === 'Pressure' && pressureUnit && typeof pressureUnit === 'string') {
+                    obj.data.common.unit = pressureUnit;
+                }
+
+                // handle dynamic temperature unit override
+                if (attr === 'Temperature' && tempUnit && typeof tempUnit === 'string') {
+                    obj.data.common.unit = tempUnit;
                 }
 
                 // adaptions for magichome tasmota
@@ -1020,7 +1182,7 @@ function MQTTServer(adapter) {
 
                     // if ledFlags bit 2, read color from tasmota, else ignore
                     if (data[attr].length === 10) {
-                        obj.data.common.role = 'level.color.rgbcwww';  // RGB + cold white + white???
+                        obj.data.common.role = 'level.color.rgbcwww'; // RGB + cold white + white???
                     } else if (data[attr].length === 8) {
                         obj.data.common.role = 'level.color.rgbww'; // RGB + White
                     } else {
@@ -1043,15 +1205,24 @@ function MQTTServer(adapter) {
 
                         xObj = addObject('Red', client, prefix, path);
                         xObj.data.common.read = allowReadColors;
-                        updateState(xObj, allowReadColors ? 100 * parseInt(data[attr].substring(0, 2), 16) / 255 : undefined);
+                        updateState(
+                            xObj,
+                            allowReadColors ? (100 * parseInt(data[attr].substring(0, 2), 16)) / 255 : undefined,
+                        );
 
                         xObj = addObject('Green', client, prefix, path);
                         xObj.data.common.read = allowReadColors;
-                        updateState(xObj, allowReadColors ? 100 * parseInt(data[attr].substring(2, 4), 16) / 255 : undefined);
+                        updateState(
+                            xObj,
+                            allowReadColors ? (100 * parseInt(data[attr].substring(2, 4), 16)) / 255 : undefined,
+                        );
 
                         xObj = addObject('Blue', client, prefix, path);
                         xObj.data.common.read = allowReadColors;
-                        updateState(xObj, allowReadColors ? 100 * parseInt(data[attr].substring(4, 6), 16) / 255 : undefined);
+                        updateState(
+                            xObj,
+                            allowReadColors ? (100 * parseInt(data[attr].substring(4, 6), 16)) / 255 : undefined,
+                        );
 
                         xObj = addObject('RGB_POWER', client, prefix, path);
                         xObj.data.common.read = allowReadColors;
@@ -1062,30 +1233,38 @@ function MQTTServer(adapter) {
                             // rgbww
                             xObj = addObject('WW', client, prefix, path);
                             xObj.data.common.read = allowReadColors;
-                            updateState(xObj, allowReadColors ? 100 * parseInt(data[attr].substring(6, 8), 16) / 255 : undefined);
+                            updateState(
+                                xObj,
+                                allowReadColors ? (100 * parseInt(data[attr].substring(6, 8), 16)) / 255 : undefined,
+                            );
 
                             xObj = addObject('WW_POWER', client, prefix, path);
                             xObj.data.common.read = allowReadColors;
-                            updateState(xObj, allowReadColors ? (val > 0) : undefined);
-                        } else
-                        if (obj.data.common.role === 'level.color.rgbcwww') {
+                            updateState(xObj, allowReadColors ? val > 0 : undefined);
+                        } else if (obj.data.common.role === 'level.color.rgbcwww') {
                             // rgbcwww
                             xObj = addObject('CW', client, prefix, path);
                             xObj.data.common.read = allowReadColors;
-                            updateState(xObj, allowReadColors ? 100 * parseInt(data[attr].substring(6, 8), 16) / 255 : undefined);
+                            updateState(
+                                xObj,
+                                allowReadColors ? (100 * parseInt(data[attr].substring(6, 8), 16)) / 255 : undefined,
+                            );
 
                             xObj = addObject('CW_POWER', client, prefix, path);
                             xObj.data.common.read = allowReadColors;
-                            updateState(xObj, allowReadColors ? (val > 0) : undefined);
+                            updateState(xObj, allowReadColors ? val > 0 : undefined);
 
                             xObj = addObject('WW', client, prefix, path);
                             xObj.data.common.read = allowReadColors;
-                            updateState(xObj, allowReadColors ? 100 * parseInt(data[attr].substring(8, 10), 16) / 255 : undefined);
+                            updateState(
+                                xObj,
+                                allowReadColors ? (100 * parseInt(data[attr].substring(8, 10), 16)) / 255 : undefined,
+                            );
 
                             xObj = addObject('WW_POWER', client, prefix, path);
                             xObj.data.common.read = allowReadColors;
                             val = parseInt(data[attr].substring(8, 10), 16);
-                            updateState(xObj, allowReadColors ? (val > 0) : undefined);
+                            updateState(xObj, allowReadColors ? val > 0 : undefined);
                         }
                     }
                 }
@@ -1116,6 +1295,42 @@ function MQTTServer(adapter) {
 
                 updateState(obj, val);
 
+                // Special handling for Zigbee devices: create writable control states for Power and Dimmer
+                if (
+                    (attr === 'Power' || attr === 'Dimmer') &&
+                    prefix === 'SENSOR' &&
+                    path.length >= 2 &&
+                    path[0] === 'ZbReceived'
+                ) {
+                    // Extract device ID from path (e.g., ZbReceived_0x0856_Power -> 0x0856)
+                    const deviceId = path[1];
+
+                    // Create a writable control state for Zigbee devices
+                    let controlObj = Object.assign({}, obj);
+
+                    // Modify object properties for control state
+                    if (attr === 'Power') {
+                        // For Zigbee Power: boolean switch, not power consumption in watts
+                        controlObj.data.common = {
+                            type: 'boolean',
+                            role: 'switch',
+                            read: true,
+                            write: true,
+                            name: `${client.id} ${prefix ? `${prefix} ` : ''}${path.join(' ')} ${attr} Control`,
+                        };
+                        // Convert numeric power value (0/1) to boolean for control state
+                        const controlVal = Boolean(val);
+                        updateState(controlObj, controlVal);
+                    } else if (attr === 'Dimmer') {
+                        // For Zigbee Dimmer: ensure it's writable
+                        controlObj.data.common.write = true;
+                        controlObj.data.common.name = `${client.id} ${prefix ? `${prefix} ` : ''}${path.join(' ')} ${attr} Control`;
+                        updateState(controlObj, val);
+                    }
+
+                    adapter.log.debug(`Created Zigbee control state for device ${deviceId}: ${controlObj.id}`);
+                }
+
                 if (powerStateFound) {
                     adapter.log.debug(`Got .STATE.POWER update, auto syncing .POWER (src: ${obj.id})`);
                     let powerObj = Object.assign({}, obj);
@@ -1130,22 +1345,23 @@ function MQTTServer(adapter) {
                 // tele/sonoff/SENSOR  tele/sonoff/STATE => read only
                 // stat/sonoff/RESULT => read,write
 
-				let parts = topic.split('/');
-				// auto generate objects
-				if ((parts[0] === 'tele' && (
-						(adapter.config.TELE_SENSOR && parts[2] === 'SENSOR') ||
-						(adapter.config.STAT_RESULT && parts[2] === 'RESULT') ||
-						(adapter.config.TELE_STATE  && parts[2] === 'STATE'))) ||
-					(parts[0] === 'stat' &&
-						(adapter.config.STAT_RESULT && parts[2] === 'RESULT'))
-				) {
-					let val = data[attr];
-					let attributes = {role: 'value', read: true, write: false};
-					if (parts[2] === 'RESULT') {
-					    // control
+                let parts = topic.split('/');
+                // auto generate objects
+                if (
+                    (parts[0] === 'tele' &&
+                        ((adapter.config.TELE_SENSOR && parts[2] === 'SENSOR') ||
+                            (adapter.config.STAT_RESULT && parts[2] === 'RESULT') ||
+                            (adapter.config.TELE_STATE && parts[2] === 'STATE') ||
+                            (adapter.config.TELE_MARGINS && parts[2] === 'MARGINS'))) ||
+                    (parts[0] === 'stat' && adapter.config.STAT_RESULT && parts[2] === 'RESULT')
+                ) {
+                    let val = data[attr];
+                    let attributes = { role: 'value', read: true, write: false };
+                    if (parts[2] === 'RESULT') {
+                        // control
                         attributes.write = true;
                         attributes.role = 'level';
-					}
+                    }
 
                     attributes.type = typeof val;
                     if (!['number', 'string', 'boolean'].includes(attributes.type)) {
@@ -1153,19 +1369,19 @@ function MQTTServer(adapter) {
                         val = (val || '').toString();
                     }
 
-					let replaceAttr = attr ;
-					let id = `${adapter.namespace}.${client.iobId}.${prefix ? `${prefix}.` : ''}${path.length ? `${path.join('_')}_` : ''}${replaceAttr}`;
-					let obj = {
-						type: 'addObject',
-						id: id,
-						data: {
-							_id: id,
-							common: attributes,
-							native: {},
-							type: 'state'
-						}
-					};
-					obj.data.common.name = `${client.id} ${prefix ? `${prefix} ` : ''}${path.length ? `${path.join(' ')} ` : ''} ${replaceAttr}`;
+                    let replaceAttr = attr;
+                    let id = `${adapter.namespace}.${client.iobId}.${prefix ? `${prefix}.` : ''}${path.length ? `${path.join('_')}_` : ''}${replaceAttr}`;
+                    let obj = {
+                        type: 'addObject',
+                        id: id,
+                        data: {
+                            _id: id,
+                            common: attributes,
+                            native: {},
+                            type: 'state',
+                        },
+                    };
+                    obj.data.common.name = `${client.id} ${prefix ? `${prefix} ` : ''}${path.length ? `${path.join(' ')} ` : ''} ${replaceAttr}`;
                     // due to some (for ex. NSPanel) versions do not automatically send .POWER switch data
                     // but this is generally a default for all devices (state cannot exist without switch) we now add
                     // POWER switches automatically if we get POWER STATE
@@ -1185,7 +1401,7 @@ function MQTTServer(adapter) {
                         powerObj.data.common.name = powerName;
                         updateState(powerObj, val);
                     }
-				}
+                }
             }
         }
     }
@@ -1199,7 +1415,7 @@ function MQTTServer(adapter) {
         client.states[packet.topic] = {
             message: packet.payload,
             retain: packet.retain,
-            qos: packet.qos
+            qos: packet.qos,
         };
 
         // update alive state
@@ -1276,8 +1492,12 @@ function MQTTServer(adapter) {
             // ignore: stat/Sonoff/RESULT = {"POWER":"ON"}
             // testserver.js reports error, so reject above cmd
             const str = val.replace(/\s+/g, '');
-            if (str.startsWith('{"POWER":"ON"}')) return;
-            if (str.startsWith('{"POWER":"OFF"}')) return;
+            if (str.startsWith('{"POWER":"ON"}')) {
+                return;
+            }
+            if (str.startsWith('{"POWER":"OFF"}')) {
+                return;
+            }
 
             if (parts[0] === 'stat' || parts[0] === 'tele') {
                 try {
@@ -1307,7 +1527,7 @@ function MQTTServer(adapter) {
                     } else if (stateId.match(/^(WAKEUP)\d?$/)) {
                         checkData(client, packet.topic, 'WAKEUP', JSON.parse(val));
                     } else if (stateId.match(/^(RESULT)\d?$/)) {
-                        checkData(client, packet.topic, 'WAKEUP', JSON.parse(val));
+                        checkData(client, packet.topic, 'RESULT', JSON.parse(val));
                     }
                 } else {
                     checkData(client, packet.topic, NO_PREFIX, JSON.parse(val));
@@ -1332,6 +1552,13 @@ function MQTTServer(adapter) {
             } catch (e) {
                 adapter.log.warn(`Client [${client.id}] cannot parse data"${stateId}": _${val}_ - ${e}`);
             }
+        } else if (parts[0] === 'tele' && stateId.match(/^(MARGINS)\d?$/)) {
+            // tele/sonoffPOW/MARGINS = {"Time":"2020-04-23T10:15:00","PowerLow":100,"PowerHigh":2000,"PowerDelta":50}
+            try {
+                checkData(client, packet.topic, 'MARGINS', JSON.parse(val));
+            } catch (e) {
+                adapter.log.warn(`Client [${client.id}] cannot parse data"${stateId}": _${val}_ - ${e}`);
+            }
         } else if (types[stateId]) {
             // /ESP_BOX/BM280/Pressure = 1010.09
             // /ESP_BOX/BM280/Humidity = 42.39
@@ -1350,15 +1577,14 @@ function MQTTServer(adapter) {
                         _id: id,
                         common: JSON.parse(JSON.stringify(types[stateId])),
                         native: {},
-                        type: 'state'
-                    }
+                        type: 'state',
+                    },
                 };
                 obj.data.common.name = `${client.id} ${stateId}`;
 
                 // push only new objects
                 updateState(obj, () => {
                     if (parts[0] === 'cmnd') {
-
                         // Set Object fix
                         if (obj.data.common.type === 'number') {
                             adapter.setState(id, parseFloat(val), true);
@@ -1395,7 +1621,9 @@ function MQTTServer(adapter) {
     }
 
     function clientClose(client, reason) {
-        if (!client) return;
+        if (!client) {
+            return;
+        }
 
         if (persistentSessions[client.id]) {
             persistentSessions[client.id].connected = false;
@@ -1407,7 +1635,7 @@ function MQTTServer(adapter) {
         }
 
         try {
-            if (clients[client.id] && (client.__secret === clients[client.id].__secret)) {
+            if (clients[client.id] && client.__secret === clients[client.id].__secret) {
                 adapter.log.info(`Client [${client.id}] connection closed: ${reason}`);
                 updateAlive(client, false);
                 delete clients[client.id];
@@ -1429,12 +1657,18 @@ function MQTTServer(adapter) {
         const now = Date.now();
         resending = true;
         for (const clientId in clients) {
-            if (clients.hasOwnProperty(clientId) && clients[clientId] && clients[clientId]._messages) {
+            if (
+                Object.prototype.hasOwnProperty.call(clients, clientId) &&
+                clients[clientId] &&
+                clients[clientId]._messages
+            ) {
                 for (let m = clients[clientId]._messages.length - 1; m >= 0; m--) {
                     const message = clients[clientId]._messages[m];
                     if (now - message.ts >= adapter.config.retransmitInterval) {
                         if (message.count > adapter.config.retransmitCount) {
-                            adapter.log.warn(`Client [${clientId}] message ${message.messageId} deleted after ${message.count} retries`);
+                            adapter.log.warn(
+                                `Client [${clientId}] message ${message.messageId} deleted after ${message.count} retries`,
+                            );
                             clients[clientId]._messages.splice(m, 1);
                             continue;
                         }
@@ -1443,7 +1677,9 @@ function MQTTServer(adapter) {
                         message.count++;
                         message.ts = now;
                         try {
-                            adapter.log.debug(`Client [${clientId}] resend message topic: ${message.topic}, payload: ${message.payload}`);
+                            adapter.log.debug(
+                                `Client [${clientId}] resend message topic: ${message.topic}, payload: ${message.payload}`,
+                            );
                             if (message.cmd === 'publish') {
                                 clients[clientId].publish(message);
                             }
@@ -1465,7 +1701,7 @@ function MQTTServer(adapter) {
         // delete old sessions
         if (adapter.config.storeClientsTime !== -1) {
             for (const id in persistentSessions) {
-                if (persistentSessions.hasOwnProperty(id)) {
+                if (Object.prototype.hasOwnProperty.call(persistentSessions, id)) {
                     if (now - persistentSessions[id].lastSeen > adapter.config.storeClientsTime * 60000) {
                         delete persistentSessions[id];
                     }
@@ -1502,10 +1738,9 @@ function MQTTServer(adapter) {
                     if (options.password) {
                         options.password = options.password.toString();
                     }
-                    if (config.user !== options.username ||
-                        config.password !== options.password) {
+                    if (config.user !== options.username || config.password !== options.password) {
                         adapter.log.warn(`Client [${client.id}] has invalid password or username`);
-                        client.connack({returnCode: 4});
+                        client.connack({ returnCode: 4 });
                         if (oldClient) {
                             // delete existing client
                             delete clients[client.id];
@@ -1519,12 +1754,13 @@ function MQTTServer(adapter) {
                 }
 
                 if (oldClient) {
-                    adapter.log.info(`Client [${client.id}] reconnected. Old secret ${clients[client.id].__secret} ==> New secret ${client.__secret}`);
+                    adapter.log.info(
+                        `Client [${client.id}] reconnected. Old secret ${clients[client.id].__secret} ==> New secret ${client.__secret}`,
+                    );
                     // need to destroy the old client
 
                     if (client.__secret !== clients[client.id].__secret) {
                         // it is another socket!!
-
                         // It was following situation:
                         // - old connection was active
                         // - new connection is on the same TCP
@@ -1546,7 +1782,7 @@ function MQTTServer(adapter) {
                             _subsID: {},
                             _subs: {},
                             messages: [],
-                            lastSeen: Date.now()
+                            lastSeen: Date.now(),
                         };
                     }
                     client._messages = persistentSessions[client.id].messages;
@@ -1556,7 +1792,7 @@ function MQTTServer(adapter) {
                 }
                 client._messages = client._messages || [];
 
-                client.connack({returnCode: 0, sessionPresent});
+                client.connack({ returnCode: 0, sessionPresent });
                 clients[client.id] = client;
                 updateClients();
 
@@ -1567,10 +1803,14 @@ function MQTTServer(adapter) {
                         client._subs = persistentSessions[client.id]._subs;
                         if (persistentSessions[client.id].messages.length) {
                             // give to the client a little bit time
-                            client._resendonStart = setTimeout(clientId => {
-                                client._resendonStart = null;
-                                resendMessages2Client(client, persistentSessions[clientId].messages);
-                            }, 100, client.id);
+                            client._resendonStart = setTimeout(
+                                clientId => {
+                                    client._resendonStart = null;
+                                    resendMessages2Client(client, persistentSessions[clientId].messages);
+                                },
+                                100,
+                                client.id,
+                            );
                         }
                     }
                 });
@@ -1590,7 +1830,10 @@ function MQTTServer(adapter) {
 
             client.on('publish', packet => {
                 if (clients[client.id] && client.__secret !== clients[client.id].__secret) {
-                    !adapter.config.ignorePings && adapter.log.warn(`Old client ${client.id} with secret ${client.__secret} sends publish. Ignore! Actual secret is ${clients[client.id].__secret}`);
+                    !adapter.config.ignorePings &&
+                        adapter.log.warn(
+                            `Old client ${client.id} with secret ${client.__secret} sends publish. Ignore! Actual secret is ${clients[client.id].__secret}`,
+                        );
                     return;
                 }
 
@@ -1600,32 +1843,35 @@ function MQTTServer(adapter) {
 
                 if (packet.qos === 1) {
                     // send PUBACK to a client
-                    client.puback({messageId: packet.messageId});
+                    client.puback({ messageId: packet.messageId });
                 } else if (packet.qos === 2) {
                     const pack = client._messages && client._messages.find(e => e.messageId === packet.messageId);
                     if (pack) {
                         // duplicate message => ignore
-                        adapter.log.warn(`Client [${client.id}] ignored duplicate message with ID: ${packet.messageId}`);
-                        return;
-                    } else {
-                        packet.ts = Date.now();
-                        packet.cmd = 'pubrel';
-                        packet.count = 0;
-                        client._messages.push(packet);
-
-                        client.pubrec({messageId: packet.messageId});
+                        adapter.log.warn(
+                            `Client [${client.id}] ignored duplicate message with ID: ${packet.messageId}`,
+                        );
                         return;
                     }
-                }
+                    packet.ts = Date.now();
+                    packet.cmd = 'pubrel';
+                    packet.count = 0;
+                    client._messages.push(packet);
 
+                    client.pubrec({ messageId: packet.messageId });
+                    return;
+                }
 
-                receivedTopic(packet, client)
+                receivedTopic(packet, client);
             });
 
             // response for QoS2
             client.on('pubrec', packet => {
                 if (clients[client.id] && client.__secret !== clients[client.id].__secret) {
-                    !adapter.config.ignorePings && adapter.log.warn(`Old client ${client.id} with secret ${client.__secret} sends pubrec. Ignore! Actual secret is ${clients[client.id].__secret}`);
+                    !adapter.config.ignorePings &&
+                        adapter.log.warn(
+                            `Old client ${client.id} with secret ${client.__secret} sends pubrec. Ignore! Actual secret is ${clients[client.id].__secret}`,
+                        );
                     return;
                 }
 
@@ -1635,23 +1881,29 @@ function MQTTServer(adapter) {
 
                 let pos = null;
                 // remove this message from queue
-                client._messages && client._messages.forEach((e, i) => {
-                    if (e.messageId === packet.messageId) {
-                        pos = i;
-                        return false;
-                    }
-                });
+                client._messages &&
+                    client._messages.forEach((e, i) => {
+                        if (e.messageId === packet.messageId) {
+                            pos = i;
+                            return false;
+                        }
+                    });
                 if (pos !== null) {
-                    client.pubrel({messageId: packet.messageId});
+                    client.pubrel({ messageId: packet.messageId });
                 } else {
-                    adapter.log.warn(`Client [${client.id}] received pubrec on ${client.id} for unknown message ID: ${packet.messageId}`);
+                    adapter.log.warn(
+                        `Client [${client.id}] received pubrec on ${client.id} for unknown message ID: ${packet.messageId}`,
+                    );
                 }
             });
 
             // response for QoS2
             client.on('pubcomp', packet => {
                 if (clients[client.id] && client.__secret !== clients[client.id].__secret) {
-                    !adapter.config.ignorePings && adapter.log.warn(`Old client ${client.id} with secret ${client.__secret} sends pubcomp. Ignore! Actual secret is ${clients[client.id].__secret}`);
+                    !adapter.config.ignorePings &&
+                        adapter.log.warn(
+                            `Old client ${client.id} with secret ${client.__secret} sends pubcomp. Ignore! Actual secret is ${clients[client.id].__secret}`,
+                        );
                     return;
                 }
 
@@ -1661,16 +1913,19 @@ function MQTTServer(adapter) {
 
                 let pos = null;
                 // remove this message from queue
-                client._messages && client._messages.forEach((e, i) => {
-                    if (e.messageId === packet.messageId) {
-                        pos = i;
-                        return false;
-                    }
-                });
+                client._messages &&
+                    client._messages.forEach((e, i) => {
+                        if (e.messageId === packet.messageId) {
+                            pos = i;
+                            return false;
+                        }
+                    });
                 if (pos !== null) {
                     client._messages.splice(pos, 1);
                 } else {
-                    adapter.log.warn(`Client [${client.id}] received pubcomp for unknown message ID: ${packet.messageId}`);
+                    adapter.log.warn(
+                        `Client [${client.id}] received pubcomp for unknown message ID: ${packet.messageId}`,
+                    );
                 }
             });
 
@@ -1680,7 +1935,10 @@ function MQTTServer(adapter) {
                     return;
                 }
                 if (clients[client.id] && client.__secret !== clients[client.id].__secret) {
-                    !adapter.config.ignorePings && adapter.log.warn(`Old client ${client.id} with secret ${client.__secret} sends pubrel. Ignore! Actual secret is ${clients[client.id].__secret}`);
+                    !adapter.config.ignorePings &&
+                        adapter.log.warn(
+                            `Old client ${client.id} with secret ${client.__secret} sends pubrel. Ignore! Actual secret is ${clients[client.id].__secret}`,
+                        );
                     return;
                 }
 
@@ -1690,27 +1948,33 @@ function MQTTServer(adapter) {
 
                 let pos = null;
                 // remove this message from queue
-                client._messages && client._messages.forEach((e, i) => {
-                    if (e.messageId === packet.messageId) {
-                        pos = i;
-                        return false;
-                    }
-                });
+                client._messages &&
+                    client._messages.forEach((e, i) => {
+                        if (e.messageId === packet.messageId) {
+                            pos = i;
+                            return false;
+                        }
+                    });
 
                 if (pos !== null) {
-                    client.pubcomp({messageId: packet.messageId});
+                    client.pubcomp({ messageId: packet.messageId });
 
                     receivedTopic(client._messages[pos], client);
                     client._messages && client._messages.splice(pos, 1);
                 } else {
-                    adapter.log.warn(`Client [${client.id}] received pubrel on ${client.id} for unknown messageId ${packet.messageId}`);
+                    adapter.log.warn(
+                        `Client [${client.id}] received pubrel on ${client.id} for unknown messageId ${packet.messageId}`,
+                    );
                 }
             });
 
             // response for QoS1
             client.on('puback', packet => {
                 if (clients[client.id] && client.__secret !== clients[client.id].__secret) {
-                    !adapter.config.ignorePings && adapter.log.warn(`Old client ${client.id} with secret ${client.__secret} sends puback. Ignore! Actual secret is ${clients[client.id].__secret}`);
+                    !adapter.config.ignorePings &&
+                        adapter.log.warn(
+                            `Old client ${client.id} with secret ${client.__secret} sends puback. Ignore! Actual secret is ${clients[client.id].__secret}`,
+                        );
                     return;
                 }
 
@@ -1721,24 +1985,32 @@ function MQTTServer(adapter) {
                 // remove this message from queue
                 let pos = null;
                 // remove this message from queue
-                client._messages && client._messages.forEach((e, i) => {
-                    if (e.messageId === packet.messageId) {
-                        pos = i;
-                        return false;
-                    }
-                });
+                client._messages &&
+                    client._messages.forEach((e, i) => {
+                        if (e.messageId === packet.messageId) {
+                            pos = i;
+                            return false;
+                        }
+                    });
 
                 if (pos !== null) {
-                    adapter.log.debug(`Client [${client.id}] received puback for ${client.id} message ID: ${packet.messageId}`);
+                    adapter.log.debug(
+                        `Client [${client.id}] received puback for ${client.id} message ID: ${packet.messageId}`,
+                    );
                     client._messages && client._messages.splice(pos, 1);
                 } else {
-                    adapter.log.warn(`Client [${client.id}] received puback for unknown message ID: ${packet.messageId}`);
+                    adapter.log.warn(
+                        `Client [${client.id}] received puback for unknown message ID: ${packet.messageId}`,
+                    );
                 }
             });
 
             client.on('unsubscribe', packet => {
                 if (clients[client.id] && client.__secret !== clients[client.id].__secret) {
-                    !adapter.config.ignorePings && adapter.log.warn(`Old client ${client.id} with secret ${client.__secret} sends unsubscribe. Ignore! Actual secret is ${clients[client.id].__secret}`);
+                    !adapter.config.ignorePings &&
+                        adapter.log.warn(
+                            `Old client ${client.id} with secret ${client.__secret} sends unsubscribe. Ignore! Actual secret is ${clients[client.id].__secret}`,
+                        );
                     return;
                 }
 
@@ -1746,12 +2018,15 @@ function MQTTServer(adapter) {
                     persistentSessions[client.id].lastSeen = Date.now();
                 }
 
-                client.unsuback({messageId: packet.messageId});
+                client.unsuback({ messageId: packet.messageId });
             });
 
             client.on('subscribe', packet => {
                 if (clients[client.id] && client.__secret !== clients[client.id].__secret) {
-                    !adapter.config.ignorePings && adapter.log.warn(`Old client ${client.id} with secret ${client.__secret} sends subscribe. Ignore! Actual secret is ${clients[client.id].__secret}`);
+                    !adapter.config.ignorePings &&
+                        adapter.log.warn(
+                            `Old client ${client.id} with secret ${client.__secret} sends subscribe. Ignore! Actual secret is ${clients[client.id].__secret}`,
+                        );
                     return;
                 }
 
@@ -1763,12 +2038,15 @@ function MQTTServer(adapter) {
                 // we expect subscribe for 'cmnd.sonoff.#'
                 let granted = packet.subscriptions.map(subs => subs.qos);
 
-                client.suback({granted: granted, messageId: packet.messageId});
+                client.suback({ granted: granted, messageId: packet.messageId });
             });
 
             client.on('pingreq', (/*packet*/) => {
                 if (clients[client.id] && client.__secret !== clients[client.id].__secret) {
-                    !adapter.config.ignorePings && adapter.log.warn(`Old client ${client.id} with secret ${client.__secret} sends pingreq. Ignore! Actual secret is ${clients[client.id].__secret}`);
+                    !adapter.config.ignorePings &&
+                        adapter.log.warn(
+                            `Old client ${client.id} with secret ${client.__secret} sends pingreq. Ignore! Actual secret is ${clients[client.id].__secret}`,
+                        );
                     return;
                 }
 
@@ -1781,15 +2059,15 @@ function MQTTServer(adapter) {
             });
         });
 
-        server.on('error', err =>
-            adapter.log.error(`Can not start Server ${err}`));
+        server.on('error', err => adapter.log.error(`Can not start Server ${err}`));
 
         config.port = parseInt(config.port, 10) || 1883;
 
         config.retransmitInterval = config.retransmitInterval || 2000;
-        config.retransmitCount    = config.retransmitCount    || 10;
-        config.storeClientsTime   = config.storeClientsTime === undefined ? 1440 : parseInt(config.storeClientsTime, 10) || 0;
-        config.defaultQoS         = parseInt(config.defaultQoS, 10) || 0;
+        config.retransmitCount = config.retransmitCount || 10;
+        config.storeClientsTime =
+            config.storeClientsTime === undefined ? 1440 : parseInt(config.storeClientsTime, 10) || 0;
+        config.defaultQoS = parseInt(config.defaultQoS, 10) || 0;
 
         // Update connection state
         updateClients();
@@ -1798,9 +2076,7 @@ function MQTTServer(adapter) {
         server.listen(config.port, config.bind, () => {
             adapter.log.info(`Starting MQTT ${config.user ? 'authenticated ' : ''} server on port ${config.port}`);
 
-            resendTimer = setInterval(() =>
-                !resending && checkResends(),
-                adapter.config.retransmitInterval || 2000);
+            resendTimer = setInterval(() => !resending && checkResends(), adapter.config.retransmitInterval || 2000);
         });
     })(adapter.config);