O01eg/sendxmppd-rs - Change E4YEIQYO6OX5U225LMB4YWIT5LK2VDBH5HVLV5C5HCIWQWVNVFOAC

Connect to xmpp server

Created by O01eg on October 28, 2018

E4YEIQYO6OX5U225LMB4YWIT5LK2VDBH5HVLV5C5HCIWQWVNVFOAC

Dependencies

In channels

main

Change contents

Insertion in src/xmpp.rs at line 1 [4.10]
[3.44]
[3.44]
```
use tokio::prelude::stream;
```
Replacement in src/xmpp.rs at line 5 [4.10]
∅:D[5.1] → [5.1:25]
```
use tokio_xmpp::Client;
```
[5.1]
[2.0]
```
use tokio_xmpp::{Client, Event};
```

Replacement in src/xmpp.rs at line 11 [4.10]

∅:D[2.44] → [5.26:53]

∅:D[6.68] → [5.26:53]

    inner: Option<Client>,

[2.44]

[6.91]

    inner: Option<(stream::SplitSink<Client>, stream::SplitStream<Client>)>,

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

∅:D[6.380] → [6.380:445]

∅:D[6.445] → [2.125:179]

∅:D[2.179] → [5.159:205]

∅:D[5.159] → [5.159:205]

∅:D[5.205] → [2.180:259]

∅:D[2.259] → [5.268:370]

∅:D[5.268] → [5.268:370]

∅:D[5.370] → [2.260:335]

    fn connect<E>(self) -> impl Future<Item = Self, Error = E> {
        let XmppConnection { account, inner } = self;
        let inner = inner.unwrap_or_else(|| {
            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);

[6.380]

[5.429]

    fn connect<E: 'static>(self) -> impl Future<Item = Self, Error = E> {
        info!("xmpp connection...");
        future::loop_fn(self, |XmppConnection { account, inner }| {
            if let Some(inner) = inner {
                Box::new(future::ok(future::Loop::Break(XmppConnection {
                    account,
                    inner: Some(inner),
                }))) as Box<Future<Item = _, Error = E>>
            } else {
                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");
                // future to wait for online
                let (sink, stream) = client.split();
                Box::new(future::loop_fn(
                    (sink, stream, account),
                    |(sink, stream, account)| {
                        stream.into_future().then(|r| match r {
                            Ok((event, stream)) => match event {
                                Some(Event::Online) => {
                                    info!("Online");
                                    future::ok(future::Loop::Break(future::Loop::Break(
                                        XmppConnection {
                                            account,
                                            inner: Some((sink, stream)),
                                        },
                                    )))
                                }
                                Some(Event::Stanza(s)) => {
                                    info!("xmpp stanza: {:?}", s);
                                    future::ok(future::Loop::Continue((sink, stream, account)))
                                }
                                _ => {
                                    warn!("Disconnected");
                                    future::ok(future::Loop::Break(future::Loop::Continue(
                                        XmppConnection {
                                            account,
                                            inner: None,
                                        },
                                    )))
                                }
                            },
                            Err((e, _)) => {
                                error!("xmpp receive error: {}", e);
                                future::ok(future::Loop::Break(future::Loop::Continue(
                                    XmppConnection {
                                        account,
                                        inner: None,
                                    },
                                )))
                            }
                        })
                    },
                ))

Deletion in src/xmpp.rs at line 86 [4.10]

∅:D[5.443] → [5.443:584]

∅:D[5.584] → [6.499:536]

∅:D[6.499] → [6.499:536]

∅:D[6.536] → [2.336:357]

∅:D[2.357] → [6.600:632]

∅:D[5.624] → [6.600:632]

∅:D[6.600] → [6.600:632]

            let client = res_client.expect("Cann't init xmpp client");
            info!("xmpp initialized");
            client
        });
        future::ok(XmppConnection {
            account,
            inner: Some(inner),

Replacement in src/xmpp.rs at line 108 [4.10]
∅:D[3.364] → [6.866:899]
```
pub fn xmpp_process<F: 'static>(
```
[3.364]
[3.388]
```
pub fn xmpp_process<F>(
```
Replacement in src/xmpp.rs at line 114 [4.10]
∅:D[4.140] → [4.140:174]
∅:D[4.140] → [4.140:174]
```
    F: future::Future<Item = ()>,
```
[4.140]
[4.174]
```
    F: future::Future<Item = ()> + 'static,
```

Insertion in src/xmpp.rs at line 129 [4.10]

[6.1222]

                info!("xmpp connected!");

Insertion in src/xmpp.rs at line 139 [4.10]

[6.1613]

                        info!("Got signal");

Insertion in src/xmpp.rs at line 145 [4.10]

[6.1879]

                        info!("Got cmd");

Replacement in src/xmpp.rs at line 159 [4.10]

∅:D[6.2523] → [6.2523:2573]

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

[6.2523]

[6.2573]

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

Insertion in src/xmpp.rs at line 161 [4.10]

[6.2623]

                        error!("Cmd error: {}", e);

Insertion in src/main.rs at line 7 [9.17]
[7.61]
[8.0]
```
extern crate minidom;
```
Insertion in Cargo.toml at line 19 [9.11995]
[8.269]
[7.2214]
```
minidom = "0.10"
```

Insertion in Cargo.lock at line 631 [9.12201]

[7.22421]

]
[[package]]
name = "minidom"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "quick-xml 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",

Insertion in Cargo.lock at line 866 [9.12201]

[7.30186]

source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "encoding_rs 0.8.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "quick-xml"
version = "0.13.1"

Insertion in Cargo.lock at line 1070 [9.12201]

[8.2078]

[7.35429]

 "minidom 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",

Insertion in Cargo.lock at line 1875 [9.12201]

[7.72552]

"checksum minidom 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "275024eea6c6ff4ace22f2750843831183785288eec1cff91a4e6b8898cf94f9"

Insertion in Cargo.lock at line 1903 [9.12201]

[7.76696]

"checksum quick-xml 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1b62a38216952bff95085ad664b772492288a96a25544f48d25e7200de1d7db7"