- The first part

- Added CodeDocs config file for customization
- Fixing LGTM alerts
- LGTM bug fixed again
- added token option to hyperion-remote
- fix DBManager::getDB()
- next bugfix
- correct broken signal from SettingManager to Hyperion
- Token list is created after the schema is fetched

Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>

include/webserver/WebServer.h

@@ -29,7 +29,7 @@ public:
 	quint16 getPort() { return _port; };
 
 	/// check if server has been inited
-	bool isInited() { return _inited; };
+	const bool isInited() { return _inited; };
 
 	///
 	/// @brief Set a new description, if empty the description is NotFound for clients

include/webserver/WebSocketClient.h

@@ -1,70 +0,0 @@
-#pragma once
-
-#include <utils/Logger.h>
-#include "webserver/WebSocketUtils.h"
-#include <QJsonObject>
-
-class QTcpSocket;
-class JsonAPI;
-
-class WebSocketClient : public QObject {
-	Q_OBJECT
-public:
-	WebSocketClient(QByteArray socketKey, QTcpSocket* sock, QObject* parent);
-
-	struct WebSocketHeader
-	{
-		bool          fin;
-		quint8 opCode;
-		bool          masked;
-		quint64       payloadLength;
-		char          key[4];
-	};
-
-private:
-	QTcpSocket* _socket;
-	QByteArray _secWebSocketKey;
-	Logger* _log;
-	JsonAPI* _jsonAPI;
-
-	void getWsFrameHeader(WebSocketHeader* header);
-	void sendClose(int status, QString reason = "");
-//	void handleBinaryMessage(QByteArray &data);
-	qint64 sendMessage_Raw(const char* data, quint64 size);
-	qint64 sendMessage_Raw(QByteArray &data);
-	QByteArray makeFrameHeader(quint8 opCode, quint64 payloadLength, bool lastFrame);
-
-	/// The buffer used for reading data from the socket
-	QByteArray _receiveBuffer;
-
-	/// buffer for websockets multi frame receive
-	QByteArray _wsReceiveBuffer;
-	quint8 _maskKey[4];
-
-	bool _onContinuation = false;
-
-	// true when data is missing for parsing
-	bool _notEnoughData = false;
-
-	// websocket header store
-	WebSocketHeader _wsh;
-
-	// masks for fields in the basic header
-	static uint8_t const BHB0_OPCODE = 0x0F;
-	static uint8_t const BHB0_RSV3   = 0x10;
-	static uint8_t const BHB0_RSV2   = 0x20;
-	static uint8_t const BHB0_RSV1   = 0x40;
-	static uint8_t const BHB0_FIN    = 0x80;
-
-	static uint8_t const BHB1_PAYLOAD = 0x7F;
-	static uint8_t const BHB1_MASK    = 0x80;
-
-	static uint8_t const payload_size_code_16bit = 0x7E; // 126
-	static uint8_t const payload_size_code_64bit = 0x7F; // 127
-
-	static const quint64 FRAME_SIZE_IN_BYTES = 512 * 512 * 2;  //maximum size of a frame when sending a message
-
-private slots:
-	void handleWebSocketFrame(void);
-	qint64 sendMessage(QJsonObject obj);
-};

include/webserver/WebSocketUtils.h

@@ -1,68 +0,0 @@
-#pragma once
-
-/// Constants and utility functions related to WebSocket opcodes
-/**
- * WebSocket Opcodes are 4 bits. See RFC6455 section 5.2.
- */
-namespace OPCODE {
-	enum value {
-		CONTINUATION = 0x0,
-		TEXT = 0x1,
-		BINARY = 0x2,
-		RSV3 = 0x3,
-		RSV4 = 0x4,
-		RSV5 = 0x5,
-		RSV6 = 0x6,
-		RSV7 = 0x7,
-		CLOSE = 0x8,
-		PING = 0x9,
-		PONG = 0xA,
-		CONTROL_RSVB = 0xB,
-		CONTROL_RSVC = 0xC,
-		CONTROL_RSVD = 0xD,
-		CONTROL_RSVE = 0xE,
-		CONTROL_RSVF = 0xF
-	};
-
-	/// Check if an opcode is reserved
-	/**
-	 * @param v The opcode to test.
-	 * @return Whether or not the opcode is reserved.
-	 */
-	inline bool reserved(value v) {
-		return (v >= RSV3 && v <= RSV7) || (v >= CONTROL_RSVB && v <= CONTROL_RSVF);
-	}
-
-	/// Check if an opcode is invalid
-	/**
-	 * Invalid opcodes are negative or require greater than 4 bits to store.
-	 *
-	 * @param v The opcode to test.
-	 * @return Whether or not the opcode is invalid.
-	 */
-	inline bool invalid(value v) {
-		return (v > 0xF || v < 0);
-	}
-
-	/// Check if an opcode is for a control frame
-	/**
-	 * @param v The opcode to test.
-	 * @return Whether or not the opcode is a control opcode.
-	*/
-	inline bool is_control(value v) {
-		return v >= 0x8;
-	}
-}
-
-namespace CLOSECODE {
-	enum value {
-		NORMAL    = 1000,
-		AWAY      = 1001,
-		TERM      = 1002,
-		INV_TYPE  = 1003,
-		INV_DATA  = 1007,
-		VIOLATION = 1008,
-		BIG_MSG   = 1009,
-		UNEXPECTED= 1011
-	};
-}