mediasoup 3.19.21 → 3.19.22

package/node/lib/Worker.d.ts

@@ -30,5 +30,6 @@ export declare class WorkerImpl<WorkerAppData extends AppData = AppData> extends
     createRouter<RouterAppData extends AppData = AppData>({ mediaCodecs, appData, }?: RouterOptions<RouterAppData>): Promise<Router<RouterAppData>>;
     private workerDied;
     private handleListenerError;
+    private onSignal;
 }
 //# sourceMappingURL=Worker.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Worker.d.ts","sourceRoot":"","sources":["../src/Worker.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EACX,MAAM,EACN,cAAc,EACd,wBAAwB,EACxB,mBAAmB,EACnB,UAAU,EACV,YAAY,EACZ,cAAc,EAEd,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE7E,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAM3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAWvC,eAAO,MAAM,gBAAgB,EAAE,MAA8B,CAAC;AAE9D,qBAAa,UAAU,CAAC,aAAa,SAAS,OAAO,GAAG,OAAO,CAC9D,SAAQ,oBAAoB,CAAC,YAAY,CACzC,YAAW,MAAM;;gBAiCL,EACX,QAAQ,EACR,OAAO,EACP,UAAU,EACV,UAAU,EACV,mBAAmB,EACnB,kBAAkB,EAClB,SAAS,EACT,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,OAAO,GACP,EAAE,cAAc,CAAC,aAAa,CAAC;IAmNhC,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,IAAI,IAAI,OAAO,CAElB;IAED,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,OAAO,IAAI,aAAa,CAE3B;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,aAAa,EAEjC;IAED,IAAI,QAAQ,IAAI,cAAc,CAE7B;IAED;;OAEG;IACH,IAAI,uBAAuB,IAAI,GAAG,CAAC,YAAY,CAAC,CAE/C;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,GAAG,CAAC,MAAM,CAAC,CAEnC;IAED,KAAK,IAAI,IAAI;IA+BP,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;IAc3B,gBAAgB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAkChD,cAAc,CAAC,EACpB,QAAQ,EACR,OAAO,GACP,GAAE,wBAAwB,CAAC,aAAa,CAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBzD,kBAAkB,CAAC,mBAAmB,SAAS,OAAO,GAAG,OAAO,EAAE,EACvE,WAAW,EACX,OAAO,GACP,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,GAAG,OAAO,CACpD,YAAY,CAAC,mBAAmB,CAAC,CACjC;IA0DK,YAAY,CAAC,aAAa,SAAS,OAAO,GAAG,OAAO,EAAE,EAC3D,WAAW,EACX,OAAO,GACP,GAAE,aAAa,CAAC,aAAa,CAAM,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAgDrE,OAAO,CAAC,UAAU;IAmClB,OAAO,CAAC,mBAAmB;CAQ3B"}
+{"version":3,"file":"Worker.d.ts","sourceRoot":"","sources":["../src/Worker.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EACX,MAAM,EACN,cAAc,EACd,wBAAwB,EACxB,mBAAmB,EACnB,UAAU,EACV,YAAY,EACZ,cAAc,EAEd,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE7E,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAM3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAWvC,eAAO,MAAM,gBAAgB,EAAE,MAA8B,CAAC;AAE9D,qBAAa,UAAU,CAAC,aAAa,SAAS,OAAO,GAAG,OAAO,CAC9D,SAAQ,oBAAoB,CAAC,YAAY,CACzC,YAAW,MAAM;;gBAiCL,EACX,QAAQ,EACR,OAAO,EACP,UAAU,EACV,UAAU,EACV,mBAAmB,EACnB,kBAAkB,EAClB,SAAS,EACT,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,OAAO,GACP,EAAE,cAAc,CAAC,aAAa,CAAC;IA6NhC,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,IAAI,IAAI,OAAO,CAElB;IAED,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,OAAO,IAAI,aAAa,CAE3B;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,aAAa,EAEjC;IAED,IAAI,QAAQ,IAAI,cAAc,CAE7B;IAED;;OAEG;IACH,IAAI,uBAAuB,IAAI,GAAG,CAAC,YAAY,CAAC,CAE/C;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,GAAG,CAAC,MAAM,CAAC,CAEnC;IAED,KAAK,IAAI,IAAI;IAkCP,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;IAc3B,gBAAgB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAkChD,cAAc,CAAC,EACpB,QAAQ,EACR,OAAO,GACP,GAAE,wBAAwB,CAAC,aAAa,CAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBzD,kBAAkB,CAAC,mBAAmB,SAAS,OAAO,GAAG,OAAO,EAAE,EACvE,WAAW,EACX,OAAO,GACP,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,GAAG,OAAO,CACpD,YAAY,CAAC,mBAAmB,CAAC,CACjC;IA0DK,YAAY,CAAC,aAAa,SAAS,OAAO,GAAG,OAAO,EAAE,EAC3D,WAAW,EACX,OAAO,GACP,GAAE,aAAa,CAAC,aAAa,CAAM,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAgDrE,OAAO,CAAC,UAAU;IAmClB,OAAO,CAAC,mBAAmB;IAU3B,OAAO,CAAC,QAAQ,CAMd;CACF"}

package/node/lib/Worker.js

@@ -192,6 +192,13 @@ class WorkerImpl extends enhancedEvents_1.EnhancedEventEmitter {
                 }
             }
         });
+        // NOTE: Avoid "Possible EventEmitter memory leak detected" Node warning.
+        const processListenerCount = process.getMaxListeners();
+        if (processListenerCount >= 10) {
+            process.setMaxListeners(processListenerCount + 2);
+        }
+        process.once('SIGINT', this.onSignal);
+        process.once('SIGTERM', this.onSignal);
         this.handleListenerError();
     }
     get pid() {
@@ -233,6 +240,8 @@ class WorkerImpl extends enhancedEvents_1.EnhancedEventEmitter {
         }
         logger.debug('close()');
         this.#closed = true;
+        process.removeListener('SIGINT', this.onSignal);
+        process.removeListener('SIGTERM', this.onSignal);
         // Close every Router.
         for (const router of this.#routers) {
             router.workerClosed();
@@ -376,6 +385,11 @@ class WorkerImpl extends enhancedEvents_1.EnhancedEventEmitter {
             logger.error(`event listener threw an error [eventName:${eventName}]:`, error);
         });
     }
+    // NOTE: Arrow method on purpose.
+    onSignal = (signal) => {
+        logger.debug(`signal received, closing the worker process [pid:${this.#pid}, signal:${signal}]`);
+        this.close();
+    };
 }
 exports.WorkerImpl = WorkerImpl;
 function parseWorkerDumpResponse(binary) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mediasoup",
-	"version": "3.19.21",
+	"version": "3.19.22",
 	"description": "Cutting Edge WebRTC Video Conferencing",
 	"contributors": [
 		"Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -48,6 +48,8 @@
 		"worker/fuzzer/include",
 		"worker/fuzzer/src",
 		"worker/include",
+		"worker/mocks/include",
+		"worker/mocks/src",
 		"worker/src",
 		"worker/scripts/*.json",
 		"worker/scripts/*.mjs",
@@ -125,7 +127,7 @@
 		"prettier": "^3.8.3",
 		"ts-jest": "^29.4.9",
 		"typescript": "^5.9.3",
-		"typescript-eslint": "^8.59.0",
+		"typescript-eslint": "^8.59.1",
 		"werift-sctp": "^0.0.11"
 	}
 }

package/worker/fuzzer/src/RTC/FuzzerDtlsTransport.cpp

@@ -4,17 +4,22 @@
 #include "RTC/FuzzerDtlsTransport.hpp"
 #include "Logger.hpp"
 #include "Utils.hpp"
+#include "mocks/include/MockShared.hpp"
 
 namespace
 {
-	// NOLINTBEGIN(readability-identifier-naming)
+	// NOLINTNEXTLINE(readability-identifier-naming)
+	thread_local mocks::MockShared shared;
+
 	// DtlsTransport instance. It's reset every time DTLS handshake fails or DTLS
 	// is closed.
+	// NOLINTNEXTLINE(readability-identifier-naming)
 	thread_local RTC::DtlsTransport* dtlsTransportSingleton{ nullptr };
+
 	// DtlsTransport Listener instance. It's reset every time the DtlsTransport
 	// singletonDTLS is reset.
+	// NOLINTNEXTLINE(readability-identifier-naming)
 	thread_local FuzzerRtcDtlsTransport::DtlsTransportListener* dtlsTransportListenerSingleton{ nullptr };
-	// NOLINTEND(readability-identifier-naming)
 } // namespace
 
 void FuzzerRtcDtlsTransport::Fuzz(const uint8_t* data, size_t len)
@@ -31,7 +36,8 @@ void FuzzerRtcDtlsTransport::Fuzz(const uint8_t* data, size_t len)
 		delete dtlsTransportListenerSingleton;
 		dtlsTransportListenerSingleton = new DtlsTransportListener();
 
-		dtlsTransportSingleton = new RTC::DtlsTransport(dtlsTransportListenerSingleton);
+		dtlsTransportSingleton =
+		  new RTC::DtlsTransport(dtlsTransportListenerSingleton, std::addressof(shared));
 
 		RTC::DtlsTransport::Role localRole;
 		RTC::DtlsTransport::Fingerprint dtlsRemoteFingerprint;

package/worker/fuzzer/src/RTC/RTP/FuzzerRtpStreamSend.cpp

@@ -1,7 +1,14 @@
 #include "RTC/RTP/FuzzerRtpStreamSend.hpp"
 #include "Utils.hpp"
+#include "mocks/include/MockShared.hpp"
 #include "RTC/RTP/SharedPacket.hpp"
 
+namespace
+{
+	// NOLINTNEXTLINE(readability-identifier-naming)
+	thread_local mocks::MockShared shared;
+} // namespace
+
 void FuzzerRtcRtpStreamSend::Fuzz(const uint8_t* data, size_t len)
 {
 	// clang-format off
@@ -30,7 +37,8 @@ void FuzzerRtcRtpStreamSend::Fuzz(const uint8_t* data, size_t len)
 	packet->SetSsrc(params.ssrc);
 
 	std::string mid;
-	auto* stream = new RTC::RTP::RtpStreamSend(&testRtpStreamListener, params, mid);
+	auto* stream = new RTC::RTP::RtpStreamSend(
+	  std::addressof(testRtpStreamListener), std::addressof(shared), params, mid);
 	size_t offset{ 0u };
 
 	while (len >= 4u)

package/worker/include/Channel/ChannelMessageRegistrator.hpp

@@ -0,0 +1,39 @@
+#ifndef MS_CHANNEL_MESSAGE_REGISTRATOR_HPP
+#define MS_CHANNEL_MESSAGE_REGISTRATOR_HPP
+
+#include "Channel/ChannelMessageRegistratorInterface.hpp"
+#include "Channel/ChannelSocket.hpp"
+#include <string>
+#include <unordered_map>
+
+namespace Channel
+{
+	class ChannelMessageRegistrator : public Channel::ChannelMessageRegistratorInterface
+	{
+	public:
+		explicit ChannelMessageRegistrator();
+
+		~ChannelMessageRegistrator() override;
+
+	public:
+		flatbuffers::Offset<FBS::Worker::ChannelMessageHandlers> FillBuffer(
+		  flatbuffers::FlatBufferBuilder& builder) override;
+
+		void RegisterHandler(
+		  const std::string& id,
+		  ChannelSocket::RequestHandler* channelRequestHandler,
+		  ChannelSocket::NotificationHandler* channelNotificationHandler) override;
+
+		void UnregisterHandler(const std::string& id) override;
+
+		ChannelSocket::RequestHandler* GetChannelRequestHandler(const std::string& id) override;
+
+		ChannelSocket::NotificationHandler* GetChannelNotificationHandler(const std::string& id) override;
+
+	private:
+		std::unordered_map<std::string, ChannelSocket::RequestHandler*> mapChannelRequestHandlers;
+		std::unordered_map<std::string, ChannelSocket::NotificationHandler*> mapChannelNotificationHandlers;
+	};
+} // namespace Channel
+
+#endif

package/worker/include/Channel/ChannelMessageRegistratorInterface.hpp

@@ -0,0 +1,32 @@
+#ifndef MS_CHANNEL_MESSAGE_REGISTRATOR_INTERFACE_HPP
+#define MS_CHANNEL_MESSAGE_REGISTRATOR_INTERFACE_HPP
+
+// TODO: We should have a ChannelSocketInterface class instead.
+#include "Channel/ChannelSocket.hpp"
+#include <string>
+
+namespace Channel
+{
+	class ChannelMessageRegistratorInterface
+	{
+	public:
+		virtual ~ChannelMessageRegistratorInterface() = default;
+
+	public:
+		virtual flatbuffers::Offset<FBS::Worker::ChannelMessageHandlers> FillBuffer(
+		  flatbuffers::FlatBufferBuilder& builder) = 0;
+
+		virtual void RegisterHandler(
+		  const std::string& id,
+		  ChannelSocket::RequestHandler* channelRequestHandler,
+		  ChannelSocket::NotificationHandler* channelNotificationHandler) = 0;
+
+		virtual void UnregisterHandler(const std::string& id) = 0;
+
+		virtual ChannelSocket::RequestHandler* GetChannelRequestHandler(const std::string& id) = 0;
+
+		virtual ChannelSocket::NotificationHandler* GetChannelNotificationHandler(const std::string& id) = 0;
+	};
+} // namespace Channel
+
+#endif

package/worker/include/Channel/ChannelSocket.hpp

@@ -82,7 +82,7 @@ namespace Channel
 		};
 
 	public:
-#ifdef MS_TEST
+#if defined(MS_TEST) || defined(MS_FUZZER)
 		explicit ChannelSocket();
 #endif
 		explicit ChannelSocket(int consumerFd, int producerFd);

package/worker/include/DepUsrSCTP.hpp

@@ -2,36 +2,37 @@
 #define MS_DEP_USRSCTP_HPP
 
 #include "common.hpp"
+#include "SharedInterface.hpp"
 #include "RTC/SctpAssociation.hpp"
-#include "handles/TimerHandle.hpp"
+#include "handles/TimerHandleInterface.hpp"
 #include <absl/container/flat_hash_map.h>
 
 class DepUsrSCTP
 {
 private:
-	class Checker : public TimerHandle::Listener
+	class Checker : public TimerHandleInterface::Listener
 	{
 	public:
-		Checker();
+		Checker(SharedInterface* shared);
 		~Checker() override;
 
 	public:
 		void Start();
 		void Stop();
 
-		/* Pure virtual methods inherited from TimerHandle::Listener. */
+		/* Pure virtual methods inherited from TimerHandleInterface::Listener. */
 	public:
-		void OnTimer(TimerHandle* timer) override;
+		void OnTimer(TimerHandleInterface* timer) override;
 
 	private:
-		TimerHandle* timer{ nullptr };
+		TimerHandleInterface* timer{ nullptr };
 		uint64_t lastCalledAtMs{ 0u };
 	};
 
 public:
 	static void ClassInit();
 	static void ClassDestroy();
-	static void CreateChecker();
+	static void CreateChecker(SharedInterface* shared);
 	static void CloseChecker();
 	static uintptr_t GetNextSctpAssociationId();
 	static void RegisterSctpAssociation(RTC::SctpAssociation* sctpAssociation);

package/worker/include/RTC/ActiveSpeakerObserver.hpp

@@ -1,9 +1,9 @@
 #ifndef MS_RTC_ACTIVE_SPEAKER_OBSERVER_HPP
 #define MS_RTC_ACTIVE_SPEAKER_OBSERVER_HPP
 
+#include "SharedInterface.hpp"
 #include "RTC/RtpObserver.hpp"
-#include "RTC/Shared.hpp"
-#include "handles/TimerHandle.hpp"
+#include "handles/TimerHandleInterface.hpp"
 #include <absl/container/flat_hash_map.h>
 #include <vector>
 
@@ -14,7 +14,7 @@
 // https://github.com/jitsi/jitsi-utils/blob/master/src/main/java/org/jitsi/utils/dsi/DominantSpeakerIdentification.java
 namespace RTC
 {
-	class ActiveSpeakerObserver : public RTC::RtpObserver, public TimerHandle::Listener
+	class ActiveSpeakerObserver : public RTC::RtpObserver, public TimerHandleInterface::Listener
 	{
 	private:
 		class Speaker
@@ -69,7 +69,7 @@ namespace RTC
 
 	public:
 		ActiveSpeakerObserver(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  RTC::RtpObserver::Listener* listener,
 		  const FBS::ActiveSpeakerObserver::ActiveSpeakerObserverOptions* options);
@@ -89,14 +89,14 @@ namespace RTC
 		bool CalculateActiveSpeaker();
 		void TimeoutIdleLevels(uint64_t now);
 
-		/* Pure virtual methods inherited from TimerHandle. */
+		/* Pure virtual methods inherited from TimerHandleInterface. */
 	protected:
-		void OnTimer(TimerHandle* timer) override;
+		void OnTimer(TimerHandleInterface* timer) override;
 
 	private:
 		double relativeSpeachActivities[RelativeSpeachActivitiesLen]{};
 		std::string dominantId;
-		TimerHandle* periodicTimer{ nullptr };
+		TimerHandleInterface* periodicTimer{ nullptr };
 		uint16_t interval{ 300u };
 		// Map of ProducerSpeakers indexed by Producer id.
 		absl::flat_hash_map<std::string, ProducerSpeaker*> mapProducerSpeakers;

package/worker/include/RTC/AudioLevelObserver.hpp

@@ -1,14 +1,14 @@
 #ifndef MS_RTC_AUDIO_LEVEL_OBSERVER_HPP
 #define MS_RTC_AUDIO_LEVEL_OBSERVER_HPP
 
+#include "SharedInterface.hpp"
 #include "RTC/RtpObserver.hpp"
-#include "RTC/Shared.hpp"
-#include "handles/TimerHandle.hpp"
+#include "handles/TimerHandleInterface.hpp"
 #include <absl/container/flat_hash_map.h>
 
 namespace RTC
 {
-	class AudioLevelObserver : public RTC::RtpObserver, public TimerHandle::Listener
+	class AudioLevelObserver : public RTC::RtpObserver, public TimerHandleInterface::Listener
 	{
 	private:
 		struct DBovs
@@ -19,7 +19,7 @@ namespace RTC
 
 	public:
 		AudioLevelObserver(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  RTC::RtpObserver::Listener* listener,
 		  const FBS::AudioLevelObserver::AudioLevelObserverOptions* options);
@@ -38,9 +38,9 @@ namespace RTC
 		void Update();
 		void ResetMapProducerDBovs();
 
-		/* Pure virtual methods inherited from TimerHandle. */
+		/* Pure virtual methods inherited from TimerHandleInterface. */
 	protected:
-		void OnTimer(TimerHandle* timer) override;
+		void OnTimer(TimerHandleInterface* timer) override;
 
 	private:
 		// Passed by argument.
@@ -48,7 +48,7 @@ namespace RTC
 		int8_t threshold{ -80 };
 		uint16_t interval{ 1000u };
 		// Allocated by this.
-		TimerHandle* periodicTimer{ nullptr };
+		TimerHandleInterface* periodicTimer{ nullptr };
 		// Others.
 		absl::flat_hash_map<RTC::Producer*, DBovs> mapProducerDBovs;
 		bool silence{ true };

package/worker/include/RTC/Consumer.hpp

@@ -2,6 +2,7 @@
 #define MS_RTC_CONSUMER_HPP
 
 #include "common.hpp"
+#include "SharedInterface.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "Channel/ChannelSocket.hpp"
 #include "FBS/consumer.h"
@@ -16,7 +17,6 @@
 #include "RTC/RTP/RtpStreamSend.hpp"
 #include "RTC/RTP/SharedPacket.hpp"
 #include "RTC/RtpDictionaries.hpp"
-#include "RTC/Shared.hpp"
 #include <absl/container/flat_hash_set.h>
 #include <string>
 #include <vector>
@@ -52,7 +52,7 @@ namespace RTC
 
 	public:
 		Consumer(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  const std::string& producerId,
 		  RTC::Consumer::Listener* listener,
@@ -177,7 +177,7 @@ namespace RTC
 
 	protected:
 		// Passed by argument.
-		RTC::Shared* shared{ nullptr };
+		SharedInterface* shared{ nullptr };
 		RTC::Consumer::Listener* listener{ nullptr };
 		RTC::Media::Kind kind;
 		RTC::RtpParameters rtpParameters;

package/worker/include/RTC/DataConsumer.hpp

@@ -2,10 +2,10 @@
 #define MS_RTC_DATA_CONSUMER_HPP
 
 #include "common.hpp"
+#include "SharedInterface.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "Channel/ChannelSocket.hpp"
 #include "RTC/SctpDictionaries.hpp"
-#include "RTC/Shared.hpp"
 #include <absl/container/flat_hash_set.h>
 #include <string>
 
@@ -43,7 +43,7 @@ namespace RTC
 
 	public:
 		DataConsumer(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  const std::string& dataProducerId,
 		  RTC::DataConsumer::Listener* listener,
@@ -114,7 +114,7 @@ namespace RTC
 
 	private:
 		// Passed by argument.
-		RTC::Shared* shared{ nullptr };
+		SharedInterface* shared{ nullptr };
 		RTC::DataConsumer::Listener* listener{ nullptr };
 		size_t maxMessageSize{ 0u };
 		// Others.

package/worker/include/RTC/DataProducer.hpp

@@ -2,10 +2,10 @@
 #define MS_RTC_DATA_PRODUCER_HPP
 
 #include "common.hpp"
+#include "SharedInterface.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "Channel/ChannelSocket.hpp"
 #include "RTC/SctpDictionaries.hpp"
-#include "RTC/Shared.hpp"
 #include <string>
 #include <vector>
 
@@ -42,7 +42,7 @@ namespace RTC
 
 	public:
 		DataProducer(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  size_t maxMessageSize,
 		  RTC::DataProducer::Listener* listener,
@@ -87,7 +87,7 @@ namespace RTC
 
 	private:
 		// Passed by argument.
-		RTC::Shared* shared{ nullptr };
+		SharedInterface* shared{ nullptr };
 		size_t maxMessageSize{ 0u };
 		RTC::DataProducer::Listener* listener{ nullptr };
 		// Others.

package/worker/include/RTC/DirectTransport.hpp

@@ -1,7 +1,7 @@
 #ifndef MS_RTC_DIRECT_TRANSPORT_HPP
 #define MS_RTC_DIRECT_TRANSPORT_HPP
 
-#include "RTC/Shared.hpp"
+#include "SharedInterface.hpp"
 #include "RTC/Transport.hpp"
 
 namespace RTC
@@ -10,7 +10,7 @@ namespace RTC
 	{
 	public:
 		DirectTransport(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  RTC::Transport::Listener* listener,
 		  const FBS::DirectTransport::DirectTransportOptions* options);

package/worker/include/RTC/DtlsTransport.hpp

@@ -2,9 +2,10 @@
 #define MS_RTC_DTLS_TRANSPORT_HPP
 
 #include "common.hpp"
+#include "SharedInterface.hpp"
 #include "FBS/webRtcTransport.h"
 #include "RTC/SrtpSession.hpp"
-#include "handles/TimerHandle.hpp"
+#include "handles/TimerHandleInterface.hpp"
 #include <openssl/bio.h>
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
@@ -14,7 +15,7 @@
 
 namespace RTC
 {
-	class DtlsTransport : public TimerHandle::Listener
+	class DtlsTransport : public TimerHandleInterface::Listener
 	{
 	public:
 		enum class DtlsState : uint8_t
@@ -135,7 +136,7 @@ namespace RTC
 		static const std::vector<SrtpCryptoSuiteMapEntry> SrtpCryptoSuites;
 
 	public:
-		explicit DtlsTransport(Listener* listener);
+		explicit DtlsTransport(Listener* listener, SharedInterface* shared);
 		~DtlsTransport() override;
 
 	public:
@@ -195,18 +196,19 @@ namespace RTC
 	public:
 		void OnSslInfo(int where, int ret);
 
-		/* Pure virtual methods inherited from TimerHandle::Listener. */
+		/* Pure virtual methods inherited from TimerHandleInterface::Listener. */
 	public:
-		void OnTimer(TimerHandle* timer) override;
+		void OnTimer(TimerHandleInterface* timer) override;
 
 	private:
 		// Passed by argument.
 		Listener* listener{ nullptr };
+		SharedInterface* shared{ nullptr };
 		// Allocated by this.
 		SSL* ssl{ nullptr };
 		BIO* sslBioFromNetwork{ nullptr }; // The BIO from which ssl reads.
 		BIO* sslBioToNetwork{ nullptr };   // The BIO in which ssl writes.
-		TimerHandle* timer{ nullptr };
+		TimerHandleInterface* timer{ nullptr };
 		// Others.
 		DtlsState state{ DtlsState::NEW };
 		std::optional<Role> localRole;

package/worker/include/RTC/ICE/IceServer.hpp

@@ -2,10 +2,11 @@
 #define MS_RTC_ICE_ICE_SERVER_HPP
 
 #include "common.hpp"
+#include "SharedInterface.hpp"
 #include "FBS/webRtcTransport.h"
 #include "RTC/ICE/StunPacket.hpp"
 #include "RTC/TransportTuple.hpp"
-#include "handles/TimerHandle.hpp"
+#include "handles/TimerHandleInterface.hpp"
 #include <list>
 #include <string>
 #include <unordered_map>
@@ -14,7 +15,7 @@ namespace RTC
 {
 	namespace ICE
 	{
-		class IceServer : public TimerHandle::Listener
+		class IceServer : public TimerHandleInterface::Listener
 		{
 		public:
 			enum class IceState : uint8_t
@@ -65,6 +66,7 @@ namespace RTC
 		public:
 			IceServer(
 			  Listener* listener,
+			  SharedInterface* shared,
 			  const std::string& usernameFragment,
 			  const std::string& password,
 			  uint8_t consentTimeoutSec);
@@ -129,13 +131,14 @@ namespace RTC
 			void RestartConsentCheck();
 			void StopConsentCheck();
 
-			/* Pure virtual methods inherited from TimerHandle::Listener. */
+			/* Pure virtual methods inherited from TimerHandleInterface::Listener. */
 		public:
-			void OnTimer(TimerHandle* timer) override;
+			void OnTimer(TimerHandleInterface* timer) override;
 
 		private:
 			// Passed by argument.
 			Listener* listener{ nullptr };
+			SharedInterface* shared{ nullptr };
 			std::string usernameFragment;
 			std::string password;
 			uint16_t consentTimeoutMs{ 30000u };
@@ -146,7 +149,7 @@ namespace RTC
 			uint32_t remoteNomination{ 0u };
 			std::list<RTC::TransportTuple> tuples;
 			RTC::TransportTuple* selectedTuple{ nullptr };
-			TimerHandle* consentCheckTimer{ nullptr };
+			TimerHandleInterface* consentCheckTimer{ nullptr };
 			bool isRemovingTuples{ false };
 		};
 	} // namespace ICE

package/worker/include/RTC/KeyFrameRequestManager.hpp

@@ -1,12 +1,13 @@
 #ifndef MS_KEY_FRAME_REQUEST_MANAGER_HPP
 #define MS_KEY_FRAME_REQUEST_MANAGER_HPP
 
-#include "handles/TimerHandle.hpp"
+#include "SharedInterface.hpp"
+#include "handles/TimerHandleInterface.hpp"
 #include <absl/container/flat_hash_map.h>
 
 namespace RTC
 {
-	class PendingKeyFrameInfo : public TimerHandle::Listener
+	class PendingKeyFrameInfo : public TimerHandleInterface::Listener
 	{
 	public:
 		class Listener
@@ -19,7 +20,7 @@ namespace RTC
 		};
 
 	public:
-		PendingKeyFrameInfo(Listener* listener, uint32_t ssrc);
+		PendingKeyFrameInfo(Listener* listener, SharedInterface* shared, uint32_t ssrc);
 		~PendingKeyFrameInfo() override;
 
 		uint32_t GetSsrc() const
@@ -39,18 +40,18 @@ namespace RTC
 			this->timer->Restart();
 		}
 
-		/* Pure virtual methods inherited from TimerHandle::Listener. */
+		/* Pure virtual methods inherited from TimerHandleInterface::Listener. */
 	public:
-		void OnTimer(TimerHandle* timer) override;
+		void OnTimer(TimerHandleInterface* timer) override;
 
 	private:
 		Listener* listener{ nullptr };
 		uint32_t ssrc;
-		TimerHandle* timer{ nullptr };
+		TimerHandleInterface* timer{ nullptr };
 		bool retryOnTimeout{ true };
 	};
 
-	class KeyFrameRequestDelayer : public TimerHandle::Listener
+	class KeyFrameRequestDelayer : public TimerHandleInterface::Listener
 	{
 	public:
 		class Listener
@@ -63,7 +64,7 @@ namespace RTC
 		};
 
 	public:
-		KeyFrameRequestDelayer(Listener* listener, uint32_t ssrc, uint32_t delay);
+		KeyFrameRequestDelayer(Listener* listener, SharedInterface* shared, uint32_t ssrc, uint32_t delay);
 		~KeyFrameRequestDelayer() override;
 
 		uint32_t GetSsrc() const
@@ -79,14 +80,14 @@ namespace RTC
 			this->keyFrameRequested = flag;
 		}
 
-		/* Pure virtual methods inherited from TimerHandle::Listener. */
+		/* Pure virtual methods inherited from TimerHandleInterface::Listener. */
 	public:
-		void OnTimer(TimerHandle* timer) override;
+		void OnTimer(TimerHandleInterface* timer) override;
 
 	private:
 		Listener* listener{ nullptr };
 		uint32_t ssrc;
-		TimerHandle* timer{ nullptr };
+		TimerHandleInterface* timer{ nullptr };
 		bool keyFrameRequested{ false };
 	};
 
@@ -104,7 +105,8 @@ namespace RTC
 		};
 
 	public:
-		explicit KeyFrameRequestManager(Listener* listener, uint32_t keyFrameRequestDelay);
+		explicit KeyFrameRequestManager(
+		  Listener* listener, SharedInterface* shared, uint32_t keyFrameRequestDelay);
 		~KeyFrameRequestManager() override;
 
 		void KeyFrameNeeded(uint32_t ssrc);
@@ -121,6 +123,7 @@ namespace RTC
 
 	private:
 		Listener* listener{ nullptr };
+		SharedInterface* shared{ nullptr };
 		uint32_t keyFrameRequestDelay{ 0u }; // 0 means disabled.
 		absl::flat_hash_map<uint32_t, PendingKeyFrameInfo*> mapSsrcPendingKeyFrameInfo;
 		absl::flat_hash_map<uint32_t, KeyFrameRequestDelayer*> mapSsrcKeyFrameRequestDelayer;