FBS: Simplify Data[Consumer|Producer] send messages

For some reason we were not sending everything as binary in this branch.
versatica · Oct 27, 2023 · deff052 · deff052
1 parent 19c5f94
commit deff052
Show file tree

Hide file tree

Showing 8 changed files with 1,364 additions and 2,543 deletions.
diff --git a/node/src/DataConsumer.ts b/node/src/DataConsumer.ts
@@ -517,23 +517,14 @@ export class DataConsumer<DataConsumerAppData extends AppData = AppData>
 
 		if (typeof message === 'string')
 		{
-			const messageOffset = builder.createString(message);
-
-			dataOffset = FbsDataConsumer.String.createString(builder, messageOffset);
+			message = Buffer.from(message);
 		}
-		else
-		{
-			const messageOffset = FbsDataConsumer.Binary.createValueVector(builder, message);
 
-			dataOffset = FbsDataConsumer.Binary.createBinary(builder, messageOffset);
-		}
+		dataOffset = FbsDataConsumer.SendRequest.createDataVector(builder, message);
 
 		const requestOffset = FbsDataConsumer.SendRequest.createSendRequest(
 			builder,
 			ppid,
-			typeof message === 'string' ?
-				FbsDataConsumer.Data.String :
-				FbsDataConsumer.Data.Binary,
 			dataOffset
 		);
 

diff --git a/node/src/DataProducer.ts b/node/src/DataProducer.ts
@@ -442,23 +442,14 @@ export class DataProducer<DataProducerAppData extends AppData = AppData>
 
 		if (typeof message === 'string')
 		{
-			const messageOffset = builder.createString(message);
-
-			dataOffset = FbsDataProducer.String.createString(builder, messageOffset);
+			message = Buffer.from(message);
 		}
-		else
-		{
-			const messageOffset = FbsDataProducer.Binary.createValueVector(builder, message);
 
-			dataOffset = FbsDataProducer.Binary.createBinary(builder, messageOffset);
-		}
+		dataOffset = FbsDataProducer.SendNotification.createDataVector(builder, message);
 
 		const notificationOffset = FbsDataProducer.SendNotification.createSendNotification(
 			builder,
 			ppid,
-			typeof message === 'string' ?
-				FbsDataProducer.Data.String :
-				FbsDataProducer.Data.Binary,
 			dataOffset,
 			subchannelsOffset,
 			requiredSubchannel ?? null

diff --git a/rust/src/fbs.rs b/rust/src/fbs.rs
diff --git a/rust/src/messages.rs b/rust/src/messages.rs
@@ -2878,12 +2878,10 @@ impl Notification for DataProducerSendNotification {
     fn into_bytes(self, handler_id: Self::HandlerId) -> Vec<u8> {
         let mut builder = Builder::new();
 
-        let binary_data = data_producer::Binary::create(&mut builder, self.payload);
-        let binary = data_producer::Data::create_binary(&mut builder, binary_data);
         let data = data_producer::SendNotification::create(
             &mut builder,
             self.ppid,
-            binary,
+            self.payload,
             self.subchannels,
             self.required_subchannel,
         );
@@ -3179,9 +3177,7 @@ impl Request for DataConsumerSendRequest {
     fn into_bytes(self, id: u32, handler_id: Self::HandlerId) -> Vec<u8> {
         let mut builder = Builder::new();
 
-        let binary_data = data_consumer::Binary::create(&mut builder, self.payload);
-        let binary = data_consumer::Data::create_binary(&mut builder, binary_data);
-        let data = data_consumer::SendRequest::create(&mut builder, self.ppid, binary);
+        let data = data_consumer::SendRequest::create(&mut builder, self.ppid, self.payload);
         let request_body = request::Body::create_data_consumer_send_request(&mut builder, data);
 
         let request = request::Request::create(

diff --git a/worker/fbs/dataConsumer.fbs b/worker/fbs/dataConsumer.fbs
@@ -38,18 +38,9 @@ table String {
     value: string (required);
 }
 
-table Binary {
-    value: [uint8] (required);
-}
-
-union Data {
-    String,
-    Binary
-}
-
 table SendRequest {
     ppid: uint32;
-    data: Data (required);
+    data: [uint8] (required);
 }
 
 table SetSubchannelsRequest {

diff --git a/worker/fbs/dataProducer.fbs b/worker/fbs/dataProducer.fbs
@@ -25,22 +25,9 @@ table GetStatsResponse {
     buffered_amount: uint32;
 }
 
-table String {
-    value: string (required);
-}
-
-table Binary {
-    value: [uint8] (required);
-}
-
-union Data {
-    String,
-    Binary
-}
-
 table SendNotification {
     ppid: uint32;
-    data: Data (required);
+    data: [uint8] (required);
     subchannels: [uint16];
     required_subchannel: uint16 = null;
 }

diff --git a/worker/src/RTC/DataConsumer.cpp b/worker/src/RTC/DataConsumer.cpp
@@ -278,20 +278,9 @@ namespace RTC
 					MS_THROW_ERROR("no SCTP association present");
 				}
 
-				const auto* body = request->data->body_as<FBS::DataConsumer::SendRequest>();
-				const uint8_t* data{ nullptr };
-				size_t len{ 0 };
-
-				if (body->data_type() == FBS::DataConsumer::Data::String)
-				{
-					data = body->data_as_String()->value()->Data();
-					len  = body->data_as_String()->value()->size();
-				}
-				else
-				{
-					data = body->data_as_Binary()->value()->Data();
-					len  = body->data_as_Binary()->value()->size();
-				}
+				const auto* body    = request->data->body_as<FBS::DataConsumer::SendRequest>();
+				const uint8_t* data = body->data()->Data();
+				size_t len          = body->data()->size();
 
 				const int ppid = body->ppid();
 

diff --git a/worker/src/RTC/DataProducer.cpp b/worker/src/RTC/DataProducer.cpp
@@ -199,20 +199,9 @@ namespace RTC
 		{
 			case Channel::ChannelNotification::Event::DATAPRODUCER_SEND:
 			{
-				const auto* body = notification->data->body_as<FBS::DataProducer::SendNotification>();
-				const uint8_t* data{ nullptr };
-				size_t len{ 0 };
-
-				if (body->data_type() == FBS::DataProducer::Data::String)
-				{
-					data = body->data_as_String()->value()->Data();
-					len  = body->data_as_String()->value()->size();
-				}
-				else
-				{
-					data = body->data_as_Binary()->value()->Data();
-					len  = body->data_as_Binary()->value()->size();
-				}
+				const auto* body    = notification->data->body_as<FBS::DataProducer::SendNotification>();
+				const uint8_t* data = body->data()->Data();
+				size_t len          = body->data()->size();
 
 				if (len > this->maxMessageSize)
 				{