Move XmppCodec and XmppStream to proto module

tokio-xmpp/src/client/async_client.rs

@@ -6,14 +6,16 @@ use std::task::Context;
 use tokio::task::JoinHandle;
 use xmpp_parsers::{jid::Jid, ns, stream_features::StreamFeatures};
 
-use super::connect::client_login;
+use crate::{
+    client::connect::client_login,
+    connect::{AsyncReadAndWrite, ServerConnector},
+    error::{Error, ProtocolError},
+    proto::{add_stanza_id, Packet, XmppStream},
+    Event,
+};
+
 #[cfg(feature = "starttls")]
 use crate::connect::starttls::ServerConfig;
-use crate::connect::{AsyncReadAndWrite, ServerConnector};
-use crate::error::{Error, ProtocolError};
-use crate::event::Event;
-use crate::xmpp_codec::Packet;
-use crate::xmpp_stream::{add_stanza_id, XMPPStream};
 #[cfg(feature = "starttls")]
 use crate::AsyncConfig;
 
@@ -44,8 +46,8 @@ pub struct Config<C> {
 enum ClientState<S: AsyncReadAndWrite> {
     Invalid,
     Disconnected,
-    Connecting(JoinHandle<Result<XMPPStream<S>, Error>>),
-    Connected(XMPPStream<S>),
+    Connecting(JoinHandle<Result<XmppStream<S>, Error>>),
+    Connected(XmppStream<S>),
 }
 
 #[cfg(feature = "starttls")]
@@ -197,7 +199,7 @@ impl<C: ServerConnector> Stream for Client<C> {
                 //
                 // This needs to be a loop in order to ignore packets we don’t care about, or those
                 // we want to handle elsewhere.  Returning something isn’t correct in those two
-                // cases because it would signal to tokio that the XMPPStream is also done, while
+                // cases because it would signal to tokio that the XmppStream is also done, while
                 // there could be additional packets waiting for us.
                 //
                 // The proper solution is thus a loop which we exit once we have something to

tokio-xmpp/src/client/auth.rs

@@ -9,11 +9,10 @@ use tokio::io::{AsyncRead, AsyncWrite};
 use xmpp_parsers::sasl::{Auth, Challenge, Failure, Mechanism as XMPPMechanism, Response, Success};
 
 use crate::error::{AuthError, Error, ProtocolError};
-use crate::xmpp_codec::Packet;
-use crate::xmpp_stream::XMPPStream;
+use crate::proto::{Packet, XmppStream};
 
 pub async fn auth<S: AsyncRead + AsyncWrite + Unpin>(
-    mut stream: XMPPStream<S>,
+    mut stream: XmppStream<S>,
     creds: Credentials,
 ) -> Result<S, Error> {
     let local_mechs: Vec<Box<dyn Fn() -> Box<dyn Mechanism + Send + Sync> + Send>> = vec![

tokio-xmpp/src/client/bind.rs

@@ -4,14 +4,13 @@ use xmpp_parsers::bind::{BindQuery, BindResponse};
 use xmpp_parsers::iq::{Iq, IqType};
 
 use crate::error::{Error, ProtocolError};
-use crate::xmpp_codec::Packet;
-use crate::xmpp_stream::XMPPStream;
+use crate::proto::{Packet, XmppStream};
 
 const BIND_REQ_ID: &str = "resource-bind";
 
 pub async fn bind<S: AsyncRead + AsyncWrite + Unpin>(
-    mut stream: XMPPStream<S>,
-) -> Result<XMPPStream<S>, Error> {
+    mut stream: XmppStream<S>,
+) -> Result<XmppStream<S>, Error> {
     if stream.stream_features.can_bind() {
         let resource = stream
             .jid

tokio-xmpp/src/client/connect.rs

@@ -1,10 +1,12 @@
 use sasl::common::Credentials;
 use xmpp_parsers::{jid::Jid, ns};
 
-use crate::client::auth::auth;
-use crate::client::bind::bind;
-use crate::connect::ServerConnector;
-use crate::{xmpp_stream::XMPPStream, Error};
+use crate::{
+    client::{auth::auth, bind::bind},
+    connect::ServerConnector,
+    proto::XmppStream,
+    Error,
+};
 
 /// Log into an XMPP server as a client with a jid+pass
 /// does channel binding if supported
@@ -12,7 +14,7 @@ pub async fn client_login<C: ServerConnector>(
     server: C,
     jid: Jid,
     password: String,
-) -> Result<XMPPStream<C::Stream>, Error> {
+) -> Result<XmppStream<C::Stream>, Error> {
     let username = jid.node().unwrap().as_str();
     let password = password;
 
@@ -26,10 +28,10 @@ pub async fn client_login<C: ServerConnector>(
         .with_channel_binding(channel_binding);
     // Authenticated (unspecified) stream
     let stream = auth(xmpp_stream, creds).await?;
-    // Authenticated XMPPStream
-    let xmpp_stream = XMPPStream::start(stream, jid, ns::JABBER_CLIENT.to_owned()).await?;
+    // Authenticated XmppStream
+    let xmpp_stream = XmppStream::start(stream, jid, ns::JABBER_CLIENT.to_owned()).await?;
 
-    // XMPPStream bound to user session
+    // XmppStream bound to user session
     let xmpp_stream = bind(xmpp_stream).await?;
     Ok(xmpp_stream)
 }