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>
128 lines
3.2 KiB
C++
128 lines
3.2 KiB
C++
#include "ProtoClientConnection.h"
|
|
#include <protoserver/ProtoServer.h>
|
|
|
|
// util
|
|
#include <utils/NetOrigin.h>
|
|
#include <utils/GlobalSignals.h>
|
|
|
|
// qt
|
|
#include <QJsonObject>
|
|
#include <QTcpServer>
|
|
#include <QTcpSocket>
|
|
|
|
// Constants
|
|
namespace {
|
|
|
|
const char SERVICE_TYPE[] = "protobuffer";
|
|
|
|
} //End of constants
|
|
|
|
ProtoServer::ProtoServer(const QJsonDocument& config, QObject* parent)
|
|
: QObject(parent)
|
|
, _server(new QTcpServer(this))
|
|
, _log(Logger::getInstance("PROTOSERVER"))
|
|
, _timeout(5000)
|
|
, _config(config)
|
|
{
|
|
|
|
}
|
|
|
|
ProtoServer::~ProtoServer()
|
|
{
|
|
stopServer();
|
|
delete _server;
|
|
}
|
|
|
|
void ProtoServer::initServer()
|
|
{
|
|
_netOrigin = NetOrigin::getInstance();
|
|
connect(_server, &QTcpServer::newConnection, this, &ProtoServer::newConnection);
|
|
|
|
// apply config
|
|
handleSettingsUpdate(settings::PROTOSERVER, _config);
|
|
}
|
|
|
|
void ProtoServer::handleSettingsUpdate(settings::type type, const QJsonDocument& config)
|
|
{
|
|
if(type == settings::PROTOSERVER)
|
|
{
|
|
const QJsonObject& obj = config.object();
|
|
|
|
quint16 port = obj["port"].toInt(19445);
|
|
|
|
// port check
|
|
if(_server->serverPort() != port)
|
|
{
|
|
stopServer();
|
|
_port = port;
|
|
}
|
|
|
|
// new timeout just for new connections
|
|
_timeout = obj["timeout"].toInt(5000);
|
|
// enable check
|
|
obj["enable"].toBool(true) ? startServer() : stopServer();
|
|
}
|
|
}
|
|
|
|
void ProtoServer::newConnection()
|
|
{
|
|
while(_server->hasPendingConnections())
|
|
{
|
|
if(QTcpSocket * socket = _server->nextPendingConnection())
|
|
{
|
|
if(_netOrigin->accessAllowed(socket->peerAddress(), socket->localAddress()))
|
|
{
|
|
Debug(_log, "New connection from %s", QSTRING_CSTR(socket->peerAddress().toString()));
|
|
ProtoClientConnection * client = new ProtoClientConnection(socket, _timeout, this);
|
|
// internal
|
|
connect(client, &ProtoClientConnection::clientDisconnected, this, &ProtoServer::clientDisconnected);
|
|
connect(client, &ProtoClientConnection::registerGlobalInput, GlobalSignals::getInstance(), &GlobalSignals::registerGlobalInput);
|
|
connect(client, &ProtoClientConnection::clearGlobalInput, GlobalSignals::getInstance(), &GlobalSignals::clearGlobalInput);
|
|
connect(client, &ProtoClientConnection::setGlobalInputImage, GlobalSignals::getInstance(), &GlobalSignals::setGlobalImage);
|
|
connect(client, &ProtoClientConnection::setGlobalInputColor, GlobalSignals::getInstance(), &GlobalSignals::setGlobalColor);
|
|
connect(GlobalSignals::getInstance(), &GlobalSignals::globalRegRequired, client, &ProtoClientConnection::registationRequired);
|
|
_openConnections.append(client);
|
|
}
|
|
else
|
|
socket->close();
|
|
}
|
|
}
|
|
}
|
|
|
|
void ProtoServer::clientDisconnected()
|
|
{
|
|
ProtoClientConnection* client = qobject_cast<ProtoClientConnection*>(sender());
|
|
client->deleteLater();
|
|
_openConnections.removeAll(client);
|
|
}
|
|
|
|
void ProtoServer::startServer()
|
|
{
|
|
if(!_server->isListening())
|
|
{
|
|
if(!_server->listen(QHostAddress::Any, _port))
|
|
{
|
|
Error(_log,"Failed to bind port %d", _port);
|
|
}
|
|
else
|
|
{
|
|
Info(_log,"Started on port %d", _port);
|
|
emit publishService(SERVICE_TYPE, _port);
|
|
}
|
|
}
|
|
}
|
|
|
|
void ProtoServer::stopServer()
|
|
{
|
|
if(_server->isListening())
|
|
{
|
|
// close client connections
|
|
for(const auto& client : _openConnections)
|
|
{
|
|
client->forceClose();
|
|
}
|
|
_server->close();
|
|
Info(_log, "Stopped");
|
|
}
|
|
}
|