iobroker.device-watcher 2.6.1 → 2.7.0

package/admin/jsonConfig.json

@@ -93,6 +93,13 @@
 					"lg": 3,
 					"label": "fullyBrowser"
 				},
+				"fullyMQTTDevices": {
+					"type": "checkbox",
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "Fully-MQTT"
+				},
 				"hamDevices": {
 					"type": "checkbox",
 					"sm": 6,
@@ -655,7 +662,7 @@
 						}
 					}
 				},
-				"trenner": {
+				"_trenner": {
 					"newLine": true,
 					"type": "divider"
 				},
@@ -676,7 +683,7 @@
 					"label": "Overview of low battery devices",
 					"help": "Get a regular message with an overview all low battery devices"
 				},
-				"chooseDay": {
+				"_chooseDay": {
 					"newLine": true,
 					"sm": 12,
 					"md": 12,
@@ -745,7 +752,7 @@
 						}
 					}
 				},
-				"trennerZwei": {
+				"_trennerZwei": {
 					"newLine": true,
 					"type": "divider"
 				},
@@ -863,7 +870,7 @@
 					"text": "Notification Service",
 					"size": 2
 				},
-				"msgServiceText": {
+				"_msgServiceText": {
 					"type": "staticText",
 					"text": "Here you can choose your notification service, you can use more than one service, but you can also leave all blank, then only the datapoint lastNotification will be filled.",
 					"style": {
@@ -877,146 +884,211 @@
 					"help": "Choose your notification services",
 					"options": [
 						{ "label": "Please choose", "value": "none" },
-						{ "label": "Pushover", "value": "pushover" },
-						{ "label": "Telegram", "value": "telegram" },
-						{ "label": "Whatsapp", "value": "whatsapp" },
-						{ "label": "Signal", "value": "signal" },
 						{ "label": "E-Mail", "value": "email" },
 						{ "label": "Jarvis", "value": "jarvis" },
 						{ "label": "Lovelace", "value": "lovelace" },
-						{ "label": "Synochat", "value": "synochat" }
+						{ "label": "Matrix", "value": "matrix" },
+						{ "label": "Pushover", "value": "pushover" },
+						{ "label": "Signal", "value": "signal" },
+						{ "label": "Synochat", "value": "synochat" },
+						{ "label": "Telegram", "value": "telegram" },
+						{ "label": "Whatsapp", "value": "whatsapp" }
 					],
 					"default": "none"
 				},
-				"_headerPushover": {
+				"_headerEmail": {
 					"newLine": true,
 					"type": "header",
-					"text": "Pushover",
+					"text": "Email",
 					"size": 2,
-					"hidden": "data.msgService !== 'pushover'",
+					"hidden": "data.msgService !== 'email' && !data.instanceEmail",
 					"hideOnlyControl": false
 				},
-				"instancePushover": {
+				"instanceEmail": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "pushover",
+					"adapter": "email",
 					"all": false,
 					"allowDeactivate": true,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Pushover Instance",
-					"help": "Please choose the pushover instance",
-					"hidden": "data.msgService !== 'pushover'",
+					"label": "Email Instance",
+					"help": "Please choose the email instance",
+					"hidden": "data.msgService !== 'email' && !data.instanceEmail",
 					"hideOnlyControl": false
 				},
-				"devicePushover": {
+				"sendToEmail": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Device-ID (optional)",
-					"help": "Choose your device",
-					"hidden": "data.msgService !== 'pushover'",
+					"label": "Send to (optional)",
+					"help": "Choose your email address",
+					"hidden": "data.msgService !== 'email' && !data.instanceEmail",
 					"hideOnlyControl": false
 				},
-				"prioPushover": {
-					"type": "select",
+				"subjectEmail": {
+					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"help": "Choose the priority",
-					"options": [
-						{ "label": "Normal", "value": "" },
-						{ "label": "High Priority", "value": 1 },
-						{ "label": "Silent", "value": -1 },
-						{ "label": "With confirmation", "value": 2 }
-					],
-					"hidden": "data.msgService !== 'pushover'",
+					"label": "Subject (optional)",
+					"help": "Choose your subject for the Email",
+					"hidden": "data.msgService !== 'email' && !data.instanceEmail",
 					"hideOnlyControl": false
 				},
-				"titlePushover": {
+				"headerJarvis": {
+					"newLine": "true",
+					"type": "header",
+					"text": "Jarvis Notification",
+					"size": 2,
+					"hidden": "data.msgService !== 'jarvis' && !data.instanceJarvis",
+					"hideOnlyControl": false
+				},
+				"instanceJarvis": {
+					"newLine": true,
+					"type": "instance",
+					"adapter": "jarvis",
+					"allowDeactivate": true,
+					"all": false,
+					"sm": 12,
+					"md": 4,
+					"lg": 4,
+					"label": "Jarvis Instance",
+					"help": "Please choose the jarvis instance",
+					"hidden": "data.msgService !== 'jarvis' && !data.instanceJarvis",
+					"hideOnlyControl": false
+				},
+				"titleJarvis": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
 					"label": "Title (optional)",
 					"help": "Choose your title for Pushmessage",
-					"hidden": "data.msgService !== 'pushover'",
+					"hidden": "data.msgService !== 'jarvis' && !data.instanceJarvis",
 					"hideOnlyControl": false
 				},
-				"headerTelegram": {
+				"headerLovelace": {
 					"newLine": "true",
 					"type": "header",
-					"text": "Telegram",
+					"text": "Lovelace Notification",
 					"size": 2,
-					"hidden": "data.msgService !== 'telegram'",
+					"hidden": "data.msgService !== 'lovelace' && !data.instanceLovelace",
 					"hideOnlyControl": false
 				},
-				"instanceTelegram": {
+				"instanceLovelace": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "telegram",
-					"all": false,
+					"adapter": "lovelace",
 					"allowDeactivate": true,
+					"all": false,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Telegram Instance",
-					"help": "Please choose the telegram instance",
-					"hidden": "data.msgService !== 'telegram'",
+					"label": "Lovelace Instance",
+					"help": "Please choose the lovelace instance",
+					"hidden": "data.msgService !== 'lovelace' && !data.instanceLovelace",
 					"hideOnlyControl": false
 				},
-				"deviceTelegram": {
+				"titleLovelace": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Device-ID (optional)",
-					"help": "Choose your device",
-					"hidden": "data.msgService !== 'telegram'",
+					"label": "Title (optional)",
+					"help": "Choose your title for Pushmessage",
+					"hidden": "data.msgService !== 'lovelace' && !data.instanceLovelace",
 					"hideOnlyControl": false
 				},
-				"chatIdTelegram": {
+				"headerMatrix": {
+					"newLine": "true",
+					"type": "header",
+					"text": "Matrix",
+					"size": 2,
+					"hidden": "data.msgService !== 'matrix' && !data.instanceMatrix",
+					"hideOnlyControl": false
+				},
+				"instanceMatrix": {
+					"newLine": true,
+					"type": "instance",
+					"adapter": "matrix-org",
+					"allowDeactivate": true,
+					"all": false,
+					"sm": 12,
+					"md": 4,
+					"lg": 4,
+					"label": "Matrix Instance",
+					"help": "Please choose the matrix instance",
+					"hidden": "data.msgService !== 'matrix' && !data.instanceMatrix",
+					"hideOnlyControl": false
+				},
+				"titleMatrix": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Chat-ID (optional)",
-					"help": "Choose your Chat-ID",
-					"hidden": "data.msgService !== 'telegram'",
+					"label": "Title (optional)",
+					"help": "Choose your title for message",
+					"hidden": "data.msgService !== 'matrix' && !data.instanceMatrix",
 					"hideOnlyControl": false
 				},
-				"headerWhatsapp": {
-					"newLine": "true",
+				"_headerPushover": {
+					"newLine": true,
 					"type": "header",
-					"text": "Whatsapp",
+					"text": "Pushover",
 					"size": 2,
-					"hidden": "data.msgService !== 'whatsapp'",
+					"hidden": "data.msgService !== 'pushover' && !data.instancePushover",
 					"hideOnlyControl": false
 				},
-				"instanceWhatsapp": {
+				"instancePushover": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "whatsapp-cmb",
+					"adapter": "pushover",
 					"all": false,
 					"allowDeactivate": true,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Whatsapp Instance",
-					"help": "Please choose the Whatsapp instance",
-					"hidden": "data.msgService !== 'whatsapp'",
+					"label": "Pushover Instance",
+					"help": "Please choose the pushover instance",
+					"hidden": "data.msgService !== 'pushover' && !data.instancePushover",
 					"hideOnlyControl": false
 				},
-				"phoneWhatapp": {
+				"devicePushover": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Recipient (optional)",
-					"help": "Choose your recipient",
-					"hidden": "data.msgService !== 'whatsapp'",
+					"label": "Device-ID (optional)",
+					"help": "Choose your device",
+					"hidden": "data.msgService !== 'pushover' && !data.instancePushover",
+					"hideOnlyControl": false
+				},
+				"prioPushover": {
+					"type": "select",
+					"sm": 12,
+					"md": 4,
+					"lg": 4,
+					"help": "Choose the priority",
+					"options": [
+						{ "label": "Normal", "value": "" },
+						{ "label": "High Priority", "value": 1 },
+						{ "label": "Silent", "value": -1 },
+						{ "label": "With confirmation", "value": 2 }
+					],
+					"hidden": "data.msgService !== 'pushover' && !data.instancePushover",
+					"hideOnlyControl": false
+				},
+				"titlePushover": {
+					"type": "text",
+					"sm": 12,
+					"md": 4,
+					"lg": 4,
+					"label": "Title (optional)",
+					"help": "Choose your title for Pushmessage",
+					"hidden": "data.msgService !== 'pushover' && !data.instancePushover",
 					"hideOnlyControl": false
 				},
 				"headerSignal": {
@@ -1024,7 +1096,7 @@
 					"type": "header",
 					"text": "Signal",
 					"size": 2,
-					"hidden": "data.msgService !== 'signal'",
+					"hidden": "data.msgService !== 'signal' && !data.instanceSignal",
 					"hideOnlyControl": false
 				},
 				"instanceSignal": {
@@ -1038,7 +1110,7 @@
 					"lg": 4,
 					"label": "Signal Instance",
 					"help": "Please choose the Signal instance",
-					"hidden": "data.msgService !== 'signal'",
+					"hidden": "data.msgService !== 'signal' && !data.instanceSignal",
 					"hideOnlyControl": false
 				},
 				"phonSignal": {
@@ -1048,137 +1120,113 @@
 					"lg": 4,
 					"label": "Recipient (optional)",
 					"help": "Choose your recipient",
-					"hidden": "data.msgService !== 'signal'",
+					"hidden": "data.msgService !== 'signal' && !data.instanceSignal",
 					"hideOnlyControl": false
 				},
-				"_headerEmail": {
-					"newLine": true,
+				"headerSynochat": {
+					"newLine": "true",
 					"type": "header",
-					"text": "Email",
+					"text": "Synochat",
 					"size": 2,
-					"hidden": "data.msgService !== 'email'",
+					"hidden": "data.msgService !== 'synochat' && !data.instanceSynochat",
 					"hideOnlyControl": false
 				},
-				"instanceEmail": {
+				"instanceSynochat": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "email",
-					"all": false,
+					"adapter": "synochat",
 					"allowDeactivate": true,
+					"all": false,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Email Instance",
-					"help": "Please choose the email instance",
-					"hidden": "data.msgService !== 'email'",
-					"hideOnlyControl": false
-				},
-				"sendToEmail": {
-					"type": "text",
-					"sm": 12,
-					"md": 4,
-					"lg": 4,
-					"label": "Send to (optional)",
-					"help": "Choose your email address",
-					"hidden": "data.msgService !== 'email'",
+					"label": "Synochat Instance",
+					"help": "Please choose the Synochat instance",
+					"hidden": "data.msgService !== 'synochat' && !data.instanceSynochat",
 					"hideOnlyControl": false
 				},
-				"subjectEmail": {
+				"channelSynochat": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Subject (optional)",
-					"help": "Choose your subject for the Email",
-					"hidden": "data.msgService !== 'email'",
+					"label": "Channel",
+					"help": "Enter the channelname for Synochat",
+					"hidden": "data.msgService !== 'synochat' && !data.instanceSynochat",
 					"hideOnlyControl": false
 				},
-				"headerJarvis": {
+				"headerTelegram": {
 					"newLine": "true",
 					"type": "header",
-					"text": "Jarvis Notification",
+					"text": "Telegram",
 					"size": 2,
-					"hidden": "data.msgService !== 'jarvis'",
+					"hidden": "data.msgService !== 'telegram' && !data.instanceTelegram",
 					"hideOnlyControl": false
 				},
-				"instanceJarvis": {
+				"instanceTelegram": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "jarvis",
-					"allowDeactivate": true,
+					"adapter": "telegram",
 					"all": false,
+					"allowDeactivate": true,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Jarvis Instance",
-					"help": "Please choose the jarvis instance",
-					"hidden": "data.msgService !== 'jarvis'",
+					"label": "Telegram Instance",
+					"help": "Please choose the telegram instance",
+					"hidden": "data.msgService !== 'telegram' && !data.instanceTelegram",
 					"hideOnlyControl": false
 				},
-				"titleJarvis": {
+				"deviceTelegram": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Title (optional)",
-					"help": "Choose your title for Pushmessage",
-					"hidden": "data.msgService !== 'jarvis'",
-					"hideOnlyControl": false
-				},
-				"headerLovelace": {
-					"newLine": "true",
-					"type": "header",
-					"text": "Lovelace Notification",
-					"size": 2,
-					"hidden": "data.msgService !== 'lovelace'",
+					"label": "Device-ID (optional)",
+					"help": "Choose your device",
+					"hidden": "data.msgService !== 'telegram' && !data.instanceTelegram",
 					"hideOnlyControl": false
 				},
-				"instanceLovelace": {
-					"newLine": true,
-					"type": "instance",
-					"adapter": "lovelace",
-					"allowDeactivate": true,
-					"all": false,
+				"chatIdTelegram": {
+					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Lovelace Instance",
-					"help": "Please choose the lovelace instance",
-					"hidden": "data.msgService !== 'lovelace'",
+					"label": "Chat-ID (optional)",
+					"help": "Choose your Chat-ID",
+					"hidden": "data.msgService !== 'telegram' && !data.instanceTelegram",
 					"hideOnlyControl": false
 				},
-				"titleLovelace": {
-					"type": "text",
-					"sm": 12,
-					"md": 4,
-					"lg": 4,
-					"label": "Title (optional)",
-					"help": "Choose your title for Pushmessage",
-					"hidden": "data.msgService !== 'lovelace'",
+				"headerWhatsapp": {
+					"newLine": "true",
+					"type": "header",
+					"text": "Whatsapp",
+					"size": 2,
+					"hidden": "data.msgService !== 'whatsapp' && !data.instanceWhatsapp",
 					"hideOnlyControl": false
 				},
-				"instanceSynochat": {
+				"instanceWhatsapp": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "synochat",
-					"allowDeactivate": true,
+					"adapter": "whatsapp-cmb",
 					"all": false,
+					"allowDeactivate": true,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Synochat Instance",
-					"help": "Please choose the Synochat instance",
-					"hidden": "data.msgService !== 'synochat'",
+					"label": "Whatsapp Instance",
+					"help": "Please choose the Whatsapp instance",
+					"hidden": "data.msgService !== 'whatsapp' && !data.instanceWhatsapp",
 					"hideOnlyControl": false
 				},
-				"channelSynochat": {
+				"phoneWhatapp": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Channel",
-					"help": "Enter the channelname for Synochat",
-					"hidden": "data.msgService !== 'synochat'",
+					"label": "Recipient (optional)",
+					"help": "Choose your recipient",
+					"hidden": "data.msgService !== 'whatsapp' && !data.instanceWhatsapp",
 					"hideOnlyControl": false
 				}
 			}
@@ -1187,7 +1235,7 @@
 			"type": "panel",
 			"label": "Blacklist",
 			"items": {
-				"headerBlacklistInstances": {
+				"_headerBlacklistInstances": {
 					"newLine": "true",
 					"type": "header",
 					"text": "Instances Blacklist",
@@ -1219,19 +1267,17 @@
 							"type": "checkbox",
 							"title": "Ignor in notifications",
 							"attr": "checkIgnorNotify",
-							"width": "15%",
-							"alsoDependsOn": ["devices"]
+							"width": "15%"
 						},
 						{
 							"type": "checkbox",
 							"title": "Ignore in lists",
 							"attr": "checkIgnorLists",
-							"width": "10%",
-							"alsoDependsOn": ["devices"]
+							"width": "10%"
 						}
 					]
 				},
-				"headerDevices": {
+				"_headerDevices": {
 					"newLine": "true",
 					"type": "header",
 					"text": "Devices/Services Blacklist",
@@ -1259,30 +1305,27 @@
 							"type": "checkbox",
 							"title": "Ignor in notifications",
 							"attr": "checkIgnorNotify",
-							"width": "15%",
-							"alsoDependsOn": ["devices"]
+							"width": "15%"
 						},
 						{
 							"type": "checkbox",
 							"title": "Ignore in main lists",
 							"attr": "checkIgnorLists",
-							"width": "10%",
-							"alsoDependsOn": ["devices"]
+							"width": "10%"
 						},
 						{
 							"type": "checkbox",
 							"title": "Ignore in lists per adapter",
 							"attr": "checkIgnorAdapterLists",
-							"width": "10%",
-							"alsoDependsOn": ["devices"]
+							"width": "10%"
 						}
 					]
 				}
 			}
 		},
-		"_expertSettings": {
+		"_otherSettings": {
 			"type": "panel",
-			"label": "Expert Settings",
+			"label": "Other Settings",
 			"items": {
 				"_headerOtherSettings": {
 					"type": "header",
@@ -1337,7 +1380,7 @@
 					"text": "Update-Interval",
 					"size": 2
 				},
-				"textUpdateInterval": {
+				"_textUpdateInterval": {
 					"type": "staticText",
 					"text": "Here you can define the update interval of the datapoints/lists. For performance reasons, it is not recommended to select a poll value that is too low. Lower than two seconds is not selectable.",
 					"sm": 12,
@@ -1358,13 +1401,70 @@
 					"label": "Update-Interval",
 					"help": "in seconds",
 					"hideOnlyControl": false
+				}
+			}
+		},
+		"_expertSettings": {
+			"type": "panel",
+			"label": "Expert Settings",
+			"items": {
+				"_headerTimeInstances": {
+					"type": "header",
+					"text": "Error Time for Instances",
+					"size": 2,
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false
+				},
+				"_textTimeInstances": {
+					"type": "staticText",
+					"text": "Here you can define the error time of each instance. The standard value is 20 seconds.",
+					"sm": 12,
+					"md": 12,
+					"lg": 12,
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false,
+					"style": {
+						"fontSize": 16,
+						"marginBottom": 10
+					}
+				},
+				"tableTimeInstance": {
+					"type": "table",
+					"nodelete": true,
+					"sm": 12,
+					"md": 12,
+					"lg": 12,
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false,
+					"items": [
+						{
+							"type": "selectSendTo",
+							"title": "Choose which instances should have a longer downtime",
+							"attr": "instancesTime",
+							"filter": false,
+							"allowAddByFilter": false,
+							"sort": false,
+							"jsonData": "{\"instanceName\":\"${globalData.instanceName}\",\"adapter\":\"${globalData.adapter}\",\"path\":\"${globalData.path}\"}",
+							"command": "instancesListTime",
+							"width": "60%"
+						},
+						{
+							"type": "number",
+							"min": 20,
+							"max": 1000000,
+							"default": 20,
+							"title": "Time in seconds",
+							"attr": "errorTime",
+							"width": "15%"
+						}
+					]
 				},
 				"_headerOfflineTime": {
 					"type": "header",
 					"text": "Offline Time for devices/services",
 					"size": 2
 				},
-				"textOfflineTime": {
+				"_textOfflineTime": {
 					"type": "staticText",
 					"text": "Here you can define the offline times of each adapter. If you want to use the data points of the devices/services (online, available, reachable etc.) directly to determine the status, enter ' 0 '.",
 					"sm": 12,
@@ -1495,6 +1595,18 @@
 					"hidden": "!data.fullybrowserDevices",
 					"hideOnlyControl": false
 				},
+				"fullyMQTTMaxMinutes": {
+					"type": "number",
+					"min": -1,
+					"max": 100000,
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "Fully-MQTT",
+					"help": "in minutes",
+					"hidden": "!data.fullyMQTTDevices",
+					"hideOnlyControl": false
+				},
 				"hamMaxMinutes": {
 					"type": "number",
 					"min": 1,