IPv6 support (#1369)

* hyperion-remote - Support IPv6 * LEDDevices - Remove IPv6 limitations * Separate JsonEditorHostValidation * Standalone grabbers & JSON/Flatbuffer forwarder: IPv6 support * remote: Fix setting multiple colors via Hex, add standard logging * IPv6 Updates -Add db migration activities * Addressing non-Windows compile issues * Code cleanup, address clang feedback * Update address (hostname, IPv4/IPv6) help text * Apply migration steps to "old" configurations imported * Show user the UI-Url, if hyperion is already running, address clang findings * Windows Cmake OpenSLL output * Minor Text update
2025-03-01 10:33:28 +00:00 · 2021-11-17 20:30:43 +00:00
parent b33466d392
commit ad293b2fb6
61 changed files with 1714 additions and 926 deletions
--- a/libsrc/leddevice/dev_net/LedDeviceNanoleaf.cpp
+++ b/libsrc/leddevice/dev_net/LedDeviceNanoleaf.cpp
@@ -19,7 +19,6 @@ const bool verbose3 = false;

 // Configuration settings
 const char CONFIG_ADDRESS[] = "host";
-//const char CONFIG_PORT[] = "port";
 const char CONFIG_AUTH_TOKEN[] = "token";
 const char CONFIG_RESTORE_STATE[] = "restoreOriginalState";
 const char CONFIG_BRIGHTNESS[] = "brightness";
@@ -182,8 +181,6 @@ bool LedDeviceNanoleaf::init(const QJsonObject& deviceConfig)

 		_startPos = deviceConfig[CONFIG_PANEL_START_POS].toInt(0);

-		// TODO: Allow to handle port dynamically
-
 		//Set hostname as per configuration and_defaultHost default port
 		_hostName = deviceConfig[CONFIG_ADDRESS].toString();
 		_apiPort = API_DEFAULT_PORT;
@@ -442,21 +439,7 @@ QJsonObject LedDeviceNanoleaf::getProperties(const QJsonObject& params)
 		QString authToken = params["token"].toString("");
 		QString filter = params["filter"].toString("");

-		// Resolve hostname and port (or use default API port)
-		QStringList addressparts = QStringUtils::split(hostName, ":", QStringUtils::SplitBehavior::SkipEmptyParts);
-		QString apiHost = addressparts[0];
-		int apiPort;
-
-		if (addressparts.size() > 1)
-		{
-			apiPort = addressparts[1].toInt();
-		}
-		else
-		{
-			apiPort = API_DEFAULT_PORT;
-		}
-
-		initRestAPI(apiHost, apiPort, authToken);
+		initRestAPI(hostName, API_DEFAULT_PORT, authToken);
 		_restApi->setPath(filter);

 		// Perform request
@@ -482,21 +465,7 @@ void LedDeviceNanoleaf::identify(const QJsonObject& params)
 	{
 		QString authToken = params["token"].toString("");

-		// Resolve hostname and port (or use default API port)
-		QStringList addressparts = QStringUtils::split(hostName, ":", QStringUtils::SplitBehavior::SkipEmptyParts);
-		QString apiHost = addressparts[0];
-		int apiPort;
-
-		if (addressparts.size() > 1)
-		{
-			apiPort = addressparts[1].toInt();
-		}
-		else
-		{
-			apiPort = API_DEFAULT_PORT;
-		}
-
-		initRestAPI(apiHost, apiPort, authToken);
+		initRestAPI(hostName, API_DEFAULT_PORT, authToken);
 		_restApi->setPath("identify");

 		// Perform request
--- a/libsrc/leddevice/dev_net/LedDeviceNanoleaf.h
+++ b/libsrc/leddevice/dev_net/LedDeviceNanoleaf.h
@@ -61,7 +61,7 @@ public:
 	/// Following parameters are required
 	/// @code
 	/// {
-	///     "host"  : "hostname or IP [:port]",
+	///     "host"  : "hostname or IP",
 	///     "token" : "authentication token",
 	///     "filter": "resource to query", root "/" is used, if empty
 	/// }
@@ -78,7 +78,7 @@ public:
 	/// Following parameters are required
 	/// @code
 	/// {
-	///     "host"  : "hostname or IP [:port]",
+	///     "host"  : "hostname or IP",
 	///     "token" : "authentication token",
 	/// }
 	///@endcode
--- a/libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp
+++ b/libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp
@@ -12,8 +12,8 @@ namespace {
 bool verbose = false;

 // Configuration settings
-const char CONFIG_ADDRESS[] = "host";
-//const char CONFIG_PORT[] = "port";
+const char CONFIG_HOST[] = "host";
+const char CONFIG_PORT[] = "port";
 const char CONFIG_USERNAME[] = "username";
 const char CONFIG_CLIENTKEY[] = "clientkey";
 const char CONFIG_BRIGHTNESSFACTOR[] = "brightnessFactor";
@@ -282,31 +282,30 @@ bool LedDevicePhilipsHueBridge::init(const QJsonObject &deviceConfig)
 		log( "LatchTime", "%d", this->getLatchTime() );

 		//Set hostname as per configuration and_defaultHost default port
-		QString address = deviceConfig[ CONFIG_ADDRESS ].toString();
+		_hostname = deviceConfig[CONFIG_HOST].toString();

 		//If host not configured the init failed
-		if ( address.isEmpty() )
+		if (_hostname.isEmpty())
 		{
-			this->setInError("No target hostname nor IP defined");
+			this->setInError("No target hostname defined");
 			isInitOK = false;
 		}
 		else
 		{
-			QStringList addressparts = QStringUtils::split(address,":", QStringUtils::SplitBehavior::SkipEmptyParts);
-			_hostname = addressparts[0];
-			log( "Hostname/IP", "%s", QSTRING_CSTR( _hostname ) );
+			log("Hostname", "%s", QSTRING_CSTR(_hostname));

-			if ( addressparts.size() > 1 )
+			int _apiPort = deviceConfig[CONFIG_PORT].toInt();
+			if (_apiPort == 0)
 			{
-				_apiPort = addressparts[1].toInt();
-				log( "Port", "%u",  _apiPort );
+				_apiPort = API_DEFAULT_PORT;
 			}
+			log("Port", "%d", _apiPort);

-			_username = deviceConfig[ CONFIG_USERNAME ].toString();
+			_username = deviceConfig[CONFIG_USERNAME].toString();

-			if ( initRestAPI( _hostname, _apiPort, _username ) )
+			if (initRestAPI(_hostname, _apiPort, _username))
 			{
-				if ( initMaps() )
+				if (initMaps())
 				{
 					isInitOK = ProviderUdpSSL::init(_devConfig);
 				}
@@ -1602,7 +1601,7 @@ QJsonObject LedDevicePhilipsHue::discover(const QJsonObject& /*params*/)
 	// Discover Devices
 	SSDPDiscover discover;

-	discover.skipDuplicateKeys(false);
+	discover.skipDuplicateKeys(true);
 	discover.setSearchFilter(SSDP_FILTER, SSDP_FILTER_HEADER);
 	QString searchTarget = SSDP_ID;

@@ -1619,37 +1618,39 @@ QJsonObject LedDevicePhilipsHue::discover(const QJsonObject& /*params*/)

 QJsonObject LedDevicePhilipsHue::getProperties(const QJsonObject& params)
 {
+	DebugIf(verbose, _log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
 	QJsonObject properties;

 	// Get Phillips-Bridge device properties
-	QString host = params["host"].toString("");
-	if ( !host.isEmpty() )
+	QString hostName = params[CONFIG_HOST].toString("");
+	if (!hostName.isEmpty())
 	{
 		QString username = params["user"].toString("");
 		QString filter = params["filter"].toString("");

-		// Resolve hostname and port (or use default API port)
-		QStringList addressparts = QStringUtils::split(host,":", QStringUtils::SplitBehavior::SkipEmptyParts);
-		QString apiHost = addressparts[0];
 		int apiPort;
-
-		if ( addressparts.size() > 1 )
+		if (params[CONFIG_PORT].isString())
 		{
-			apiPort = addressparts[1].toInt();
+			apiPort = params[CONFIG_PORT].toString().toInt();
 		}
 		else
+		{
+			apiPort = params[CONFIG_PORT].toInt();
+		}
+
+		if (apiPort == 0)
 		{
 			apiPort = API_DEFAULT_PORT;
 		}

-		initRestAPI(apiHost, apiPort, username);
+		initRestAPI(hostName, apiPort, username);
 		_restApi->setPath(filter);

 		// Perform request
 		httpResponse response = _restApi->get();
-		if ( response.error() )
+		if (response.error())
 		{
-			Warning (_log, "%s get properties failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+			Warning(_log, "%s get properties failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
 		}

 		// Perform request
@@ -1660,45 +1661,46 @@ QJsonObject LedDevicePhilipsHue::getProperties(const QJsonObject& params)

 void LedDevicePhilipsHue::identify(const QJsonObject& params)
 {
-	Debug(_log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData() );
+	DebugIf(verbose, _log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
 	QJsonObject properties;

 	// Identify Phillips-Bridge device
-	QString host = params["host"].toString("");
-	if ( !host.isEmpty() )
+	QString hostName = params[CONFIG_HOST].toString("");
+	if (!hostName.isEmpty())
 	{
 		QString username = params["user"].toString("");
 		int lightId = params["lightId"].toInt(0);

-		// Resolve hostname and port (or use default API port)
-		QStringList addressparts = QStringUtils::split(host,":", QStringUtils::SplitBehavior::SkipEmptyParts);
-		QString apiHost = addressparts[0];
 		int apiPort;
-
-		if ( addressparts.size() > 1 )
+		if (params[CONFIG_PORT].isString())
 		{
-			apiPort = addressparts[1].toInt();
+			apiPort = params[CONFIG_PORT].toString().toInt();
 		}
 		else
 		{
-			apiPort   = API_DEFAULT_PORT;
+			apiPort = params[CONFIG_PORT].toInt();
 		}

-		initRestAPI(apiHost, apiPort, username);
+		if (apiPort == 0)
+		{
+			apiPort = API_DEFAULT_PORT;
+		}

-		QString resource = QString("%1/%2/%3").arg( API_LIGHTS ).arg( lightId ).arg( API_STATE);
+		initRestAPI(hostName, apiPort, username);
+
+		QString resource = QString("%1/%2/%3").arg(API_LIGHTS).arg(lightId).arg(API_STATE);
 		_restApi->setPath(resource);

 		QString stateCmd;
-		stateCmd += QString("\"%1\":%2,").arg( API_STATE_ON, API_STATE_VALUE_TRUE );
-		stateCmd += QString("\"%1\":\"%2\"").arg( "alert", "select" );
+		stateCmd += QString("\"%1\":%2,").arg(API_STATE_ON, API_STATE_VALUE_TRUE);
+		stateCmd += QString("\"%1\":\"%2\"").arg("alert", "select");
 		stateCmd = "{" + stateCmd + "}";

 		// Perform request
 		httpResponse response = _restApi->put(stateCmd);
-		if ( response.error() )
+		if (response.error())
 		{
-			Warning (_log, "%s identification failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+			Warning(_log, "%s identification failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
 		}
 	}
 }
--- a/libsrc/leddevice/dev_net/LedDevicePhilipsHue.h
+++ b/libsrc/leddevice/dev_net/LedDevicePhilipsHue.h
@@ -376,7 +376,8 @@ public:
 	/// Following parameters are required
 	/// @code
 	/// {
-	///     "host"  : "hostname or IP [:port]",
+	///     "host"  : "hostname or IP
+	///     "port"  : port
 	///     "user"  : "username",
 	///     "filter": "resource to query", root "/" is used, if empty
 	/// }
@@ -390,7 +391,15 @@ public:
 	///
 	/// @brief Send an update to the device to identify it.
 	///
-	/// Used in context of a set of devices of the same type.
+	/// Following parameters are required
+	/// @code
+	/// {
+	///     "host"  : "hostname or IP
+	///     "port"  : port
+	///     "user"  : "username",
+	///     "filter": "resource to query", root "/" is used, if empty
+	/// }
+	///@endcode
 	///
 	/// @param[in] params Parameters to address device
 	///
--- a/libsrc/leddevice/dev_net/LedDeviceWled.h
+++ b/libsrc/leddevice/dev_net/LedDeviceWled.h
@@ -47,7 +47,7 @@ public:
 	/// Following parameters are required
 	/// @code
 	/// {
-	///     "host"  : "hostname or IP [:port]",
+	///     "host"  : "hostname or IP",
 	///     "filter": "resource to query", root "/" is used, if empty
 	/// }
 	///@endcode
@@ -63,7 +63,7 @@ public:
 	/// Following parameters are required
 	/// @code
 	/// {
-	///     "host"  : "hostname or IP [:port]",
+	///     "host"  : "hostname or IP",
 	/// }
 	///@endcode
 	///
--- a/libsrc/leddevice/dev_net/LedDeviceYeelight.cpp
+++ b/libsrc/leddevice/dev_net/LedDeviceYeelight.cpp
@@ -1112,11 +1112,7 @@ bool LedDeviceYeelight::init(const QJsonObject &deviceConfig)
 				QString hostName = configuredYeelightLights[j].toObject().value("host").toString();
 				int port = configuredYeelightLights[j].toObject().value("port").toInt(API_DEFAULT_PORT);

-				QStringList addressparts = QStringUtils::split(hostName,":", QStringUtils::SplitBehavior::SkipEmptyParts);
-				QString apiHost = addressparts[0];
-				int apiPort = port;
-
-				_lightsAddressList.append( {apiHost, apiPort} );
+				_lightsAddressList.append( { hostName, port} );
 			}

 			if ( updateLights(_lightsAddressList) )
@@ -1150,19 +1146,19 @@ bool LedDeviceYeelight::startMusicModeServer()
 		}
 		else
 		{
-			QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
-			// use the first non-localhost IPv4 address
-			for (int i = 0; i < ipAddressesList.size(); ++i) {
-				if (ipAddressesList.at(i) != QHostAddress::LocalHost &&
-					 (ipAddressesList.at(i).toIPv4Address() != 0U))
+			// use the first non-localhost IPv4 address, IPv6 are not supported by Yeelight currently
+			for (const auto& address : QNetworkInterface::allAddresses())
+			{
+				// is valid when, no loopback, IPv4
+				if (!address.isLoopback() && (address.protocol() == QAbstractSocket::IPv4Protocol))
 				{
-					_musicModeServerAddress = ipAddressesList.at(i);
+					_musicModeServerAddress = address;
 					break;
 				}
 			}
-			if ( _musicModeServerAddress.isNull() )
+			if (_musicModeServerAddress.isNull())
 			{
-				Error( _log, "Failed to resolve IP for music mode server");
+				Error(_log, "Failed to resolve IP for music mode server");
 			}
 		}
 	}
--- a/libsrc/leddevice/dev_net/ProviderUdp.cpp
+++ b/libsrc/leddevice/dev_net/ProviderUdp.cpp
@@ -70,7 +70,7 @@ bool ProviderUdp::init(const QJsonObject& deviceConfig)
 			else
 			{
 				_port = static_cast<quint16>(config_port);
-				Debug(_log, "UDP socket will write to %s:%u", QSTRING_CSTR(_address.toString()), _port);
+				Debug(_log, "UDP socket will write to %s port: %u", QSTRING_CSTR(_address.toString()), _port);

 				_udpSocket = new QUdpSocket(this);

--- a/libsrc/leddevice/dev_net/ProviderUdpSSL.cpp
+++ b/libsrc/leddevice/dev_net/ProviderUdpSSL.cpp
@@ -74,9 +74,6 @@ bool ProviderUdpSSL::init(const QJsonObject &deviceConfig)
 		if( deviceConfig.contains("hs_attempts") )    _handshake_attempts    = deviceConfig["hs_attempts"].toInt(5);

 		QString host = deviceConfig["host"].toString(_defaultHost);
-		//Split hostname from API-port in case given
-		QStringList addressparts = QStringUtils::split(host, ":", QStringUtils::SplitBehavior::SkipEmptyParts);
-		QString udpHost = addressparts[0];

 		QStringList debugLevels = QStringList() << "No Debug" << "Error" << "State Change" << "Informational" << "Verbose";

@@ -96,25 +93,24 @@ bool ProviderUdpSSL::init(const QJsonObject &deviceConfig)
 		configLog( "SSL Handshake Timeout max", "%d", _handshake_timeout_max );
 		configLog( "SSL Handshake attempts", "%d", _handshake_attempts );

-		if ( _address.setAddress(udpHost) )
+		if (_address.setAddress(host))
 		{
-			Debug( _log, "Successfully parsed %s as an ip address.", QSTRING_CSTR(udpHost) );
+			Debug(_log, "Successfully parsed %s as an IP-address.", QSTRING_CSTR(_address.toString()));
 		}
 		else
 		{
-			Debug( _log, "Failed to parse [%s] as an ip address.", QSTRING_CSTR(udpHost) );
-			QHostInfo info = QHostInfo::fromName(udpHost);
-			if ( info.addresses().isEmpty() )
+			QHostInfo hostInfo = QHostInfo::fromName(host);
+			if (hostInfo.error() == QHostInfo::NoError)
 			{
-				Debug( _log, "Failed to parse [%s] as a hostname.", QSTRING_CSTR(udpHost) );
-				QString errortext = QString("Invalid target address [%1]!").arg(host);
-				this->setInError( errortext );
-				isInitOK = false;
+				_address = hostInfo.addresses().first();
+				Debug(_log, "Successfully resolved IP-address (%s) for hostname (%s).", QSTRING_CSTR(_address.toString()), QSTRING_CSTR(host));
 			}
 			else
 			{
-				Debug( _log, "Successfully parsed %s as a hostname.", QSTRING_CSTR(udpHost) );
-				_address = info.addresses().first();
+				QString errortext = QString("Failed resolving IP-address for [%1], (%2) %3").arg(host).arg(hostInfo.error()).arg(hostInfo.errorString());
+				this->setInError(errortext);
+				isInitOK = false;
+				return isInitOK;
 			}
 		}

@@ -129,7 +125,7 @@ bool ProviderUdpSSL::init(const QJsonObject &deviceConfig)
 		else
 		{
 			_ssl_port = config_port;
-			Debug( _log, "UDP SSL using %s:%u", QSTRING_CSTR( _address.toString() ), _ssl_port );
+			Debug(_log, "UDP SSL will write to %s port: %u", QSTRING_CSTR(_address.toString()), _ssl_port);
 			isInitOK = true;
 		}
 	}
@@ -250,23 +246,26 @@ bool ProviderUdpSSL::initConnection()

 bool ProviderUdpSSL::seedingRNG()
 {
-	int ret = 0;
-
-	sslLog( "Seeding the random number generator..." );
+	sslLog("Seeding the random number generator...");

 	mbedtls_entropy_init(&entropy);

-	sslLog( "Set mbedtls_ctr_drbg_seed..." );
+	sslLog("Set mbedtls_ctr_drbg_seed...");

-	const char* custom = QSTRING_CSTR( _custom );
+	QByteArray customDataArray = _custom.toLocal8Bit();
+	const char* customData = customDataArray.constData();

-	if ((ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, reinterpret_cast<const unsigned char *>(custom), strlen(custom))) != 0)
+	int ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func,
+		&entropy, reinterpret_cast<const unsigned char*>(customData),
+		std::min(strlen(customData), (size_t)MBEDTLS_CTR_DRBG_MAX_SEED_INPUT));
+
+	if (ret != 0)
 	{
-		sslLog( QString("mbedtls_ctr_drbg_seed FAILED %1").arg( errorMsg( ret ) ), "error" );
+		sslLog(QString("mbedtls_ctr_drbg_seed FAILED %1").arg(errorMsg(ret)), "error");
 		return false;
 	}

-	sslLog( "Seeding the random number generator...ok" );
+	sslLog("Seeding the random number generator...ok");

 	return true;
 }
--- a/libsrc/leddevice/schemas/schema-artnet.json
+++ b/libsrc/leddevice/schemas/schema-artnet.json
@@ -1,42 +1,43 @@
 {
-	"type":"object",
-	"required":true,
-	"properties":{
-		"host" : {
-			"type": "string",
-			"title":"edt_dev_spec_targetIp_title",
-			"propertyOrder" : 1
-		},
-		"port" : {
-			"type": "integer",
-			"title":"edt_dev_spec_port_title",
-			"default": 6454,
-			"minimum": 0,
-			"maximum": 65535,
-			"propertyOrder" : 2
-		},
-		"universe": {
-			"type": "integer",
-			"title":"edt_dev_spec_universe_title",
-			"default": 1,
-			"propertyOrder" : 3
-		},
-		"channelsPerFixture": {
-			"type": "integer",
-			"title":"edt_dev_spec_chanperfixture_title",
-			"default": 3,
-			"propertyOrder" : 4
-		},
-		"latchTime": {
-			"type": "integer",
-			"title":"edt_dev_spec_latchtime_title",
-			"default": 0,
-			"append": "edt_append_ms",
-			"minimum": 0,
-			"maximum": 1000,
-			"access" : "expert",
-			"propertyOrder" : 5
-		}
-	},
-	"additionalProperties": true
+  "type": "object",
+  "required": true,
+  "properties": {
+    "host": {
+      "type": "string",
+      "format": "hostname_or_ip",
+      "title": "edt_dev_spec_targetIpHost_title",
+      "propertyOrder": 1
+    },
+    "port": {
+      "type": "integer",
+      "title": "edt_dev_spec_port_title",
+      "default": 6454,
+      "minimum": 0,
+      "maximum": 65535,
+      "propertyOrder": 2
+    },
+    "universe": {
+      "type": "integer",
+      "title": "edt_dev_spec_universe_title",
+      "default": 1,
+      "propertyOrder": 3
+    },
+    "channelsPerFixture": {
+      "type": "integer",
+      "title": "edt_dev_spec_chanperfixture_title",
+      "default": 3,
+      "propertyOrder": 4
+    },
+    "latchTime": {
+      "type": "integer",
+      "title": "edt_dev_spec_latchtime_title",
+      "default": 0,
+      "append": "edt_append_ms",
+      "minimum": 0,
+      "maximum": 1000,
+      "access": "expert",
+      "propertyOrder": 5
+    }
+  },
+  "additionalProperties": true
 }
--- a/libsrc/leddevice/schemas/schema-atmoorb.json
+++ b/libsrc/leddevice/schemas/schema-atmoorb.json
@@ -18,6 +18,7 @@
    },
    "host": {
      "type": "string",
+      "format": "ipv4",
      "title": "edt_dev_spec_multicastGroup_title",
      "default": "239.255.255.250",
      "propertyOrder": 3
--- a/libsrc/leddevice/schemas/schema-cololight.json
+++ b/libsrc/leddevice/schemas/schema-cololight.json
@@ -15,6 +15,7 @@
    },
    "host": {
      "type": "string",
+      "format": "hostname_or_ip4",
      "title": "edt_dev_spec_targetIpHost_title",
      "options": {
        "infoText": "edt_dev_spec_targetIpHost_title_info"
--- a/libsrc/leddevice/schemas/schema-e131.json
+++ b/libsrc/leddevice/schemas/schema-e131.json
@@ -1,41 +1,42 @@
 {
-	"type":"object",
-	"required":true,
-	"properties":{
-		"host" : {
-			"type": "string",
-			"title":"edt_dev_spec_targetIp_title",
-			"propertyOrder" : 1
-		},
-		"port" : {
-			"type": "integer",
-			"title":"edt_dev_spec_port_title",
-			"default": 5568,
-			"minimum" : 0,
-			"maximum" : 65535,
-			"propertyOrder" : 2
-		},
-		"universe": {
-			"type": "integer",
-			"title":"edt_dev_spec_universe_title",
-			"default": 1,
-			"propertyOrder" : 3
-		},
-		"latchTime": {
-			"type": "integer",
-			"title":"edt_dev_spec_latchtime_title",
-			"default": 0,
-			"append" : "edt_append_ms",
-			"minimum": 0,
-			"maximum": 1000,
-			"access" : "expert",
-			"propertyOrder" : 4
-		},
-		"cid": {
-			"type": "string",
-			"title":"edt_dev_spec_cid_title",
-			"propertyOrder" : 5
-		}
-	},
-	"additionalProperties": true
+  "type": "object",
+  "required": true,
+  "properties": {
+    "host": {
+      "type": "string",
+      "format": "hostname_or_ip",
+      "title": "edt_dev_spec_targetIpHost_title",
+      "propertyOrder": 1
+    },
+    "port": {
+      "type": "integer",
+      "title": "edt_dev_spec_port_title",
+      "default": 5568,
+      "minimum": 0,
+      "maximum": 65535,
+      "propertyOrder": 2
+    },
+    "universe": {
+      "type": "integer",
+      "title": "edt_dev_spec_universe_title",
+      "default": 1,
+      "propertyOrder": 3
+    },
+    "latchTime": {
+      "type": "integer",
+      "title": "edt_dev_spec_latchtime_title",
+      "default": 0,
+      "append": "edt_append_ms",
+      "minimum": 0,
+      "maximum": 1000,
+      "access": "expert",
+      "propertyOrder": 4
+    },
+    "cid": {
+      "type": "string",
+      "title": "edt_dev_spec_cid_title",
+      "propertyOrder": 5
+    }
+  },
+  "additionalProperties": true
 }
--- a/libsrc/leddevice/schemas/schema-fadecandy.json
+++ b/libsrc/leddevice/schemas/schema-fadecandy.json
@@ -1,113 +1,113 @@
 {
-	"type":"object",
-	"required":true,
-	"properties": {
-		"host": {
-			"type": "string",
-			"title": "edt_dev_spec_targetIp_title",
-			"default": "127.0.0.1",
-			"propertyOrder": 1
-		},
-		"port": {
-			"type": "number",
-			"title": "edt_dev_spec_port_title",
-			"default": 7890,
-			"propertyOrder": 2
-		},
-		"latchTime": {
-			"type": "integer",
-			"title": "edt_dev_spec_latchtime_title",
-			"default": 0,
-			"append": "edt_append_ms",
-			"minimum": 0,
-			"maximum": 1000,
-			"access": "expert",
-			"propertyOrder": 3
-		},
-		"setFcConfig": {
-			"type": "boolean",
-			"title": "edt_dev_spec_FCsetConfig_title",
-			"default": false,
-			"propertyOrder": 4
-		},
-		"manualLed": {
-			"type": "boolean",
-			"title": "edt_dev_spec_FCmanualControl_title",
-			"default": false,
-			"options": {
-				"dependencies": {
-					"setFcConfig": true
-				}
-			},
-			"propertyOrder": 5
-		},
-		"ledOn": {
-			"type": "boolean",
-			"title": "edt_dev_spec_FCledToOn_title",
-			"default": false,
-			"options": {
-				"dependencies": {
-					"setFcConfig": true
-				}
-			},
-			"propertyOrder": 6
-		},
-		"interpolation": {
-			"type": "boolean",
-			"title": "edt_dev_spec_interpolation_title",
-			"default": false,
-			"options": {
-				"dependencies": {
-					"setFcConfig": true
-				}
-			},
-			"propertyOrder": 7
-		},
-		"dither": {
-			"type": "boolean",
-			"title": "edt_dev_spec_dithering_title",
-			"default": false,
-			"options": {
-				"dependencies": {
-					"setFcConfig": true
-				}
-			},
-			"propertyOrder": 8
-		},
-		"gamma": {
-			"type": "number",
-			"title": "edt_dev_spec_gamma_title",
-			"default": 1.0,
-			"minimum": 0.1,
-			"maximum": 5.0,
-			"options": {
-				"dependencies": {
-					"setFcConfig": true
-				}
-			},
-			"propertyOrder": 9
-		},
-		"whitepoint": {
-			"type": "array",
-			"title": "edt_dev_spec_whitepoint_title",
-			"options": {
-				"dependencies": {
-					"setFcConfig": true
-				}
-			},
-			"propertyOrder": 10,
-			"default": [ 255, 255, 255 ],
-			"maxItems": 3,
-			"minItems": 3,
-			"format": "colorpicker",
-			"items": {
-				"type": "integer",
-				"minimum": 0,
-				"maximum": 255,
-				"default": 255
-			}
-		}
-	},
-	"additionalProperties": true
+  "type": "object",
+  "required": true,
+  "properties": {
+    "host": {
+      "type": "string",
+      "format": "hostname_or_ip4",
+      "title": "edt_dev_spec_targetIpHost_title",
+      "default": "127.0.0.1",
+      "propertyOrder": 1
+    },
+    "port": {
+      "type": "number",
+      "title": "edt_dev_spec_port_title",
+      "default": 7890,
+      "propertyOrder": 2
+    },
+    "latchTime": {
+      "type": "integer",
+      "title": "edt_dev_spec_latchtime_title",
+      "default": 0,
+      "append": "edt_append_ms",
+      "minimum": 0,
+      "maximum": 1000,
+      "access": "expert",
+      "propertyOrder": 3
+    },
+    "setFcConfig": {
+      "type": "boolean",
+      "title": "edt_dev_spec_FCsetConfig_title",
+      "default": false,
+      "propertyOrder": 4
+    },
+    "manualLed": {
+      "type": "boolean",
+      "title": "edt_dev_spec_FCmanualControl_title",
+      "default": false,
+      "options": {
+        "dependencies": {
+          "setFcConfig": true
+        }
+      },
+      "propertyOrder": 5
+    },
+    "ledOn": {
+      "type": "boolean",
+      "title": "edt_dev_spec_FCledToOn_title",
+      "default": false,
+      "options": {
+        "dependencies": {
+          "setFcConfig": true
+        }
+      },
+      "propertyOrder": 6
+    },
+    "interpolation": {
+      "type": "boolean",
+      "title": "edt_dev_spec_interpolation_title",
+      "default": false,
+      "options": {
+        "dependencies": {
+          "setFcConfig": true
+        }
+      },
+      "propertyOrder": 7
+    },
+    "dither": {
+      "type": "boolean",
+      "title": "edt_dev_spec_dithering_title",
+      "default": false,
+      "options": {
+        "dependencies": {
+          "setFcConfig": true
+        }
+      },
+      "propertyOrder": 8
+    },
+    "gamma": {
+      "type": "number",
+      "title": "edt_dev_spec_gamma_title",
+      "default": 1.0,
+      "minimum": 0.1,
+      "maximum": 5.0,
+      "options": {
+        "dependencies": {
+          "setFcConfig": true
+        }
+      },
+      "propertyOrder": 9
+    },
+    "whitepoint": {
+      "type": "array",
+      "title": "edt_dev_spec_whitepoint_title",
+      "options": {
+        "dependencies": {
+          "setFcConfig": true
+        }
+      },
+      "propertyOrder": 10,
+      "default": [ 255, 255, 255 ],
+      "maxItems": 3,
+      "minItems": 3,
+      "format": "colorpicker",
+      "items": {
+        "type": "integer",
+        "minimum": 0,
+        "maximum": 255,
+        "default": 255
+      }
+    }
+  },
+  "additionalProperties": true
 }
-
--- a/libsrc/leddevice/schemas/schema-h801.json
+++ b/libsrc/leddevice/schemas/schema-h801.json
@@ -1,38 +1,39 @@
 {
-	"type":"object",
-	"required":true,
-	"properties":{
-		"host" : {
-			"type": "string",
-			"title":"edt_dev_spec_targetIp_title",
-		    "default": "255.255.255.255",
-			"propertyOrder" : 1
-		},
-		"port" : {
-			"type": "integer",
-			"title":"edt_dev_spec_port_title",
-			"default": 30977,
-			"propertyOrder" : 2
-		},
-		"lightIds": {
-			"type": "array",
-			"title":"edt_dev_spec_lightid_title",
-			"items" : {
-				"type" : "string",
-				"title" : "edt_dev_spec_lightid_itemtitle"
-			},
-			"propertyOrder" : 3
-		},
-		"latchTime": {
-			"type": "integer",
-			"title":"edt_dev_spec_latchtime_title",
-			"default": 10,
-			"append" : "edt_append_ms",
-			"minimum": 0,
-			"maximum": 1000,
-			"access" : "expert",
-			"propertyOrder" : 4
-		}
-	},
-	"additionalProperties": true
+  "type": "object",
+  "required": true,
+  "properties": {
+    "host": {
+      "type": "string",
+      "format": "ipv4",
+      "title": "edt_dev_spec_targetIp_title",
+      "default": "255.255.255.255",
+      "propertyOrder": 1
+    },
+    "port": {
+      "type": "integer",
+      "title": "edt_dev_spec_port_title",
+      "default": 30977,
+      "propertyOrder": 2
+    },
+    "lightIds": {
+      "type": "array",
+      "title": "edt_dev_spec_lightid_title",
+      "items": {
+        "type": "string",
+        "title": "edt_dev_spec_lightid_itemtitle"
+      },
+      "propertyOrder": 3
+    },
+    "latchTime": {
+      "type": "integer",
+      "title": "edt_dev_spec_latchtime_title",
+      "default": 10,
+      "append": "edt_append_ms",
+      "minimum": 0,
+      "maximum": 1000,
+      "access": "expert",
+      "propertyOrder": 4
+    }
+  },
+  "additionalProperties": true
 }
--- a/libsrc/leddevice/schemas/schema-nanoleaf.json
+++ b/libsrc/leddevice/schemas/schema-nanoleaf.json
@@ -15,6 +15,7 @@
    },
    "host": {
      "type": "string",
+      "format": "hostname_or_ip",
      "title": "edt_dev_spec_targetIpHost_title",
      "options": {
        "infoText": "edt_dev_spec_targetIpHost_title_info"
--- a/libsrc/leddevice/schemas/schema-philipshue.json
+++ b/libsrc/leddevice/schemas/schema-philipshue.json
@@ -4,15 +4,25 @@
  "properties": {
    "host": {
      "type": "string",
-      "title": "edt_dev_spec_targetIp_title",
+      "format": "hostname_or_ip",
+      "title": "edt_dev_spec_targetIpHost_title",
      "default": "",
      "propertyOrder": 1
    },
+    "port": {
+      "type": "integer",
+      "title": "edt_dev_spec_port_title",
+      "default": 0,
+      "minimum": 0,
+      "maximum": 65535,
+      "access": "expert",
+      "propertyOrder": 2
+    },
    "username": {
      "type": "string",
      "title": "edt_dev_spec_username_title",
      "default": "",
-      "propertyOrder": 2
+      "propertyOrder": 3
    },
    "clientkey": {
      "type": "string",
@@ -23,13 +33,13 @@
          "useEntertainmentAPI": true
        }
      },
-      "propertyOrder": 3
+      "propertyOrder": 4
    },
    "useEntertainmentAPI": {
      "type": "boolean",
      "title": "edt_dev_spec_useEntertainmentAPI_title",
      "default": true,
-      "propertyOrder": 4
+      "propertyOrder": 5
    },
    "transitiontime": {
      "type": "number",
@@ -41,19 +51,19 @@
          "useEntertainmentAPI": false
        }
      },
-      "propertyOrder": 5
+      "propertyOrder": 6
    },
    "switchOffOnBlack": {
      "type": "boolean",
      "title": "edt_dev_spec_switchOffOnBlack_title",
      "default": false,
-      "propertyOrder": 6
+      "propertyOrder": 7
    },
    "restoreOriginalState": {
      "type": "boolean",
      "title": "edt_dev_spec_restoreOriginalState_title",
      "default": true,
-      "propertyOrder": 7
+      "propertyOrder": 8
    },
    "lightIds": {
      "type": "array",
@@ -71,7 +81,7 @@
          "useEntertainmentAPI": false
        }
      },
-      "propertyOrder": 8
+      "propertyOrder": 9
    },
    "groupId": {
      "type": "number",
@@ -82,7 +92,7 @@
          "useEntertainmentAPI": true
        }
      },
-      "propertyOrder": 9
+      "propertyOrder": 10
    },
    "blackLightsTimeout": {
      "type": "number",
@@ -98,7 +108,7 @@
          "useEntertainmentAPI": true
        }
      },
-      "propertyOrder": 10
+      "propertyOrder": 11
    },
    "brightnessThreshold": {
      "type": "number",
@@ -113,7 +123,7 @@
          "useEntertainmentAPI": true
        }
      },
-      "propertyOrder": 11
+      "propertyOrder": 12
    },
    "brightnessFactor": {
      "type": "number",
@@ -123,7 +133,7 @@
      "minimum": 0.5,
      "maximum": 10.0,
      "access": "advanced",
-      "propertyOrder": 12
+      "propertyOrder": 13
    },
    "brightnessMin": {
      "type": "number",
@@ -138,7 +148,7 @@
          "useEntertainmentAPI": true
        }
      },
-      "propertyOrder": 13
+      "propertyOrder": 14
    },
    "brightnessMax": {
      "type": "number",
@@ -153,7 +163,7 @@
          "useEntertainmentAPI": true
        }
      },
-      "propertyOrder": 14
+      "propertyOrder": 15
    },
    "sslReadTimeout": {
      "type": "number",
@@ -169,7 +179,7 @@
          "useEntertainmentAPI": true
        }
      },
-      "propertyOrder": 15
+      "propertyOrder": 16
    },
    "sslHSTimeoutMin": {
      "type": "number",
@@ -185,7 +195,7 @@
          "useEntertainmentAPI": true
        }
      },
-      "propertyOrder": 16
+      "propertyOrder": 17
    },
    "sslHSTimeoutMax": {
      "type": "number",
@@ -201,14 +211,14 @@
          "useEntertainmentAPI": true
        }
      },
-      "propertyOrder": 17
+      "propertyOrder": 18
    },
    "verbose": {
      "type": "boolean",
      "title": "edt_dev_spec_verbose_title",
      "default": false,
      "access": "expert",
-      "propertyOrder": 18
+      "propertyOrder": 19
    },
    "debugStreamer": {
      "type": "boolean",
@@ -220,7 +230,7 @@
          "useEntertainmentAPI": true
        }
      },
-      "propertyOrder": 19
+      "propertyOrder": 20
    },
    "debugLevel": {
      "type": "string",
@@ -236,7 +246,7 @@
      "minimum": 0,
      "maximum": 4,
      "access": "expert",
-      "propertyOrder": 20
+      "propertyOrder": 21
    }
  },
  "additionalProperties": true
--- a/libsrc/leddevice/schemas/schema-tinkerforge.json
+++ b/libsrc/leddevice/schemas/schema-tinkerforge.json
@@ -2,11 +2,12 @@
 	"type":"object",
 	"required":true,
 	"properties":{
-		"output": {
+		"host": {
 			"type": "string",
-			"title":"edt_dev_spec_targetIp_title",
-			"default" : "127.0.0.1",
-			"propertyOrder" : 1
+			"format": "hostname_or_ip",
+			"title": "edt_dev_spec_targetIpHost_title",
+			"default": "127.0.0.1",
+			"propertyOrder": 1
 		},
 		"port": {
 			"type": "integer",
--- a/libsrc/leddevice/schemas/schema-tpm2net.json
+++ b/libsrc/leddevice/schemas/schema-tpm2net.json
@@ -1,37 +1,38 @@
 {
-	"type":"object",
-	"required":true,
-	"properties":{
-		"host" : {
-			"type": "string",
-			"title":"edt_dev_spec_targetIpHost_title",
-			"propertyOrder" : 1
-		},
-		"port": {
-			"type": "integer",
-			"title":"edt_dev_spec_port_title",
-			"minimum" : 0,
-			"maximum" : 65535,
-			"default" : 50200,
-			"propertyOrder" : 2
-		},
-		"max-packet": {
-			"type": "integer",
-			"title":"edt_dev_spec_maxPacket_title",
-			"minimum" : 0,
-			"default" : 170,
-			"propertyOrder" : 3
-		},
-		"latchTime": {
-			"type": "integer",
-			"title":"edt_dev_spec_latchtime_title",
-			"default": 0,
-			"append" : "edt_append_ms",
-			"minimum": 0,
-			"maximum": 1000,
-			"access" : "expert",
-			"propertyOrder" : 4
-		}
-	},
-	"additionalProperties": true
+  "type": "object",
+  "required": true,
+  "properties": {
+    "host": {
+      "type": "string",
+      "format": "hostname_or_ip",
+      "title": "edt_dev_spec_targetIpHost_title",
+      "propertyOrder": 1
+    },
+    "port": {
+      "type": "integer",
+      "title": "edt_dev_spec_port_title",
+      "minimum": 0,
+      "maximum": 65535,
+      "default": 50200,
+      "propertyOrder": 2
+    },
+    "max-packet": {
+      "type": "integer",
+      "title": "edt_dev_spec_maxPacket_title",
+      "minimum": 0,
+      "default": 170,
+      "propertyOrder": 3
+    },
+    "latchTime": {
+      "type": "integer",
+      "title": "edt_dev_spec_latchtime_title",
+      "default": 0,
+      "append": "edt_append_ms",
+      "minimum": 0,
+      "maximum": 1000,
+      "access": "expert",
+      "propertyOrder": 4
+    }
+  },
+  "additionalProperties": true
 }
--- a/libsrc/leddevice/schemas/schema-udpraw.json
+++ b/libsrc/leddevice/schemas/schema-udpraw.json
@@ -1,30 +1,31 @@
 {
-	"type":"object",
-	"required":true,
-	"properties":{
-		"host" : {
-			"type": "string",
-			"title":"edt_dev_spec_targetIp_title",
-			"propertyOrder" : 1
-		},
-		"port" : {
-			"type": "integer",
-			"title":"edt_dev_spec_port_title",
-			"default": 5568,
-			"minimum" : 0,
-			"maximum" : 65535,
-			"propertyOrder" : 2
-		},
-		"latchTime": {
-			"type": "integer",
-			"title":"edt_dev_spec_latchtime_title",
-			"default": 0,
-			"append" : "edt_append_ms",
-			"minimum": 0,
-			"maximum": 1000,
-			"access" : "expert",
-			"propertyOrder" : 3
-		}
-	},
-	"additionalProperties": true
+  "type": "object",
+  "required": true,
+  "properties": {
+    "host": {
+      "type": "string",
+      "title": "edt_dev_spec_targetIpHost_title",
+      "format": "hostname_or_ip",
+      "propertyOrder": 1
+    },
+    "port": {
+      "type": "integer",
+      "title": "edt_dev_spec_port_title",
+      "default": 5568,
+      "minimum": 0,
+      "maximum": 65535,
+      "propertyOrder": 2
+    },
+    "latchTime": {
+      "type": "integer",
+      "title": "edt_dev_spec_latchtime_title",
+      "default": 0,
+      "append": "edt_append_ms",
+      "minimum": 0,
+      "maximum": 1000,
+      "access": "expert",
+      "propertyOrder": 3
+    }
+  },
+  "additionalProperties": true
 }
--- a/libsrc/leddevice/schemas/schema-wled.json
+++ b/libsrc/leddevice/schemas/schema-wled.json
@@ -16,6 +16,7 @@
    },
    "host": {
      "type": "string",
+      "format": "hostname_or_ip4",
      "title": "edt_dev_spec_targetIpHost_title",
      "options": {
        "infoText": "edt_dev_spec_targetIpHost_title_info"
--- a/libsrc/leddevice/schemas/schema-yeelight.json
+++ b/libsrc/leddevice/schemas/schema-yeelight.json
@@ -112,8 +112,9 @@
        "properties": {
          "host": {
            "type": "string",
+            "format": "hostname_or_ip",
            "minLength": 7,
-            "title": "edt_dev_spec_networkDeviceName_title",
+            "title": "edt_dev_spec_targetIpHost_title",
            "required": true,
            "propertyOrder": 1
          },
@@ -122,7 +123,7 @@
            "minimum": 0,
            "maximum": 65535,
            "default": 55443,
-            "title": "edt_dev_spec_networkDevicePort_title",
+            "title": "edt_dev_spec_port_title",
            "required": false,
            "access": "expert",
            "propertyOrder": 2