chore: 一些封装调整

MaaXYZ · Feb 23, 2025 · b5debb4 · b5debb4
1 parent 675a989
commit b5debb4
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 53 deletions.
diff --git a/source/MaaAgentClient/Client/AgentClient.cpp b/source/MaaAgentClient/Client/AgentClient.cpp
@@ -138,7 +138,7 @@ std::optional<json::value> AgentClient::recv()
     zmq::message_t msg;
     auto size_opt = child_sock_.recv(msg);
     if (!size_opt || *size_opt == 0) {
-        LogError << "failed to recv msg";
+        LogError << "failed to recv msg" << VAR(ipc_addr_);
         return std::nullopt;
     }
 
@@ -147,7 +147,7 @@ std::optional<json::value> AgentClient::recv()
 
     auto jopt = json::parse(str);
     if (!jopt) {
-        LogError << "failed to parse msg";
+        LogError << "failed to parse msg" << VAR(ipc_addr_);
         return std::nullopt;
     }
 
@@ -163,20 +163,25 @@ bool AgentClient::recv_and_handle_start_up_response()
         return false;
     }
 
-    auto msg_opt = recv<StartUpResponse>();
-    if (!msg_opt) {
-        LogError << "failed to recv StartUpResponse";
+    auto jopt = recv();
+    if (!jopt) {
+        LogError << "failed to recv msg" << VAR(ipc_addr_);
+        return false;
+    }
+    const json::value& j = *jopt;
+    if (!j.is<StartUpResponse>()) {
+        LogError << "unexpected msg" << VAR(j) << VAR(ipc_addr_);
         return false;
     }
 
-    const StartUpResponse& msg = *msg_opt;
-    LogInfo << VAR(msg);
+    auto resp = j.as<StartUpResponse>();
+    LogInfo << VAR(resp);
 
-    for (const auto& reco : msg.recognitions) {
+    for (const auto& reco : resp.recognitions) {
         LogTrace << VAR(reco);
         resource_->register_custom_recognition(reco, reco_agent, this);
     }
-    for (const auto& act : msg.actions) {
+    for (const auto& act : resp.actions) {
         LogTrace << VAR(act);
         resource_->register_custom_action(act, action_agent, this);
     }

diff --git a/source/MaaAgentClient/Client/AgentClient.h b/source/MaaAgentClient/Client/AgentClient.h
@@ -23,22 +23,9 @@ class AgentClient : public MaaAgentClient
 
 private:
     std::string create_socket();
-
     bool send(const json::value& j);
-
     std::optional<json::value> recv();
 
-    template <typename T>
-    std::optional<T> recv()
-    {
-        auto jopt = recv();
-        if (!jopt) {
-            return std::nullopt;
-        }
-        const json::value& j = *jopt;
-        return j.is<T>() ? std::make_optional(j.as<T>()) : std::nullopt;
-    }
-
     template <typename ResponseT, typename RequestT>
     std::optional<ResponseT> send_and_recv(const RequestT& req, std::function<bool(const json::value&)> reverse_request_handler = nullptr)
     {

diff --git a/source/MaaAgentServer/RemoteInstance/RemoteContext.cpp b/source/MaaAgentServer/RemoteInstance/RemoteContext.cpp
@@ -1,5 +1,7 @@
 #include "RemoteContext.h"
 
+#include "MaaAgent/Message.hpp"
+
 MAA_AGENT_SERVER_NS_BEGIN
 
 RemoteContext::RemoteContext(const std::string& context_id)

diff --git a/source/MaaAgentServer/RemoteInstance/RemoteObject.cpp b/source/MaaAgentServer/RemoteInstance/RemoteObject.cpp
@@ -0,0 +1,5 @@
+#include "RemoteObject.h"
+
+MAA_AGENT_SERVER_NS_BEGIN
+
+MAA_AGENT_SERVER_NS_END
diff --git a/source/MaaAgentServer/RemoteInstance/RemoteObject.h b/source/MaaAgentServer/RemoteInstance/RemoteObject.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "Common/MaaTypes.h"
+
+MAA_AGENT_SERVER_NS_BEGIN
+
+class RemoteObject
+{
+public:
+    virtual ~RemoteObject() = default;
+
+    template <typename ResponseT, typename RequestT>
+    std::optional<ResponseT> send_and_recv(const RequestT& req)
+    {
+    }
+
+private:
+    bool send(const json::value& j);
+    std::optional<json::value> recv();
+};
+
+MAA_AGENT_SERVER_NS_END
diff --git a/source/MaaAgentServer/Server/AgentServer.cpp b/source/MaaAgentServer/Server/AgentServer.cpp
@@ -173,7 +173,7 @@ std::optional<json::value> AgentServer::recv()
     return *jopt;
 }
 
-bool AgentServer::recv_and_handle_recognition_request(const json::value& j)
+bool AgentServer::handle_recognition_request(const json::value& j)
 {
     if (!j.is<CustomRecognitionRequest>()) {
         return false;
@@ -226,7 +226,7 @@ bool AgentServer::recv_and_handle_recognition_request(const json::value& j)
     return true;
 }
 
-bool AgentServer::recv_and_handle_action_request(const json::value& j)
+bool AgentServer::handle_action_request(const json::value& j)
 {
     if (!j.is<CustomActionRequest>()) {
         return false;
@@ -270,7 +270,7 @@ bool AgentServer::recv_and_handle_action_request(const json::value& j)
     return true;
 }
 
-bool AgentServer::recv_and_handle_shut_down_request(const json::value& j)
+bool AgentServer::handle_shut_down_request(const json::value& j)
 {
     if (!j.is<ShutDownRequest>()) {
         return false;
@@ -293,20 +293,25 @@ void AgentServer::request_msg_loop()
         auto msg_opt = recv();
         if (!msg_opt) {
             LogError << "failed to recv msg" << VAR(ipc_addr_);
-            continue;
+            return;
         }
         const json::value& j = *msg_opt;
-        LogInfo << VAR(j) << VAR(ipc_addr_);
+        handle_request(j);
+    }
+}
 
-        if (recv_and_handle_recognition_request(j)) {
-        }
-        else if (recv_and_handle_action_request(j)) {
-        }
-        else if (recv_and_handle_shut_down_request(j)) {
-        }
-        else {
-            LogError << "unknown msg" << VAR(j);
-        }
+void AgentServer::handle_request(const json::value& j)
+{
+    LogInfo << VAR(j) << VAR(ipc_addr_);
+
+    if (handle_recognition_request(j)) {
+    }
+    else if (handle_action_request(j)) {
+    }
+    else if (handle_shut_down_request(j)) {
+    }
+    else {
+        LogError << "unknown msg" << VAR(j);
     }
 }
 

diff --git a/source/MaaAgentServer/Server/AgentServer.h b/source/MaaAgentServer/Server/AgentServer.h
@@ -41,28 +41,17 @@ class AgentServer : public SingletonHolder<AgentServer>
 
 private:
     bool create_socket(const std::string& ipc_addr);
-
     bool send(const json::value& j);
-    bool send_start_up_response();
-
     std::optional<json::value> recv();
 
-    template <typename T>
-    std::optional<T> recv()
-    {
-        auto jopt = recv();
-        if (!jopt) {
-            return std::nullopt;
-        }
-        const json::value& j = *jopt;
-        return j.is<T>() ? std::make_optional(j.as<T>()) : std::nullopt;
-    }
-
-    bool recv_and_handle_recognition_request(const json::value& j);
-    bool recv_and_handle_action_request(const json::value& j);
-    bool recv_and_handle_shut_down_request(const json::value& j);
+    bool send_start_up_response();
+
+    bool handle_recognition_request(const json::value& j);
+    bool handle_action_request(const json::value& j);
+    bool handle_shut_down_request(const json::value& j);
 
     void request_msg_loop();
+    void handle_request(const json::value& j);
 
 private:
     std::unordered_map<std::string, CustomRecognitionSession> custom_recognitions_;