mediasoup 3.19.1 → 3.19.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mediasoup",
-	"version": "3.19.1",
+	"version": "3.19.2",
 	"description": "Cutting Edge WebRTC Video Conferencing",
 	"contributors": [
 		"Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -100,12 +100,12 @@
 		"tar": "^7.4.3"
 	},
 	"devDependencies": {
-		"@eslint/js": "^9.34.0",
+		"@eslint/js": "^9.35.0",
 		"@octokit/rest": "^22.0.0",
 		"@types/debug": "^4.1.12",
 		"@types/jest": "^30.0.0",
-		"@types/node": "^24.3.0",
-		"eslint": "^9.34.0",
+		"@types/node": "^24.3.1",
+		"eslint": "^9.35.0",
 		"eslint-config-prettier": "^10.1.8",
 		"eslint-plugin-jest": "^29.0.1",
 		"eslint-plugin-prettier": "^5.5.4",

package/worker/include/RTC/IceServer.hpp

@@ -9,6 +9,7 @@
 #include "handles/TimerHandle.hpp"
 #include <list>
 #include <string>
+#include <unordered_map>
 
 namespace RTC
 {
@@ -23,10 +24,6 @@ namespace RTC
 			DISCONNECTED,
 		};
 
-	public:
-		static IceState RoleFromFbs(FBS::WebRtcTransport::IceState state);
-		static FBS::WebRtcTransport::IceState IceStateToFbs(IceState state);
-
 	public:
 		class Listener
 		{
@@ -54,6 +51,13 @@ namespace RTC
 			virtual void OnIceServerDisconnected(const RTC::IceServer* iceServer) = 0;
 		};
 
+	public:
+		static const std::string& IceStateToString(IceState iceState);
+		static FBS::WebRtcTransport::IceState IceStateToFbs(IceState state);
+
+	private:
+		static std::unordered_map<IceState, std::string> iceStateToString;
+
 	public:
 		IceServer(
 		  Listener* listener,
@@ -63,6 +67,7 @@ namespace RTC
 		~IceServer() override;
 
 	public:
+		void Dump(int indentation = 0) const;
 		void ProcessStunPacket(RTC::StunPacket* packet, RTC::TransportTuple* tuple);
 		const std::string& GetUsernameFragment() const
 		{
@@ -138,7 +143,6 @@ namespace RTC
 		std::list<RTC::TransportTuple> tuples;
 		RTC::TransportTuple* selectedTuple{ nullptr };
 		TimerHandle* consentCheckTimer{ nullptr };
-		uint64_t lastConsentRequestReceivedAtMs{ 0u };
 		bool isRemovingTuples{ false };
 	};
 } // namespace RTC

package/worker/include/RTC/TransportTuple.hpp

@@ -55,7 +55,7 @@ namespace RTC
 
 		flatbuffers::Offset<FBS::Transport::Tuple> FillBuffer(flatbuffers::FlatBufferBuilder& builder) const;
 
-		void Dump() const;
+		void Dump(int indentation = 0) const;
 
 		void StoreUdpRemoteAddress()
 		{

package/worker/src/RTC/IceServer.cpp

@@ -15,37 +15,31 @@ namespace RTC
 	static constexpr uint8_t ConsentCheckMinTimeoutSec{ 10u };
 	static constexpr uint8_t ConsentCheckMaxTimeoutSec{ 60u };
 
-	/* Class methods. */
-	IceServer::IceState IceStateFromFbs(FBS::WebRtcTransport::IceState state)
-	{
-		switch (state)
-		{
-			case FBS::WebRtcTransport::IceState::NEW:
-			{
-				return IceServer::IceState::NEW;
-			}
+	/* Class variables. */
 
-			case FBS::WebRtcTransport::IceState::CONNECTED:
-			{
-				return IceServer::IceState::CONNECTED;
-			}
+	// clang-format off
+	std::unordered_map<IceServer::IceState, std::string> IceServer::iceStateToString =
+	{
+		{ IceServer::IceState::NEW,          "new"          },
+		{ IceServer::IceState::CONNECTED,    "connected"    },
+		{ IceServer::IceState::COMPLETED,    "completed"    },
+		{ IceServer::IceState::DISCONNECTED, "disconnected" },
+	};
+	// clang-format on
 
-			case FBS::WebRtcTransport::IceState::COMPLETED:
-			{
-				return IceServer::IceState::COMPLETED;
-			}
+	/* Class methods. */
 
-			case FBS::WebRtcTransport::IceState::DISCONNECTED:
-			{
-				return IceServer::IceState::DISCONNECTED;
-			}
+	const std::string& IceServer::IceStateToString(IceState iceState)
+	{
+		MS_TRACE();
 
-				NO_DEFAULT_GCC();
-		}
+		return IceServer::iceStateToString.at(iceState);
 	}
 
 	FBS::WebRtcTransport::IceState IceServer::IceStateToFbs(IceServer::IceState state)
 	{
+		MS_TRACE();
+
 		switch (state)
 		{
 			case IceServer::IceState::NEW:
@@ -152,6 +146,27 @@ namespace RTC
 		this->consentCheckTimer = nullptr;
 	}
 
+	void IceServer::Dump(int indentation) const
+	{
+		MS_TRACE();
+
+		MS_DUMP_CLEAN(indentation, "<IceServer>");
+		MS_DUMP_CLEAN(indentation, "  state: %s", IceServer::IceStateToString(this->state).c_str());
+		MS_DUMP_CLEAN(indentation, "  tuples:");
+		for (const auto& tuple : this->tuples)
+		{
+			tuple.Dump(indentation + 2);
+		}
+		if (this->selectedTuple)
+		{
+			MS_DUMP_CLEAN(indentation, "  selected tuple:");
+			this->selectedTuple->Dump(indentation + 2);
+		}
+		MS_DUMP_CLEAN(indentation, "  consent timeout (ms): %" PRIu16, this->consentTimeoutMs);
+		MS_DUMP_CLEAN(indentation, "  remote nomination: %" PRIu32, this->remoteNomination);
+		MS_DUMP_CLEAN(indentation, "</IceServer>");
+	}
+
 	void IceServer::ProcessStunPacket(RTC::StunPacket* packet, RTC::TransportTuple* tuple)
 	{
 		MS_TRACE();
@@ -587,9 +602,10 @@ namespace RTC
 				else
 				{
 					// Store the tuple.
-					auto* storedTuple = AddTuple(tuple);
+					auto* storedTuple          = AddTuple(tuple);
+					const auto isNewNomination = hasNomination && nomination > this->remoteNomination;
 
-					if ((hasNomination && nomination > this->remoteNomination) || !hasNomination)
+					if (isNewNomination || !hasNomination)
 					{
 						MS_DEBUG_TAG(
 						  ice,
@@ -606,7 +622,7 @@ namespace RTC
 						SetSelectedTuple(storedTuple);
 
 						// Update nomination.
-						if (hasNomination && nomination > this->remoteNomination)
+						if (isNewNomination)
 						{
 							this->remoteNomination = nomination;
 						}
@@ -649,9 +665,10 @@ namespace RTC
 				else
 				{
 					// Store the tuple.
-					auto* storedTuple = AddTuple(tuple);
+					auto* storedTuple          = AddTuple(tuple);
+					const auto isNewNomination = hasNomination && nomination > this->remoteNomination;
 
-					if ((hasNomination && nomination > this->remoteNomination) || !hasNomination)
+					if (isNewNomination || !hasNomination)
 					{
 						MS_DEBUG_TAG(
 						  ice,
@@ -668,7 +685,7 @@ namespace RTC
 						SetSelectedTuple(storedTuple);
 
 						// Update nomination.
-						if (hasNomination && nomination > this->remoteNomination)
+						if (isNewNomination)
 						{
 							this->remoteNomination = nomination;
 						}
@@ -705,9 +722,10 @@ namespace RTC
 					  nomination);
 
 					// Store the tuple.
-					auto* storedTuple = AddTuple(tuple);
+					auto* storedTuple          = AddTuple(tuple);
+					const auto isNewNomination = hasNomination && nomination > this->remoteNomination;
 
-					if ((hasNomination && nomination > this->remoteNomination) || !hasNomination)
+					if (isNewNomination || !hasNomination)
 					{
 						// Update state.
 						this->state = IceState::COMPLETED;
@@ -716,7 +734,7 @@ namespace RTC
 						SetSelectedTuple(storedTuple);
 
 						// Update nomination.
-						if (hasNomination && nomination > this->remoteNomination)
+						if (isNewNomination)
 						{
 							this->remoteNomination = nomination;
 						}
@@ -745,17 +763,18 @@ namespace RTC
 				else
 				{
 					// Store the tuple.
-					auto* storedTuple = AddTuple(tuple);
+					auto* storedTuple          = AddTuple(tuple);
+					const auto isNewNomination = hasNomination && nomination > this->remoteNomination;
 
-					// When in completed state, only update selected tuple if there is ICE
-					// nomination.
-					if (hasNomination && nomination > this->remoteNomination)
+					// When in completed state, update selected tuple if there is ICE
+					// nomination or useCandidate.
+					if (isNewNomination || hasUseCandidate)
 					{
 						// Mark it as selected tuple.
 						SetSelectedTuple(storedTuple);
 
 						// Update nomination.
-						if (hasNomination && nomination > this->remoteNomination)
+						if (isNewNomination)
 						{
 							this->remoteNomination = nomination;
 						}

package/worker/src/RTC/TransportTuple.cpp

@@ -90,11 +90,11 @@ namespace RTC
 		  protocol);
 	}
 
-	void TransportTuple::Dump() const
+	void TransportTuple::Dump(int indentation) const
 	{
 		MS_TRACE();
 
-		MS_DUMP("<TransportTuple>");
+		MS_DUMP_CLEAN(indentation, "<TransportTuple>");
 
 		int family;
 		std::string ip;
@@ -102,32 +102,32 @@ namespace RTC
 
 		Utils::IP::GetAddressInfo(GetLocalAddress(), family, ip, port);
 
-		MS_DUMP("  localIp: %s", ip.c_str());
-		MS_DUMP("  localPort: %" PRIu16, port);
+		MS_DUMP_CLEAN(indentation, "  localIp: %s", ip.c_str());
+		MS_DUMP_CLEAN(indentation, "  localPort: %" PRIu16, port);
 
 		Utils::IP::GetAddressInfo(GetRemoteAddress(), family, ip, port);
 
-		MS_DUMP("  remoteIp: %s", ip.c_str());
-		MS_DUMP("  remotePort: %" PRIu16, port);
+		MS_DUMP_CLEAN(indentation, "  remoteIp: %s", ip.c_str());
+		MS_DUMP_CLEAN(indentation, "  remotePort: %" PRIu16, port);
 
 		switch (GetProtocol())
 		{
 			case Protocol::UDP:
 			{
-				MS_DUMP("  protocol: udp");
+				MS_DUMP_CLEAN(indentation, "  protocol: udp");
 
 				break;
 			}
 
 			case Protocol::TCP:
 			{
-				MS_DUMP("  protocol: tcp");
+				MS_DUMP_CLEAN(indentation, "  protocol: tcp");
 
 				break;
 			}
 		}
 
-		MS_DUMP("</TransportTuple>");
+		MS_DUMP_CLEAN(indentation, "</TransportTuple>");
 	}
 
 	void TransportTuple::GenerateHash()