iobroker.zigbee2mqtt 2.1.1 → 2.2.0

package/lib/messages.js

@@ -1,39 +1,39 @@
 async function adapterInfo(config, log) {
-	log.info('================================= Adapter Config =================================');
-	log.info(`|| Zigbee2MQTT Frontend Scheme: ${config.webUIScheme}`);
-	log.info(`|| Zigbee2MQTT Frontend Server: ${config.webUIServer}`);
-	log.info(`|| Zigbee2MQTT Frontend Port: ${config.webUIPort}`);
-	log.info(`|| Zigbee2MQTT Connection Type: ${config.connectionType}`);
-	if (config.connectionType == 'ws') {
-		log.info(`|| Zigbee2MQTT Websocket Server: ${config.wsServerIP}`);
-		log.info(`|| Zigbee2MQTT Websocket Port: ${config.wsServerPort}`);
-		log.info(`|| Zigbee2MQTT Websocket Dummy MQTT-Server: ${config.dummyMqtt ? 'activated' : 'deactivated'}`);
-		if (config.dummyMqtt == true) {
-			log.info(`|| Zigbee2MQTT Dummy MQTT IP-Bind: ${config.mqttServerIPBind}`);
-			log.info(`|| Zigbee2MQTT Dummy MQTT Port: ${config.mqttServerPort}`);
-		}
-	} else if (config.connectionType == 'exmqtt') {
-		log.info(`|| Zigbee2MQTT Externanl MQTT Server: ${config.externalMqttServerIP}`);
-		log.info(`|| Zigbee2MQTT Externanl MQTT Port: ${config.externalMqttServerPort}`);
-	} else if (config.connectionType == 'intmqtt') {
-		log.info(`|| Zigbee2MQTT Internal MQTT IP-Bind: ${config.mqttServerIPBind}`);
-		log.info(`|| Zigbee2MQTT Internal MQTT Port: ${config.mqttServerPort}`);
-	}
-	log.info(`|| Zigbee2MQTT Debug Log: ${config.debugLogEnabled ? 'activated' : 'deactivated'}`);
-	log.info(`|| Proxy Zigbee2MQTT Logs to ioBroker Logs: ${config.proxyZ2MLogs ? 'activated' : 'deactivated'}`);
-	log.info(`|| Use Kelvin: ${config.useKelvin ? 'yes' : 'no'}`);
-	log.info('==================================================================================');
+    log.info('================================= Adapter Config =================================');
+    log.info(`|| Zigbee2MQTT Frontend Scheme: ${config.webUIScheme}`);
+    log.info(`|| Zigbee2MQTT Frontend Server: ${config.webUIServer}`);
+    log.info(`|| Zigbee2MQTT Frontend Port: ${config.webUIPort}`);
+    log.info(`|| Zigbee2MQTT Connection Type: ${config.connectionType}`);
+    if (config.connectionType == 'ws') {
+        log.info(`|| Zigbee2MQTT Websocket Server: ${config.wsServerIP}`);
+        log.info(`|| Zigbee2MQTT Websocket Port: ${config.wsServerPort}`);
+        log.info(`|| Zigbee2MQTT Websocket Dummy MQTT-Server: ${config.dummyMqtt ? 'activated' : 'deactivated'}`);
+        if (config.dummyMqtt == true) {
+            log.info(`|| Zigbee2MQTT Dummy MQTT IP-Bind: ${config.mqttServerIPBind}`);
+            log.info(`|| Zigbee2MQTT Dummy MQTT Port: ${config.mqttServerPort}`);
+        }
+    } else if (config.connectionType == 'exmqtt') {
+        log.info(`|| Zigbee2MQTT Externanl MQTT Server: ${config.externalMqttServerIP}`);
+        log.info(`|| Zigbee2MQTT Externanl MQTT Port: ${config.externalMqttServerPort}`);
+    } else if (config.connectionType == 'intmqtt') {
+        log.info(`|| Zigbee2MQTT Internal MQTT IP-Bind: ${config.mqttServerIPBind}`);
+        log.info(`|| Zigbee2MQTT Internal MQTT Port: ${config.mqttServerPort}`);
+    }
+    log.info(`|| Zigbee2MQTT Debug Log: ${config.debugLogEnabled ? 'activated' : 'deactivated'}`);
+    log.info(`|| Proxy Zigbee2MQTT Logs to ioBroker Logs: ${config.proxyZ2MLogs ? 'activated' : 'deactivated'}`);
+    log.info(`|| Use Kelvin: ${config.useKelvin ? 'yes' : 'no'}`);
+    log.info('==================================================================================');
 }
 
 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('==================================================================================');
+    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('==================================================================================');
 }
 
 module.exports = {
-	adapterInfo,
-	zigbee2mqttInfo,
+    adapterInfo,
+    zigbee2mqttInfo,
 };

package/lib/mqttServerController.js

@@ -4,39 +4,39 @@ const net = require('net');
 
 
 class MqttServerController {
-	constructor(adapter) {
-		this.adapter = adapter;
-	}
+    constructor(adapter) {
+        this.adapter = adapter;
+    }
 
-	async createMQTTServer() {
-		try {
-			const NedbPersistence = require('aedes-persistence-nedb');
-			const db = new NedbPersistence({ path: `${core.getAbsoluteInstanceDataDir(this.adapter)}/mqttData`, prefix: '' });
-			// @ts-ignore
-			const aedes = Aedes({ persistence: db });
-			const 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}`);
-			});
-		} catch (err) {
-			this.adapter.log.error(err);
-		}
-	}
+    async createMQTTServer() {
+        try {
+            const NedbPersistence = require('aedes-persistence-nedb');
+            const db = new NedbPersistence({ path: `${core.getAbsoluteInstanceDataDir(this.adapter)}/mqttData`, prefix: '' });
+            // @ts-ignore
+            const aedes = Aedes({ persistence: db });
+            const 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}`);
+            });
+        } catch (err) {
+            this.adapter.log.error(err);
+        }
+    }
 
-	async createDummyMQTTServer() {
-		try {
-			// @ts-ignore
-			const aedes = Aedes();
-			const 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}`);
-			});
-		} catch (err) {
-			this.adapter.log.error(err);
-		}
-	}
+    async createDummyMQTTServer() {
+        try {
+            // @ts-ignore
+            const aedes = Aedes();
+            const 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}`);
+            });
+        } catch (err) {
+            this.adapter.log.error(err);
+        }
+    }
 }
 
 module.exports = {
-	MqttServerController
+    MqttServerController
 };

package/lib/nonGenericDevicesExtension.js

@@ -0,0 +1,47 @@
+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;
+                }
+                return valObj;
+
+            } catch (error) {
+                return undefined;
+            }
+
+        },
+        getter: payload => {
+            if (!payload.effect) {
+                return undefined;
+            }
+            return JSON.stringify(payload.effect);
+        },
+    }]
+};
+
+function getStateDefinition(model) {
+    const stateDef = nonGenDevStatesDefs[model];
+    if (stateDef) {
+        return stateDef;
+    } else {
+        return [];
+    }
+
+}
+
+module.exports = {
+    getStateDefinition
+};

package/lib/rgb.js

@@ -47,68 +47,68 @@ const colors = require('./colors.js');
  * @return {Array} Array that contains the color values for red, green and blue
  */
 function cie_to_rgb(x, y, brightness) {
-	//Set to maximum brightness if no custom value was given (Not the slick ECMAScript 6 way for compatibility reasons)
-	if (brightness === undefined) {
-		brightness = 254;
-	}
-
-	const z = 1.0 - x - y;
-	const Y = (brightness / 254).toFixed(2);
-	// @ts-ignore
-	const X = (Y / y) * x;
-	// @ts-ignore
-	const Z = (Y / y) * z;
-
-	//Convert to RGB using Wide RGB D65 conversion
-	// @ts-ignore
-	let red = X * 1.656492 - Y * 0.354851 - Z * 0.255038;
-	// @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;
-
-	//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;
-
-
-	//Convert normalized decimal to decimal
-	red = Math.round(red * 255);
-	green = Math.round(green * 255);
-	blue = Math.round(blue * 255);
-
-	if (isNaN(red) || red < 0) {
-		red = 0;
-	}
-
-	if (isNaN(green) || green < 0) {
-		green = 0;
-	}
-
-	if (isNaN(blue) || blue < 0) {
-		blue = 0;
-	}
-
-	return [red, green, blue];
+    //Set to maximum brightness if no custom value was given (Not the slick ECMAScript 6 way for compatibility reasons)
+    if (brightness === undefined) {
+        brightness = 254;
+    }
+
+    const z = 1.0 - x - y;
+    const Y = (brightness / 254).toFixed(2);
+    // @ts-ignore
+    const X = (Y / y) * x;
+    // @ts-ignore
+    const Z = (Y / y) * z;
+
+    //Convert to RGB using Wide RGB D65 conversion
+    // @ts-ignore
+    let red = X * 1.656492 - Y * 0.354851 - Z * 0.255038;
+    // @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;
+
+    //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;
+
+
+    //Convert normalized decimal to decimal
+    red = Math.round(red * 255);
+    green = Math.round(green * 255);
+    blue = Math.round(blue * 255);
+
+    if (isNaN(red) || red < 0) {
+        red = 0;
+    }
+
+    if (isNaN(green) || green < 0) {
+        green = 0;
+    }
+
+    if (isNaN(blue) || blue < 0) {
+        blue = 0;
+    }
+
+    return [red, green, blue];
 }
 
 
@@ -120,169 +120,193 @@ function cie_to_rgb(x, y, brightness) {
  * @return {Array} Array that contains the CIE color values for x and y
  */
 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);
-
-	// 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;
-
-	// Calculate the xy values from the XYZ values
-	let x = (X / (X + Y + Z)).toFixed(4);
-	let y = (Y / (X + Y + Z)).toFixed(4);
-
-	// @ts-ignore
-	if (isNaN(x)) {
-		// @ts-ignore
-		x = 0;
-	}
-
-	// @ts-ignore
-	if (isNaN(y)) {
-		// @ts-ignore
-		y = 0;
-	}
-
-	return [x, y];
+    // 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);
+
+    // 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;
+
+    // Calculate the xy values from the XYZ values
+    let x = (X / (X + Y + Z)).toFixed(4);
+    let y = (Y / (X + Y + Z)).toFixed(4);
+
+    // @ts-ignore
+    if (isNaN(x)) {
+        // @ts-ignore
+        x = 0;
+    }
+
+    // @ts-ignore
+    if (isNaN(y)) {
+        // @ts-ignore
+        y = 0;
+    }
+
+    return [x, y];
 }
 
 
 function hsvToRGB(h, s, v) {
-	h = h % 360 / 360;
-	s = s / 100;
-	v = v / 100;
-
-	let r;
-	let g;
-	let b;
-	if (arguments.length === 1) {
-		s = h.s, v = h.v, h = h.h;
-	}
-	const i = Math.floor(h * 6);
-	const f = h * 6 - i;
-	const p = v * (1 - s);
-	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;
-	}
-	return {
-		r: Math.round(r * 255),
-		g: Math.round(g * 255),
-		b: Math.round(b * 255),
-	};
+    h = h % 360 / 360;
+    s = s / 100;
+    v = v / 100;
+
+    let r;
+    let g;
+    let b;
+    if (arguments.length === 1) {
+        s = h.s, v = h.v, h = h.h;
+    }
+    const i = Math.floor(h * 6);
+    const f = h * 6 - i;
+    const p = v * (1 - s);
+    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;
+    }
+    return {
+        r: Math.round(r * 255),
+        g: Math.round(g * 255),
+        b: Math.round(b * 255),
+    };
 }
 
 function rgbToHSV(r, g, b, numeric) {
-	if (arguments.length === 1) {
-		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 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;
-	}
-	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),
-		s: (s * 100).toFixed(3),
-		v: (v * 100).toFixed(3),
-	};
+    if (arguments.length === 1) {
+        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 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;
+    }
+    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),
+        s: (s * 100).toFixed(3),
+        v: (v * 100).toFixed(3),
+    };
 }
 
 function colorArrayFromString(value) {
-	if (typeof (value) === 'string') {
-		const rv = [];
-		value.split(',').forEach(element => {
-			rv.push(colors.ParseColor(element));
-		});
-		return rv;
-	}
-	return [{ r: 0, g: 128, b: 255 }];
+    if (typeof (value) === 'string') {
+        const rv = [];
+        value.split(',').forEach(element => {
+            rv.push(colors.ParseColor(element));
+        });
+        return rv;
+    }
+    return [{ r: 0, g: 128, b: 255 }];
 }
 
 function colorStringFromRGBArray(payload) {
-	const rv = [];
-	payload.forEach(element => {
-		rv.push(rgb_to_rgbstring(element));
-	});
-	return rv.toString();
+    const rv = [];
+    payload.forEach(element => {
+        rv.push(rgb_to_rgbstring(element));
+    });
+    return rv.toString();
 }
 
 function hsv_to_cie(h, s, v) {
-	const rgb = hsvToRGB(h, s, v);
-	return rgb_to_cie(rgb.r, rgb.g, rgb.b);
+    const rgb = hsvToRGB(h, s, v);
+    return rgb_to_cie(rgb.r, rgb.g, rgb.b);
 }
 
 function rgb_to_rgbstring(element) {
-	let col = '#';
-	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');
-	else col = col + '00';
-	if (element && element.hasOwnProperty('b'))
-		col = col + element.b.toString(16).padStart(2, '0');
-	else col = col + '00';
-	return col;
+    let col = '#';
+    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');
+    else col = col + '00';
+    if (element && element.hasOwnProperty('b'))
+        col = col + element.b.toString(16).padStart(2, '0');
+    else col = col + '00';
+    return col;
 }
 
+function hsbToRGB(h, s, b) {
+    const br = Math.round(b * 2.55);
+    if (s == 0) {
+        return [br, br, br];
+    } 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);
+        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];
+        }
+    }
+    return false;
+}
 
 function hsvToRGBString(h, s, v) {
-	return rgb_to_rgbstring(hsvToRGB(h, s, v));
+    return rgb_to_rgbstring(hsvToRGB(h, s, v));
 }
 
-exports.hsv_to_cie = hsv_to_cie;
-exports.rgb_to_cie = rgb_to_cie;
-exports.cie_to_rgb = cie_to_rgb;
-exports.hsvToRGB = hsvToRGB;
-exports.rgbToHSV = rgbToHSV;
-exports.colorArrayFromString = colorArrayFromString;
-exports.colorStringFromRGBArray = colorStringFromRGBArray;
-exports.hsvToRGBString = hsvToRGBString;
+module.exports = {
+    hsv_to_cie,
+    rgb_to_cie,
+    cie_to_rgb,
+    hsvToRGB,
+    rgbToHSV,
+    colorArrayFromString,
+    colorStringFromRGBArray,
+    hsvToRGBString,
+    hsbToRGB,
+};