iobroker.zigbee2mqtt 0.2.0 → 1.0.0

package/lib/states.js

@@ -5447,6 +5447,7 @@ const states = {
 		write: false,
 		read: true,
 		type: 'boolean',
+		def: false,
 		isEvent: true,
 		getter: payload => (payload.action === 'brightness_move_up') ? true : undefined,
 	},
@@ -5471,6 +5472,7 @@ const states = {
 		write: false,
 		read: true,
 		type: 'boolean',
+		def: false,
 		isEvent: true,
 		getter: payload => (payload.action === 'brightness_move_down') ? true : undefined,
 	},

package/lib/statesController.js

@@ -0,0 +1,127 @@
+const utils = require('./utils');
+const incStatsQueue = [];
+
+class StatesController {
+	constructor(adapter, deviceCache, groupCache, debugDevices) {
+		this.adapter = adapter;
+		this.groupCache = groupCache;
+		this.deviceCache = deviceCache;
+		this.debugDevices = debugDevices;
+	}
+
+	async processDeviceMessage(messageObj) {
+		// Is payload present?
+		if (messageObj.payload == '') {
+			return;
+		}
+
+		const device = this.groupCache.concat(this.deviceCache).find(x => x.id == messageObj.topic);
+		if (device) {
+			try {
+				this.setDeviceState(messageObj, device);
+			} catch (error) {
+				this.adapter.log.error(error);
+			}
+		}
+		else {
+			incStatsQueue[incStatsQueue.length] = messageObj;
+			this.adapter.log.debug(`Device: ${messageObj.topic} not found, queue state in incStatsQueue!`);
+		}
+	}
+
+	async setDeviceState(messageObj, device) {
+		if (this.debugDevices.includes(device.ieee_address)) {
+			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);
+			}
+
+			for (const state of states) {
+				if (!state) {
+					continue;
+				}
+
+				const stateName = `${device.ieee_address}.${state.id}`;
+
+				try {
+					if (state.isEvent) {
+						if (state.getter) {
+							await this.setStateWithTimeoutAsync(stateName, state.getter(messageObj.payload), 300);
+						}
+						else {
+							await this.setStateWithTimeoutAsync(stateName, value, 300);
+						}
+					}
+					else {
+						if (state.getter) {
+							await this.setStateAsync(stateName, state.getter(messageObj.payload));
+						}
+						else {
+							await this.setStateAsync(stateName, value);
+						}
+					}
+				} catch (err) {
+					//this.adapter.log.warn(`Can not set ${stateName}`);
+					incStatsQueue[incStatsQueue.length] = messageObj;
+					this.adapter.log.debug(`Can not set ${stateName} for ${messageObj.topic}, queue state in incStatsQueue!`);
+				}
+			}
+		}
+	}
+
+	async setStateAsync(stateName, value) {
+		if (value !== undefined) {
+			await this.adapter.setStateAsync(stateName, value, true);
+		}
+	}
+
+	async setStateWithTimeoutAsync(stateName, value, timeout) {
+		if (value !== undefined) {
+			await this.adapter.setStateAsync(stateName, value, true);
+			setTimeout(() => {
+				this.adapter.setStateAsync(stateName, !value, true);
+			}, timeout);
+		}
+	}
+
+	async processQueue() {
+		const oldIncStatsQueue = [];
+		utils.moveArray(incStatsQueue, oldIncStatsQueue);
+		while (oldIncStatsQueue.length > 0) {
+			this.processDeviceMessage(oldIncStatsQueue.shift());
+		}
+	}
+
+	async subscribeWritableStates() {
+		await this.adapter.unsubscribeObjectsAsync('*');
+		for (const device of this.groupCache.concat(this.deviceCache)) {
+			for (const state of device.states) {
+				if (state.write == true) {
+					this.adapter.subscribeStatesAsync(`${device.ieee_address}.${state.id}`);
+				}
+			}
+		}
+		this.adapter.subscribeStatesAsync('info.debugmessages');
+		this.adapter.subscribeStatesAsync('info.logfilter');
+	}
+
+	async setAllAvailableToFalse() {
+		for (const device of this.deviceCache) {
+			for (const state of device.states) {
+				if (state.id == 'available') {
+					await this.adapter.setStateAsync(`${device.ieee_address}.${state.id}`, false, true);
+				}
+			}
+		}
+	}
+}
+
+module.exports = {
+	StatesController
+};

package/lib/utils.js

@@ -118,14 +118,23 @@ function clearArray(array) {
 	}
 }
 
-exports.bulbLevelToAdapterLevel = bulbLevelToAdapterLevel;
-exports.adapterLevelToBulbLevel = adapterLevelToBulbLevel;
-exports.bytesArrayToWordArray = bytesArrayToWordArray;
-exports.toMired = toMired;
-exports.miredKelvinConversion = miredKelvinConversion;
-exports.decimalToHex = decimalToHex;
-exports.getZbId = getZbId;
-exports.getAdId = getAdId;
-exports.removeDeviceByIeee = removeDeviceByIeee;
-exports.getDeviceIcon = getDeviceIcon;
-exports.clearArray = clearArray;
+function moveArray(source, target) {
+	while (source.length > 0) {
+		target.push(source.shift());
+	}
+}
+
+module.exports = {
+	bulbLevelToAdapterLevel: bulbLevelToAdapterLevel,
+	adapterLevelToBulbLevel: adapterLevelToBulbLevel,
+	bytesArrayToWordArray: bytesArrayToWordArray,
+	toMired: toMired,
+	miredKelvinConversion: miredKelvinConversion,
+	decimalToHex: decimalToHex,
+	getZbId: getZbId,
+	getAdId: getAdId,
+	removeDeviceByIeee: removeDeviceByIeee,
+	getDeviceIcon: getDeviceIcon,
+	clearArray: clearArray,
+	moveArray: moveArray,
+};

package/lib/z2mController.js

@@ -0,0 +1,80 @@
+class Z2mController {
+	constructor(adapter, deviceCache, groupCache, logfilter) {
+		this.adapter = adapter;
+		this.groupCache = groupCache;
+		this.deviceCache = deviceCache;
+		this.logfilter = logfilter;
+	}
+
+	async createZ2MMessage(id, state) {
+		const splitedID = id.split('.');
+		if (splitedID.length < 4) {
+			this.adapter.log.warn(`state ${id} not valid`);
+			return;
+		}
+
+		const ieee_address = splitedID[2];
+		const stateName = splitedID[3];
+
+		const device = this.groupCache.concat(this.deviceCache).find(d => d.ieee_address == ieee_address);
+		if (!device) {
+			return;
+		}
+
+		const deviceState = device.states.find(s => s.id == stateName);
+		if (!deviceState) {
+			return;
+		}
+
+		let stateVal = state.val;
+		if (deviceState.setter) {
+			stateVal = deviceState.setter(state.val);
+		}
+
+		let stateID = deviceState.id;
+		if (deviceState.prop) {
+			stateID = deviceState.prop;
+		}
+
+		let topic = `${device.ieee_address}/set`;
+		if (device.ieee_address.includes('group_')) {
+			topic = `${device.id}/set`;
+		}
+
+		const controlObj = {
+			payload: {
+				[stateID]: stateVal
+			},
+			topic: topic
+		};
+		// 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)) {
+			this.adapter.setState(id, state, true);
+		}
+
+		return controlObj;
+	}
+
+	async proxyZ2MLogs(messageObj) {
+		const logMessage = messageObj.payload.message;
+		if (this.logfilter.some(x => logMessage.includes(x))) {
+			return;
+		}
+
+		const logLevel = messageObj.payload.level;
+		switch (logLevel) {
+			case 'debug':
+			case 'info':
+			case 'error':
+				this.adapter.log[logLevel](logMessage);
+				break;
+			case 'warning':
+				this.adapter.log.warn(logMessage);
+				break;
+		}
+	}
+}
+
+module.exports = {
+	Z2mController: Z2mController
+};