Remove user from transmission when websocket closed

tests/signal_server/signal_server.cpp

@@ -55,6 +55,7 @@ bool SignalServer::on_open(websocketpp::connection_hdl hdl) {
 
 bool SignalServer::on_close(websocketpp::connection_hdl hdl) {
   LOG_INFO("Websocket onnection [{}] closed", ws_connection_id_);
+  bool ret = transmission_manager_.ReleaseUserIdFromTransmission(hdl);
   ws_connections_.erase(hdl);
   return true;
 }
@@ -114,16 +115,9 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
         }
         transmission_list_.insert(transmission_id);
 
-        // transmission_manager_.BindWsHandleToTransmission(hdl,
-        // transmission_id);
         transmission_manager_.BindUserIdToTransmission(user_id,
                                                        transmission_id);
         transmission_manager_.BindUserIdToWsHandle(user_id, hdl);
-        // transmission_manager_.BindUserNameToUserId("host", user_id);
-
-        // if (transmission_manager_.GetUsername(hdl).empty()) {
-        //   transmission_manager_.BindUsernameToWsHandle("host", hdl);
-        // }
 
         LOG_INFO("Create transmission id [{}]", transmission_id);
         json message = {{"type", "transmission_id"},
@@ -141,17 +135,17 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
 
       break;
     }
-    case "query_members"_H: {
+    case "query_user_id_list"_H: {
       std::string transmission_id = j["transmission_id"].get<std::string>();
-      std::vector<std::string> member_list =
-          transmission_manager_.GetAllMembersOfTransmission(transmission_id);
+      std::vector<std::string> user_id_list =
+          transmission_manager_.GetAllUserIdOfTransmission(transmission_id);
 
-      json message = {{"type", "transmission_members"},
+      json message = {{"type", "user_id_list"},
                       {"transmission_id", transmission_id},
-                      {"transmission_members", member_list},
+                      {"user_id_list", user_id_list},
                       {"status", "success"}};
 
-      LOG_INFO("Send member_list: [{}]", message.dump());
+      // LOG_INFO("Send member_list: [{}]", message.dump());
       send_msg(hdl, message);
       break;
     }
@@ -161,10 +155,6 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
       std::string user_id = j["user_id"].get<std::string>();
       std::string remote_user_id = j["remote_user_id"].get<std::string>();
 
-      // transmission_manager_.BindWsHandleToTransmission(hdl, transmission_id);
-      // std::string offer_peer = GetIceUsername(sdp);
-      // transmission_manager_.BindUsernameToWsHandle(offer_peer, hdl);
-
       transmission_manager_.BindUserIdToTransmission(user_id, transmission_id);
       transmission_manager_.BindUserIdToWsHandle(user_id, hdl);
 
@@ -176,7 +166,7 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
                       {"remote_user_id", user_id},
                       {"transmission_id", transmission_id}};
 
-      LOG_INFO("[{}] send offer sdp to [{}]", user_id, remote_user_id);
+      LOG_INFO("[{}] send offer to [{}]", user_id, remote_user_id);
       send_msg(destination_hdl, message);
 
       break;
@@ -187,25 +177,11 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
       std::string user_id = j["user_id"].get<std::string>();
       std::string remote_user_id = j["remote_user_id"].get<std::string>();
 
-      // transmission_manager_.BindUserIdToTransmission(user_id,
-      // transmission_id); transmission_manager_.BindUserIdToWsHandle(user_id,
-      // hdl);
-
       websocketpp::connection_hdl destination_hdl =
           transmission_manager_.GetWsHandle(remote_user_id);
 
-      // if (transmission_manager_.GetUsername(hdl) == "host") {
-      //   LOG_INFO("Update transmission [{}] [host] to [{}]", transmission_id,
-      //            host_ice_username);
-      //   transmission_manager_.UpdateUsernameToWsHandle(host_ice_username,
-      //   hdl);
-      // }
-
-      // websocketpp::connection_hdl guest_hdl =
-      //     transmission_manager_.GetWsHandle(guest_ice_username);
-
       // LOG_INFO("send answer sdp [{}]", sdp);
-      LOG_INFO("[{}] send answer sdp to [{}]", user_id, remote_user_id);
+      LOG_INFO("[{}] send answer to [{}]", user_id, remote_user_id);
       json message = {{"type", "remote_sdp"},
                       {"sdp", sdp},
                       {"remote_user_id", user_id},

tests/signal_server/transmission_manager.cpp

@@ -6,135 +6,8 @@ TransmissionManager::TransmissionManager() {}
 
 TransmissionManager::~TransmissionManager() {}
 
-// bool TransmissionManager::BindHostToTransmission(
-//     websocketpp::connection_hdl hdl, const std::string& transmission_id) {
-//   if (transmission_host_list_.find(transmission_id) !=
-//       transmission_host_list_.end()) {
-//     LOG_WARN("Transmission already has a host [{}]",
-//              transmission_host_list_[transmission_id].lock().get());
-//     return false;
-//   } else {
-//     transmission_host_list_[transmission_id] = hdl;
-//   }
-//   return true;
-// }
-
-// bool TransmissionManager::BindGuestToTransmission(
-//     websocketpp::connection_hdl hdl, const std::string& transmission_id) {
-//   if (transmission_guest_list_.find(transmission_id) !=
-//       transmission_guest_list_.end()) {
-//     transmission_guest_list_[transmission_id].push_back(hdl);
-//   } else {
-//     std::vector<websocketpp::connection_hdl> guest_hdl_list;
-//     guest_hdl_list.push_back(hdl);
-//     transmission_guest_list_[transmission_id] = guest_hdl_list;
-//   }
-//   return true;
-// }
-
-// bool TransmissionManager::ReleaseHostFromTransmission(
-//     websocketpp::connection_hdl hdl, const std::string& transmission_id) {
-//   return true;
-// }
-
-// bool TransmissionManager::ReleaseGuestFromTransmission(
-//     websocketpp::connection_hdl hdl, const std::string& transmission_id) {
-//   return true;
-// }
-
-// bool TransmissionManager::BindHostUsernameToWsHandle(
-//     websocketpp::connection_hdl hdl) {
-//   if (transmission_host_username_list_.find("host") !=
-//       transmission_host_username_list_.end()) {
-//     LOG_ERROR("Host already exist");
-//     return false;
-//   } else {
-//     transmission_host_username_list_["host"] = hdl;
-//   }
-//   return true;
-// }
-
-// bool TransmissionManager::UpdateHostUsernameToWsHandle(
-//     const std::string& host_username, websocketpp::connection_hdl hdl) {
-//   if (transmission_host_username_list_.find("host") ==
-//       transmission_host_username_list_.end()) {
-//     LOG_ERROR("Host not exist");
-//     return false;
-//   }
-//   transmission_host_username_list_.erase("host");
-//   transmission_host_username_list_[host_username] = hdl;
-
-//   return true;
-// }
-
-// bool TransmissionManager::BindGuestUsernameToWsHandle(
-//     const std::string& guest_username, websocketpp::connection_hdl hdl) {
-//   if (transmission_guest_username_list_.find(guest_username) !=
-//       transmission_guest_username_list_.end()) {
-//     LOG_ERROR("Guest already bind to username [{}]", guest_username.c_str());
-//     return false;
-//   } else {
-//     transmission_guest_username_list_[guest_username] = hdl;
-//   }
-//   return true;
-// }
-
-// websocketpp::connection_hdl TransmissionManager::GetHostOfTransmission(
-//     const std::string& transmission_id) {
-//   if (transmission_host_list_.find(transmission_id) !=
-//       transmission_host_list_.end()) {
-//     return transmission_host_list_[transmission_id];
-//   } else {
-//     websocketpp::connection_hdl hdl;
-//     return hdl;
-//   }
-// }
-
-// std::string TransmissionManager::GetHostUsername(
-//     websocketpp::connection_hdl hdl) {
-//   for (auto host : transmission_host_username_list_) {
-//     if (host.second.lock().get() == hdl.lock().get()) return host.first;
-//   }
-
-//   return "";
-// }
-
-// std::string TransmissionManager::GetGuestUsername(
-//     websocketpp::connection_hdl hdl) {
-//   for (auto guest : transmission_guest_username_list_) {
-//     if (guest.second.lock().get() == hdl.lock().get()) return guest.first;
-//   }
-
-//   return "";
-// }
-
-std::vector<websocketpp::connection_hdl>
-TransmissionManager::GetAllGuestsOfTransmission(
+std::vector<std::string> TransmissionManager::GetAllUserIdOfTransmission(
     const std::string& transmission_id) {
-  if (transmission_user_ws_hdl_list_.find(transmission_id) !=
-      transmission_user_ws_hdl_list_.end()) {
-    return transmission_user_ws_hdl_list_[transmission_id];
-  } else {
-    return std::vector<websocketpp::connection_hdl>();
-  }
-}
-
-websocketpp::connection_hdl TransmissionManager::GetGuestWsHandle(
-    const std::string& guest_username) {
-  if (transmission_guest_username_list_.find(guest_username) !=
-      transmission_guest_username_list_.end()) {
-    return transmission_guest_username_list_[guest_username];
-  } else {
-    websocketpp::connection_hdl hdl;
-    return hdl;
-  }
-}
-
-std::vector<std::string> TransmissionManager::GetAllMembersOfTransmission(
-    const std::string& transmission_id) {
-  // for (auto guest_hdl : GetAllGuestsOfTransmission(transmission_id)) {
-  //   member_list.push_back(GetUsername(guest_hdl));
-  // }
   if (transmission_user_id_list_.find(transmission_id) !=
       transmission_user_id_list_.end()) {
     return transmission_user_id_list_[transmission_id];
@@ -143,44 +16,26 @@ std::vector<std::string> TransmissionManager::GetAllMembersOfTransmission(
   return std::vector<std::string>();
 }
 
-bool TransmissionManager::BindWsHandleToTransmission(
-    websocketpp::connection_hdl hdl, const std::string& transmission_id) {
-  if (transmission_user_ws_hdl_list_.find(transmission_id) ==
-      transmission_user_ws_hdl_list_.end()) {
-    transmission_user_ws_hdl_list_[transmission_id].push_back(hdl);
-    return true;
-  } else {
-    auto hdl_list = transmission_user_ws_hdl_list_[transmission_id];
-    for (auto h : hdl_list) {
-      if (h.lock().get() == hdl.lock().get()) {
-        LOG_ERROR("Ws handle [{}] already bind to transmission [{}]",
-                  hdl.lock().get(), transmission_id);
-        return false;
-      }
-    }
-    transmission_user_ws_hdl_list_[transmission_id].push_back(hdl);
-  }
-  return true;
-}
-
 bool TransmissionManager::BindUserIdToTransmission(
     const std::string& user_id, const std::string& transmission_id) {
   if (transmission_user_id_list_.find(transmission_id) ==
       transmission_user_id_list_.end()) {
-    LOG_INFO("Add user id [{}] to transmission [{}]", user_id, transmission_id);
     transmission_user_id_list_[transmission_id].push_back(user_id);
+    LOG_INFO("Bind user id [{}]  to transmission [{}]", user_id,
+             transmission_id);
     return true;
   } else {
     auto user_id_list = transmission_user_id_list_[transmission_id];
     for (auto id : user_id_list) {
       if (id == user_id) {
-        LOG_ERROR("User id [{}] already bind to transmission [{}]", user_id,
-                  transmission_id);
+        LOG_WARN("User id [{}] already bind to transmission [{}]", user_id,
+                 transmission_id);
         return false;
       }
     }
     transmission_user_id_list_[transmission_id].push_back(user_id);
-    LOG_INFO("Add user id [{}] to transmission [{}]", user_id, transmission_id);
+    LOG_INFO("Bind user id [{}]  to transmission [{}]", user_id,
+             transmission_id);
   }
   return true;
 }
@@ -188,8 +43,8 @@ bool TransmissionManager::BindUserIdToTransmission(
 bool TransmissionManager::BindUserIdToWsHandle(
     const std::string& user_id, websocketpp::connection_hdl hdl) {
   if (user_id_ws_hdl_list_.find(user_id) != user_id_ws_hdl_list_.end()) {
-    LOG_ERROR("User id already bind to websocket handle [{}]", user_id,
-              hdl.lock().get());
+    LOG_WARN("User id already bind to websocket handle [{}]", user_id,
+             hdl.lock().get());
     return false;
   } else {
     user_id_ws_hdl_list_[user_id] = hdl;
@@ -197,72 +52,46 @@ bool TransmissionManager::BindUserIdToWsHandle(
   return true;
 }
 
-bool TransmissionManager::BindUserNameToUserId(const std::string& user_name,
-                                               const std::string& user_id) {
-  if (user_name_user_id_list_.find(user_id) == user_name_user_id_list_.end()) {
-    user_name_user_id_list_[user_id].push_back(user_name);
-    return true;
-  } else {
-    auto user_name_list = user_name_user_id_list_[user_id];
-    for (auto name : user_name_list) {
-      if (name == user_name) {
-        LOG_ERROR("User name [{}] already bind to user id [{}]", user_name,
-                  user_id);
-        return false;
+bool TransmissionManager::ReleaseWsHandleFromTransmission(
+    websocketpp::connection_hdl hdl) {
+  for (auto trans_it = transmission_user_ws_hdl_list_.begin();
+       trans_it != transmission_user_ws_hdl_list_.end(); ++trans_it) {
+    auto hdl_list = trans_it->second;
+    for (auto it = hdl_list.begin(); it != hdl_list.end(); ++it) {
+      if (it->lock().get() == hdl.lock().get()) {
+        hdl_list.erase(it);
+        LOG_INFO("Remove ws handle [{}] from transmission [{}]",
+                 hdl.lock().get(), trans_it->first);
+        return true;
       }
     }
-    user_name_user_id_list_[user_id].push_back(user_name);
   }
-  return true;
+  return false;
 }
 
-bool TransmissionManager::ReleaseWsHandleFromTransmission(
-    websocketpp::connection_hdl hdl, const std::string& transmission_id) {
-  return true;
-}
-
-bool TransmissionManager::BindUsernameToWsHandle(
-    const std::string& username, websocketpp::connection_hdl hdl) {
-  if (username_ws_hdl_list_.find(username) != username_ws_hdl_list_.end()) {
-    LOG_ERROR("Guest already bind to username [{}]", username.c_str());
-    return false;
-  } else {
-    username_ws_hdl_list_[username] = hdl;
+bool TransmissionManager::ReleaseUserIdFromTransmission(
+    websocketpp::connection_hdl hdl) {
+  for (auto it = user_id_ws_hdl_list_.begin(); it != user_id_ws_hdl_list_.end();
+       ++it) {
+    if (it->second.lock().get() == hdl.lock().get()) {
+      for (auto trans_it = transmission_user_id_list_.begin();
+           trans_it != transmission_user_id_list_.end(); ++trans_it) {
+        auto& user_id_list = trans_it->second;
+        auto user_id_it =
+            std::find(user_id_list.begin(), user_id_list.end(), it->first);
+        if (user_id_it != user_id_list.end()) {
+          user_id_list.erase(user_id_it);
+          LOG_INFO("Remove user id [{}] from transmission [{}]", it->first,
+                   trans_it->first);
+          user_id_ws_hdl_list_.erase(it);
+          return true;
+        }
+      }
+    }
   }
-  return true;
+  return false;
 }
 
-bool TransmissionManager::UpdateUsernameToWsHandle(
-    const std::string& username, websocketpp::connection_hdl hdl) {
-  if (username_ws_hdl_list_.find("host") == username_ws_hdl_list_.end()) {
-    LOG_ERROR("Host not exist");
-    return false;
-  }
-  username_ws_hdl_list_.erase("host");
-  username_ws_hdl_list_[username] = hdl;
-
-  return true;
-}
-
-std::string TransmissionManager::GetUsername(websocketpp::connection_hdl hdl) {
-  for (auto guest : username_ws_hdl_list_) {
-    if (guest.second.lock().get() == hdl.lock().get()) return guest.first;
-  }
-
-  LOG_ERROR("No user with websocket handle [{}]", hdl.lock().get());
-  return "";
-}
-
-// websocketpp::connection_hdl TransmissionManager::GetWsHandle(
-//     const std::string& username) {
-//   if (username_ws_hdl_list_.find(username) != username_ws_hdl_list_.end()) {
-//     return username_ws_hdl_list_[username];
-//   } else {
-//     websocketpp::connection_hdl hdl;
-//     return hdl;
-//   }
-// }
-
 websocketpp::connection_hdl TransmissionManager::GetWsHandle(
     const std::string& user_id) {
   if (user_id_ws_hdl_list_.find(user_id) != user_id_ws_hdl_list_.end()) {

tests/signal_server/transmission_manager.h

@@ -11,52 +11,18 @@ class TransmissionManager {
   ~TransmissionManager();
 
  public:
-  //   bool BindHostToTransmission(websocketpp::connection_hdl hdl,
-  //                               const std::string& transmission_id);
-  //   bool BindGuestToTransmission(websocketpp::connection_hdl hdl,
-  //                                const std::string& transmission_id);
-  //   bool ReleaseHostFromTransmission(websocketpp::connection_hdl hdl,
-  //                                    const std::string& transmission_id);
-  //   bool ReleaseGuestFromTransmission(websocketpp::connection_hdl hdl,
-  //                                     const std::string& transmission_id);
-
-  //   bool BindHostUsernameToWsHandle(websocketpp::connection_hdl hdl);
-  //   bool UpdateHostUsernameToWsHandle(const std::string& host_username,
-  //                                     websocketpp::connection_hdl hdl);
-  //   bool BindGuestUsernameToWsHandle(const std::string& guest_username,
-  //                                    websocketpp::connection_hdl hdl);
-
-  //   std::string GetHostUsername(websocketpp::connection_hdl hdl);
-  //   std::string GetGuestUsername(websocketpp::connection_hdl hdl);
-
-  websocketpp::connection_hdl GetHostOfTransmission(
-      const std::string& transmission_id);
-  std::vector<websocketpp::connection_hdl> GetAllGuestsOfTransmission(
-      const std::string& transmission_id);
-  websocketpp::connection_hdl GetGuestWsHandle(
-      const std::string& guest_username);
-
-  std::vector<std::string> GetAllMembersOfTransmission(
+  std::vector<std::string> GetAllUserIdOfTransmission(
       const std::string& transmission_id);
 
  public:
-  bool BindWsHandleToTransmission(websocketpp::connection_hdl hdl,
-                                  const std::string& transmission_id);
   bool BindUserIdToTransmission(const std::string& user_id,
                                 const std::string& transmission_id);
   bool BindUserIdToWsHandle(const std::string& user_id,
                             websocketpp::connection_hdl hdl);
-  bool BindUserNameToUserId(const std::string& user_name,
-                            const std::string& user_id);
 
-  bool ReleaseWsHandleFromTransmission(websocketpp::connection_hdl hdl,
-                                       const std::string& transmission_id);
-  bool BindUsernameToWsHandle(const std::string& username,
-                              websocketpp::connection_hdl hdl);
-  bool UpdateUsernameToWsHandle(const std::string& username,
-                                websocketpp::connection_hdl hdl);
-  std::string GetUsername(websocketpp::connection_hdl hdl);
-  //   websocketpp::connection_hdl GetWsHandle(const std::string& username);
+  bool ReleaseWsHandleFromTransmission(websocketpp::connection_hdl hdl);
+  bool ReleaseUserIdFromTransmission(websocketpp::connection_hdl hdl);
+
   websocketpp::connection_hdl GetWsHandle(const std::string& user_id);
 
  private:
@@ -72,11 +38,12 @@ class TransmissionManager {
  private:
   std::map<std::string, std::vector<websocketpp::connection_hdl>>
       transmission_user_ws_hdl_list_;
-  std::map<std::string, std::vector<std::string>> transmission_user_id_list_;
-  std::map<std::string, websocketpp::connection_hdl> user_id_ws_hdl_list_;
+  std::map<std::string, websocketpp::connection_hdl> username_ws_hdl_list_;
+
   std::map<std::string, std::vector<std::string>> user_name_user_id_list_;
 
-  std::map<std::string, websocketpp::connection_hdl> username_ws_hdl_list_;
+  std::map<std::string, std::vector<std::string>> transmission_user_id_list_;
+  std::map<std::string, websocketpp::connection_hdl> user_id_ws_hdl_list_;
 };
 
 #endif