refactor: ProjectInterface Parser

source/CMakeLists.txt

@@ -14,7 +14,7 @@ if (WITH_DBG_CONTROLLER)
 endif()
 
 add_subdirectory(LibraryHolder)
-add_subdirectory(TaskAgent)
+add_subdirectory(ProjectInterface)
 add_subdirectory(MaaFramework)
 add_subdirectory(MaaToolkit)
 

source/ProjectInterface/CMakeLists.txt

@@ -0,0 +1,13 @@
+file(GLOB_RECURSE project_interface_src *.h *.hpp *.cpp)
+file(GLOB_RECURSE project_interface_header ../include/ProjectInterface/*)
+
+add_library(ProjectInterface STATIC ${project_interface_src} ${project_interface_header})
+
+target_include_directories(ProjectInterface 
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
+
+target_link_libraries(ProjectInterface MaaUtils HeaderOnlyLibraries Boost::system)
+
+add_dependencies(ProjectInterface MaaUtils)
+
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${project_interface_src})

source/ProjectInterface/Parser/Parser.cpp

@@ -0,0 +1,27 @@
+#include "ProjectInterface/Parser.h"
+
+#include "Utils/Logger.h"
+
+MAA_PROJECT_INTERFACE_NS_BEGIN
+
+std::optional<InterfaceData> Parser::parse(const std::filesystem::path& path)
+{
+    LogFunc << VAR(path);
+
+    auto root_opt = json::open(path);
+    if (!root_opt) {
+        LogError << "failed to parse" << path;
+        return std::nullopt;
+    }
+    const json::value& root = *root_opt;
+
+    std::string error_key;
+    if (!InterfaceData().check_json(root, error_key)) {
+        LogError << "json is not an InterfaceData" << VAR(error_key) << VAR(root);
+        return std::nullopt;
+    }
+
+    return root.as<InterfaceData>();
+}
+
+MAA_PROJECT_INTERFACE_NS_END

source/include/Conf/Conf.h

@@ -113,11 +113,11 @@
     {
 #define MAA_TOOLKIT_NS_END }
 
-#define MAA_TASKAGENT_NS MAA_NS::TaskAgentNS
-#define MAA_TASKAGENT_NS_BEGIN \
-    namespace MAA_TASKAGENT_NS \
+#define MAA_PROJECT_INTERFACE_NS MAA_NS::ProjectInterfaceNS
+#define MAA_PROJECT_INTERFACE_NS_BEGIN \
+    namespace MAA_PROJECT_INTERFACE_NS \
     {
-#define MAA_TASKAGENT_NS_END }
+#define MAA_PROJECT_INTERFACE_NS_END }
 
 #define MAA_RPC_NS MAA_NS::RpcNS
 #define MAA_RPC_NS_BEGIN \

source/include/ProjectInterface/Parser.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <filesystem>
+#include <optional>
+#include <unordered_map>
+#include <utility>
+
+#include "Types.h"
+
+MAA_PROJECT_INTERFACE_NS_BEGIN
+
+class Parser
+{
+public:
+    static std::optional<InterfaceData> parse(const std::filesystem::path& path);
+};
+
+MAA_PROJECT_INTERFACE_NS_END

source/include/TaskAgent/TaskAgentTypes.h → source/include/ProjectInterface/Types.h

@@ -7,12 +7,14 @@
 
 #include "Conf/Conf.h"
 
-MAA_TASKAGENT_NS_BEGIN
+MAA_PROJECT_INTERFACE_NS_BEGIN
 
 struct Resource
 {
     std::string name;
     std::vector<std::string> path;
+
+    MEO_JSONIZATION(name, path);
 };
 
 struct Option
@@ -21,11 +23,15 @@ struct Option
     {
         std::string name;
         json::value param;
+
+        MEO_JSONIZATION(name, param);
     };
 
     std::string name;
     std::vector<Case> cases;
     std::string default_case; // case.name
+
+    MEO_JSONIZATION(name, cases, MEO_OPT default_case);
 };
 
 struct Entry
@@ -34,27 +40,34 @@ struct Entry
     std::string task;
     json::value param;
     std::vector<Option> options;
+
+    MEO_JSONIZATION(name, task, MEO_OPT param, MEO_OPT options);
 };
 
 struct Executor
 {
-    enum class Type
-    {
-        Action,
-        Recognizer,
-    };
+    // enum class Type
+    //{
+    //     Action,
+    //     Recognizer,
+    // };
+    // Type type = Type::Action;
 
-    Type type = Type::Action;
+    std::string type;
     std::string name;
     std::string exec_path;
     std::vector<std::string> exec_param;
+
+    MEO_JSONIZATION(type, name, exec_path, MEO_OPT exec_param);
 };
 
-struct AgentData
+struct InterfaceData
 {
     std::vector<Resource> resource;
     std::vector<Entry> entry;
     std::vector<Executor> executor;
+
+    MEO_JSONIZATION(resource, entry, MEO_OPT executor);
 };
 
-MAA_TASKAGENT_NS_END
+MAA_PROJECT_INTERFACE_NS_END