O01eg/sendxmppd-rs - Change 4LRBIGVT4GOFDT7EUBBRG7776IC6WVJYTB6NVMIBVWAFGISYGIUAC

Show info about xmpp errors

Created by O01eg on December 31, 2018

4LRBIGVT4GOFDT7EUBBRG7776IC6WVJYTB6NVMIBVWAFGISYGIUAC

Dependencies

In channels

main

Change contents

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

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

∅:D[3.419] → [4.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 [5.17]
∅:D[3.434] → [2.0:47]
```
const ID_GET_ROSTER: &str = "id_get_roster0";
```

Replacement in src/xmpp/mod.rs at line 38 [5.17]

∅:D[5.554] → [6.479:781]

    /// don't connect if stop_future resolved
    fn connect<F>(
        self,
        stop_future: F,
    ) -> impl Future<Item = XmppConnection, Error = failure::Error>
    where
        F: future::Future + Clone + 'static,
        <F as hyper::rt::Future>::Error: Into<failure::Error> + Send,
    {

[5.554]

[5.653]

    /// Error shoud be !
    fn connect<E: 'static>(self) -> impl Future<Item = XmppConnection, Error = E> {

Replacement in src/xmpp/mod.rs at line 45 [5.17]

∅:D[6.910] → [6.910:962]

                as Box<Future<Item = _, Error = _>>

[6.910]

[5.944]

                as Box<Future<Item = _, Error = E>>

Replacement in src/xmpp/mod.rs at line 47 [5.17]

∅:D[5.961] → [6.963:1618]

            Box::new(
                stop_future
                    .clone()
                    .select2(
                        future::loop_fn(account, move |account| {
                            info!("xmpp initialization...");
                            let res_client = Client::new(&account.jid, &account.password);
                            match res_client {
                                Err(_e) => Box::new(future::ok(future::Loop::Continue(account)))
                                    as Box<Future<Item = _, Error = _>>,
                                Ok(client) => {
                                    info!("xmpp initialized");

[5.961]

[5.1476]

            Box::new(future::loop_fn(account, |account| {
                info!("xmpp initialization...");
                let mut res_client = Client::new(&account.jid, &account.password);
                while let Err(e) = res_client {
                    error!("Cann't init xmpp client: {}", e);
                    res_client = Client::new(&account.jid, &account.password);
                }
                let client = res_client.expect("Cann't init xmpp client");
                info!("xmpp initialized");

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

∅:D[5.1477] → [6.1619:1695]

∅:D[6.1695] → [4.273:349]

∅:D[4.349] → [6.1695:2243]

∅:D[6.1695] → [6.1695:2243]

∅:D[6.2243] → [4.350:533]

∅:D[4.533] → [6.2334:2926]

∅:D[6.2334] → [6.2334:2926]

∅:D[7.2437] → [8.426:466]

∅:D[9.1167] → [8.426:466]

∅:D[6.2926] → [8.426:466]

∅:D[8.426] → [8.426:466]

∅:D[8.466] → [6.2927:3372]

                                    let stop_future2 = stop_future.clone();
                                    let stop_future3 = stop_future.clone();
                                    // future to wait for online
                                    Box::new(
                                        XmppConnection {
                                            inner: 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 {
                                                Ok(conn) => future::ok(future::Loop::Break(conn)),
                                                Err(acc) => future::ok(future::Loop::Continue(acc)),
                                            },
                                        ),
                                    )
                                }
                            }
                        })
                        .map_err(|_: ()| ()),
                    )
                    .then(|r| match r {
                        Ok(Either::A((_x, _b))) => future::err(format_err!("Stop XMMP connection")),
                        Ok(Either::B((x, _a))) => future::ok(x),
                        Err(Either::A((e, _b))) => future::err(e.into()),
                        Err(Either::B((_, _a))) => {
                            future::err(format_err!("Cann't initiate XMPP connection"))
                        }
                    }),
            )

[5.1477]

[5.1858]

                // future to wait for online
                XmppConnection {
                    inner: client,
                    account,
                }
                .online()
                .and_then(XmppConnection::self_presence)
                .then(|r| match r {
                    Ok(conn) => future::ok(future::Loop::Break(conn)),
                    Err(acc) => future::ok(future::Loop::Continue(acc)),
                })
            }))

Replacement in src/xmpp/mod.rs at line 75 [5.17]

∅:D[6.3427] → [6.3427:3535]

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

[6.3427]

[6.3535]

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

Replacement in src/xmpp/mod.rs at line 85 [5.17]

∅:D[6.3776] → [6.3776:3958]

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

[6.3776]

[6.3958]

        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 90 [5.17]

∅:D[6.4014] → [6.4014:4047]

∅:D[6.4047] → [4.534:602]

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

[6.4014]

[6.4116]

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

Replacement in src/xmpp/mod.rs at line 104 [5.17]

∅:D[6.4701] → [4.603:672]

∅:D[4.672] → [6.4771:5203]

∅:D[6.4771] → [6.4771:5203]

                            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))),

[6.4701]

[6.5203]

                            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 123 [5.17]

∅:D[6.5802] → [6.5802:5891]

                    Err(Either::A((_e, b))) => future::err((account, Ok(Either::A(b)))),

[6.5802]

[6.5891]

                    Err(Either::A((e, b))) => {
                        warn!("XMPP error: {}", e.0);
                        future::err((account, Ok(Either::A(b))))
                    }

Replacement in src/xmpp/mod.rs at line 131 [5.17]

∅:D[6.6129] → [6.6129:6176]

                                Err(e.into()),

[6.6129]

[6.6176]

                                Err(e),

Replacement in src/xmpp/mod.rs at line 134 [5.17]

∅:D[6.6241] → [6.6241:6307]

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

[6.6241]

[7.5513]

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

Replacement in src/xmpp/mod.rs at line 144 [5.17]

∅:D[6.6432] → [4.673:746]

∅:D[4.746] → [6.6506:6926]

∅:D[6.6506] → [6.6506:6926]

∅:D[6.6926] → [4.747:748]

∅:D[4.748] → [2.48:1664]

    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)

[6.6432]

[2.1664]

    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 165 [5.17]

∅:D[2.1690] → [2.1690:1784]

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

[2.1690]

[2.1784]

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

Replacement in src/xmpp/mod.rs at line 170 [5.17]

∅:D[2.1806] → [2.1806:1975]

∅:D[2.1975] → [4.748:1095]

∅:D[4.748] → [4.748:1095]

∅:D[4.1162] → [6.6926:6927]

∅:D[6.6926] → [6.6926:6927]

∅:D[6.6927] → [2.1976:2042]

∅:D[2.2042] → [4.1230:1697]

∅:D[4.1230] → [4.1230:1697]

∅:D[4.1697] → [2.2043:2124]

∅:D[2.2124] → [4.3184:3687]

∅:D[4.3184] → [4.3184:3687]

                }
                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,
            inner: 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 {
                    inner: 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.1806]

[4.3687]

                })
            },
        ))

Replacement in src/xmpp/mod.rs at line 175 [5.17]

∅:D[4.3694] → [6.6927:7144]

∅:D[6.6927] → [6.6927:7144]

∅:D[6.7144] → [4.3695:3790]

    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,
            inner: client,
        } = self;

[4.3694]

[6.7173]

    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 181 [5.17]
[6.7265]
[6.7303]
```
        info!("Sending presence...");
```

Replacement in src/xmpp/mod.rs at line 183 [5.17]

∅:D[6.7343] → [4.3791:3845]

∅:D[4.3845] → [6.7343:8375]

∅:D[6.7343] → [6.7343:8375]

∅:D[6.8375] → [9.5234:5260]

∅:D[9.5234] → [9.5234:5260]

∅:D[9.5260] → [6.8376:8497]

∅:D[6.8497] → [4.3846:3886]

∅:D[4.3886] → [6.8536:8718]

∅:D[6.8536] → [6.8536:8718]

        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 {
                    inner: 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),
            })

[6.7343]

[5.3783]

        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 256 [5.17]

∅:D[5.4311] → [6.8860:8987]

    F: future::Future + Clone + 'static,
    <F as hyper::rt::Future>::Error: std::fmt::Display + Into<failure::Error> + Send,

[5.4311]

[10.465]

    F: future::Future<Item = ()> + 'static,

Insertion in src/xmpp/mod.rs at line 259 [5.17]

[5.4357]

[6.8988]

    let signal = signal.map_err(|_| format_err!("Wrong shutdown signal"));

Replacement in src/xmpp/mod.rs at line 269 [5.17]

∅:D[5.4692] → [6.9039:9107]

        conn.connect(signal.clone())
            .and_then(|conn| {

[5.4692]

[5.4761]

        signal
            .select2(conn.connect().and_then(|conn| {

Replacement in src/xmpp/mod.rs at line 278 [5.17]

∅:D[10.675] → [6.9108:9189]

                    .map(|(cmd, cmd_recv)| (cmd, cmd_recv, conn))
            })

[10.675]

[10.731]

                    .map(|f| (f, conn))
            }))

Replacement in src/xmpp/mod.rs at line 282 [5.17]

∅:D[5.5146] → [6.9190:9763]

                    Ok((cmd, cmd_recv, conn)) => {
                        if let Some(_cmd) = cmd {
                            info!("Got cmd");
                            // got cmd, continue
                            future::ok(future::Loop::Continue(XmppState::new(
                                cmd_recv,
                                signal,
                                conn.into(),
                            )))
                        } else {
                            future::ok(future::Loop::Break((None, conn.into())))
                        }

[5.5146]

[9.7045]

                    Ok(Either::A((_x, b))) => {
                        info!("Got signal");
                        // got signal, breaks
                        Box::new(b.map(|b| future::Loop::Break((Some((b.0).1), b.1.into()))))
                            as Box<Future<Item = _, Error = _>>
                    }
                    Ok(Either::B((x, a))) => {
                        info!("Got cmd");
                        // got cmd, continue
                        Box::new(future::ok(future::Loop::Continue(XmppState::new(
                            (x.0).1,
                            a,
                            x.1.into(),
                        )))) as Box<Future<Item = _, Error = _>>
                    }
                    Err(Either::A((e, b))) => {
                        // got signal error, breaks
                        error!("Signal error: {}", e);
                        Box::new(b.map(|b| future::Loop::Break((Some((b.0).1), b.1.into()))))
                            as Box<Future<Item = _, Error = _>>

Replacement in src/xmpp/mod.rs at line 303 [5.17]

∅:D[9.7067] → [6.9764:9796]

                    Err(e) => {

[9.7067]

[5.6240]

                    Err(Either::B((e, _a))) => {

Replacement in src/xmpp/mod.rs at line 306 [5.17]

∅:D[5.6342] → [4.3887:3926]

                        future::err(e)

[5.6342]

[5.6572]

                        Box::new(future::err(format_err!("Cmd error")))
                            as Box<Future<Item = _, Error = _>>

Replacement in src/xmpp/mod.rs at line 322 [5.17]

∅:D[10.1354] → [6.9935:9972]

            Box::new(future::ok(()))

[10.1354]

[10.1422]

            Box::new(future::err(format_err!("cmd receiver gone")))

Replacement in src/main.rs at line 63 [12.17]

∅:D[11.4954] → [6.10033:10140]

        .map_err(|e| {
            error!("Cann't get CTRL+C signal: {}", e.0);
            e.0
        })

[11.4954]

[11.5020]

        .map_err(|e| error!("Cann't get CTRL+C signal: {}", e.0))

Replacement in src/main.rs at line 97 [12.17]

∅:D[11.6389] → [6.10922:11010]

        let result = ctrt.block_on(xmpp_process(ctrl_c.clone(), recv, config.account));

[11.6389]

[11.6536]

        let result = ctrt.block_on(xmpp_process(
            ctrl_c.clone().map(|_| ()),
            recv,
            config.account,
        ));

Deletion in Cargo.toml at line 23 [12.11995]
∅:D[11.7111] → [4.3927:3976]
```
try_from = "=0.2.2" # dependency of xmpp-parsers
```
Deletion in Cargo.lock at line 1110 [12.12201]
∅:D[11.44807] → [4.3977:4052]
```
 "try_from 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
```