mediasoup 3.12.5 → 3.12.6

package/node/lib/Worker.js

@@ -90,7 +90,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.12.5',
+                MEDIASOUP_VERSION: '3.12.6',
                 // 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

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

package/node/lib/index.js

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

package/node/lib/types.d.ts

@@ -1,21 +1,21 @@
-export type * from './Worker';
-export type * from './WebRtcServer';
-export type * from './Router';
-export type * from './Transport';
-export type * from './WebRtcTransport';
-export type * from './PlainTransport';
-export type * from './PipeTransport';
-export type * from './DirectTransport';
-export type * from './Producer';
-export type * from './Consumer';
-export type * from './DataProducer';
-export type * from './DataConsumer';
-export type * from './RtpObserver';
-export type * from './ActiveSpeakerObserver';
-export type * from './AudioLevelObserver';
-export type * from './RtpParameters';
-export type * from './SctpParameters';
-export type * from './SrtpParameters';
+export * from './Worker';
+export * from './WebRtcServer';
+export * from './Router';
+export * from './Transport';
+export * from './WebRtcTransport';
+export * from './PlainTransport';
+export * from './PipeTransport';
+export * from './DirectTransport';
+export * from './Producer';
+export * from './Consumer';
+export * from './DataProducer';
+export * from './DataConsumer';
+export * from './RtpObserver';
+export * from './ActiveSpeakerObserver';
+export * from './AudioLevelObserver';
+export * from './RtpParameters';
+export * from './SctpParameters';
+export * from './SrtpParameters';
 export * from './errors';
 export type { ScalabilityMode } from './scalabilityModes';
 export type AppData = {

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,mBAAmB,UAAU,CAAC;AAC9B,mBAAmB,gBAAgB,CAAC;AACpC,mBAAmB,UAAU,CAAC;AAC9B,mBAAmB,aAAa,CAAC;AACjC,mBAAmB,mBAAmB,CAAC;AACvC,mBAAmB,kBAAkB,CAAC;AACtC,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,mBAAmB,CAAC;AACvC,mBAAmB,YAAY,CAAC;AAChC,mBAAmB,YAAY,CAAC;AAChC,mBAAmB,gBAAgB,CAAC;AACpC,mBAAmB,gBAAgB,CAAC;AACpC,mBAAmB,eAAe,CAAC;AACnC,mBAAmB,yBAAyB,CAAC;AAC7C,mBAAmB,sBAAsB,CAAC;AAC1C,mBAAmB,iBAAiB,CAAC;AACrC,mBAAmB,kBAAkB,CAAC;AACtC,mBAAmB,kBAAkB,CAAC;AAEtC,cAAc,UAAU,CAAC;AACzB,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,MAAM,MAAM,OAAO,GACnB;IACC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,MAAM,MAAM,OAAO,GACnB;IACC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB,CAAC"}

package/node/lib/types.js

@@ -14,5 +14,22 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// We cannot export only the type of error classes because those are useless.
+__exportStar(require("./Worker"), exports);
+__exportStar(require("./WebRtcServer"), exports);
+__exportStar(require("./Router"), exports);
+__exportStar(require("./Transport"), exports);
+__exportStar(require("./WebRtcTransport"), exports);
+__exportStar(require("./PlainTransport"), exports);
+__exportStar(require("./PipeTransport"), exports);
+__exportStar(require("./DirectTransport"), exports);
+__exportStar(require("./Producer"), exports);
+__exportStar(require("./Consumer"), exports);
+__exportStar(require("./DataProducer"), exports);
+__exportStar(require("./DataConsumer"), exports);
+__exportStar(require("./RtpObserver"), exports);
+__exportStar(require("./ActiveSpeakerObserver"), exports);
+__exportStar(require("./AudioLevelObserver"), exports);
+__exportStar(require("./RtpParameters"), exports);
+__exportStar(require("./SctpParameters"), exports);
+__exportStar(require("./SrtpParameters"), exports);
 __exportStar(require("./errors"), exports);

package/npm-scripts.mjs

@@ -204,11 +204,11 @@ async function run()
 			catch (error)
 			{
 				logError(error.message);
+
 				exitWithError();
 			}
 
 			checkRelease();
-
 			executeCmd(`git commit -am '${PKG.version}'`);
 			executeCmd(`git tag -a ${PKG.version} -m '${PKG.version}'`);
 			executeCmd(`git push origin v${MAYOR_VERSION}`);
@@ -243,7 +243,6 @@ async function run()
 		case 'release:upload-mac-arm-prebuilt-worker':
 		{
 			checkRelease();
-
 			await prebuildWorker();
 			await uploadMacArmPrebuiltWorker();
 
@@ -428,6 +427,7 @@ function installMsysMake()
 		if (res.status !== 0)
 		{
 			logError('`installMsysMake() | cannot find Python executable');
+
 			exitWithError();
 		}
 	}
@@ -685,6 +685,7 @@ function executeCmd(command, exitOnError = true)
 		if (exitOnError)
 		{
 			logError(`executeCmd() failed, exiting: ${error}`);
+
 			exitWithError();
 		}
 		else

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "mediasoup",
-  "version": "3.12.5",
+  "version": "3.12.6",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
     "José Luis Millán <jmillan@aliax.net> (https://github.com/jmillan)",
     "Nazar Mokynskyi (https://github.com/nazar-pc)"
   ],
-  "homepage": "https://mediasoup.org",
   "license": "ISC",
+  "homepage": "https://mediasoup.org",
   "repository": {
     "type": "git",
     "url": "https://github.com/versatica/mediasoup.git"
@@ -38,15 +38,15 @@
     "worker/meson_options.txt",
     "npm-scripts.mjs"
   ],
+  "engines": {
+    "node": ">=16"
+  },
   "keywords": [
     "webrtc",
     "ortc",
     "sfu",
     "nodejs"
   ],
-  "engines": {
-    "node": ">=16"
-  },
   "scripts": {
     "prepare": "node npm-scripts.mjs prepare",
     "postinstall": "node npm-scripts.mjs postinstall",

package/worker/Makefile

@@ -81,6 +81,7 @@ endif
 	lint \
 	format \
 	test \
+	test-asan \
 	tidy \
 	fuzzer \
 	fuzzer-run-all \
@@ -225,6 +226,11 @@ else
 	$(BUILD_DIR)/mediasoup-worker-test --invisibles --use-colour=yes $(MEDIASOUP_TEST_TAGS)
 endif
 
+test-asan: setup
+	$(MESON) compile -C $(BUILD_DIR) -j $(CORES) mediasoup-worker-test-asan
+	$(MESON) install -C $(BUILD_DIR) --no-rebuild --tags mediasoup-worker-test-asan
+	ASAN_OPTIONS=detect_leaks=1 $(BUILD_DIR)/mediasoup-worker-test-asan --invisibles --use-colour=yes $(MEDIASOUP_TEST_TAGS)
+
 tidy:
 	$(PYTHON) ./scripts/clang-tidy.py \
 		-clang-tidy-binary=./scripts/node_modules/.bin/clang-tidy \

package/worker/include/RTC/RTCP/ReceiverReport.hpp

@@ -102,9 +102,9 @@ namespace RTC
 			{
 				return uint32_t{ ntohl(this->header->jitter) };
 			}
-			void SetJitter(uint32_t jitter)
+			void SetJitter(float jitter)
 			{
-				this->header->jitter = uint32_t{ htonl(jitter) };
+				this->header->jitter = uint32_t{ htonl(static_cast<uint32_t>(jitter)) };
 			}
 			uint32_t GetLastSenderReport() const
 			{

package/worker/include/RTC/RtpStreamRecv.hpp

@@ -114,7 +114,9 @@ namespace RTC
 		uint64_t lastSrReceived{ 0u };
 		// Relative transit time for prev packet.
 		int32_t transit{ 0u };
-		uint32_t jitter{ 0u };
+		// Jitter in RTP timestamp units. As per spec it's kept as floating value
+		// although it's exposed as integer in the stats.
+		float jitter{ 0 };
 		uint8_t firSeqNumber{ 0u };
 		uint32_t reportedPacketLost{ 0u };
 		std::unique_ptr<RTC::NackGenerator> nackGenerator;

package/worker/include/RTC/Transport.hpp

@@ -144,6 +144,7 @@ namespace RTC
 
 	protected:
 		// Must be called from the subclass.
+		void Destroying();
 		void Connected();
 		void Disconnected();
 		void DataReceived(size_t len)

package/worker/meson.build

@@ -280,15 +280,7 @@ executable(
   cpp_args: cpp_args + ['-DMS_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'),
-  ],
-  sources: common_sources + [
+test_sources = [
     'test/src/tests.cpp',
     'test/src/PayloadChannel/TestPayloadChannelNotification.cpp',
     'test/src/PayloadChannel/TestPayloadChannelRequest.cpp',
@@ -333,7 +325,17 @@ mediasoup_worker_test = executable(
     'test/src/Utils/TestJson.cpp',
     'test/src/Utils/TestString.cpp',
     'test/src/Utils/TestTime.cpp',
+]
+
+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'),
   ],
+  sources: common_sources + test_sources,
   include_directories: include_directories(
     'include',
     'test/include',
@@ -350,6 +352,35 @@ test(
   workdir: meson.project_source_root(),
 )
 
+mediasoup_worker_test_asan = executable(
+  'mediasoup-worker-test-asan',
+  build_by_default: false,
+  install: true,
+  install_tag: 'mediasoup-worker-test-asan',
+  dependencies: dependencies + [
+    catch2_proj.get_variable('catch2_dep'),
+  ],
+  sources: common_sources + test_sources,
+  include_directories: include_directories(
+    'include',
+    'test/include',
+  ),
+  cpp_args: cpp_args + [
+    '-DMS_LOG_STD',
+    '-DMS_TEST',
+    '-fsanitize=address',
+  ],
+  link_args: [
+    '-fsanitize=address',
+  ],
+)
+
+test(
+  'mediasoup-worker-test-asan',
+  mediasoup_worker_test_asan,
+  workdir: meson.project_source_root(),
+)
+
 executable(
   'mediasoup-worker-fuzzer',
   build_by_default: false,

package/worker/src/RTC/DirectTransport.cpp

@@ -28,6 +28,10 @@ namespace RTC
 	{
 		MS_TRACE();
 
+		// Tell the Transport parent class that we are about to destroy
+		// the class instance.
+		Destroying();
+
 		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
 	}
 

package/worker/src/RTC/PipeTransport.cpp

@@ -117,6 +117,10 @@ namespace RTC
 	{
 		MS_TRACE();
 
+		// Tell the Transport parent class that we are about to destroy
+		// the class instance.
+		Destroying();
+
 		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
 
 		delete this->udpSocket;

package/worker/src/RTC/PlainTransport.cpp

@@ -206,6 +206,10 @@ namespace RTC
 	{
 		MS_TRACE();
 
+		// Tell the Transport parent class that we are about to destroy
+		// the class instance.
+		Destroying();
+
 		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
 
 		delete this->udpSocket;

package/worker/src/RTC/RtpStreamRecv.cpp

@@ -236,7 +236,7 @@ namespace RTC
 		RTC::RtpStream::FillJsonStats(jsonObject);
 
 		jsonObject["type"]        = "inbound-rtp";
-		jsonObject["jitter"]      = this->jitter;
+		jsonObject["jitter"]      = static_cast<uint32_t>(this->jitter);
 		jsonObject["packetCount"] = this->transmissionCounter.GetPacketCount();
 		jsonObject["byteCount"]   = this->transmissionCounter.GetBytes();
 		jsonObject["bitrate"]     = this->transmissionCounter.GetBitrate(nowMs);
@@ -692,15 +692,14 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		if (this->params.clockRate == 0u)
+		if (GetClockRate() == 0u)
 		{
 			return;
 		}
 
 		// NOTE: Based on https://github.com/versatica/mediasoup/issues/1018.
-		auto transit = static_cast<int>(
-		  DepLibUV::GetTimeMs() - (static_cast<uint64_t>(rtpTimestamp) * 1000 / this->params.clockRate));
-		int d = transit - this->transit;
+		auto transit = static_cast<int>((DepLibUV::GetTimeMs() * GetClockRate() / 1000) - rtpTimestamp);
+		int d        = transit - this->transit;
 
 		// First transit calculation, save and return.
 		if (this->transit == 0)
@@ -717,7 +716,7 @@ namespace RTC
 			d = -d;
 		}
 
-		this->jitter += (1. / 16.) * (static_cast<double>(d) - this->jitter);
+		this->jitter += (1. / 16.) * (static_cast<float>(d) - this->jitter);
 	}
 
 	void RtpStreamRecv::UpdateScore()

package/worker/src/RTC/Transport.cpp

@@ -182,9 +182,6 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		// Set the destroying flag.
-		this->destroying = true;
-
 		// The destructor must delete and clear everything silently.
 
 		// Delete all Producers.
@@ -1594,6 +1591,13 @@ namespace RTC
 		}
 	}
 
+	void Transport::Destroying()
+	{
+		MS_TRACE();
+
+		this->destroying = true;
+	}
+
 	void Transport::Connected()
 	{
 		MS_TRACE();

package/worker/src/RTC/WebRtcTransport.cpp

@@ -300,6 +300,11 @@ namespace RTC
 	{
 		MS_TRACE();
 
+		// We need to tell the Transport parent class that we are about to destroy
+		// the class instance. This is because child's destructor runs before
+		// parent's destructor. See comment in Transport::OnSctpAssociationSendData().
+		Destroying();
+
 		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
 
 		// Must delete the DTLS transport first since it will generate a DTLS alert

package/worker/src/lib.cpp

@@ -19,9 +19,7 @@
 #include <uv.h>
 #include <absl/container/flat_hash_map.h>
 #include <cerrno>
-#include <csignal>  // sigaction()
-#include <cstdlib>  // std::_Exit(), std::genenv()
-#include <iostream> // std::cerr, std::endl
+#include <csignal> // sigaction()
 #include <string>
 
 void IgnoreSignals();
@@ -225,7 +223,9 @@ void IgnoreSignals()
 	err            = sigfillset(&act.sa_mask);
 
 	if (err != 0)
+	{
 		MS_THROW_ERROR("sigfillset() failed: %s", std::strerror(errno));
+	}
 
 	for (auto& kv : ignoredSignals)
 	{
@@ -235,7 +235,9 @@ void IgnoreSignals()
 		err = sigaction(sigId, &act, nullptr);
 
 		if (err != 0)
+		{
 			MS_THROW_ERROR("sigaction() failed for signal %s: %s", sigName.c_str(), std::strerror(errno));
+		}
 	}
 #endif
 }

package/worker/src/main.cpp

@@ -3,7 +3,7 @@
 
 #include "MediaSoupErrors.hpp"
 #include "lib.hpp"
-#include <cstdlib> // std::_Exit(), std::genenv()
+#include <cstdlib> // std::_Exit()
 #include <string>
 
 static constexpr int ConsumerChannelFd{ 3 };