O01eg/sendxmppd-rs - Change ALP2YJIUN45LOOJU7GZWYDY7BMLCKR3LJVFPXTTLLZFB4LSYJKMAC

Rename XmppState to XmppProcessState

Created by O01eg on December 31, 2018

ALP2YJIUN45LOOJU7GZWYDY7BMLCKR3LJVFPXTTLLZFB4LSYJKMAC

Dependencies

In channels

main

Change contents

Deletion in src/xmpp/stanzas.rs at line 2 [3.13]
∅:D[3.57] → [2.0:26]
```
use xmpp_parsers::iq::Iq;
```
Deletion in src/xmpp/stanzas.rs at line 3 [3.13]
∅:D[3.141] → [2.27:61]
```
use xmpp_parsers::roster::Roster;
```

Deletion in src/xmpp/stanzas.rs at line 12 [3.13]

∅:D[3.419] → [2.62:272]


pub fn make_get_roster(id: &str) -> Element {
    let mut get_roster = Iq::from_get(Roster {
        ver: None,
        items: vec![],
    });
    get_roster.id = Some(id.to_string());
    get_roster.into()
}

Deletion in src/xmpp/mod.rs at line 9 [4.17]
∅:D[3.434] → [2.273:320]
```
const ID_GET_ROSTER: &str = "id_get_roster0";
```
Replacement in src/xmpp/mod.rs at line 12 [4.17]
∅:D[2.397] → [2.397:425]
```
    client: Option<Client>,
```
[2.397]
[2.425]
```
    inner: Option<Client>,
```
Replacement in src/xmpp/mod.rs at line 17 [4.17]
∅:D[5.74] → [2.428:448]
```
    client: Client,
```
[5.74]
[2.448]
```
    inner: Client,
```

Replacement in src/xmpp/mod.rs at line 24 [4.17]

∅:D[2.627] → [2.627:666]

            client: Some(from.client),

[2.627]

[2.666]

            inner: Some(from.inner),

Replacement in src/xmpp/mod.rs at line 33 [4.17]
∅:D[3.527] → [2.803:829]
```
            client: None,
```
[3.527]
[4.499]
```
            inner: None,
```

Replacement in src/xmpp/mod.rs at line 44 [4.17]

∅:D[2.1011] → [2.1011:1056]

        F: future::Future + Clone + 'static,

[2.1011]

[2.1056]

        F: future::Future + 'static,

Replacement in src/xmpp/mod.rs at line 48 [4.17]

∅:D[4.690] → [2.1133:1193]

        let MaybeXmppConnection { account, client } = self;

[4.690]

[4.744]

        let MaybeXmppConnection { account, inner } = self;

Replacement in src/xmpp/mod.rs at line 50 [4.17]

∅:D[4.745] → [2.1194:1302]

        if let Some(client) = client {
            Box::new(future::ok(XmppConnection { account, client }))

[4.745]

[2.1302]

        if let Some(inner) = inner {
            Box::new(future::ok(XmppConnection { account, inner }))

Deletion in src/xmpp/mod.rs at line 56 [4.17]
∅:D[2.1405] → [2.1405:1434]
```
                    .clone()
```

Replacement in src/xmpp/mod.rs at line 57 [4.17]

∅:D[2.1464] → [2.1464:1530]

                        future::loop_fn(account, move |account| {

[2.1464]

[2.1530]

                        future::loop_fn(account, |account| {

Deletion in src/xmpp/mod.rs at line 66 [4.17]

∅:D[4.1477] → [2.2011:2164]

                                    let stop_future2 = stop_future.clone();
                                    let stop_future3 = stop_future.clone();

Replacement in src/xmpp/mod.rs at line 68 [4.17]

∅:D[2.2275] → [2.2275:2842]

                                        XmppConnection { client, account }
                                            .processing(XmppConnection::online, stop_future.clone())
                                            .map(|(conn, _)| conn)
                                            .map_err(|(acc, _)| acc)
                                            .and_then(|conn| conn.initial_roster(stop_future2))
                                            .and_then(|conn| conn.self_presence(stop_future3))
                                            .then(|r| match r {

[2.2275]

[2.2842]

                                        XmppConnection {
                                            inner: client,
                                            account,
                                        }
                                        .online()
                                        .and_then(XmppConnection::self_presence)
                                        .then(
                                            |r| match r {

Replacement in src/xmpp/mod.rs at line 78 [4.17]

∅:D[2.3042] → [2.3042:3090]

}),

[2.3042]

[2.3090]

                                            },
                                        ),

Replacement in src/xmpp/mod.rs at line 101 [4.17]

∅:D[2.3788] → [2.3788:3896]

    fn xmpp_processing(&mut self, event: &Event) {
        info!("Incoming xmpp event: {:?}", event);
    }

[2.3788]

[2.3896]

    fn xmpp_processing(&mut self, _event: &Event) {}

Replacement in src/xmpp/mod.rs at line 111 [4.17]

∅:D[2.4137] → [2.4137:4319]

        Item = (Self, Result<Either<F, T>, failure::Error>),
        Error = (
            std::rc::Rc<config::Account>,
            Result<Either<F, T>, failure::Error>,
        ),

[2.4137]

[2.4319]

        Item = (Self, Result<Either<F, T>, E>),
        Error = (std::rc::Rc<config::Account>, Result<Either<F, T>, E>),

Replacement in src/xmpp/mod.rs at line 116 [4.17]

∅:D[2.4375] → [2.4375:4476]

        E: Into<failure::Error>,
        S: FnMut(&mut Self, Event) -> Result<bool, failure::Error>,

[2.4375]

[2.4476]

        S: FnMut(&mut Self, &Event) -> bool,

Replacement in src/xmpp/mod.rs at line 121 [4.17]

∅:D[2.4612] → [2.4612:4752]

                let XmppConnection { client, account } = xmpp;
                client.into_future().select2(stop_future).then(|r| match r {

[2.4612]

[2.4752]

                let XmppConnection { inner, account } = xmpp;
                inner.into_future().select2(stop_future).then(|r| match r {

Replacement in src/xmpp/mod.rs at line 125 [4.17]

∅:D[2.4866] → [2.4866:4945]

                            let mut xmpp = XmppConnection { client, account };

[2.4866]

[2.4945]

                            let mut xmpp = XmppConnection {
                                inner: client,
                                account,
                            };

Replacement in src/xmpp/mod.rs at line 130 [4.17]

∅:D[2.5003] → [2.5003:5504]

                            match stop_condition(&mut xmpp, event) {
                                Ok(true) => {
                                    future::ok(future::Loop::Break((xmpp, Ok(Either::A(b)))))
                                }
                                Ok(false) => {
                                    future::ok(future::Loop::Continue((xmpp, b, stop_condition)))
                                }
                                Err(e) => future::err((xmpp.account, Err(e))),

[2.5003]

[2.5504]

                            if stop_condition(&mut xmpp, &event) {
                                future::ok(future::Loop::Break((xmpp, Ok(Either::A(b)))))
                            } else {
                                future::ok(future::Loop::Continue((xmpp, b, stop_condition)))

Replacement in src/xmpp/mod.rs at line 140 [4.17]

∅:D[2.5706] → [2.5706:5769]

                        if let Some(client) = a.into_inner() {

[2.5706]

[2.5769]

                        if let Some(inner) = a.into_inner() {

Replacement in src/xmpp/mod.rs at line 142 [4.17]

∅:D[2.5830] → [2.5830:5898]

                                XmppConnection { client, account },

[2.5830]

[2.5898]

                                XmppConnection { inner, account },

Replacement in src/xmpp/mod.rs at line 151 [4.17]

∅:D[2.6242] → [2.6242:6305]

                        if let Some(client) = a.into_inner() {

[2.6242]

[2.6305]

                        if let Some(inner) = a.into_inner() {

Replacement in src/xmpp/mod.rs at line 153 [4.17]

∅:D[2.6366] → [2.6366:6481]

                                XmppConnection { client, account },
                                Err(e.into()),

[2.6366]

[2.6481]

                                XmppConnection { inner, account },
                                Err(e),

Replacement in src/xmpp/mod.rs at line 157 [4.17]

∅:D[2.6546] → [2.6546:6612]

                            future::err((account, Err(e.into())))

[2.6546]

[6.5513]

                            future::err((account, Err(e)))

Replacement in src/xmpp/mod.rs at line 167 [4.17]

∅:D[2.6737] → [2.6737:7230]

∅:D[7.2924] → [8.3693:3694]

∅:D[2.7230] → [8.3693:3694]

∅:D[8.3693] → [8.3693:3694]

∅:D[8.3694] → [2.7231:8352]

∅:D[7.4798] → [9.2496:2542]

∅:D[2.8352] → [9.2496:2542]

∅:D[9.2496] → [9.2496:2542]

∅:D[9.2542] → [2.8353:8406]

∅:D[7.4885] → [9.2645:2687]

∅:D[2.8406] → [9.2645:2687]

∅:D[9.2645] → [9.2645:2687]

∅:D[9.2687] → [2.8407:8505]

∅:D[2.8505] → [9.2813:2851]

∅:D[9.2813] → [9.2813:2851]

∅:D[9.2851] → [2.8506:8724]

    fn online(&mut self, event: Event) -> Result<bool, failure::Error> {
        match event {
            Event::Online => {
                info!("Online!");
                Ok(true)
            }
            Event::Stanza(s) => {
                warn!("Stanza before online: {:?}", s);
                Ok(false)
            }
            _ => {
                error!("Disconnected while online");
                Err(format_err!("Disconnected while online"))
            }
        }
    }
    fn process_initial_roster(&mut self, event: Event) -> Result<bool, failure::Error> {
        if let Event::Stanza(s) = event {
            use try_from::TryInto;
            match s.try_into() as Result<xmpp_parsers::iq::Iq, _> {
                Ok(iq) => {
                    if let Some(id) = iq.id {
                        if id == ID_GET_ROSTER {
                            match iq.payload {
                                xmpp_parsers::iq::IqType::Error(_e) => {
                                    Err(format_err!("Get error instead of roster"))
                                }
                                xmpp_parsers::iq::IqType::Result(Some(result)) => {
                                    match result.try_into()
                                        as Result<xmpp_parsers::roster::Roster, _>
                                    {
                                        Ok(roster) => {
                                            info!("Got roster:");
                                            for i in roster.items {
                                                info!(" >>> {:?}", i);
                                            }
                                            Ok(true)
                                        }
                                        Err(e) => Err(format_err!("Cann't parse roster: {}", e)),
                                    }
                                }
                                _ => Err(format_err!("Unknown result of roster")),
                            }
                        } else {
                            Ok(false)

[2.6737]

[10.5558]

    fn online(self) -> impl Future<Item = XmppConnection, Error = std::rc::Rc<config::Account>> {
        Box::new(future::loop_fn(
            (self.inner, self.account),
            |(client, account)| {
                client.into_future().then(|r| match r {
                    Ok((event, client)) => match event {
                        Some(Event::Online) => {
                            info!("Online");
                            future::ok(future::Loop::Break(XmppConnection {
                                account,
                                inner: client,
                            }))
                        }
                        Some(Event::Stanza(s)) => {
                            info!("xmpp stanza: {:?}", s);
                            future::ok(future::Loop::Continue((client, account)))
                        }
                        _ => {
                            warn!("Disconnected");
                            future::err(account)

Replacement in src/xmpp/mod.rs at line 188 [4.17]

∅:D[10.5584] → [2.8725:8819]

                    } else {
                        Err(format_err!("Iq stanza without id"))

[10.5584]

[2.8819]

                    },
                    Err((e, _)) => {
                        error!("xmpp receive error: {}", e);
                        future::err(account)

Replacement in src/xmpp/mod.rs at line 193 [4.17]

∅:D[2.8841] → [2.8841:8911]

∅:D[2.8911] → [7.5554:5571]

∅:D[7.5554] → [7.5554:5571]

∅:D[7.5571] → [2.8912:8977]

∅:D[2.8977] → [7.5710:5720]

∅:D[7.5710] → [7.5710:5720]

∅:D[7.5720] → [2.8978:10350]

                }
                Err(_e) => Ok(false),
            }
        } else {
            Err(format_err!("Wrong event while waiting roster"))
        }
    }
    fn initial_roster<F, E>(
        self,
        stop_future: F,
    ) -> impl Future<Item = Self, Error = std::rc::Rc<config::Account>>
    where
        F: Future<Error = E>,
        E: Into<failure::Error>,
    {
        let XmppConnection { account, client } = self;
        use tokio::prelude::Sink;
        let get_roster = stanzas::make_get_roster(ID_GET_ROSTER);
        let account2 = account.clone();
        info!("Quering roster... {:?}", get_roster);
        client
            .send(get_roster)
            .map_err(move |e| {
                error!("Error on querying roster: {}", e);
                (account2, Err(failure::SyncFailure::new(e).into()))
            })
            .and_then(move |client| {
                XmppConnection { client, account }
                    .processing(XmppConnection::process_initial_roster, stop_future)
            })
            .then(|r| match r {
                Err((account, e)) => {
                    error!(
                        "Cann't wait roster: {}",
                        e.err().map_or_else(
                            || std::borrow::Cow::Borrowed("None"),
                            |e| e.to_string().into()
                        )
                    );
                    future::err(account)
                }
                Ok((conn, _)) => future::ok(conn),
            })

[2.8841]

[4.3783]

                })
            },
        ))

Replacement in src/xmpp/mod.rs at line 198 [4.17]

∅:D[2.10352] → [2.10352:10624]

    fn self_presence<F, E>(
        self,
        stop_future: F,
    ) -> impl Future<Item = Self, Error = std::rc::Rc<config::Account>>
    where
        F: Future<Error = E>,
        E: Into<failure::Error>,
    {
        let XmppConnection { account, client } = self;

[2.10352]

[2.10624]

    fn self_presence(self) -> impl Future<Item = Self, Error = std::rc::Rc<config::Account>> {
        let XmppConnection { account, inner } = self;
        let client = inner;

Insertion in src/xmpp/mod.rs at line 204 [4.17]
[2.10716]
[2.10716]
```
        info!("Sending presence...");
```

Replacement in src/xmpp/mod.rs at line 206 [4.17]

∅:D[2.10756] → [2.10756:12130]

        info!("Sending presence... {:?}", presence);
        client
            .send(presence)
            .map_err(|e| {
                error!("Error on send self-presence: {}", e);
                (account2, Err(failure::SyncFailure::new(e).into()))
            })
            .and_then(move |client| {
                XmppConnection { client, account }.processing(
                    move |conn, event| {
                        if let Event::Stanza(s) = event {
                            if s.name() == "presence"
                                && s.attr("from").map_or(false, |f| f == conn.account.jid)
                                && s.attr("to").map_or(false, |f| f == conn.account.jid)
                            {
                                Ok(true)
                            } else {
                                Ok(false)
                            }
                        } else {
                            Err(format_err!("Wrong event while waiting self-presence"))
                        }
                    },
                    stop_future,
                )
            })
            .then(|r| match r {
                Err((account, _e)) => {
                    error!("Cann't wait self-presence");
                    future::err(account)
                }
                Ok((conn, _)) => future::ok(conn),
            })

[2.10756]

[2.12130]

        Box::new(
            client
                .send(presence)
                .map_err(|e| {
                    error!("Error on send self-presence: {}", e);
                    "Cann't send self-presence".to_owned()
                })
                .and_then(move |client| {
                    future::loop_fn((account2.clone(), client), |(account, client)| {
                        client
                            .into_future()
                            .map_err(|(e, _)| {
                                error!("Error on reading self-presence: {}", e);
                                "Cann't read self-presence".to_owned()
                            })
                            .and_then(|(event, client)| match event {
                                Some(event) => {
                                    if let tokio_xmpp::Event::Stanza(e) = event {
                                        info!("Get stanza: {:?}", e);
                                        if e.name() == "presence"
                                            && e.attr("from").map_or(false, |f| f == account.jid)
                                            && e.attr("to").map_or(false, |f| f == account.jid)
                                        {
                                            info!("Self presence");
                                            future::ok(future::Loop::Break(client))
                                        } else {
                                            future::ok(future::Loop::Continue((account, client)))
                                        }
                                    } else {
                                        future::err("Got wrong event".to_owned())
                                    }
                                }
                                None => future::err("Got closed stream".to_owned()),
                            })
                    })
                    .map_err(|e| format!("waiting self-presence: {}", e))
                })
                .then(|r| match r {
                    Err(e) => {
                        error!("Self-presence waiting error: {}", e);
                        future::err(account)
                    }
                    Ok(inner) => future::ok(XmppConnection { account, inner }),
                }),
        )

Replacement in src/xmpp/mod.rs at line 257 [4.17]
∅:D[4.3817] → [11.61:86]
```
struct XmppState<F, S> {
```
[4.3817]
[11.86]
```
struct XmppProcessState<F, S> {
```
Replacement in src/xmpp/mod.rs at line 263 [4.17]
∅:D[4.3920] → [11.104:133]
∅:D[11.133] → [2.12169:12252]
∅:D[7.5851] → [4.4038:4058]
∅:D[11.211] → [4.4038:4058]
∅:D[12.4137] → [4.4038:4058]
∅:D[13.5748] → [4.4038:4058]
∅:D[14.597] → [4.4038:4058]
∅:D[15.4900] → [4.4038:4058]
∅:D[2.12252] → [4.4038:4058]
∅:D[16.8859] → [4.4038:4058]
∅:D[4.4038] → [4.4038:4058]
```
impl<F, S> XmppState<F, S> {
    fn new(cmd_recv: S, signal: F, conn: MaybeXmppConnection) -> XmppState<F, S> {
        XmppState {
```
[4.3920]
[4.4058]
```
impl<F, S> XmppProcessState<F, S> {
    fn new(cmd_recv: S, signal: F, conn: MaybeXmppConnection) -> XmppProcessState<F, S> {
        XmppProcessState {
```
Replacement in src/xmpp/mod.rs at line 285 [4.17]
∅:D[4.4527] → [4.4527:4617]
∅:D[4.4527] → [4.4527:4617]
∅:D[4.4527] → [4.4527:4617]
∅:D[4.4527] → [4.4527:4617]
∅:D[4.4527] → [4.4527:4617]
∅:D[4.4527] → [4.4527:4617]
∅:D[4.4527] → [4.4527:4617]
∅:D[4.4527] → [4.4527:4617]
```
    future::loop_fn(XmppState::new(cmd_recv, signal, conn), |s| {
        let XmppState {
```
[4.4527]
[4.4617]
```
    future::loop_fn(XmppProcessState::new(cmd_recv, signal, conn), |s| {
        let XmppProcessState {
```

Replacement in src/xmpp/mod.rs at line 308 [4.17]

∅:D[2.12779] → [2.12779:12857]

                            future::ok(future::Loop::Continue(XmppState::new(

[2.12779]

[2.12857]

                            future::ok(future::Loop::Continue(XmppProcessState::new(

Replacement in src/xmpp/mod.rs at line 320 [4.17]

∅:D[4.6342] → [2.13190:13229]

                        future::err(e)

[4.6342]

[4.6572]

                        future::err(format_err!("Cmd error"))

Deletion in Cargo.toml at line 23 [17.11995]
∅:D[5.7111] → [2.13540:13589]
```
try_from = "=0.2.2" # dependency of xmpp-parsers
```
Deletion in Cargo.lock at line 1110 [17.12201]
∅:D[5.44807] → [2.18562:18637]
```
 "try_from 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
```