Starting a move towards ezsockets

This commit is contained in:
Dave Hrycyszyn
2024-06-06 19:25:54 +01:00
parent bc2307f085
commit ff9fbd49ec
6 changed files with 494 additions and 381 deletions

View File

@@ -6,4 +6,8 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
simple-websockets = "0.1.6"
async-trait = "0.1.52"
ezsockets = { version = "*", features = ["tungstenite"] }
tokio = { version = "1.17.0", features = ["full"] }
tracing = "0.1.32"
tracing-subscriber = "0.3.9"

View File

@@ -1,34 +1,197 @@
use simple_websockets::{Event, Responder};
use async_trait::async_trait;
use ezsockets::CloseFrame;
use ezsockets::Error;
use ezsockets::Server;
use std::collections::HashMap;
use std::net::SocketAddr;
fn main() {
let event_hub = simple_websockets::launch(8080).expect("failed to listen on port 8080");
let mut clients: HashMap<u64, Responder> = HashMap::new();
println!("Listening for websocket connection...");
loop {
match event_hub.poll_event() {
Event::Connect(client_id, responder) => {
println!("A client connected with id #{}", client_id);
// add their Responder to our `clients` map:
clients.insert(client_id, responder);
}
Event::Disconnect(client_id) => {
println!("Client #{} disconnected.", client_id);
// remove the disconnected client from the clients map:
clients.remove(&client_id);
}
Event::Message(client_id, message) => {
println!("\nReceived a message from client #{}", client_id);
const DEFAULT_ROOM: &str = "main";
let all_clients = clients.keys().collect::<Vec<_>>();
for client in all_clients {
if *client != client_id {
println!("Sending message to client #{}", client);
let responder = clients.get(client).unwrap();
responder.send(message.clone());
}
type SessionID = u8;
type Session = ezsockets::Session<SessionID, ()>;
#[derive(Debug)]
enum Message {
Join {
id: SessionID,
room: String,
},
Send {
from: SessionID,
room: String,
text: String,
},
}
struct ChatServer {
sessions: HashMap<SessionID, Session>,
rooms: HashMap<String, Vec<SessionID>>,
handle: Server<Self>,
}
#[async_trait]
impl ezsockets::ServerExt for ChatServer {
type Call = Message;
type Session = SessionActor;
async fn on_connect(
&mut self,
socket: ezsockets::Socket,
_request: ezsockets::Request,
_address: SocketAddr,
) -> Result<Session, Option<CloseFrame>> {
let id = (0..).find(|i| !self.sessions.contains_key(i)).unwrap_or(0);
let session = Session::create(
|session_handle| SessionActor {
id,
server: self.handle.clone(),
session: session_handle,
room: DEFAULT_ROOM.to_string(),
},
id,
socket,
);
self.sessions.insert(id, session.clone());
self.rooms.get_mut(DEFAULT_ROOM).unwrap().push(id);
Ok(session)
}
async fn on_disconnect(
&mut self,
id: <Self::Session as ezsockets::SessionExt>::ID,
_reason: Result<Option<CloseFrame>, Error>,
) -> Result<(), Error> {
assert!(self.sessions.remove(&id).is_some());
let (ids, n) = self
.rooms
.values_mut()
.find_map(|ids| ids.iter().position(|v| id == *v).map(|n| (ids, n)))
.expect("could not find session in any room");
ids.remove(n);
Ok(())
}
async fn on_call(&mut self, call: Self::Call) -> Result<(), Error> {
match call {
Message::Send { from, room, text } => {
let (ids, sessions): (Vec<SessionID>, Vec<&Session>) = self
.rooms
.get(&room)
.unwrap()
.iter()
.filter(|id| **id != from)
.map(|id| (id, self.sessions.get(id).unwrap()))
.unzip();
tracing::info!(
"sending {text} to [{sessions}] at `{room}`",
sessions = ids
.iter()
.map(|id| id.to_string())
.collect::<Vec<_>>()
.join(",")
);
for session in sessions {
session.text(text.clone()).unwrap();
}
}
}
Message::Join { id, room } => {
let (ids, n) = self
.rooms
.values_mut()
.find_map(|ids| ids.iter().position(|v| id == *v).map(|n| (ids, n)))
.expect("could not find session in any room");
ids.remove(n);
if let Some(ids) = self.rooms.get_mut(&room) {
ids.push(id);
} else {
self.rooms.insert(room.clone(), vec![id]);
}
let sessions = self
.rooms
.get(&room)
.unwrap()
.iter()
.map(|id| self.sessions.get(id).unwrap());
for session in sessions {
session
.text(format!("User with ID: {id} just joined {room} room"))
.unwrap();
}
}
};
Ok(())
}
}
struct SessionActor {
id: SessionID,
server: Server<ChatServer>,
session: Session,
room: String,
}
#[async_trait]
impl ezsockets::SessionExt for SessionActor {
type ID = SessionID;
type Call = ();
fn id(&self) -> &Self::ID {
&self.id
}
async fn on_text(&mut self, text: String) -> Result<(), Error> {
tracing::info!("received: {text}");
if text.starts_with('/') {
let mut args = text.split_whitespace();
let command = args.next().unwrap();
if command == "/join" {
let room = args.next().expect("missing <room> argument").to_string();
tracing::info!("moving {} to {room}", self.id);
self.room = room.clone();
self.server
.call(Message::Join { id: self.id, room })
.unwrap();
} else {
tracing::error!("unrecognized command: {text}");
}
} else {
self.server
.call(Message::Send {
text,
from: self.id,
room: self.room.clone(),
})
.unwrap();
}
Ok(())
}
async fn on_binary(&mut self, bytes: Vec<u8>) -> Result<(), Error> {
// echo bytes back (we use this for a hacky ping/pong protocol for the wasm client demo)
tracing::info!("echoing bytes: {bytes:?}");
self.session.binary("pong".as_bytes())?;
Ok(())
}
async fn on_call(&mut self, call: Self::Call) -> Result<(), Error> {
let () = call;
Ok(())
}
}
#[tokio::main]
async fn main() {
tracing_subscriber::fmt::init();
let (server, _) = Server::create(|handle| ChatServer {
sessions: HashMap::new(),
rooms: HashMap::from_iter([(DEFAULT_ROOM.to_string(), vec![])]),
handle,
});
ezsockets::tungstenite::run(server, "127.0.0.1:8080")
.await
.unwrap();
}