refactor into stream_start + xmpp_stream
This commit is contained in:
parent
98e7a2fbf4
commit
c32a38874c
7 changed files with 239 additions and 117 deletions
102
src/stream_start.rs
Normal file
102
src/stream_start.rs
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
use std::mem::replace;
|
||||
use std::io::{Error, ErrorKind};
|
||||
use std::collections::HashMap;
|
||||
use futures::*;
|
||||
use tokio_io::{AsyncRead, AsyncWrite};
|
||||
use tokio_io::codec::Framed;
|
||||
|
||||
use xmpp_codec::*;
|
||||
use xmpp_stream::*;
|
||||
|
||||
const NS_XMPP_STREAM: &str = "http://etherx.jabber.org/streams";
|
||||
|
||||
pub struct StreamStart<S: AsyncWrite> {
|
||||
state: StreamStartState<S>,
|
||||
}
|
||||
|
||||
enum StreamStartState<S: AsyncWrite> {
|
||||
SendStart(sink::Send<Framed<S, XMPPCodec>>),
|
||||
RecvStart(Framed<S, XMPPCodec>),
|
||||
RecvFeatures(Framed<S, XMPPCodec>, HashMap<String, String>),
|
||||
Invalid,
|
||||
}
|
||||
|
||||
impl<S: AsyncWrite> StreamStart<S> {
|
||||
pub fn from_stream(stream: Framed<S, XMPPCodec>, to: String) -> Self {
|
||||
let attrs = [("to".to_owned(), to),
|
||||
("version".to_owned(), "1.0".to_owned()),
|
||||
("xmlns".to_owned(), "jabber:client".to_owned()),
|
||||
("xmlns:stream".to_owned(), NS_XMPP_STREAM.to_owned()),
|
||||
].iter().cloned().collect();
|
||||
let send = stream.send(Packet::StreamStart(attrs));
|
||||
|
||||
StreamStart {
|
||||
state: StreamStartState::SendStart(send),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<S: AsyncRead + AsyncWrite> Future for StreamStart<S> {
|
||||
type Item = XMPPStream<S>;
|
||||
type Error = Error;
|
||||
|
||||
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
|
||||
let old_state = replace(&mut self.state, StreamStartState::Invalid);
|
||||
let mut retry = false;
|
||||
|
||||
let (new_state, result) = match old_state {
|
||||
StreamStartState::SendStart(mut send) =>
|
||||
match send.poll() {
|
||||
Ok(Async::Ready(stream)) => {
|
||||
retry = true;
|
||||
(StreamStartState::RecvStart(stream), Ok(Async::NotReady))
|
||||
},
|
||||
Ok(Async::NotReady) =>
|
||||
(StreamStartState::SendStart(send), Ok(Async::NotReady)),
|
||||
Err(e) =>
|
||||
(StreamStartState::Invalid, Err(e)),
|
||||
},
|
||||
StreamStartState::RecvStart(mut stream) =>
|
||||
match stream.poll() {
|
||||
Ok(Async::Ready(Some(Packet::StreamStart(stream_attrs)))) => {
|
||||
retry = true;
|
||||
// TODO: skip RecvFeatures for version < 1.0
|
||||
(StreamStartState::RecvFeatures(stream, stream_attrs), Ok(Async::NotReady))
|
||||
},
|
||||
Ok(Async::Ready(_)) =>
|
||||
return Err(Error::from(ErrorKind::InvalidData)),
|
||||
Ok(Async::NotReady) =>
|
||||
(StreamStartState::RecvStart(stream), Ok(Async::NotReady)),
|
||||
Err(e) =>
|
||||
return Err(e),
|
||||
},
|
||||
StreamStartState::RecvFeatures(mut stream, stream_attrs) =>
|
||||
match stream.poll() {
|
||||
Ok(Async::Ready(Some(Packet::Stanza(stanza)))) =>
|
||||
if stanza.name == "features"
|
||||
&& stanza.ns == Some(NS_XMPP_STREAM.to_owned()) {
|
||||
(StreamStartState::Invalid, Ok(Async::Ready(XMPPStream { stream, stream_attrs, stream_features: stanza })))
|
||||
} else {
|
||||
(StreamStartState::RecvFeatures(stream, stream_attrs), Ok(Async::NotReady))
|
||||
},
|
||||
Ok(Async::Ready(item)) => {
|
||||
println!("StreamStart skip {:?}", item);
|
||||
(StreamStartState::RecvFeatures(stream, stream_attrs), Ok(Async::NotReady))
|
||||
},
|
||||
Ok(Async::NotReady) =>
|
||||
(StreamStartState::RecvFeatures(stream, stream_attrs), Ok(Async::NotReady)),
|
||||
Err(e) =>
|
||||
return Err(e),
|
||||
},
|
||||
StreamStartState::Invalid =>
|
||||
unreachable!(),
|
||||
};
|
||||
|
||||
self.state = new_state;
|
||||
if retry {
|
||||
self.poll()
|
||||
} else {
|
||||
result
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue