[BugFix]Add try catch to deal with worker->join() crash

1. add try-catch for thread->join()
2. unify kInvalidSocket.

Author: RovicnowYoyi

debug_router/native/base/socket_guard.h

@@ -9,36 +9,37 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #define CLOSESOCKET closesocket
+typedef SOCKET SocketType;
+constexpr SocketType kInvalidSocket = INVALID_SOCKET;
 #else
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
-#define SOCKET int
 #define CLOSESOCKET close
+typedef int SocketType;
+constexpr SocketType kInvalidSocket = -1;
 #endif
 
-constexpr SOCKET kInvalidSocket = 0;
-
 namespace debugrouter {
 namespace base {
 
 class SocketGuard {
  public:
-  SOCKET Get() const { return sock_; }
+  SocketType Get() const { return sock_; }
 
-  explicit SocketGuard(SOCKET sock) : sock_(sock) {}
+  explicit SocketGuard(SocketType sock) : sock_(sock) {}
 
   ~SocketGuard() {
-    if (sock_ != 0) {
+    if (sock_ != kInvalidSocket) {
       CLOSESOCKET(sock_);
     }
   }
   SocketGuard(const SocketGuard&) = delete;
   SocketGuard& operator=(const SocketGuard&) = delete;
 
  private:
-  SOCKET sock_;
+  SocketType sock_;
 };
 
 }  // namespace base

debug_router/native/net/websocket_task.cc

@@ -125,8 +125,18 @@ void WebSocketTask::SendInternal(const std::string &data) {
   *reinterpret_cast<uint32_t *>(prefix + prefix_len) = 0;
   prefix_len += 4;
 
-  send(socket_guard_->Get(), (char *)prefix, prefix_len, 0);
-  send(socket_guard_->Get(), buf, payloadLen, 0);
+  if (!socket_guard_) {
+    onFailure();
+    return;
+  }
+  if (send(socket_guard_->Get(), (char *)prefix, prefix_len, 0) == -1) {
+    onFailure();
+    return;
+  }
+  if (send(socket_guard_->Get(), buf, payloadLen, 0) == -1) {
+    onFailure();
+    return;
+  }
 }
 
 void WebSocketTask::start() {
@@ -230,6 +240,11 @@ bool WebSocketTask::do_read(std::string &msg) {
     uint8_t mask_payload_len;
   } head;
 
+  if (!socket_guard_) {
+    onFailure();
+    return false;
+  }
+
   if (recv(socket_guard_->Get(), (char *)&head, sizeof(head), 0) !=
       sizeof(head)) {
     LOGE("failed to read websocket message");

debug_router/native/socket/work_thread_executor.cc

@@ -4,6 +4,8 @@
 
 #include "debug_router/native/socket/work_thread_executor.h"
 
+#include "debug_router/native/log/logging.h"
+
 namespace debugrouter {
 namespace base {
 
@@ -38,7 +40,12 @@ void WorkThreadExecutor::shutdown() {
   cond.notify_all();
 
   if (worker && worker->joinable()) {
-    worker->join();
+    try {
+      worker->join();
+    } catch (const std::exception& e) {
+      LOGE("WorkThreadExecutor::shutdown worker->detach() failed, "
+           << e.what());
+    }
   }
   worker.reset();
 }