fix request after dead

Author: reitowo

core/room_server.cpp

@@ -168,6 +168,7 @@ void RoomServer::setSdp(const vts::server::Sdp &sdp) {
     if (!status.ok()) {
         qDebug() << __FUNCTION__ << "failed:" << status.error_message().c_str();
         emit room->onRoomServerError(__FUNCTION__, status.error_message().c_str());
+        requestHasFailed = true;
     }
 }
 
@@ -181,6 +182,7 @@ void RoomServer::setCandidate(const vts::server::Candidate& candidate) {
     if (!status.ok()) {
         qDebug() << __FUNCTION__ << "failed:" << status.error_message().c_str();
         emit room->onRoomServerError(__FUNCTION__, status.error_message().c_str());
+        requestHasFailed = true;
     }
 }
 
@@ -197,6 +199,7 @@ void RoomServer::setNat(int type) {
     if (!status.ok()) {
         qDebug() << __FUNCTION__ << "failed:" << status.error_message().c_str();
         emit room->onRoomServerError(__FUNCTION__, status.error_message().c_str());
+        requestHasFailed = true;
     }
 }
 
@@ -210,6 +213,7 @@ void RoomServer::setRtt(const vts::server::ReqRtt &rtt) {
     if (!status.ok()) {
         qDebug() << __FUNCTION__ << "failed:" << status.error_message().c_str();
         emit room->onRoomServerError(__FUNCTION__, status.error_message().c_str());
+        requestHasFailed = true;
     }
 }
 
@@ -223,6 +227,7 @@ void RoomServer::setStat(const vts::server::ReqStat &stat) {
     if (!status.ok()) {
         qDebug() << __FUNCTION__ << "failed:" << status.error_message().c_str();
         emit room->onRoomServerError(__FUNCTION__, status.error_message().c_str());
+        requestHasFailed = true;
     }
 }
 
@@ -239,6 +244,7 @@ void RoomServer::setNick(const string &nick) {
     if (!status.ok()) {
         qDebug() << __FUNCTION__ << "failed:" << status.error_message().c_str();
         emit room->onRoomServerError(__FUNCTION__, status.error_message().c_str());
+        requestHasFailed = true;
     }
 }
 
@@ -255,6 +261,7 @@ void RoomServer::setTurn(const string &turn) {
     if (!status.ok()) {
         qDebug() << __FUNCTION__ << "failed:" << status.error_message().c_str();
         emit room->onRoomServerError(__FUNCTION__, status.error_message().c_str());
+        requestHasFailed = true;
     }
 }
 
@@ -268,6 +275,7 @@ void RoomServer::setFrameFormat(const vts::server::FrameFormatSetting &format) {
     if (!status.ok()) {
         qDebug() << __FUNCTION__ << "failed:" << status.error_message().c_str();
         emit room->onRoomServerError(__FUNCTION__, status.error_message().c_str());
+        requestHasFailed = true;
     }
 }
 
@@ -288,6 +296,7 @@ void RoomServer::setShareInfo(const std::string& gpu, const std::string& capture
     if (!status.ok()) {
         qDebug() << __FUNCTION__ << "failed:" << status.error_message().c_str();
         emit room->onRoomServerError(__FUNCTION__, status.error_message().c_str());
+        requestHasFailed = true;
     }
 }
 
@@ -325,5 +334,6 @@ void RoomServer::requestIdr(const std::string& reason, const std::string& peer)
     if (!status.ok()) {
         qDebug() << __FUNCTION__ << "failed:" << status.error_message().c_str();
         emit room->onRoomServerError(__FUNCTION__, status.error_message().c_str());
+        requestHasFailed = true;
     }
 }

core/room_server.h

@@ -18,6 +18,8 @@ class RoomServer {
     std::atomic_bool exiting = false;
     std::atomic_bool destroyed = false;
 
+    std::atomic_bool requestHasFailed = false;
+
     std::unique_ptr<QThread> natThread;
     std::unique_ptr<QThread> notifyThread;
     std::unique_ptr<grpc::ClientContext> notifyContext;
@@ -39,7 +41,7 @@ class RoomServer {
     void joinRoom(const std::string& peerId, const std::string& roomId, const std::string& nick);
 
     inline std::unique_ptr<grpc::ClientContext> getCtx() {
-        if (peerId.empty() || roomId.empty())
+        if (peerId.empty() || roomId.empty() || requestHasFailed)
             return nullptr;
 
         auto ctx = std::make_unique<grpc::ClientContext>();

ui/windows/collabroom.cpp

@@ -108,13 +108,7 @@ CollabRoom::CollabRoom(bool isServer, QString roomId, QWidget *parent) :
 
     this->roomId = roomId;
 
-    localPeerId =  QSysInfo::machineUniqueId();
-    if (localPeerId.isEmpty()) {
-        localPeerId = QSysInfo::bootUniqueId();
-    }
-    if (localPeerId.isEmpty()) {
-        localPeerId = QUuid::createUuid().toString(QUuid::WithoutBraces);
-    }
+    localPeerId = QUuid::createUuid().toString(QUuid::WithoutBraces);
 
     useDxCapture = settings.value("useDxCapture", false).toBool();
     qDebug() << "sender is" << (useDxCapture ? "dx" : "spout");