mediasoup 3.9.2 → 3.9.3

package/node/lib/Channel.js

@@ -207,7 +207,7 @@ class Channel extends EnhancedEventEmitter_1.EnhancedEventEmitter {
             // the response, destroying the ordered delivery. So we must wait a bit
             // here.
             // See https://github.com/versatica/mediasoup/issues/510
-            setImmediate(() => this.emit(msg.targetId, msg.event, msg.data));
+            setImmediate(() => this.emit(String(msg.targetId), msg.event, msg.data));
         }
         // Otherwise unexpected message.
         else {

package/node/lib/PayloadChannel.js

@@ -213,7 +213,7 @@ class PayloadChannel extends EnhancedEventEmitter_1.EnhancedEventEmitter {
             else if (msg.targetId && msg.event) {
                 this.#ongoingNotification =
                     {
-                        targetId: msg.targetId,
+                        targetId: String(msg.targetId),
                         event: msg.event,
                         data: msg.data
                     };

package/node/lib/Worker.js

@@ -81,7 +81,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.9.2',
+                MEDIASOUP_VERSION: '3.9.3',
                 // 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.2";
+export declare const version = "3.9.3";
 /**
  * Expose parseScalabilityMode() function.
  */

package/node/lib/index.js

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

package/node/lib/ortc.js

@@ -829,12 +829,11 @@ function matchCodecs(aCodec, bCodec, { strict = false, modify = false } = {}) {
             }
         case 'video/h264':
             {
-                const aPacketizationMode = aCodec.parameters['packetization-mode'] || 0;
-                const bPacketizationMode = bCodec.parameters['packetization-mode'] || 0;
-                if (aPacketizationMode !== bPacketizationMode)
-                    return false;
-                // If strict matching check profile-level-id.
                 if (strict) {
+                    const aPacketizationMode = aCodec.parameters['packetization-mode'] || 0;
+                    const bPacketizationMode = bCodec.parameters['packetization-mode'] || 0;
+                    if (aPacketizationMode !== bPacketizationMode)
+                        return false;
                     if (!h264.isSameProfile(aCodec.parameters, bCodec.parameters))
                         return false;
                     let selectedProfileLevelId;
@@ -856,7 +855,6 @@ function matchCodecs(aCodec, bCodec, { strict = false, modify = false } = {}) {
             }
         case 'video/vp9':
             {
-                // If strict matching check profile-id.
                 if (strict) {
                     const aProfileId = aCodec.parameters['profile-id'] || 0;
                     const bProfileId = bCodec.parameters['profile-id'] || 0;

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

@@ -1 +1 @@
-{"version":3,"file":"supportedRtpCapabilities.d.ts","sourceRoot":"","sources":["../src/supportedRtpCapabilities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,QAAA,MAAM,wBAAwB,EAAE,eAwY/B,CAAC;AAEF,OAAO,EAAE,wBAAwB,EAAE,CAAC"}
+{"version":3,"file":"supportedRtpCapabilities.d.ts","sourceRoot":"","sources":["../src/supportedRtpCapabilities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,QAAA,MAAM,wBAAwB,EAAE,eAkW/B,CAAC;AAEF,OAAO,EAAE,wBAAwB,EAAE,CAAC"}

package/node/lib/supportedRtpCapabilities.js

@@ -207,39 +207,6 @@ const supportedRtpCapabilities = {
             mimeType: 'video/H264',
             clockRate: 90000,
             parameters: {
-                'packetization-mode': 1,
-                'level-asymmetry-allowed': 1
-            },
-            rtcpFeedback: [
-                { type: 'nack' },
-                { type: 'nack', parameter: 'pli' },
-                { type: 'ccm', parameter: 'fir' },
-                { type: 'goog-remb' },
-                { type: 'transport-cc' }
-            ]
-        },
-        {
-            kind: 'video',
-            mimeType: 'video/H264',
-            clockRate: 90000,
-            parameters: {
-                'packetization-mode': 0,
-                'level-asymmetry-allowed': 1
-            },
-            rtcpFeedback: [
-                { type: 'nack' },
-                { type: 'nack', parameter: 'pli' },
-                { type: 'ccm', parameter: 'fir' },
-                { type: 'goog-remb' },
-                { type: 'transport-cc' }
-            ]
-        },
-        {
-            kind: 'video',
-            mimeType: 'video/H265',
-            clockRate: 90000,
-            parameters: {
-                'packetization-mode': 1,
                 'level-asymmetry-allowed': 1
             },
             rtcpFeedback: [
@@ -255,7 +222,6 @@ const supportedRtpCapabilities = {
             mimeType: 'video/H265',
             clockRate: 90000,
             parameters: {
-                'packetization-mode': 0,
                 'level-asymmetry-allowed': 1
             },
             rtcpFeedback: [

package/npm-scripts.js

@@ -121,8 +121,12 @@ switch (task)
 		if (!process.env.MEDIASOUP_WORKER_BIN)
 		{
 			execute('node npm-scripts.js worker:build');
-			execute(`${MAKE} clean-pip -C worker`);
+			// Clean build artifacts except `mediasoup-worker`.
+			execute(`${MAKE} clean-build -C worker`);
+			// Clean downloaded dependencies.
 			execute(`${MAKE} clean-subprojects -C worker`);
+			// Clean PIP/Meson/Ninja.
+			execute(`${MAKE} clean-pip -C worker`);
 		}
 
 		break;
@@ -143,7 +147,7 @@ switch (task)
 
 	case 'install-clang-tools':
 	{
-		execute('npm install --prefix worker/scripts');
+		execute('npm ci --prefix worker/scripts');
 
 		break;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -69,27 +69,27 @@
     "testRegex": "node/tests/test.*\\.js"
   },
   "dependencies": {
-    "@types/node": "^16.11.7",
-    "debug": "^4.3.2",
+    "@types/node": "^16.11.10",
+    "debug": "^4.3.3",
     "h264-profile-level-id": "^1.0.1",
     "random-number": "^0.0.9",
-    "supports-color": "^9.0.2",
+    "supports-color": "^9.2.1",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "@types/random-number": "^0.0.1",
-    "@types/uuid": "^8.3.1",
-    "@typescript-eslint/eslint-plugin": "^5.3.1",
-    "@typescript-eslint/parser": "^5.3.1",
-    "eslint": "^8.2.0",
-    "eslint-plugin-jest": "^25.2.4",
-    "jest": "^27.3.1",
+    "@types/uuid": "^8.3.3",
+    "@typescript-eslint/eslint-plugin": "^5.8.0",
+    "@typescript-eslint/parser": "^5.8.0",
+    "eslint": "^8.5.0",
+    "eslint-plugin-jest": "^25.3.0",
+    "jest": "^27.4.5",
     "jest-tobetype": "^1.2.3",
     "open-cli": "^7.0.1",
     "pick-port": "^1.0.0",
     "sctp": "^1.0.0",
-    "tsc-watch": "^4.5.0",
-    "typescript": "^4.4.4"
+    "tsc-watch": "^4.6.0",
+    "typescript": "^4.5.4"
   }
 }

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
+BUILD_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/build
 MESON ?= $(PIP_DIR)/bin/meson
 MESON_ARGS ?= ""
 # Workaround for NixOS and Guix that don't work with pre-built binaries, see:
@@ -37,6 +38,13 @@ else
 	export PYTHONPATH := $(PIP_DIR):${PYTHONPATH}
 endif
 
+# Activate VS environment on Windows by default.
+ifeq ($(OS),Windows_NT)
+ifeq ($(MESON_ARGS),"")
+	MESON_ARGS = $(subst $\",,"--vsenv")
+endif
+endif
+
 .PHONY:	\
 	default meson-ninja setup clean clean-pip clean-subprojects clean-all mediasoup-worker xcode lint format test tidy \
 	fuzzer fuzzer-run-all docker-build docker-run libmediasoup-worker
@@ -69,14 +77,14 @@ ifeq ($(MEDIASOUP_BUILDTYPE),Release)
 		-Db_staticpic=true \
 		--reconfigure \
 		$(MESON_ARGS) \
-		$(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE) || \
+		$(BUILD_DIR) || \
 		$(MESON) setup \
 			--buildtype release \
 			-Db_ndebug=true \
 			-Db_pie=true \
 			-Db_staticpic=true \
 			$(MESON_ARGS) \
-			$(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)
+			$(BUILD_DIR)
 else
 ifeq ($(MEDIASOUP_BUILDTYPE),Debug)
 	$(MESON) setup \
@@ -85,13 +93,13 @@ ifeq ($(MEDIASOUP_BUILDTYPE),Debug)
 		-Db_staticpic=true \
 		--reconfigure \
 		$(MESON_ARGS) \
-		$(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE) || \
+		$(BUILD_DIR) || \
 		$(MESON) setup \
 			--buildtype debug \
 			-Db_pie=true \
 			-Db_staticpic=true \
 			$(MESON_ARGS) \
-			$(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)
+			$(BUILD_DIR)
 else
 	$(MESON) setup \
 		--buildtype $(MEDIASOUP_BUILDTYPE) \
@@ -100,20 +108,23 @@ else
 		-Db_staticpic=true \
 		--reconfigure \
 		$(MESON_ARGS) \
-		$(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE) || \
+		$(BUILD_DIR) || \
 		$(MESON) setup \
 			--buildtype $(MEDIASOUP_BUILDTYPE) \
 			-Db_ndebug=if-release \
 			-Db_pie=true \
 			-Db_staticpic=true \
 			$(MESON_ARGS) \
-			$(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)
+			$(BUILD_DIR)
 endif
 endif
 
 clean:
 	$(RM) -rf $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)
 
+clean-build:
+	$(RM) -rf $(BUILD_DIR)
+
 clean-pip:
 	$(RM) -rf $(PIP_DIR)
 
@@ -125,7 +136,12 @@ clean-all: clean-subprojects
 
 mediasoup-worker: setup
 ifeq ($(MEDIASOUP_WORKER_BIN),)
-	$(MESON) compile -j $(CORES) -C $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE) mediasoup-worker
+	$(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
 endif
 
 xcode: setup
@@ -139,14 +155,14 @@ format:
 
 test: setup
 ifeq ($(MEDIASOUP_WORKER_BIN),)
-	$(MESON) compile -j $(CORES) -C $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE) mediasoup-worker-test
+	$(MESON) compile -j $(CORES) -C $(BUILD_DIR) 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)
-	$(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/mediasoup-worker-test.exe --invisibles --use-colour=yes $(MEDIASOUP_TEST_TAGS)
+	$(BUILD_DIR)/mediasoup-worker-test.exe --invisibles --use-colour=yes $(MEDIASOUP_TEST_TAGS)
 else
 	$(LCOV) --directory ./ --zerocounters
-	$(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/mediasoup-worker-test --invisibles --use-colour=yes $(MEDIASOUP_TEST_TAGS)
+	$(BUILD_DIR)/mediasoup-worker-test --invisibles --use-colour=yes $(MEDIASOUP_TEST_TAGS)
 endif
 endif
 
@@ -155,18 +171,18 @@ tidy:
 		-clang-tidy-binary=./scripts/node_modules/.bin/clang-tidy \
 		-clang-apply-replacements-binary=./scripts/node_modules/.bin/clang-apply-replacements \
 		-header-filter='(Channel/**/*.hpp|DepLibSRTP.hpp|DepLibUV.hpp|DepLibWebRTC.hpp|DepOpenSSL.hpp|DepUsrSCTP.hpp|LogLevel.hpp|Logger.hpp|MediaSoupError.hpp|RTC/**/*.hpp|Settings.hpp|Utils.hpp|Worker.hpp|common.hpp|handles/**/*.hpp)' \
-		-p=$(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE) \
+		-p=$(BUILD_DIR) \
 		-j=$(CORES) \
 		-checks=$(MEDIASOUP_TIDY_CHECKS) \
 		-quiet
 
 fuzzer: setup
 ifeq ($(MEDIASOUP_WORKER_BIN),)
-	$(MESON) compile -j $(CORES) -C $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE) mediasoup-worker-fuzzer
+	$(MESON) compile -j $(CORES) -C $(BUILD_DIR) mediasoup-worker-fuzzer
 endif
 
 fuzzer-run-all:
-	LSAN_OPTIONS=verbosity=1:log_threads=1 ./$(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/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
+	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
 
 docker-build:
 ifeq ($(DOCKER_NO_CACHE),true)
@@ -184,4 +200,4 @@ docker-run:
 		mediasoup/docker:latest
 
 libmediasoup-worker: setup
-	$(MESON) compile -j $(CORES) -C $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE) libmediasoup-worker
+	$(MESON) compile -j $(CORES) -C $(BUILD_DIR) libmediasoup-worker

package/worker/include/Channel/ChannelNotifier.hpp

@@ -12,6 +12,7 @@ namespace Channel
 	{
 	public:
 		static void ClassInit(Channel::ChannelSocket* channel);
+		static void Emit(uint64_t targetId, const char* event);
 		static void Emit(const std::string& targetId, const char* event);
 		static void Emit(const std::string& targetId, const char* event, json& data);
 

package/worker/include/Channel/ChannelSocket.hpp

@@ -64,16 +64,22 @@ namespace Channel
 
 	public:
 		explicit ChannelSocket(int consumerFd, int producerFd);
+		explicit ChannelSocket(
+		  ChannelReadFn channelReadFn,
+		  ChannelReadCtx channelReadCtx,
+		  ChannelWriteFn channelWriteFn,
+		  ChannelWriteCtx channelWriteCtx);
 		virtual ~ChannelSocket();
 
 	public:
 		void Close();
 		void SetListener(Listener* listener);
+		bool CallbackRead();
 		void Send(json& jsonMessage);
-		void SendLog(char* message, uint32_t messageLen);
+		void SendLog(const char* message, uint32_t messageLen);
 
 	private:
-		void SendImpl(const void* payload, uint32_t payloadLen);
+		void SendImpl(const uint8_t* payload, uint32_t payloadLen);
 
 		/* Pure virtual methods inherited from ConsumerSocket::Listener. */
 	public:
@@ -85,9 +91,14 @@ namespace Channel
 		Listener* listener{ nullptr };
 		// Others.
 		bool closed{ false };
-		ConsumerSocket consumerSocket;
-		ProducerSocket producerSocket;
-		uint8_t* writeBuffer;
+		ConsumerSocket* consumerSocket{ nullptr };
+		ProducerSocket* producerSocket{ nullptr };
+		ChannelReadFn channelReadFn{ nullptr };
+		ChannelReadCtx channelReadCtx{ nullptr };
+		ChannelWriteFn channelWriteFn{ nullptr };
+		ChannelWriteCtx channelWriteCtx{ nullptr };
+		uv_async_t* uvReadHandle{ nullptr };
+		uint8_t* writeBuffer{ nullptr };
 	};
 } // namespace Channel
 

package/worker/include/Logger.hpp

@@ -132,7 +132,7 @@ public:
 	static void ClassInit(Channel::ChannelSocket* channel);
 
 public:
-	static const int64_t pid;
+	static const uint64_t pid;
 	thread_local static Channel::ChannelSocket* channel;
 	static const size_t bufferSize {50000};
 	thread_local static char buffer[];

package/worker/include/PayloadChannel/PayloadChannelSocket.hpp

@@ -71,16 +71,24 @@ namespace PayloadChannel
 
 	public:
 		explicit PayloadChannelSocket(int consumerFd, int producerFd);
+		explicit PayloadChannelSocket(
+		  PayloadChannelReadFn payloadChannelReadFn,
+		  PayloadChannelReadCtx payloadChannelReadCtx,
+		  PayloadChannelWriteFn payloadChannelWriteFn,
+		  PayloadChannelWriteCtx payloadChannelWriteCtx);
 		virtual ~PayloadChannelSocket();
 
 	public:
 		void Close();
 		void SetListener(Listener* listener);
+		bool CallbackRead();
 		void Send(json& jsonMessage, const uint8_t* payload, size_t payloadLen);
 		void Send(json& jsonMessage);
 
 	private:
-		void SendImpl(const void* payload, uint32_t payloadLen);
+		void SendImpl(const uint8_t* message, uint32_t messageLen);
+		void SendImpl(
+		  const uint8_t* message, uint32_t messageLen, const uint8_t* payload, uint32_t payloadLen);
 
 		/* Pure virtual methods inherited from ConsumerSocket::Listener. */
 	public:
@@ -92,11 +100,16 @@ namespace PayloadChannel
 		Listener* listener{ nullptr };
 		// Others.
 		bool closed{ false };
-		ConsumerSocket consumerSocket;
-		ProducerSocket producerSocket;
+		ConsumerSocket* consumerSocket{ nullptr };
+		ProducerSocket* producerSocket{ nullptr };
+		PayloadChannelReadFn payloadChannelReadFn{ nullptr };
+		PayloadChannelReadCtx payloadChannelReadCtx{ nullptr };
+		PayloadChannelWriteFn payloadChannelWriteFn{ nullptr };
+		PayloadChannelWriteCtx payloadChannelWriteCtx{ nullptr };
 		PayloadChannel::Notification* ongoingNotification{ nullptr };
 		PayloadChannel::PayloadChannelRequest* ongoingRequest{ nullptr };
-		uint8_t* writeBuffer;
+		uv_async_t* uvReadHandle{ nullptr };
+		uint8_t* writeBuffer{ nullptr };
 	};
 } // namespace PayloadChannel
 

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

@@ -46,9 +46,10 @@ namespace RTC
 			bool HasReceiverReferenceTime()
 			{
 				return std::any_of(
-				  this->xrPacket.Begin(), this->xrPacket.End(), [](const ExtendedReportBlock* report) {
-					  return report->GetType() == ExtendedReportBlock::Type::RRT;
-				  });
+				  this->xrPacket.Begin(),
+				  this->xrPacket.End(),
+				  [](const ExtendedReportBlock* report)
+				  { return report->GetType() == ExtendedReportBlock::Type::RRT; });
 			}
 			void Serialize(uint8_t* data);
 

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

@@ -24,6 +24,12 @@ namespace RTC
 		class FeedbackPsTstItem : public FeedbackItem
 		{
 		public:
+#ifdef _WIN32
+#pragma pack(push, 1)
+#define MEDIASOUP_PACKED
+#else
+#define MEDIASOUP_PACKED __attribute__((packed))
+#endif
 			struct Header
 			{
 				uint32_t ssrc;
@@ -36,7 +42,11 @@ namespace RTC
 				uint8_t reserved2 : 3;
 				uint8_t index : 5;
 #endif
-			};
+			} MEDIASOUP_PACKED;
+#ifdef _WIN32
+#pragma pack(pop)
+#endif
+#undef MEDIASOUP_PACKED
 
 		public:
 			static const size_t HeaderSize{ 8 };

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

@@ -82,8 +82,9 @@ namespace RTC
 			void SetTotalLost(int32_t totalLost)
 			{
 				// Get the limit value for possitive and negative totalLost.
-				int32_t clamp = (totalLost >= 0) ? totalLost > 0x07FFFFF ? 0x07FFFFF : totalLost
-				                                 : -totalLost > 0x0800000 ? 0x0800000 : -totalLost;
+				int32_t clamp = (totalLost >= 0)         ? totalLost > 0x07FFFFF ? 0x07FFFFF : totalLost
+				                : -totalLost > 0x0800000 ? 0x0800000
+				                                         : -totalLost;
 
 				uint32_t value = (totalLost >= 0) ? (clamp & 0x07FFFFF) : (clamp | 0x0800000);
 

package/worker/include/common.hpp

@@ -23,4 +23,43 @@ typedef SSIZE_T ssize_t;
 #include <sys/socket.h> // struct sockaddr, struct sockaddr_storage, AF_INET, AF_INET6
 #endif
 
+using ChannelReadCtx    = void*;
+using ChannelReadFreeFn = void (*)(uint8_t*, uint32_t, size_t);
+// Returns `ChannelReadFree` on successful read that must be used to free `message`.
+using ChannelReadFn = ChannelReadFreeFn (*)(
+  uint8_t** /* message */,
+  uint32_t* /* messageLen */,
+  size_t* /* messageCtx */,
+  // This is `uv_async_t` handle that can be called later with `uv_async_send()` when there is more
+  // data to read.
+  const void* /* handle */,
+  ChannelReadCtx /* ctx */);
+
+using ChannelWriteCtx = void*;
+using ChannelWriteFn =
+  void (*)(const uint8_t* /* message */, uint32_t /* messageLen */, ChannelWriteCtx /* ctx */);
+
+using PayloadChannelReadCtx    = void*;
+using PayloadChannelReadFreeFn = void (*)(uint8_t*, uint32_t, size_t);
+// Returns `PayloadChannelReadFree` on successful read that must be used to free `message` and `payload`.
+using PayloadChannelReadFn = PayloadChannelReadFreeFn (*)(
+  uint8_t** /* message */,
+  uint32_t* /* messageLen */,
+  size_t* /* messageCtx */,
+  uint8_t** /* payload */,
+  uint32_t* /* payloadLen */,
+  size_t* /* payloadCapacity */,
+  // This is `uv_async_t` handle that can be called later with `uv_async_send()` when there is more
+  // data to read.
+  const void* /* handle */,
+  PayloadChannelReadCtx /* ctx */);
+
+using PayloadChannelWriteCtx = void*;
+using PayloadChannelWriteFn  = void (*)(
+  const uint8_t* /* message */,
+  uint32_t /* messageLen */,
+  const uint8_t* /* payload */,
+  uint32_t /* payloadLen */,
+  ChannelWriteCtx /* ctx */);
+
 #endif

package/worker/include/lib.hpp

@@ -1,8 +1,18 @@
-extern "C" int run_worker(
+#include "common.hpp"
+
+extern "C" int mediasoup_worker_run(
   int argc,
   char* argv[],
   const char* version,
   int consumerChannelFd,
   int producerChannelFd,
   int payloadConsumeChannelFd,
-  int payloadProduceChannelFd);
+  int payloadProduceChannelFd,
+  ChannelReadFn channelReadFn,
+  ChannelReadCtx channelReadCtx,
+  ChannelWriteFn channelWriteFn,
+  ChannelWriteCtx channelWriteCtx,
+  PayloadChannelReadFn payloadChannelReadFn,
+  PayloadChannelReadCtx payloadChannelReadCtx,
+  PayloadChannelWriteFn payloadChannelWriteFn,
+  PayloadChannelWriteCtx payloadChannelWriteCtx);