Move JsonProcessing from JsonClientConnection to own class (#444)

* update

* Tell me why...

include/hyperion/Hyperion.h

@@ -92,7 +92,7 @@ public:
 	/// @return The current priority
 	///
 	int getCurrentPriority() const;
-	
+
 	///
 	/// Returns a list of active priorities
 	///
@@ -117,15 +117,15 @@ public:
 	/// Get the list of available effects
 	/// @return The list of available effects
 	const std::list<EffectDefinition> &getEffects() const;
-	
+
 	/// Get the list of active effects
 	/// @return The list of active effects
 	const std::list<ActiveEffectDefinition> &getActiveEffects();
-	
+
 	/// Get the list of available effect schema files
 	/// @return The list of available effect schema files
 	const std::list<EffectSchema> &getEffectSchemas();
-	
+
 	/// gets the current json config object
 	/// @return json config
 	const QJsonObject& getQJsonConfig() { return _qjsonConfig; };
@@ -139,28 +139,28 @@ public:
 	/// @param origin External setter
 	/// @param priority priority channel
 	void registerPriority(const QString &name, const int priority);
-	
+
 	/// unregister a input source to a priority channel
 	/// @param name uniq name of input source
 	void unRegisterPriority(const QString &name);
-	
+
 	/// gets current priority register
 	/// @return the priority register
 	const PriorityRegister& getPriorityRegister() { return _priorityRegister; }
-	
+
 	/// enable/disable automatic/priorized source selection
 	/// @param enabled the state
 	void setSourceAutoSelectEnabled(bool enabled);
-	
+
 	/// set current input source to visible
 	/// @param priority the priority channel which should be vidible
 	/// @return true if success, false on error
 	bool setCurrentSourcePriority(int priority );
-	
+
 	/// gets current state of automatic/priorized source selection
 	/// @return the state
 	bool sourceAutoSelectEnabled() { return _sourceAutoSelectEnabled; };
-	
+
 	///
 	/// Enable/Disable components during runtime
 	///
@@ -177,12 +177,10 @@ public:
 
 	/// gets the methode how image is maped to leds
 	int getLedMappingType() { return _ledMAppingType; };
-	
+
 	int getConfigVersionId() { return _configVersionId; };
-	
+
 	QJsonObject getConfig() { return _qjsonConfig; };
-	
-	QString getConfigFile() { return _configFile; };
 
 	/// unique id per instance
 	QString id;
@@ -273,6 +271,9 @@ public slots:
 	///
 	Hyperion::BonjourRegister getHyperionSessions();
 
+	/// Slot which is called, when state of hyperion has been changed
+	void hyperionStateChanged();
+
 public:
 	static Hyperion *_hyperion;
 
@@ -311,8 +312,11 @@ signals:
 	void emitImage(int priority, const Image<ColorRgb> & image, const int timeout_ms);
 	void closing();
 
-	/// Signal which is emitted, when state of config or bonjour or priorityMuxer changed
-	void hyperionStateChanged();
+	/// Signal which is emitted, when a new json message should be forwarded
+	void forwardJsonMessage(QJsonObject);
+
+	/// Signal which is emitted, after the hyperionStateChanged has been processed with a emit count blocker (250ms interval)
+	void sendServerInfo();
 
 private slots:
 	///
@@ -329,7 +333,7 @@ private slots:
 	void checkConfigState();
 
 private:
-	
+
 	///
 	/// Constructs the Hyperion instance based on the given Json configuration
 	///
@@ -344,13 +348,13 @@ private:
 	LedString _ledStringClone;
 
 	std::vector<ColorOrder> _ledStringColorOrder;
-	
+
 	/// The priority muxer
 	PriorityMuxer _muxer;
 
 	/// The adjustment from raw colors to led colors
 	MultiColorAdjustment * _raw2ledAdjustment;
-	
+
 	/// The actual LedDevice
 	LedDevice * _device;
 
@@ -359,7 +363,7 @@ private:
 
 	/// Effect engine
 	EffectEngine * _effectEngine;
-	
+
 	// proto and json Message forwarder
 	MessageForwarder * _messageForwarder;
 
@@ -383,24 +387,24 @@ private:
 	unsigned _hwLedCount;
 
 	ComponentRegister _componentRegister;
-	
+
 	/// register of input sources and it's prio channel
 	PriorityRegister _priorityRegister;
 
 	/// flag indicates state for autoselection of input source
 	bool _sourceAutoSelectEnabled;
-	
+
 	/// holds the current priority channel that is manualy selected
 	int _currentSourcePriority;
 
 	QByteArray _configHash;
 
 	QSize _ledGridSize;
-	
+
 	int _ledMAppingType;
-	
+
 	int _configVersionId;
-	
+
 	hyperion::Components   _prevCompId;
 	BonjourServiceBrowser  _bonjourBrowser;
 	BonjourServiceResolver _bonjourResolver;
@@ -417,4 +421,8 @@ private:
 	/// holds the current states of configWriteable and modified
 	bool _configMod = false;
 	bool _configWrite = true;
+
+	/// timers to handle severinfo blocking
+	QTimer _fsi_timer;
+	QTimer _fsi_blockTimer; 
 };

include/jsonserver/JsonServer.h

@@ -6,7 +6,6 @@
 // Qt includes
 #include <QTcpServer>
 #include <QSet>
-#include <QTimer>
 
 // Hyperion includes
 #include <hyperion/Hyperion.h>
@@ -37,15 +36,12 @@ public:
 	///
 	uint16_t getPort() const;
 
+
 private slots:
 	///
 	/// Slot which is called when a client tries to create a new connection
 	///
 	void newConnection();
-	///
-	/// Slot which is called when a new forced serverinfo should be pushed
-	///
-	void pushReq();
 
 	///
 	/// Slot which is called when a client closes a connection
@@ -53,11 +49,25 @@ private slots:
 	///
 	void closedConnection(JsonClientConnection * connection);
 
+	/// forward message to all json slaves
+	void forwardJsonMessage(const QJsonObject &message);
+
+public slots:
+	/// process current forwarder state
+	void componentStateChanged(const hyperion::Components component, bool enable);
+
+	///
+	/// forward message to a single json slaves
+	///
+	/// @param message The JSON message to send
+	///
+	void sendMessage(const QJsonObject & message, QTcpSocket * socket);
+
 private:
 	/// The TCP server object
 	QTcpServer _server;
 
-	/// Link to Hyperion to get hyperion state emiter
+	/// Link to Hyperion to get config state emiter
 	Hyperion * _hyperion;
 
 	/// List with open connections
@@ -66,6 +76,6 @@ private:
 	/// the logger instance
 	Logger * _log;
 
-	QTimer _timer;
-	QTimer _blockTimer;
+	/// Flag if forwarder is enabled
+	bool _forwarder_enabled = true;
 };

include/utils/JsonProcessor.h

@@ -0,0 +1,268 @@
+#pragma once
+
+// hyperion includes
+#include <utils/Logger.h>
+#include <utils/jsonschema/QJsonSchemaChecker.h>
+#include <utils/Components.h>
+#include <hyperion/Hyperion.h>
+
+// qt includess
+#include <QTimer>
+#include <QJsonObject>
+#include <QMutex>
+#include <QString>
+
+// createEffect helper
+struct find_schema: std::unary_function<EffectSchema, bool>
+{
+	QString pyFile;
+	find_schema(QString pyFile):pyFile(pyFile) { }
+	bool operator()(EffectSchema const& schema) const
+	{
+		return schema.pyFile == pyFile;
+	}
+};
+
+// deleteEffect helper
+struct find_effect: std::unary_function<EffectDefinition, bool>
+{
+	QString effectName;
+	find_effect(QString effectName) :effectName(effectName) { }
+	bool operator()(EffectDefinition const& effectDefinition) const
+	{
+		return effectDefinition.name == effectName;
+	}
+};
+
+class ImageProcessor;
+
+class JsonProcessor : public QObject
+{
+	Q_OBJECT
+
+public:
+	JsonProcessor(QString peerAddress);
+	~JsonProcessor();
+
+	///
+	/// Handle an incoming JSON message
+	///
+	/// @param message the incoming message as string
+	///
+	void handleMessage(const QString & message);
+
+	///
+	/// send a forced serverinfo to a client
+	///
+	void forceServerInfo();
+
+public slots:
+	/// _timer_ledcolors requests ledcolor updates (if enabled)
+	void streamLedcolorsUpdate();
+
+	/// push images whenever hyperion emits (if enabled)
+	void setImage(int priority, const Image<ColorRgb> & image, int duration_ms);
+
+	/// process and push new log messages from logger (if enabled)
+	void incommingLogMessage(Logger::T_LOG_MESSAGE);
+
+signals:
+	///
+	/// Signal which is emitted when a sendSuccessReply() has been executed
+	///
+	void pushReq();
+	///
+	/// Signal emits with the reply message provided with handleMessage()
+	///
+	void callbackMessage(QJsonObject);
+
+	///
+	/// Signal emits whenever a jsonmessage should be forwarded
+	///
+	void forwardJsonMessage(QJsonObject);
+
+private:
+    /// The peer address of the client
+    QString _peerAddress;
+
+	/// Log instance
+	Logger* _log;
+
+	/// Hyperion instance
+	Hyperion* _hyperion;
+
+	/// The processor for translating images to led-values
+	ImageProcessor * _imageProcessor;
+
+    /// holds the state before off state
+    static std::map<hyperion::Components, bool> _componentsPrevState;
+
+	/// returns if hyperion is on or off
+	inline bool hyperionIsActive() { return JsonProcessor::_componentsPrevState.empty(); };
+
+	/// timer for ledcolors streaming
+	QTimer _timer_ledcolors;
+
+	// streaming buffers
+	QJsonObject _streaming_leds_reply;
+	QJsonObject _streaming_image_reply;
+	QJsonObject _streaming_logging_reply;
+
+	/// flag to determine state of log streaming
+	bool _streaming_logging_activated;
+
+	/// mutex to determine state of image streaming
+	QMutex _image_stream_mutex;
+
+	/// timeout for live video refresh
+	volatile qint64 _image_stream_timeout;
+
+	///
+	/// Handle an incoming JSON Color message
+	///
+	/// @param message the incoming message
+	///
+	void handleColorCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON Image message
+	///
+	/// @param message the incoming message
+	///
+	void handleImageCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON Effect message
+	///
+	/// @param message the incoming message
+	///
+	void handleEffectCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON Effect message (Write JSON Effect)
+	///
+	/// @param message the incoming message
+	///
+	void handleCreateEffectCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON Effect message (Delete JSON Effect)
+	///
+	/// @param message the incoming message
+	///
+	void handleDeleteEffectCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON System info message
+	///
+	/// @param message the incoming message
+	///
+	void handleSysInfoCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON Server info message
+	///
+	/// @param message the incoming message
+	///
+	void handleServerInfoCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON Clear message
+	///
+	/// @param message the incoming message
+	///
+	void handleClearCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON Clearall message
+	///
+	/// @param message the incoming message
+	///
+	void handleClearallCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON Adjustment message
+	///
+	/// @param message the incoming message
+	///
+	void handleAdjustmentCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON SourceSelect message
+	///
+	/// @param message the incoming message
+	///
+	void handleSourceSelectCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	/// Handle an incoming JSON GetConfig message and check subcommand
+	///
+	/// @param message the incoming message
+	///
+	void handleConfigCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	/// Handle an incoming JSON GetConfig message from handleConfigCommand()
+	///
+	/// @param message the incoming message
+	///
+	void handleSchemaGetCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	/// Handle an incoming JSON GetConfig message from handleConfigCommand()
+	///
+	/// @param message the incoming message
+	///
+	void handleConfigGetCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON Component State message
+	///
+	/// @param message the incoming message
+	///
+	void handleComponentStateCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	/// Handle an incoming JSON Led Colors message
+	///
+	/// @param message the incoming message
+	///
+	void handleLedColorsCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	/// Handle an incoming JSON Logging message
+	///
+	/// @param message the incoming message
+	///
+	void handleLoggingCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	/// Handle an incoming JSON Proccessing message
+	///
+	/// @param message the incoming message
+	///
+	void handleProcessingCommand(const QJsonObject & message, const QString &command, const int tan);
+
+	///
+	/// Handle an incoming JSON message of unknown type
+	///
+	void handleNotImplemented();
+
+	///
+	/// Send a standard reply indicating success
+	///
+	void sendSuccessReply(const QString &command="", const int tan=0);
+
+	///
+	/// Send an error message back to the client
+	///
+	/// @param error String describing the error
+	///
+	void sendErrorReply(const QString & error, const QString &command="", const int tan=0);
+
+	///
+	/// Check if a JSON messag is valid according to a given JSON schema
+	///
+	/// @param message JSON message which need to be checked
+	/// @param schemaResource Qt Resource identifier with the JSON schema
+	/// @param errors Output error message
+	/// @param ignoreRequired ignore the required value in JSON schema
+	///
+	/// @return true if message conforms the given JSON schema
+	///
+	bool checkJson(const QJsonObject & message, const QString &schemaResource, QString & errors, bool ignoreRequired = false);
+};