[Optimize]Add macro to decide whether to implement transceiver logic

Add ENABLE_MESSAGE_IMPL to control whether to implement message transceiver, enabled by default.

Author: RovicnowYoyi

DebugRouter.podspec

@@ -49,4 +49,9 @@ Pod::Spec.new do |s|
       ssp.private_header_files = 'third_party/jsoncpp/**/*.{h}', 'third_party/jsoncpp/**/*.{inl}'
     end
   end
+
+  s.subspec "MessageTransceiverEnable" do |sp|
+    sp.source_files = ''
+    sp.pod_target_xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => "ENABLE_MESSAGE_IMPL=1 $(inherited)" }
+  end
 end

debug_router/android/debug_router/CMakeLists.txt

@@ -71,6 +71,12 @@ if ((ENABLE_16KB_ALIGN MATCHES "true"))
     endif()
 endif()
 
+MESSAGE(WARNING "Received ENABLE_MESSAGE_IMPL: ${ENABLE_MESSAGE_IMPL}")
+if ((ENABLE_MESSAGE_IMPL MATCHES "true"))
+    MESSAGE(WARNING "Enable message implementation")
+    add_definitions(-DENABLE_MESSAGE_IMPL=1)
+endif()
+
 # liblynxdebugrouter
 target_link_libraries(lynxdebugrouter
     ${log-lib}

debug_router/android/debug_router/build.gradle

@@ -34,6 +34,7 @@ android {
                             '-DANDROID_TOOLCHAIN=clang',
                             '-DANDROID_STL=c++_static',
                             ("-DENABLE_16KB_ALIGN="+enable16KBAlign).toString(),
+                            '-DENABLE_MESSAGE_IMPL=true',
                             '-DCMAKE_BUILD_TYPE=Release',
                             '-DLOCAL_ARM_NEON=true',
                             '-LH'
@@ -54,6 +55,7 @@ android {
                             '-DBUILD_LEPUS_COMPILE=false',
                             '-DANDROID_TOOLCHAIN=clang',
                             ("-DENABLE_16KB_ALIGN="+enable16KBAlign).toString(),
+                            '-DENABLE_MESSAGE_IMPL=true',
                             '-DLOCAL_ARM_NEON=true',
                             '-LH'
 

debug_router/common/BUILD.gn

@@ -30,14 +30,14 @@ config("debug_router_private_config") {
   ]
 }
 
-config("debug_router_config") {
+config("debug_router_message_impl_config") {
   include_dirs = [ "." ]
 
-  defines = [ "JSON_USE_EXCEPTION=0" ]
+  defines = [ "ENABLE_MESSAGE_IMPL=1" ]
 }
 
 source_set("debug_router_source") {
-  public_configs = [ ":debug_router_config" ]
+  public_configs = [ ":debug_router_message_impl_config" ]
   configs += [ ":debug_router_private_config" ]
 
   sources = [

debug_router/native/BUILD.gn

@@ -5,7 +5,10 @@
 import("//build/config/harmony/config.gni")
 
 source_set("debug_router_core") {
-  defines = [ "JSON_USE_EXCEPTION=0" ]
+  defines = [
+    "JSON_USE_EXCEPTION=0",
+    "ENABLE_MESSAGE_IMPL=1",
+  ]
 
   include_dirs = [
     ".",

debug_router/native/core/debug_router_core.cc

@@ -126,13 +126,16 @@ DebugRouterCore::DebugRouterCore()
       retry_times_(0),
       handler_count_(1),
       is_first_connect_(UNINIT) {
-  message_transceivers_.push_back(std::make_shared<net::WebSocketClient>());
-  message_transceivers_.push_back(std::make_shared<net::SocketServerClient>());
-
-  for (auto it = message_transceivers_.begin();
-       it != message_transceivers_.end(); ++it) {
-    (*it)->Init();
-    (*it)->SetDelegate(this);
+#if ENABLE_MESSAGE_IMPL
+  size_t transceiver_count = 0;
+  message_transceivers_[transceiver_count++] =
+      std::make_shared<net::WebSocketClient>();
+  message_transceivers_[transceiver_count++] =
+      std::make_shared<net::SocketServerClient>();
+#endif
+  for (size_t i = 0; i < kTransceiverCount; ++i) {
+    message_transceivers_[i]->Init();
+    message_transceivers_[i]->SetDelegate(this);
   }
   std::unique_ptr<processor::MessageHandler> handler =
       std::make_unique<MessageHandlerCore>();
@@ -219,9 +222,8 @@ void DebugRouterCore::Connect(const std::string &url, const std::string &room,
       "connect. retry times: " << retry_times_.load(std::memory_order_relaxed));
   Disconnect();
   connection_state_.store(CONNECTING, std::memory_order_relaxed);
-  for (auto it = message_transceivers_.begin();
-       it != message_transceivers_.end(); ++it) {
-    if ((*it)->Connect(url)) {
+  for (size_t i = 0; i < kTransceiverCount; ++i) {
+    if (message_transceivers_[i]->Connect(url)) {
       break;
     }
   }

debug_router/native/core/debug_router_core.h

@@ -5,6 +5,7 @@
 #ifndef DEBUGROUTER_NATIVE_CORE_DEBUG_ROUTER_CORE_H_
 #define DEBUGROUTER_NATIVE_CORE_DEBUG_ROUTER_CORE_H_
 
+#include <array>
 #include <atomic>
 #include <cstdint>
 #include <memory>
@@ -42,6 +43,12 @@ typedef enum {
 
 class DebugRouterSlot;
 
+#if ENABLE_MESSAGE_IMPL
+static constexpr size_t kTransceiverCount = 2;
+#else
+static constexpr size_t kTransceiverCount = 0;
+#endif
+
 class DebugRouterCore : public MessageTransceiverDelegate {
  public:
   friend class MessageHandlerCore;
@@ -150,7 +157,8 @@ class DebugRouterCore : public MessageTransceiverDelegate {
                bool is_reconnect);
   std::atomic<ConnectionState> connection_state_;
   std::shared_ptr<MessageTransceiver> current_transceiver_;
-  std::vector<std::shared_ptr<MessageTransceiver> > message_transceivers_;
+  std::array<std::shared_ptr<MessageTransceiver>, kTransceiverCount>
+      message_transceivers_;
   int32_t max_session_id_;
   std::unique_ptr<report::DebugRouterNativeReport> report_;
   std::unique_ptr<debugrouter::processor::Processor> processor_;

test/e2e_test/ios_example/Podfile.lock

@@ -1,26 +1,26 @@
 PODS:
-  - DebugRouter (5.0.10):
-    - DebugRouter/Framework (= 5.0.10)
-    - DebugRouter/Native (= 5.0.10)
-    - DebugRouter/third_party (= 5.0.10)
-  - DebugRouter/Framework (5.0.10):
+  - DebugRouter/Framework (5.0.11):
     - DebugRouter/Native
-  - DebugRouter/Native (5.0.10):
+  - DebugRouter/MessageTransceiverEnable (5.0.11)
+  - DebugRouter/Native (5.0.11):
     - DebugRouter/third_party
-  - DebugRouter/third_party (5.0.10):
-    - DebugRouter/third_party/jsoncpp (= 5.0.10)
-  - DebugRouter/third_party/jsoncpp (5.0.10)
+  - DebugRouter/third_party (5.0.11):
+    - DebugRouter/third_party/jsoncpp (= 5.0.11)
+  - DebugRouter/third_party/jsoncpp (5.0.11)
 
 DEPENDENCIES:
-  - DebugRouter (from `../../../`)
+  - DebugRouter/Framework (from `../../../`)
+  - DebugRouter/MessageTransceiverEnable (from `../../../`)
+  - DebugRouter/Native (from `../../../`)
+  - DebugRouter/third_party (from `../../../`)
 
 EXTERNAL SOURCES:
   DebugRouter:
     :path: "../../../"
 
 SPEC CHECKSUMS:
-  DebugRouter: bd96ce2f2e3150f5c49cfbd29b80b684705fa325
+  DebugRouter: c27fcdfee7a0a0e54a8215b1c7f262d2e78f290c
 
-PODFILE CHECKSUM: 453f33108fffde859263ad6670787b0438d93813
+PODFILE CHECKSUM: 687a4d2578a15db938e619b1da87062723f6ab77
 
 COCOAPODS: 1.10.1