mediasoup 3.9.4 → 3.9.5

package/node/lib/Worker.js

@@ -81,7 +81,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.9.4',
+                MEDIASOUP_VERSION: '3.9.5',
                 // Let the worker process inherit all environment variables, useful
                 // if a custom and not in the path GCC is used so the user can set
                 // LD_LIBRARY_PATH environment variable for runtime.

package/node/lib/index.d.ts

@@ -9,7 +9,7 @@ export { types };
 /**
  * Expose mediasoup version.
  */
-export declare const version = "3.9.4";
+export declare const version = "3.9.5";
 /**
  * Expose parseScalabilityMode() function.
  */

package/node/lib/index.js

@@ -11,7 +11,7 @@ exports.types = types;
 /**
  * Expose mediasoup version.
  */
-exports.version = '3.9.4';
+exports.version = '3.9.5';
 /**
  * Expose parseScalabilityMode() function.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.9.4",
+  "version": "3.9.5",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -80,8 +80,8 @@
     "@types/debug": "^4.1.7",
     "@types/random-number": "^0.0.1",
     "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.9.0",
-    "@typescript-eslint/parser": "^5.9.0",
+    "@typescript-eslint/eslint-plugin": "^5.9.1",
+    "@typescript-eslint/parser": "^5.9.1",
     "eslint": "^8.6.0",
     "eslint-plugin-jest": "^25.3.4",
     "jest": "^27.4.7",

package/worker/Makefile

@@ -12,6 +12,7 @@ GULP = ./scripts/node_modules/.bin/gulp
 LCOV = ./deps/lcov/bin/lcov
 DOCKER ?= docker
 PIP_DIR = $(MEDIASOUP_OUT_DIR)/pip
+INSTALL_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)
 BUILD_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/build
 MESON ?= $(PIP_DIR)/bin/meson
 MESON_ARGS ?= ""
@@ -71,6 +72,9 @@ setup: meson-ninja
 # https://github.com/ninja-build/ninja/issues/1997
 ifeq ($(MEDIASOUP_BUILDTYPE),Release)
 	$(MESON) setup \
+		--prefix $(INSTALL_DIR) \
+		--bindir '' \
+		--libdir '' \
 		--buildtype release \
 		-Db_ndebug=true \
 		-Db_pie=true \
@@ -79,6 +83,9 @@ ifeq ($(MEDIASOUP_BUILDTYPE),Release)
 		$(MESON_ARGS) \
 		$(BUILD_DIR) || \
 		$(MESON) setup \
+			--prefix $(INSTALL_DIR) \
+			--bindir '' \
+			--libdir '' \
 			--buildtype release \
 			-Db_ndebug=true \
 			-Db_pie=true \
@@ -88,6 +95,9 @@ ifeq ($(MEDIASOUP_BUILDTYPE),Release)
 else
 ifeq ($(MEDIASOUP_BUILDTYPE),Debug)
 	$(MESON) setup \
+		--prefix $(INSTALL_DIR) \
+		--bindir '' \
+		--libdir '' \
 		--buildtype debug \
 		-Db_pie=true \
 		-Db_staticpic=true \
@@ -95,6 +105,9 @@ ifeq ($(MEDIASOUP_BUILDTYPE),Debug)
 		$(MESON_ARGS) \
 		$(BUILD_DIR) || \
 		$(MESON) setup \
+			--prefix $(INSTALL_DIR) \
+			--bindir '' \
+			--libdir '' \
 			--buildtype debug \
 			-Db_pie=true \
 			-Db_staticpic=true \
@@ -102,6 +115,9 @@ ifeq ($(MEDIASOUP_BUILDTYPE),Debug)
 			$(BUILD_DIR)
 else
 	$(MESON) setup \
+		--prefix $(INSTALL_DIR) \
+		--bindir '' \
+		--libdir '' \
 		--buildtype $(MEDIASOUP_BUILDTYPE) \
 		-Db_ndebug=if-release \
 		-Db_pie=true \
@@ -110,6 +126,9 @@ else
 		$(MESON_ARGS) \
 		$(BUILD_DIR) || \
 		$(MESON) setup \
+			--prefix $(INSTALL_DIR) \
+			--bindir '' \
+			--libdir '' \
 			--buildtype $(MEDIASOUP_BUILDTYPE) \
 			-Db_ndebug=if-release \
 			-Db_pie=true \
@@ -120,7 +139,7 @@ endif
 endif
 
 clean:
-	$(RM) -rf $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)
+	$(RM) -rf $(INSTALL_DIR)
 
 clean-build:
 	$(RM) -rf $(BUILD_DIR)
@@ -136,12 +155,8 @@ clean-all: clean-subprojects
 
 mediasoup-worker: setup
 ifeq ($(MEDIASOUP_WORKER_BIN),)
-	$(MESON) compile -j $(CORES) -C $(BUILD_DIR) mediasoup-worker
-endif
-ifeq ($(OS),Windows_NT)
-	cp $(BUILD_DIR)/mediasoup-worker.exe $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/mediasoup-worker.exe
-else
-	cp $(BUILD_DIR)/mediasoup-worker $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/mediasoup-worker
+	$(MESON) compile -C $(BUILD_DIR) -j $(CORES) mediasoup-worker
+	$(MESON) install -C $(BUILD_DIR) --no-rebuild --tags mediasoup-worker
 endif
 
 xcode: setup
@@ -154,8 +169,8 @@ format:
 	$(GULP) --gulpfile ./scripts/gulpfile.js format:worker
 
 test: setup
-ifeq ($(MEDIASOUP_WORKER_BIN),)
-	$(MESON) compile -j $(CORES) -C $(BUILD_DIR) mediasoup-worker-test
+	$(MESON) compile -C $(BUILD_DIR) -j $(CORES) mediasoup-worker-test
+	$(MESON) install -C $(BUILD_DIR) --no-rebuild --tags mediasoup-worker-test
 	# On Windows lcov doesn't work (at least not yet) and we need to add `.exe` to
 	# the binary path.
 ifeq ($(OS),Windows_NT)
@@ -164,7 +179,6 @@ else
 	$(LCOV) --directory ./ --zerocounters
 	$(BUILD_DIR)/mediasoup-worker-test --invisibles --use-colour=yes $(MEDIASOUP_TEST_TAGS)
 endif
-endif
 
 tidy:
 	$(PYTHON) ./scripts/clang-tidy.py \
@@ -177,9 +191,8 @@ tidy:
 		-quiet
 
 fuzzer: setup
-ifeq ($(MEDIASOUP_WORKER_BIN),)
-	$(MESON) compile -j $(CORES) -C $(BUILD_DIR) mediasoup-worker-fuzzer
-endif
+	$(MESON) compile -C $(BUILD_DIR) -j $(CORES) mediasoup-worker-fuzzer
+	$(MESON) install -C $(BUILD_DIR) --no-rebuild --tags mediasoup-worker-fuzzer
 
 fuzzer-run-all:
 	LSAN_OPTIONS=verbosity=1:log_threads=1 ./$(BUILD_DIR)/mediasoup-worker-fuzzer -artifact_prefix=fuzzer/reports/ -max_len=1400 fuzzer/new-corpus deps/webrtc-fuzzer-corpora/corpora/stun-corpus deps/webrtc-fuzzer-corpora/corpora/rtp-corpus deps/webrtc-fuzzer-corpora/corpora/rtcp-corpus
@@ -200,4 +213,5 @@ docker-run:
 		mediasoup/docker:latest
 
 libmediasoup-worker: setup
-	$(MESON) compile -j $(CORES) -C $(BUILD_DIR) libmediasoup-worker
+	$(MESON) compile -C $(BUILD_DIR) -j $(CORES) libmediasoup-worker
+	$(MESON) install -C $(BUILD_DIR) --no-rebuild --tags libmediasoup-worker

package/worker/include/RTC/IceServer.hpp

@@ -61,15 +61,15 @@ namespace RTC
 		{
 			return this->selectedTuple;
 		}
-		void SetUsernameFragment(const std::string& usernameFragment)
+		void RestartIce(const std::string& usernameFragment, const std::string& password)
 		{
 			this->oldUsernameFragment = this->usernameFragment;
 			this->usernameFragment    = usernameFragment;
-		}
-		void SetPassword(const std::string& password)
-		{
+
 			this->oldPassword = this->password;
 			this->password    = password;
+
+			this->remoteNomination = 0u;
 		}
 		bool IsValidTuple(const RTC::TransportTuple* tuple) const;
 		void RemoveTuple(RTC::TransportTuple* tuple);
@@ -78,7 +78,8 @@ namespace RTC
 		void ForceSelectedTuple(const RTC::TransportTuple* tuple);
 
 	private:
-		void HandleTuple(RTC::TransportTuple* tuple, bool hasUseCandidate);
+		void HandleTuple(
+		  RTC::TransportTuple* tuple, bool hasUseCandidate, bool hasNomination, uint32_t nomination);
 		/**
 		 * Store the given tuple and return its stored address.
 		 */
@@ -101,6 +102,7 @@ namespace RTC
 		std::string password;
 		std::string oldUsernameFragment;
 		std::string oldPassword;
+		uint32_t remoteNomination{ 0u };
 		IceState state{ IceState::NEW };
 		std::list<RTC::TransportTuple> tuples;
 		RTC::TransportTuple* selectedTuple{ nullptr };

package/worker/include/RTC/StunPacket.hpp

@@ -41,7 +41,8 @@ namespace RTC
 			ALTERNATE_SERVER   = 0x8023,
 			FINGERPRINT        = 0x8028,
 			ICE_CONTROLLED     = 0x8029,
-			ICE_CONTROLLING    = 0x802A
+			ICE_CONTROLLING    = 0x802A,
+			NOMINATION         = 0xC001
 		};
 
 		// Authentication result.
@@ -114,6 +115,10 @@ namespace RTC
 		{
 			this->hasUseCandidate = true;
 		}
+		void SetNomination(uint32_t nomination)
+		{
+			this->nomination = nomination;
+		}
 		void SetXorMappedAddress(const struct sockaddr* xorMappedAddress)
 		{
 			this->xorMappedAddress = xorMappedAddress;
@@ -150,6 +155,18 @@ namespace RTC
 		{
 			return this->hasUseCandidate;
 		}
+		void SetHasNomination()
+		{
+			this->hasNomination = true;
+		}
+		bool HasNomination() const
+		{
+			return this->hasNomination;
+		}
+		uint32_t GetNomination() const
+		{
+			return this->nomination;
+		}
 		uint16_t GetErrorCode() const
 		{
 			return this->errorCode;
@@ -177,10 +194,12 @@ namespace RTC
 		uint8_t* data{ nullptr };                // Pointer to binary data.
 		size_t size{ 0u };                       // The full message size (including header).
 		// STUN attributes.
-		std::string username;                               // Less than 513 bytes.
-		uint32_t priority{ 0u };                            // 4 bytes unsigned integer.
-		uint64_t iceControlling{ 0u };                      // 8 bytes unsigned integer.
-		uint64_t iceControlled{ 0u };                       // 8 bytes unsigned integer.
+		std::string username;          // Less than 513 bytes.
+		uint32_t priority{ 0u };       // 4 bytes unsigned integer.
+		uint64_t iceControlling{ 0u }; // 8 bytes unsigned integer.
+		uint64_t iceControlled{ 0u };  // 8 bytes unsigned integer.
+		bool hasNomination{ false };
+		uint32_t nomination{ 0u };                          // 4 bytes unsigned integer.
 		bool hasUseCandidate{ false };                      // 0 bytes.
 		const uint8_t* messageIntegrity{ nullptr };         // 20 bytes.
 		bool hasFingerprint{ false };                       // 4 bytes.

package/worker/meson.build

@@ -233,6 +233,8 @@ libmediasoup_worker = library(
   'libmediasoup-worker',
   name_prefix: '',
   build_by_default: false,
+  install: true,
+  install_tag: 'libmediasoup-worker',
   dependencies: dependencies,
   sources: common_sources,
   include_directories: include_directories('include'),
@@ -243,6 +245,8 @@ libmediasoup_worker = library(
 executable(
   'mediasoup-worker',
   build_by_default: true,
+  install: true,
+  install_tag: 'mediasoup-worker',
   dependencies: dependencies,
   sources: common_sources + ['src/main.cpp'],
   include_directories: include_directories('include'),
@@ -252,6 +256,8 @@ executable(
 mediasoup_worker_test = executable(
   'mediasoup-worker-test',
   build_by_default: false,
+  install: true,
+  install_tag: 'mediasoup-worker-test',
   dependencies: dependencies + [
     catch2_proj.get_variable('catch2_dep'),
   ],
@@ -314,6 +320,8 @@ if host_machine.system() == 'linux'
   executable(
     'mediasoup-worker-fuzzer',
     build_by_default: false,
+    install: true,
+    install_tag: 'mediasoup-worker-fuzzer',
     dependencies: dependencies,
     sources: common_sources + [
       'fuzzer/src/fuzzer.cpp',

package/worker/src/RTC/IceServer.cpp

@@ -198,8 +198,13 @@ namespace RTC
 
 				delete response;
 
+				uint32_t nomination{ 0u };
+
+				if (packet->HasNomination())
+					nomination = packet->GetNomination();
+
 				// Handle the tuple.
-				HandleTuple(tuple, packet->HasUseCandidate());
+				HandleTuple(tuple, packet->HasUseCandidate(), packet->HasNomination(), nomination);
 
 				break;
 			}
@@ -301,7 +306,8 @@ namespace RTC
 		SetSelectedTuple(storedTuple);
 	}
 
-	void IceServer::HandleTuple(RTC::TransportTuple* tuple, bool hasUseCandidate)
+	void IceServer::HandleTuple(
+	  RTC::TransportTuple* tuple, bool hasUseCandidate, bool hasNomination, uint32_t nomination)
 	{
 		MS_TRACE();
 
@@ -316,9 +322,15 @@ namespace RTC
 				// There shouldn't be a selected tuple.
 				MS_ASSERT(!this->selectedTuple, "state is 'new' but there is selected tuple");
 
-				if (!hasUseCandidate)
+				if (!hasUseCandidate && !hasNomination)
 				{
-					MS_DEBUG_TAG(ice, "transition from state 'new' to 'connected'");
+					MS_DEBUG_TAG(
+					  ice,
+					  "transition from state 'new' to 'connected' [hasUseCandidate:%s, hasNomination:%s, nomination:%" PRIu32
+					  "]",
+					  hasUseCandidate ? "true" : "false",
+					  hasNomination ? "true" : "false",
+					  nomination);
 
 					// Store the tuple.
 					auto* storedTuple = AddTuple(tuple);
@@ -332,17 +344,29 @@ namespace RTC
 				}
 				else
 				{
-					MS_DEBUG_TAG(ice, "transition from state 'new' to 'completed'");
-
 					// Store the tuple.
 					auto* storedTuple = AddTuple(tuple);
 
-					// Mark it as selected tuple.
-					SetSelectedTuple(storedTuple);
-					// Update state.
-					this->state = IceState::COMPLETED;
-					// Notify the listener.
-					this->listener->OnIceServerCompleted(this);
+					if ((hasNomination && nomination > this->remoteNomination) || !hasNomination)
+					{
+						MS_DEBUG_TAG(
+						  ice,
+						  "transition from state 'new' to 'completed' [hasUseCandidate:%s, hasNomination:%s, nomination:%" PRIu32
+						  "]",
+						  hasUseCandidate ? "true" : "false",
+						  hasNomination ? "true" : "false",
+						  nomination);
+
+						// Mark it as selected tuple.
+						SetSelectedTuple(storedTuple);
+						// Update state.
+						this->state = IceState::COMPLETED;
+						// Update nomination.
+						if (hasNomination && nomination > this->remoteNomination)
+							this->remoteNomination = nomination;
+						// Notify the listener.
+						this->listener->OnIceServerCompleted(this);
+					}
 				}
 
 				break;
@@ -359,9 +383,15 @@ namespace RTC
 				// There shouldn't be a selected tuple.
 				MS_ASSERT(!this->selectedTuple, "state is 'disconnected' but there is selected tuple");
 
-				if (!hasUseCandidate)
+				if (!hasUseCandidate && !hasNomination)
 				{
-					MS_DEBUG_TAG(ice, "transition from state 'disconnected' to 'connected'");
+					MS_DEBUG_TAG(
+					  ice,
+					  "transition from state 'disconnected' to 'connected' [hasUseCandidate:%s, hasNomination:%s, nomination:%" PRIu32
+					  "]",
+					  hasUseCandidate ? "true" : "false",
+					  hasNomination ? "true" : "false",
+					  nomination);
 
 					// Store the tuple.
 					auto* storedTuple = AddTuple(tuple);
@@ -375,17 +405,29 @@ namespace RTC
 				}
 				else
 				{
-					MS_DEBUG_TAG(ice, "transition from state 'disconnected' to 'completed'");
-
 					// Store the tuple.
 					auto* storedTuple = AddTuple(tuple);
 
-					// Mark it as selected tuple.
-					SetSelectedTuple(storedTuple);
-					// Update state.
-					this->state = IceState::COMPLETED;
-					// Notify the listener.
-					this->listener->OnIceServerCompleted(this);
+					if ((hasNomination && nomination > this->remoteNomination) || !hasNomination)
+					{
+						MS_DEBUG_TAG(
+						  ice,
+						  "transition from state 'disconnected' to 'completed' [hasUseCandidate:%s, hasNomination:%s, nomination:%" PRIu32
+						  "]",
+						  hasUseCandidate ? "true" : "false",
+						  hasNomination ? "true" : "false",
+						  nomination);
+
+						// Mark it as selected tuple.
+						SetSelectedTuple(storedTuple);
+						// Update state.
+						this->state = IceState::COMPLETED;
+						// Update nomination.
+						if (hasNomination && nomination > this->remoteNomination)
+							this->remoteNomination = nomination;
+						// Notify the listener.
+						this->listener->OnIceServerCompleted(this);
+					}
 				}
 
 				break;
@@ -399,7 +441,7 @@ namespace RTC
 				// There should be a selected tuple.
 				MS_ASSERT(this->selectedTuple, "state is 'connected' but there is not selected tuple");
 
-				if (!hasUseCandidate)
+				if (!hasUseCandidate && !hasNomination)
 				{
 					// If a new tuple store it.
 					if (!HasTuple(tuple))
@@ -407,7 +449,13 @@ namespace RTC
 				}
 				else
 				{
-					MS_DEBUG_TAG(ice, "transition from state 'connected' to 'completed'");
+					MS_DEBUG_TAG(
+					  ice,
+					  "transition from state 'connected' to 'completed' [hasUseCandidate:%s, hasNomination:%s, nomination:%" PRIu32
+					  "]",
+					  hasUseCandidate ? "true" : "false",
+					  hasNomination ? "true" : "false",
+					  nomination);
 
 					auto* storedTuple = HasTuple(tuple);
 
@@ -415,12 +463,18 @@ namespace RTC
 					if (!storedTuple)
 						storedTuple = AddTuple(tuple);
 
-					// Mark it as selected tuple.
-					SetSelectedTuple(storedTuple);
-					// Update state.
-					this->state = IceState::COMPLETED;
-					// Notify the listener.
-					this->listener->OnIceServerCompleted(this);
+					if ((hasNomination && nomination > this->remoteNomination) || !hasNomination)
+					{
+						// Mark it as selected tuple.
+						SetSelectedTuple(storedTuple);
+						// Update state.
+						this->state = IceState::COMPLETED;
+						// Update nomination.
+						if (hasNomination && nomination > this->remoteNomination)
+							this->remoteNomination = nomination;
+						// Notify the listener.
+						this->listener->OnIceServerCompleted(this);
+					}
 				}
 
 				break;
@@ -434,7 +488,7 @@ namespace RTC
 				// There should be a selected tuple.
 				MS_ASSERT(this->selectedTuple, "state is 'completed' but there is not selected tuple");
 
-				if (!hasUseCandidate)
+				if (!hasUseCandidate && !hasNomination)
 				{
 					// If a new tuple store it.
 					if (!HasTuple(tuple))
@@ -448,8 +502,14 @@ namespace RTC
 					if (!storedTuple)
 						storedTuple = AddTuple(tuple);
 
-					// Mark it as selected tuple.
-					SetSelectedTuple(storedTuple);
+					if ((hasNomination && nomination > this->remoteNomination) || !hasNomination)
+					{
+						// Mark it as selected tuple.
+						SetSelectedTuple(storedTuple);
+						// Update nomination.
+						if (hasNomination && nomination > this->remoteNomination)
+							this->remoteNomination = nomination;
+					}
 				}
 
 				break;

package/worker/src/RTC/StunPacket.cpp

@@ -209,6 +209,23 @@ namespace RTC
 					break;
 				}
 
+				case Attribute::NOMINATION:
+				{
+					// Ensure attribute length is 4 bytes.
+					if (attrLength != 4)
+					{
+						MS_WARN_TAG(ice, "attribute NOMINATION must be 4 bytes length, packet discarded");
+
+						delete packet;
+						return nullptr;
+					}
+
+					packet->SetHasNomination();
+					packet->SetNomination(Utils::Byte::Get4Bytes(attrValuePos, 0));
+
+					break;
+				}
+
 				case Attribute::MESSAGE_INTEGRITY:
 				{
 					// Ensure attribute length is 20 bytes.

package/worker/src/RTC/WebRtcTransport.cpp

@@ -585,8 +585,7 @@ namespace RTC
 				std::string usernameFragment = Utils::Crypto::GetRandomString(16);
 				std::string password         = Utils::Crypto::GetRandomString(32);
 
-				this->iceServer->SetUsernameFragment(usernameFragment);
-				this->iceServer->SetPassword(password);
+				this->iceServer->RestartIce(usernameFragment, password);
 
 				MS_DEBUG_DEV(
 				  "WebRtcTransport ICE usernameFragment and password changed [id:%s]", this->id.c_str());

package/worker/subprojects/libuv.wrap

@@ -1,11 +1,11 @@
 [wrap-file]
-directory = libuv-v1.42.0
-source_url = https://dist.libuv.org/dist/v1.42.0/libuv-v1.42.0.tar.gz
-source_filename = libuv-v1.42.0.tar.gz
-source_hash = 43129625155a8aed796ebe90b8d4c990a73985ec717de2b2d5d3a23cfe4deb72
-patch_filename = libuv_1.42.0-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/libuv_1.42.0-1/get_patch
-patch_hash = 891698d781bc68379b799e47bc7e100698f03985b6db5d1ddc4eaa9be42a8f35
+directory = libuv-v1.43.0
+source_url = https://dist.libuv.org/dist/v1.43.0/libuv-v1.43.0.tar.gz
+source_filename = libuv-v1.43.0.tar.gz
+source_hash = 90d72bb7ae18de2519d0cac70eb89c319351146b90cd3f91303a492707e693a4
+patch_filename = libuv_1.43.0-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/libuv_1.43.0-1/get_patch
+patch_hash = 9bd241c95110c67f9486f1a77a988216bf5ec192dc3002651a6ccefb2e6aba5a
 
 [provide]
 libuv = libuv_dep