|
|
@ -1,10 +1,10 @@
|
|
|
|
use std::sync::{Arc, Mutex};
|
|
|
|
|
|
|
|
use std::net::{TcpListener, TcpStream};
|
|
|
|
|
|
|
|
use std::thread;
|
|
|
|
|
|
|
|
use clap::Parser;
|
|
|
|
use clap::Parser;
|
|
|
|
|
|
|
|
use std::fs::File;
|
|
|
|
use std::io::Write;
|
|
|
|
use std::io::Write;
|
|
|
|
use std::io::{self, BufRead};
|
|
|
|
use std::io::{self, BufRead};
|
|
|
|
use std::fs::File;
|
|
|
|
use std::net::{TcpListener, TcpStream};
|
|
|
|
|
|
|
|
use std::sync::{Arc, Mutex};
|
|
|
|
|
|
|
|
use std::thread;
|
|
|
|
|
|
|
|
|
|
|
|
mod chat_error;
|
|
|
|
mod chat_error;
|
|
|
|
use chat_error::ChatError;
|
|
|
|
use chat_error::ChatError;
|
|
|
@ -17,8 +17,11 @@ use chat_server::ChatServer;
|
|
|
|
mod config;
|
|
|
|
mod config;
|
|
|
|
use config::ConfigArgs;
|
|
|
|
use config::ConfigArgs;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn handle_client(
|
|
|
|
fn handle_client(mut stream: TcpStream, server: Arc<Mutex<ChatServer>>, client_id: &mut Option<u64>) -> Result<(), ChatError> {
|
|
|
|
mut stream: TcpStream,
|
|
|
|
|
|
|
|
server: Arc<Mutex<ChatServer>>,
|
|
|
|
|
|
|
|
client_id: &mut Option<u64>,
|
|
|
|
|
|
|
|
) -> Result<(), ChatError> {
|
|
|
|
let mut writer = stream.try_clone()?;
|
|
|
|
let mut writer = stream.try_clone()?;
|
|
|
|
let reader = io::BufReader::new(&mut stream);
|
|
|
|
let reader = io::BufReader::new(&mut stream);
|
|
|
|
let mut lines = reader.lines();
|
|
|
|
let mut lines = reader.lines();
|
|
|
@ -27,20 +30,33 @@ fn handle_client(mut stream: TcpStream, server: Arc<Mutex<ChatServer>>, client_i
|
|
|
|
write!(writer, "Hello and welcome to RustChat!\nNick: ")?;
|
|
|
|
write!(writer, "Hello and welcome to RustChat!\nNick: ")?;
|
|
|
|
let mut nick;
|
|
|
|
let mut nick;
|
|
|
|
loop {
|
|
|
|
loop {
|
|
|
|
nick = lines.next().ok_or(ChatError::Protocol(String::from("Could not recv nickname")))??;
|
|
|
|
nick = lines
|
|
|
|
|
|
|
|
.next()
|
|
|
|
|
|
|
|
.ok_or(ChatError::Protocol(String::from("Could not recv nickname")))??;
|
|
|
|
// check for nick name uniqueness
|
|
|
|
// check for nick name uniqueness
|
|
|
|
let mut srv = server.lock()?;
|
|
|
|
let mut srv = server.lock()?;
|
|
|
|
if !srv.is_nick_in_use(&nick) {
|
|
|
|
if !srv.is_nick_in_use(&nick) {
|
|
|
|
// print joined msg and register at server
|
|
|
|
// print joined msg and register at server
|
|
|
|
srv.send_to_all(&format!("* {} has joined the chat", nick))?;
|
|
|
|
srv.send_to_all(&format!("* {} has joined the chat", nick))?;
|
|
|
|
let curr_users = srv.get_user_count();
|
|
|
|
let curr_users = srv.get_user_count();
|
|
|
|
let users_in_room_msg = if curr_users == 1 { String::from("is 1 user") } else { format!("are {} users", curr_users) };
|
|
|
|
let users_in_room_msg = if curr_users == 1 {
|
|
|
|
write!(writer, " *** {}\n *** You are known as {}. There {} in the room.\n", srv.config.greeting_msg, nick, users_in_room_msg)?;
|
|
|
|
String::from("is 1 user")
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
format!("are {} users", curr_users)
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
write!(
|
|
|
|
|
|
|
|
writer,
|
|
|
|
|
|
|
|
" *** {}\n *** You are known as {}. There {} in the room.\n",
|
|
|
|
|
|
|
|
srv.config.greeting_msg, nick, users_in_room_msg
|
|
|
|
|
|
|
|
)?;
|
|
|
|
*client_id = Some(srv.register(nick.clone(), writer));
|
|
|
|
*client_id = Some(srv.register(nick.clone(), writer));
|
|
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
write!(writer, "This nickname is already in use, please choose another.\nNick: ")?;
|
|
|
|
write!(
|
|
|
|
|
|
|
|
writer,
|
|
|
|
|
|
|
|
"This nickname is already in use, please choose another.\nNick: "
|
|
|
|
|
|
|
|
)?;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// read lines
|
|
|
|
// read lines
|
|
|
@ -55,7 +71,6 @@ fn handle_client(mut stream: TcpStream, server: Arc<Mutex<ChatServer>>, client_i
|
|
|
|
Ok(())
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn run_thread(stream: TcpStream, server: Arc<Mutex<ChatServer>>) {
|
|
|
|
fn run_thread(stream: TcpStream, server: Arc<Mutex<ChatServer>>) {
|
|
|
|
let mut client_id = None;
|
|
|
|
let mut client_id = None;
|
|
|
|
let quit_reason = match handle_client(stream, Arc::clone(&server), &mut client_id) {
|
|
|
|
let quit_reason = match handle_client(stream, Arc::clone(&server), &mut client_id) {
|
|
|
@ -65,7 +80,10 @@ fn run_thread(stream: TcpStream, server: Arc<Mutex<ChatServer>>) {
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(client_id) = client_id {
|
|
|
|
if let Some(client_id) = client_id {
|
|
|
|
let mut srv = server.lock().unwrap();
|
|
|
|
let mut srv = server.lock().unwrap();
|
|
|
|
let name = srv.deregister(client_id).map(|client| client.name).unwrap_or("<unknown user>".into());
|
|
|
|
let name = srv
|
|
|
|
|
|
|
|
.deregister(client_id)
|
|
|
|
|
|
|
|
.map(|client| client.name)
|
|
|
|
|
|
|
|
.unwrap_or("<unknown user>".into());
|
|
|
|
let quit_msg = format!("* {} has left the chat ({})", name, quit_reason);
|
|
|
|
let quit_msg = format!("* {} has left the chat ({})", name, quit_reason);
|
|
|
|
println!("{}", quit_msg);
|
|
|
|
println!("{}", quit_msg);
|
|
|
|
srv.send_to_all(&quit_msg).unwrap();
|
|
|
|
srv.send_to_all(&quit_msg).unwrap();
|
|
|
@ -74,7 +92,6 @@ fn run_thread(stream: TcpStream, server: Arc<Mutex<ChatServer>>) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// Chatserver in RUST!
|
|
|
|
/// Chatserver in RUST!
|
|
|
|
#[derive(Parser, Debug)]
|
|
|
|
#[derive(Parser, Debug)]
|
|
|
|
#[clap(about, version, author)]
|
|
|
|
#[clap(about, version, author)]
|
|
|
@ -98,7 +115,8 @@ fn main() -> std::io::Result<()> {
|
|
|
|
|
|
|
|
|
|
|
|
// read config file
|
|
|
|
// read config file
|
|
|
|
let config_reader = File::open(args.config).expect("Could not open config file");
|
|
|
|
let config_reader = File::open(args.config).expect("Could not open config file");
|
|
|
|
let mut config: ConfigArgs = serde_yaml::from_reader(&config_reader).expect("Could not parse config file");
|
|
|
|
let mut config: ConfigArgs =
|
|
|
|
|
|
|
|
serde_yaml::from_reader(&config_reader).expect("Could not parse config file");
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(host) = args.host {
|
|
|
|
if let Some(host) = args.host {
|
|
|
|
config.host = host;
|
|
|
|
config.host = host;
|
|
|
@ -116,7 +134,9 @@ fn main() -> std::io::Result<()> {
|
|
|
|
for stream in listener.incoming() {
|
|
|
|
for stream in listener.incoming() {
|
|
|
|
if let Ok(stream) = stream {
|
|
|
|
if let Ok(stream) = stream {
|
|
|
|
let server_clone = Arc::clone(&server);
|
|
|
|
let server_clone = Arc::clone(&server);
|
|
|
|
thread::spawn(move || { run_thread(stream, server_clone); });
|
|
|
|
thread::spawn(move || {
|
|
|
|
|
|
|
|
run_thread(stream, server_clone);
|
|
|
|
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
Ok(())
|
|
|
|