iobroker.zigbee2mqtt 2.1.0 → 2.1.1

package/README.md

@@ -13,7 +13,7 @@
 
 ## zigbee2mqtt adapter for ioBroker
 
-Zigbee2MQTT adapter for ioBroker
+This adapter allows to control the data points of the devices of a Zigbee2MQTT instance in ioBroker.  
 
 ## Adapter Documentation
 
@@ -30,6 +30,11 @@ Zigbee2MQTT adapter for ioBroker
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 2.1.1 (2022-10-16)
+
+-   (o0shojo0o) advanced detection if a device has been removed
+-   (o0shojo0o) fixes the design error in the websocket connection
+
 ### 2.1.0 (2022-10-14)
 
 -   (o0shojo0o) added option for color temperature sync with color

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee2mqtt",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "news": {
+      "2.1.1": {
+        "en": "advanced detection if a device has been removed\nfixes the design error in the websocket connection",
+        "de": "fortgeschrittene erkennung, wenn ein gerät entfernt wurde\nkorrigiert den designfehler in der websocket-verbindung",
+        "ru": "предварительное обнаружение, если устройство было удалено\nисправляет ошибку дизайна в подключении к сети",
+        "pt": "detecção avançada se um dispositivo foi removido\ncorrige o erro de projeto na conexão websocket",
+        "nl": "als er een apparaat verwijderd is\nde ontwerpfout in de websocket verbinding",
+        "fr": "détection avancée si un dispositif a été enlevé\ncorrige l'erreur de conception dans la connexion websocket",
+        "it": "rilevamento avanzato se un dispositivo è stato rimosso\ncorregge l'errore di progettazione nella connessione websocket",
+        "es": "detección avanzada si se ha eliminado un dispositivo\nfija el error de diseño en la conexión websocket",
+        "pl": "wykrywanie zaawansowane, jeśli urządzenie zostało usunięte\numożliwia to błędy projektowe w łączu internetowym",
+        "uk": "розширене виявлення, якщо пристрій було видалено\nвиправлено помилку дизайну в підключенні websocket",
+        "zh-cn": "如果一个装置被拆除,则预先发现\nf 确定网站的设计错误"
+      },
       "2.1.0": {
         "en": "added option for color temperature sync with color\nfix logfilter and debugDevices\nlots of bugfixes\nnow set the correct min/max at color temp\nbetter error handling for the connections",
         "de": "zusatzoption für farbtemperatur-sync mit farbe\nlogfilter und DebugDevices fixieren\nviele bugfixes\njetzt die richtige min/max in der farbe tempo einstellen\nbessere fehlerbehandlung für die verbindungen",

package/lib/deviceController.js

@@ -195,10 +195,20 @@ class DeviceController {
 		}
 	}
 
-	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!', } });
 		}
 	}
 

package/lib/statesController.js

@@ -10,7 +10,7 @@ class StatesController {
 		this.logCustomizations = logCustomizations;
 	}
 
-	async processDeviceMessage(messageObj) {
+	processDeviceMessage(messageObj) {
 		// Is payload present?
 		if (messageObj.payload == '') {
 			return;
@@ -19,7 +19,7 @@ class StatesController {
 		const device = this.groupCache.concat(this.deviceCache).find(x => x.id == messageObj.topic);
 		if (device) {
 			try {
-				this.setDeviceState(messageObj, device);
+				this.setDeviceStateSafely(messageObj, device);
 			} catch (error) {
 				this.adapter.log.error(error);
 			}
@@ -29,7 +29,7 @@ class StatesController {
 		}
 	}
 
-	async setDeviceState(messageObj, device) {
+	async setDeviceStateSafely(messageObj, device) {
 		if (this.logCustomizations.debugDevices.includes(device.ieee_address)) {
 			this.adapter.log.warn(`--->>> fromZ2M -> ${device.ieee_address} states: ${JSON.stringify(messageObj)}`);
 		}
@@ -58,9 +58,9 @@ class StatesController {
 						}
 					} else {
 						if (state.getter) {
-							await this.setStateChangedAsync(stateName, state.getter(messageObj.payload));
+							await this.setStateChangedSafelyAsync(stateName, state.getter(messageObj.payload));
 						} else {
-							await this.setStateChangedAsync(stateName, value);
+							await this.setStateChangedSafelyAsync(stateName, value);
 						}
 					}
 				} catch (err) {
@@ -71,13 +71,13 @@ class StatesController {
 		}
 	}
 
-	async setStateAsync(stateName, value) {
+	async setStateSafelyAsync(stateName, value) {
 		if (value !== undefined) {
 			await this.adapter.setStateAsync(stateName, value, true);
 		}
 	}
 
-	async setStateChangedAsync(stateName, value) {
+	async setStateChangedSafelyAsync(stateName, value) {
 		if (value !== undefined) {
 			await this.adapter.setStateChangedAsync(stateName, value, true);
 		}
@@ -95,7 +95,7 @@ class StatesController {
 		}
 	}
 
-	async processQueue() {
+	processQueue() {
 		const oldIncStatsQueue = [];
 		utils.moveArray(incStatsQueue, oldIncStatsQueue);
 		while (oldIncStatsQueue.length > 0) {

package/lib/websocketController.js

@@ -11,9 +11,9 @@ class WebsocketController {
 		this.adapter = adapter;
 	}
 
-	async initWsClient(server, port) {
+	initWsClient() {
 		try {
-			wsClient = new WebSocket(`ws://${server}:${port}/api`);
+			wsClient = new WebSocket(`ws://${this.adapter.config.wsServerIP}:${this.adapter.config.wsServerPort}/api`);
 
 			wsClient.on('open', () => {
 				// Send ping to server
@@ -45,11 +45,11 @@ class WebsocketController {
 		}
 	}
 
-	async send(message) {
+	send(message) {
 		wsClient.send(message);
 	}
 
-	async sendPingToServer() {
+	sendPingToServer() {
 		//this.logDebug('Send ping to server');
 		wsClient.ping();
 		ping = setTimeout(() => {
@@ -57,7 +57,7 @@ class WebsocketController {
 		}, wsHeartbeatIntervall);
 	}
 
-	async wsHeartbeat() {
+	wsHeartbeat() {
 		clearTimeout(pingTimeout);
 		pingTimeout = setTimeout(() => {
 			this.adapter.log.warn('Websocked connection timed out');
@@ -68,7 +68,7 @@ class WebsocketController {
 	async autoRestart() {
 		this.adapter.log.warn(`Start try again in ${restartTimeout / 1000} seconds...`);
 		autoRestartTimeout = setTimeout(() => {
-			this.adapter.onReady();
+			this.adapter.startWebsocket();
 		}, restartTimeout);
 	}
 

package/main.js

@@ -108,23 +108,27 @@ class Zigbee2mqtt extends core.Adapter {
 				await this.delay(1500);
 			}
 
-			websocketController = new WebsocketController(this);
-			const wsClient = await websocketController.initWsClient(this.config.wsServerIP, this.config.wsServerPort);
+			this.startWebsocket();
+		}
+	}
 
-			wsClient.on('open', () => {
-				this.log.info('Connect to Zigbee2MQTT over websocket connection.');
-			});
+	startWebsocket() {
+		websocketController = new WebsocketController(this);
+		const wsClient = websocketController.initWsClient();
 
-			wsClient.on('message', (message) => {
-				this.messageParse(message);
-			});
+		wsClient.on('open', () => {
+			this.log.info('Connect to Zigbee2MQTT over websocket connection.');
+		});
 
-			wsClient.on('clo', async () => {
-				this.setStateChangedAsync('info.connection', false, true);
-				await statesController.setAllAvailableToFalse();
-				this.log.warn('Websocket disconnectet');
-			});
-		}
+		wsClient.on('message', (message) => {
+			this.messageParse(message);
+		});
+
+		wsClient.on('close', async () => {
+			this.setStateChangedAsync('info.connection', false, true);
+			await statesController.setAllAvailableToFalse();
+			this.log.warn('Websocket disconnectet');
+		});
 	}
 
 	async messageParse(message) {
@@ -159,6 +163,10 @@ class Zigbee2mqtt extends core.Adapter {
 				statesController.processQueue();
 				break;
 			case 'bridge/event':
+				console.log(JSON.stringify(messageObj));
+				deviceController.processRemoveEvent(messageObj);
+				break;
+			case 'bridge/response/device/remove':
 				deviceController.processRemoveEvent(messageObj);
 				break;
 			case 'bridge/extensions':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen",
@@ -36,7 +36,7 @@
     "@types/chai": "^4.3.3",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.0",
-    "@types/node": "^18.8.3",
+    "@types/node": "^18.11.0",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.8",
@@ -45,7 +45,7 @@
     "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "mocha": "^10.0.0",
+    "mocha": "^10.1.0",
     "prettier": "^2.7.1",
     "proxyquire": "^2.1.3",
     "sinon": "^14.0.1",