iobroker.zigbee 1.8.0 → 1.8.1

package/lib/json.js

@@ -19,7 +19,7 @@ function safeGetValueFromPropertyOnObject(obj, property) {
 }
 
 function ensureProperties(obj) {
-    const seen = [ ]; // store references to objects we have seen before
+    const seen = []; // store references to objects we have seen before
 
     function visit(obj) {
         if (obj === null || typeof obj !== 'object') {
@@ -34,7 +34,7 @@ function ensureProperties(obj) {
         if (typeof obj.toJSON === 'function') {
             try {
                 return visit(obj.toJSON());
-            } catch(err) {
+            } catch (err) {
                 return throwsMessage(err);
             }
         }

package/lib/networkmap.js

@@ -1,6 +1,5 @@
 'use strict';
 
-
 class NetworkMap {
     constructor(adapter) {
         this.adapter = adapter;

package/lib/ota.js

@@ -55,7 +55,11 @@ class Ota {
         const device = await this.getDeviceForMessage(obj);
         if (!device) {
             this.debug(`Device ${obj.message.devId} is unavailable`);
-            this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is unavailable'}, obj.callback);
+            this.adapter.sendTo(obj.from, obj.command, {
+                status: 'fail',
+                device: getZbId(obj.message.devId),
+                msg: 'Device is unavailable'
+            }, obj.callback);
             return;
         }
         if (this.inProgress.has(device.device.ieeeAddr)) {
@@ -111,7 +115,11 @@ class Ota {
         const device = await this.getDeviceForMessage(obj);
         if (!device) {
             this.debug(`Device ${obj.message.devId} is unavailable`);
-            this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is unavailable'}, obj.callback);
+            this.adapter.sendTo(obj.from, obj.command, {
+                status: 'fail',
+                device: getZbId(obj.message.devId),
+                msg: 'Device is unavailable'
+            }, obj.callback);
             return;
         }
         if (this.inProgress.has(device.device.ieeeAddr)) {
@@ -133,7 +141,7 @@ class Ota {
         this.inProgress.add(device.device.ieeeAddr);
         const result = {status: 'unknown', device: device ? device.name : null};
         try {
-            this.info('Start firmware update for '+device.name);
+            this.info('Start firmware update for ' + device.name);
 
             const onProgress = (progress, remaining) => {
                 let message = `Update of '${device.name}' at ${progress}%`;

package/lib/rgb.js

@@ -4,7 +4,7 @@ With these functions you can convert the CIE color space to the RGB color space
 The developer documentation for Philips Hue provides the formulas used in the code below:
 https://developers.meethue.com/documentation/color-conversions-rgb-xy
 
-I've used the formulas and Objective-C example code and transfered it to JavaScript.
+I've used the formulas and Objective-C example code and transferred it to JavaScript.
 
 
 Examples:
@@ -60,9 +60,9 @@ function cie_to_rgb(x, y, brightness) {
     const Z = (Y / y) * z;
 
     //Convert to RGB using Wide RGB D65 conversion
-    let red 	=  X * 1.656492 - Y * 0.354851 - Z * 0.255038;
-    let green   = -X * 0.707196 + Y * 1.655397 + Z * 0.036152;
-    let blue 	=  X * 0.051713 - Y * 0.121364 + Z * 1.011530;
+    let red   = X * 1.656492 - Y * 0.354851 - Z * 0.255038;
+    let green = -X * 0.707196 + Y * 1.655397 + Z * 0.036152;
+    let blue  = X * 0.051713 - Y * 0.121364 + Z * 1.011530;
 
     //If red, green or blue is larger than 1.0 set it back to the maximum of 1.0
     if (red > blue && red > green && red > 1.0) {
@@ -81,24 +81,24 @@ function cie_to_rgb(x, y, brightness) {
     }
 
     //Reverse gamma correction
-    red 	= red   <= 0.0031308 ? 12.92 * red   : (1.0 + 0.055) * Math.pow(red,   (1.0 / 2.4)) - 0.055;
-    green 	= green <= 0.0031308 ? 12.92 * green : (1.0 + 0.055) * Math.pow(green, (1.0 / 2.4)) - 0.055;
-    blue 	= blue  <= 0.0031308 ? 12.92 * blue  : (1.0 + 0.055) * Math.pow(blue,  (1.0 / 2.4)) - 0.055;
+    red   = red   <= 0.0031308 ? 12.92 * red : (1.0 + 0.055) * Math.pow(red, (1.0 / 2.4)) - 0.055;
+    green = green <= 0.0031308 ? 12.92 * green : (1.0 + 0.055) * Math.pow(green, (1.0 / 2.4)) - 0.055;
+    blue  = blue  <= 0.0031308 ? 12.92 * blue : (1.0 + 0.055) * Math.pow(blue, (1.0 / 2.4)) - 0.055;
 
     //Convert normalized decimal to decimal
-    red 	= Math.round(red * 255);
-    green 	= Math.round(green * 255);
-    blue 	= Math.round(blue * 255);
+    red   = Math.round(red * 255);
+    green = Math.round(green * 255);
+    blue  = Math.round(blue * 255);
 
-    if (isNaN(red) || red < 0 ) {
+    if (isNaN(red) || red < 0) {
         red = 0;
     }
 
-    if (isNaN(green) || green < 0 ) {
+    if (isNaN(green) || green < 0) {
         green = 0;
     }
 
-    if (isNaN(blue) || blue < 0 ) {
+    if (isNaN(blue) || blue < 0) {
         blue = 0;
     }
 
@@ -145,7 +145,9 @@ function hsvToRGB(h, s, v) {
     s = s / 100;
     v = v / 100;
 
-    let r; let g; let b;
+    let r;
+    let g;
+    let b;
     if (arguments.length === 1) {
         s = h.s;
         v = h.v;
@@ -157,12 +159,36 @@ function hsvToRGB(h, s, v) {
     const q = v * (1 - f * s);
     const t = v * (1 - (1 - f) * s);
     switch (i % 6) {
-        case 0: r = v, g = t, b = p; break;
-        case 1: r = q, g = v, b = p; break;
-        case 2: r = p, g = v, b = t; break;
-        case 3: r = p, g = q, b = v; break;
-        case 4: r = t, g = p, b = v; break;
-        case 5: r = v, g = p, b = q; break;
+        case 0:
+            r = v;
+            g = t;
+            b = p;
+            break;
+        case 1:
+            r = q;
+            g = v;
+            b = p;
+            break;
+        case 2:
+            r = p;
+            g = v;
+            b = t;
+            break;
+        case 3:
+            r = p;
+            g = q;
+            b = v;
+            break;
+        case 4:
+            r = t;
+            g = p;
+            b = v;
+            break;
+        case 5:
+            r = v;
+            g = p;
+            b = q;
+            break;
     }
     return {
         r: Math.round(r * 255),
@@ -177,23 +203,35 @@ function rgbToHSV(r, g, b, numeric) {
         b = r.b;
         r = r.r;
     }
-    const max = Math.max(r, g, b); const min = Math.min(r, g, b);
+    const max = Math.max(r, g, b);
+    const min = Math.min(r, g, b);
     const d = max - min;
     let h;
     const s = (max === 0 ? 0 : d / max);
     const v = max / 255;
 
     switch (max) {
-        case min: h = 0; break;
-        case r: h = (g - b) + d * (g < b ? 6: 0); h /= 6 * d; break;
-        case g: h = (b - r) + d * 2; h /= 6 * d; break;
-        case b: h = (r - g) + d * 4; h /= 6 * d; break;
+        case min:
+            h = 0;
+            break;
+        case r:
+            h = (g - b) + d * (g < b ? 6 : 0);
+            h /= 6 * d;
+            break;
+        case g:
+            h = (b - r) + d * 2;
+            h /= 6 * d;
+            break;
+        case b:
+            h = (r - g) + d * 4;
+            h /= 6 * d;
+            break;
     }
     if (numeric) {
         return {
-            h: Math.round(h*360),
-            s: Math.round(s*100),
-            v: Math.round(v*100),
+            h: Math.round(h * 360),
+            s: Math.round(s * 100),
+            v: Math.round(v * 100),
         };
     }
     return {
@@ -202,8 +240,9 @@ function rgbToHSV(r, g, b, numeric) {
         v: (v * 100).toFixed(3),
     };
 }
+
 function colorArrayFromString(value) {
-    if (typeof(value) === 'string') {
+    if (typeof value === 'string') {
         const rv = [];
         value.split(',').forEach(element =>
             rv.push(colors.ParseColor(element)));
@@ -219,8 +258,8 @@ function colorStringFromRGBArray(payload) {
     return rv.toString();
 }
 
-function hsv_to_cie(h,s,v){
-    const rgb = hsvToRGB(h,s,v);
+function hsv_to_cie(h, s, v) {
+    const rgb = hsvToRGB(h, s, v);
     return rgb_to_cie(rgb.r, rgb.g, rgb.b);
 }
 
@@ -244,8 +283,8 @@ function rgb_to_rgbstring(element) {
     return col;
 }
 
-function hsvToRGBString(h,s,v) {
-    return rgb_to_rgbstring(hsvToRGB(h,s,v));
+function hsvToRGBString(h, s, v) {
+    return rgb_to_rgbstring(hsvToRGB(h, s, v));
 }
 
 exports.hsv_to_cie = hsv_to_cie;

package/lib/seriallist.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const serialPortUtils = require('zigbee-herdsman/dist/adapter/serialPortUtils').default;
 let SerialPort = null;
 
 class SerialList {
@@ -8,6 +7,7 @@ class SerialList {
         this.adapter = adapter;
         this.adapter.on('message', obj => this.onMessage(obj));
     }
+
     /**
      * @param {ioBroker.Message} obj
      */
@@ -22,7 +22,10 @@ class SerialList {
                             SerialPort.list()
                                 .then(ports => {
                                     this.adapter.log.info(`List of port: ${JSON.stringify(ports)}`);
-                                    this.adapter.sendTo(obj.from, obj.command, ports.map(item => ({label: item.friendlyName, comName: item.path})), obj.callback);
+                                    this.adapter.sendTo(obj.from, obj.command, ports.map(item => ({
+                                        label: item.friendlyName || item.pnpId || item.manufacturer,
+                                        comName: item.path
+                                    })), obj.callback);
                                 })
                                 .catch(e => {
                                     this.adapter.sendTo(obj.from, obj.command, [], obj.callback);
@@ -30,19 +33,16 @@ class SerialList {
                                 });
                         } else {
                             this.adapter.log.warn('Module serialport is not available');
-                            this.adapter.sendTo(obj.from, obj.command, [{label: 'Not available', value: ''}], obj.callback);
+                            this.adapter.sendTo(obj.from, obj.command, [{
+                                label: 'Not available',
+                                comName: ''
+                            }], obj.callback);
                         }
                     }
                     break;
             }
         }
     }
-
-    listSerial() {
-        return serialPortUtils.find([{}])
-            .then(ports =>
-                ports.map(port => ({comName: port})));
-    }
 }
 
 module.exports = SerialList;

package/lib/states.js

@@ -60,17 +60,17 @@ const unitLookup = {
 const timers = {};
 
 const states = {
-/*    groups: {
-        id: 'groups',
-        name: 'Groups',
-        icon: undefined,
-        role: 'state',
-        write: false,
-        read: true,
-        type: 'string',
-        isOption: true,
-    },
-*/
+    /*    groups: {
+            id: 'groups',
+            name: 'Groups',
+            icon: undefined,
+            role: 'state',
+            write: false,
+            read: true,
+            type: 'string',
+            isOption: true,
+        },
+    */
     link_quality: {
         id: 'link_quality',
         prop: 'linkquality',
@@ -1355,7 +1355,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => payload.action === 'up_hold' ? 'up' : payload.action === 'down_hold' ? 'down' : payload.action === 'circle_hold' ? 'circle':  undefined,
+        getter: payload => payload.action === 'up_hold' ? 'up' : (payload.action === 'down_hold' ? 'down' : (payload.action === 'circle_hold' ? 'circle' : undefined)),
     },
     switch_release: {
         id: 'release',
@@ -1366,7 +1366,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => payload.action === 'up_release' ? 'up' : payload.action === 'down_release' ? 'down' : payload.action === 'circle_release' ? 'circle':  undefined,
+        getter: payload => payload.action === 'up_release' ? 'up' : (payload.action === 'down_release' ? 'down' : (payload.action === 'circle_release' ? 'circle' : undefined)),
     },
     // new RWL states
     rwl_state: {
@@ -1897,7 +1897,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: false,
-        getter: payload => payload.action === 'brightness_up_hold' ? true :  payload.action === 'brightness_up_release'  ? false : undefined,
+        getter: payload => payload.action === 'brightness_up_hold' ? true : payload.action === 'brightness_up_release' ? false : undefined,
     },
     tint404011_brightness_down_click: {
         id: 'brightness_down_click',
@@ -1921,7 +1921,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: false,
-        getter: payload => payload.action === 'brightness_down_hold' ? true :  payload.action === 'brightness_down_release'  ? false : undefined,
+        getter: payload => payload.action === 'brightness_down_hold' ? true : (payload.action === 'brightness_down_release' ? false : undefined),
     },
     tint404011_colortemp_read: {
         id: 'colortemp',
@@ -1944,7 +1944,7 @@ const states = {
         read: true,
         type: 'string',
         getter: payload => {
-            if( payload.action === 'color_wheel') {
+            if (payload.action === 'color_wheel') {
                 const colorval = rgb.cie_to_rgb(payload.action_color.x, payload.action_color.y);
                 return '#' + utils.decimalToHex(colorval[0]) + utils.decimalToHex(colorval[1]) + utils.decimalToHex(colorval[2]);
             } else {
@@ -1965,7 +1965,7 @@ const states = {
         isEvent: true,
         getter: payload => payload.action === 'scene_3' ? true : undefined,
     },
-    tint404011_scene_sunset:  {
+    tint404011_scene_sunset: {
         // starting with warm-white light at 50% brightness then dims after 15 minutes.
         // after another 10 minutes the light is turned off
         id: 'scene_sunset',
@@ -2150,8 +2150,8 @@ const states = {
         icon: undefined,
         write: true,
         read: true,
-        min:  0,
-        max:  7,
+        min: 0,
+        max: 7,
         type: 'number',
     },
     hvacThermostat_control_sequence_of_operation_write: {
@@ -2516,26 +2516,26 @@ const states = {
         type: 'number',
     },
     danfoss_testrun_day_of_week: {
-        id:   'testrun_day_of_week',
+        id: 'testrun_day_of_week',
         name: 'testrun_day_of_week',
         prop: 'day_of_week',
-        icon:  undefined,
-        role:  'state',
+        icon: undefined,
+        role: 'state',
         write: true,
-        read:  true,
-        type:  'number',
+        read: true,
+        type: 'number',
         min: 0,
         max: 7,
     },
     danfoss_testrun_hour: {
-        id:   'testrun_hour',
+        id: 'testrun_hour',
         name: 'testrun_hour',
         prop: 'trigger_time',
-        icon:  undefined,
-        role:  'state',
+        icon: undefined,
+        role: 'state',
         write: true,
-        read:  true,
-        type:  'number',
+        read: true,
+        type: 'number',
     },
     danfoss_mounted_direction: {
         id: 'thermostat_orientation',
@@ -2608,12 +2608,11 @@ const states = {
         role: 'state',
         write: true,
         read: true,
-        min:  0,
-        max:  1,
+        min: 0,
+        max: 1,
         type: 'number',
     },
-    thermostat_keypad_lockout:
-    {
+    thermostat_keypad_lockout: {
         id: 'keypad_lockout',
         name: 'Keypad Lockout',
         prop: 'keypad_lockout',
@@ -4068,7 +4067,7 @@ const states = {
         read: true,
         type: 'boolean',
         getter: payload => payload.child_lock === 'LOCKED',
-        setter: value => value ? 'LOCK': 'UNLOCK',
+        setter: value => value ? 'LOCK' : 'UNLOCK',
     },
     tuya_trv_window_detected: {
         id: 'window_detected',
@@ -5397,7 +5396,7 @@ const states = {
         read: true,
         type: 'string',
         getter: payload => {
-            if( payload.action === 'color_move') {
+            if (payload.action === 'color_move') {
                 const colorval = rgb.cie_to_rgb(payload.action_color.x, payload.action_color.y);
                 return `#${utils.decimalToHex(colorval[0])}${utils.decimalToHex(colorval[1])}${utils.decimalToHex(colorval[2])}`;
             } else {
@@ -5608,7 +5607,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => payload.action === 'on_1' ? false : (payload.action === 'off_1'  ? true : undefined),
+        getter: payload => payload.action === 'on_1' ? false : (payload.action === 'off_1' ? true : undefined),
         isEvent: true,
     },
     rob_2_click: {
@@ -5620,7 +5619,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => payload.action === 'on_2' ? false : (payload.action === 'off_2'  ? true : undefined),
+        getter: payload => payload.action === 'on_2' ? false : (payload.action === 'off_2' ? true : undefined),
         isEvent: true,
     },
     rob_3_click: {
@@ -5632,7 +5631,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => payload.action === 'on_3' ? false : (payload.action === 'off_3'  ? true : undefined),
+        getter: payload => payload.action === 'on_3' ? false : (payload.action === 'off_3' ? true : undefined),
         isEvent: true,
     },
     rob_4_click: {
@@ -5644,7 +5643,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => payload.action === 'on_4' ? false : (payload.action === 'off_4'  ? true : undefined),
+        getter: payload => payload.action === 'on_4' ? false : (payload.action === 'off_4' ? true : undefined),
         isEvent: true,
     },
 
@@ -5846,7 +5845,7 @@ const states = {
         unit: '',
         setter: (value, options) => {
             const effectjson = {
-                colors:[{r: 255, g: 0, b: 0}, {r: 0, g: 255, b: 0}, {r: 0, g: 0, b: 255}],
+                colors: [{r: 255, g: 0, b: 0}, {r: 0, g: 255, b: 0}, {r: 0, g: 0, b: 255}],
                 speed: 10,
                 effect: 'snake',
             };
@@ -5982,7 +5981,7 @@ const states = {
         read: true,
         getter: payload => {
             const rv = {};
-            const id = typeof(payload.device_l1) == 'string' ? payload.device_l1.replace(/[-. ]/g, '') : 'unset';
+            const id = typeof payload.device_l1 === 'string' ? payload.device_l1.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6020,7 +6019,7 @@ const states = {
         read: true,
         getter: payload => {
             const rv = {};
-            const id = typeof(payload.device_l2) == 'string' ? payload.device_l2.replace(/[-. ]/g, '') : 'unset';
+            const id = typeof payload.device_l2 === 'string' ? payload.device_l2.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6058,7 +6057,7 @@ const states = {
         read: true,
         getter: payload => {
             const rv = {};
-            const id = typeof(payload.device_l3) == 'string' ? payload.device_l3.replace(/[-. ]/g, '') : 'unset';
+            const id = typeof payload.device_l3 === 'string' ? payload.device_l3.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6078,7 +6077,7 @@ const states = {
                 rv.stateid = id;
             }
             rv.value = payload.l3;
-            rv.name = measurement ? `${measurement} 0x${id}`: `0x${id}`;
+            rv.name = measurement ? `${measurement} 0x${id}` : `0x${id}`;
             rv.unit = unit;
             rv.role = measurement;
 
@@ -6096,7 +6095,7 @@ const states = {
         read: true,
         getter: payload => {
             const rv = {};
-            const id = typeof(payload.device_l4) == 'string' ? payload.device_l4.replace(/[-. ]/g, '') : 'unset';
+            const id = typeof payload.device_l4 === 'string' ? payload.device_l4.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6134,7 +6133,7 @@ const states = {
         read: true,
         getter: payload => {
             const rv = {};
-            const id = typeof(payload.device_l5) == 'string' ? payload.device_l5.replace(/[-. ]/g, '') : 'unset';
+            const id = typeof payload.device_l5 === 'string' ? payload.device_l5.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6172,7 +6171,7 @@ const states = {
         read: true,
         getter: payload => {
             const rv = {};
-            const id = typeof(payload.device_l6) == 'string' ? payload.device_l6.replace(/[-. ]/g, '') : 'unset';
+            const id = typeof payload.device_l6 === 'string' ? payload.device_l6.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6210,7 +6209,7 @@ const states = {
         read: true,
         getter: payload => {
             const rv = {};
-            const id = typeof(payload.device_l7) == 'string' ? payload.device_l7.replace(/[-. ]/g, '') : 'unset';
+            const id = typeof payload.device_l7 === 'string' ? payload.device_l7.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6248,7 +6247,7 @@ const states = {
         read: true,
         getter: payload => {
             const rv = {};
-            const id = typeof(payload.device_l8) == 'string' ? payload.device_l8.replace(/[-. ]/g, '') : 'unset';
+            const id = typeof payload.device_l8 === 'string' ? payload.device_l8.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {