iobroker.zigbee2mqtt 1.0.0 → 2.1.1

package/lib/deviceController.js

@@ -1,14 +1,16 @@
 const states = require('./states').states;
 const defineDeviceFromExposes = require('./exposes').defineDeviceFromExposes;
 const utils = require('./utils');
+const colors = require('./colors.js');
+const rgb = require('./rgb.js');
 const createCache = {};
 
 class DeviceController {
-	constructor(adapter, deviceCache, groupCache, useKelvin) {
+	constructor(adapter, deviceCache, groupCache, config) {
 		this.adapter = adapter;
 		this.groupCache = groupCache;
 		this.deviceCache = deviceCache;
-		this.useKelvin = useKelvin;
+		this.config = config;
 	}
 
 	async createDeviceDefinitions(exposes) {
@@ -22,13 +24,15 @@ class DeviceController {
 						scenes = scenes.concat(expose.endpoints[key].scenes);
 					}
 				}
-				await defineDeviceFromExposes(this.deviceCache, expose.friendly_name, expose.ieee_address, expose.definition, expose.power_source, scenes, this.useKelvin);
+				// if the device is already present in the cache, remove it
+				this.removeDeviceByIeee(this.deviceCache, expose.ieee_address);
+				defineDeviceFromExposes(this.deviceCache, expose.friendly_name, expose.ieee_address, expose.definition, expose.power_source, scenes, this.config);
 			}
 		}
 	}
 
 
-	async defineGroupDevice(devices, groupID, ieee_address, scenes, useKelvin) {
+	async defineGroupDevice(groupID, ieee_address, scenes) {
 		const newDevice = {
 			id: groupID,
 			ieee_address: ieee_address,
@@ -36,12 +40,46 @@ class DeviceController {
 			states: [
 				states.state,
 				states.brightness,
-				states.color,
+				//states.color,
 				states.brightness_move,
 				states.colortemp_move,
 			],
 		};
 
+		const color = {
+			id: 'color',
+			prop: 'color',
+			name: 'Color',
+			icon: undefined,
+			role: 'level.color.rgb',
+			write: true,
+			read: true,
+			type: 'string',
+			setter: (value) => {
+				let xy = [0, 0];
+				const rgbcolor = colors.ParseColor(value);
+				xy = rgb.rgb_to_cie(rgbcolor.r, rgbcolor.g, rgbcolor.b);
+				return {
+					x: xy[0],
+					y: xy[1]
+				};
+			},
+			getter: payload => {
+				if (payload.color_mode != 'xy' && this.config.colorTempSyncColor == false) {
+					return undefined;
+				}
+				if (payload.color && payload.color.x && payload.color.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;
+				}
+			},
+		};
+
+		// @ts-ignore
+		newDevice.states.push(color);
+
 		const colortemp = {
 			id: 'colortemp',
 			prop: 'color_temp',
@@ -51,15 +89,19 @@ class DeviceController {
 			write: true,
 			read: true,
 			type: 'number',
-			unit: useKelvin == true ? 'K' : 'mired',
+			min: this.config.useKelvin == true ? utils.miredKelvinConversion(500) : 150,
+			max: this.config.useKelvin == true ? utils.miredKelvinConversion(150) : 500,
+			unit: this.config.useKelvin == true ? 'K' : 'mired',
 			setter: (value) => {
 				return utils.toMired(value);
 			},
 			getter: (payload) => {
-				if (useKelvin == true) {
-					return utils.miredKelvinConversion(payload.color_temp);
+				if (payload.color_mode != 'color_temp') {
+					return undefined;
 				}
-				else {
+				if (this.config.useKelvin == true) {
+					return utils.miredKelvinConversion(payload.color_temp);
+				} else {
 					return payload.color_temp;
 				}
 			},
@@ -86,13 +128,14 @@ class DeviceController {
 		}
 
 		// if the device is already present in the cache, remove it
-		utils.removeDeviceByIeee(devices, ieee_address);
-		devices.push(newDevice);
+		this.removeDeviceByIeee(this.groupCache, ieee_address);
+		this.groupCache.push(newDevice);
 	}
+
 	async createGroupDefinitions(exposes) {
 		utils.clearArray(this.groupCache);
 		for (const expose of exposes) {
-			await this.defineGroupDevice(this.groupCache, expose.friendly_name, `group_${expose.id}`, expose.scenes, this.useKelvin);
+			await this.defineGroupDevice(expose.friendly_name, `group_${expose.id}`, expose.scenes);
 		}
 	}
 
@@ -147,13 +190,32 @@ class DeviceController {
 
 	async renameDeviceInCache(messageObj) {
 		const renamedDevice = this.groupCache.concat(this.deviceCache).find(x => x.id == messageObj.payload.data.from);
-		renamedDevice.id = messageObj.payload.data.to;
+		if (renamedDevice) {
+			renamedDevice.id = messageObj.payload.data.to;
+		}
 	}
 
-	async processRemoveEvent(messageObj) {
+	processRemoveEvent(messageObj) {
+		let ieee_address = undefined;
 		if (messageObj.payload && messageObj.payload.type == 'device_leave') {
-			this.adapter.setStateAsync(`${messageObj.payload.data.ieee_address}.available`, false, true);
-			this.adapter.extendObject(`${messageObj.payload.data.ieee_address}`, { common: { name: 'Device removed!', } });
+			ieee_address = messageObj.payload.data.ieee_address;
+		}
+
+		//{"data":{"block":false,"force":true,"id":"0xa4c138c954baaf54"},"status":"ok","transaction":"zhvjf-5"}
+		if (messageObj.payload && messageObj.payload.data) {
+			ieee_address = messageObj.payload.data.id;
+		}
+
+		if (ieee_address != undefined) {
+			this.adapter.setStateAsync(`${ieee_address}.available`, false, true);
+			this.adapter.extendObject(`${ieee_address}`, { common: { name: 'Device removed!', } });
+		}
+	}
+
+	removeDeviceByIeee(devices, ieee_address) {
+		const idx = devices.findIndex(x => x.ieee_address == ieee_address);
+		if (idx > -1) {
+			devices.splice(idx, 1);
 		}
 	}
 

package/lib/exposes.js

@@ -38,8 +38,7 @@ function genState(expose, role, name, desc) {
 
 			if (readable) {
 				state.getter = (payload) => (payload[propName] === (expose.value_on || 'ON'));
-			}
-			else {
+			} else {
 				state.getter = (_payload) => (undefined);
 			}
 
@@ -121,7 +120,7 @@ function genState(expose, role, name, desc) {
 	return state;
 }
 
-function createFromExposes(deviceID, ieee_address, definitions, power_source, scenes, useKelvin) {
+function createFromExposes(deviceID, ieee_address, definitions, power_source, scenes, config) {
 	const states = [];
 	// make the different (set and get) part of state is updatable if different exposes is used for get and set
 	// as example:
@@ -161,8 +160,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
 			}
 
 			return states.push(state);
-		}
-		else {
+		} else {
 
 			if ((state.readable) && (!states[stateExists].readable)) {
 				states[stateExists].read = state.read;
@@ -192,8 +190,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
 						}
 						delete states[stateExists].prop;
 					}
-				}
-				else if (state.hasOwnProperty('prop')) {
+				} else if (state.hasOwnProperty('prop')) {
 					states[stateExists].prop = state.prop;
 				}
 				states[stateExists].readable = true;
@@ -220,16 +217,14 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
 				// or remove it
 				if (((!state.hasOwnProperty('isOption')) || (state.isOptions === false)) && (states[stateExists].hasOwnProperty('isOption'))) {
 					delete states[stateExists].isOption;
-				}
-				else {
+				} else {
 					states[stateExists].isOption = state.isOption;
 				}
 
 				// use new `setattr` or `prop` as `setattr`
 				if (state.hasOwnProperty('setattr')) {
 					states[stateExists].setattr = state.setattr;
-				}
-				else if (state.hasOwnProperty('prop')) {
+				} else if (state.hasOwnProperty('prop')) {
 					states[stateExists].setattr = state.prop;
 				}
 
@@ -322,22 +317,24 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
 								write: true,
 								read: true,
 								type: 'number',
-								min: undefined, //useKelvin == true ? expose.value_min : utils.miredKelvinConversion(expose.value_min),
-								max: undefined, //useKelvin == true ? expose.value_min : utils.miredKelvinConversion(expose.value_max),
-								unit: useKelvin == true ? 'K' : 'mired',
+								min: config.useKelvin == true ? utils.miredKelvinConversion(prop.value_max) : prop.value_min,
+								max: config.useKelvin == true ? utils.miredKelvinConversion(prop.value_min) : prop.value_max,
+								unit: config.useKelvin == true ? 'K' : 'mired',
 								setter: (value) => {
 									return utils.toMired(value);
 								},
-								setterOpt: (_value, options) => {
-									const hasTransitionTime = options && options.hasOwnProperty('transition_time');
-									const transitionTime = hasTransitionTime ? options.transition_time : 0;
-									return { ...options, transition: transitionTime };
-								},
+								// setterOpt: (_value, options) => {
+								// 	const hasTransitionTime = options && options.hasOwnProperty('transition_time');
+								// 	const transitionTime = hasTransitionTime ? options.transition_time : 0;
+								// 	return { ...options, transition: transitionTime };
+								// },
 								getter: (payload) => {
-									if (useKelvin == true) {
-										return utils.miredKelvinConversion(payload.color_temp);
+									if (payload.color_mode != 'color_temp') {
+										return undefined;
 									}
-									else {
+									if (config.useKelvin == true) {
+										return utils.miredKelvinConversion(payload.color_temp);
+									} else {
 										return payload.color_temp;
 									}
 								},
@@ -370,12 +367,10 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
 									};
 
 								},
-								setterOpt: (_value, options) => {
-									const hasTransitionTime = options && options.hasOwnProperty('transition_time');
-									const transitionTime = hasTransitionTime ? options.transition_time : 0;
-									return { ...options, transition: transitionTime };
-								},
 								getter: payload => {
+									if (payload.color_mode != 'xy' && config.colorTempSyncColor == false) {
+										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]);
@@ -578,6 +573,10 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
 							state = statesDefs.temperature;
 							break;
 
+						case 'device_temperature':
+							state = statesDefs.device_temperature;
+							break;
+
 						case 'humidity':
 							state = statesDefs.humidity;
 							break;
@@ -598,6 +597,24 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
 							state = statesDefs.load_power;
 							break;
 
+						case 'current':
+							state = statesDefs.load_current;
+							break;
+
+						case 'voltage':
+							state = statesDefs.voltage;
+							if (power_source == 'Battery') {
+								state = statesDefs.battery_voltage;
+							}
+							if (expose.unit == 'mV') {
+								state.getter = payload => payload.voltage / 1000;
+							}
+							break;
+
+						case 'energy':
+							state = statesDefs.energy;
+							break;
+
 						default:
 							state = genState(expose);
 							break;
@@ -761,13 +778,14 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
 						case 'running_mode':
 							pushToStates(statesDefs.climate_running_mode, prop.access);
 							break;
-						default: {
-							if (prop.name.includes('heating_setpoint')) {
-								pushToStates(genState(prop, 'level.temperature'), prop.access);
-							} else {
-								pushToStates(genState(prop), prop.access);
+						default:
+							{
+								if (prop.name.includes('heating_setpoint')) {
+									pushToStates(genState(prop, 'level.temperature'), prop.access);
+								} else {
+									pushToStates(genState(prop), prop.access);
+								}
 							}
-						}
 							break;
 					}
 				}
@@ -800,13 +818,11 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
 						st.getter = payload => {
 							if ((payload.hasOwnProperty(expose.property)) && (payload[expose.property] !== null) && payload[expose.property].hasOwnProperty(prop.property)) {
 								return !isNaN(payload[expose.property][prop.property]) ? payload[expose.property][prop.property] : undefined;
-							}
-							else {
+							} else {
 								return undefined;
 							}
 						};
-					}
-					else {
+					} else {
 						st.getter = _payload => { return undefined; };
 					}
 					pushToStates(st, prop.access);
@@ -850,15 +866,13 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source, sc
 	return newDevice;
 }
 
-function defineDeviceFromExposes(devices, deviceID, ieee_address, definitions, power_source, scenes, useKelvin) {
-	// if the device is already present in the cache, remove it
-	utils.removeDeviceByIeee(devices, ieee_address);
+function defineDeviceFromExposes(devices, deviceID, ieee_address, definitions, power_source, scenes, config) {
 	if (definitions.hasOwnProperty('exposes')) {
-		const newDevice = createFromExposes(deviceID, ieee_address, definitions, power_source, scenes, useKelvin);
+		const newDevice = createFromExposes(deviceID, ieee_address, definitions, power_source, scenes, config);
 		devices.push(newDevice);
 	}
 }
 
 module.exports = {
 	defineDeviceFromExposes: defineDeviceFromExposes,
-};
+};

package/lib/messages.js

@@ -1,18 +1,39 @@
 async function adapterInfo(config, log) {
-	log.info(`Zigbee2MQTT Frontend Server: ${config.server}`);
-	log.info(`Zigbee2MQTT Frontend Port: ${config.port}`);
-	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('================================= 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 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('============================ 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: adapterInfo,
-	zigbee2mqttInfo: zigbee2mqttInfo,
+	adapterInfo,
+	zigbee2mqttInfo,
 };

package/lib/mqttServerController.js

@@ -0,0 +1,42 @@
+const core = require('@iobroker/adapter-core');
+const Aedes = require('aedes');
+const net = require('net');
+
+
+class MqttServerController {
+	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 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
+};

package/lib/rgb.js

@@ -73,14 +73,12 @@ function cie_to_rgb(x, y, brightness) {
 		green = green / red;
 		blue = blue / red;
 		red = 1.0;
-	}
-	else if (green > blue && green > red && green > 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) {
+	} else if (blue > red && blue > green && blue > 1.0) {
 
 		red = red / blue;
 		green = green / blue;
@@ -157,7 +155,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, h = h.h;
 	}
@@ -167,12 +167,24 @@ 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),
@@ -185,17 +197,29 @@ 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 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 {
 		// @ts-ignore
@@ -210,6 +234,7 @@ function rgbToHSV(r, g, b, numeric) {
 		v: (v * 100).toFixed(3),
 	};
 }
+
 function colorArrayFromString(value) {
 	if (typeof (value) === 'string') {
 		const rv = [];
@@ -260,4 +285,4 @@ exports.hsvToRGB = hsvToRGB;
 exports.rgbToHSV = rgbToHSV;
 exports.colorArrayFromString = colorArrayFromString;
 exports.colorStringFromRGBArray = colorStringFromRGBArray;
-exports.hsvToRGBString = hsvToRGBString;
+exports.hsvToRGBString = hsvToRGBString;