YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-27 04:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix signal server member list error when rejoin same one connection

Browse Source
This commit is contained in:
dijunkun
2023-10-11 14:26:57 +08:00
parent 683235fa3f
commit 682fa0ff17
4 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/signal_server/signal_server.cpp
View File

@@ -113,7 +113,9 @@ void SignalServer::run(uint16_t port) {
}
void SignalServer::send_msg(websocketpp::connection_hdl hdl, json message) {
server_.send(hdl, message.dump(), websocketpp::frame::opcode::text);
if (!hdl.expired()) {
server_.send(hdl, message.dump(), websocketpp::frame::opcode::text);
}
}
void SignalServer::on_message(websocketpp::connection_hdl hdl,
@@ -170,6 +172,18 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
LOG_INFO("[{}] leaves transmission [{}]", user_id.c_str(),
transmission_id.c_str());
transmission_manager_.ReleaseUserIdFromTransmission(hdl);
json message = {{"type", "user_leave_transmission"},
{"transmission_id", transmission_id},
{"user_id", user_id}};
std::vector<std::string> user_id_list =
transmission_manager_.GetAllUserIdOfTransmission(transmission_id);
for (const auto& user_id : user_id_list) {
send_msg(transmission_manager_.GetWsHandle(user_id), message);
}
break;
}
case "query_user_id_list"_H: {

11
application/signal_server/transmission_manager.cpp
View File

@@ -79,7 +79,16 @@ bool TransmissionManager::ReleaseAllUserIdFromTransmission(
const std::string& transmission_id) {
if (transmission_user_id_list_.end() !=
transmission_user_id_list_.find(transmission_id)) {
transmission_user_id_list_[transmission_id].clear();
auto user_id_list = transmission_user_id_list_[transmission_id];
for (auto& user_id : user_id_list) {
if (user_id_ws_hdl_list_.find(user_id) != user_id_ws_hdl_list_.end()) {
LOG_INFO("Remove user id [{}] from transmission [{}]", user_id,
transmission_id);
user_id_ws_hdl_list_.erase(user_id);
}
}
user_id_list.clear();
transmission_user_id_list_.erase(transmission_id);
}
return true;