Move flatbuffer server to separate thread

awawa-dev · Feb 27, 2022 · ead6db4 · ead6db4
1 parent f426758
commit ead6db4
Show file tree

Hide file tree

Showing 9 changed files with 594 additions and 477 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 awawa-dev
+Copyright (c) 2022 awawa-dev
 
 Project homesite: https://github.com/awawa-dev/HyperHDR
 

diff --git a/assets/webconfig/js/hyperhdr.js b/assets/webconfig/js/hyperhdr.js
@@ -189,8 +189,13 @@ function initWebSocket()
 						if (tan != -1)
 						{
 							var error = response.hasOwnProperty("error") ? response.error : "unknown";
-							$(window.hyperhdr).trigger({ type: "error", reason: error });
-							console.log("[window.websocket::onmessage] ", error);
+
+							if (error == "Not ready")
+								window.location.reload();
+							else							
+								$(window.hyperhdr).trigger({ type: "error", reason: error });
+
+							console.log("[window.websocket::onmessage] ", error);							
 						}
 					}
 				}

diff --git a/include/flatbufserver/FlatBufferConnection.h b/include/flatbufserver/FlatBufferConnection.h
@@ -75,8 +75,6 @@ class FlatBufferConnection : public QObject
 	///
 	void sendMessage(const uint8_t* buffer, uint32_t size);
 
-	bool isFree();
-
 public slots:
 	///
 	/// @brief Set the leds according to the given image
@@ -135,6 +133,7 @@ private slots:
 	Logger* _log;
 	flatbuffers::FlatBufferBuilder _builder;
 
-	bool _registered;
-	bool _free;
+	bool	 _registered;
+	bool	 _sent;
+	uint64_t _lastSendImage;
 };
diff --git a/include/hyperhdrbase/HyperHdrInstance.h b/include/hyperhdrbase/HyperHdrInstance.h
@@ -102,12 +102,12 @@ class HyperHdrInstance : public QObject
 	///
 	QString getActiveDeviceType() const;
 
-	bool getReadOnlyMode() { return _readOnlyMode; };
-
 	ImageProcessor* getImageProcessor();
 
 public slots:
 
+	bool getReadOnlyMode() { return _readOnlyMode; };
+
 	void saveCalibration(QString saveData);
 
 	///

diff --git a/include/hyperhdrbase/MessageForwarder.h b/include/hyperhdrbase/MessageForwarder.h
@@ -27,6 +27,7 @@
 class HyperHdrInstance;
 class QTcpSocket;
 class FlatBufferConnection;
+class MessageForwarderHelper;
 
 class MessageForwarder : public QObject
 {
@@ -93,11 +94,35 @@ private slots:
 	QStringList   _jsonSlaves;
 
 	/// Proto connection for forwarding
-	QStringList _flatSlaves;
-	QList<FlatBufferConnection*> _forwardClients;
+	QStringList _flatSlaves;	
 
 	/// Flag if forwarder is enabled
 	bool _forwarder_enabled = true;
 
-	const int _priority;
+	const int	_priority;
+
+	MessageForwarderHelper* _messageForwarderHelper;	
+};
+
+class MessageForwarderHelper : public QObject
+{
+	Q_OBJECT
+
+	QList<FlatBufferConnection*> _forwardClients;
+	bool _free;
+
+public:
+	MessageForwarderHelper();
+
+	~MessageForwarderHelper();
+
+signals:
+	void addClient(const QString& origin, const QString& address, int priority, bool skipReply);
+	void clearClients();
+
+public slots:
+	bool isFree();
+	void forwardImage(const Image<ColorRgb>& image);
+	void addClientHandler(const QString& origin, const QString& address, int priority, bool skipReply);
+	void clearClientsHandler();
 };