mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
5aa1940ef8
switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work
116 lines
2.8 KiB
Rust
116 lines
2.8 KiB
Rust
#![deny(unsafe_code)]
|
|
#![allow(clippy::option_map_unit_fn)]
|
|
#![deny(clippy::clone_on_ref_ptr)]
|
|
|
|
use common::{clock::Clock, comp};
|
|
use std::{
|
|
io,
|
|
net::ToSocketAddrs,
|
|
sync::{mpsc, Arc},
|
|
thread,
|
|
time::Duration,
|
|
};
|
|
use tokio::runtime::Runtime;
|
|
use tracing::{error, info};
|
|
use veloren_client::{Client, Event};
|
|
|
|
const TPS: u64 = 10; // Low value is okay, just reading messages.
|
|
|
|
fn read_input() -> String {
|
|
let mut buffer = String::new();
|
|
|
|
io::stdin()
|
|
.read_line(&mut buffer)
|
|
.expect("Failed to read input");
|
|
|
|
buffer.trim().to_string()
|
|
}
|
|
|
|
fn main() {
|
|
// Initialize logging.
|
|
tracing_subscriber::fmt::init();
|
|
|
|
info!("Starting chat-cli...");
|
|
|
|
// Set up an fps clock.
|
|
let mut clock = Clock::new(Duration::from_secs_f64(1.0 / TPS as f64));
|
|
|
|
println!("Enter your username");
|
|
let username = read_input();
|
|
|
|
println!("Enter the server address");
|
|
let server_addr = read_input();
|
|
|
|
println!("Enter your password");
|
|
let password = read_input();
|
|
|
|
let runtime = Arc::new(Runtime::new().unwrap());
|
|
|
|
// Create a client.
|
|
let mut client = Client::new(
|
|
server_addr
|
|
.to_socket_addrs()
|
|
.expect("Invalid server address")
|
|
.next()
|
|
.unwrap(),
|
|
None,
|
|
runtime,
|
|
)
|
|
.expect("Failed to create client instance");
|
|
|
|
println!("Server info: {:?}", client.server_info());
|
|
|
|
println!("Players online: {:?}", client.get_players());
|
|
|
|
client
|
|
.register(username, password, |provider| {
|
|
provider == "https://auth.veloren.net"
|
|
})
|
|
.unwrap();
|
|
|
|
let (tx, rx) = mpsc::channel();
|
|
thread::spawn(move || {
|
|
loop {
|
|
let msg = read_input();
|
|
tx.send(msg).unwrap();
|
|
}
|
|
});
|
|
|
|
loop {
|
|
for msg in rx.try_iter() {
|
|
client.send_chat(msg)
|
|
}
|
|
|
|
let events = match client.tick(comp::ControllerInputs::default(), clock.dt(), |_| {}) {
|
|
Ok(events) => events,
|
|
Err(err) => {
|
|
error!("Error: {:?}", err);
|
|
break;
|
|
},
|
|
};
|
|
|
|
const SHOW_NAME: bool = false;
|
|
for event in events {
|
|
match event {
|
|
Event::Chat(m) => println!("{}", client.format_message(&m, SHOW_NAME)),
|
|
Event::Disconnect => {}, // TODO
|
|
Event::DisconnectionNotification(time) => {
|
|
let message = match time {
|
|
0 => String::from("Goodbye!"),
|
|
_ => format!("Connection lost. Kicking in {} seconds", time),
|
|
};
|
|
|
|
println!("{}", message)
|
|
},
|
|
_ => {},
|
|
}
|
|
}
|
|
|
|
// Clean up the server after a tick.
|
|
client.cleanup();
|
|
|
|
// Wait for the next tick.
|
|
clock.tick();
|
|
}
|
|
}
|