refactor: use ipc client provided in common lib

Author: NoaLand

infra/CMakeLists.txt

@@ -1,2 +1 @@
 add_subdirectory(tsf)
-add_subdirectory(ipc)

infra/ipc/CMakeLists.txt

@@ -27,9 +27,10 @@ target_include_directories(modian_brush_tsf PUBLIC
 )
 
 target_link_libraries(modian_brush_tsf PRIVATE
+    modian::common::core::ipc
     modian::common::core::logger
     modian::common::service::protocol
-    modian::brush::ipc
+    modian::common::infra::ipc
 )
 
 add_library(modian::brush::tsf ALIAS modian_brush_tsf)

infra/ipc/include/modian/ipc/input_protocol_pipe_client.h

@@ -5,7 +5,7 @@
 #include <memory>
 
 #include "modian/common/core/protocol/v1/input/instruction.h"
-#include "modian/ipc/input_protocol_pipe_client.h"
+#include "modian/common/core/ipc/isync_ipc_client.h"
 
 namespace modian::brush::infra::tsf {
 	constexpr auto parse_content = [](const auto& p){ return p.payload; };
@@ -42,7 +42,7 @@ namespace modian::brush::infra::tsf {
 		std::wstring input_pinyin_;
 		TfClientId client_id_ = TF_CLIENTID_NULL;
 
-		std::shared_ptr<ipc::input_protocol_pipe_client> input_protocol_pipe_client_;
+		std::unique_ptr<common::core::ipc::isync_ipc_client<std::string, std::string>> input_protocol_ipc_client_;
 
 	public:
 		ITfComposition* current_composition_{nullptr};

infra/ipc/src/input_protocol_pipe_client.cpp

@@ -9,10 +9,14 @@
 #include "modian/common/core/protocol/v1/input/key_event.h"
 #include "modian/common/service/protocol/input_protocol_service.h"
 
+#include "modian/common/infra/ipc/ipc_client_factory.h"
+
 namespace modian::brush::infra::tsf {
+	const std::string INPUT_PROTOCOL_PIPE_NAME = R"(\\.\pipe\modian_input_protocol_pipe)";
+
     tsf_key_event_service::tsf_key_event_service(IUnknown* owner)
         : owner_{owner},
-          input_protocol_pipe_client_{std::make_shared<ipc::input_protocol_pipe_client>()} {}
+          input_protocol_ipc_client_{modian::common::infra::ipc::ipc_client_factory::create_sync_ipc_client(INPUT_PROTOCOL_PIPE_NAME)} {}
 
     bool tsf_key_event_service::_is_key_supported(const WPARAM vk_code) {
         return (vk_code >= 'A' && vk_code <= 'Z') || (vk_code == VK_BACK) || (vk_code == VK_SPACE) || (vk_code == VK_LEFT) || (vk_code == VK_RIGHT);
@@ -42,7 +46,7 @@ namespace modian::brush::infra::tsf {
 
             const auto key_event = common::core::protocol::input::v1::key_event::from_os_key(w_param);
             const std::string req_data = common::service::input_protocol_service::build_key_event_request(key_event);
-            const std::string response = input_protocol_pipe_client_->send_and_wait(req_data);
+            const std::string response = input_protocol_ipc_client_->sync_send(req_data);
             const auto [content, is_commit] = common::service::input_protocol_service::parse_instruction_response(response)
                 .unpack(parse_content, parse_commit_flag);
 

infra/tsf/CMakeLists.txt

@@ -15,7 +15,8 @@ add_executable(modian_brush_integration_tests
 )
 
 target_link_libraries(modian_brush_integration_tests PRIVATE
-    modian::brush::ipc
+    modian::common::core::ipc
+    modian::common::infra::ipc
     modian::brush::tsf
     modian::brush
     gtest_main

infra/tsf/include/modian/tsf/tsf_key_event_service.h

@@ -3,7 +3,8 @@
 #include <filesystem>
 #include <string>
 #include <thread>
-#include "modian/ipc/input_protocol_pipe_client.h"
+
+#include "modian/common/infra/ipc/ipc_client_factory.h"
 
 namespace fs = std::filesystem;
 
@@ -58,25 +59,26 @@ class InkstoneIntegrationTest : public ::testing::Test {
 };
 
 TEST_F(InkstoneIntegrationTest, DISABLED_ConnectAndInput) {
-    modian::brush::infra::ipc::input_protocol_pipe_client client;
+	const std::string INPUT_PROTOCOL_PIPE_NAME = R"(\\.\pipe\modian_input_protocol_pipe)";
+    auto client = modian::common::infra::ipc::ipc_client_factory::create_sync_ipc_client(INPUT_PROTOCOL_PIPE_NAME);
 
-    std::string response = client.send_and_wait("n");
-    response = client.send_and_wait("i");
+    std::string response = client->sync_send("n");
+    response = client->sync_send("i");
     EXPECT_EQ(response, "C:你");
 
-    client.send_and_wait("h");
-    client.send_and_wait("a");
-    response = client.send_and_wait("o");
+    client->sync_send("h");
+    client->sync_send("a");
+    response = client->sync_send("o");
     EXPECT_EQ(response, "C:好");
 
 
-    client.send_and_wait("m");
-    response = client.send_and_wait("o");
+    client->sync_send("m");
+    response = client->sync_send("o");
     EXPECT_EQ(response, "C:墨");
 
-    client.send_and_wait("d");
-    client.send_and_wait("i");
-    client.send_and_wait("a");
-    response = client.send_and_wait("n");
+    client->sync_send("d");
+    client->sync_send("i");
+    client->sync_send("a");
+    response = client->sync_send("n");
     EXPECT_EQ(response, "C:点");
-}
+}

infra/tsf/src/tsf_key_event_service.cpp

@@ -1,14 +1,13 @@
 add_executable(modian_brush_unit_tests
     infra/tsf/dll_main_test.cpp
-    infra/ipc/input_protocol_pipe_client_test.cpp
 )
 
 target_include_directories(modian_brush_unit_tests PRIVATE ${CMAKE_SOURCE_DIR}/tests/unit_tests/include)
 
 target_link_libraries(modian_brush_unit_tests PRIVATE
     modian::common::core::protocol
+    modian::common::core::ipc
     modian::common::core::logger
-    modian::brush::ipc
     modian::brush::tsf
     modian::brush
     gtest_main