Simplify the API by removing explicit channels.
This commit is contained in:
Marcin Mielniczuk
parent
08af035eb1
commit
3f056813ed
3 changed files with 86 additions and 46 deletions
72
src/lib.rs
72
src/lib.rs
|
|
@ -34,6 +34,8 @@ use xmpp_parsers::{
|
|||
|
||||
mod avatar;
|
||||
|
||||
pub type Error = tokio_xmpp::Error;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum ClientType {
|
||||
Bot,
|
||||
|
|
@ -135,19 +137,35 @@ impl ClientBuilder<'_> {
|
|||
presence
|
||||
}
|
||||
|
||||
pub fn build(self, mut app_tx: mpsc::UnboundedSender<Event>) -> Result<(Box<Future<Item = (), Error = ()>>, Client), JidParseError> {
|
||||
pub fn build(
|
||||
self,
|
||||
) -> Result<(Agent, impl Stream<Item = Event, Error = tokio_xmpp::Error>), JidParseError> {
|
||||
let client = TokioXmppClient::new(self.jid, self.password)?;
|
||||
Ok(self.build_impl(client))
|
||||
}
|
||||
|
||||
// This function is meant to be used for testing build
|
||||
pub(crate) fn build_impl<S>(
|
||||
self,
|
||||
stream: S,
|
||||
) -> (Agent, impl Stream<Item = Event, Error = tokio_xmpp::Error>)
|
||||
where
|
||||
S: Stream<Item = tokio_xmpp::Event, Error = tokio_xmpp::Error>
|
||||
+ Sink<SinkItem = tokio_xmpp::Packet, SinkError = tokio_xmpp::Error>,
|
||||
{
|
||||
let disco = self.make_disco();
|
||||
let node = self.website;
|
||||
let (sender_tx, sender_rx) = mpsc::unbounded();
|
||||
|
||||
let client = TokioXmppClient::new(self.jid, self.password)?;
|
||||
let client = stream;
|
||||
let (sink, stream) = client.split();
|
||||
|
||||
let reader = {
|
||||
let mut sender_tx = sender_tx.clone();
|
||||
let jid = self.jid.to_owned();
|
||||
stream.for_each(move |event| {
|
||||
stream.map(move |event| {
|
||||
// Helper function to send an iq error.
|
||||
let mut events = Vec::new();
|
||||
let send_error = |to, id, type_, condition, text: &str| {
|
||||
let error = StanzaError::new(type_, condition, "en", text);
|
||||
let iq = Iq::from_error(id, error)
|
||||
|
|
@ -162,13 +180,13 @@ impl ClientBuilder<'_> {
|
|||
let packet = Packet::Stanza(presence);
|
||||
sender_tx.unbounded_send(packet)
|
||||
.unwrap();
|
||||
app_tx.unbounded_send(Event::Online).unwrap();
|
||||
events.push(Event::Online);
|
||||
let iq = Iq::from_get("roster", Roster { ver: None, items: vec![] })
|
||||
.into();
|
||||
sender_tx.unbounded_send(Packet::Stanza(iq)).unwrap();
|
||||
}
|
||||
TokioXmppEvent::Disconnected => {
|
||||
app_tx.unbounded_send(Event::Disconnected).unwrap();
|
||||
events.push(Event::Disconnected);
|
||||
}
|
||||
TokioXmppEvent::Stanza(stanza) => {
|
||||
if stanza.is("iq", "jabber:client") {
|
||||
|
|
@ -197,7 +215,7 @@ impl ClientBuilder<'_> {
|
|||
if payload.is("query", ns::ROSTER) {
|
||||
let roster = Roster::try_from(payload).unwrap();
|
||||
for item in roster.items.into_iter() {
|
||||
app_tx.unbounded_send(Event::ContactAdded(item)).unwrap();
|
||||
events.push(Event::ContactAdded(item));
|
||||
}
|
||||
} else if payload.is("pubsub", ns::PUBSUB) {
|
||||
let pubsub = PubSub::try_from(payload).unwrap();
|
||||
|
|
@ -205,7 +223,8 @@ impl ClientBuilder<'_> {
|
|||
iq.from.clone().unwrap_or(Jid::from_str(&jid).unwrap());
|
||||
if let PubSub::Items(items) = pubsub {
|
||||
if items.node.0 == ns::AVATAR_DATA {
|
||||
avatar::handle_data_pubsub_iq(&from, &mut app_tx, items);
|
||||
let new_events = avatar::handle_data_pubsub_iq(&from, &items);
|
||||
events.extend(new_events);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -236,7 +255,7 @@ impl ClientBuilder<'_> {
|
|||
};
|
||||
for status in muc_user.status.into_iter() {
|
||||
if status == Status::SelfPresence {
|
||||
app_tx.unbounded_send(Event::RoomJoined(from.clone())).unwrap();
|
||||
events.push(Event::RoomJoined(from.clone()));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -249,8 +268,9 @@ impl ClientBuilder<'_> {
|
|||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
futures::stream::iter_ok(events)
|
||||
})
|
||||
.flatten()
|
||||
};
|
||||
|
||||
let sender = sender_rx
|
||||
|
|
@ -259,25 +279,45 @@ impl ClientBuilder<'_> {
|
|||
.map(|(rx, mut sink)| {
|
||||
drop(rx);
|
||||
let _ = sink.close();
|
||||
None
|
||||
});
|
||||
|
||||
let future = reader.select(sender)
|
||||
.map(|_| ())
|
||||
.map_err(|_| ());
|
||||
// TODO is this correct?
|
||||
// Some(Error) means a real error
|
||||
// None means the end of the sender stream and can be ignored
|
||||
let future = reader
|
||||
.map(Some)
|
||||
.select(sender.into_stream())
|
||||
.filter_map(|x| x);
|
||||
|
||||
let agent = Client {
|
||||
sender_tx,
|
||||
};
|
||||
let agent = Agent { sender_tx };
|
||||
|
||||
Ok((Box::new(future), agent))
|
||||
(agent, future)
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Client {
|
||||
sender_tx: mpsc::UnboundedSender<Packet>,
|
||||
stream: Box<Stream<Item = Event, Error = Error>>,
|
||||
}
|
||||
|
||||
impl Client {
|
||||
pub fn get_agent(&self) -> Agent {
|
||||
Agent {
|
||||
sender_tx: self.sender_tx.clone(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn listen(self) -> Box<Stream<Item = Event, Error = Error>> {
|
||||
self.stream
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Agent {
|
||||
sender_tx: mpsc::UnboundedSender<Packet>,
|
||||
}
|
||||
|
||||
impl Agent {
|
||||
pub fn join_room(&mut self, room: Jid, lang: &str, status: &str) {
|
||||
let mut presence = Presence::new(PresenceType::None)
|
||||
.with_to(Some(room))
|
||||
|
|
|
|||
Loading…
Reference in a new issue