mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
e9936e131b
* 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>
171 lines
5.4 KiB
C++
171 lines
5.4 KiB
C++
#ifndef MDNS_BROWSER_H
|
|
#define MDNS_BROWSER_H
|
|
|
|
#include <chrono>
|
|
#include <type_traits>
|
|
|
|
#include <qmdnsengine/server.h>
|
|
#include <qmdnsengine/service.h>
|
|
|
|
#include <qmdnsengine/browser.h>
|
|
#include <qmdnsengine/cache.h>
|
|
#include <qmdnsengine/resolver.h>
|
|
#include <qmdnsengine/dns.h>
|
|
#include <qmdnsengine/record.h>
|
|
|
|
// Qt includes
|
|
#include <QObject>
|
|
#include <QByteArray>
|
|
|
|
// Utility includes
|
|
#include <utils/Logger.h>
|
|
|
|
namespace {
|
|
constexpr std::chrono::milliseconds DEFAULT_DISCOVER_TIMEOUT{ 500 };
|
|
constexpr std::chrono::milliseconds DEFAULT_ADDRESS_RESOLVE_TIMEOUT{ 1000 };
|
|
|
|
} //End of constants
|
|
|
|
class MdnsBrowser : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
// Run MdnsBrowser as singleton
|
|
|
|
private:
|
|
///
|
|
/// @brief Browse for hyperion services in bonjour, constructed from HyperionDaemon
|
|
/// Searching for hyperion http service by default
|
|
///
|
|
// Run MdnsBrowser as singleton
|
|
MdnsBrowser(QObject* parent = nullptr);
|
|
~MdnsBrowser() override;
|
|
|
|
public:
|
|
|
|
static MdnsBrowser& getInstance()
|
|
{
|
|
static MdnsBrowser* instance = new MdnsBrowser();
|
|
return *instance;
|
|
}
|
|
|
|
MdnsBrowser(const MdnsBrowser&) = delete;
|
|
MdnsBrowser(MdnsBrowser&&) = delete;
|
|
MdnsBrowser& operator=(const MdnsBrowser&) = delete;
|
|
MdnsBrowser& operator=(MdnsBrowser&&) = delete;
|
|
|
|
QMdnsEngine::Service getFirstService(const QByteArray& serviceType, const QString& filter = ".*", const std::chrono::milliseconds waitTime = DEFAULT_DISCOVER_TIMEOUT) const;
|
|
QJsonArray getServicesDiscoveredJson(const QByteArray& serviceType, const QString& filter = ".*", const std::chrono::milliseconds waitTime = std::chrono::milliseconds{ 0 }) const;
|
|
|
|
|
|
void printCache(const QByteArray& name = QByteArray(), quint16 type = QMdnsEngine::ANY) const;
|
|
|
|
public slots:
|
|
|
|
///
|
|
/// @brief Browse for a service of type
|
|
///
|
|
void browseForServiceType(const QByteArray& serviceType);
|
|
|
|
QHostAddress getHostFirstAddress(const QByteArray& hostname);
|
|
|
|
void onHostNameResolved(const QHostAddress& address);
|
|
|
|
QMdnsEngine::Record getServiceInstanceRecord(const QByteArray& serviceInstance, const std::chrono::milliseconds waitTime = DEFAULT_DISCOVER_TIMEOUT) const;
|
|
|
|
bool resolveAddress(Logger* log, const QString& hostname, QHostAddress& hostAddress, std::chrono::milliseconds timeout = DEFAULT_ADDRESS_RESOLVE_TIMEOUT);
|
|
|
|
Q_SIGNALS:
|
|
|
|
/**
|
|
* @brief Indicate that the specified service was updated
|
|
*
|
|
* This signal is emitted when the SRV record for a service (identified by
|
|
* its name and type) or a TXT record has changed.
|
|
*/
|
|
void serviceFound(const QMdnsEngine::Service& service);
|
|
|
|
/**
|
|
* @brief Indicate that the specified service was removed
|
|
*
|
|
* This signal is emitted when an essential record (PTR or SRV) is
|
|
* expiring from the cache. This will also occur when an updated PTR or
|
|
* SRV record is received with a TTL of 0.
|
|
*/
|
|
void serviceRemoved(const QMdnsEngine::Service& service);
|
|
|
|
void addressResolved(const QHostAddress address);
|
|
|
|
private slots:
|
|
|
|
void onServiceAdded(const QMdnsEngine::Service& service);
|
|
void onServiceUpdated(const QMdnsEngine::Service& service);
|
|
void onServiceRemoved(const QMdnsEngine::Service& service);
|
|
|
|
private:
|
|
|
|
// template <typename Func1, typename Func2, typename std::enable_if_t<std::is_member_pointer<Func2>::value, int> = 0>
|
|
// static inline QMetaObject::Connection weakConnect(typename QtPrivate::FunctionPointer<Func1>::Object* sender,
|
|
// Func1 signal,
|
|
// typename QtPrivate::FunctionPointer<Func2>::Object* receiver,
|
|
// Func2 slot)
|
|
// {
|
|
// QMetaObject::Connection conn_normal = QObject::connect(sender, signal, receiver, slot);
|
|
|
|
// QMetaObject::Connection* conn_delete = new QMetaObject::Connection();
|
|
|
|
// *conn_delete = QObject::connect(sender, signal, [conn_normal, conn_delete]() {
|
|
// QObject::disconnect(conn_normal);
|
|
// QObject::disconnect(*conn_delete);
|
|
// delete conn_delete;
|
|
// });
|
|
// return conn_normal;
|
|
// }
|
|
|
|
template <typename Func1, typename Func2, typename std::enable_if_t<!std::is_member_pointer<Func2>::value, int> = 0>
|
|
static inline QMetaObject::Connection weakConnect(typename QtPrivate::FunctionPointer<Func1>::Object* sender,
|
|
Func1 signal,
|
|
Func2 slot)
|
|
{
|
|
QMetaObject::Connection conn_normal = QObject::connect(sender, signal, slot);
|
|
|
|
QMetaObject::Connection* conn_delete = new QMetaObject::Connection();
|
|
|
|
*conn_delete = QObject::connect(sender, signal, [conn_normal, conn_delete]() {
|
|
QObject::disconnect(conn_normal);
|
|
QObject::disconnect(*conn_delete);
|
|
delete conn_delete;
|
|
});
|
|
return conn_normal;
|
|
}
|
|
|
|
// template <typename Func1, typename Func2, typename std::enable_if_t<!std::is_member_pointer<Func2>::value, int> = 0>
|
|
// static inline QMetaObject::Connection weakConnect(typename QtPrivate::FunctionPointer<Func1>::Object* sender,
|
|
// Func1 signal,
|
|
// typename QtPrivate::FunctionPointer<Func2>::Object* receiver,
|
|
// Func2 slot)
|
|
// {
|
|
// Q_UNUSED(receiver);
|
|
// QMetaObject::Connection conn_normal = QObject::connect(sender, signal, slot);
|
|
|
|
// QMetaObject::Connection* conn_delete = new QMetaObject::Connection();
|
|
|
|
// *conn_delete = QObject::connect(sender, signal, [conn_normal, conn_delete]() {
|
|
// QObject::disconnect(conn_normal);
|
|
// QObject::disconnect(*conn_delete);
|
|
// delete conn_delete;
|
|
// });
|
|
// return conn_normal;
|
|
// }
|
|
|
|
/// The logger instance for mDNS-Service
|
|
Logger* _log;
|
|
|
|
QMdnsEngine::Server _server;
|
|
QMdnsEngine::Cache _cache;
|
|
|
|
QMap<QByteArray, QMdnsEngine::Browser*> _browsedServiceTypes;
|
|
};
|
|
|
|
#endif // MDNSBROWSER_H
|