mDNS Support (#1452)

* Allow build, if no grabbers are enabled * Align available functions to right Qt version * Update to next development version * Align available functions to right Qt version * fix workflows (apt/nightly) * Disable QNetworkConfigurationManager deprecation warnings * Initial go on Smart Pointers * Add Deallocation * Correct QT_WARNING_DISABLE_DEPRECATED (available since 5.9) * Cluster Build Variables * Hyperion Light * Address build warnings * Hyperion Light - UI * Update Protobuf to latest master * Removed compiler warnings * Added restart ability to systray * Correct Protobuf * Ignore 'no-return' warning on protobuf build * hyperion-remote: Fix auto discovery of hyperion server * Fix Qt version override * Update changelog * Remove Grabber Components, if no Grabber exists * Standalone Grabber - Fix fps default * Remote Control - Have Source Selction accrosswhole screen * Enable Blackborder detection only, if relevant input sources available * Enable Blackborder detection only, if relevant input sources available * Remote UI - rearrange containers * Checkout * Fix compilation on windows * Re-added qmdnsengine template cmake * chrono added for linux * Removed existing AVAHI/Bonjour, allow to enable/disable mDNS * hyperiond macos typo fix * Fix macOS Bundle build * Fix macOS bundle info details * Correct CMake files * Removed existing AVAHI/Bonjour (2) * Share hyperion's services via mDNS * Add mDNS Browser and mDNS for LED-Devices * Support mDNS discovery for standalone grabbers * Remove ZLib Dependency & Cleanup * mDNS - hanle 2.local2 an ".local." domains equally * Hue - Link discovery to bridge class, workaround port 443 for mDNS discovery * Fix save button state when switching between devices * Removed sessions (of other hyperions) * mDNS Publisher - Simplify service naming * mDNS refactoring & Forwarder discovery * mDNS Updates to use device service name * Consistency of standalone grabbers with mDNS Service Registry * Merge branch 'hyperion-project:master' into mDNS * Start JSON and WebServers only after Instance 0 is available * Remove bespoke qDebug Output again * MDNS updates and refactor Forwarder * Minor updates * Upgrade to CMake 3.1 * typo * macOS fix * Correct merge * - Remove dynamic linker flag from standalone dispmanX Grabber - Added ability to use system qmdns libs * Cec handler library will load at runtime * typo fix * protobuf changes * mDNS changes for Windows/macOS * test window build qmdnsengine * absolute path to protobuf cmake dir * Rework Hue Wizard supporting mDNS * LED-Devices - Retry support + Refactoring (excl. Hue) * LED-Devices - Refactoring/Retry support Hue + additional alignments * Address LGTM findings * Fix CI-Build, revert test changes * Build Windows in Release mode to avoid python problem * Correct that WebServerObject is available earlier * Ensure that instance name in logs for one instance are presented * Update content LEDs * Rework mDNS Address lookup * Fix LED UI * Fix for non mDNS Services (ignore default port) * Disbale device when now input is available * Revert back some updates, ensure last color is updated when switched on * Handle reopening case and changed IP, port for API-calls * Add UPD-DDP Device * WLED support for DDP * Fix printout * LEDDevice - Allow more retries, udapte defaults * LED-Net Devices - Select Custom device, if configured Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> Co-authored-by: Paulchen Panther <Paulchen-Panter@protonmail.com>
2025-03-01 10:33:28 +00:00 · 2022-05-01 19:42:47 +02:00
parent 3ef4ebc1a4
commit e9936e131b
148 changed files with 5885 additions and 4459 deletions
--- a/libsrc/leddevice/dev_net/LedDeviceYeelight.cpp
+++ b/libsrc/leddevice/dev_net/LedDeviceYeelight.cpp
@@ -1,7 +1,7 @@
-#include "LedDeviceYeelight.h"
+#include "LedDeviceYeelight.h"

-#include <ssdp/SSDPDiscover.h>
-#include <utils/QStringUtils.h>
+#include <chrono>
+#include <thread>

 // Qt includes
 #include <QEventLoop>
@@ -11,8 +11,15 @@
 #include <QColor>
 #include <QDateTime>

-#include <chrono>
-#include <thread>
+#include <ssdp/SSDPDiscover.h>
+#include <utils/QStringUtils.h>
+
+// mDNS discover
+#ifdef ENABLE_MDNS
+#include <mdns/MdnsBrowser.h>
+#include <mdns/MdnsServiceRegister.h>
+#endif
+#include <utils/NetUtils.h>

 // Constants
 namespace {
@@ -28,6 +35,9 @@ constexpr std::chrono::milliseconds CONNECT_STREAM_TIMEOUT{1000}; // device stre
 const bool TEST_CORRELATION_IDS  = false; //Ignore, if yeelight sends responses in different order as request commands

 // Configuration settings
+const char CONFIG_HOST[] = "host";
+const char CONFIG_PORT[] = "port";
+
 const char CONFIG_LIGHTS [] = "lights";

 const char CONFIG_COLOR_MODEL [] = "colorModel";
@@ -111,7 +121,6 @@ YeelightLight::YeelightLight( Logger *log, const QString &hostname, quint16 port
 	  ,_isInMusicMode(false)
 {
 	_name = hostname;
-
 }

 YeelightLight::~YeelightLight()
@@ -151,25 +160,29 @@ bool YeelightLight::open()
 	}
 	else
 	{
-		_tcpSocket->connectToHost( _host, _port);
-
-		if ( _tcpSocket->waitForConnected( CONNECT_TIMEOUT.count() ) )
+		QHostAddress address;
+		if (NetUtils::resolveHostToAddress(_log, _host, address))
 		{
-			if ( _tcpSocket->state() != QAbstractSocket::ConnectedState )
+			_tcpSocket->connectToHost( address.toString(), _port);
+
+			if ( _tcpSocket->waitForConnected( CONNECT_TIMEOUT.count() ) )
+			{
+				if ( _tcpSocket->state() != QAbstractSocket::ConnectedState )
+				{
+					this->setInError( _tcpSocket->errorString() );
+					rc = false;
+				}
+				else
+				{
+					log (2,"open()","Successfully opened Yeelight: %s", QSTRING_CSTR(_host));
+					rc = true;
+				}
+			}
+			else
 			{
 				this->setInError( _tcpSocket->errorString() );
 				rc = false;
 			}
-			else
-			{
-				log (2,"open()","Successfully opened Yeelight: %s", QSTRING_CSTR(_host));
-				rc = true;
-			}
-		}
-		else
-		{
-			this->setInError( _tcpSocket->errorString() );
-			rc = false;
 		}
 	}
 	return rc;
@@ -1006,6 +1019,10 @@ LedDeviceYeelight::LedDeviceYeelight(const QJsonObject &deviceConfig)
 	  ,_debuglevel(0)
 	  ,_musicModeServerPort(-1)
 {
+#ifdef ENABLE_MDNS
+	QMetaObject::invokeMethod(&MdnsBrowser::getInstance(), "browseForServiceType",
+							   Qt::QueuedConnection, Q_ARG(QByteArray, MdnsServiceRegister::getServiceType(_activeDeviceType)));
+#endif
 }

 LedDeviceYeelight::~LedDeviceYeelight()
@@ -1034,12 +1051,6 @@ bool LedDeviceYeelight::init(const QJsonObject &deviceConfig)

 	if ( LedDevice::init(deviceConfig) )
 	{
-		Debug(_log, "DeviceType        : %s", QSTRING_CSTR( this->getActiveDeviceType() ));
-		Debug(_log, "LedCount          : %d", this->getLedCount());
-		Debug(_log, "ColorOrder        : %s", QSTRING_CSTR( this->getColorOrder() ));
-		Debug(_log, "RewriteTime  : %d", this->getRewriteTime());
-		Debug(_log, "LatchTime         : %d", this->getLatchTime());
-
 		//Get device specific configuration

 		if ( deviceConfig[ CONFIG_COLOR_MODEL ].isString() )
@@ -1102,8 +1113,9 @@ bool LedDeviceYeelight::init(const QJsonObject &deviceConfig)
 		int configuredYeelightsCount = 0;
 		for (const QJsonValueRef light : configuredYeelightLights)
 		{
-			QString hostName = light.toObject().value("host").toString();
-			int port = light.toObject().value("port").toInt(API_DEFAULT_PORT);
+			QString hostName = light.toObject().value(CONFIG_HOST).toString();
+			int port = light.toObject().value(CONFIG_PORT).toInt(API_DEFAULT_PORT);
+
 			if ( !hostName.isEmpty() )
 			{
 				QString name = light.toObject().value("name").toString();
@@ -1133,9 +1145,8 @@ bool LedDeviceYeelight::init(const QJsonObject &deviceConfig)
 			_lightsAddressList.clear();
 			for (int j = 0; j < static_cast<int>( configuredLedCount ); ++j)
 			{
-				QString hostName = configuredYeelightLights[j].toObject().value("host").toString();
-				int port = configuredYeelightLights[j].toObject().value("port").toInt(API_DEFAULT_PORT);
-
+				QString hostName = configuredYeelightLights[j].toObject().value(CONFIG_HOST).toString();
+				int port = configuredYeelightLights[j].toObject().value(CONFIG_PORT).toInt(API_DEFAULT_PORT);
 				_lightsAddressList.append( { hostName, port} );
 			}

@@ -1160,13 +1171,10 @@ bool LedDeviceYeelight::startMusicModeServer()

 	if ( ! _tcpMusicModeServer->isListening() )
 	{
-		if (! _tcpMusicModeServer->listen())
+		if (! _tcpMusicModeServer->listen(QHostAddress::AnyIPv4))
 		{
-			QString errorReason = QString ("(%1) %2").arg(_tcpMusicModeServer->serverError()).arg( _tcpMusicModeServer->errorString());
-			Error( _log, "Error: MusicModeServer: %s", QSTRING_CSTR(errorReason));
+			QString errorReason = QString ("Failed to start music mode server: (%1) %2").arg(_tcpMusicModeServer->serverError()).arg( _tcpMusicModeServer->errorString());
 			this->setInError ( errorReason );
-
-			Error( _log, "Failed to start music mode server");
 		}
 		else
 		{
@@ -1182,12 +1190,14 @@ bool LedDeviceYeelight::startMusicModeServer()
 			}
 			if (_musicModeServerAddress.isNull())
 			{
-				Error(_log, "Failed to resolve IP for music mode server");
+				_tcpMusicModeServer->close();
+				QString errorReason = QString ("Network error - failed to resolve IP for music mode server");
+				this->setInError ( errorReason );
 			}
 		}
 	}

-	if ( _tcpMusicModeServer->isListening() )
+	if ( !_isDeviceInError && _tcpMusicModeServer->isListening() )
 	{
 		_musicModeServerPort = _tcpMusicModeServer->serverPort();
 		Debug (_log, "The music mode server is running at %s:%d", QSTRING_CSTR(_musicModeServerAddress.toString()), _musicModeServerPort);
@@ -1391,10 +1401,21 @@ QJsonObject LedDeviceYeelight::discover(const QJsonObject& /*params*/)
 	QJsonObject devicesDiscovered;
 	devicesDiscovered.insert("ledDeviceType", _activeDeviceType );

-	QString discoveryMethod("ssdp");
 	QJsonArray deviceList;
-	deviceList = discover();

+#ifdef ENABLE_MDNS
+	QString discoveryMethod("mDNS");
+	deviceList = MdnsBrowser::getInstance().getServicesDiscoveredJson(
+		MdnsServiceRegister::getServiceType(_activeDeviceType),
+		MdnsServiceRegister::getServiceNameFilter(_activeDeviceType),
+		DEFAULT_DISCOVER_TIMEOUT
+		);
+#else
+	QString discoveryMethod("ssdp");
+	deviceList = discover();
+#endif
+
+	devicesDiscovered.insert("discoveryMethod", discoveryMethod);
 	devicesDiscovered.insert("devices", deviceList);

 	DebugIf(verbose,_log, "devicesDiscovered: [%s]", QString(QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact)).toUtf8().constData() );
@@ -1407,21 +1428,22 @@ QJsonObject LedDeviceYeelight::getProperties(const QJsonObject& params)
 	DebugIf(verbose,_log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData() );
 	QJsonObject properties;

-	QString hostName = params["hostname"].toString("");
-	quint16 apiPort = static_cast<quint16>( params["port"].toInt(API_DEFAULT_PORT) );
+	QString hostName = params[CONFIG_HOST].toString("");
+	quint16 apiPort = static_cast<quint16>( params[CONFIG_PORT].toInt(API_DEFAULT_PORT) );

-	if ( !hostName.isEmpty() )
+	Info(_log, "Get properties for %s, hostname (%s)", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(hostName) );
+
+	QHostAddress address;
+	if (NetUtils::resolveHostToAddress(_log, hostName, address))
 	{
-		YeelightLight yeelight(_log, hostName, apiPort);
-
-		//yeelight.setDebuglevel(3);
+		YeelightLight yeelight(_log, address.toString(), apiPort);
 		if ( yeelight.open() )
 		{
 			properties.insert("properties", yeelight.getProperties());
 			yeelight.close();
 		}
 	}
-	Debug(_log, "properties: [%s]", QString(QJsonDocument(properties).toJson(QJsonDocument::Compact)).toUtf8().constData() );
+	DebugIf(verbose, _log, "properties: [%s]", QString(QJsonDocument(properties).toJson(QJsonDocument::Compact)).toUtf8().constData() );

 	return properties;
 }
@@ -1430,15 +1452,15 @@ void LedDeviceYeelight::identify(const QJsonObject& params)
 {
 	DebugIf(verbose,_log,  "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData() );

-	QString hostName = params["hostname"].toString("");
-	quint16 apiPort = static_cast<quint16>( params["port"].toInt(API_DEFAULT_PORT) );
-	Debug (_log, "apiHost [%s], apiPort [%d]", QSTRING_CSTR(hostName), apiPort);
+	QString hostName = params[CONFIG_HOST].toString("");
+	quint16 apiPort = static_cast<quint16>( params[CONFIG_PORT].toInt(API_DEFAULT_PORT) );

-	if ( !hostName.isEmpty() )
+	Info(_log, "Identify %s, hostname (%s)", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(hostName) );
+
+	QHostAddress address;
+	if (NetUtils::resolveHostToAddress(_log, hostName, address))
 	{
-		YeelightLight yeelight(_log, hostName, apiPort);
-		//yeelight.setDebuglevel(3);
-
+		YeelightLight yeelight(_log, address.toString(), apiPort);
 		if ( yeelight.open() )
 		{
 			yeelight.identify();