chore: 临时保存摸了摸了

Author: MistEO

include/MaaAgentServer/MaaAgentServerAPI.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "MaaAgentServerDef.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    MAA_AGENT_SERVER_API MaaBool MaaAgentServerStartUp(const MaaStringListBuffer* args);
+    MAA_AGENT_SERVER_API void MaaAgentServerShutDown();
+
+    MAA_AGENT_SERVER_API MaaBool
+        MaaAgentServerRegisterCustomRecognition(const char* name, MaaCustomRecognitionCallback recognition, void* trans_arg);
+
+    MAA_AGENT_SERVER_API MaaBool MaaAgentServerRegisterCustomAction(const char* name, MaaCustomActionCallback action, void* trans_arg);
+
+#ifdef __cplusplus
+}
+#endif

include/MaaAgentServer/MaaAgentServerDef.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#include "MaaFramework/MaaDef.h" // IWYU pragma: export

include/MaaFramework/MaaPort.h

@@ -59,3 +59,9 @@
 #else
 #define MAA_AGENT_CLIENT_API MAA_DLL_IMPORT
 #endif
+
+#ifdef MAA_AGENT_SERVER_EXPORTS
+#define MAA_AGENT_SERVER_API MAA_DLL_EXPORT
+#else
+#define MAA_AGENT_SERVER_API MAA_DLL_IMPORT
+#endif

source/CMakeLists.txt

@@ -17,5 +17,6 @@ add_subdirectory(MaaFramework)
 add_subdirectory(MaaToolkit)
 add_subdirectory(MaaProjectInterface)
 add_subdirectory(MaaAgentClient)
+add_subdirectory(MaaAgentServer)
 
 add_subdirectory(binding)

source/MaaFramework/API/MaaBuffer.cpp source/Common/MaaBuffer.cpp

@@ -1,120 +1,11 @@
-#include "MaaFramework/Instance/MaaController.h"
+#include "MaaFramework/MaaAPI.h"
 
-#include "Controller/CustomControllerAgent.h"
-#include "Controller/GeneralControllerAgent.h"
-#include "LibraryHolder/ControlUnit.h"
+#include "Common/MaaTypes.h"
 #include "Utils/Buffer/ImageBuffer.hpp"
 #include "Utils/Buffer/StringBuffer.hpp"
 #include "Utils/Logger.h"
 #include "Utils/Platform.h"
 
-MaaController* MaaAdbControllerCreate(
-    const char* adb_path,
-    const char* address,
-    MaaAdbScreencapMethod screencap_methods,
-    MaaAdbInputMethod input_methods,
-    const char* config,
-    const char* agent_path,
-    MaaNotificationCallback notify,
-    void* notify_trans_arg)
-{
-    LogFunc << VAR(adb_path) << VAR(address) << VAR(screencap_methods) << VAR(input_methods) << VAR(config) << VAR(agent_path)
-            << VAR_VOIDP(notify) << VAR_VOIDP(notify_trans_arg);
-
-    auto control_unit =
-        MAA_NS::AdbControlUnitLibraryHolder::create_control_unit(adb_path, address, screencap_methods, input_methods, config, agent_path);
-
-    if (!control_unit) {
-        LogError << "Failed to create control unit";
-        return nullptr;
-    }
-
-    return new MAA_CTRL_NS::GeneralControllerAgent(std::move(control_unit), notify, notify_trans_arg);
-}
-
-MaaController* MaaWin32ControllerCreate(
-    void* hWnd,
-    MaaWin32ScreencapMethod screencap_method,
-    MaaWin32InputMethod input_method,
-    MaaNotificationCallback notify,
-    void* notify_trans_arg)
-{
-    LogFunc << VAR_VOIDP(hWnd) << VAR(screencap_method) << VAR(input_method) << VAR_VOIDP(notify) << VAR_VOIDP(notify_trans_arg);
-
-#ifndef _WIN32
-
-    LogError << "This API" << __FUNCTION__ << "is only available on Windows";
-    return nullptr;
-
-#else
-
-    if (!hWnd) {
-        LogWarn << "hWnd is nullptr";
-    }
-
-    auto control_unit = MAA_NS::Win32ControlUnitLibraryHolder::create_control_unit(hWnd, screencap_method, input_method);
-
-    if (!control_unit) {
-        LogError << "Failed to create control unit";
-        return nullptr;
-    }
-
-    return new MAA_CTRL_NS::GeneralControllerAgent(std::move(control_unit), notify, notify_trans_arg);
-
-#endif
-}
-
-MaaController* MaaCustomControllerCreate(
-    MaaCustomControllerCallbacks* controller,
-    void* controller_arg,
-    MaaNotificationCallback notify,
-    void* notify_trans_arg)
-{
-    LogFunc << VAR(controller) << VAR(controller_arg) << VAR_VOIDP(notify) << VAR_VOIDP(notify_trans_arg);
-
-    if (!controller) {
-        LogError << "controller is null";
-        return nullptr;
-    }
-
-    return new MAA_CTRL_NS::CustomControllerAgent(controller, controller_arg, notify, notify_trans_arg);
-}
-
-MaaController* MaaDbgControllerCreate(
-    const char* read_path,
-    const char* write_path,
-    MaaDbgControllerType type,
-    const char* config,
-    MaaNotificationCallback notify,
-    void* notify_trans_arg)
-{
-    LogFunc << VAR(read_path) << VAR(write_path) << VAR(type) << VAR_VOIDP(notify) << VAR_VOIDP(notify_trans_arg);
-
-    std::ignore = write_path;
-    std::ignore = config;
-
-    auto control_unit = MAA_NS::DbgControlUnitLibraryHolder::create_control_unit(type, read_path);
-
-    if (!control_unit) {
-        LogError << "Failed to create control unit";
-        return nullptr;
-    }
-
-    return new MAA_CTRL_NS::GeneralControllerAgent(std::move(control_unit), notify, notify_trans_arg);
-}
-
-void MaaControllerDestroy(MaaController* ctrl)
-{
-    LogFunc << VAR_VOIDP(ctrl);
-
-    if (ctrl == nullptr) {
-        LogError << "handle is null";
-        return;
-    }
-
-    delete ctrl;
-}
-
 MaaBool MaaControllerSetOption(MaaController* ctrl, MaaCtrlOption key, MaaOptionValue value, MaaOptionValueSize val_size)
 {
     LogFunc << VAR_VOIDP(ctrl) << VAR(key) << VAR_VOIDP(value) << VAR(val_size);

source/MaaFramework/API/MaaContext.cpp source/Common/MaaContext.cpp

@@ -1,31 +1,10 @@
 #include "MaaFramework/MaaAPI.h"
 
-#include <meojson/json.hpp>
-
-#include "Resource/ResourceMgr.h"
+#include "Common/MaaTypes.h"
 #include "Utils/Buffer/StringBuffer.hpp"
 #include "Utils/Logger.h"
 #include "Utils/Platform.h"
 
-MaaResource* MaaResourceCreate(MaaNotificationCallback notify, void* notify_trans_arg)
-{
-    LogFunc << VAR_VOIDP(notify) << VAR_VOIDP(notify_trans_arg);
-
-    return new MAA_RES_NS::ResourceMgr(notify, notify_trans_arg);
-}
-
-void MaaResourceDestroy(MaaResource* res)
-{
-    LogFunc << VAR_VOIDP(res);
-
-    if (res == nullptr) {
-        LogError << "handle is null";
-        return;
-    }
-
-    delete res;
-}
-
 MaaBool MaaResourceRegisterCustomRecognition(MaaResource* res, const char* name, MaaCustomRecognitionCallback recognition, void* trans_arg)
 {
     LogFunc << VAR_VOIDP(res) << VAR(name) << VAR_VOIDP(recognition) << VAR_VOIDP(trans_arg);

source/MaaFramework/API/MaaController.cpp source/Common/MaaController.cpp

@@ -1,29 +1,10 @@
 #include "MaaFramework/Instance/MaaTasker.h"
 
-#include "Tasker/Tasker.h"
+#include "Common/MaaTypes.h"
 #include "Utils/Buffer/ImageBuffer.hpp"
 #include "Utils/Buffer/StringBuffer.hpp"
 #include "Utils/Logger.h"
 
-MaaTasker* MaaTaskerCreate(MaaNotificationCallback notify, void* notify_trans_arg)
-{
-    LogFunc << VAR_VOIDP(notify) << VAR_VOIDP(notify_trans_arg);
-
-    return new MAA_NS::Tasker(notify, notify_trans_arg);
-}
-
-void MaaTaskerDestroy(MaaTasker* tasker)
-{
-    LogFunc << VAR_VOIDP(tasker);
-
-    if (tasker == nullptr) {
-        LogError << "handle is null";
-        return;
-    }
-
-    delete tasker;
-}
-
 MaaBool MaaTaskerSetOption(MaaTasker* tasker, MaaTaskerOption key, MaaOptionValue value, MaaOptionValueSize val_size)
 {
     LogFunc << VAR_VOIDP(tasker) << VAR(key) << VAR_VOIDP(value) << VAR(val_size);

source/MaaFramework/API/MaaResource.cpp source/Common/MaaResource.cpp

@@ -0,0 +1,10 @@
+#include "MaaFramework/MaaAPI.h"
+
+#include "Utils/Logger.h"
+
+const char* MaaVersion()
+{
+#pragma message("MaaFramework MAA_VERSION: " MAA_VERSION)
+
+    return MAA_VERSION;
+}

source/MaaFramework/API/MaaTasker.cpp source/Common/MaaTasker.cpp

@@ -41,6 +41,11 @@ AgentClient::~AgentClient()
     if (child_ && child_.joinable()) {
         child_.join();
     }
+
+    msg_loop_running_ = false;
+    if (msg_thread_.joinable()) {
+        msg_thread_.join();
+    }
 }
 
 bool AgentClient::bind_resource(MaaResource* resource)
@@ -83,7 +88,20 @@ bool AgentClient::start_clild(const std::filesystem::path& child_exec, const std
         return false;
     }
 
-    return recv_and_handle_init_msg();
+    bool inited = recv_and_handle_init_msg();
+    if (!inited) {
+        LogError << "failed to recv_and_handle_init_msg";
+        return false;
+    }
+
+    msg_loop_running_ = true;
+    msg_thread_ = std::thread(std::bind(&AgentClient::msg_loop, this));
+    if (!msg_thread_.joinable()) {
+        LogError << "failed to start child_recv_thread";
+        return false;
+    }
+
+    return true;
 }
 
 std::string AgentClient::create_socket()
@@ -111,7 +129,7 @@ std::optional<json::value> AgentClient::recv()
         return std::nullopt;
     }
 
-    const std::string& init_str = init_msg.to_string();
+    std::string_view init_str = init_msg.to_string_view();
     LogInfo << VAR(init_str);
 
     auto jopt = json::parse(init_str);
@@ -153,6 +171,37 @@ bool AgentClient::recv_and_handle_init_msg()
     return true;
 }
 
+void AgentClient::msg_loop()
+{
+    LogFunc;
+
+    while (msg_loop_running_) {
+        auto msg_opt = recv();
+        if (!msg_opt) {
+            LogError << "failed to recv msg";
+            continue;
+        }
+        const json::value& j = *msg_opt;
+        LogInfo << VAR(j);
+
+        if (handle_context_run_task(j)) {
+        }
+        else {
+            LogError << "unknown msg" << VAR(j);
+        }
+    }
+}
+
+bool AgentClient::handle_context_run_task(const json::value& j)
+{
+    if (!j.is<ContextRunTaskMsg>()) {
+        return false;
+    }
+    LogInfo << VAR(j);
+
+    return true;
+}
+
 MaaBool AgentClient::reco_agent(
     MaaContext* context,
     MaaTaskId task_id,

source/Common/MaaUtility.cpp

@@ -39,6 +39,9 @@ class AgentClient : public MaaAgentClient
 
     bool recv_and_handle_init_msg();
 
+    void msg_loop();
+    bool handle_context_run_task(const json::value& j);
+
 public:
     static MaaBool reco_agent(
         MaaContext* context,
@@ -69,6 +72,9 @@ class AgentClient : public MaaAgentClient
 
     zmq::context_t child_ctx_;
     zmq::socket_t child_sock_;
+
+    bool msg_loop_running_ = false;
+    std::thread msg_thread_;
 };
 
 MAA_AGENT_CLIENT_NS_END

source/MaaAgentClient/Client/AgentClient.cpp

@@ -0,0 +1,55 @@
+#include "MaaAgentServer/MaaAgentServerAPI.h"
+
+#include "Server/AgentServer.h"
+#include "Utils/Buffer/StringBuffer.hpp"
+#include "Utils/Logger.h"
+
+MaaBool MaaAgentServerStartUp(const MaaStringListBuffer* args)
+{
+    LogFunc << VAR(args);
+
+    if (!args) {
+        LogError << "args is null";
+        return false;
+    }
+
+    std::vector<std::string> args_vec;
+
+    size_t size = args->size();
+    for (size_t i = 0; i < size; ++i) {
+        args_vec.emplace_back(args->at(i).get());
+    }
+
+    return MAA_AGENT_SERVER_NS::AgentServer::get_instance().start_up(args_vec);
+}
+
+void MaaAgentServerShutDown()
+{
+    LogFunc;
+
+    MAA_AGENT_SERVER_NS::AgentServer::get_instance().shut_down();
+}
+
+MaaBool MaaAgentServerRegisterCustomRecognition(const char* name, MaaCustomRecognitionCallback recognition, void* trans_arg)
+{
+    LogFunc << VAR(name) << VAR_VOIDP(recognition) << VAR_VOIDP(trans_arg);
+
+    if (!name || !recognition) {
+        LogError << "name or recognition is null";
+        return false;
+    }
+
+    return MAA_AGENT_SERVER_NS::AgentServer::get_instance().register_custom_recognition(name, recognition, trans_arg);
+}
+
+MaaBool MaaAgentServerRegisterCustomAction(const char* name, MaaCustomActionCallback action, void* trans_arg)
+{
+    LogFunc << VAR(name) << VAR_VOIDP(action) << VAR_VOIDP(trans_arg);
+
+    if (!name || !action) {
+        LogError << "name or action is null";
+        return false;
+    }
+
+    return MAA_AGENT_SERVER_NS::AgentServer::get_instance().register_custom_action(name, action, trans_arg);
+}