Details coming soon.

libsrc/jsonserver/CMakeLists.txt

@@ -8,6 +8,7 @@ FILE ( GLOB JsonServer_SOURCES "${CURRENT_HEADER_DIR}/*.h"  "${CURRENT_SOURCE_DI
 add_library(jsonserver ${JsonServer_SOURCES} )
 
 target_link_libraries(jsonserver
+	hyperion-api
 	hyperion
 	Qt5::Network
 	Qt5::Gui

libsrc/jsonserver/JsonClientConnection.cpp

@@ -1,7 +1,10 @@
 // project includes
 #include "JsonClientConnection.h"
-#include <utils/JsonProcessor.h>
+#include <api/JsonAPI.h>
+
+// qt inc
 #include <QTcpSocket>
+#include <QHostAddress>
 
 JsonClientConnection::JsonClientConnection(QTcpSocket *socket)
 	: QObject()
@@ -11,10 +14,10 @@ JsonClientConnection::JsonClientConnection(QTcpSocket *socket)
 {
 	connect(_socket, &QTcpSocket::disconnected, this, &JsonClientConnection::disconnected);
 	connect(_socket, &QTcpSocket::readyRead, this, &JsonClientConnection::readRequest);
-	// create a new instance of JsonProcessor
-	_jsonProcessor = new JsonProcessor(socket->peerAddress().toString(), _log, this);
-	// get the callback messages from JsonProcessor and send it to the client
-	connect(_jsonProcessor,SIGNAL(callbackMessage(QJsonObject)),this,SLOT(sendMessage(QJsonObject)));
+	// create a new instance of JsonAPI
+	_jsonAPI = new JsonAPI(socket->peerAddress().toString(), _log, this);
+	// get the callback messages from JsonAPI and send it to the client
+	connect(_jsonAPI,SIGNAL(callbackMessage(QJsonObject)),this,SLOT(sendMessage(QJsonObject)));
 }
 
 void JsonClientConnection::readRequest()
@@ -31,7 +34,7 @@ void JsonClientConnection::readRequest()
 		_receiveBuffer = _receiveBuffer.mid(bytes);
 
 		// handle message
-		_jsonProcessor->handleMessage(message);
+		_jsonAPI->handleMessage(message);
 
 		// try too look up '\n' again
 		bytes = _receiveBuffer.indexOf('\n') + 1;

libsrc/jsonserver/JsonClientConnection.h

@@ -3,11 +3,12 @@
 // Qt includes
 #include <QString>
 #include <QByteArray>
+#include <QJsonObject>
 
 // util includes
 #include <utils/Logger.h>
 
-class JsonProcessor;
+class JsonAPI;
 class QTcpSocket;
 
 ///
@@ -40,8 +41,8 @@ private slots:
 
 private:
 	QTcpSocket* _socket;
-	/// new instance of JsonProcessor
-	JsonProcessor * _jsonProcessor;
+	/// new instance of JsonAPI
+	JsonAPI * _jsonAPI;
 
 	/// The buffer used for reading data from the socket
 	QByteArray _receiveBuffer;

libsrc/jsonserver/JsonServer.cpp

@@ -6,41 +6,41 @@
 #include "JsonClientConnection.h"
 
 // hyperion include
+#include <hyperion/Hyperion.h>
 #include <hyperion/MessageForwarder.h>
+#include <bonjour/bonjourserviceregister.h>
+#include <hyperion/ComponentRegister.h>
 
 // qt includes
+#include <QTcpServer>
 #include <QTcpSocket>
 #include <QJsonDocument>
 #include <QByteArray>
 
-JsonServer::JsonServer(uint16_t port)
+JsonServer::JsonServer(const QJsonDocument& config)
 	: QObject()
-	, _server()
+	, _server(new QTcpServer(this))
 	, _hyperion(Hyperion::getInstance())
 	, _openConnections()
 	, _log(Logger::getInstance("JSONSERVER"))
+	, _componentRegister( & _hyperion->getComponentRegister())
 {
-	if (!_server.listen(QHostAddress::Any, port))
-	{
-		throw std::runtime_error("JSONSERVER ERROR: could not bind to port");
-	}
-
-		QList<MessageForwarder::JsonSlaveAddress> list = Hyperion::getInstance()->getForwarder()->getJsonSlaves();
-		for ( int i=0; i<list.size(); i++ )
-		{
-			if ( list.at(i).addr == QHostAddress::LocalHost && list.at(i).port == port ) {
-				throw std::runtime_error("JSONSERVER ERROR: Loop between proto server and forwarder detected. Fix your config!");
-			}
-		}
+	Debug(_log, "Created instance");
 
 	// Set trigger for incoming connections
-	connect(&_server, SIGNAL(newConnection()), this, SLOT(newConnection()));
+	connect(_server, SIGNAL(newConnection()), this, SLOT(newConnection()));
 
 	// receive state of forwarder
-	connect(_hyperion, &Hyperion::componentStateChanged, this, &JsonServer::componentStateChanged);
+	connect(_componentRegister, &ComponentRegister::updatedComponentState, this, &JsonServer::componentStateChanged);
 
-	// initial connect TODO get initial state from config to stop messing
+	// listen for component register changes
 	connect(_hyperion, &Hyperion::forwardJsonMessage, this, &JsonServer::forwardJsonMessage);
+
+	// init
+	handleSettingsUpdate(settings::JSONSERVER, config);
+
+	// set initial state of forwarding
+	componentStateChanged(hyperion::COMP_FORWARDER, _componentRegister->isComponentEnabled(hyperion::COMP_FORWARDER));
 }
 
 JsonServer::~JsonServer()
@@ -50,16 +50,58 @@ JsonServer::~JsonServer()
 	}
 }
 
+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);
+
+	if(_serviceRegister == nullptr)
+	{
+		_serviceRegister = new BonjourServiceRegister();
+		_serviceRegister->registerService("_hyperiond-json._tcp", _port);
+	}
+}
+
+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 _server.serverPort();
+	return _port;
 }
 
 void JsonServer::newConnection()
 {
-	while(_server.hasPendingConnections())
+	while(_server->hasPendingConnections())
 	{
-		if (QTcpSocket * socket = _server.nextPendingConnection())
+		if (QTcpSocket * socket = _server->nextPendingConnection())
 		{
 			Debug(_log, "New connection from: %s ",socket->localAddress().toString().toStdString().c_str());
 			JsonClientConnection * connection = new JsonClientConnection(socket);
@@ -83,11 +125,9 @@ void JsonServer::closedConnection(void)
 
 void JsonServer::componentStateChanged(const hyperion::Components component, bool enable)
 {
-	if (component == hyperion::COMP_FORWARDER && _forwarder_enabled != enable)
+	if (component == hyperion::COMP_FORWARDER)
 	{
-		_forwarder_enabled = enable;
-		Info(_log, "forwarder change state to %s", (enable ? "enabled" : "disabled") );
-		if(_forwarder_enabled)
+		if(enable)
 		{
 			connect(_hyperion, &Hyperion::forwardJsonMessage, this, &JsonServer::forwardJsonMessage);
 		}
@@ -101,11 +141,12 @@ void JsonServer::componentStateChanged(const hyperion::Components component, boo
 void JsonServer::forwardJsonMessage(const QJsonObject &message)
 {
 	QTcpSocket client;
-	QList<MessageForwarder::JsonSlaveAddress> list = _hyperion->getForwarder()->getJsonSlaves();
+	QStringList list = _hyperion->getForwarder()->getJsonSlaves();
 
-	for ( int i=0; i<list.size(); i++ )
+	for (const auto& entry : list)
 	{
-		client.connectToHost(list.at(i).addr, list.at(i).port);
+		QStringList splitted = entry.split(":");
+		client.connectToHost(splitted[0], splitted[1].toInt());
 		if ( client.waitForConnected(500) )
 		{
 			sendMessage(message,&client);