Обновление cpp-сервера
This commit is contained in:
@@ -0,0 +1,14 @@
|
||||
#include <string>
|
||||
|
||||
#include <controllers/controller_base.h>
|
||||
|
||||
namespace server::details {
|
||||
class ControllerInvoker {
|
||||
public:
|
||||
explicit ControllerInvoker(const controllers::ControllerBase* controller);
|
||||
|
||||
std::string operator()(const char* request) const;
|
||||
private:
|
||||
const controllers::ControllerBase* controller_;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
#include <controllers/dispatcher.h>
|
||||
|
||||
namespace server::details {
|
||||
/// @brief Парсинг строки в json
|
||||
/// @param[in] data Строка
|
||||
/// @throws std::runtime_error В случае ошибки парсинга (например, некорректный формат)
|
||||
/// @returns json
|
||||
json ParseJson(const char* data);
|
||||
|
||||
controllers::Dispatcher CreateDispatcher();
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include <string_view>
|
||||
|
||||
/// @brief Поля запроса
|
||||
namespace server::details::fields::request {
|
||||
constexpr std::string_view command = "command"; ///< Название команды / Название контроллера
|
||||
constexpr std::string_view parameters = "parameters"; ///< Параметры
|
||||
}
|
||||
|
||||
/// @brief Поля ответа
|
||||
namespace server::details::fields::response {
|
||||
constexpr std::string_view command = "command"; ///< Название команды / Название контроллера
|
||||
constexpr std::string_view status = "status"; ///< Статус ответа (ok/error)
|
||||
constexpr std::string_view result = "result"; ///< Результат (в случае статуса ok)
|
||||
constexpr std::string_view error_message = "error_message"; ///< Сообщение об ошибке (в случае статуса error)
|
||||
}
|
||||
@@ -1,12 +1,21 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
#include <controllers/dispatcher.h>
|
||||
|
||||
namespace seasocks {
|
||||
class Server;
|
||||
}
|
||||
|
||||
class WebSocketServer {
|
||||
public:
|
||||
/// @brief Конструктор
|
||||
/// @param[in] dispatcher Диспетчер контроллеров
|
||||
explicit WebSocketServer(Dispatcher&& dispatcher);
|
||||
explicit WebSocketServer(const controllers::Dispatcher& dispatcher);
|
||||
|
||||
~WebSocketServer();
|
||||
|
||||
/// @brief Начать обслуживание запросов
|
||||
/// @param[in] path Директория со статическими ресурсами
|
||||
@@ -14,5 +23,5 @@ public:
|
||||
void Serve(const std::string& path, int port);
|
||||
|
||||
protected:
|
||||
Dispatcher dispatcher_; ///< Диспетчер контроллеров
|
||||
};
|
||||
std::unique_ptr<seasocks::Server> server_; ///< Сервер
|
||||
};
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
#include <seasocks/WebSocket.h>
|
||||
|
||||
#include <controllers/dispatcher.h>
|
||||
#include <server/details/controller_invoker.h>
|
||||
|
||||
class AnalysisWebSocketHandler : public seasocks::WebSocket::Handler {
|
||||
public:
|
||||
explicit AnalysisWebSocketHandler(const Dispatcher& dispatcher);
|
||||
explicit AnalysisWebSocketHandler(const controllers::ControllerBase* controller);
|
||||
|
||||
void onConnect(seasocks::WebSocket* socket) override;
|
||||
|
||||
@@ -15,5 +15,5 @@ public:
|
||||
void onDisconnect(seasocks::WebSocket* socket) override;
|
||||
|
||||
private:
|
||||
const Dispatcher& dispatcher_;
|
||||
server::details::ControllerInvoker controller_invoker_;
|
||||
};
|
||||
@@ -0,0 +1,49 @@
|
||||
#include <server/details/controller_invoker.h>
|
||||
#include <server/details/details.h>
|
||||
#include <server/details/fields.h>
|
||||
#include <utils/utils.h>
|
||||
|
||||
using namespace server::details;
|
||||
|
||||
namespace {
|
||||
json CallImpl(const controllers::ControllerBase& controller, const char* request, std::string& command) {
|
||||
// Проверяем корректность формата запроса
|
||||
auto json = ParseJson(request);
|
||||
|
||||
// Проверяем наличие необходимых ключей
|
||||
utils::CheckForRequiredFields(json, { fields::request::parameters });
|
||||
|
||||
// Формируем и возвращаем ответ
|
||||
auto parameters = json[fields::request::parameters];
|
||||
return controller(parameters);
|
||||
}
|
||||
}
|
||||
|
||||
ControllerInvoker::ControllerInvoker(const controllers::ControllerBase* controller) : controller_(controller) {}
|
||||
|
||||
std::string ControllerInvoker::operator()(const char* request) const {
|
||||
std::string command;
|
||||
json result;
|
||||
try {
|
||||
result = CallImpl(*controller_, request, command);
|
||||
}
|
||||
catch (const std::exception& e) {
|
||||
json json;
|
||||
json[fields::response::command] = command;
|
||||
json[fields::response::status] = "error";
|
||||
json[fields::response::error_message] = e.what();
|
||||
|
||||
result = json.dump();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
json json;
|
||||
json[fields::response::command] = command;
|
||||
json[fields::response::status] = "ok";
|
||||
json[fields::response::result] = result;
|
||||
|
||||
result = json.dump();
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
#include <controllers/anomaly_logs/get.h>
|
||||
#include <controllers/logs_classes/get.h>
|
||||
#include <controllers/statistics/get.h>
|
||||
#include <server/details/details.h>
|
||||
|
||||
namespace server::details {
|
||||
json ParseJson(const char* data) {
|
||||
json json;
|
||||
try {
|
||||
json = json::parse(data);
|
||||
} catch (const std::exception& e) {
|
||||
throw std::runtime_error("failed to parse request");
|
||||
}
|
||||
|
||||
return json;
|
||||
}
|
||||
|
||||
controllers::Dispatcher CreateDispatcher() {
|
||||
using namespace controllers;
|
||||
|
||||
Dispatcher result;
|
||||
result.AddController<anomaly_logs::Get>();
|
||||
result.AddController<logs_classes::Get>();
|
||||
result.AddController<statistics::Get>();
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,10 @@
|
||||
#include <iostream>
|
||||
|
||||
#include <configuration/configuration.h>
|
||||
#include <controllers/dispatcher.h>
|
||||
#include <controllers/anomaly_logs_controller.h>
|
||||
#include <controllers/statistics_controller.h>
|
||||
#include <json/json.h>
|
||||
#include <server/logger.h>
|
||||
#include <server/server.h>
|
||||
#include <server/details/details.h>
|
||||
#include <storage/postgresql/postgresql_storage.h>
|
||||
|
||||
void Log(LogLevel level, const char* message) {
|
||||
@@ -30,7 +28,7 @@ void ConnectToStorage(const json& configuration) {
|
||||
Logger::Get().Write(LogLevel::Info, "connected to postgresql");
|
||||
}
|
||||
|
||||
json ParseConfiguration2(const std::string& path_to_configuration) {
|
||||
json ParseConfiguration(const std::string& path_to_configuration) {
|
||||
json required_keys;
|
||||
required_keys["server"] = { "path", "port" };
|
||||
required_keys["storage"] = { "database", "username", "password", "host", "port" };
|
||||
@@ -46,7 +44,7 @@ int main(int argc, char** argv) {
|
||||
|
||||
try {
|
||||
// Парсим конфигурационный файл
|
||||
auto configuration = ParseConfiguration2(argv[1]);
|
||||
auto configuration = ParseConfiguration(argv[1]);
|
||||
|
||||
// Настраиваем логирование
|
||||
Logger::Get().SetSettings(LogLevel::Info, Log);
|
||||
@@ -54,13 +52,11 @@ int main(int argc, char** argv) {
|
||||
// Подключаемся к базе данных
|
||||
ConnectToStorage(configuration);
|
||||
|
||||
// Создаём и заполняем диспетчер контроллеров
|
||||
Dispatcher dispatcher;
|
||||
dispatcher.AddController<AnomalyLogsController>();
|
||||
dispatcher.AddController<StatisticsController>();
|
||||
// Создаём диспетчер контроллеров
|
||||
controllers::Dispatcher dispatcher = server::details::CreateDispatcher();
|
||||
|
||||
// Создаём и запускаем сервер
|
||||
WebSocketServer server(std::move(dispatcher));
|
||||
WebSocketServer server(dispatcher);
|
||||
|
||||
const std::string path = configuration["server"]["path"].get<std::string>();
|
||||
const int port = configuration["server"]["port"].get<int>();
|
||||
|
||||
@@ -6,13 +6,16 @@
|
||||
#include <server/websockets_handler.h>
|
||||
#include <server/websockets_logger.h>
|
||||
|
||||
WebSocketServer::WebSocketServer(Dispatcher&& dispatcher) : dispatcher_(std::move(dispatcher)) {}
|
||||
WebSocketServer::WebSocketServer(const controllers::Dispatcher& dispatcher) : server_(std::make_unique<seasocks::Server>(std::make_shared<WebSocketsLogger>())) {
|
||||
for (const auto& [path, controller] : dispatcher.GetControllers()) {
|
||||
server_->addWebSocketHandler(path.c_str(), std::make_shared<AnalysisWebSocketHandler>(controller.get()));
|
||||
}
|
||||
|
||||
server_->addPageHandler(std::make_shared<seasocks::RootPageHandler>());
|
||||
}
|
||||
|
||||
WebSocketServer::~WebSocketServer() = default;
|
||||
|
||||
void WebSocketServer::Serve(const std::string& path, int port) {
|
||||
auto logger = std::make_shared<WebSocketsLogger>();
|
||||
|
||||
seasocks::Server server(logger);
|
||||
server.addPageHandler(std::make_shared<seasocks::RootPageHandler>());
|
||||
server.addWebSocketHandler("/", std::make_shared<AnalysisWebSocketHandler>(dispatcher_));
|
||||
server.serve(path.c_str(), port);
|
||||
server_->serve(path.c_str(), port);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <server/logger.h>
|
||||
#include <server/websockets_handler.h>
|
||||
|
||||
AnalysisWebSocketHandler::AnalysisWebSocketHandler(const Dispatcher& dispatcher) : dispatcher_(dispatcher) {}
|
||||
AnalysisWebSocketHandler::AnalysisWebSocketHandler(const controllers::ControllerBase* controller) : controller_invoker_(controller) {}
|
||||
|
||||
void AnalysisWebSocketHandler::onConnect(seasocks::WebSocket* socket) {
|
||||
Logger::Get().Write(LogLevel::Info, "new client connected");
|
||||
@@ -11,7 +11,7 @@ void AnalysisWebSocketHandler::onConnect(seasocks::WebSocket* socket) {
|
||||
|
||||
void AnalysisWebSocketHandler::onData(seasocks::WebSocket* socket, const char* data) {
|
||||
try {
|
||||
auto response = dispatcher_(data);
|
||||
auto response = controller_invoker_(data);
|
||||
socket->send(response.c_str());
|
||||
} catch (const std::exception& e) {
|
||||
std::ostringstream message;
|
||||
@@ -22,6 +22,4 @@ void AnalysisWebSocketHandler::onData(seasocks::WebSocket* socket, const char* d
|
||||
}
|
||||
}
|
||||
|
||||
void AnalysisWebSocketHandler::onDisconnect(seasocks::WebSocket* socket) {
|
||||
|
||||
}
|
||||
void AnalysisWebSocketHandler::onDisconnect(seasocks::WebSocket* socket) {}
|
||||
|
||||
Reference in New Issue
Block a user