Flatbuffers

rust/Cargo.toml

@@ -35,10 +35,10 @@ hash_hasher = "2.0.3"
 log = "0.4.17"
 nohash-hasher = "0.2.0"
 once_cell = "1.16.0"
+planus = "0.3.1"
 serde_json = "1.0.87"
 serde_repr = "0.1.9"
 thiserror = "1.0.37"
-planus = "0.3.1"
 
 [dependencies.lru]
 default-features = false
@@ -52,10 +52,6 @@ version = "0.5.4"
 version = "0.12.1"
 features = ["serde"]
 
-[dependencies.flatbuffers]
-version = "23.1.21"
-features = ["serialize"]
-
 [dependencies.regex]
 default-features = false
 features = ["std", "perf"]

rust/src/fbs.rs

@@ -1,9 +1,12 @@
-pub use root::*;
+//! Flatbuffers data structures compiled from `.fbs` files
+pub use root::fbs::*;
 
 const _: () = ::planus::check_version_compatibility("planus-0.3.1");
 
 #[no_implicit_prelude]
 mod root {
+    #[allow(missing_docs)]
+    #[allow(clippy::all)]
     pub mod fbs {
         pub mod active_speaker_observer {
             #[derive(

rust/src/lib.rs

@@ -49,8 +49,6 @@
 //! and are a good place to start until we have demo apps built in Rust).
 
 pub mod data_structures;
-#[allow(missing_docs)]
-#[allow(clippy::all)]
 pub mod fbs;
 mod macros;
 mod messages;

rust/src/worker.rs

@@ -6,7 +6,7 @@ mod common;
 mod utils;
 
 use crate::data_structures::AppData;
-use crate::fbs::fbs;
+use crate::fbs;
 use crate::messages::{WorkerCreateWebRtcServerRequest, WorkerDumpRequest};
 pub use crate::ortc::RtpCapabilitiesError;
 use crate::router::{Router, RouterId, RouterOptions};

rust/src/worker/channel.rs

@@ -1,4 +1,4 @@
-use crate::fbs::fbs::{message, notification, request, response};
+use crate::fbs::{message, notification, request, response};
 use crate::messages::{Notification, Request, WorkerCloseRequest};
 use crate::worker::common::{
     EventHandlers, FBSEventHandlers, FBSWeakEventHandlers, SubscriptionTarget, WeakEventHandlers,
@@ -18,7 +18,6 @@ use serde_json::Value;
 use std::any::TypeId;
 use std::collections::VecDeque;
 use std::fmt::{Debug, Display};
-use std::io::copy;
 use std::num::NonZeroUsize;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Weak};
@@ -92,7 +91,7 @@ enum ChannelReceiveMessage<'a> {
     Event(InternalMessage),
 }
 
-fn deserialize_message<'a>(bytes: &'a [u8]) -> ChannelReceiveMessage<'_> {
+fn deserialize_message(bytes: &[u8]) -> ChannelReceiveMessage<'_> {
     let message_ref = message::MessageRef::read_as_root(&bytes[4..]).unwrap();
 
     match message_ref.data().unwrap() {
@@ -560,20 +559,15 @@ impl Channel {
 
         debug!("request() [method:{:?}, id:{}]", method, id);
 
-        // TODO: Can't we use directly the buffer of the builder, since we own it?.
-        let mut copied: Vec<u8> = vec![];
-
         let request =
             request::Request::create(&mut builder, id, method, handler_id.to_string(), body);
 
         let message_body = message::Body::create_request(&mut builder, request);
         let message = message::Message::create(&mut builder, message::Type::Request, message_body);
 
-        let mut data = builder.finish(message, None);
-
-        copy(&mut data, &mut copied).unwrap();
+        let data = builder.finish(message, None).to_vec();
 
-        let buffer = Arc::new(AtomicTake::new(copied));
+        let buffer = Arc::new(AtomicTake::new(data));
 
         {
             let mut outgoing_message_buffer = self.inner.outgoing_message_buffer.lock();

rust/src/worker/common.rs

@@ -1,4 +1,4 @@
-use crate::fbs::fbs::notification;
+use crate::fbs::notification;
 use hash_hasher::HashedMap;
 use nohash_hasher::IntMap;
 use parking_lot::Mutex;