reduce public api surface of ConnectionTrait

icewind1991 · Sep 28, 2024 · 48f9f55 · 48f9f55
1 parent 5320647
commit 48f9f55
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/connection/mod.rs b/src/connection/mod.rs
@@ -9,6 +9,7 @@ use crate::serverlist::ServerList;
 use crate::service_method::ServiceMethodRequest;
 use crate::session::{anonymous, hello, login, ConnectionError, Session};
 use crate::transport::websocket::connect;
+pub(crate) use connection_impl::ConnectionImpl;
 pub use filter::MessageFilter;
 use futures_util::future::{select, Either};
 use futures_util::{FutureExt, Sink, SinkExt};
@@ -224,12 +225,18 @@ impl Connection {
     }
 }
 
-pub trait ConnectionTrait: Sync + Debug {
-    fn timeout(&self) -> Duration;
-    fn filter(&self) -> &MessageFilter;
-    fn session(&self) -> &Session;
-    fn sender(&self) -> &MessageSender;
+pub(crate) mod connection_impl {
+    use super::*;
 
+    pub trait ConnectionImpl: Sync + Debug {
+        fn timeout(&self) -> Duration;
+        fn filter(&self) -> &MessageFilter;
+        fn session(&self) -> &Session;
+        fn sender(&self) -> &MessageSender;
+    }
+}
+
+pub trait ConnectionTrait: ConnectionImpl {
     fn on_notification<T: ServiceMethodRequest>(&self) -> impl Stream<Item = Result<T>> + 'static {
         BroadcastStream::new(self.filter().on_notification(T::REQ_NAME))
             .filter_map(|res| res.ok())
@@ -375,7 +382,7 @@ pub trait ConnectionTrait: Sync + Debug {
     }
 }
 
-impl ConnectionTrait for Connection {
+impl ConnectionImpl for Connection {
     fn timeout(&self) -> Duration {
         self.timeout
     }
@@ -392,3 +399,5 @@ impl ConnectionTrait for Connection {
         &self.sender
     }
 }
+
+impl ConnectionTrait for Connection {}
diff --git a/src/game_coordinator.rs b/src/game_coordinator.rs
@@ -1,4 +1,4 @@
-use crate::connection::{ConnectionTrait, MessageFilter, MessageSender};
+use crate::connection::{ConnectionImpl, ConnectionTrait, MessageFilter, MessageSender};
 use crate::net::{decode_kind, NetMessageHeader, RawNetMessage};
 use crate::session::Session;
 use crate::{Connection, NetMessage, NetworkError};
@@ -148,7 +148,7 @@ impl GameCoordinator {
     }
 }
 
-impl ConnectionTrait for GameCoordinator {
+impl ConnectionImpl for GameCoordinator {
     fn timeout(&self) -> Duration {
         self.timeout
     }
@@ -164,7 +164,9 @@ impl ConnectionTrait for GameCoordinator {
     fn sender(&self) -> &MessageSender {
         &self.sender
     }
+}
 
+impl ConnectionTrait for GameCoordinator {
     async fn raw_send_with_kind<Msg: NetMessage, K: MsgKindEnum>(
         &self,
         header: NetMessageHeader,