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

Websocket auto serverinfo responder (#443)

Browse Source 
* serverinfo cb

* remove webui cron

* missing header file

* tcp connection should trigger to
This commit is contained in:
brindosch
2017-06-17 23:29:04 +02:00
committed by GitHub
parent 91c7637a2b
commit d3707cb118
12 changed files with 166 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libsrc/jsonserver/JsonClientConnection.cpp
View File

@@ -48,7 +48,6 @@
using namespace hyperion;
int _connectionCounter = 0;
std::map<hyperion::Components, bool> JsonClientConnection::_componentsPrevState;
JsonClientConnection::JsonClientConnection(QTcpSocket *socket)
@@ -83,7 +82,7 @@ JsonClientConnection::~JsonClientConnection()
void JsonClientConnection::readData()
{
_receiveBuffer += _socket->readAll();
if (_webSocketHandshakeDone)
{
// websocket mode, data frame
@@ -237,6 +236,7 @@ void JsonClientConnection::doWebSocketHandshake()
_socket->write(h.str().c_str());
_socket->flush();
// we are in WebSocket mode, data frames should follow next
_webSocketHandshakeDone = true;
}
@@ -1394,6 +1394,14 @@ void JsonClientConnection::sendSuccessReply(const QString &command, const int ta
// send reply
sendMessage(reply);
// blacklisted commands for emitter
QVector<QString> vector;
vector << "ledcolors-imagestream-stop" << "ledcolors-imagestream-start" << "ledcolors-ledstream-stop" << "ledcolors-ledstream-start" << "logging-start" << "logging-stop";
if(vector.indexOf(command) == -1)
{
emit pushReq();
}
}
void JsonClientConnection::sendErrorReply(const QString &error, const QString &command, const int tan)
@@ -1510,4 +1518,11 @@ void JsonClientConnection::setImage(int priority, const Image<ColorRgb> & image,
}
}
void JsonClientConnection::forceServerInfo()
{
const QString command("serverinfo");
const int tan = 1;
const QJsonObject obj;
handleServerInfoCommand(obj,command,tan);
}

10
libsrc/jsonserver/JsonClientConnection.h
View File

@@ -114,6 +114,11 @@ public:
///
~JsonClientConnection();
///
/// send a forced serverinfo to a client
///
void forceServerInfo();
public slots:
void componentStateChanged(const hyperion::Components component, bool enable);
void streamLedcolorsUpdate();
@@ -127,6 +132,11 @@ signals:
///
void connectionClosed(JsonClientConnection * connection);
///
/// Signal which is emitted when a sendSuccessReply() has been executed
///
void pushReq();
private slots:
///
/// Slot called when new data has arrived

29
libsrc/jsonserver/JsonServer.cpp
View File

@@ -8,6 +8,7 @@
JsonServer::JsonServer(uint16_t port)
: QObject()
, _server()
, _hyperion(Hyperion::getInstance())
, _openConnections()
, _log(Logger::getInstance("JSONSERVER"))
{
@@ -27,6 +28,14 @@ JsonServer::JsonServer(uint16_t port)
// Set trigger for incoming connections
connect(&_server, SIGNAL(newConnection()), this, SLOT(newConnection()));
// connect delay timer and setup
connect(&_timer, SIGNAL(timeout()), this, SLOT(pushReq()));
_timer.setSingleShot(true);
_blockTimer.setSingleShot(true);
// register for hyprion state changes (bonjour, config, prioritymuxer, register/unregister source)
connect(_hyperion, SIGNAL(hyperionStateChanged()), this, SLOT(pushReq()));
// make sure the resources are loaded (they may be left out after static linking
Q_INIT_RESOURCE(JsonSchemas);
@@ -50,10 +59,13 @@ void JsonServer::newConnection()
if (socket != nullptr)
{
Debug(_log, "New connection");
Debug(_log, "New connection from: %s ",socket->localAddress().toString().toStdString().c_str());
JsonClientConnection * connection = new JsonClientConnection(socket);
_openConnections.insert(connection);
// register for JSONClientConnection events
connect(connection, SIGNAL(pushReq()), this, SLOT(pushReq()));
// register slot for cleaning up after the connection closed
connect(connection, SIGNAL(connectionClosed(JsonClientConnection*)), this, SLOT(closedConnection(JsonClientConnection*)));
}
@@ -67,3 +79,18 @@ void JsonServer::closedConnection(JsonClientConnection *connection)
// schedule to delete the connection object
connection->deleteLater();
}
void JsonServer::pushReq()
{
if(_blockTimer.isActive())
{
_timer.start(250);
}
else
{
foreach (JsonClientConnection * connection, _openConnections) {
connection->forceServerInfo();
}
_blockTimer.start(250);
}
}