iobroker.device-watcher 2.10.0 → 2.10.2

package/README.md

@@ -189,6 +189,16 @@ It's possible to select:
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 2.10.2 (2024-01-20)
+
+-   (ciddi89) Fixed: typeError for available adapter update messages
+-   (ciddi89) Fixed: Lists for updatable adapter
+
+### 2.10.1 (2024-01-15)
+
+-   (ciddi89) Fixed: several bugs from last version
+-   (ciddi89) Added: finished translations
+
 ### 2.10.0 (2024-01-13)
 
 -   (ciddi89) Fixed: Batterie value for shelly plus Gen2 devices [#282](https://github.com/ciddi89/ioBroker.device-watcher/issues/282)

package/io-package.json

@@ -1,8 +1,34 @@
 {
 	"common": {
 		"name": "device-watcher",
-		"version": "2.10.0",
+		"version": "2.10.2",
 		"news": {
+			"2.10.2": {
+				"en": "Fixed: typeError for available adapter update messages\nFixed: Lists for updatable adapter",
+				"de": "Behoben: Type-Fehler bei verfügbaren Adapter-Update-Nachrichten\nBehoben: Fehler bei Listen für Updatable Adapter",
+				"ru": "Исправлено: тип Ошибка для доступных сообщений обновления адаптера\nИсправлено: Списокы для обновляемого адаптера",
+				"pt": "Fixo: tipo Erro para mensagens de atualização do adaptador disponível\nCorrigido: Listas para adaptador updatable",
+				"nl": "Vast: type Fout bij het updaten van beschikbare adapterberichten\nVast: Lijsten voor updatable adapter",
+				"fr": "Correction : type Erreur pour les messages de mise à jour adaptateur disponibles\nCorrection : Listes pour adaptateur updatable",
+				"it": "Fisso: tipo Errore per i messaggi di aggiornamento dell'adattatore disponibili\nFisso: Liste per adattatore updatable",
+				"es": "Fijo: tipo Error para mensajes de actualización de adaptador disponibles\nFijación: Listas para adaptador actualizado",
+				"pl": "Naprawiono: typ Błąd dla dostępnych komunikatów aktualizacji adaptera\nNaprawiono: Listy do aktualizacji adaptera",
+				"uk": "Фіксований: тип Помилка для доступних повідомлень про оновлення адаптера\nВиправлено: Списки для адаптера",
+				"zh-cn": "固定:类型 可用适配器更新消息出错\n固定: 更新适配器列表"
+			},
+			"2.10.1": {
+				"en": "Fixed: several bugs from last version\nAdded: finished translations",
+				"de": "Behoben: mehrere Bugs aus der letzten Version\nHinzugefügt: fertige Übersetzungen",
+				"ru": "Исправлено: несколько ошибок из последней версии\nДобавлено: законченные переводы",
+				"pt": "Corrigido: vários bugs da última versão\nAdicionado: terminou traduções",
+				"nl": "Vast: meerdere bugs van de laatste versie\nToegevoegd: voltooide vertalingen",
+				"fr": "Correction : plusieurs bogues de la dernière version\nAjouté : traductions terminées",
+				"it": "Risolto: diversi bug dall'ultima versione\nAggiunto: finito traduzioni",
+				"es": "Corregido: varios errores de la última versión\nAñadido: traducciones terminadas",
+				"pl": "Naprawiono: kilka błędów z ostatniej wersji\nDodano: tłumaczenie gotowe",
+				"uk": "Виправлено: кілька помилок з останньої версії\nДодано: закінчені переклади",
+				"zh-cn": "固定: 上一个版本的一些错误\n添加:完成翻译"
+			},
 			"2.10.0": {
 				"en": "Fixed: Batterie value for shelly plus Gen2 devices [#282](https://github.com/ciddi89/ioBroker.device-watcher/issues/282)\nAdded: Option to display the last signal strength value when the device is offline [#282](https://github.com/ciddi89/ioBroker.device-watcher/issues/282)\nAdded: Translation for JSON lists, HTML lists and notifications [#245](https://github.com/ciddi89/ioBroker.device-watcher/issues/245)\nOther: clean up code",
 				"de": "Behoben: Batteriewert für Shelly plus Gen2 Geräte [#282](https://github.com/ciddi89/ioBroker.device-watcher/issues/282)\nHinzugefügt: Option, den letzten Signalstärkewert anzuzeigen, wenn das Gerät offline ist [#282](https://github.com/ciddi89/ioBroker.device-watcher/issues/282)\nHinzugefügt: Übersetzung für JSON-Listen, HTML-Listen und Benachrichtigungen [#245](https://github.com/ciddi89/ioBroker.device-watcher/issues/245)\nAndere: Code aufgeräumt",
@@ -67,32 +93,6 @@
 				"pl": "Fixed: Fullybroswer >v3 wykorzystuje niepospolitą nazwę",
 				"uk": "Виправлено: Fullybroswer >v3 використовувати id не загальна назва",
 				"zh-cn": "固定名称:全盘罗维塔 >v3"
-			},
-			"2.9.10": {
-				"en": "Fixed: Fullybroswer >v3 devicename\nFixed: Fullybroswer >v3 wifi signal",
-				"de": "Behoben: Fullybroswer >v3 Gerätename\nBehoben: Fullybroswer >v3 Wifi-Signal",
-				"ru": "Исправлено: Fullybroswer >v3 имя устройства\nИсправлено: Fullybroswer >v3 wifi сигнал",
-				"pt": "Fixo: Fullybroswer >v3 nome do dispositivo\nFixo: sinal wifi Fullybroswer >v3",
-				"nl": "Vertaling:\nQuality over Quantity (QoQ) Releases Vertaling:",
-				"fr": "Correction : Nom du dispositif Fullybroswer ACIAv3\nCorrection : signal wifi Fullybroswer ACIAv3",
-				"it": "Risolto: Fullybroswer >v3 nome del dispositivo\nFisso: Fullybroswer >v3 segnale wifi",
-				"es": "Fijación: Fullybroswer >v3 nombre de dispositivo\nFijación: Fullybroswer 3v3 señal wifi",
-				"pl": "Fixed: Fullybroswer >v3\nFixed: Fullybroswer >v3 wifi signal",
-				"uk": "Виправлено: Fullybroswer >v3 назва пристрою\nВиправлено: Fullybroswer >v3 Wi-Fi сигнал",
-				"zh-cn": "固定装置:全盘变压装置\n九. 固定:完全妓院"
-			},
-			"2.9.9": {
-				"en": "Fixed: Write log message of selected adapters only on startup",
-				"de": "Fixed: Log-Nachricht von ausgewählten Adaptern nur beim Start schreiben",
-				"ru": "Исправлено: Напишите лог-сообщение выбранных адаптеров только при запуске",
-				"pt": "Corrigido: Escreva a mensagem de log de adaptadores selecionados apenas na inicialização",
-				"nl": "Vertaling:",
-				"fr": "Correction : Écrivez un message de journal des adaptateurs sélectionnés uniquement au démarrage",
-				"it": "Risolto: Scrivi il messaggio di registro degli adattatori selezionati solo all'avvio",
-				"es": "Fijo: Escriba el mensaje de registro de adaptadores seleccionados sólo en el inicio",
-				"pl": "Fixed: Write log message to selected adapter tylko na początku",
-				"uk": "Виправлено: Напишіть лог повідомлення вибраних адаптерів тільки на запуску",
-				"zh-cn": "九. 固定:选择的适应者在开端的礼拜信息"
 			}
 		},
 		"titleLang": {

package/lib/translations.js

@@ -581,6 +581,71 @@ const translations = {
 		uk: 'Пристрої акумулятора',
 		'zh-cn': '电池设备',
 	},
+	instance_activated: {
+		en: 'Instance activated',
+		de: 'Instanz aktiviert',
+		ru: 'Активируется',
+		pt: 'Processo activado',
+		nl: 'Instantie geactiveerd',
+		fr: 'Instance activée',
+		it: 'Attivazione',
+		es: 'Instalación activada',
+		pl: 'Uruchamiony osąd',
+		uk: 'Інструкції активовані',
+		'zh-cn': '实例激活',
+	},
+	instance_deactivated: {
+		en: 'Instance deactivated',
+		de: 'Instanz deaktiviert',
+		ru: 'Экземпляр деактивирован',
+		pt: 'Instância desativada',
+		nl: 'Instantie gedeactiveerd',
+		fr: 'Instance désactivée',
+		it: 'Istanza disattivata',
+		es: 'Instancia desactivada',
+		pl: 'Instancja dezaktywowana',
+		uk: 'Екземпляр деактивовано',
+		'zh-cn': '实例已停用',
+	},
+	instance_okay: {
+		en: 'Instance okay',
+		de: 'Instanz okay',
+		ru: 'Экземпляр в норме',
+		pt: 'Instância OK',
+		nl: 'Instantie OK',
+		fr: 'Instance OK',
+		it: 'Istanza OK',
+		es: 'Instancia OK',
+		pl: 'Instancja OK',
+		uk: 'Екземпляр в нормі',
+		'zh-cn': '实例正常',
+	},
+	not_connected_host: {
+		en: 'Not connected to host',
+		de: 'Nicht mit Host verbunden',
+		ru: 'Не подключен к хосту',
+		pt: 'Não conectado ao host',
+		nl: 'Niet verbonden met host',
+		fr: 'Pas connecté au hôte',
+		it: 'Non connesso al host',
+		es: 'No conectado al host',
+		pl: 'Nie podłączony do hosta',
+		uk: "Не під'єднаний до хоста",
+		'zh-cn': '未连接到主机',
+	},
+	not_connected_device: {
+		en: 'Not connected to device or service',
+		de: 'Nicht mit Gerät oder Service verbunden',
+		ru: 'Не подключен к устройству или сервису',
+		pt: 'Não conectado ao dispositivo ou serviço',
+		nl: 'Niet verbonden met apparaat of dienst',
+		fr: 'Non connecté à un appareil ou à un service',
+		it: 'Non collegato al dispositivo o al servizio',
+		es: 'No conectado al dispositivo o servicio',
+		pl: 'Niepodłączone do urządzenia lub usługi',
+		uk: 'Не підключено до пристрою або сервісу',
+		'zh-cn': '未连接到设备或服务',
+	},
 };
 
 module.exports = translations;

package/main.js

@@ -80,8 +80,12 @@ class DeviceWatcher extends utils.Adapter {
 		// Interval timer
 		this.refreshDataTimeout = null;
 
+		// Check if main function is running
 		this.mainRunning = false;
 
+		// System anguage
+		this.userSystemLanguage;
+
 		this.on('ready', this.onReady.bind(this));
 		this.on('stateChange', this.onStateChange.bind(this));
 		this.on('objectChange', this.onObjectChange.bind(this));
@@ -95,6 +99,13 @@ class DeviceWatcher extends utils.Adapter {
 	async onReady() {
 		this.log.debug(`Adapter ${adapterName} was started`);
 
+		// set user language
+		if (this.userSystemLanguage === undefined && this.userSystemLanguage === null) {
+			this.userSystemLanguage = 'de';
+		} else {
+			this.userSystemLanguage = this.language;
+		}
+
 		this.configCreateInstanceList = this.config.checkAdapterInstances;
 		this.configListOnlyBattery = this.config.listOnlyBattery;
 		this.configCreateOwnFolder = this.config.createOwnFolder;
@@ -299,22 +310,22 @@ class DeviceWatcher extends utils.Adapter {
 			await this.refreshData();
 
 			// send overview for low battery devices
-			if (this.config.checkSendBatteryMsgDaily) this.sendScheduleNotifications('lowBatteryDevices');
+			if (this.config.checkSendBatteryMsgDaily) await this.sendScheduleNotifications('lowBatteryDevices');
 
 			// send overview of offline devices
-			if (this.config.checkSendOfflineMsgDaily) this.sendScheduleNotifications('offlineDevices');
+			if (this.config.checkSendOfflineMsgDaily) await this.sendScheduleNotifications('offlineDevices');
 
 			// send overview of upgradeable devices
-			if (this.config.checkSendUpgradeMsgDaily) this.sendScheduleNotifications('updateDevices');
+			if (this.config.checkSendUpgradeMsgDaily) await this.sendScheduleNotifications('updateDevices');
 
 			// send overview of updatable adapters
-			if (this.config.checkSendAdapterUpdateMsgDaily) this.sendScheduleNotifications('updateAdapter');
+			if (this.config.checkSendAdapterUpdateMsgDaily) await this.sendScheduleNotifications('updateAdapter');
 
 			// send overview of deactivated instances
-			if (this.config.checkSendInstanceDeactivatedDaily) this.sendScheduleNotifications('deactivatedInstance');
+			if (this.config.checkSendInstanceDeactivatedDaily) await this.sendScheduleNotifications('deactivatedInstance');
 
 			// send overview of instances with error
-			if (this.config.checkSendInstanceFailedDaily) this.sendScheduleNotifications('errorInstance');
+			if (this.config.checkSendInstanceFailedDaily) await this.sendScheduleNotifications('errorInstance');
 		} catch (error) {
 			this.log.error(`[onReady] - ${error}`);
 			this.terminate ? this.terminate(15) : process.exit(15);
@@ -583,9 +594,9 @@ class DeviceWatcher extends utils.Adapter {
 			this.refreshDataTimeout = null;
 		}
 
-		this.refreshDataTimeout = this.setTimeout(() => {
+		this.refreshDataTimeout = this.setTimeout(async () => {
 			this.log.debug('Updating Data');
-			this.refreshData();
+			await this.refreshData();
 		}, nextTimeout);
 	} // <-- refreshData end
 
@@ -1210,14 +1221,13 @@ class DeviceWatcher extends utils.Adapter {
 		const lastContact = this.getTimestamp(selector);
 		let lastContactString;
 
+		lastContactString = `${this.formatDate(new Date(selector), 'hh:mm')}`;
 		if (Math.round(lastContact) > 100) {
-			lastContactString = `${Math.round(lastContact / 60 / 24)} ${translations.days[this.language]}`;
-		} else if (Math.round(lastContact) > 48) {
-			lastContactString = `${Math.round(lastContact / 60)} ${translations.hours[this.language]}`;
-		} else {
-			lastContactString = `${this.formatDate(new Date(selector), 'hh:mm')}`;
+			lastContactString = `${Math.round(lastContact / 60)} ${translations.hours[this.userSystemLanguage]}`;
+		}
+		if (Math.round(lastContact / 60) > 48) {
+			lastContactString = `${Math.round(lastContact / 60 / 24)} ${translations.days[this.userSystemLanguage]}`;
 		}
-
 		return lastContactString;
 	}
 
@@ -1240,63 +1250,83 @@ class DeviceWatcher extends utils.Adapter {
 			const deviceUnreachSelector = await this.getForeignStateAsync(unreachDP);
 			const deviceStateSelector = await this.getForeignStateAsync(deviceStateSelectorDP); // for hmrpc devices
 			const rssiPeerSelector = await this.getForeignStateAsync(rssiPeerSelectorDP);
-			const lastDeviceUnreachStateChange = deviceUnreachSelector !== undefined ? this.getTimestamp(deviceUnreachSelector.lc) : this.getTimestamp(timeSelector.ts);
-
-			// If there is no contact since the user sets minutes, add the device to the offline list and calculate to days after 48 hours
+			const lastDeviceUnreachStateChange = deviceUnreachSelector != undefined ? this.getTimestamp(deviceUnreachSelector.lc) : this.getTimestamp(timeSelector.ts);
+			//  If there is no contact since user sets minutes add device in offline list
+			// calculate to days after 48 hours
 			switch (unreachDP) {
 				case 'none':
-					if (deviceTimeSelector) {
-						lastContactString = await this.getLastContact(deviceTimeSelector.ts);
-					}
+					if (deviceTimeSelector) lastContactString = await this.getLastContact(deviceTimeSelector.ts);
 					break;
 
 				default:
-					// State changed
+					//State changed
 					if (adapterID === 'hmrpc') {
 						if (linkQuality !== ' - ' && deviceTimeSelector) {
-							lastContactString = deviceUnreachState === 1 ? await this.getLastContact(deviceTimeSelector.lc) : await this.getLastContact(deviceTimeSelector.ts);
+							if (deviceUnreachState === 1) {
+								lastContactString = await this.getLastContact(deviceTimeSelector.lc);
+							} else {
+								lastContactString = await this.getLastContact(deviceTimeSelector.ts);
+							}
 						} else {
 							if (deviceStateSelector) {
-								// Because old hm devices don't send rssi states
+								// because old hm devices don't send rssi states
 								lastContactString = await this.getLastContact(deviceStateSelector.ts);
 							} else if (rssiPeerSelector) {
-								// Because old hm sensors don't send rssi/state values
+								// because old hm sensors don't send rssi/state values
 								lastContactString = await this.getLastContact(rssiPeerSelector.ts);
 							}
 						}
 					} else {
 						if ((!deviceUnreachState || deviceUnreachState === 0) && deviceTimeSelector) {
 							lastContactString = await this.getLastContact(deviceTimeSelector.lc);
-						} else if (deviceTimeSelector) {
-							lastContactString = await this.getLastContact(deviceTimeSelector.ts);
+						} else {
+							if (deviceTimeSelector) lastContactString = await this.getLastContact(deviceTimeSelector.ts);
 						}
 						break;
 					}
 			}
 
 			/*=============================================
-				=            Set Online Status             =
-				=============================================*/
+					=            Set Online Status             =
+					=============================================*/
 			let lastContact;
-
 			if (deviceTimeSelector) lastContact = this.getTimestamp(deviceTimeSelector.ts);
 
 			if (this.configMaxMinutes !== undefined) {
-				let setOfflineState = false;
-
 				switch (adapterID) {
 					case 'hmrpc':
-						setOfflineState =
-							(this.configMaxMinutes[adapterID] <= 0 && deviceUnreachState === 1) || (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState === 1);
+						if (this.configMaxMinutes[adapterID] <= 0) {
+							if (deviceUnreachState === 1) {
+								deviceState = 'Offline'; //set online state to offline
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							}
+						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState === 1) {
+							deviceState = 'Offline'; //set online state to offline
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+						}
 						break;
 					case 'proxmox':
-						setOfflineState =
-							(this.configMaxMinutes[adapterID] <= 0 && deviceUnreachState !== 'running' && deviceUnreachState !== 'online') ||
-							(lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState !== 'running' && deviceUnreachState !== 'online');
+						if (this.configMaxMinutes[adapterID] <= 0) {
+							if (deviceUnreachState !== 'running' && deviceUnreachState !== 'online') {
+								deviceState = 'Offline'; //set online state to offline
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							}
+						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState !== 'running' && deviceUnreachState !== 'online') {
+							deviceState = 'Offline'; //set online state to offline
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+						}
 						break;
 					case 'hmiP':
 					case 'maxcube':
-						setOfflineState = (this.configMaxMinutes[adapterID] <= 0 && deviceUnreachState) || (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState);
+						if (this.configMaxMinutes[adapterID] <= 0) {
+							if (deviceUnreachState) {
+								deviceState = 'Offline'; //set online state to offline
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							}
+						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState) {
+							deviceState = 'Offline'; //set online state to offline
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+						}
 						break;
 					case 'apcups':
 					case 'hue':
@@ -1309,36 +1339,74 @@ class DeviceWatcher extends utils.Adapter {
 					case 'unifi':
 					case 'zigbee':
 					case 'zigbee2MQTT':
-						setOfflineState = (this.configMaxMinutes[adapterID] <= 0 && !deviceUnreachState) || (!deviceUnreachState && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]);
+						if (this.configMaxMinutes[adapterID] <= 0) {
+							if (!deviceUnreachState) {
+								deviceState = 'Offline'; //set online state to offline
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							}
+						} else if (!deviceUnreachState && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
+							deviceState = 'Offline'; //set online state to offline
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+						}
 						break;
 					case 'mqttClientZigbee2Mqtt':
-						setOfflineState =
-							(this.configMaxMinutes[adapterID] <= 0 && deviceUnreachState !== 'online') ||
-							(deviceUnreachState !== 'online' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]);
+						if (this.configMaxMinutes[adapterID] <= 0) {
+							if (deviceUnreachState !== 'online') {
+								deviceState = 'Offline'; //set online state to offline
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							}
+						} else if (deviceUnreachState !== 'online' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
+							deviceState = 'Offline'; //set online state to offline
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+						}
 						break;
 					case 'mihome':
 						if (deviceUnreachState !== undefined) {
-							setOfflineState = (this.configMaxMinutes[adapterID] <= 0 && !deviceUnreachState) || (lastContact && lastContact > this.configMaxMinutes[adapterID]);
+							if (this.configMaxMinutes[adapterID] <= 0) {
+								if (!deviceUnreachState) {
+									deviceState = 'Offline'; //set online state to offline
+									if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+								}
+							} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
+								deviceState = 'Offline'; //set online state to offline
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							}
 						} else {
-							setOfflineState = (this.config.mihomeMaxMinutes <= 0 && this.configMaxMinutes[adapterID] <= 0) || (lastContact && lastContact > this.configMaxMinutes[adapterID]);
+							if (this.config.mihomeMaxMinutes <= 0) {
+								if (this.configMaxMinutes[adapterID] <= 0) {
+									deviceState = 'Offline'; //set online state to offline
+									if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+								}
+							} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
+								deviceState = 'Offline'; //set online state to offline
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							}
 						}
 						break;
 					case 'smartgarden':
-						setOfflineState =
-							(this.configMaxMinutes[adapterID] <= 0 && deviceUnreachState === 'OFFLINE') ||
-							(deviceUnreachState === 'OFFLINE' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]);
+						if (this.configMaxMinutes[adapterID] <= 0) {
+							if (deviceUnreachState === 'OFFLINE') {
+								deviceState = 'Offline'; //set online state to offline
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							}
+						} else if (deviceUnreachState === 'OFFLINE' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
+							deviceState = 'Offline'; //set online state to offline
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+						}
 						break;
 					default:
-						setOfflineState = (this.configMaxMinutes[adapterID] <= 0 && !deviceUnreachState) || (lastContact && lastContact > this.configMaxMinutes[adapterID]);
+						if (this.configMaxMinutes[adapterID] <= 0) {
+							if (!deviceUnreachState) {
+								deviceState = 'Offline'; //set online state to offline
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							}
+						} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
+							deviceState = 'Offline'; //set online state to offline
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+						}
 						break;
 				}
-
-				if (setOfflineState) {
-					deviceState = 'Offline';
-					if (linkQuality !== ' - ' && !this.config.showLastSignal) linkQuality = '0%';
-				}
 			}
-
 			return [lastContactString, deviceState, linkQuality];
 		} catch (error) {
 			this.log.error(`[getLastContact] - ${error}`);
@@ -1473,74 +1541,74 @@ class DeviceWatcher extends utils.Adapter {
 	async theLists(device) {
 		// Raw List with all devices for user
 		this.listAllDevicesUserRaw.push({
-			[translations.Device[this.language]]: device.Device,
-			[translations.Adapter[this.language]]: device.Adapter,
-			[translations.Instance[this.language]]: device.instance,
-			[translations.Instance_connected[this.language]]: device.instancedeviceConnected,
-			[translations.isBatteryDevice[this.language]]: device.isBatteryDevice,
-			[translations.Battery[this.language]]: device.Battery,
-			[translations.BatteryRaw[this.language]]: device.BatteryRaw,
-			[translations.BatteryUnitRaw[this.language]]: device.BatteryUnitRaw,
-			[translations.isLowBat[this.language]]: device.LowBat,
-			[translations.Signal_strength[this.language]]: device.SignalStrength,
-			[translations.Signal_strength_Raw[this.language]]: device.SignalStrengthRaw,
-			[translations.Last_Contact[this.language]]: device.LastContact,
-			[translations.Update_Available[this.language]]: device.Upgradable,
-			[translations.Status[this.language]]: device.Status,
+			Device: device.Device,
+			Adapter: device.Adapter,
+			Instance: device.instance,
+			'Instance connected': device.instancedeviceConnected,
+			isBatteryDevice: device.isBatteryDevice,
+			Battery: device.Battery,
+			BatteryRaw: device.BatteryRaw,
+			BatteryUnitRaw: device.BatteryUnitRaw,
+			isLowBat: device.LowBat,
+			'Signal strength': device.SignalStrength,
+			'Signal strength Raw': device.SignalStrengthRaw,
+			'Last contact': device.LastContact,
+			'Update Available': device.Upgradable,
+			Status: device.Status,
 		});
 
 		// List with all devices
 		this.listAllDevices.push({
-			[translations.Device[this.language]]: device.Device,
-			[translations.Adapter[this.language]]: device.Adapter,
-			[translations.Battery[this.language]]: device.Battery,
-			[translations.Signal_strength[this.language]]: device.SignalStrength,
-			[translations.Last_Contact[this.language]]: device.LastContact,
-			[translations.Status[this.language]]: device.Status,
+			[translations.Device[this.userSystemLanguage]]: device.Device,
+			[translations.Adapter[this.userSystemLanguage]]: device.Adapter,
+			[translations.Battery[this.userSystemLanguage]]: device.Battery,
+			[translations.Signal_strength[this.userSystemLanguage]]: device.SignalStrength,
+			[translations.Last_Contact[this.userSystemLanguage]]: device.LastContact,
+			[translations.Status[this.userSystemLanguage]]: device.Status,
 		});
 
 		// LinkQuality lists
 		if (device.SignalStrength != ' - ') {
 			this.linkQualityDevices.push({
-				[translations.Device[this.language]]: device.Device,
-				[translations.Adapter[this.language]]: device.Adapter,
-				[translations.Signal_strength[this.language]]: device.SignalStrength,
+				[translations.Device[this.userSystemLanguage]]: device.Device,
+				[translations.Adapter[this.userSystemLanguage]]: device.Adapter,
+				[translations.Signal_strength[this.userSystemLanguage]]: device.SignalStrength,
 			});
 		}
 
 		// Battery lists
 		if (device.isBatteryDevice) {
 			this.batteryPowered.push({
-				[translations.Device[this.language]]: device.Device,
-				[translations.Adapter[this.language]]: device.Adapter,
-				[translations.Battery[this.language]]: device.Battery,
-				[translations.Status[this.language]]: device.Status,
+				[translations.Device[this.userSystemLanguage]]: device.Device,
+				[translations.Adapter[this.userSystemLanguage]]: device.Adapter,
+				[translations.Battery[this.userSystemLanguage]]: device.Battery,
+				[translations.Status[this.userSystemLanguage]]: device.Status,
 			});
 		}
 
 		// Low Bat lists
 		if (device.LowBat && device.Status !== 'Offline') {
 			this.batteryLowPowered.push({
-				[translations.Device[this.language]]: device.Device,
-				[translations.Adapter[this.language]]: device.Adapter,
-				[translations.Battery[this.language]]: device.Battery,
+				[translations.Device[this.userSystemLanguage]]: device.Device,
+				[translations.Adapter[this.userSystemLanguage]]: device.Adapter,
+				[translations.Battery[this.userSystemLanguage]]: device.Battery,
 			});
 		}
 
 		// Offline List
 		if (device.Status === 'Offline') {
 			this.offlineDevices.push({
-				[translations.Device[this.language]]: device.Device,
-				[translations.Adapter[this.language]]: device.Adapter,
-				[translations.Last_Contact[this.language]]: device.LastContact,
+				[translations.Device[this.userSystemLanguage]]: device.Device,
+				[translations.Adapter[this.userSystemLanguage]]: device.Adapter,
+				[translations.Last_Contact[this.userSystemLanguage]]: device.LastContact,
 			});
 		}
 
 		// Device update List
 		if (device.Upgradable === true || device.Upgradable === 1) {
 			this.upgradableList.push({
-				[translations.Device[this.language]]: device.Device,
-				[translations.Adapter[this.language]]: device.Adapter,
+				[translations.Device[this.userSystemLanguage]]: device.Device,
+				[translations.Adapter[this.userSystemLanguage]]: device.Adapter,
 			});
 		}
 	}
@@ -1595,28 +1663,28 @@ class DeviceWatcher extends utils.Adapter {
 				// if no device is count, write the JSON List with default value
 				this.listAllDevices = [
 					{
-						[translations.Device[this.language]]: '--none--',
-						[translations.Adapter[this.language]]: '',
-						[translations.Battery[this.language]]: '',
-						[translations.Signal_strength[this.language]]: '',
-						[translations.Last_Contact[this.language]]: '',
-						[translations.Status[this.language]]: '',
+						[translations.Device[this.userSystemLanguage]]: '--none--',
+						[translations.Adapter[this.userSystemLanguage]]: '',
+						[translations.Battery[this.userSystemLanguage]]: '',
+						[translations.Signal_strength[this.userSystemLanguage]]: '',
+						[translations.Last_Contact[this.userSystemLanguage]]: '',
+						[translations.Status[this.userSystemLanguage]]: '',
 					},
 				];
 				this.listAllDevicesUserRaw = [
 					{
-						[translations.Device[this.language]]: '--none--',
-						[translations.Adapter[this.language]]: '',
-						[translations.Instance[this.language]]: '',
-						[translations.Instance_connected[this.language]]: '',
-						[translations.isBatteryDevice[this.language]]: '',
-						[translations.Battery[this.language]]: '',
-						[translations.BatteryRaw[this.language]]: '',
-						[translations.isLowBat[this.language]]: '',
-						[translations.Signal_strength[this.language]]: '',
-						[translations.Last_Contact[this.language]]: '',
-						[translations.Update_Available[this.language]]: '',
-						[translations.Status[this.language]]: '',
+						Device: '--none--',
+						Adapter: '',
+						Instance: '',
+						'Instance connected': '',
+						isBatteryDevice: '',
+						Battery: '',
+						BatteryRaw: '',
+						isLowBat: '',
+						'Signal strength': '',
+						'Last contact': '',
+						UpdateAvailable: '',
+						Status: '',
 					},
 				];
 			}
@@ -1628,9 +1696,9 @@ class DeviceWatcher extends utils.Adapter {
 				// if no device is count, write the JSON List with default value
 				this.linkQualityDevices = [
 					{
-						[translations.Device[this.language]]: '--none--',
-						[translations.Adapter[this.language]]: '',
-						[translations.Signal_strength[this.language]]: '',
+						[translations.Device[this.userSystemLanguage]]: '--none--',
+						[translations.Adapter[this.userSystemLanguage]]: '',
+						[translations.Signal_strength[this.userSystemLanguage]]: '',
 					},
 				];
 			}
@@ -1645,9 +1713,9 @@ class DeviceWatcher extends utils.Adapter {
 				// if no device is count, write the JSON List with default value
 				this.offlineDevices = [
 					{
-						[translations.Device[this.language]]: '--none--',
-						[translations.Adapter[this.language]]: '',
-						[translations.Last_Contact[this.language]]: '',
+						[translations.Device[this.userSystemLanguage]]: '--none--',
+						[translations.Adapter[this.userSystemLanguage]]: '',
+						[translations.Last_Contact[this.userSystemLanguage]]: '',
 					},
 				];
 			}
@@ -1662,9 +1730,9 @@ class DeviceWatcher extends utils.Adapter {
 				// if no device is count, write the JSON List with default value
 				this.upgradableList = [
 					{
-						[translations.Device[this.language]]: '--none--',
-						[translations.Adapter[this.language]]: '',
-						[translations.Last_Contact[this.language]]: '',
+						[translations.Device[this.userSystemLanguage]]: '--none--',
+						[translations.Adapter[this.userSystemLanguage]]: '',
+						[translations.Last_Contact[this.userSystemLanguage]]: '',
 					},
 				];
 			}
@@ -1677,7 +1745,9 @@ class DeviceWatcher extends utils.Adapter {
 			// List battery powered
 			if (this.batteryPoweredCount === 0) {
 				// if no device is count, write the JSON List with default value
-				this.batteryPowered = [{ [translations.Device[this.language]]: '--none--', [translations.Adapter[this.language]]: '', [translations.Battery[this.language]]: '' }];
+				this.batteryPowered = [
+					{ [translations.Device[this.userSystemLanguage]]: '--none--', [translations.Adapter[this.userSystemLanguage]]: '', [translations.Battery[this.userSystemLanguage]]: '' },
+				];
 			}
 			//write JSON list
 			await this.setStateChangedAsync(`devices.${dpSubFolder}batteryList`, {
@@ -1688,7 +1758,9 @@ class DeviceWatcher extends utils.Adapter {
 			// list battery low powered
 			if (this.lowBatteryPoweredCount === 0) {
 				// if no device is count, write the JSON List with default value
-				this.batteryLowPowered = [{ [translations.Device[this.language]]: '--none--', [translations.Adapter[this.language]]: '', [translations.Battery[this.language]]: '' }];
+				this.batteryLowPowered = [
+					{ [translations.Device[this.userSystemLanguage]]: '--none--', [translations.Adapter[this.userSystemLanguage]]: '', [translations.Battery[this.userSystemLanguage]]: '' },
+				];
 			}
 			//write JSON list
 			await this.setStateChangedAsync(`devices.${dpSubFolder}lowBatteryList`, {
@@ -2069,16 +2141,16 @@ class DeviceWatcher extends utils.Adapter {
 		}
 
 		let isHealthy = false;
-		let instanceStatusString = 'Instanz deaktiviert';
+		let instanceStatusString = translations.instance_deactivated[this.userSystemLanguage];
 
 		if (isAlive) {
 			if (connectedHostState && connectedDeviceState) {
 				isHealthy = true;
-				instanceStatusString = 'Instanz okay';
+				instanceStatusString = translations.instance_okay[this.userSystemLanguage];
 			} else if (!connectedHostState) {
-				instanceStatusString = 'Nicht verbunden mit Host';
+				instanceStatusString = translations.not_connected_host[this.userSystemLanguage];
 			} else if (!connectedDeviceState) {
-				instanceStatusString = 'Nicht verbunden mit Gerät oder Dienst';
+				instanceStatusString = translations.not_connected_device[this.userSystemLanguage];
 			}
 		}
 
@@ -2094,7 +2166,7 @@ class DeviceWatcher extends utils.Adapter {
 		let isAlive = await this.getInitValue(`system.adapter.${instanceID}.alive`);
 		let daemonIsAlive;
 		let isHealthy = false;
-		let instanceStatusString = isAlive ? 'Instanz aktiviert' : 'Instanz deaktiviert';
+		let instanceStatusString = isAlive ? translations.instance_activated[this.userSystemLanguage] : translations.instance_deactivated[this.userSystemLanguage];
 
 		if (isAlive) {
 			daemonIsAlive = await this.checkDaemonIsHealthy(instanceID);
@@ -2121,7 +2193,7 @@ class DeviceWatcher extends utils.Adapter {
 		let diff;
 		let isAlive = false;
 		let isHealthy = false;
-		let instanceStatusString = 'Instanz deaktiviert';
+		let instanceStatusString = translations.instance_deactivated[this.userSystemLanguage];
 		const isAliveSchedule = await this.getForeignStateAsync(`system.adapter.${instanceID}.alive`);
 
 		if (isAliveSchedule) {
@@ -2134,7 +2206,7 @@ class DeviceWatcher extends utils.Adapter {
 					// if 5 minutes difference exceeded, instance is not alive
 					isAlive = true;
 					isHealthy = true;
-					instanceStatusString = 'Instanz okay';
+					instanceStatusString = translations.instance_okay[this.userSystemLanguage];
 				}
 			}
 		}
@@ -2192,7 +2264,7 @@ class DeviceWatcher extends utils.Adapter {
 
 		let isAlive = false;
 		let isHealthy = false;
-		let instanceStatusString = 'Instanz deaktiviert';
+		let instanceStatusString = translations.instance_deactivated[this.userSystemLanguage];
 
 		switch (instanceMode) {
 			case 'schedule':
@@ -2267,9 +2339,9 @@ class DeviceWatcher extends utils.Adapter {
 
 		for (const [adapter, updateData] of this.adapterUpdatesJsonRaw) {
 			this.listAdapterUpdates.push({
-				[translations.Adapter[this.language]]: adapter,
-				'Available Version': updateData.newVersion,
-				'Installed Version': updateData.oldVersion,
+				[translations.Adapter[this.userSystemLanguage]]: adapter,
+				[translations.Available_Version[this.userSystemLanguage]]: updateData.newVersion,
+				[translations.Installed_Version[this.userSystemLanguage]]: updateData.oldVersion,
 			});
 		}
 		this.countAdapterUpdates = this.listAdapterUpdates.length;
@@ -2283,9 +2355,14 @@ class DeviceWatcher extends utils.Adapter {
 		// Write Datapoints for counts
 		await this.setStateChangedAsync(`adapterAndInstances.countAdapterUpdates`, { val: this.countAdapterUpdates, ack: true });
 
-		// list deactivated instances
 		if (this.countAdapterUpdates === 0) {
-			this.listAdapterUpdates = [{ [translations.Adapter[this.language]]: '--none--', 'Available Version': '', 'Installed Version': '' }];
+			this.listAdapterUpdates = [
+				{
+					[translations.Adapter[this.userSystemLanguage]]: '--none--',
+					[translations.Available_Version[this.userSystemLanguage]]: '',
+					[translations.Installed_Version[this.userSystemLanguage]]: '',
+				},
+			];
 		}
 		await this.setStateChangedAsync(`adapterAndInstances.listAdapterUpdates`, { val: JSON.stringify(this.listAdapterUpdates), ack: true });
 	}
@@ -2314,40 +2391,40 @@ class DeviceWatcher extends utils.Adapter {
 			if (this.blacklistInstancesLists.includes(instance)) continue;
 			// all instances
 			this.listAllInstances.push({
-				[translations.Adapter[this.language]]: instanceData.Adapter,
-				[translations.Instance[this.language]]: instance,
-				[translations.Mode[this.language]]: instanceData.instanceMode,
-				[translations.Schedule[this.language]]: instanceData.schedule,
-				[translations.Version[this.language]]: instanceData.adapterVersion,
-				[translations.Updateable[this.language]]: instanceData.updateAvailable,
-				[translations.Status[this.language]]: instanceData.status,
+				[translations.Adapter[this.userSystemLanguage]]: instanceData.Adapter,
+				[translations.Instance[this.userSystemLanguage]]: instance,
+				[translations.Mode[this.userSystemLanguage]]: instanceData.instanceMode,
+				[translations.Schedule[this.userSystemLanguage]]: instanceData.schedule,
+				[translations.Version[this.userSystemLanguage]]: instanceData.adapterVersion,
+				[translations.Updateable[this.userSystemLanguage]]: instanceData.updateAvailable,
+				[translations.Status[this.userSystemLanguage]]: instanceData.status,
 			});
 
 			if (!instanceData.isAlive) {
 				// list with deactivated instances
 				this.listDeactivatedInstances.push({
-					[translations.Adapter[this.language]]: instanceData.Adapter,
-					[translations.Instance[this.language]]: instance,
-					[translations.Status[this.language]]: instanceData.status,
+					[translations.Adapter[this.userSystemLanguage]]: instanceData.Adapter,
+					[translations.Instance[this.userSystemLanguage]]: instance,
+					[translations.Status[this.userSystemLanguage]]: instanceData.status,
 				});
 			} else {
 				// list with active instances
 				this.listAllActiveInstances.push({
-					[translations.Adapter[this.language]]: instanceData.Adapter,
-					[translations.Instance[this.language]]: instance,
-					[translations.Mode[this.language]]: instanceData.instanceMode,
-					[translations.Schedule[this.language]]: instanceData.schedule,
-					[translations.Status[this.language]]: instanceData.status,
+					[translations.Adapter[this.userSystemLanguage]]: instanceData.Adapter,
+					[translations.Instance[this.userSystemLanguage]]: instance,
+					[translations.Mode[this.userSystemLanguage]]: instanceData.instanceMode,
+					[translations.Schedule[this.userSystemLanguage]]: instanceData.schedule,
+					[translations.Status[this.userSystemLanguage]]: instanceData.status,
 				});
 			}
 
 			// list with error instances
 			if (instanceData.isAlive && !instanceData.isHealthy) {
 				this.listErrorInstance.push({
-					[translations.Adapter[this.language]]: instanceData.Adapter,
-					[translations.Instance[this.language]]: instance,
-					[translations.Mode[this.language]]: instanceData.instanceMode,
-					[translations.Status[this.language]]: instanceData.status,
+					[translations.Adapter[this.userSystemLanguage]]: instanceData.Adapter,
+					[translations.Instance[this.userSystemLanguage]]: instance,
+					[translations.Mode[this.userSystemLanguage]]: instanceData.instanceMode,
+					[translations.Status[this.userSystemLanguage]]: instanceData.status,
 				});
 			}
 		}
@@ -2384,7 +2461,12 @@ class DeviceWatcher extends utils.Adapter {
 		// list deactivated instances
 		if (this.countDeactivatedInstances === 0) {
 			this.listDeactivatedInstances = [
-				{ [translations.Adapter[this.language]]: '--none--', [translations.Instance[this.language]]: '', [translations.Version[this.language]]: '', [translations.Status[this.language]]: '' },
+				{
+					[translations.Adapter[this.userSystemLanguage]]: '--none--',
+					[translations.Instance[this.userSystemLanguage]]: '',
+					[translations.Version[this.userSystemLanguage]]: '',
+					[translations.Status[this.userSystemLanguage]]: '',
+				},
 			];
 		}
 		await this.setStateChangedAsync(`adapterAndInstances.listDeactivatedInstances`, { val: JSON.stringify(this.listDeactivatedInstances), ack: true });
@@ -2393,7 +2475,12 @@ class DeviceWatcher extends utils.Adapter {
 		// list error instances
 		if (this.countErrorInstance === 0) {
 			this.listErrorInstance = [
-				{ [translations.Adapter[this.language]]: '--none--', [translations.Instance[this.language]]: '', [translations.Mode[this.language]]: '', [translations.Status[this.language]]: '' },
+				{
+					[translations.Adapter[this.userSystemLanguage]]: '--none--',
+					[translations.Instance[this.userSystemLanguage]]: '',
+					[translations.Mode[this.userSystemLanguage]]: '',
+					[translations.Status[this.userSystemLanguage]]: '',
+				},
 			];
 		}
 		await this.setStateChangedAsync(`adapterAndInstances.listInstancesError`, { val: JSON.stringify(this.listErrorInstance), ack: true });
@@ -2970,9 +3057,14 @@ class DeviceWatcher extends utils.Adapter {
 	 */
 	async sendStateNotifications(type, id) {
 		if (isUnloaded) return;
+		let objectData;
+		let adapterName;
+
+		if (id !== null) {
+			objectData = this.listAllDevicesRaw.get(id);
+			adapterName = this.config.showAdapterNameinMsg ? `${objectData.Adapter}: ` : '';
+		}
 
-		let objectData = this.listAllDevicesRaw.get(id);
-		const adapterName = this.config.showAdapterNameinMsg ? `${objectData.Adapter}: ` : '';
 		let list = '';
 		let message = '';
 
@@ -2984,41 +3076,47 @@ class DeviceWatcher extends utils.Adapter {
 
 		switch (type) {
 			case 'lowBatDevice':
-				message = `${translations.Device_low_bat_detected[this.language]}: \n${adapterName} ${objectData.Device} (${objectData.Battery})`;
-				setMessage(message);
+				message = `${translations.Device_low_bat_detected[this.userSystemLanguage]}: \n${adapterName} ${objectData.Device} (${objectData.Battery})`;
+				await setMessage(message);
 				break;
 
 			case 'onlineStateDevice':
 				switch (objectData.Status) {
 					case 'Online':
-						message = `${translations.Device_available_again[this.language]}: \n${adapterName} ${objectData.Device} (${objectData.LastContact})`;
+						message = `${translations.Device_available_again[this.userSystemLanguage]}: \n${adapterName} ${objectData.Device} (${objectData.LastContact})`;
 						break;
 
 					case 'Offline':
-						message = `${translations.Device_not_reachable[this.language]}: \n${adapterName} ${objectData.Device} (${objectData.LastContact})`;
+						message = `${translations.Device_not_reachable[this.userSystemLanguage]}: \n${adapterName} ${objectData.Device} (${objectData.LastContact})`;
 						break;
 				}
-				setMessage(message);
+				await setMessage(message);
 				break;
 
 			case 'updateDevice':
-				message = `${translations.Device_new_updates[this.language]}: \n${adapterName} ${objectData.Device}`;
-				setMessage(message);
+				message = `${translations.Device_new_updates[this.userSystemLanguage]}: \n${adapterName} ${objectData.Device}`;
+				await setMessage(message);
 				break;
 
 			case 'updateAdapter':
 				if (this.countAdapterUpdates === 0) return;
 
-				list = objectData.map((id) => `${id.Adapter}: v${id['Available Version']}`).join('\n');
-				message = `${translations.Adapter_new_updates[this.language]}: ${list}`;
-				setMessage(message);
+				objectData = this.listAdapterUpdates;
+				list = '';
+
+				for (const id of objectData) {
+					list = `${list}\n${id[translations.Adapter[this.userSystemLanguage]]}: v${id[translations.Available_Version[this.userSystemLanguage]]}`;
+				}
+
+				message = `${translations.Adapter_new_updates[this.userSystemLanguage]}: ${list}`;
+				await setMessage(message);
 				break;
 
 			case 'errorInstance':
 			case 'deactivatedInstance':
 				objectData = this.listInstanceRaw.get(id);
-				message = `${translations.Instance_Watchdog[this.language]}:\n${id}: ${objectData.status}`;
-				setMessage(message);
+				message = `${translations.Instance_Watchdog[this.userSystemLanguage]}:\n${id}: ${objectData.status}`;
+				await setMessage(message);
 				break;
 		}
 	}
@@ -3050,27 +3148,27 @@ class DeviceWatcher extends utils.Adapter {
 
 		const processInstanceList = (instanceList, property) => {
 			for (const id of instanceList) {
-				if (this.blacklistInstancesNotify.includes(id[translations['Instance'][this.language]])) continue;
-				list += `\n${id[translations['Instance'][this.language]]}${property ? `: ${id[property]}` : ''}`;
+				if (this.blacklistInstancesNotify.includes(id[translations['Instance'][this.userSystemLanguage]])) continue;
+				list += `\n${id[translations['Instance'][this.userSystemLanguage]]}${property ? `: ${id[property]}` : ''}`;
 			}
 		};
 
-		const processNotification = (list, messageType) => {
+		const processNotification = async (list, messageType) => {
 			if (list.length === 0) return;
 
 			switch (checkDays.length) {
 				case 1:
-					message = `${translations.Weekly_overview[this.language]} ${translations[messageType][this.language]}: ${list}`;
+					message = `${translations.Weekly_overview[this.userSystemLanguage]} ${translations[messageType][this.userSystemLanguage]}: ${list}`;
 					break;
 				case 7:
-					message = `${translations.Daily_overview[this.language]} ${translations[messageType][this.language]}: ${list}`;
+					message = `${translations.Daily_overview[this.userSystemLanguage]} ${translations[messageType][this.userSystemLanguage]}: ${list}`;
 					break;
 				default:
-					message = `${translations.Overview_of[this.language]} ${translations[messageType][this.language]}: ${list}`;
+					message = `${translations.Overview_of[this.userSystemLanguage]} ${translations[messageType][this.userSystemLanguage]}: ${list}`;
 					break;
 			}
 
-			setMessage(message);
+			await setMessage(message);
 		};
 
 		switch (type) {
@@ -3083,10 +3181,10 @@ class DeviceWatcher extends utils.Adapter {
 				}
 				this.log.debug(`Number of selected days for daily low battery devices message: ${checkDays.length}. Send Message on: ${checkDays.join(', ')} ...`);
 
-				schedule.scheduleJob(`1 ${this.config.checkSendBatteryTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, () => {
+				schedule.scheduleJob(`1 ${this.config.checkSendBatteryTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, async () => {
 					processDeviceList(this.batteryLowPoweredRaw, 'Device', 'Battery');
 
-					processNotification(list, 'devices_low_bat');
+					await processNotification(list, 'devices_low_bat');
 				});
 				break;
 
@@ -3099,10 +3197,10 @@ class DeviceWatcher extends utils.Adapter {
 				}
 				this.log.debug(`Number of selected days for daily offline devices message: ${checkDays.length}. Send Message on: ${checkDays.join(', ')} ...`);
 
-				schedule.scheduleJob(`2 ${this.config.checkSendOfflineTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, () => {
+				schedule.scheduleJob(`2 ${this.config.checkSendOfflineTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, async () => {
 					processDeviceList(this.offlineDevicesRaw, `Device`, 'LastContact');
 
-					processNotification(list, 'offline_devices');
+					await processNotification(list, 'offline_devices');
 				});
 				break;
 
@@ -3115,10 +3213,10 @@ class DeviceWatcher extends utils.Adapter {
 				}
 				this.log.debug(`Number of selected days for daily updatable devices message: ${checkDays.length}. Send Message on: ${checkDays.join(', ')} ...`);
 
-				schedule.scheduleJob(`3 ${this.config.checkSendUpgradeTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, () => {
+				schedule.scheduleJob(`3 ${this.config.checkSendUpgradeTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, async () => {
 					processDeviceList(this.upgradableDevicesRaw, 'Device');
 
-					processNotification(list, 'available_updatable_devices');
+					await processNotification(list, 'available_updatable_devices');
 				});
 				break;
 
@@ -3131,10 +3229,11 @@ class DeviceWatcher extends utils.Adapter {
 				}
 				this.log.debug(`Number of selected days for daily adapter update message: ${checkDays.length}. Send Message on: ${checkDays.join(', ')} ...`);
 
-				schedule.scheduleJob(`4 ${this.config.checkSendAdapterUpdateTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, () => {
-					processDeviceList(this.listAdapterUpdates, translations.Adapter[this.language], translations.Available_Version[this.language]);
-
-					processNotification(list, 'available_adapter_update');
+				schedule.scheduleJob(`4 ${this.config.checkSendAdapterUpdateTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, async () => {
+					for (const id of this.listAdapterUpdates) {
+						list = `${list}\n${id[translations.Adapter[this.userSystemLanguage]]}: v${id[translations.Available_Version[this.userSystemLanguage]]}`;
+					}
+					await processNotification(list, 'available_adapter_updates');
 				});
 				break;
 
@@ -3147,10 +3246,10 @@ class DeviceWatcher extends utils.Adapter {
 				}
 				this.log.debug(`Number of selected days for daily instance error message: ${checkDays.length}. Send Message on: ${checkDays.join(', ')} ...`);
 
-				schedule.scheduleJob(`5 ${this.config.checkSendInstanceFailedTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, () => {
+				schedule.scheduleJob(`5 ${this.config.checkSendInstanceFailedTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, async () => {
 					processInstanceList(this.listErrorInstanceRaw, 'Status');
 
-					processNotification(list, 'error_instances_msg');
+					await processNotification(list, 'error_instances_msg');
 				});
 				break;
 
@@ -3163,10 +3262,10 @@ class DeviceWatcher extends utils.Adapter {
 				}
 				this.log.debug(`Number of selected days for daily instance deactivated message: ${checkDays.length}. Send Message on: ${checkDays.join(', ')} ...`);
 
-				schedule.scheduleJob(`5 ${this.config.checkSendInstanceDeactivatedTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, () => {
+				schedule.scheduleJob(`5 ${this.config.checkSendInstanceDeactivatedTime.split(':').reverse().join(' ')} * * ${checkDays.join(',')}`, async () => {
 					processInstanceList(this.listDeactivatedInstances);
 
-					processNotification(list, 'deactivated_instances_msg');
+					await processNotification(list, 'deactivated_instances_msg');
 				});
 				break;
 		}
@@ -3191,14 +3290,14 @@ class DeviceWatcher extends utils.Adapter {
 					return a.localeCompare(b);
 				});
 				html = `<center>
-			<b>${[translations.Link_quality_devices[this.language]]}:<font> ${deviceCount}</b><small></small></font>
+			<b>${[translations.Link_quality_devices[this.userSystemLanguage]]}:<font> ${deviceCount}</b><small></small></font>
 			<p></p>
 			</center>   
 			<table width=100%>
 			<tr>
-			<th align=left>${[translations.Device[this.language]]}</th>
-			<th align=center width=120>${[translations.Adapter[this.language]]}</th>
-			<th align=right>${[translations.Signal_strength[this.language]]}</th>
+			<th align=left>${[translations.Device[this.userSystemLanguage]]}</th>
+			<th align=center width=120>${[translations.Adapter[this.userSystemLanguage]]}</th>
+			<th align=right>${[translations.Signal_strength[this.userSystemLanguage]]}</th>
 			</tr>
 			<tr>
 			<td colspan="5"><hr></td>
@@ -3206,9 +3305,9 @@ class DeviceWatcher extends utils.Adapter {
 
 				for (const device of devices) {
 					html += `<tr>
-				<td><font>${device[translations.Device[this.language]]}</font></td>
-				<td align=center><font>${device[translations.Adapter[this.language]]}</font></td>
-				<td align=right><font>${device[translations.Signal_strength[this.language]]}</font></td>
+				<td><font>${device[translations.Device[this.userSystemLanguage]]}</font></td>
+				<td align=center><font>${device[translations.Adapter[this.userSystemLanguage]]}</font></td>
+				<td align=right><font>${device[translations.Signal_strength[this.userSystemLanguage]]}</font></td>
 				</tr>`;
 				}
 
@@ -3222,14 +3321,14 @@ class DeviceWatcher extends utils.Adapter {
 					return a.localeCompare(b);
 				});
 				html = `<center>
-			<b>${[translations.offline_devices[this.language]]}: <font color=${deviceCount === 0 ? '#3bcf0e' : 'orange'}>${deviceCount}</b><small></small></font>
+			<b>${[translations.offline_devices[this.userSystemLanguage]]}: <font color=${deviceCount === 0 ? '#3bcf0e' : 'orange'}>${deviceCount}</b><small></small></font>
 			<p></p>
 			</center>   
 			<table width=100%>
 			<tr>
-			<th align=left>${[translations.Device[this.language]]}</th>
-			<th align=center width=120>${[translations.Adapter[this.language]]}</th>
-			<th align=center>${[translations.Last_Contact[this.language]]}</th>
+			<th align=left>${[translations.Device[this.userSystemLanguage]]}</th>
+			<th align=center width=120>${[translations.Adapter[this.userSystemLanguage]]}</th>
+			<th align=center>${[translations.Last_Contact[this.userSystemLanguage]]}</th>
 			</tr>
 			<tr>
 			<td colspan="5"><hr></td>
@@ -3253,28 +3352,28 @@ class DeviceWatcher extends utils.Adapter {
 					return a.localeCompare(b);
 				});
 				html = `<center>
-			<b>${isLowBatteryList === true ? `${[translations.low[this.language]]} ` : ''}${[translations.battery_devices[this.language]]}: 
+			<b>${isLowBatteryList === true ? `${[translations.low[this.userSystemLanguage]]} ` : ''}${[translations.battery_devices[this.userSystemLanguage]]}: 
 			<font color=${isLowBatteryList === true ? (deviceCount > 0 ? 'orange' : '#3bcf0e') : ''}>${deviceCount}</b></font>
 			<p></p>
 			</center>   
 			<table width=100%>
 			<tr>
-			<th align=left>${[translations.Device[this.language]]}</th>
-			<th align=center width=120>${[translations.Adapter[this.language]]}</th>
-			<th align=${isLowBatteryList ? 'center' : 'right'}>${[translations.Battery[this.language]]}</th>
+			<th align=left>${[translations.Device[this.userSystemLanguage]]}</th>
+			<th align=center width=120>${[translations.Adapter[this.userSystemLanguage]]}</th>
+			<th align=${isLowBatteryList ? 'center' : 'right'}>${[translations.Battery[this.userSystemLanguage]]}</th>
 			</tr>
 			<tr>
 			<td colspan="5"><hr></td>
 			</tr>`;
 				for (const device of devices) {
 					html += `<tr>
-				<td><font>${device[translations.Device[this.language]]}</font></td>
-				<td align=center><font>${device[translations.Adapter[this.language]]}</font></td>`;
+				<td><font>${device[translations.Device[this.userSystemLanguage]]}</font></td>
+				<td align=center><font>${device[translations.Adapter[this.userSystemLanguage]]}</font></td>`;
 
 					if (isLowBatteryList) {
-						html += `<td align=center><font color=orange>${device[translations.Battery[this.language]]}</font></td>`;
+						html += `<td align=center><font color=orange>${device[translations.Battery[this.userSystemLanguage]]}</font></td>`;
 					} else {
-						html += `<td align=right><font color=#3bcf0e>${device[translations.Battery[this.language]]}</font></td>`;
+						html += `<td align=right><font color=#3bcf0e>${device[translations.Battery[this.userSystemLanguage]]}</font></td>`;
 					}
 					html += `</tr>`;
 				}
@@ -3295,14 +3394,14 @@ class DeviceWatcher extends utils.Adapter {
 		switch (type) {
 			case 'allInstancesList':
 				html = `<center>
-				<b>${[translations.All_Instances[this.language]]}:<font> ${instancesCount}</b><small></small></font>
+				<b>${[translations.All_Instances[this.userSystemLanguage]]}:<font> ${instancesCount}</b><small></small></font>
 				<p></p>
 				</center>   
 				<table width=100%>
 				<tr>
-				<th align=left>${[translations.Adapter[this.language]]}</th>
-				<th align=center>${[translations.Instance[this.language]]}</th>
-				<th align=center width=180>${[translations.Status[this.language]]}</th>
+				<th align=left>${[translations.Adapter[this.userSystemLanguage]]}</th>
+				<th align=center>${[translations.Instance[this.userSystemLanguage]]}</th>
+				<th align=center width=180>${[translations.Status[this.userSystemLanguage]]}</th>
 				</tr>
 				<tr>
 				<td colspan="5"><hr></td>
@@ -3321,14 +3420,14 @@ class DeviceWatcher extends utils.Adapter {
 
 			case 'allActiveInstancesList':
 				html = `<center>
-				<b>${[translations.Active_Instances[this.language]]}: <font> ${instancesCount}</b><small></small></font>
+				<b>${[translations.Active_Instances[this.userSystemLanguage]]}: <font> ${instancesCount}</b><small></small></font>
 				<p></p>
 				</center>   
 				<table width=100%>
 				<tr>
-				<th align=left>${[translations.Adapter[this.language]]}</th>
-				<th align=center>${[translations.Instance[this.language]]}</th>
-				<th align=center width=180>${[translations.Status[this.language]]}</th>
+				<th align=left>${[translations.Adapter[this.userSystemLanguage]]}</th>
+				<th align=center>${[translations.Instance[this.userSystemLanguage]]}</th>
+				<th align=center width=180>${[translations.Status[this.userSystemLanguage]]}</th>
 				</tr>
 				<tr>
 				<td colspan="5"><hr></td>
@@ -3349,24 +3448,24 @@ class DeviceWatcher extends utils.Adapter {
 
 			case 'errorInstanceList':
 				html = `<center>
-				<b>${[translations.Error_Instances[this.language]]}: <font color=${instancesCount === 0 ? '#3bcf0e' : 'orange'}>${instancesCount}</b><small></small></font>
+				<b>${[translations.Error_Instances[this.userSystemLanguage]]}: <font color=${instancesCount === 0 ? '#3bcf0e' : 'orange'}>${instancesCount}</b><small></small></font>
 				<p></p>
 				</center>   
 				<table width=100%>
 				<tr>
-				<th align=left>${[translations.Adapter[this.language]]}</th>
-				<th align=center>${[translations.Instance[this.language]]}</th>
-				<th align=center width=180>${[translations.Status[this.language]]}</th>
+				<th align=left>${[translations.Adapter[this.userSystemLanguage]]}</th>
+				<th align=center>${[translations.Instance[this.userSystemLanguage]]}</th>
+				<th align=center width=180>${[translations.Status[this.userSystemLanguage]]}</th>
 				</tr>
 				<tr>
 				<td colspan="5"><hr></td>
 				</tr>`;
 
-				for (const [instance, instanceData] of instances) {
+				for (const instance of instances) {
 					html += `<tr>
-					<td><font>${instanceData.Adapter}</font></td>
-					<td align=center><font>${instance}</font></td>
-					<td align=center><font color=orange>${instanceData.status}</font></td>
+					<td><font>${instance.Adapter}</font></td>
+					<td align=center><font>${instance.Instance}</font></td>
+					<td align=center><font color=orange>${instance.Status}</font></td>
 					</tr>`;
 				}
 
@@ -3375,14 +3474,14 @@ class DeviceWatcher extends utils.Adapter {
 
 			case 'deactivatedInstanceList':
 				html = `<center>
-				<b>${[translations.Deactivated_Instances[this.language]]}: <font color=${instancesCount === 0 ? '#3bcf0e' : 'orange'}>${instancesCount}</b><small></small></font>
+				<b>${[translations.Deactivated_Instances[this.userSystemLanguage]]}: <font color=${instancesCount === 0 ? '#3bcf0e' : 'orange'}>${instancesCount}</b><small></small></font>
 				<p></p>
 				</center>   
 				<table width=100%>
 				<tr>
-				<th align=left>${[translations.Adapter[this.language]]}</th>
-				<th align=center>${[translations.Instance[this.language]]}</th>
-				<th align=center width=180>${[translations.Status[this.language]]}</th>
+				<th align=left>${[translations.Adapter[this.userSystemLanguage]]}</th>
+				<th align=center>${[translations.Instance[this.userSystemLanguage]]}</th>
+				<th align=center width=180>${[translations.Status[this.userSystemLanguage]]}</th>
 				</tr>
 				<tr>
 				<td colspan="5"><hr></td>
@@ -3403,14 +3502,14 @@ class DeviceWatcher extends utils.Adapter {
 
 			case 'updateAdapterList':
 				html = `<center>
-				<b>${[translations.Updatable_adapters[this.language]]}: <font color=${instancesCount === 0 ? '#3bcf0e' : 'orange'}>${instancesCount}</b><small></small></font>
+				<b>${[translations.Updatable_adapters[this.userSystemLanguage]]}: <font color=${instancesCount === 0 ? '#3bcf0e' : 'orange'}>${instancesCount}</b><small></small></font>
 				<p></p>
 				</center>   
 				<table width=100%>
 				<tr>
-				<th align=left>${[translations.Adapter[this.language]]}</th>
-				<th align=center>${[translations.Installed_Version[this.language]]}</th>
-				<th align=center>${[translations.Available_Version[this.language]]}</th>
+				<th align=left>${[translations.Adapter[this.userSystemLanguage]]}</th>
+				<th align=center>${[translations.Installed_Version[this.userSystemLanguage]]}</th>
+				<th align=center>${[translations.Available_Version[this.userSystemLanguage]]}</th>
 				</tr>
 				<tr>
 				<td colspan="5"><hr></td>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.10.0",
+  "version": "2.10.2",
   "description": "Watchdog for devices",
   "author": {
     "name": "Christian Behrends",
@@ -42,6 +42,8 @@
     "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.2",
     "@types/sinon-chai": "^3.2.12",
+    "@typescript-eslint/eslint-plugin": "^6.18.1",
+    "@typescript-eslint/parser": "^6.18.1",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "cron-parser": "^4.9.0",