iobroker.zigbee2mqtt 2.2.1 → 2.4.0

package/lib/states.js

@@ -56,8 +56,8 @@ const unitLookup = {
     'frequency': 'Hz',
     'power_factor': 'pf',
     'illuminance_lux': 'lx',
-
 };
+
 const timers = {};
 
 const states = {
@@ -72,7 +72,7 @@ const states = {
         type: 'number',
         min: 0,
         max: 255,
-        def: 10,
+        def: 0,
     },
 
     available: {
@@ -86,6 +86,110 @@ const states = {
         type: 'boolean',
         def: false,
     },
+
+    color_read: {
+        id: 'color',
+        prop: 'action',
+        name: 'Color',
+        icon: undefined,
+        role: 'level.color.rgb',
+        write: false,
+        read: true,
+        type: 'string',
+        def: '#ffffff',
+        getter: (payload) => {
+            if (payload.action != 'color_wheel') {
+                return undefined;
+            }
+
+            if (payload.color && payload.color.hasOwnProperty('x') && payload.color.hasOwnProperty('y')) {
+                const colorval = rgb.cie_to_rgb(payload.color.x, payload.color.y);
+                return '#' + utils.decimalToHex(colorval[0]) + utils.decimalToHex(colorval[1]) + utils.decimalToHex(colorval[2]);
+            }
+            else {
+                return undefined;
+            }
+        },
+    },
+
+    simulated_brightness: {
+        id: 'simulated_brightness',
+        prop: 'brightness',
+        name: 'Simulated brightness',
+        icon: undefined,
+        role: 'level.dimmer',
+        write: true,
+        read: true,
+        type: 'number',
+        unit: '%',
+        def: 0,
+        getter: payload => {
+            return utils.bulbLevelToAdapterLevel(payload.brightness);
+        },
+    },
+
+    state: {
+        id: 'state',
+        name: 'Switch state',
+        icon: undefined,
+        role: 'switch',
+        write: true,
+        read: true,
+        type: 'boolean',
+        def: false,
+        getter: payload => (payload.state === 'ON'),
+        setter: (value) => (value) ? 'ON' : 'OFF',
+    },
+
+    brightness: {
+        id: 'brightness',
+        name: 'Brightness',
+        icon: undefined,
+        role: 'level.dimmer',
+        write: true,
+        read: true,
+        type: 'number',
+        unit: '%',
+        min: 0,
+        max: 100,
+        def: 100,
+        getter: payload => {
+            return utils.bulbLevelToAdapterLevel(payload.brightness);
+        },
+        setter: (value) => {
+            return utils.adapterLevelToBulbLevel(value);
+        }
+    },
+
+    brightness_move: {
+        id: 'brightness_move',
+        prop: 'brightness_move',
+        name: 'Dimming',
+        icon: undefined,
+        role: 'state',
+        write: true,
+        read: false,
+        type: 'number',
+        min: -50,
+        max: 50,
+        def: 0
+    },
+
+    colortemp_move: {
+        id: 'colortemp_move',
+        prop: 'color_temp_move',
+        name: 'Colortemp change',
+        icon: undefined,
+        role: 'state',
+        write: true,
+        read: false,
+        type: 'number',
+        min: -50,
+        max: 50,
+        def: 0
+    },
+
+    //#################################################################
     device_query: { // button to trigger device read
         id: 'device_query',
         prop: 'device_query',
@@ -462,22 +566,7 @@ const states = {
         isEvent: true,
         getter: payload => (payload.click === 'both_double') ? true : undefined,
     },
-    state: {
-        id: 'state',
-        name: 'Switch state',
-        icon: undefined,
-        role: 'switch',
-        write: true,
-        read: true,
-        type: 'boolean',
-        getter: payload => (payload.state === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
-        setterOpt: (value, options) => {
-            const stateValue = (value ? 'ON' : 'OFF');
-            return { ...options, state: stateValue };
-        },
-        inOptions: true,
-    },
+
     stateEp: {
         id: 'state',
         name: 'Switch state',
@@ -1182,37 +1271,7 @@ const states = {
             return utils.bulbLevelToAdapterLevel(payload.brightness);
         },
     },
-    brightness: {
-        id: 'brightness',
-        name: 'Brightness',
-        icon: undefined,
-        role: 'level.dimmer',
-        write: true,
-        read: true,
-        type: 'number',
-        unit: '%',
-        min: 0,
-        max: 100,
-        getter: payload => {
-            return utils.bulbLevelToAdapterLevel(payload.brightness);
-        },
-        setter: (value, options) => {
-            return utils.adapterLevelToBulbLevel(value);
-        },
-        setterOpt: (value, options) => {
-            const hasTransitionTime = options && options.hasOwnProperty('transition_time');
-            const transitionTime = hasTransitionTime ? options.transition_time : 0;
-            const preparedOptions = { ...options, transition: transitionTime };
-            preparedOptions.brightness = utils.adapterLevelToBulbLevel(value);
-            return preparedOptions;
-        },
-        readResponse: (resp) => {
-            const respObj = resp[0];
-            if (respObj.status === 0 && respObj.attrData != undefined) {
-                return utils.bulbLevelToAdapterLevel(respObj.attrData);
-            }
-        },
-    },
+
     colortemp: {
         id: 'colortemp',
         prop: 'color_temp',
@@ -5293,32 +5352,6 @@ const states = {
         min: -50,
         max: 50
     },
-    brightness_move: {
-        id: 'brightness_move',
-        prop: 'brightness_move',
-        name: 'Dimming',
-        icon: undefined,
-        role: 'state',
-        write: true,
-        read: false,
-        type: 'number',
-        min: -50,
-        max: 50,
-        def: 0
-    },
-    colortemp_move: {
-        id: 'colortemp_move',
-        prop: 'color_temp_move',
-        name: 'Colortemp change',
-        icon: undefined,
-        role: 'state',
-        write: true,
-        read: false,
-        type: 'number',
-        min: -50,
-        max: 50,
-        def: 0
-    },
     hue_move: {
         id: 'hue_move',
         prop: 'hue_move',

package/lib/statesController.js

@@ -35,15 +35,47 @@ class StatesController {
             this.adapter.log.warn(`--->>> fromZ2M -> ${device.ieee_address} states: ${JSON.stringify(messageObj)}`);
         }
 
-        for (const [key, value] of Object.entries(messageObj.payload)) {
-            let states;
-            if (key == 'action') {
-                states = device.states.filter(x => (x.prop && x.prop == key));
-            } else {
-                states = device.states.filter(x => (x.prop && x.prop == key) || x.id == key);
-            }
+        //  Is an action
+        if (Object.keys(messageObj.payload).includes('action')) {
+            const states = device.states.filter(x => (x.prop && x.prop == 'action'));
 
             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) {
+                    incStatsQueue[incStatsQueue.length] = messageObj;
+                    continue;
+                }
+
+                if (!state.getter) {
+                    this.adapter.log.error(`Action ${stateName} has no getter, this must not be!`);
+                    continue;
+                }
+
+                try {
+                    if (state.isEvent && state.isEvent == true) {
+                        if (state.type == 'boolean') {
+                            await this.setStateWithTimeoutAsync(stateName, state.getter(messageObj.payload), 300);
+                        }
+                        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!`);
+                }
+            }
+        }
+        // Is not an action
+        else {
+            for (const [key, value] of Object.entries(messageObj.payload)) {
+                const state = device.states.find(x => (x.prop && x.prop == key) || x.id == key);
+
                 if (!state) {
                     continue;
                 }
@@ -53,28 +85,20 @@ class StatesController {
                 // 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) {
                     incStatsQueue[incStatsQueue.length] = messageObj;
-                    //this.adapter.log.debug(`State ${stateName} is not yet created, queue state in incStatsQueue!`);
                     continue;
                 }
 
                 try {
-                    if (state.isEvent) {
-                        if (state.getter) {
-                            await this.setStateWithTimeoutAsync(stateName, state.getter(messageObj.payload), 300);
-                        } else {
-                            await this.setStateWithTimeoutAsync(stateName, value, 300);
-                        }
+                    if (state.getter) {
+                        await this.setStateChangedSafelyAsync(stateName, state.getter(messageObj.payload));
                     } else {
-                        if (state.getter) {
-                            await this.setStateChangedSafelyAsync(stateName, state.getter(messageObj.payload));
-                        } else {
-                            await this.setStateChangedSafelyAsync(stateName, value);
-                        }
+                        await this.setStateChangedSafelyAsync(stateName, value);
                     }
                 } catch (err) {
                     incStatsQueue[incStatsQueue.length] = messageObj;
                     this.adapter.log.debug(`Can not set ${stateName}, queue state in incStatsQueue!`);
                 }
+
             }
         }
     }

package/lib/z2mController.js

@@ -36,6 +36,11 @@ class Z2mController {
             stateID = deviceState.prop;
         }
 
+        if (deviceState.setattr) {
+            stateID = deviceState.setattr;
+        }
+
+
         const controlObj = {
             payload: {
                 [stateID]: stateVal
@@ -44,7 +49,7 @@ class Z2mController {
         };
 
         // set stats with the mentioned role or ids always immediately to ack = true, because these are not reported back by Zigbee2MQTT
-        if (['button'].includes(deviceState.role) || ['brightness_move', 'color_temp_move'].includes(stateID)) {
+        if (['button'].includes(deviceState.role) || ['brightness_move', 'colortemp_move', 'brightness_move', 'effect'].includes(deviceState.id)) {
             this.adapter.setState(id, state, true);
         }
 

package/main.js

@@ -46,7 +46,7 @@ class Zigbee2mqtt extends core.Adapter {
 
     async onReady() {
         statesController = new StatesController(this, deviceCache, groupCache, logCustomizations, createCache);
-        deviceController = new DeviceController(this, deviceCache, groupCache, this.config, createCache);
+        deviceController = new DeviceController(this, deviceCache, groupCache, this.config, logCustomizations, createCache);
         z2mController = new Z2mController(this, deviceCache, groupCache, logCustomizations);
 
         // Initialize your adapter here
@@ -128,7 +128,7 @@ class Zigbee2mqtt extends core.Adapter {
         wsClient.on('close', async () => {
             this.setStateChangedAsync('info.connection', false, true);
             await statesController.setAllAvailableToFalse();
-            this.log.warn('Websocket disconnectet');
+            this.log.warn('Websocket disconnected');
         });
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "2.2.1",
+  "version": "2.4.0",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen",
@@ -24,19 +24,19 @@
     "aedes-persistence-nedb": "^2.0.3",
     "mqtt": "^4.3.7",
     "net": "^1.0.2",
-    "ws": "^8.9.0"
+    "ws": "^8.10.0"
   },
   "devDependencies": {
     "@alcalzone/release-script-plugin-iobroker": "^3.5.9",
     "@alcalzone/release-script-plugin-license": "^3.5.9",
     "@alcalzone/release-script": "^3.5.9",
-    "@iobroker/adapter-dev": "^1.1.0",
+    "@iobroker/adapter-dev": "^1.2.0",
     "@iobroker/testing": "^4.1.0",
     "@tsconfig/node14": "^1.0.3",
     "@types/chai": "^4.3.3",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.0",
-    "@types/node": "^18.11.3",
+    "@types/node": "^18.11.9",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.8",