refactor: 重构整个ControlUnit

.gitignore

@@ -434,16 +434,7 @@ FodyWeavers.xsd
 .idea/
 *.sln.iml
 
-enc_temp_folder/*
-
-# Nuke
-.nuke/temp/*
-
-# test install dir
-install
-
+# chore
 .DS_Store
-
-source/MaaRpc/generated/*.h
-source/MaaRpc/generated/*.cc
-source/MaaRpc/generated/*.timestamp
+.nuke/temp/*
+enc_temp_folder/*

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.24)
-project(MAA)
+project(MaaFw)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
 
@@ -9,12 +9,16 @@ set(CMAKE_MAP_IMPORTED_CONFIG_DebWithRelDeps "DebWithRelDeps;Release;")
 set(Boost_NO_WARN_NEW_VERSIONS 1)
 
 option(USE_MAADEPS "use third-party libraries built by MaaDeps" ON)
+
 option(WITH_ADB_CONTROLLER "build with adb controller" ON)
 option(WITH_THRIFT_CONTROLLER "build with thrift controller" ON)
 option(WITH_DBG_CONTROLLER "build with debugging controller" ON)
 option(WITH_GRPC "build with protobuf and grpc" ON)
+
 option(BUILD_GRPC_CLI "build grpc CLI exec" ON)
+
 option(BUILD_SAMPLE "build a demo" OFF)
+
 option(BUILD_PIPELINE_TESTING "build pipeline testing" OFF)
 option(BUILD_GRPC_TESTING "build grpc testing" OFF)
 

cmake/grpc-gen.cmake

@@ -23,6 +23,8 @@ macro(GENERATE_GRPC_LIB LIB_NAME IN_DIR OUT_DIR GEN_SRCS)
     set(${LIB_NAME}_INCLUDE_DIRS ${OUT_DIR})
     set(${GEN_SRCS} ${SRCS})
 
+    set_target_properties(${LIB_NAME} PROPERTIES FOLDER "Generated")
+
     source_group("generated" FILES ${SRCS})
     source_group("proto" FILES ${PROTOS})
 endmacro()

cmake/thrift-gen.cmake

@@ -8,14 +8,16 @@ macro(GENERATE_THRIFT_LIB LIB_NAME FILENAME OUTPUTDIR SOURCES)
     if(CMD_RESULT)
         message(FATAL_ERROR "Error generating ${FILENAME} with generator ${GENERATOR}")
     endif()
-    file(GLOB_RECURSE GENERATED_SOURCES ${OUTPUTDIR}/*.cpp)
-    add_library(${LIB_NAME} SHARED ${GENERATED_SOURCES})
+    file(GLOB_RECURSE GENERATED_SOURCES ${OUTPUTDIR}/*.cpp ${OUTPUTDIR}/*.h ${OUTPUTDIR}/*.hpp)
+    add_library(${LIB_NAME} STATIC ${GENERATED_SOURCES} ${FILENAME})
     set_target_properties(${LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
     target_link_libraries(${LIB_NAME} thrift::thrift)
     set(${LIB_NAME}_INCLUDE_DIRS
         ${OUTPUTDIR}
         PARENT_SCOPE)
     set(${SOURCES} ${GENERATED_SOURCES})
+
+    set_target_properties(${LIB_NAME} PROPERTIES FOLDER "Generated")
 
     source_group("generated" FILES ${GENERATED_SOURCES})
     source_group("thrift" FILES ${FILENAME})

include/Interface/ThriftControlUnit.thrift → include/Interface/ThriftController.thrift

@@ -1,4 +1,4 @@
-namespace cpp ThriftControlUnit
+namespace cpp ThriftController
 
 struct Point {
   1: i32 x,
@@ -31,15 +31,18 @@ struct Size {
 }
 
 struct CustomImage {
-  1: Size size,
-  2: i32 type,
-  3: binary data,
+  1: binary png_data,
 }
 
-service ThriftControlUnit {
-  bool set_option(1: string key, 2: string value),
-
+service ThriftController {
   bool connect(),
+
+  string get_uuid(),
+  Size get_resolution(),
+
+  bool start_app(1: string entry),
+  bool stop_app(1: string entry),
+
   bool click(1: ClickParam param),
   bool swipe(1: SwipeParam param),
 
@@ -49,11 +52,5 @@ service ThriftControlUnit {
 
   bool press_key(1: PressKeyParam param),
 
-  bool start_game(1: string activity),
-  bool stop_game(1: string activity),
-
-  Size get_resolution(),
-
-  string get_uuid(),
   CustomImage screencap(),
 }

include/MaaFramework/MaaDef.h

@@ -156,6 +156,15 @@ enum MaaDbgControllerTypeEnum
     MaaDbgControllerType_ReplayRecording = 2,
 };
 
+typedef int32_t MaaThriftControllerType;
+enum MaaThriftControllerTypeEnum
+{
+    MaaThriftController_Invalid = 0,
+
+    MaaThriftControllerType_Socket = 1,
+    MaaThriftControllerType_UnixDomainSocket = 2,
+};
+
 typedef void* MaaTransparentArg;
 typedef MaaTransparentArg MaaCallbackTransparentArg;