Reverse websocket detail done

Author: stdrc

src/api/handlers.cpp

@@ -372,7 +372,8 @@ HANDLER(get_status) {
         {"app_enabled", app.is_enabled()},
         {"server_initialized", ApiServer::instance().is_initialized()},
         {"http_server_started", ApiServer::instance().http_server_is_started()},
-        {"ws_server_started", ApiServer::instance().ws_server_is_started()}
+        {"ws_server_started", ApiServer::instance().ws_server_is_started()},
+        {"ws_reverse_api_client_started", ApiServer::instance().ws_reverse_api_client_is_started()}
     };
 }
 

src/api/server_class.cpp

@@ -395,7 +395,7 @@ void ApiServer::start() {
     }
 
     if (config.use_ws_reverse /* use ws reverse */
-        && ws_reverse_api_client_is_wss_.has_value() /* client successfully initialized */) {
+        && ws_reverse_api_client_is_wss_.has_value() /* successfully initialized */) {
         ws_reverse_api_client_started_ = true;
         ws_reverse_api_thread_ = thread([&]() {
             if (ws_reverse_api_client_is_wss_.value() == false) {
@@ -466,28 +466,31 @@ static bool push_ws_reverse_event(const string &server_port_path, const json &pa
     return succeeded;
 }
 
-size_t ApiServer::push_event(const json &payload) const {
-    if (!ws_server_started_) {
-        return 0;
-    }
-
-    size_t count = 0;
-    for (const auto &connection : ws_server_->get_connections()) {
-        if (boost::algorithm::starts_with(connection->path, "/event")) {
-            const auto send_stream = make_shared<WsServer::SendStream>();
-            *send_stream << payload.dump();
-            connection->send(send_stream);
-            count++;
+void ApiServer::push_event(const json &payload) const {
+    if (ws_server_started_) {
+        Log::d(TAG, u8"开始通过 WebSocket 服务端推送事件");
+        size_t count = 0;
+        for (const auto &connection : ws_server_->get_connections()) {
+            if (boost::algorithm::starts_with(connection->path, "/event")) {
+                const auto send_stream = make_shared<WsServer::SendStream>();
+                *send_stream << payload.dump();
+                connection->send(send_stream);
+                count++;
+            }
         }
+        Log::d(TAG, u8"已成功向 " + to_string(count) + u8" 个客户端推送事件");
     }
 
-    if (ws_reverse_event_client_is_wss_.has_value()) {
+    if (config.use_ws_reverse /* use ws reverse */
+        && ws_reverse_event_client_is_wss_.has_value() /* successfully initialized */) {
+        Log::d(TAG, u8"开始通过 WebSocket 反向客户端上报事件");
+        bool succeeded;
         if (ws_reverse_event_client_is_wss_.value() == false) {
-            push_ws_reverse_event<WsClient>(ws_reverse_event_server_port_path_, payload);
+            succeeded = push_ws_reverse_event<WsClient>(ws_reverse_event_server_port_path_, payload);
         } else {
-            push_ws_reverse_event<WssClient>(ws_reverse_event_server_port_path_, payload);
+            succeeded = push_ws_reverse_event<WssClient>(ws_reverse_event_server_port_path_, payload);
         }
-    }
 
-    return count;
+        Log::d(TAG, u8"通过 WebSocket 反向客户端上报数据到 " + config.ws_reverse_event_url + (succeeded ? u8" 成功" : u8" 失败"));
+    }
 }

src/api/server_class.h

@@ -39,9 +39,10 @@ class ApiServer {
     bool is_initialized() const { return initialized_; }
     bool http_server_is_started() const { return http_server_started_; }
     bool ws_server_is_started() const { return ws_server_started_; }
+    bool ws_reverse_api_client_is_started() const { return ws_reverse_api_client_started_; }
 
     // websocket only
-    size_t push_event(const json &payload) const;
+    void push_event(const json &payload) const;
 
 private:
     ApiServer() {}

src/event/events.cpp

@@ -97,11 +97,7 @@ static int32_t post_event(const json &payload, const function<void(const Params
         }
     }
 
-    if (ApiServer::instance().ws_server_is_started()) {
-        Log::d(TAG, u8"开始通过 WebSocket 推送事件");
-        const auto client_count = ApiServer::instance().push_event(payload);
-        Log::d(TAG, u8"已成功向 " + to_string(client_count) + u8" 个客户端推送事件");
-    }
+    ApiServer::instance().push_event(payload);
 
     return should_block ? CQEVENT_BLOCK : CQEVENT_IGNORE;
 }