Browse Source

Upgrade deps, specifically tokio-xmpp 3.0.0

master
Travis Burtrum 9 months ago
parent
commit
d12a548793
3 changed files with 832 additions and 1083 deletions
  1. +813
    -1041
      Cargo.lock
  2. +9
    -10
      Cargo.toml
  3. +10
    -32
      src/main.rs

+ 813
- 1041
Cargo.lock
File diff suppressed because it is too large
View File


+ 9
- 10
Cargo.toml View File

@ -15,14 +15,13 @@ edition = "2018"
exclude = [ ".gitignore" ]
[dependencies]
toml = "0.4.10"
serde_derive = "1.0.85"
serde = "1.0.85"
gumdrop = "0.5.0"
gumdrop_derive = "0.5.0"
dirs = "1.0.4"
tokio-xmpp = "1.0.1"
futures = "0.1"
tokio = "0.1"
xmpp-parsers = "0.15"
toml = "0.5"
serde_derive = "1.0"
serde = { version = "1.0", features = ["derive"] }
gumdrop = "0.8.0"
gumdrop_derive = "0.8.0"
dirs = "3.0.1"
tokio-xmpp = "3.0.0"
tokio = { version = "1", features = ["net", "rt", "rt-multi-thread", "macros"] }
xmpp-parsers = "0.18"
die = "0.2.0"

+ 10
- 32
src/main.rs View File

@ -8,10 +8,7 @@ use die::{die, Die};
use gumdrop::Options;
use serde_derive::Deserialize;
use futures::{future, Sink, Stream};
use tokio::runtime::current_thread::Runtime;
use tokio_xmpp::xmpp_codec::Packet;
use tokio_xmpp::Client;
use tokio_xmpp::SimpleClient as Client;
use xmpp_parsers::message::{Body, Message};
use xmpp_parsers::{Element, Jid};
@ -57,7 +54,8 @@ struct MyOptions {
attempt_pgp: bool,
}
fn main() {
#[tokio::main]
async fn main() {
let args: Vec<String> = args().collect();
// Remember to skip the first argument. That's the program name.
@ -109,36 +107,16 @@ fn main() {
.die("error reading from stdin");
let data = data.trim();
// tokio_core context
let mut rt = Runtime::new().die("unknown error");
// Client instance
let client = Client::new(&cfg.jid, &cfg.password).die("could not connect to xmpp server");
// Make the two interfaces for sending and receiving independent
// of each other so we can move one into a closure.
let (sink, stream) = client.split();
let mut sink_state = Some(sink);
// Main loop, processes events
let done = stream.for_each(move |event| {
if event.is_online() {
let mut sink = sink_state.take().die("unknown error");
for recipient in recipients {
let reply = make_reply(recipient.clone(), &data);
sink.start_send(Packet::Stanza(reply)).die("send failed");
}
sink.start_send(Packet::StreamEnd)
.die("send stream end failed");
}
let mut client = Client::new(&cfg.jid, &cfg.password).await.die("could not connect to xmpp server");
Box::new(future::ok(()))
});
for recipient in recipients {
let reply = make_reply(recipient.clone(), &data);
client.send_stanza(reply).await.unwrap();
}
// Start polling `done`
match rt.block_on(done) {
Ok(_) => (),
Err(e) => die!("Fatal: {}", e),
};
// Close client connection
client.end().await.ok(); // ignore errors here, I guess
}
// Construct a chat <message/>


Loading…
Cancel
Save