frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

mDNS Support (#1452)

Browse Source 
* 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>
This commit is contained in:
LordGrey
2022-05-01 19:42:47 +02:00
committed by GitHub
parent 3ef4ebc1a4
commit e9936e131b
148 changed files with 5885 additions and 4459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/hyperion-remote/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.0)
cmake_minimum_required(VERSION 3.1.0)
project(hyperion-remote)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Widgets REQUIRED)
@@ -32,7 +32,6 @@ add_executable(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
commandline
hyperion-utils
ssdp
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::Network
Qt${QT_VERSION_MAJOR}::Widgets
@@ -44,6 +43,12 @@ if (ENABLE_AMLOGIC)
)
endif()
if(ENABLE_MDNS)
target_link_libraries(${PROJECT_NAME} mdns)
else()
target_link_libraries(${PROJECT_NAME} ssdp)
endif()
if(ENABLE_EFFECTENGINE)
target_link_libraries(${PROJECT_NAME} effectengine)
endif()

4
src/hyperion-remote/JsonConnection.h
View File

@@ -9,7 +9,7 @@
//forward class decl
class Logger;
const int JSON_DEFAULT_PORT = 19444;
const int JSONAPI_DEFAULT_PORT = 19444;
///
/// Connection class to setup an connection to the hyperion server and execute commands
@@ -24,7 +24,7 @@ public:
/// @param address The port of the Hyperion JSON-server (default port = 19444)
/// @param printJson Boolean indicating if the sent and received json is written to stdout
///
JsonConnection(const QString& host, bool printJson, quint16 port = JSON_DEFAULT_PORT);
JsonConnection(const QString& host, bool printJson, quint16 port = JSONAPI_DEFAULT_PORT);
///
/// Destructor

74
src/hyperion-remote/hyperion-remote.cpp
View File

@@ -9,18 +9,34 @@
#include <QCoreApplication>
#include <QLocale>
#include <utils/Logger.h>
#include "HyperionConfig.h"
#include <commandline/Parser.h>
#ifdef ENABLE_MDNS
// mDNS discover
#include <mdns/MdnsBrowser.h>
#include <mdns/MdnsServiceRegister.h>
#else
// ssdp discover
#include <ssdp/SSDPDiscover.h>
#endif
#include <utils/NetUtils.h>
// hyperion-remote include
#include "JsonConnection.h"
// ssdp discover
#include <ssdp/SSDPDiscover.h>
#include <utils/NetUtils.h>
#include <utils/DefaultSignalHandler.h>
// Constants
namespace {
const char SERVICE_TYPE[] = "jsonapi";
} //End of constants
using namespace commandline;
/// Count the number of true values in a list of booleans
@@ -38,10 +54,10 @@ int count(std::initializer_list<bool> values)
void showHelp(Option & option){
QString shortOption;
QString longOption = QString("--%1").arg(option.names().last());
QString longOption = QString("--%1").arg(option.names().constLast());
if(option.names().size() == 2){
shortOption = QString("-%1").arg(option.names().first());
shortOption = QString("-%1").arg(option.names().constFirst());
}
qWarning() << qPrintable(QString("\t%1\t%2\t%3").arg(shortOption, longOption, option.description()));
@@ -51,7 +67,7 @@ int getInstaneIdbyName(const QJsonObject & reply, const QString & name){
if(reply.contains("instance")){
QJsonArray list = reply.value("instance").toArray();
for (const QJsonValueRef entry : list) {
for ( const auto &entry : qAsConst(list) ) {
const QJsonObject obj = entry.toObject();
if(obj["friendly_name"] == name && obj["running"].toBool())
{
@@ -65,10 +81,6 @@ int getInstaneIdbyName(const QJsonObject & reply, const QString & name){
int main(int argc, char * argv[])
{
#ifndef _WIN32
setenv("AVAHI_COMPAT_NOWARN", "1", 1);
#endif
Logger* log = Logger::getInstance("REMOTE");
Logger::setLogLevel(Logger::INFO);
@@ -204,28 +216,34 @@ int main(int argc, char * argv[])
showHelp(argYAdjust);
return 1;
}
// server searching by ssdp
QString address = argAddress.value(parser);
if(address == "127.0.0.1" || address == "127.0.0.1:19444")
{
SSDPDiscover discover;
address = discover.getFirstService(searchType::STY_JSONSERVER);
if(address.isEmpty())
{
address = argAddress.value(parser);
}
}
// Resolve hostname and port (or use default port)
QString host;
quint16 port{ JSON_DEFAULT_PORT };
QString serviceName{ QHostInfo::localHostName() };
int port{ JSONAPI_DEFAULT_PORT };
if (!NetUtils::resolveHostPort(address, host, port))
// Split hostname and port (or use default port)
QString givenAddress = argAddress.value(parser);
if (!NetUtils::resolveHostPort(givenAddress, host, port))
{
throw std::runtime_error(QString("Wrong address: unable to parse address (%1)").arg(address).toStdString());
throw std::runtime_error(QString("Wrong address: unable to parse address (%1)").arg(givenAddress).toStdString());
}
// Search available Hyperion services via mDNS, if default/localhost IP is given
if (host == "127.0.0.1" || host == "::1")
{
#ifndef ENABLE_MDNS
SSDPDiscover discover;
host = discover.getFirstService(searchType::STY_FLATBUFSERVER);
#endif
QHostAddress address;
if (!NetUtils::resolveHostToAddress(log, host, address, port))
{
throw std::runtime_error(QString("Address could not be resolved for hostname: %2").arg(QSTRING_CSTR(host)).toStdString());
}
host = address.toString();
}
Info(log, "Connecting to Hyperion host: %s, port: %u using service: %s", QSTRING_CSTR(host), port, QSTRING_CSTR(serviceName));
// create the connection to the hyperion server
JsonConnection connection(host, parser.isSet(argPrint), port);