Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# .env
RUST_LOG=info
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@ Cargo.lock

# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb


# Added by cargo

/target
7 changes: 7 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[workspace]
members = ["server", "client"]

[profile.release]
lto = true
codegen-units = 1
panic = "abort"
17 changes: 17 additions & 0 deletions client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[package]
name = "client"
version = "0.1.0"
edition = "2024"

[dependencies]
tokio = { version = "1.0", features = ["full"] }
tokio-tungstenite = "0.20"
url = "2.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
futures-util = "0.3"
uuid = { version = "1.0", features = ["v4"] }
chrono = "0.4"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
dotenv = "0.15"
146 changes: 146 additions & 0 deletions client/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
use std::env;
use std::io::Write;
use std::sync::Arc;
use tokio::sync::Mutex;
use tracing_subscriber::EnvFilter;

use chrono::TimeZone;
use futures_util::{SinkExt, StreamExt};
use tokio::io::{AsyncBufReadExt, BufReader, stdin};
use tokio_tungstenite::{connect_async, tungstenite::Message as WsMessage};
use url::Url;

mod shared_types;
use shared_types::*;

#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
dotenv::dotenv().ok();
tracing_subscriber::fmt()
.with_env_filter(EnvFilter::from_default_env())
.init();

let args: Vec<String> = env::args().collect();
if args.len() != 4 {
eprintln!("Usage: {} <host> <port> <username>", args[0]);
return Ok(());
}

let host = &args[1];
let port = &args[2];
let username = &args[3];

let url = Url::parse(&format!("ws://{}:{}/", host, port))?;
let (ws_stream, _) = connect_async(url).await?;

let (write_half, read_half) = ws_stream.split();
let shared_write = Arc::new(Mutex::new(write_half));
let shared_write_for_read_task = shared_write.clone();

// Send join message
let join_msg = ClientMessage::Join {
username: username.to_string(),
};
let json = serde_json::to_string(&join_msg)?;
{
let mut write_guard = shared_write.lock().await;
write_guard.send(WsMessage::Text(json)).await?;
}

// Spawn task to handle incoming messages
let read_handle = tokio::spawn(async move {
let mut read = read_half;

while let Some(msg) = read.next().await {
match msg {
Ok(WsMessage::Text(text)) => {
match serde_json::from_str::<ServerMessage>(&text) {
Ok(ServerMessage::Welcome { username: _ }) => {
println!("✅ Welcome to the chat!");
println!("➡️ Type 'send <message>' to chat or 'leave' to exit.");
}
Ok(ServerMessage::Joined { username }) => {
println!("📥 {} joined the chat", username);
}
Ok(ServerMessage::Left { username }) => {
println!("📤 {} left the chat", username);
}
Ok(ServerMessage::NewMessage(msg)) => {
let ts = chrono::Local
.timestamp_opt((msg.timestamp / 1000) as i64, 0)
.single()
.unwrap_or_else(|| chrono::Local::now())
.format("%H:%M:%S");
println!("[{}] [{}] {}", ts, msg.sender, msg.content);

// Send ACK
let ack = ClientMessage::AckReceived {
message_id: msg.id.clone(),
intended_recipient: msg.sender.clone(),
};
if let Ok(ack_json) = serde_json::to_string(&ack) {
let mut write_guard = shared_write_for_read_task.lock().await;
let _ = write_guard.send(WsMessage::Text(ack_json)).await;
}
}
Ok(ServerMessage::DeliveryReceipt {
message_id,
received_by,
}) => {
println!("✅ Message {} delivered to {}", message_id, received_by);
}
Ok(ServerMessage::Error { message }) => {
eprintln!("Error: {}", message);
}
Err(_) => {}
}
}
Ok(WsMessage::Close(_)) | Err(_) => {
println!("Disconnected from server.");
break;
}
_ => {}
}
}
});

// Handle user input
let stdin = stdin();
let mut lines = BufReader::new(stdin).lines();

loop {
print!("> ");
std::io::stdout().flush().unwrap();

match lines.next_line().await {
Ok(Some(line)) => {
let line = line.trim();
if line == "leave" {
let leave_msg = ClientMessage::Leave;
let json = serde_json::to_string(&leave_msg)?;
{
let mut write_guard = shared_write.lock().await;
let _ = write_guard.send(WsMessage::Text(json)).await;
}
println!("Goodbye!");
break;
} else if line.starts_with("send ") {
let content = line[5..].to_string();
let msg = ClientMessage::SendMessage { content };
let json = serde_json::to_string(&msg)?;
{
let mut write_guard = shared_write.lock().await;
let _ = write_guard.send(WsMessage::Text(json)).await;
}
} else {
println!("Unknown command. Use 'send <message>' or 'leave'");
}
}
Err(_) => break,
_ => break,
}
}

let _ = read_handle.await;
Ok(())
}
47 changes: 47 additions & 0 deletions client/src/shared_types.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
use serde::{Deserialize, Serialize};
use uuid::Uuid;

#[derive(Debug, Serialize, Deserialize, Clone)]
pub enum ClientMessage {
Join {
username: String,
},
Leave,
SendMessage {
content: String,
},
AckReceived {
message_id: String,
intended_recipient: String, // 👈 NEW: who sent the original message
},
}

#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct ChatMessage {
pub id: String,
pub sender: String,
pub content: String,
pub timestamp: u64,
pub delivered_to: Vec<String>,
}

#[derive(Debug, Serialize, Deserialize)]
pub enum ServerMessage {
Welcome {
username: String,
},
Joined {
username: String,
},
Left {
username: String,
},
NewMessage(ChatMessage),
DeliveryReceipt {
message_id: String,
received_by: String,
},
Error {
message: String,
},
}
Binary file added recording_client.webm
Binary file not shown.
18 changes: 18 additions & 0 deletions server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[package]
name = "server"
version = "0.1.0"
edition = "2024"

[dependencies]
tokio = { version = "1.0", features = ["full"] }
tokio-tungstenite = "0.20"
tungstenite = "0.20"
sled = "0.34"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
futures-util = "0.3"
uuid = { version = "1.0", features = ["v4"] }
chrono = "0.4"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
dotenv = "0.15"
Loading