mediasoup 3.24.0 → 3.24.1

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### NEXT
 
+### 3.24.1
+
+- Worker: Don't check `ignoredSubchannel` in piped `DataConsumers` ([PR #1879](https://github.com/versatica/mediasoup/pull/1879)).
+
 ### 3.24.0
 
 - `DataProducer.send()`: Add `ignoredSubchannel` optional argument ([PR #1877](https://github.com/versatica/mediasoup/pull/1877)).

package/node/lib/test/test-PipeTransport.js

@@ -967,8 +967,8 @@ test('transport.consumeData() for a pipe DataProducer succeeds with subchannels'
     /* ppid */ undefined, 
     /* subchannels */ [125], 
     /* requiredSubchannel */ 666);
-    // The `pipeDataConsumer` is subscribed to subchannel 666 so it must not
-    // allow the message to pass through.
+    // The final `directDataConsumer` is subscribed to subchannel 666 so it must
+    // not receive the message.
     directDataProducer.send('hello5', 
     /* ppid */ undefined, 
     /* subchannels */ [123], 
@@ -979,7 +979,7 @@ test('transport.consumeData() for a pipe DataProducer succeeds with subchannels'
     directDataProducer.send('hello6', 
     /* ppid */ undefined, 
     /* subchannels */ undefined, 
-    /* requiredSubchannel */ undefined, 
+    /* requiredSubchannel */ 123, 
     /* ignoredSubchannel */ 777);
     // Send a message without subchannels so it's guaranteed that it will reach
     // the final `directDataConsumer`. And wait for reception of this message so
@@ -997,6 +997,63 @@ test('transport.consumeData() for a pipe DataProducer succeeds with subchannels'
     });
     expect(receivedMessages).toStrictEqual(['hello1', 'hello2', 'bye']);
 }, 2000);
+test('transport.consumeData() for a pipe DataProducer succeeds with ignoredSubchannel', async () => {
+    const directTransport1 = await ctx.router1.createDirectTransport();
+    const directDataProducer = await directTransport1.produceData({
+        label: 'foo',
+        protocol: 'bar',
+    });
+    const { pipeDataConsumer } = await ctx.router1.pipeToRouter({
+        dataProducerId: directDataProducer.id,
+        router: ctx.router2,
+    });
+    const directTransport2 = await ctx.router2.createDirectTransport();
+    const directDataConsumer1 = await directTransport2.consumeData({
+        dataProducerId: directDataProducer.id,
+        subchannels: [111],
+    });
+    const directDataConsumer2 = await directTransport2.consumeData({
+        dataProducerId: directDataProducer.id,
+        subchannels: [222],
+    });
+    // A pipe DataConsumer must be subscribed to the union of the subchannels of
+    // all the DataConsumers behind it.
+    await pipeDataConsumer.setSubchannels([111, 222]);
+    const receivedMessages1 = [];
+    const receivedMessages2 = [];
+    // Resolved once both final DataConsumers have received the last sent message.
+    const allReceived = Promise.all([
+        [directDataConsumer1, receivedMessages1],
+        [directDataConsumer2, receivedMessages2],
+    ].map(([dataConsumer, receivedMessages]) => new Promise(resolve => {
+        dataConsumer.on('message', message => {
+            const receivedMessage = message.toString('utf8');
+            receivedMessages.push(receivedMessage);
+            // Resolve once the last sent message is received.
+            if (receivedMessage === 'bye') {
+                resolve();
+            }
+        });
+    })));
+    // The `pipeDataConsumer` is subscribed to subchannel 111, but being a pipe
+    // DataConsumer it must not apply `ignoredSubchannel` itself. Otherwise it
+    // would drop the message for every DataConsumer behind it rather than just
+    // for `directDataConsumer1`. `ignoredSubchannel` travels within the message
+    // and is applied by the final DataConsumers, so `directDataConsumer2` must
+    // still receive it.
+    directDataProducer.send('hello1', 
+    /* ppid */ undefined, 
+    /* subchannels */ undefined, 
+    /* requiredSubchannel */ undefined, 
+    /* ignoredSubchannel */ 111);
+    // Send a message without subchannels so it's guaranteed that it will reach
+    // both final DataConsumers. And wait for reception of this message so at
+    // this time we know whether the previous one reached them.
+    directDataProducer.send('bye');
+    await allReceived;
+    expect(receivedMessages1).toStrictEqual(['bye']);
+    expect(receivedMessages2).toStrictEqual(['hello1', 'bye']);
+}, 2000);
 test('dataProducer.close() is transmitted to pipe DataConsumer', async () => {
     const { pipeDataProducer } = await ctx.router1.pipeToRouter({
         dataProducerId: ctx.dataProducer.id,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mediasoup",
-	"version": "3.24.0",
+	"version": "3.24.1",
 	"description": "Cutting Edge WebRTC Video Conferencing",
 	"contributors": [
 		"Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -129,14 +129,14 @@
 		"globals": "^17.9.0",
 		"ini": "^7.0.0",
 		"jest": "^30.4.2",
-		"knip": "^6.31.0",
-		"marked": "^18.0.7",
+		"knip": "^6.32.0",
+		"marked": "^18.0.9",
 		"open-cli": "^9.0.0",
 		"pick-port": "^2.2.1",
 		"prettier": "^3.9.6",
 		"ts-jest": "^29.4.12",
 		"typescript": "^6.0.3",
-		"typescript-eslint": "^8.65.0",
+		"typescript-eslint": "^8.66.0",
 		"werift-sctp": "^0.0.11"
 	}
 }

package/worker/scripts/package-lock.json

@@ -21,9 +21,9 @@
 			}
 		},
 		"node_modules/brace-expansion": {
-			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz",
-			"integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==",
+			"version": "5.0.9",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz",
+			"integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==",
 			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^4.0.2"
@@ -105,9 +105,9 @@
 			"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="
 		},
 		"brace-expansion": {
-			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz",
-			"integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==",
+			"version": "5.0.9",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz",
+			"integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==",
 			"requires": {
 				"balanced-match": "^4.0.2"
 			}

package/worker/src/RTC/DataConsumer.cpp

@@ -502,8 +502,8 @@ namespace RTC
 			return false;
 		}
 
-		// Only verify subchannels if this is not a piped DataConsumer or if this is
-		// a piped DataConsumer and it's subscribed to at least one subchannel.
+		// Only verify subchannels if this is not a piped DataConsumer or if this
+		// is a piped DataConsumer and it's subscribed to at least one subchannel.
 		const bool verifySubchannels = !this->pipe || !this->subchannels.empty();
 
 		if (verifySubchannels)
@@ -521,9 +521,14 @@ namespace RTC
 				return false;
 			}
 
-			// If an ignored subchannel is given, verify that this data consumer is not
-			// subscribed to it, otherwise don't send this message to it.
-			if (ignoredSubchannel.has_value() && this->subchannels.contains(ignoredSubchannel.value()))
+			// If an ignored subchannel is given, verify that this data consumer is
+			// not subscribed to it, otherwise don't send this message to it.
+			// NOTE: We don't check this in piped DataConsumers on purpose. Otherwise
+			// a message generated by peer X and forwarded to all peers in another
+			// host wouldn't pass this filter in the local PipeTransport.
+			if (
+			  !this->pipe && ignoredSubchannel.has_value() &&
+			  this->subchannels.contains(ignoredSubchannel.value()))
 			{
 				if (cb)
 				{