refactor pub use rtc::

Author: yngrtc

examples/data-channels-close/data-channels-close.rs

@@ -5,14 +5,14 @@ use std::fs::OpenOptions;
 use std::sync::Arc;
 use std::time::Duration;
 use std::{fs, io::Write, str::FromStr};
-use webrtc::Result;
 use webrtc::data_channel::{DataChannel, DataChannelEvent};
-use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
-use webrtc::runtime::{Notify, Runtime, Sender, block_on, channel, default_runtime, sleep};
-use webrtc::{
+use webrtc::error::Result;
+use webrtc::peer_connection::{
     MediaEngine, RTCConfigurationBuilder, RTCIceGatheringState, RTCIceServer,
     RTCPeerConnectionState, RTCSessionDescription, Registry, register_default_interceptors,
 };
+use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
+use webrtc::runtime::{Notify, Runtime, Sender, block_on, channel, default_runtime, sleep};
 
 #[derive(Parser)]
 #[command(name = "data-channels")]

examples/data-channels-create/data-channels-create.rs

@@ -5,14 +5,14 @@ use std::fs::OpenOptions;
 use std::sync::Arc;
 use std::time::Duration;
 use std::{fs, io::Write, str::FromStr};
-use webrtc::Result;
 use webrtc::data_channel::DataChannelEvent;
-use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
-use webrtc::runtime::{Sender, block_on, channel, default_runtime, sleep};
-use webrtc::{
+use webrtc::error::Result;
+use webrtc::peer_connection::{
     MediaEngine, RTCConfigurationBuilder, RTCIceGatheringState, RTCIceServer,
     RTCPeerConnectionState, RTCSessionDescription, Registry, register_default_interceptors,
 };
+use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
+use webrtc::runtime::{Sender, block_on, channel, default_runtime, sleep};
 
 #[derive(Parser)]
 #[command(name = "data-channels")]

examples/data-channels-flow-control/data-channels-flow-control.rs

@@ -16,13 +16,13 @@ use std::io::Write;
 use std::str::FromStr;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
-use webrtc::data_channel::{DataChannel, DataChannelEvent};
+use webrtc::data_channel::{DataChannel, DataChannelEvent, RTCDataChannelInit};
+use webrtc::peer_connection::{
+    MediaEngine, RTCConfigurationBuilder, RTCIceGatheringState, RTCPeerConnectionState, Registry,
+    register_default_interceptors,
+};
 use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
 use webrtc::runtime::{Runtime, Sender, block_on, channel, default_runtime};
-use webrtc::{
-    MediaEngine, RTCConfigurationBuilder, RTCDataChannelInit, RTCIceGatheringState,
-    RTCPeerConnectionState, Registry, register_default_interceptors,
-};
 
 const BUFFERED_AMOUNT_LOW_THRESHOLD: u32 = 5120 * 1024; // 5120 KB
 const BUFFERED_AMOUNT_HIGH_THRESHOLD: u32 = 102400 * 1024; // 100 MB

examples/data-channels-offer-answer/data-channels-answer.rs

@@ -17,12 +17,12 @@ use futures::FutureExt;
 use hyper::{Body, Client, Method, Request};
 use signal::get_local_ip;
 use webrtc::data_channel::{DataChannel, DataChannelEvent};
-use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
-use webrtc::runtime::{Runtime, Sender, block_on, channel, default_runtime, sleep};
-use webrtc::{
+use webrtc::peer_connection::{
     MediaEngine, RTCConfigurationBuilder, RTCIceGatheringState, RTCIceServer,
     RTCPeerConnectionState, Registry, register_default_interceptors,
 };
+use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
+use webrtc::runtime::{Runtime, Sender, block_on, channel, default_runtime, sleep};
 
 #[derive(Parser)]
 #[command(name = "answer", about = "WebRTC answer side")]

examples/data-channels-offer-answer/data-channels-offer.rs

@@ -17,12 +17,12 @@ use futures::FutureExt;
 use hyper::{Body, Client, Method, Request};
 use signal::get_local_ip;
 use webrtc::data_channel::DataChannelEvent;
-use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
-use webrtc::runtime::{Sender, block_on, channel, default_runtime, sleep};
-use webrtc::{
+use webrtc::peer_connection::{
     MediaEngine, RTCConfigurationBuilder, RTCIceGatheringState, RTCIceServer,
     RTCPeerConnectionState, Registry, register_default_interceptors,
 };
+use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
+use webrtc::runtime::{Sender, block_on, channel, default_runtime, sleep};
 
 #[derive(Parser)]
 #[command(name = "offer", about = "WebRTC offer side")]

examples/data-channels-simple/data-channels-simple.rs

@@ -16,11 +16,11 @@ use std::sync::Arc;
 use std::time::Duration;
 use webrtc::data_channel::{DataChannel, DataChannelEvent};
 use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
-use webrtc::runtime::{Runtime, Sender, block_on, channel, default_runtime, timeout};
-use webrtc::{
+use webrtc::peer_connection::{
     RTCConfigurationBuilder, RTCIceCandidateInit, RTCIceGatheringState, RTCIceServer,
     RTCPeerConnectionState, RTCSessionDescription,
 };
+use webrtc::runtime::{Runtime, Sender, block_on, channel, default_runtime, timeout};
 
 const DEMO_HTML: &str = include_str!("demo.html");
 

examples/data-channels/data-channels.rs

@@ -5,14 +5,14 @@ use std::fs::OpenOptions;
 use std::sync::Arc;
 use std::time::Duration;
 use std::{fs, io::Write, str::FromStr};
-use webrtc::Result;
 use webrtc::data_channel::{DataChannel, DataChannelEvent};
-use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
-use webrtc::runtime::{Runtime, Sender, block_on, channel, default_runtime, sleep};
-use webrtc::{
+use webrtc::error::Result;
+use webrtc::peer_connection::{
     MediaEngine, RTCConfigurationBuilder, RTCIceGatheringState, RTCIceServer,
     RTCPeerConnectionState, RTCSessionDescription, Registry, register_default_interceptors,
 };
+use webrtc::peer_connection::{PeerConnection, PeerConnectionBuilder, PeerConnectionEventHandler};
+use webrtc::runtime::{Runtime, Sender, block_on, channel, default_runtime, sleep};
 
 #[derive(Parser)]
 #[command(name = "data-channels")]

rtc

@@ -1,13 +1,16 @@
-//! Async DataChannel implementation
+//! Async DataChannel API
 
 use crate::peer_connection::{MessageInner, PeerConnectionRef};
 use crate::runtime::{Mutex, Receiver};
-use crate::{Error, Result};
 use bytes::BytesMut;
-use rtc::data_channel::{RTCDataChannelId, RTCDataChannelMessage, RTCDataChannelState};
 use rtc::interceptor::{Interceptor, NoopInterceptor};
+use rtc::shared::error::{Error, Result};
 use std::sync::Arc;
 
+pub use rtc::data_channel::{
+    RTCDataChannelId, RTCDataChannelInit, RTCDataChannelMessage, RTCDataChannelState,
+};
+
 /// Object-safe trait exposing all public DataChannel operations.
 ///
 /// This allows `on_data_channel` in `PeerConnectionEventHandler` to receive a
@@ -274,7 +277,7 @@ where
     ///
     /// ```no_run
     /// # use bytes::BytesMut;
-    /// # use webrtc::Result;
+    /// # use webrtc::error::Result;
     /// # use webrtc::data_channel::DataChannel;
     /// # use std::sync::Arc;
     /// # async fn example(dc: Arc<dyn DataChannel>) -> Result<()> {
@@ -303,7 +306,7 @@ where
     /// # Example
     ///
     /// ```no_run
-    /// # use webrtc::Result;
+    /// # use webrtc::error::Result;
     /// # use webrtc::data_channel::DataChannel;
     /// # use std::sync::Arc;
     /// # async fn example(dc: Arc<dyn DataChannel>) -> Result<()> {

src/data_channel.rs

@@ -4,13 +4,14 @@
 //! Unlike the old async version, this gatherer is a configuration object that holds
 //! the ICE servers and state.
 
-use crate::{Error, runtime};
+use crate::runtime;
 use rtc::ice::candidate::CandidateConfig;
 use rtc::peer_connection::configuration::{RTCIceServer, RTCIceTransportPolicy};
 use rtc::peer_connection::transport::{
     CandidateHostConfig, CandidateServerReflexiveConfig, RTCIceCandidate, RTCIceCandidateInit,
 };
 use rtc::sansio::Protocol;
+use rtc::shared::error::Error;
 use rtc::shared::{FourTuple, TaggedBytesMut, TransportProtocol};
 use rtc::stun::{
     client::Client as StunClient, client::ClientBuilder as StunClientBuilder,