refactor configs and handlers

webrtc-rs · Mar 8, 2024 · 82c0219 · 82c0219
1 parent a2a9115
commit 82c0219
Show file tree

Hide file tree

Showing 20 changed files with 17 additions and 16 deletions.
diff --git a/src/description/config.rs → src/configs/media_config.rs b/src/description/config.rs → src/configs/media_config.rs
@@ -6,9 +6,8 @@ use crate::description::{
         RTPCodecType,
     },
     rtp_extensions_from_media_description,
-    rtp_transceiver::TYPE_RTCP_FB_TRANSPORT_CC,
+    rtp_transceiver::{PayloadType, RTCPFeedback, TYPE_RTCP_FB_TRANSPORT_CC},
     rtp_transceiver_direction::RTCRtpTransceiverDirection,
-    PayloadType, RTCPFeedback,
 };
 
 //TODO: use crate::stats::stats_collector::StatsCollector;

diff --git a/src/configs/mod.rs b/src/configs/mod.rs
@@ -0,0 +1,3 @@
+pub(crate) mod media_config;
+pub(crate) mod server_config;
+pub(crate) mod session_config;
diff --git a/src/server/config.rs → src/configs/server_config.rs b/src/server/config.rs → src/configs/server_config.rs
@@ -1,4 +1,4 @@
-use crate::description::config::MediaConfig;
+use crate::configs::media_config::MediaConfig;
 use crate::server::certificate::RTCCertificate;
 use std::sync::Arc;
 use std::time::Duration;

diff --git a/src/session/config.rs → src/configs/session_config.rs b/src/session/config.rs → src/configs/session_config.rs
@@ -1,4 +1,4 @@
-use crate::server::config::ServerConfig;
+use crate::configs::server_config::ServerConfig;
 use std::net::SocketAddr;
 use std::sync::Arc;
 

diff --git a/src/description/mod.rs b/src/description/mod.rs
@@ -1,10 +1,10 @@
-pub(crate) mod config;
 pub(crate) mod fmtp;
 pub(crate) mod rtp_codec;
 pub(crate) mod rtp_transceiver;
 pub(crate) mod rtp_transceiver_direction;
 pub(crate) mod sdp_type;
 
+use crate::configs::session_config::SessionConfig;
 use crate::description::{
     rtp_codec::{RTCRtpCodecCapability, RTCRtpCodecParameters, RTCRtpHeaderExtensionParameters},
     rtp_transceiver::{
@@ -15,7 +15,6 @@ use crate::description::{
 };
 use crate::endpoint::candidate::RTCIceParameters;
 use crate::server::certificate::RTCDtlsFingerprint;
-use crate::session::config::SessionConfig;
 use crate::types::Mid;
 use sdp::description::common::{Address, ConnectionInformation};
 use sdp::description::media::{MediaName, RangedPort};

diff --git a/src/description/rtp_codec.rs b/src/description/rtp_codec.rs
@@ -1,5 +1,5 @@
+use crate::configs::media_config::*;
 use crate::description::{
-    config::*,
     fmtp,
     rtp_transceiver::{PayloadType, RTCPFeedback},
 };

diff --git a/src/handler/datachannel.rs → src/handlers/datachannel.rs b/src/handler/datachannel.rs → src/handlers/datachannel.rs
diff --git a/src/handler/demuxer.rs → src/handlers/demuxer.rs b/src/handler/demuxer.rs → src/handlers/demuxer.rs
diff --git a/src/handler/dtls.rs → src/handlers/dtls.rs b/src/handler/dtls.rs → src/handlers/dtls.rs
diff --git a/src/handler/exception.rs → src/handlers/exception.rs b/src/handler/exception.rs → src/handlers/exception.rs
diff --git a/src/handler/gateway.rs → src/handlers/gateway.rs b/src/handler/gateway.rs → src/handlers/gateway.rs
diff --git a/src/handler/interceptor.rs → src/handlers/interceptor.rs b/src/handler/interceptor.rs → src/handlers/interceptor.rs
diff --git a/src/handler/mod.rs → src/handlers/mod.rs b/src/handler/mod.rs → src/handlers/mod.rs
diff --git a/src/handler/sctp.rs → src/handlers/sctp.rs b/src/handler/sctp.rs → src/handlers/sctp.rs
diff --git a/src/handler/srtp.rs → src/handlers/srtp.rs b/src/handler/srtp.rs → src/handlers/srtp.rs
diff --git a/src/handler/stun.rs → src/handlers/stun.rs b/src/handler/stun.rs → src/handlers/stun.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,20 +1,22 @@
 #![warn(rust_2018_idioms)]
 #![allow(dead_code)]
 
+pub(crate) mod configs;
 pub(crate) mod description;
 pub(crate) mod endpoint;
-pub(crate) mod handler;
+pub(crate) mod handlers;
 pub(crate) mod interceptor;
 pub(crate) mod messages;
 pub(crate) mod metrics;
 pub(crate) mod server;
 pub(crate) mod session;
 pub(crate) mod types;
 
+pub use configs::{media_config::MediaConfig, server_config::ServerConfig};
 pub use description::RTCSessionDescription;
-pub use handler::{
+pub use handlers::{
     datachannel::DataChannelHandler, demuxer::DemuxerHandler, dtls::DtlsHandler,
     exception::ExceptionHandler, gateway::GatewayHandler, interceptor::InterceptorHandler,
     sctp::SctpHandler, srtp::SrtpHandler, stun::StunHandler,
 };
-pub use server::{certificate::RTCCertificate, config::ServerConfig, states::ServerStates};
+pub use server::{certificate::RTCCertificate, states::ServerStates};
diff --git a/src/server/mod.rs b/src/server/mod.rs
@@ -1,3 +1,2 @@
 pub(crate) mod certificate;
-pub(crate) mod config;
 pub(crate) mod states;
diff --git a/src/server/states.rs b/src/server/states.rs
@@ -1,12 +1,13 @@
+use crate::configs::server_config::ServerConfig;
+use crate::configs::session_config::SessionConfig;
 use crate::description::RTCSessionDescription;
 use crate::endpoint::{
     candidate::{Candidate, ConnectionCredentials},
     transport::Transport,
     Endpoint,
 };
 use crate::metrics::Metrics;
-use crate::server::config::ServerConfig;
-use crate::session::{config::SessionConfig, Session};
+use crate::session::Session;
 use crate::types::{EndpointId, FourTuple, SessionId, UserName};
 use log::{debug, info};
 use opentelemetry::metrics::Meter;

diff --git a/src/session/mod.rs b/src/session/mod.rs
@@ -6,8 +6,7 @@ use shared::error::{Error, Result};
 use std::collections::{HashMap, HashSet};
 use std::rc::Rc;
 
-pub(crate) mod config;
-
+use crate::configs::session_config::SessionConfig;
 use crate::description::{
     codecs_from_media_description, get_cname, get_mid_value, get_msid, get_peer_direction,
     get_rids, get_ssrc_groups, get_ssrcs, populate_sdp, rtp_extensions_from_media_description,
@@ -24,7 +23,6 @@ use crate::endpoint::{
     transport::Transport,
     Endpoint,
 };
-use crate::session::config::SessionConfig;
 use crate::types::{EndpointId, Mid, SessionId};
 
 pub(crate) struct Session {