L3-Rabbit merge

.run/CLIENT rabbitClientL3cmd.run.xml

@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="CLIENT rabbitClientL3cmd" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="-i 2 -h localhost -p 3030" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="rabbit" TARGET_NAME="rabbitClientL3cmd" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="rabbit" RUN_TARGET_NAME="rabbitClientL3cmd">
+    <method v="2">
+      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/SERVER rabbitServerL3cmd.run.xml

@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="SERVER rabbitServerL3cmd" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="-p 3030" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="rabbit" TARGET_NAME="rabbitServerL3cmd" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="rabbit" RUN_TARGET_NAME="rabbitServerL3cmd">
+    <method v="2">
+      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/WORKER1 rabbitWorkerL3cmd.run.xml

@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="WORKER1 rabbitWorkerL3cmd" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="-i 1 -h localhost -p 3030 -c 4" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="rabbit" TARGET_NAME="rabbitWorkerL3cmd" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="rabbit" RUN_TARGET_NAME="rabbitWorkerL3cmd">
+    <method v="2">
+      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

CMakeLists.txt

@@ -32,6 +32,7 @@ CPMAddPackage(
 
 find_package(SqliteOrm REQUIRED)
 find_package(argparse REQUIRED)
+find_package(nlohmann_json REQUIRED)
 
 # Include directories
 include_directories(src)

INTERNAL_API.md

@@ -0,0 +1,10 @@
+# Описание внутреннего взаимодействия API
+
+API передает сообщение используя JSON формат.
+Каждое сообщение содержит следующие поля:
+
+
+## Описание примеров взаимодействия
+
+### Воркер 
+

conandata.yml

@@ -2,5 +2,6 @@
 # To keep your changes, remove these comment lines, but the plugin won't be able to modify your requirements
 
 requirements:
+  - "nlohmann_json/3.11.3"
   - "argparse/3.0"
   - "sqlite_orm/1.8.2"

src/CMakeLists.txt

@@ -2,22 +2,33 @@
 
 # Add subdirectory for protocol
 add_subdirectory(protocol)
-
+include_directories(DataModel)
 # Source files
 set(SOURCE_FILES
         server/STIPServer.cpp
         client/STIPClient.cpp
+        services/TaskService/TaskService.cpp
+        services/UserDBService/UserDBService.cpp
+        services/TaskQueue/TaskQueue.h
 )
 
 # Function to create executable targets
 function(add_rabbit_executable target_name)
     add_executable(${target_name} ${ARGN} ${SOURCE_FILES})
     target_compile_features(${target_name} PRIVATE cxx_std_17)
-    target_link_libraries(${target_name} PUBLIC STIPProtocol argparse::argparse Boost::asio ws2_32)
+    target_link_libraries(${target_name} PUBLIC
+            STIPProtocol
+            argparse::argparse
+            Boost::asio
+            ws2_32
+            nlohmann_json::nlohmann_json
+    )
 endfunction()
 
 # Define executables
 add_rabbit_executable(rabbitServerL2Example ${CMAKE_CURRENT_SOURCE_DIR}/../examples/server.cpp)
 add_rabbit_executable(rabbitClientL2Example ${CMAKE_CURRENT_SOURCE_DIR}/../examples/client.cpp)
+
 add_rabbit_executable(rabbitServerL3cmd cmd/serverMain.cpp rabbitCore/server/RabbitServer.cpp)
-target_link_libraries(rabbitServerL3cmd PRIVATE sqlite_orm::sqlite_orm)
+add_rabbit_executable(rabbitClientL3cmd cmd/clientMain.cpp rabbitCore/client/RabbitClient.cpp)
+add_rabbit_executable(rabbitWorkerL3cmd cmd/workerMain.cpp rabbitCore/worker/RabbitWorker.cpp)

src/DataModel/Client.h

@@ -0,0 +1,27 @@
+//
+// Created by Potato on 12.04.24.
+//
+
+#ifndef RABBIT_USER_H
+#define RABBIT_USER_H
+
+#include <string>
+#include <nlohmann/json.hpp>
+#include "protocol/Connection.h"
+
+using json = nlohmann::json;
+
+struct Client {
+    std::string id;
+    STIP::Connection *connection;
+};
+
+inline void to_json(json &j, const Client &c) {
+    j = json{{"id", c.id}};
+}
+
+inline void from_json(const json &j, Client &c) {
+    j.at("id").get_to(c.id);
+}
+
+#endif //RABBIT_USER_H

src/DataModel/Message.h

@@ -0,0 +1,48 @@
+//
+// Created by Potato on 12.04.24.
+//
+
+#ifndef RABBIT_MESSAGE_H
+#define RABBIT_MESSAGE_H
+
+#include <string>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+// TODO: обернуть все нижестоящие объекты в этот высооуровневый класс
+
+// example enum type declaration
+enum MessageType {
+    RegisterClient,
+    RegisterWorker,
+    TaskRequest,
+    TaskResult,
+    Invalid = -1
+};
+
+// map TaskState values to JSON as strings
+NLOHMANN_JSON_SERIALIZE_ENUM(MessageType, {
+    { RegisterClient, "registerClient" },
+    { RegisterWorker, "registerWorker" },
+    { TaskRequest, "request" },
+    { TaskResult, "result" },
+    { Invalid, nullptr },
+})
+
+struct Message {
+    MessageType action;
+    std::string data;
+};
+
+inline void to_json(nlohmann::json &j, const Message &m) {
+    j = json{{"action", m.action},
+             {"data",   m.data}};
+}
+
+inline void from_json(const nlohmann::json &j, Message &m) {
+    j.at("action").get_to(m.action);
+    j.at("data").get_to(m.data);
+}
+
+#endif //RABBIT_MESSAGE_H

src/DataModel/Task.h

@@ -0,0 +1,64 @@
+//
+// Created by Serge on 26.03.2024.
+//
+
+#ifndef RABBIT_TASKS_H
+#define RABBIT_TASKS_H
+
+#include <string>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+// example enum type declaration
+enum TaskStatus {
+    Created,
+    Queued,
+    SentToWorker,
+    Ready,
+    Failed,
+};
+
+// map TaskState values to JSON as strings
+NLOHMANN_JSON_SERIALIZE_ENUM(TaskStatus, {
+    { Created, "created" },
+    { Queued, "queued" },
+    { SentToWorker, "sentToWorker" },
+    { Ready, "ready" },
+    { Failed, "failed" },
+})
+
+struct Task {
+    std::string id;
+    std::string func;
+    std::string input;
+    std::string output;
+    int cores;
+    TaskStatus status;
+    std::string worker_hash_id;
+    std::string client_hash_id;
+};
+
+inline void to_json(json &j, const Task &t) {
+    j = json{{"id",             t.id},
+             {"func",           t.func},
+             {"input",          t.input},
+             {"output",         t.output},
+             {"cores",          t.cores},
+             {"status",         t.status},
+             {"worker_hash_id", t.worker_hash_id},
+             {"client_hash_id", t.client_hash_id}};
+}
+
+inline void from_json(const json &j, Task &t) {
+    j.at("id").get_to(t.id);
+    j.at("func").get_to(t.func);
+    j.at("input").get_to(t.input);
+    j.at("output").get_to(t.output);
+    j.at("cores").get_to(t.cores);
+    j.at("status").get_to(t.status);
+    j.at("worker_hash_id").get_to(t.worker_hash_id);
+    j.at("client_hash_id").get_to(t.client_hash_id);
+}
+
+#endif //RABBIT_TASKS_H

src/DataModel/TaskRequest.h

@@ -0,0 +1,34 @@
+//
+// Created by Potato on 11.04.24.
+//
+
+#ifndef RABBIT_TASKREQUEST_H
+#define RABBIT_TASKREQUEST_H
+
+#include <string>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+struct TaskRequest {
+    std::string id;
+    std::string func;
+    std::string data;
+    int cores;
+};
+
+inline void to_json(json &j, const struct TaskRequest &tr) {
+    j = json{{"id",    tr.id},
+             {"func",  tr.func},
+             {"data",  tr.data},
+             {"cores", tr.cores}};
+}
+
+inline void from_json(const json &j, struct TaskRequest &tr) {
+    j.at("id").get_to(tr.id);
+    j.at("func").get_to(tr.func);
+    j.at("data").get_to(tr.data);
+    j.at("cores").get_to(tr.cores);
+}
+
+#endif //RABBIT_TASKREQUEST_H

src/DataModel/TaskResult.h

@@ -0,0 +1,31 @@
+//
+// Created by Potato on 11.04.24.
+//
+
+#ifndef RABBIT_TASKRESULT_H
+#define RABBIT_TASKRESULT_H
+
+#include <string>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+struct TaskResult {
+    std::string id;
+    std::string data;
+    int status;
+};
+
+inline void to_json(json &j, const struct TaskResult &tr) {
+    j = json{{"id",     tr.id},
+             {"data",   tr.data},
+             {"status", tr.status}};
+}
+
+inline void from_json(const json &j, struct TaskResult &tr) {
+    j.at("id").get_to(tr.id);
+    j.at("data").get_to(tr.data);
+    j.at("status").get_to(tr.status);
+}
+
+#endif //RABBIT_TASKRESULT_H

src/DataModel/Worker.h

@@ -0,0 +1,33 @@
+//
+// Created by Potato on 12.04.24.
+//
+
+#ifndef RABBIT_WORKER_H
+#define RABBIT_WORKER_H
+
+#include <string>
+#include <nlohmann/json.hpp>
+#include "protocol/Connection.h"
+
+using json = nlohmann::json;
+
+struct Worker {
+    std::string id;
+    int cores;
+    int usedCores;
+    STIP::Connection *connection;
+};
+
+inline void to_json(json &j, const Worker &w) {
+    j = json{{"id",        w.id},
+             {"cores",     w.cores},
+             {"usedCores", w.usedCores}};
+}
+
+inline void from_json(const json &j, Worker &w) {
+    j.at("id").get_to(w.id);
+    j.at("cores").get_to(w.cores);
+    j.at("usedCores").get_to(w.usedCores);
+}
+
+#endif //RABBIT_WORKER_H

src/client/STIPClient.cpp

@@ -19,7 +19,6 @@ namespace STIP {
         this->connectionManager = new ConnectionManager(socket);
     }
 
-
     void STIPClient::receiveProcess() {
         std::cout << "Start listen" << std::endl;
         while (isRunning) {

src/client/STIPClient.h

@@ -33,7 +33,6 @@ namespace STIP {
 
         void receiveProcess();
     };
-
 }
 
 #endif //RABBIT_STIPCLIENT_H