iobroker.device-watcher 2.9.5 → 2.9.7

package/lib/arrApart.js

@@ -541,6 +541,18 @@ const arrApart = {
 		isLowBat: 'none',
 		id: 'none',
 	},
+	tuya: {
+		Selektor: 'tuya.*.online',
+		timeSelector: '.online',
+		adapterID: 'tuya',
+		adapter: 'Tuya',
+		rssiState: 'none',
+		battery: 'none',
+		reach: '.online',
+		isLowBat: 'none',
+		id: 'none',
+		upgrade: 'none',
+	},
 	unifi: {
 		Selektor: 'unifi.*.state',
 		timeSelector: '.uptime',
@@ -564,6 +576,18 @@ const arrApart = {
 		id: 'none',
 		upgrade: 'none',
 	},
+	wifilight: {
+		Selektor: 'wifilight.*.reachable',
+		timeSelector: '.reachable',
+		adapterID: 'wifilight',
+		adapter: 'Wifilight',
+		rssiState: 'none',
+		battery: 'none',
+		reach: '.reachable',
+		isLowBat: 'none',
+		id: 'none',
+		upgrade: 'none',
+	},
 	wled: {
 		Selektor: 'wled.*._online',
 		timeSelector: '._online',

package/main.js

@@ -147,8 +147,10 @@ class DeviceWatcher extends utils.Adapter {
 			tado: this.config.tadoDevices,
 			tapo: this.config.tapoDevices,
 			tradfri: this.config.tradfriDevices,
+			tuya: this.config.tuyaDevices,
 			unifi: this.config.unifiDevices,
 			viessmann: this.config.viessmannDevices,
+			wifilight: this.config.wifilightDevices,
 			wled: this.config.wledDevices,
 			yeelight: this.config.yeelightDevices,
 			zigbee: this.config.zigbeeDevices,
@@ -206,8 +208,10 @@ class DeviceWatcher extends utils.Adapter {
 			tado: this.config.tadoMaxMinutes,
 			tapo: this.config.tapoMaxMinutes,
 			tradfri: this.config.tradfriMaxMinutes,
+			tuya: this.config.tuyaMaxMinutes,
 			unifi: this.config.unifiMaxMinutes,
 			viessmann: this.config.viessmannMaxMinutes,
+			wifilight: this.config.wifilightMaxMinutes,
 			wled: this.config.wledMaxMinutes,
 			yeelight: this.config.yeelightMaxMinutes,
 			zigbee: this.config.zigbeeMaxMinutes,
@@ -368,7 +372,6 @@ class DeviceWatcher extends utils.Adapter {
 	 * @param {ioBroker.State | null | undefined} state
 	 */
 	async onStateChange(id, state) {
-		// Admin JSON for Adapter updates
 		if (state) {
 			// this.log.debug(`State changed: ${id} changed ${state.val}`);
 			let batteryData;
@@ -524,30 +527,32 @@ class DeviceWatcher extends utils.Adapter {
 
 						// device unreach
 						case deviceData.UnreachDP:
-							oldStatus = deviceData.Status;
-							deviceData.UnreachState = await this.getInitValue(deviceData.UnreachDP);
-							contactData = await this.getOnlineState(
-								deviceData.timeSelector,
-								deviceData.adapterID,
-								deviceData.UnreachDP,
-								deviceData.SignalStrength,
-								deviceData.UnreachState,
-								deviceData.DeviceStateSelectorDP,
-								deviceData.rssiPeerSelectorDP,
-							);
-							if (contactData !== undefined) {
-								deviceData.LastContact = contactData[0];
-								deviceData.Status = contactData[1];
-								deviceData.SignalStrength = contactData[2];
-							}
-							if (this.config.checkSendOfflineMsg && oldStatus !== deviceData.Status && !this.blacklistNotify.includes(deviceData.Path)) {
-								if (deviceData.instanceDeviceConnectionDP.val !== undefined) {
-									// check if the generally deviceData connected state is for a while true
-									if (await this.getTimestampConnectionDP(deviceData.instanceDeviceConnectionDP, 20000)) {
+							if (deviceData.UnreachState !== state.val) {
+								oldStatus = deviceData.Status;
+								deviceData.UnreachState = state.val;
+								contactData = await this.getOnlineState(
+									deviceData.timeSelector,
+									deviceData.adapterID,
+									deviceData.UnreachDP,
+									deviceData.SignalStrength,
+									deviceData.UnreachState,
+									deviceData.DeviceStateSelectorDP,
+									deviceData.rssiPeerSelectorDP,
+								);
+								if (contactData !== undefined) {
+									deviceData.LastContact = contactData[0];
+									deviceData.Status = contactData[1];
+									deviceData.SignalStrength = contactData[2];
+								}
+								if (this.config.checkSendOfflineMsg && oldStatus !== deviceData.Status && !this.blacklistNotify.includes(deviceData.Path)) {
+									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', device);
+										}
+									} else {
 										await this.sendStateNotifications('onlineStateDevice', device);
 									}
-								} else {
-									await this.sendStateNotifications('onlineStateDevice', device);
 								}
 							}
 							break;
@@ -1139,6 +1144,7 @@ class DeviceWatcher extends utils.Adapter {
 
 				//Get ID of foldername
 				case 'tado':
+				case 'wifilight':
 					deviceName = currDeviceString.slice(currDeviceString.lastIndexOf('.') + 1);
 					break;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.9.5",
+  "version": "2.9.7",
   "description": "Watchdog for devices",
   "author": {
     "name": "Christian Behrends",
@@ -58,10 +58,8 @@
   },
   "main": "main.js",
   "files": [
-    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*).json",
-    "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
+    "admin/",
     "lib/",
-    "www/",
     "io-package.json",
     "LICENSE",
     "main.js"