O01eg/sendxmppd-rs - Change QTCUURXNMKPKDLG64QH72BIVP6SELSTQLUGGN67LKFVFN6FP2ZUQC

Add additional requirement for command stream

Created by O01eg on December 31, 2018

QTCUURXNMKPKDLG64QH72BIVP6SELSTQLUGGN67LKFVFN6FP2ZUQC

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] → [4.273:320]
```
const ID_GET_ROSTER: &str = "id_get_roster0";
```

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

∅:D[6.1011] → [4.536:581]

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

[6.1011]

[6.1056]

        F: future::Future + 'static,

Deletion in src/xmpp/mod.rs at line 56 [5.17]
∅:D[6.1405] → [4.748:777]
```
                    .clone()
```

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

∅:D[6.1464] → [4.778:844]

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

[6.1464]

[6.1530]

                        future::loop_fn(account, |account| {

Deletion in src/xmpp/mod.rs at line 65 [5.17]

∅:D[6.2010] → [4.845:998]


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

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

∅:D[7.589] → [4.1073:1481]

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

[7.589]

[7.720]

                                        .online()
                                        .and_then(XmppConnection::self_presence)

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

∅:D[6.3788] → [4.1482:1590]

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

[6.3788]

[6.3896]

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

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

∅:D[6.4137] → [4.1591:1773]

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

[6.4137]

[6.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 [5.17]

∅:D[6.4375] → [4.1774:1875]

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

[6.4375]

[6.4476]

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

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

∅:D[8.907] → [8.907:1295]

∅:D[8.1295] → [4.3111:3145]

∅:D[4.3111] → [4.3111:3145]

∅:D[4.3145] → [8.1296:1375]

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

[8.907]

[4.3255]

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

∅:D[2.939] → [8.2644:2691]

∅:D[8.2644] → [8.2644:2691]

                                Err(e.into()),

[2.939]

[8.2691]

                                Err(e),

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

∅:D[8.2756] → [8.2756:2822]

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

[8.2756]

[9.5513]

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

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

∅:D[6.6737] → [4.4692:6307]

∅:D[4.6307] → [2.940:1025]

∅:D[2.1025] → [4.6307:6802]

∅:D[4.6307] → [4.6307:6802]

    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);
                                                self.state.roster.insert(i.jid, ());
                                            }
                                            Ok(true)
                                        }
                                        Err(e) => Err(format_err!("Cann't parse roster: {}", e)),
                                    }
                                }
                                _ => Err(format_err!("Unknown result of roster")),
                            }
                        } else {
                            Ok(false)

[6.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 [5.17]

∅:D[10.5584] → [4.6803:6897]

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

[10.5584]

[6.8819]

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

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

∅:D[6.8841] → [4.6898:7060]

∅:D[9.8564] → [5.3783:3789]

∅:D[11.5720] → [5.3783:3789]

∅:D[4.7060] → [5.3783:3789]

∅:D[10.5926] → [5.3783:3789]

∅:D[12.3280] → [5.3783:3789]

∅:D[13.3996] → [5.3783:3789]

∅:D[14.5642] → [5.3783:3789]

∅:D[15.4300] → [5.3783:3789]

∅:D[16.4794] → [5.3783:3789]

∅:D[7.3307] → [5.3783:3789]

∅:D[6.10350] → [5.3783:3789]

∅:D[17.5692] → [5.3783:3789]

∅:D[18.8718] → [5.3783:3789]

∅:D[5.3783] → [5.3783:3789]

∅:D[5.3789] → [6.10351:10352]

∅:D[6.10352] → [4.7061:7279]

∅:D[4.7279] → [8.2865:2915]

∅:D[8.2915] → [2.1026:1053]

∅:D[2.1053] → [8.2964:2982]

∅:D[8.2964] → [8.2964:2982]

∅:D[8.2982] → [4.7333:7528]

∅:D[4.7333] → [4.7333:7528]

∅:D[4.7528] → [8.2983:2998]

∅:D[8.2998] → [4.7562:7838]

∅:D[4.7562] → [4.7562:7838]

∅:D[4.7838] → [2.1054:1089]

∅:D[8.3056] → [4.7887:8518]

∅:D[2.1089] → [4.7887:8518]

∅:D[4.7887] → [4.7887:8518]

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

[6.8841]

[4.8518]

                })
            },
        ))

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

∅:D[4.8525] → [4.8525:8742]

∅:D[4.8742] → [8.3057:3107]

∅:D[8.3107] → [2.1090:1117]

∅:D[2.1117] → [8.3156:3174]

∅:D[8.3156] → [8.3156:3174]

    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.8525]

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

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

∅:D[6.10756] → [4.8797:8851]

∅:D[4.8851] → [8.3175:3190]

∅:D[8.3190] → [4.8885:9157]

∅:D[4.8885] → [4.8885:9157]

∅:D[4.9157] → [2.1118:1153]

∅:D[8.3248] → [4.9206:10285]

∅:D[2.1153] → [4.9206:10285]

∅:D[4.9206] → [4.9206:10285]

        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.10756]

[6.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 281 [5.17]
∅:D[9.8651] → [19.465:518]
∅:D[11.5896] → [19.465:518]
∅:D[10.6054] → [19.465:518]
∅:D[14.5793] → [19.465:518]
∅:D[15.4398] → [19.465:518]
∅:D[6.12380] → [19.465:518]
∅:D[17.5737] → [19.465:518]
∅:D[18.8987] → [19.465:518]
∅:D[5.4355] → [19.465:518]
```
    S: stream::Stream<Item = XmppCommand> + 'static,
```
[6.12380]
[5.4355]
```
    S: stream::Stream<Item = XmppCommand, Error = ()> + 'static,
```

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

∅:D[5.6342] → [4.10615:10654]

                        future::err(e)

[5.6342]

[5.6572]

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

Deletion in Cargo.toml at line 23 [20.11995]
∅:D[12.7111] → [4.10655:10704]
```
try_from = "=0.2.2" # dependency of xmpp-parsers
```
Deletion in Cargo.lock at line 1110 [20.12201]
∅:D[12.44807] → [4.10705:10780]
```
 "try_from 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
```