mediasoup 3.19.0 → 3.19.2

package/node/lib/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../src/Router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../src/Router.ts"],"names":[],"mappings":"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"}

package/node/lib/Router.js

@@ -644,6 +644,8 @@ class RouterImpl extends enhancedEvents_1.EnhancedEventEmitter {
             }
         }
         else {
+            // NOTE: This cannot happen since it's guaranteed that producer or
+            // dataProducer exists, but TypeScript is not that smart.
             throw new Error('internal error');
         }
     }

package/node/lib/test/test-PipeTransport.js

@@ -929,3 +929,21 @@ test('router.pipeToRouter() called in two Routers passing one to each other as a
     expect(pipeTransportsA.size).toBe(0);
     expect(pipeTransportsB.size).toBe(0);
 }, 2000);
+test('router.pipeToRouter() with neither producerId nor dataProducerId fails', async () => {
+    const router1bis = await ctx.worker1.createRouter({
+        mediaCodecs: ctx.mediaCodecs,
+    });
+    await expect(ctx.router1.pipeToRouter({
+        router: router1bis,
+    })).rejects.toThrow(Error);
+}, 2000);
+test('router.pipeToRouter() with both producerId and dataProducerId fails', async () => {
+    const router1bis = await ctx.worker1.createRouter({
+        mediaCodecs: ctx.mediaCodecs,
+    });
+    await expect(ctx.router1.pipeToRouter({
+        producerId: '1234',
+        dataProducerId: '5678',
+        router: router1bis,
+    })).rejects.toThrow(Error);
+}, 2000);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mediasoup",
-	"version": "3.19.0",
+	"version": "3.19.2",
 	"description": "Cutting Edge WebRTC Video Conferencing",
 	"contributors": [
 		"Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -100,17 +100,17 @@
 		"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",
 		"globals": "^16.3.0",
-		"jest": "^30.1.1",
+		"jest": "^30.1.3",
 		"marked": "^16.2.1",
 		"open-cli": "^8.0.0",
 		"pick-port": "^2.1.2",
@@ -118,6 +118,6 @@
 		"sctp": "^1.0.0",
 		"ts-jest": "^29.4.1",
 		"typescript": "^5.9.2",
-		"typescript-eslint": "^8.41.0"
+		"typescript-eslint": "^8.42.0"
 	}
 }

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/RtpRetransmissionBuffer.hpp

@@ -30,6 +30,8 @@ namespace RTC
 			uint16_t sequenceNumber{ 0u };
 			// Correct timestamp since original packet may not have the same.
 			uint32_t timestamp{ 0u };
+			// Correct marker bit since original packet may not have the same.
+			bool marker{ false };
 			// Last time this packet was resent.
 			uint64_t resentAtMs{ 0u };
 			// Number of times this packet was resent.

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/RtpRetransmissionBuffer.cpp

@@ -26,6 +26,7 @@ namespace RTC
 		item->ssrc           = packet->GetSsrc();
 		item->sequenceNumber = packet->GetSequenceNumber();
 		item->timestamp      = packet->GetTimestamp();
+		item->marker         = packet->HasMarker();
 
 		return item;
 	}

package/worker/src/RTC/RtpStreamSend.cpp

@@ -173,12 +173,14 @@ namespace RTC
 				auto origSsrc      = packet->GetSsrc();
 				auto origSeq       = packet->GetSequenceNumber();
 				auto origTimestamp = packet->GetTimestamp();
+				auto origMarker    = packet->HasMarker();
 				std::string origMid;
 
 				// Put correct info into the packet.
 				packet->SetSsrc(item->ssrc);
 				packet->SetSequenceNumber(item->sequenceNumber);
 				packet->SetTimestamp(item->timestamp);
+				packet->SetMarker(item->marker);
 
 				if (item->encoder != nullptr)
 				{
@@ -237,6 +239,7 @@ namespace RTC
 				packet->SetSsrc(origSsrc);
 				packet->SetSequenceNumber(origSeq);
 				packet->SetTimestamp(origTimestamp);
+				packet->SetMarker(origMarker);
 			}
 		}
 

package/worker/src/RTC/SvcConsumer.cpp

@@ -794,10 +794,7 @@ namespace RTC
 		packet->logger.sendSeqNumber    = seq;
 #endif
 
-		if (marker)
-		{
-			packet->SetMarker(true);
-		}
+		packet->SetMarker(marker);
 
 		if (isSyncPacket)
 		{

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()

package/worker/test/src/RTC/TestRtpStreamSend.cpp

@@ -44,11 +44,12 @@ static void SendRtpPacket(std::vector<std::pair<RtpStreamSend*, uint32_t>> strea
 	}
 }
 
-static void CheckRtxPacket(RtpPacket* packet, uint16_t seq, uint32_t timestamp)
+static void CheckRtxPacket(RtpPacket* rtxPacket, RtpPacket* origPacket)
 {
-	REQUIRE(packet);
-	REQUIRE(packet->GetSequenceNumber() == seq);
-	REQUIRE(packet->GetTimestamp() == timestamp);
+	REQUIRE(rtxPacket);
+	REQUIRE(rtxPacket->GetSequenceNumber() == origPacket->GetSequenceNumber());
+	REQUIRE(rtxPacket->GetTimestamp() == origPacket->GetTimestamp());
+	REQUIRE(rtxPacket->HasMarker() == origPacket->HasMarker());
 }
 
 SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
@@ -94,12 +95,14 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 		auto packet1(CreateRtpPacket(rtpBuffer1, sizeof(rtpBuffer1), 21006, 1533790901));
 		// packet2 [pt:123, seq:21007, timestamp:1533790901]
 		auto packet2(CreateRtpPacket(rtpBuffer2, sizeof(rtpBuffer2), 21007, 1533790901));
+		packet2->SetMarker(true);
 		// packet3 [pt:123, seq:21008, timestamp:1533793871]
 		auto packet3(CreateRtpPacket(rtpBuffer3, sizeof(rtpBuffer3), 21008, 1533793871));
 		// packet4 [pt:123, seq:21009, timestamp:1533793871]
 		auto packet4(CreateRtpPacket(rtpBuffer4, sizeof(rtpBuffer4), 21009, 1533793871));
 		// packet5 [pt:123, seq:21010, timestamp:1533796931]
 		auto packet5(CreateRtpPacket(rtpBuffer5, sizeof(rtpBuffer5), 21010, 1533796931));
+		packet5->SetMarker(true);
 
 		// Create a RtpStreamSend instance.
 		TestRtpStreamListener testRtpStreamListener;
@@ -144,11 +147,11 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 
 		testRtpStreamListener.retransmittedPackets.clear();
 
-		CheckRtxPacket(rtxPacket1, packet1->GetSequenceNumber(), packet1->GetTimestamp());
-		CheckRtxPacket(rtxPacket2, packet2->GetSequenceNumber(), packet2->GetTimestamp());
-		CheckRtxPacket(rtxPacket3, packet3->GetSequenceNumber(), packet3->GetTimestamp());
-		CheckRtxPacket(rtxPacket4, packet4->GetSequenceNumber(), packet4->GetTimestamp());
-		CheckRtxPacket(rtxPacket5, packet5->GetSequenceNumber(), packet5->GetTimestamp());
+		CheckRtxPacket(rtxPacket1, packet1.get());
+		CheckRtxPacket(rtxPacket2, packet2.get());
+		CheckRtxPacket(rtxPacket3, packet3.get());
+		CheckRtxPacket(rtxPacket4, packet4.get());
+		CheckRtxPacket(rtxPacket5, packet5.get());
 	}
 
 	SECTION("receive NACK and get zero retransmitted packets if useNack is not set")
@@ -306,8 +309,8 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 
 		testRtpStreamListener1.retransmittedPackets.clear();
 
-		CheckRtxPacket(rtxPacket1, packet1->GetSequenceNumber(), packet1->GetTimestamp());
-		CheckRtxPacket(rtxPacket2, packet2->GetSequenceNumber(), packet2->GetTimestamp());
+		CheckRtxPacket(rtxPacket1, packet1.get());
+		CheckRtxPacket(rtxPacket2, packet2.get());
 
 		// Process the NACK packet on stream2.
 		stream2->ReceiveNack(&nackPacket);
@@ -319,8 +322,8 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 
 		testRtpStreamListener2.retransmittedPackets.clear();
 
-		CheckRtxPacket(rtxPacket1, packet1->GetSequenceNumber(), packet1->GetTimestamp());
-		CheckRtxPacket(rtxPacket2, packet2->GetSequenceNumber(), packet2->GetTimestamp());
+		CheckRtxPacket(rtxPacket1, packet1.get());
+		CheckRtxPacket(rtxPacket2, packet2.get());
 	}
 
 	SECTION("retransmitted packets are correctly encoded")
@@ -531,8 +534,8 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 
 		testRtpStreamListener.retransmittedPackets.clear();
 
-		CheckRtxPacket(rtxPacket1, packet1->GetSequenceNumber(), packet1->GetTimestamp());
-		CheckRtxPacket(rtxPacket2, packet2->GetSequenceNumber(), packet2->GetTimestamp());
+		CheckRtxPacket(rtxPacket1, packet1.get());
+		CheckRtxPacket(rtxPacket2, packet2.get());
 	}
 
 	SECTION("packets don't get retransmitted if MaxRetransmissionDelayForVideoMs is exceeded")
@@ -585,7 +588,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 
 		testRtpStreamListener.retransmittedPackets.clear();
 
-		CheckRtxPacket(rtxPacket2, packet2->GetSequenceNumber(), packet2->GetTimestamp());
+		CheckRtxPacket(rtxPacket2, packet2.get());
 	}
 
 	SECTION("packets get removed from the retransmission buffer if seq number of the stream is reset")