mediasoup 3.13.7 → 3.13.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.13.7",
+  "version": "3.13.9",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -91,7 +91,11 @@
       "node/src/fbs",
       "node/src/tests"
     ],
-    "cacheDirectory": ".cache/jest"
+    "cacheDirectory": ".cache/jest",
+    "modulePathIgnorePatterns": [
+      "worker/",
+      "rust/"
+    ]
   },
   "dependencies": {
     "debug": "^4.3.4",
@@ -104,10 +108,10 @@
   "devDependencies": {
     "@octokit/rest": "^20.0.2",
     "@types/debug": "^4.1.12",
-    "@types/jest": "^29.5.10",
+    "@types/jest": "^29.5.11",
     "@types/node": "^20.10.3",
-    "@typescript-eslint/eslint-plugin": "^6.13.1",
-    "@typescript-eslint/parser": "^6.13.1",
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
+    "@typescript-eslint/parser": "^6.13.2",
     "eslint": "^8.55.0",
     "eslint-plugin-jest": "^27.6.0",
     "jest": "^29.7.0",

package/worker/meson.build

@@ -258,8 +258,8 @@ if host_machine.system() == 'windows'
   ]
 endif
 
-if host_machine.system() == 'linux'
-  kernel_version = run_command('uname', '-r').stdout().strip()
+if host_machine.system() == 'linux' and not get_option('ms_disable_liburing')
+  kernel_version = run_command('uname', '-r', check: true).stdout().strip()
 
   # Enable liburing for kernel versions greather than or equal to 6.
   if kernel_version[0].to_int() >= 6

package/worker/meson_options.txt

@@ -1,3 +1,4 @@
-option('ms_log_trace', type : 'boolean', value : false, description : 'When enabled, logs the current method/function if current log level is "debug"')
-option('ms_log_file_line', type : 'boolean', value : false, description : 'When enabled, all the logging macros print more verbose information, including current file and line')
-option('ms_rtc_logger_rtp', type : 'boolean', value : false, description : 'When enabled, prints a line with information for each RTP packet')
+option('ms_log_trace', type : 'boolean', value : false, description : 'When set to true, logs the current method/function if current log level is "debug"')
+option('ms_log_file_line', type : 'boolean', value : false, description : 'When set to true, all the logging macros print more verbose information, including current file and line')
+option('ms_rtc_logger_rtp', type : 'boolean', value : false, description : 'When set to true, prints a line with information for each RTP packet')
+option('ms_disable_liburing', type : 'boolean', value : false, description : 'When set to true, disables liburing integration despite current host supports it')

package/worker/src/DepUsrSCTP.cpp

@@ -2,6 +2,9 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "DepUsrSCTP.hpp"
+#ifdef MS_LIBURING_SUPPORTED
+#include "DepLibUring.hpp"
+#endif
 #include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include <usrsctp.h>
@@ -249,7 +252,21 @@ void DepUsrSCTP::Checker::OnTimer(TimerHandle* /*timer*/)
 	auto nowMs          = DepLibUV::GetTimeMs();
 	const int elapsedMs = this->lastCalledAtMs ? static_cast<int>(nowMs - this->lastCalledAtMs) : 0;
 
+#ifdef MS_LIBURING_SUPPORTED
+	// Activate liburing usage.
+	// 'usrsctp_handle_timers()' will synchronously call the send/recv
+	// callbacks for the pending data. If there are multiple messages to be
+	// sent over the network then we will send those messages within a single
+	// system call.
+	DepLibUring::SetActive();
+#endif
+
 	usrsctp_handle_timers(elapsedMs);
 
+#ifdef MS_LIBURING_SUPPORTED
+	// Submit all prepared submission entries.
+	DepLibUring::Submit();
+#endif
+
 	this->lastCalledAtMs = nowMs;
 }

package/worker/src/RTC/Router.cpp

@@ -921,9 +921,24 @@ namespace RTC
 
 		auto& dataConsumers = this->mapDataProducerDataConsumers.at(dataProducer);
 
-		for (auto* dataConsumer : dataConsumers)
+		if (!dataConsumers.empty())
 		{
-			dataConsumer->SendMessage(msg, len, ppid, subchannels, requiredSubchannel);
+#ifdef MS_LIBURING_SUPPORTED
+			// Activate liburing usage.
+			// The effective sending could be synchronous, thus we would send those
+			// messages within a single system call.
+			DepLibUring::SetActive();
+#endif
+
+			for (auto* dataConsumer : dataConsumers)
+			{
+				dataConsumer->SendMessage(msg, len, ppid, subchannels, requiredSubchannel);
+			}
+
+#ifdef MS_LIBURING_SUPPORTED
+			// Submit all prepared submission entries.
+			DepLibUring::Submit();
+#endif
 		}
 	}
 

package/worker/subprojects/liburing.wrap

@@ -3,11 +3,11 @@ directory = liburing-liburing-2.4
 source_url = https://github.com/axboe/liburing/archive/refs/tags/liburing-2.4.tar.gz
 source_filename = liburing-2.4.tar.gz
 source_hash = 2398ec82d967a6f903f3ae1fd4541c754472d3a85a584dc78c5da2fabc90706b
-patch_filename = liburing_2.4-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/liburing_2.4-1/get_patch
-patch_hash = 0dd939828da6a7c6d22c0f4db879405e74f9ac7153927c365642a28f871c92c2
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/liburing_2.4-1/liburing-2.4.tar.gz
-wrapdb_version = 2.4-1
+patch_filename = liburing_2.4-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/liburing_2.4-2/get_patch
+patch_hash = 0435ae1012065fa96a22e1068c2e39e2f7c7c03b58a812774434a6e7455d7f20
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/liburing_2.4-2/liburing-2.4.tar.gz
+wrapdb_version = 2.4-2
 
 [provide]
 dependency_names = liburing