Move event_handlers to message_handlers

include/event_handlers/WebSocket.h → include/message_handlers/WebSocket.h

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace OpenShock::EventHandlers::WebSocket {
+namespace OpenShock::MessageHandlers::WebSocket {
   void HandleGatewayBinary(const uint8_t* data, std::size_t len);
   void HandleLocalBinary(uint8_t socketId, const uint8_t* data, std::size_t len);
 }

src/CaptivePortalInstance.cpp

@@ -5,9 +5,9 @@
 const char* const TAG = "CaptivePortalInstance";
 
 #include "CommandHandler.h"
-#include "event_handlers/WebSocket.h"
 #include "GatewayConnectionManager.h"
 #include "Logging.h"
+#include "message_handlers/WebSocket.h"
 #include "serialization/WSLocal.h"
 #include "util/FnProxy.h"
 #include "util/HexUtils.h"
@@ -29,7 +29,8 @@ const uint32_t WEBSOCKET_UPDATE_INTERVAL = 10;  // 10ms / 100Hz
 
 using namespace OpenShock;
 
-const esp_partition_t* _getStaticPartition() {
+const esp_partition_t* _getStaticPartition()
+{
   const esp_partition_t* partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, "static0");
   if (partition != nullptr) {
     return partition;
@@ -43,7 +44,8 @@ const esp_partition_t* _getStaticPartition() {
   return nullptr;
 }
 
-const char* _getPartitionHash() {
+const char* _getPartitionHash()
+{
   const esp_partition_t* partition = _getStaticPartition();
   if (partition == nullptr) {
     return nullptr;
@@ -63,7 +65,8 @@ CaptivePortalInstance::CaptivePortalInstance()
   , m_socketDeFragger(std::bind(&CaptivePortalInstance::handleWebSocketEvent, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4))
   , m_fileSystem()
   , m_dnsServer()
-  , m_taskHandle(nullptr) {
+  , m_taskHandle(nullptr)
+{
   m_socketServer.onEvent(std::bind(&WebSocketDeFragger::handler, &m_socketDeFragger, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
   m_socketServer.begin();
   m_socketServer.enableHeartbeat(WEBSOCKET_PING_INTERVAL, WEBSOCKET_PING_TIMEOUT, WEBSOCKET_PING_RETRIES);
@@ -130,7 +133,8 @@ discord.gg/OpenShock
   }
 }
 
-CaptivePortalInstance::~CaptivePortalInstance() {
+CaptivePortalInstance::~CaptivePortalInstance()
+{
   if (m_taskHandle != nullptr) {
     vTaskDelete(m_taskHandle);
     m_taskHandle = nullptr;
@@ -141,15 +145,17 @@ CaptivePortalInstance::~CaptivePortalInstance() {
   m_dnsServer.stop();
 }
 
-void CaptivePortalInstance::task() {
+void CaptivePortalInstance::task()
+{
   while (true) {
     m_socketServer.loop();
     // instance->m_dnsServer.processNextRequest();
     vTaskDelay(pdMS_TO_TICKS(WEBSOCKET_UPDATE_INTERVAL));
   }
 }
 
-void CaptivePortalInstance::handleWebSocketClientConnected(uint8_t socketId) {
+void CaptivePortalInstance::handleWebSocketClientConnected(uint8_t socketId)
+{
   OS_LOGD(TAG, "WebSocket client #%u connected from %s", socketId, m_socketServer.remoteIP(socketId).toString().c_str());
 
   WiFiNetwork connectedNetwork;
@@ -166,15 +172,18 @@ void CaptivePortalInstance::handleWebSocketClientConnected(uint8_t socketId) {
   Serialization::Local::SerializeWiFiNetworksEvent(Serialization::Types::WifiNetworkEventType::Discovered, networks, std::bind(&CaptivePortalInstance::sendMessageBIN, this, socketId, std::placeholders::_1, std::placeholders::_2));
 }
 
-void CaptivePortalInstance::handleWebSocketClientDisconnected(uint8_t socketId) {
+void CaptivePortalInstance::handleWebSocketClientDisconnected(uint8_t socketId)
+{
   OS_LOGD(TAG, "WebSocket client #%u disconnected", socketId);
 }
 
-void CaptivePortalInstance::handleWebSocketClientError(uint8_t socketId, uint16_t code, const char* message) {
+void CaptivePortalInstance::handleWebSocketClientError(uint8_t socketId, uint16_t code, const char* message)
+{
   OS_LOGE(TAG, "WebSocket client #%u error %u: %s", socketId, code, message);
 }
 
-void CaptivePortalInstance::handleWebSocketEvent(uint8_t socketId, WebSocketMessageType type, const uint8_t* payload, std::size_t length) {
+void CaptivePortalInstance::handleWebSocketEvent(uint8_t socketId, WebSocketMessageType type, const uint8_t* payload, std::size_t length)
+{
   switch (type) {
     case WebSocketMessageType::Connected:
       handleWebSocketClientConnected(socketId);
@@ -186,7 +195,7 @@ void CaptivePortalInstance::handleWebSocketEvent(uint8_t socketId, WebSocketMess
       OS_LOGE(TAG, "Message type is not supported");
       break;
     case WebSocketMessageType::Binary:
-      EventHandlers::WebSocket::HandleLocalBinary(socketId, payload, length);
+      MessageHandlers::WebSocket::HandleLocalBinary(socketId, payload, length);
       break;
     case WebSocketMessageType::Error:
       handleWebSocketClientError(socketId, length, reinterpret_cast<const char*>(payload));

src/GatewayClient.cpp

@@ -4,9 +4,9 @@ const char* const TAG = "GatewayClient";
 
 #include "Common.h"
 #include "config/Config.h"
-#include "event_handlers/WebSocket.h"
 #include "events/Events.h"
 #include "Logging.h"
+#include "message_handlers/WebSocket.h"
 #include "OtaUpdateManager.h"
 #include "serialization/WSGateway.h"
 #include "Time.h"
@@ -203,7 +203,7 @@ void GatewayClient::_handleEvent(WStype_t type, uint8_t* payload, std::size_t le
       OS_LOGV(TAG, "Received pong from API");
       break;
     case WStype_BIN:
-      EventHandlers::WebSocket::HandleGatewayBinary(payload, length);
+      MessageHandlers::WebSocket::HandleGatewayBinary(payload, length);
       break;
     case WStype_FRAGMENT_BIN_START:
       OS_LOGE(TAG, "Received binary fragment start from API, this is not supported!");

src/event_handlers/websocket/Gateway.cpp → src/message_handlers/websocket/Gateway.cpp

@@ -1,8 +1,8 @@
-#include "event_handlers/WebSocket.h"
+#include "message_handlers/WebSocket.h"
 
 const char* const TAG = "ServerMessageHandlers";
 
-#include "event_handlers/impl/WSGateway.h"
+#include "message_handlers/impl/WSGateway.h"
 
 #include "Logging.h"
 
@@ -34,7 +34,8 @@ static std::array<Handlers::HandlerType, HANDLER_COUNT> s_serverHandlers = []()
   return handlers;
 }();
 
-void EventHandlers::WebSocket::HandleGatewayBinary(const uint8_t* data, std::size_t len) {
+void MessageHandlers::WebSocket::HandleGatewayBinary(const uint8_t* data, std::size_t len)
+{
   // Deserialize
   auto msg = flatbuffers::GetRoot<Schemas::GatewayToHubMessage>(data);
   if (msg == nullptr) {

src/event_handlers/websocket/Local.cpp → src/message_handlers/websocket/Local.cpp

@@ -1,9 +1,9 @@
-#include "event_handlers/WebSocket.h"
+#include "message_handlers/WebSocket.h"
 
 const char* const TAG = "LocalMessageHandlers";
 
-#include "event_handlers/impl/WSLocal.h"
 #include "Logging.h"
+#include "message_handlers/impl/WSLocal.h"
 
 #include "serialization/_fbs/LocalToHubMessage_generated.h"
 
@@ -39,7 +39,8 @@ static std::array<Handlers::HandlerType, HANDLER_COUNT> s_localHandlers = []() {
   return handlers;
 }();
 
-void EventHandlers::WebSocket::HandleLocalBinary(uint8_t socketId, const uint8_t* data, std::size_t len) {
+void MessageHandlers::WebSocket::HandleLocalBinary(uint8_t socketId, const uint8_t* data, std::size_t len)
+{
   // Deserialize
   auto msg = flatbuffers::GetRoot<Schemas::LocalToHubMessage>(data);
   if (msg == nullptr) {

src/event_handlers/websocket/gateway/CaptivePortalConfig.cpp → src/message_handlers/websocket/gateway/CaptivePortalConfig.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSGateway.h"
+#include "message_handlers/impl/WSGateway.h"
 
 const char* const TAG = "ServerMessageHandlers";
 
@@ -9,7 +9,8 @@ const char* const TAG = "ServerMessageHandlers";
 
 using namespace OpenShock::MessageHandlers::Server;
 
-void _Private::HandleCaptivePortalConfig(const OpenShock::Serialization::Gateway::GatewayToHubMessage* root) {
+void _Private::HandleCaptivePortalConfig(const OpenShock::Serialization::Gateway::GatewayToHubMessage* root)
+{
   auto msg = root->payload_as_CaptivePortalConfig();
   if (msg == nullptr) {
     OS_LOGE(TAG, "Payload cannot be parsed as CaptivePortalConfig");

src/event_handlers/websocket/gateway/OtaInstall.cpp → src/message_handlers/websocket/gateway/OtaInstall.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSGateway.h"
+#include "message_handlers/impl/WSGateway.h"
 
 const char* const TAG = "ServerMessageHandlers";
 
@@ -10,7 +10,8 @@ const char* const TAG = "ServerMessageHandlers";
 
 using namespace OpenShock::MessageHandlers::Server;
 
-void _Private::HandleOtaInstall(const OpenShock::Serialization::Gateway::GatewayToHubMessage* root) {
+void _Private::HandleOtaInstall(const OpenShock::Serialization::Gateway::GatewayToHubMessage* root)
+{
   auto msg = root->payload_as_OtaInstall();
   if (msg == nullptr) {
     OS_LOGE(TAG, "Payload cannot be parsed as OtaInstall");

src/event_handlers/websocket/gateway/ShockerCommandList.cpp → src/message_handlers/websocket/gateway/ShockerCommandList.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSGateway.h"
+#include "message_handlers/impl/WSGateway.h"
 
 const char* const TAG = "ServerMessageHandlers";
 
@@ -10,7 +10,8 @@ const char* const TAG = "ServerMessageHandlers";
 
 using namespace OpenShock::MessageHandlers::Server;
 
-void _Private::HandleShockerCommandList(const OpenShock::Serialization::Gateway::GatewayToHubMessage* root) {
+void _Private::HandleShockerCommandList(const OpenShock::Serialization::Gateway::GatewayToHubMessage* root)
+{
   auto msg = root->payload_as_ShockerCommandList();
   if (msg == nullptr) {
     OS_LOGE(TAG, "Payload cannot be parsed as ShockerCommandList");
@@ -26,9 +27,9 @@ void _Private::HandleShockerCommandList(const OpenShock::Serialization::Gateway:
   OS_LOGV(TAG, "Received command list from API (%u commands)", commands->size());
 
   for (auto command : *commands) {
-    uint16_t id                   = command->id();
-    uint8_t intensity             = command->intensity();
-    uint16_t durationMs           = command->duration();
+    uint16_t id                        = command->id();
+    uint8_t intensity                  = command->intensity();
+    uint16_t durationMs                = command->duration();
     OpenShock::ShockerModelType model  = command->model();
     OpenShock::ShockerCommandType type = command->type();
 

src/event_handlers/websocket/gateway/_InvalidMessage.cpp → src/message_handlers/websocket/gateway/_InvalidMessage.cpp

@@ -1,12 +1,13 @@
-#include "event_handlers/impl/WSGateway.h"
+#include "message_handlers/impl/WSGateway.h"
 
 const char* const TAG = "ServerMessageHandlers";
 
 #include "Logging.h"
 
 using namespace OpenShock::MessageHandlers::Server;
 
-void _Private::HandleInvalidMessage(const OpenShock::Serialization::Gateway::GatewayToHubMessage* root) {
+void _Private::HandleInvalidMessage(const OpenShock::Serialization::Gateway::GatewayToHubMessage* root)
+{
   if (root == nullptr) {
     OS_LOGE(TAG, "Message cannot be parsed");
     return;

src/event_handlers/websocket/local/AccountLinkCommand.cpp → src/message_handlers/websocket/local/AccountLinkCommand.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSLocal.h"
+#include "message_handlers/impl/WSLocal.h"
 
 const char* const TAG = "LocalMessageHandlers";
 
@@ -8,7 +8,8 @@ const char* const TAG = "LocalMessageHandlers";
 
 #include <cstdint>
 
-void serializeAccountLinkCommandResult(uint8_t socketId, OpenShock::Serialization::Local::AccountLinkResultCode result) {
+void serializeAccountLinkCommandResult(uint8_t socketId, OpenShock::Serialization::Local::AccountLinkResultCode result)
+{
   flatbuffers::FlatBufferBuilder builder(1024);  // TODO: Determine a good size
 
   auto responseOffset = OpenShock::Serialization::Local::CreateAccountLinkCommandResult(builder, result);
@@ -25,7 +26,8 @@ void serializeAccountLinkCommandResult(uint8_t socketId, OpenShock::Serializatio
 
 using namespace OpenShock::MessageHandlers::Local;
 
-void _Private::HandleAccountLinkCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root) {
+void _Private::HandleAccountLinkCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root)
+{
   auto msg = root->payload_as_AccountLinkCommand();
   if (msg == nullptr) {
     OS_LOGE(TAG, "Payload cannot be parsed as AccountLinkCommand");

src/event_handlers/websocket/local/AccountUnlinkCommand.cpp → src/message_handlers/websocket/local/AccountUnlinkCommand.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSLocal.h"
+#include "message_handlers/impl/WSLocal.h"
 
 const char* const TAG = "LocalMessageHandlers";
 
@@ -9,7 +9,8 @@ const char* const TAG = "LocalMessageHandlers";
 
 using namespace OpenShock::MessageHandlers::Local;
 
-void _Private::HandleAccountUnlinkCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root) {
+void _Private::HandleAccountUnlinkCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root)
+{
   (void)socketId;
 
   auto msg = root->payload_as_AccountUnlinkCommand();

src/event_handlers/websocket/local/SetEStopPinCommand.cpp → src/message_handlers/websocket/local/SetEStopPinCommand.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSLocal.h"
+#include "message_handlers/impl/WSLocal.h"
 
 #include "CaptivePortal.h"
 #include "CommandHandler.h"

src/event_handlers/websocket/local/SetRfTxPinCommand.cpp → src/message_handlers/websocket/local/SetRfTxPinCommand.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSLocal.h"
+#include "message_handlers/impl/WSLocal.h"
 
 const char* const TAG = "LocalMessageHandlers";
 

src/event_handlers/websocket/local/WiFiNetworkConnectCommand.cpp → src/message_handlers/websocket/local/WiFiNetworkConnectCommand.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSLocal.h"
+#include "message_handlers/impl/WSLocal.h"
 
 const char* const TAG = "LocalMessageHandlers";
 
@@ -10,9 +10,10 @@ const char* const TAG = "LocalMessageHandlers";
 
 using namespace OpenShock::MessageHandlers::Local;
 
-void _Private::HandleWiFiNetworkConnectCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root) {
+void _Private::HandleWiFiNetworkConnectCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root)
+{
   (void)socketId;
-  
+
   auto msg = root->payload_as_WifiNetworkConnectCommand();
   if (msg == nullptr) {
     OS_LOGE(TAG, "Payload cannot be parsed as WiFiNetworkConnectCommand");

src/event_handlers/websocket/local/WiFiNetworkDisconnectCommand.cpp → src/message_handlers/websocket/local/WiFiNetworkDisconnectCommand.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSLocal.h"
+#include "message_handlers/impl/WSLocal.h"
 
 const char* const TAG = "LocalMessageHandlers";
 
@@ -10,9 +10,10 @@ const char* const TAG = "LocalMessageHandlers";
 
 using namespace OpenShock::MessageHandlers::Local;
 
-void _Private::HandleWiFiNetworkDisconnectCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root) {
+void _Private::HandleWiFiNetworkDisconnectCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root)
+{
   (void)socketId;
-  
+
   auto msg = root->payload_as_WifiNetworkDisconnectCommand();
   if (msg == nullptr) {
     OS_LOGE(TAG, "Payload cannot be parsed as WiFiNetworkDisconnectCommand");

src/event_handlers/websocket/local/WiFiNetworkForgetCommand.cpp → src/message_handlers/websocket/local/WiFiNetworkForgetCommand.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSLocal.h"
+#include "message_handlers/impl/WSLocal.h"
 
 const char* const TAG = "LocalMessageHandlers";
 
@@ -10,9 +10,10 @@ const char* const TAG = "LocalMessageHandlers";
 
 using namespace OpenShock::MessageHandlers::Local;
 
-void _Private::HandleWiFiNetworkForgetCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root) {
+void _Private::HandleWiFiNetworkForgetCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root)
+{
   (void)socketId;
-  
+
   auto msg = root->payload_as_WifiNetworkForgetCommand();
   if (msg == nullptr) {
     OS_LOGE(TAG, "Payload cannot be parsed as WiFiNetworkForgetCommand");

src/event_handlers/websocket/local/WiFiNetworkSaveCommand.cpp → src/message_handlers/websocket/local/WiFiNetworkSaveCommand.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSLocal.h"
+#include "message_handlers/impl/WSLocal.h"
 
 const char* const TAG = "LocalMessageHandlers";
 
@@ -10,9 +10,10 @@ const char* const TAG = "LocalMessageHandlers";
 
 using namespace OpenShock::MessageHandlers::Local;
 
-void _Private::HandleWiFiNetworkSaveCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root) {
+void _Private::HandleWiFiNetworkSaveCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root)
+{
   (void)socketId;
-  
+
   auto msg = root->payload_as_WifiNetworkSaveCommand();
   if (msg == nullptr) {
     OS_LOGE(TAG, "Payload cannot be parsed as WiFiNetworkSaveCommand");

src/event_handlers/websocket/local/WiFiScanCommand.cpp → src/message_handlers/websocket/local/WiFiScanCommand.cpp

@@ -1,4 +1,4 @@
-#include "event_handlers/impl/WSLocal.h"
+#include "message_handlers/impl/WSLocal.h"
 
 const char* const TAG = "LocalMessageHandlers";
 
@@ -7,9 +7,10 @@ const char* const TAG = "LocalMessageHandlers";
 
 using namespace OpenShock::MessageHandlers::Local;
 
-void _Private::HandleWiFiScanCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root) {
+void _Private::HandleWiFiScanCommand(uint8_t socketId, const OpenShock::Serialization::Local::LocalToHubMessage* root)
+{
   (void)socketId;
-  
+
   auto msg = root->payload_as_WifiScanCommand();
   if (msg == nullptr) {
     OS_LOGE(TAG, "Payload cannot be parsed as WiFiScanCommand");