even more changes

Signed-off-by: Paulchen-Panther <Paulchen--Panter@gmx.net>
2025-03-01 10:33:28 +00:00 · 2018-12-28 18:12:45 +01:00
parent 3700566d10
commit 2a77f6f012
99 changed files with 2610 additions and 673 deletions
--- a/include/api/JsonAPI.h
+++ b/include/api/JsonAPI.h
@@ -0,0 +1,254 @@
+#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 JsonCB;
+
+class JsonAPI : public QObject
+{
+	Q_OBJECT
+
+public:
+	///
+	/// Constructor
+	///
+	/// @param peerAddress provide the Address of the peer
+	/// @param log         The Logger class of the creator
+	/// @param parent      Parent QObject
+	/// @param noListener  if true, this instance won't listen for hyperion push events
+	///
+	JsonAPI(QString peerAddress, Logger* log, QObject* parent, bool noListener = false);
+
+	///
+	/// Handle an incoming JSON message
+	///
+	/// @param message the incoming message as string
+	///
+	void handleMessage(const QString & message, const QString& httpAuthHeader = "");
+
+public slots:
+	/// _timer_ledcolors requests ledcolor updates (if enabled)
+	void streamLedcolorsUpdate();
+
+	/// push images whenever hyperion emits (if enabled)
+	void setImage(const Image<ColorRgb> & image);
+
+	/// process and push new log messages from logger (if enabled)
+	void incommingLogMessage(Logger::T_LOG_MESSAGE);
+
+signals:
+	///
+	/// 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 JsonCB instance which handles data subscription/notifications
+	JsonCB* _jsonCB;
+	// true if further callbacks are forbidden (http)
+	bool _noListener;
+    /// The peer address of the client
+    QString _peerAddress;
+
+	/// Log instance
+	Logger* _log;
+
+	/// Hyperion instance
+	Hyperion* _hyperion;
+
+	/// 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 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 SetConfig message from handleConfigCommand()
+	///
+	/// @param message the incoming message
+	///
+	void handleConfigSetCommand(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 VideoMode message
+	///
+	/// @param message the incoming message
+	///
+	void handleVideoModeCommand(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 a standard reply indicating success with data
+	///
+	void sendSuccessDataReply(const QJsonDocument &doc, 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);
+};
--- a/include/api/JsonCB.h
+++ b/include/api/JsonCB.h
@@ -0,0 +1,112 @@
+#pragma once
+
+// qt incl
+#include <QObject>
+#include <QJsonObject>
+
+// components def
+#include <utils/Components.h>
+// bonjour
+#include <bonjour/bonjourrecord.h>
+// videModes
+#include <utils/VideoMode.h>
+// settings
+#include <utils/settings.h>
+
+class Hyperion;
+class ComponentRegister;
+class BonjourBrowserWrapper;
+class PriorityMuxer;
+
+class JsonCB : public QObject
+{
+	Q_OBJECT
+
+public:
+	JsonCB(QObject* parent);
+
+	///
+	/// @brief Subscribe to future data updates given by cmd
+	/// @param cmd   The cmd which will be subscribed for
+	/// @return      True on success, false if not found
+	///
+	bool subscribeFor(const QString& cmd);
+
+	///
+	/// @brief Get all possible commands to subscribe for
+	/// @return  The list of commands
+	///
+	QStringList getCommands() { return _availableCommands; };
+	///
+	/// @brief Get all subscribed commands
+	/// @return  The list of commands
+	///
+	QStringList getSubscribedCommands() { return _subscribedCommands; };
+signals:
+	///
+	/// @brief Emits whenever a new json mesage callback is ready to send
+	/// @param The JsonObject message
+	///
+	void newCallback(QJsonObject);
+
+private slots:
+	///
+	/// @brief handle component state changes
+	///
+	void handleComponentState(const hyperion::Components comp, const bool state);
+
+	///
+	/// @brief handle emits from bonjour wrapper
+	/// @param  bRegisters   The full register map
+	///
+	void handleBonjourChange(const QMap<QString,BonjourRecord>& bRegisters);
+
+	///
+	/// @brief handle emits from PriorityMuxer
+	///
+	void handlePriorityUpdate();
+
+	///
+	/// @brief Handle imageToLedsMapping updates
+	///
+	void handleImageToLedsMappingChange(const int& mappingType);
+
+	///
+	/// @brief Handle the adjustment update
+	///
+	void handleAdjustmentChange();
+
+	///
+	/// @brief Handle video mode change
+	/// @param mode  The new videoMode
+	///
+	void handleVideoModeChange(const VideoMode& mode);
+
+	///
+	/// @brief Handle effect list change
+	///
+	void handleEffectListChange();
+
+	///
+	/// @brief Handle a config part change. This does NOT include (global) changes from other hyperion instances
+	/// @param type   The settings type from enum
+	/// @param data   The data as QJsonDocument
+	///
+	void handleSettingsChange(const settings::type& type, const QJsonDocument& data);
+
+private:
+	/// pointer of Hyperion instance
+	Hyperion* _hyperion;
+	/// pointer of comp register
+	ComponentRegister* _componentRegister;
+	/// Bonjour instance
+	BonjourBrowserWrapper* _bonjour;
+	/// priority muxer instance
+	PriorityMuxer* _prioMuxer;
+	/// contains all available commands
+	QStringList _availableCommands;
+	/// contains active subscriptions
+	QStringList _subscribedCommands;
+	/// construct callback msg
+	void doCallback(const QString& cmd, const QVariant& data);
+};