iobroker.zigbee2mqtt 2.13.6 → 2.13.11

package/lib/imageController.js

@@ -7,22 +7,30 @@ class ImageController {
     }
 
     sanitizeModelIDForImageUrl(modelName) {
-        return modelName.replace('/', '_');
+        const modelNameString = modelName.replace('/', '_');
+        // eslint-disable-next-line no-control-regex
+        return modelNameString.replace(/\u0000/g, '');
     }
 
     sanitizeZ2MDeviceName(deviceName) {
-        return deviceName ? deviceName.replace(/:|\s|\//g, '-') : 'NA';
+        const deviceNameString = deviceName.replace(/:|\s|\//g, '-');
+        // eslint-disable-next-line no-control-regex
+        return deviceName ? deviceNameString.replace(/\u0000/g, '') : 'NA';
     }
 
     getZ2mDeviceImage(device) {
         if (device && device.definition && device.definition.model) {
-            return `https://www.zigbee2mqtt.io/images/devices/${this.sanitizeZ2MDeviceName(device.definition.model)}.jpg`;
+            const icoString = `https://www.zigbee2mqtt.io/images/devices/${this.sanitizeZ2MDeviceName(device.definition.model)}.jpg`;
+            // eslint-disable-next-line no-control-regex
+            return icoString.replace(/\u0000/g, '');
         }
     }
 
     getSlsDeviceImage(device) {
         if (device && device.model_id) {
-            return `https://slsys.github.io/Gateway/devices/png/${this.sanitizeModelIDForImageUrl(device.model_id)}.png`;
+            const icoString = `https://slsys.github.io/Gateway/devices/png/${this.sanitizeModelIDForImageUrl(device.model_id)}.png`;
+            // eslint-disable-next-line no-control-regex
+            return icoString.replace(/\u0000/g, '');
         }
     }
 
@@ -68,15 +76,20 @@ class ImageController {
             // Load Image Metadata
             const origIconMeta = await sharp(icon.file).metadata();
             // Check whether the image needs to be resized
-            if ((origIconMeta.height && origIconMeta.height > imageSize) || (origIconMeta.width && origIconMeta.width > imageSize)) {
+            if (
+                (origIconMeta.height && origIconMeta.height > imageSize) ||
+				(origIconMeta.width && origIconMeta.width > imageSize)
+            ) {
                 // Resize image to 28x28 pixel
-                this.adapter.log.info(`Resize image for device model ${device.definition.model} from: ${origIconMeta.width}x${origIconMeta.height} to ${imageSize}x${imageSize}`);
+                this.adapter.log.info(
+                    `Resize image for device model ${device.definition.model} from: ${origIconMeta.width}x${origIconMeta.height} to ${imageSize}x${imageSize}`
+                );
                 icon.file = await sharp(icon.file)
                     .resize({
                         width: imageSize,
                         height: imageSize,
                         fit: sharp.fit.cover,
-                        position: sharp.strategy.entropy
+                        position: sharp.strategy.entropy,
                     })
                     .toBuffer();
                 // Replace the original image with the resize image.
@@ -88,24 +101,23 @@ class ImageController {
         }
         // Create and output Base64
         return `data:image/png;base64,${icon.file.toString('base64')}`;
-
     }
     getFileNameWithExtension(url) {
         const path = new URL(url).pathname;
         const filename = path.split('/').pop();
-        return filename;
+        // eslint-disable-next-line no-control-regex
+        return filename.replace(/\u0000/g, '');
     }
 
     async downloadIcon(adapter, url, namespace) {
         try {
             const res = await axios.get(url, { responseType: 'arraybuffer' });
             await adapter.writeFileAsync(namespace, this.getFileNameWithExtension(url), res.data);
-        }
-        catch (ex) {
+        } catch (ex) {
             adapter.log.warn(ex);
         }
     }
 }
 module.exports = {
     ImageController,
-};
+};

package/lib/messages.js

@@ -17,7 +17,9 @@ async function adapterInfo(config, log) {
     } else if (config.connectionType == 'exmqtt') {
         log.info(`|| Zigbee2MQTT Externanl MQTT Server: ${config.externalMqttServerIP}`);
         log.info(`|| Zigbee2MQTT Externanl MQTT Port: ${config.externalMqttServerPort}`);
-        log.info(`|| Zigbee2MQTT Externanl MQTT Credentials: ${config.externalMqttServerCredentials ? 'use' : 'unused'}`);
+        log.info(
+            `|| Zigbee2MQTT Externanl MQTT Credentials: ${config.externalMqttServerCredentials ? 'use' : 'unused'}`
+        );
     } else if (config.connectionType == 'intmqtt') {
         log.info(`|| Zigbee2MQTT Internal MQTT IP-Bind: ${config.mqttServerIPBind}`);
         log.info(`|| Zigbee2MQTT Internal MQTT Port: ${config.mqttServerPort}`);
@@ -42,12 +44,16 @@ async function adapterInfo(config, log) {
 async function zigbee2mqttInfo(payload, log) {
     log.info('============================ Zigbee2MQTT Information =============================');
     log.info(`|| Zigbee2MQTT Version: ${payload.version} `);
-    log.info(`|| Coordinator type: ${payload.coordinator.type} Version: ${payload.coordinator.meta.revision} Serial: ${payload.config.serial.port}`);
-    log.info(`|| Network panid ${payload.network.pan_id} channel: ${payload.network.channel} ext_pan_id: ${payload.network.extended_pan_id}`);
+    log.info(
+        `|| Coordinator type: ${payload.coordinator.type} Version: ${payload.coordinator.meta.revision} Serial: ${payload.config.serial.port}`
+    );
+    log.info(
+        `|| Network panid ${payload.network.pan_id} channel: ${payload.network.channel} ext_pan_id: ${payload.network.extended_pan_id}`
+    );
     log.info('==================================================================================');
 }
 
 module.exports = {
     adapterInfo,
     zigbee2mqttInfo,
-};
+};

package/lib/mqttServerController.js

@@ -11,12 +11,17 @@ class MqttServerController {
     async createMQTTServer() {
         try {
             const NedbPersistence = require('aedes-persistence-nedb');
-            const db = new NedbPersistence({ path: `${core.getAbsoluteInstanceDataDir(this.adapter)}/mqttData`, prefix: '' });
+            const db = new NedbPersistence({
+                path: `${core.getAbsoluteInstanceDataDir(this.adapter)}/mqttData`,
+                prefix: '',
+            });
             // @ts-ignore
             const aedes = Aedes({ persistence: db });
             mqttServer = net.createServer(aedes.handle);
             mqttServer.listen(this.adapter.config.mqttServerPort, this.adapter.config.mqttServerIPBind, () => {
-                this.adapter.log.info(`Statring MQTT-Server on IP ${this.adapter.config.mqttServerIPBind} and Port ${this.adapter.config.mqttServerPort}`);
+                this.adapter.log.info(
+                    `Statring MQTT-Server on IP ${this.adapter.config.mqttServerIPBind} and Port ${this.adapter.config.mqttServerPort}`
+                );
             });
         } catch (err) {
             this.adapter.log.error(err);
@@ -29,7 +34,9 @@ class MqttServerController {
             const aedes = Aedes();
             mqttServer = net.createServer(aedes.handle);
             mqttServer.listen(this.adapter.config.mqttServerPort, this.adapter.config.mqttServerIPBind, () => {
-                this.adapter.log.info(`Statring DummyMQTT-Server on IP ${this.adapter.config.mqttServerIPBind} and Port ${this.adapter.config.mqttServerPort}`);
+                this.adapter.log.info(
+                    `Statring DummyMQTT-Server on IP ${this.adapter.config.mqttServerIPBind} and Port ${this.adapter.config.mqttServerPort}`
+                );
             });
         } catch (err) {
             this.adapter.log.error(err);
@@ -44,5 +51,5 @@ class MqttServerController {
 }
 
 module.exports = {
-    MqttServerController
-};
+    MqttServerController,
+};

package/lib/nonGenericDevicesExtension.js

@@ -1,35 +1,35 @@
 const nonGenDevStatesDefs = {
     // https://www.zigbee2mqtt.io/devices/HG06467.html#trigger-effects
-    HG06467: [{
-        id: 'effect',
-        prop: 'effect',
-        name: 'effect',
-        icon: undefined,
-        role: 'state',
-        write: true,
-        read: true,
-        type: 'string',
-        def: '{"effect":{"effect":"snake","speed":100,"colors":[{"r":255,"g":0,"b":0},{"r":0,"g":255,"b":0},{"r":0,"g":0,"b":255}]}}',
-        setter: (value) => {
-            try {
-                const valObj = JSON.parse(value);
-                if (valObj.effect && valObj.effect.effect) {
-                    return valObj.effect;
+    HG06467: [
+        {
+            id: 'effect',
+            prop: 'effect',
+            name: 'effect',
+            icon: undefined,
+            role: 'state',
+            write: true,
+            read: true,
+            type: 'string',
+            def: '{"effect":{"effect":"snake","speed":100,"colors":[{"r":255,"g":0,"b":0},{"r":0,"g":255,"b":0},{"r":0,"g":0,"b":255}]}}',
+            setter: (value) => {
+                try {
+                    const valObj = JSON.parse(value);
+                    if (valObj.effect && valObj.effect.effect) {
+                        return valObj.effect;
+                    }
+                    return valObj;
+                } catch (error) {
+                    return undefined;
                 }
-                return valObj;
-
-            } catch (error) {
-                return undefined;
-            }
-
-        },
-        getter: payload => {
-            if (!payload.effect) {
-                return undefined;
-            }
-            return JSON.stringify(payload.effect);
+            },
+            getter: (payload) => {
+                if (!payload.effect) {
+                    return undefined;
+                }
+                return JSON.stringify(payload.effect);
+            },
         },
-    }]
+    ],
 };
 
 function getStateDefinition(model) {
@@ -39,9 +39,8 @@ function getStateDefinition(model) {
     } else {
         return [];
     }
-
 }
 
 module.exports = {
-    getStateDefinition
-};
+    getStateDefinition,
+};

package/lib/rgb.js

@@ -65,31 +65,27 @@ function cie_to_rgb(x, y, brightness) {
     // @ts-ignore
     let green = -X * 0.707196 + Y * 1.655397 + Z * 0.036152;
     // @ts-ignore
-    let blue = X * 0.051713 - Y * 0.121364 + Z * 1.011530;
+    let blue = X * 0.051713 - Y * 0.121364 + Z * 1.01153;
 
     //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) {
-
         green = green / red;
         blue = blue / red;
         red = 1.0;
     } else if (green > blue && green > red && green > 1.0) {
-
         red = red / green;
         blue = blue / green;
         green = 1.0;
     } else if (blue > red && blue > green && blue > 1.0) {
-
         red = red / blue;
         green = green / blue;
         blue = 1.0;
     }
 
     //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);
@@ -111,7 +107,6 @@ function cie_to_rgb(x, y, brightness) {
     return [red, green, blue];
 }
 
-
 /**
  * Converts RGB color space to CIE color space
  * @param {Number} red
@@ -121,14 +116,14 @@ function cie_to_rgb(x, y, brightness) {
  */
 function rgb_to_cie(red, green, blue) {
     // Apply a gamma correction to the RGB values, which makes the color more vivid and more the like the color displayed on the screen of your device
-    red = (red > 0.04045) ? Math.pow((red + 0.055) / (1.0 + 0.055), 2.4) : (red / 12.92);
-    green = (green > 0.04045) ? Math.pow((green + 0.055) / (1.0 + 0.055), 2.4) : (green / 12.92);
-    blue = (blue > 0.04045) ? Math.pow((blue + 0.055) / (1.0 + 0.055), 2.4) : (blue / 12.92);
+    red = red > 0.04045 ? Math.pow((red + 0.055) / (1.0 + 0.055), 2.4) : red / 12.92;
+    green = green > 0.04045 ? Math.pow((green + 0.055) / (1.0 + 0.055), 2.4) : green / 12.92;
+    blue = blue > 0.04045 ? Math.pow((blue + 0.055) / (1.0 + 0.055), 2.4) : blue / 12.92;
 
     // RGB values to XYZ using the Wide RGB D65 conversion formula
     const X = red * 0.664511 + green * 0.154324 + blue * 0.162028;
     const Y = red * 0.283881 + green * 0.668433 + blue * 0.047685;
-    const Z = red * 0.000088 + green * 0.072310 + blue * 0.986039;
+    const Z = red * 0.000088 + green * 0.07231 + blue * 0.986039;
 
     // Calculate the xy values from the XYZ values
     let x = (X / (X + Y + Z)).toFixed(4);
@@ -149,9 +144,8 @@ function rgb_to_cie(red, green, blue) {
     return [x, y];
 }
 
-
 function hsvToRGB(h, s, v) {
-    h = h % 360 / 360;
+    h = (h % 360) / 360;
     s = s / 100;
     v = v / 100;
 
@@ -159,7 +153,7 @@ function hsvToRGB(h, s, v) {
     let g;
     let b;
     if (arguments.length === 1) {
-        s = h.s, v = h.v, h = h.h;
+        (s = h.s), (v = h.v), (h = h.h);
     }
     const i = Math.floor(h * 6);
     const f = h * 6 - i;
@@ -168,22 +162,22 @@ function hsvToRGB(h, s, v) {
     const t = v * (1 - (1 - f) * s);
     switch (i % 6) {
         case 0:
-            r = v, g = t, b = p;
+            (r = v), (g = t), (b = p);
             break;
         case 1:
-            r = q, g = v, b = p;
+            (r = q), (g = v), (b = p);
             break;
         case 2:
-            r = p, g = v, b = t;
+            (r = p), (g = v), (b = t);
             break;
         case 3:
-            r = p, g = q, b = v;
+            (r = p), (g = q), (b = v);
             break;
         case 4:
-            r = t, g = p, b = v;
+            (r = t), (g = p), (b = v);
             break;
         case 5:
-            r = v, g = p, b = q;
+            (r = v), (g = p), (b = q);
             break;
     }
     return {
@@ -195,13 +189,13 @@ function hsvToRGB(h, s, v) {
 
 function rgbToHSV(r, g, b, numeric) {
     if (arguments.length === 1) {
-        g = r.g, b = r.b, r = r.r;
+        (g = r.g), (b = r.b), (r = r.r);
     }
     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 s = max === 0 ? 0 : d / max;
     const v = max / 255;
 
     switch (max) {
@@ -209,24 +203,25 @@ function rgbToHSV(r, g, b, numeric) {
             h = 0;
             break;
         case r:
-            h = (g - b) + d * (g < b ? 6 : 0);
+            h = g - b + d * (g < b ? 6 : 0);
             h /= 6 * d;
             break;
         case g:
-            h = (b - r) + d * 2;
+            h = b - r + d * 2;
             h /= 6 * d;
             break;
         case b:
-            h = (r - g) + d * 4;
+            h = r - g + d * 4;
             h /= 6 * d;
             break;
     }
-    if (numeric) return {
-        // @ts-ignore
-        h: Math.round(h * 360),
-        s: Math.round(s * 100),
-        v: Math.round(v * 100),
-    };
+    if (numeric)
+        return {
+            // @ts-ignore
+            h: Math.round(h * 360),
+            s: Math.round(s * 100),
+            v: Math.round(v * 100),
+        };
     return {
         // @ts-ignore
         h: (h * 360).toFixed(3),
@@ -236,9 +231,9 @@ function rgbToHSV(r, g, b, numeric) {
 }
 
 function colorArrayFromString(value) {
-    if (typeof (value) === 'string') {
+    if (typeof value === 'string') {
         const rv = [];
-        value.split(',').forEach(element => {
+        value.split(',').forEach((element) => {
             rv.push(colors.ParseColor(element));
         });
         return rv;
@@ -248,7 +243,7 @@ function colorArrayFromString(value) {
 
 function colorStringFromRGBArray(payload) {
     const rv = [];
-    payload.forEach(element => {
+    payload.forEach((element) => {
         rv.push(rgb_to_rgbstring(element));
     });
     return rv.toString();
@@ -261,14 +256,11 @@ function hsv_to_cie(h, s, v) {
 
 function rgb_to_rgbstring(element) {
     let col = '#';
-    if (element && element.hasOwnProperty('r'))
-        col = col + element.r.toString(16).padStart(2, '0');
+    if (element && element.hasOwnProperty('r')) col = col + element.r.toString(16).padStart(2, '0');
     else col = col + '00';
-    if (element && element.hasOwnProperty('g'))
-        col = col + element.g.toString(16).padStart(2, '0');
+    if (element && element.hasOwnProperty('g')) col = col + element.g.toString(16).padStart(2, '0');
     else col = col + '00';
-    if (element && element.hasOwnProperty('b'))
-        col = col + element.b.toString(16).padStart(2, '0');
+    if (element && element.hasOwnProperty('b')) col = col + element.b.toString(16).padStart(2, '0');
     else col = col + '00';
     return col;
 }
@@ -280,16 +272,22 @@ function hsbToRGB(h, s, b) {
     } else {
         const hue = h % 360;
         const f = hue % 60;
-        const p = Math.round((b * (100 - s)) * .0255);
-        const q = Math.round((b * (6000 - s * f)) * .000425);
-        const t = Math.round((b * (6000 - s * (60 - f))) * .000425);
+        const p = Math.round(b * (100 - s) * 0.0255);
+        const q = Math.round(b * (6000 - s * f) * 0.000425);
+        const t = Math.round(b * (6000 - s * (60 - f)) * 0.000425);
         switch (Math.floor(hue / 60)) {
-            case 0: return [br, t, p];
-            case 1: return [q, br, p];
-            case 2: return [p, br, t];
-            case 3: return [p, q, br];
-            case 4: return [t, p, br];
-            case 5: return [br, p, q];
+            case 0:
+                return [br, t, p];
+            case 1:
+                return [q, br, p];
+            case 2:
+                return [p, br, t];
+            case 3:
+                return [p, q, br];
+            case 4:
+                return [t, p, br];
+            case 5:
+                return [br, p, q];
         }
     }
     return false;
@@ -309,4 +307,4 @@ module.exports = {
     colorStringFromRGBArray,
     hsvToRGBString,
     hsbToRGB,
-};
+};