mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
510bb903ae
* Disable AVAHI * Replace SysInfo backport with Qt SysInfo * Update vscode config * Update LedDevices * Update Logger * Update hyperiond * Update hyperion-remote * Exclude avahi * Empty definition for Process * PythonInit path broken * Exclude PiBlaster and link ws2_32 * more avahi * resolve ui bug * Update Compile howto * JsonAPI QtGrabber missing * fix error * ssize_t replacement * Nope, doesn't work * Adjust compile description and verify winSDK * Update ci script * Update ci script * Update ci * Update ci script * update Logger * Update PythonInit * added Azure & GitHub Actions, Logger, PythonInit * resolve merge conflicts * revert ssize_t in FadeCandy * look at registry for QT5 & use find_package(Python) if cmake >= 3.12 * second try * another try * and yet another test * qt5 registry search undone * Package creation test * finished package creation. only fine tuning is required :-) Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Dependencies for Windows finished Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * use 'add_definitions()' until CMake 3.12 Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Update .github/workflows/pull-request.yml Co-Authored-By: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> * Update cmake/Dependencies.cmake Co-Authored-By: brindosch <edeltraud70@gmx.de> * fix typo/ add VCINSTALLDIR var * fix again * Undo change again (Not working) * fix QT grabber Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * first NSIS test Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Update NSIS package * surprise :-) Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Update NSIS package * fix: NSIS .bmps * Add nsis templates * Force windows gui app * fix: QSysInfo required Qt5.6, now it's 5.4 again * Update: Remove platform component and adjust package name * Add macOS as system name * Update docs * fix: Allow gh actions ci also for forks with branches * Add ReadMe docs, mention windows, add vscode linux debug config * fix: readme visual * reduce/hide banner/copyright/log message Infos here: https://docs.microsoft.com/de-de/visualstudio/msbuild/msbuild-command-line-reference?view=vs-2019#switches * Fix PythonInit * vscode: Add runner task * fix(vscode): compiler path gcc ver independent * fix azure * vscode: add windows run tasks * move process detection * main: add windows process detection * Azure file shredder * Update docs Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> Co-authored-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>
127 lines
2.9 KiB
C++
127 lines
2.9 KiB
C++
// system includes
|
|
#include <stdexcept>
|
|
|
|
// project includes
|
|
#include <jsonserver/JsonServer.h>
|
|
#include "JsonClientConnection.h"
|
|
|
|
// bonjour include
|
|
#ifdef ENABLE_AVAHI
|
|
#include <bonjour/bonjourserviceregister.h>
|
|
#endif
|
|
#include <utils/NetOrigin.h>
|
|
|
|
// qt includes
|
|
#include <QTcpServer>
|
|
#include <QTcpSocket>
|
|
#include <QJsonDocument>
|
|
#include <QByteArray>
|
|
|
|
JsonServer::JsonServer(const QJsonDocument& config)
|
|
: QObject()
|
|
, _server(new QTcpServer(this))
|
|
, _openConnections()
|
|
, _log(Logger::getInstance("JSONSERVER"))
|
|
, _netOrigin(NetOrigin::getInstance())
|
|
{
|
|
Debug(_log, "Created instance");
|
|
|
|
// Set trigger for incoming connections
|
|
connect(_server, SIGNAL(newConnection()), this, SLOT(newConnection()));
|
|
|
|
// init
|
|
handleSettingsUpdate(settings::JSONSERVER, config);
|
|
}
|
|
|
|
JsonServer::~JsonServer()
|
|
{
|
|
foreach (JsonClientConnection * connection, _openConnections) {
|
|
delete connection;
|
|
}
|
|
}
|
|
|
|
void JsonServer::start()
|
|
{
|
|
if(_server->isListening())
|
|
return;
|
|
|
|
if (!_server->listen(QHostAddress::Any, _port))
|
|
{
|
|
Error(_log,"Could not bind to port '%d', please use an available port", _port);
|
|
return;
|
|
}
|
|
Info(_log, "Started on port %d", _port);
|
|
#ifdef ENABLE_AVAHI
|
|
if(_serviceRegister == nullptr)
|
|
{
|
|
_serviceRegister = new BonjourServiceRegister(this);
|
|
_serviceRegister->registerService("_hyperiond-json._tcp", _port);
|
|
}
|
|
else if( _serviceRegister->getPort() != _port)
|
|
{
|
|
delete _serviceRegister;
|
|
_serviceRegister = new BonjourServiceRegister(this);
|
|
_serviceRegister->registerService("_hyperiond-json._tcp", _port);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void JsonServer::stop()
|
|
{
|
|
if(!_server->isListening())
|
|
return;
|
|
|
|
_server->close();
|
|
Info(_log, "Stopped");
|
|
}
|
|
|
|
void JsonServer::handleSettingsUpdate(const settings::type& type, const QJsonDocument& config)
|
|
{
|
|
if(type == settings::JSONSERVER)
|
|
{
|
|
QJsonObject obj = config.object();
|
|
if(_port != obj["port"].toInt())
|
|
{
|
|
_port = obj["port"].toInt();
|
|
stop();
|
|
start();
|
|
}
|
|
}
|
|
}
|
|
|
|
uint16_t JsonServer::getPort() const
|
|
{
|
|
return _port;
|
|
}
|
|
|
|
void JsonServer::newConnection()
|
|
{
|
|
while(_server->hasPendingConnections())
|
|
{
|
|
if (QTcpSocket * socket = _server->nextPendingConnection())
|
|
{
|
|
if(_netOrigin->accessAllowed(socket->peerAddress(), socket->localAddress()))
|
|
{
|
|
Debug(_log, "New connection from: %s ",socket->localAddress().toString().toStdString().c_str());
|
|
JsonClientConnection * connection = new JsonClientConnection(socket, _netOrigin->isLocalAddress(socket->peerAddress(), socket->localAddress()));
|
|
_openConnections.insert(connection);
|
|
|
|
// register slot for cleaning up after the connection closed
|
|
connect(connection, &JsonClientConnection::connectionClosed, this, &JsonServer::closedConnection);
|
|
}
|
|
else
|
|
socket->close();
|
|
}
|
|
}
|
|
}
|
|
|
|
void JsonServer::closedConnection(void)
|
|
{
|
|
JsonClientConnection* connection = qobject_cast<JsonClientConnection*>(sender());
|
|
Debug(_log, "Connection closed");
|
|
_openConnections.remove(connection);
|
|
|
|
// schedule to delete the connection object
|
|
connection->deleteLater();
|
|
}
|