iobroker.device-watcher 2.10.2 → 2.10.3

package/README.md

@@ -189,6 +189,10 @@ It's possible to select:
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 2.10.3 (2024-01-27)
+
+-   (ciddi89) Fixed [#299](https://github.com/ciddi89/ioBroker.device-watcher/issues/299): blacklisted devices was shown in html-list
+
 ### 2.10.2 (2024-01-20)
 
 -   (ciddi89) Fixed: typeError for available adapter update messages

package/admin/jsonConfig.json5

@@ -524,6 +524,8 @@
 							newLine: true,
 							type: 'text',
 							help: 'Format hh:mm',
+							validator: 'const timePattern = /^(?:[01]\\d|2[0-3]):[0-5]\\d$/; const value = data.checkSendAdapterUpdateTime; if(timePattern.test(value)) return true;return false;',
+							validatorNoSaveOnError: true,
 						},
 					},
 				},
@@ -622,6 +624,8 @@
 							newLine: true,
 							type: 'text',
 							help: 'Format hh:mm',
+							validator: 'const timePattern = /^(?:[01]\\d|2[0-3]):[0-5]\\d$/; const value = data.checkSendInstanceDeactivatedTime; if(timePattern.test(value)) return true;return false;',
+							validatorNoSaveOnError: true,
 						},
 					},
 				},
@@ -720,6 +724,8 @@
 							newLine: true,
 							type: 'text',
 							help: 'Format hh:mm',
+							validator: 'const timePattern = /^(?:[01]\\d|2[0-3]):[0-5]\\d$/; const value = data.checkSendInstanceFailedTime; if(timePattern.test(value)) return true;return false;',
+							validatorNoSaveOnError: true,
 						},
 					},
 				},
@@ -812,6 +818,8 @@
 							newLine: true,
 							type: 'text',
 							help: 'Format hh:mm',
+							validator: 'const timePattern = /^(?:[01]\\d|2[0-3]):[0-5]\\d$/; const value = data.checkSendOfflineTime; if(timePattern.test(value)) return true;return false;',
+							validatorNoSaveOnError: true,
 						},
 					},
 				},
@@ -904,6 +912,8 @@
 							newLine: true,
 							type: 'text',
 							help: 'Format hh:mm',
+							validator: 'const timePattern = /^(?:[01]\\d|2[0-3]):[0-5]\\d$/; const value = data.checkSendBatteryTime; if(timePattern.test(value)) return true;return false;',
+							validatorNoSaveOnError: true,
 						},
 					},
 				},
@@ -996,6 +1006,8 @@
 							newLine: true,
 							type: 'text',
 							help: 'Format hh:mm',
+							validator: 'const timePattern = /^(?:[01]\\d|2[0-3]):[0-5]\\d$/; const value = data.checkSendUpgradeTime; if(timePattern.test(value)) return true;return false;',
+							validatorNoSaveOnError: true,
 						},
 					},
 				},

package/io-package.json

@@ -1,8 +1,21 @@
 {
 	"common": {
 		"name": "device-watcher",
-		"version": "2.10.2",
+		"version": "2.10.3",
 		"news": {
+			"2.10.3": {
+				"en": "Fixed [#299](https://github.com/ciddi89/ioBroker.device-watcher/issues/299): blacklisted devices was shown in html-list",
+				"de": "Behoben [#299](https://github.com/ciddi89/ioBroker.device-watcher/issues/299): In der Blacklist aufgeführte Geräte wurden in html-list angezeigt",
+				"ru": "Fixed [#299] (http://github.com/ciddi89/ioBroker.device-watcher/issues/299): blacklisted devices was shown in html-list",
+				"pt": "Corrigido [#299](https://github.com/ciddi89/ioBroker.device-watcher/issues/299): dispositivos listados em pretos foram mostrados em html-list",
+				"nl": "Fixed [#299](https://github.com/ciddi89/ioBroker.device-watcher/issues/299): blacklisted devices werd getoond in html-list",
+				"fr": "Correction [#299](https://github.com/ciddi89/ioBroker.device-watcher/issues/299): les appareils sur liste noire sont affichés dans la liste html",
+				"it": "Fisso [#299](https://github.com/ciddi89/ioBroker.device-watcher/issues/299): la lista nera è stata mostrata nella lista html",
+				"es": "Fixed [#299](https://github.com/ciddi89/ioBroker.device-watcher/issues/299): blacklisted devices was shown in html-list",
+				"pl": "Poprawiono [# 299] (https: / / github.com / ciddi89 / ioBroker.device- watcher / issues / 299): na liście html- pokazano na czarnej liście urządzenia",
+				"uk": "Виправлено [#299](https://github.com/ciddi89/ioBroker.device-watcher/products/299): Чорнелистові пристрої були показані в html-list",
+				"zh-cn": "固定 [299] (https://github.com/ciddi89/ioBroker.device-watcher/issues/299):列入黑名单的设备在html列表中显示"
+			},
 			"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",
@@ -80,19 +93,6 @@
 				"pl": "Fixed: Changed handling for state changes and subscriptions #283(https:/github.com/ciddi89/ioBroker.device-watcher/issues/283) (ang.)",
 				"uk": "Виправлено: Змінене поводження з державними змінами та підписками [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
 				"zh-cn": "固定:国家变化和订阅的改变(第283号)"
-			},
-			"2.9.11": {
-				"en": "Fixed: Fullybroswer >v3 use id not common name",
-				"de": "Behoben: Fullybroswer >v3 verwende den ID Namen",
-				"ru": "Исправлено: Fullybroswer >v3 использовать id не общее имя",
-				"pt": "Corrigido: Fullybroswer >v3 use id não nome comum",
-				"nl": "Quality over Quantity (QoQ) Releases Vertaling:",
-				"fr": "Correction : Fullybroswer phylv3 utiliser le nom usuel",
-				"it": "Fisso: Fullybroswer >v3 uso id nome non comune",
-				"es": "Fijo: Fullybroswer >v3 use id no nombre común",
-				"pl": "Fixed: Fullybroswer >v3 wykorzystuje niepospolitą nazwę",
-				"uk": "Виправлено: Fullybroswer >v3 використовувати id не загальна назва",
-				"zh-cn": "固定名称:全盘罗维塔 >v3"
 			}
 		},
 		"titleLang": {

package/main.js

@@ -394,7 +394,7 @@ class DeviceWatcher extends utils.Adapter {
 	 */
 	async onStateChange(id, state) {
 		if (state) {
-			// this.log.debug(`State changed: ${id} changed ${state.val}`);
+			this.log.debug(`State changed: ${id} changed ${state.val}`);
 
 			try {
 				/*=============================================
@@ -627,7 +627,7 @@ class DeviceWatcher extends utils.Adapter {
 					this.log.error(`[createBlacklist] - ${error}`);
 				}
 				if (this.blacklistLists.length >= 1) this.log.info(`Found devices/services on blacklist for lists: ${this.blacklistLists}`);
-				if (this.blacklistAdapterLists.length >= 1) this.log.info(`Found devices/services on blacklist for lists: ${this.blacklistAdapterLists}`);
+				if (this.blacklistAdapterLists.length >= 1) this.log.info(`Found devices/services on blacklist for own adapter lists: ${this.blacklistAdapterLists}`);
 				if (this.blacklistNotify.length >= 1) this.log.info(`Found devices/services on blacklist for notifications: ${this.blacklistNotify}`);
 			}
 		}
@@ -1436,7 +1436,7 @@ class DeviceWatcher extends utils.Adapter {
 					deviceData.linkQuality = contactData[2];
 				}
 				if (this.config.checkSendOfflineMsg && oldContactState !== deviceData.Status && !this.blacklistNotify.includes(deviceData.Path)) {
-					await this.sendStateNotifications('onlineStateDevice', device);
+					await this.sendStateNotifications('Devices', 'onlineStateDevice', device);
 				}
 			}
 		}
@@ -1812,7 +1812,7 @@ class DeviceWatcher extends utils.Adapter {
 					ack: true,
 				});
 				await this.setStateChangedAsync(`devices.${dpSubFolder}offlineListHTML`, {
-					val: await this.createListHTML('offlineList', this.offlineDevicesRaw, this.offlineDevicesCount, null),
+					val: await this.createListHTML('offlineList', this.offlineDevices, this.offlineDevicesCount, null),
 					ack: true,
 				});
 				await this.setStateChangedAsync(`devices.${dpSubFolder}batteryListHTML`, {
@@ -1825,23 +1825,23 @@ class DeviceWatcher extends utils.Adapter {
 				});
 				if (this.config.checkAdapterInstances) {
 					await this.setStateChangedAsync(`adapterAndInstances.HTML_Lists.listAllInstancesHTML`, {
-						val: await this.createListHTMLInstances('allInstancesList', this.listInstanceRaw, this.countAllInstances),
+						val: await this.createListHTMLInstances('allInstancesList', this.listAllInstances, this.countAllInstances),
 						ack: true,
 					});
 					await this.setStateChangedAsync(`adapterAndInstances.HTML_Lists.listAllActiveInstancesHTML`, {
-						val: await this.createListHTMLInstances('allActiveInstancesList', this.listInstanceRaw, this.countAllActiveInstances),
+						val: await this.createListHTMLInstances('allActiveInstancesList', this.listAllActiveInstances, this.countAllActiveInstances),
 						ack: true,
 					});
 					await this.setStateChangedAsync(`adapterAndInstances.HTML_Lists.listInstancesErrorHTML`, {
-						val: await this.createListHTMLInstances('errorInstanceList', this.listErrorInstanceRaw, this.countErrorInstance),
+						val: await this.createListHTMLInstances('errorInstanceList', this.listErrorInstance, this.countErrorInstance),
 						ack: true,
 					});
 					await this.setStateChangedAsync(`adapterAndInstances.HTML_Lists.listDeactivatedInstancesHTML`, {
-						val: await this.createListHTMLInstances('deactivatedInstanceList', this.listInstanceRaw, this.countDeactivatedInstances),
+						val: await this.createListHTMLInstances('deactivatedInstanceList', this.listDeactivatedInstances, this.countDeactivatedInstances),
 						ack: true,
 					});
 					await this.setStateChangedAsync(`adapterAndInstances.HTML_Lists.listAdapterUpdatesHTML`, {
-						val: await this.createListHTMLInstances('updateAdapterList', this.listInstanceRaw, this.countAdapterUpdates),
+						val: await this.createListHTMLInstances('updateAdapterList', this.listAdapterUpdates, this.countAdapterUpdates),
 						ack: true,
 					});
 				}
@@ -1887,7 +1887,7 @@ class DeviceWatcher extends utils.Adapter {
 						deviceData.Upgradable = await this.checkDeviceUpdate(deviceData.adapterID, state.val);
 						if (deviceData.Upgradable === true) {
 							if (this.config.checkSendDeviceUpgrade && !this.blacklistNotify.includes(deviceData.Path)) {
-								await this.sendStateNotifications('updateDevice', deviceID);
+								await this.sendStateNotifications('Devices', 'updateDevice', deviceID);
 							}
 						}
 					}
@@ -1919,7 +1919,7 @@ class DeviceWatcher extends utils.Adapter {
 
 						if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
 							if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
-								await this.sendStateNotifications('lowBatDevice', deviceID);
+								await this.sendStateNotifications('Devices', 'lowBatDevice', deviceID);
 							}
 						}
 					}
@@ -1937,7 +1937,7 @@ class DeviceWatcher extends utils.Adapter {
 
 						if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
 							if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
-								await this.sendStateNotifications('lowBatDevice', deviceID);
+								await this.sendStateNotifications('Devices', 'lowBatDevice', deviceID);
 							}
 						}
 					}
@@ -1956,7 +1956,7 @@ class DeviceWatcher extends utils.Adapter {
 
 						if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
 							if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
-								await this.sendStateNotifications('lowBatDevice', deviceID);
+								await this.sendStateNotifications('Devices', 'lowBatDevice', deviceID);
 							}
 						}
 					}
@@ -1987,10 +1987,10 @@ class DeviceWatcher extends utils.Adapter {
 								if (deviceData.instanceDeviceConnectionDP.val !== undefined) {
 									// check if the generally deviceData connected state is for a while true
 									if (await this.getTimestampConnectionDP(deviceData.instanceDeviceConnectionDP, 20000)) {
-										await this.sendStateNotifications('onlineStateDevice', deviceID);
+										await this.sendStateNotifications('Devices', 'onlineStateDevice', deviceID);
 									}
 								} else {
-									await this.sendStateNotifications('onlineStateDevice', deviceID);
+									await this.sendStateNotifications('Devices', 'onlineStateDevice', deviceID);
 								}
 							}
 						}
@@ -2499,7 +2499,7 @@ class DeviceWatcher extends utils.Adapter {
 
 		// Check and send update notification if required
 		if (this.config.checkSendAdapterUpdateMsg && this.countAdapterUpdates > previousAdapterUpdatesCount) {
-			await this.sendStateNotifications('updateAdapter', null);
+			await this.sendStateNotifications('AdapterUpdates', 'updateAdapter', null);
 		}
 
 		// Update instances with available adapter updates
@@ -2542,7 +2542,7 @@ class DeviceWatcher extends utils.Adapter {
 						// send message when instance was deactivated
 						if (this.config.checkSendInstanceDeactivatedMsg && !instanceData.isAlive) {
 							if (this.blacklistInstancesNotify.includes(instanceID)) return;
-							await this.sendStateNotifications('deactivatedInstance', instanceID);
+							await this.sendStateNotifications('Instances', 'deactivatedInstance', instanceID);
 						}
 					}
 					break;
@@ -2553,7 +2553,7 @@ class DeviceWatcher extends utils.Adapter {
 						// send message when instance has an error
 						if (this.config.checkSendInstanceFailedMsg && !instanceData.isHealthy && instanceData.isAlive) {
 							if (this.blacklistInstancesNotify.includes(instanceID)) return;
-							await this.sendStateNotifications('errorInstance', instanceID);
+							await this.sendStateNotifications('Instances', 'errorInstance', instanceID);
 						}
 					}
 					break;
@@ -2564,7 +2564,7 @@ class DeviceWatcher extends utils.Adapter {
 						// send message when instance has an error
 						if (this.config.checkSendInstanceFailedMsg && !instanceData.isHealthy && instanceData.isAlive) {
 							if (this.blacklistInstancesNotify.includes(instanceID)) return;
-							await this.sendStateNotifications('errorInstance', instanceID);
+							await this.sendStateNotifications('Instances', 'errorInstance', instanceID);
 						}
 					}
 					break;
@@ -3052,22 +3052,26 @@ class DeviceWatcher extends utils.Adapter {
 	/*---------- Notifications ----------*/
 	/**
 	 * Notifications on state changes
+	 * @param {string} mainType
 	 * @param {string} type
 	 * @param {object} id
 	 */
-	async sendStateNotifications(type, id) {
+	async sendStateNotifications(mainType, type, id) {
 		if (isUnloaded) return;
 		let objectData;
 		let adapterName;
+		let list = '';
+		let message = '';
 
 		if (id !== null) {
-			objectData = this.listAllDevicesRaw.get(id);
-			adapterName = this.config.showAdapterNameinMsg ? `${objectData.Adapter}: ` : '';
+			if (mainType === 'Devices') {
+				objectData = this.listAllDevicesRaw.get(id);
+				adapterName = this.config.showAdapterNameinMsg ? `${objectData.Adapter}: ` : '';
+			} else if (mainType === 'Instances') {
+				objectData = this.listInstanceRaw.get(id);
+			}
 		}
 
-		let list = '';
-		let message = '';
-
 		const setMessage = async (message) => {
 			this.log.info(message);
 			await this.setStateAsync('lastNotification', message, true);
@@ -3114,7 +3118,6 @@ class DeviceWatcher extends utils.Adapter {
 
 			case 'errorInstance':
 			case 'deactivatedInstance':
-				objectData = this.listInstanceRaw.get(id);
 				message = `${translations.Instance_Watchdog[this.userSystemLanguage]}:\n${id}: ${objectData.status}`;
 				await setMessage(message);
 				break;
@@ -3336,9 +3339,9 @@ class DeviceWatcher extends utils.Adapter {
 
 				for (const device of devices) {
 					html += `<tr>
-				<td><font>${device.Device}</font></td>
-				<td align=center><font>${device.Adapter}</font></td>
-				<td align=center><font color=orange>${device.LastContact}</font></td>
+				<td><font>${device[translations.Device[this.userSystemLanguage]]}</font></td>
+				<td align=center><font>${device[translations.Adapter[this.userSystemLanguage]]}</font></td>
+				<td align=center><font color=orange>${device[translations.Last_Contact[this.userSystemLanguage]]}</font></td>
 				</tr>`;
 				}
 
@@ -3393,6 +3396,11 @@ class DeviceWatcher extends utils.Adapter {
 		let html;
 		switch (type) {
 			case 'allInstancesList':
+				instances = instances.sort((a, b) => {
+					a = a.Instance || '';
+					b = b.Instance || '';
+					return a.localeCompare(b);
+				});
 				html = `<center>
 				<b>${[translations.All_Instances[this.userSystemLanguage]]}:<font> ${instancesCount}</b><small></small></font>
 				<p></p>
@@ -3407,11 +3415,11 @@ class DeviceWatcher extends utils.Adapter {
 				<td colspan="5"><hr></td>
 				</tr>`;
 
-				for (const [instance, instanceData] of instances) {
+				for (const instanceData of instances) {
 					html += `<tr>
-					<td><font>${instanceData.Adapter}</font></td>
-					<td align=center><font>${instance}</font></td>
-					<td align=center><font>${instanceData.status}</font></td>
+					<td><font>${instanceData[translations.Adapter[this.userSystemLanguage]]}</font></td>
+					<td align=center><font>${instanceData[translations.Instance[this.userSystemLanguage]]}</font></td>
+					<td align=center><font>${instanceData[translations.Status[this.userSystemLanguage]]}</font></td>
 					</tr>`;
 				}
 
@@ -3419,6 +3427,11 @@ class DeviceWatcher extends utils.Adapter {
 				break;
 
 			case 'allActiveInstancesList':
+				instances = instances.sort((a, b) => {
+					a = a.Instance || '';
+					b = b.Instances || '';
+					return a.localeCompare(b);
+				});
 				html = `<center>
 				<b>${[translations.Active_Instances[this.userSystemLanguage]]}: <font> ${instancesCount}</b><small></small></font>
 				<p></p>
@@ -3433,20 +3446,23 @@ class DeviceWatcher extends utils.Adapter {
 				<td colspan="5"><hr></td>
 				</tr>`;
 
-				for (const [instance, instanceData] of instances) {
-					if (instanceData.isAlive) {
-						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>
+				for (const instanceData of instances) {
+					html += `<tr>
+					<td><font>${instanceData[translations.Adapter[this.userSystemLanguage]]}</font></td>
+					<td align=center><font>${instanceData[translations.Instance[this.userSystemLanguage]]}</font></td>
+					<td align=center><font color=orange>${instanceData[translations.Status[this.userSystemLanguage]]}</font></td>
 					</tr>`;
-					}
 				}
 
 				html += '</table>';
 				break;
 
 			case 'errorInstanceList':
+				instances = instances.sort((a, b) => {
+					a = a.Instance || '';
+					b = b.Instances || '';
+					return a.localeCompare(b);
+				});
 				html = `<center>
 				<b>${[translations.Error_Instances[this.userSystemLanguage]]}: <font color=${instancesCount === 0 ? '#3bcf0e' : 'orange'}>${instancesCount}</b><small></small></font>
 				<p></p>
@@ -3461,11 +3477,11 @@ class DeviceWatcher extends utils.Adapter {
 				<td colspan="5"><hr></td>
 				</tr>`;
 
-				for (const instance of instances) {
+				for (const instanceData of instances) {
 					html += `<tr>
-					<td><font>${instance.Adapter}</font></td>
-					<td align=center><font>${instance.Instance}</font></td>
-					<td align=center><font color=orange>${instance.Status}</font></td>
+					<td><font>${instanceData[translations.Adapter[this.userSystemLanguage]]}</font></td>
+					<td align=center><font>${instanceData[translations.Instance[this.userSystemLanguage]]}</font></td>
+					<td align=center><font color=orange>${instanceData[translations.Status[this.userSystemLanguage]]}</font></td>
 					</tr>`;
 				}
 
@@ -3473,6 +3489,11 @@ class DeviceWatcher extends utils.Adapter {
 				break;
 
 			case 'deactivatedInstanceList':
+				instances = instances.sort((a, b) => {
+					a = a.Instance || '';
+					b = b.Instances || '';
+					return a.localeCompare(b);
+				});
 				html = `<center>
 				<b>${[translations.Deactivated_Instances[this.userSystemLanguage]]}: <font color=${instancesCount === 0 ? '#3bcf0e' : 'orange'}>${instancesCount}</b><small></small></font>
 				<p></p>
@@ -3487,12 +3508,12 @@ class DeviceWatcher extends utils.Adapter {
 				<td colspan="5"><hr></td>
 				</tr>`;
 
-				for (const [instance, instanceData] of instances) {
+				for (const instanceData of instances) {
 					if (!instanceData.isAlive) {
 						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>${instanceData[translations.Adapter[this.userSystemLanguage]]}</font></td>
+					<td align=center><font>${instanceData[translations.Instance[this.userSystemLanguage]]}</font></td>
+					<td align=center><font color=orange>${instanceData[translations.Status[this.userSystemLanguage]]}</font></td>
 					</tr>`;
 					}
 				}
@@ -3518,9 +3539,9 @@ class DeviceWatcher extends utils.Adapter {
 				for (const instanceData of instances.values()) {
 					if (instanceData.updateAvailable !== ' - ') {
 						html += `<tr>
-					<td><font>${instanceData.Adapter}</font></td>
-					<td align=center><font>${instanceData.adapterVersion}</font></td>
-					<td align=center><font color=orange>${instanceData.updateAvailable}</font></td>
+					<td><font>${instanceData[translations.Adapter[this.userSystemLanguage]]}</font></td>
+					<td align=center><font>${instanceData[translations.Installed_Version[this.userSystemLanguage]]}</font></td>
+					<td align=center><font color=orange>${instanceData[translations.Available_Version[this.userSystemLanguage]]}</font></td>
 					</tr>`;
 					}
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.10.2",
+  "version": "2.10.3",
   "description": "Watchdog for devices",
   "author": {
     "name": "Christian Behrends",