Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: Error Adapter #40

Merged
merged 9 commits into from
Jun 30, 2023
Merged

Feature: Error Adapter #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
321ffef
feat: custom error in adapter and `Infallible` for `LocalAdapter`
Totodore Jun 27, 2023
42c313d
ft: adapter error
Totodore Jun 30, 2023
b493c99
Merge branch 'main' into ft-error-adapter
Totodore Jun 30, 2023
5964233
Fixing some error issues for the Adapter errors
Totodore Jun 30, 2023
9bc4f1c
Make corresponding example match the new adapter errors
Totodore Jun 30, 2023
d693dee
chore: cargo.lock
Totodore Jun 30, 2023
50d58ab
fix(clippy): From prefered rather than Into
Totodore Jun 30, 2023
e04c494
fix(clippy): unhandled error
Totodore Jun 30, 2023
b3b66f7
fix: Send bound on Error + doc test
Totodore Jun 30, 2023
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
15 changes: 12 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions examples/src/chat/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub async fn handler(socket: Arc<Socket<LocalAdapter>>) {
info!("Nickname: {:?}", data.nickname);
socket.extensions.insert(data.nickname);
socket.emit("message", "Welcome to the chat!").ok();
socket.join("default");
socket.join("default").unwrap();
} else {
info!("No nickname provided, disconnecting...");
socket.disconnect().ok();
Expand All @@ -30,8 +30,8 @@ pub async fn handler(socket: Arc<Socket<LocalAdapter>>) {
|socket, (room, message): (String, String), _, _| async move {
let Nickname(ref nickname) = *socket.extensions.get().unwrap();
info!("transfering message from {nickname} to {room}: {message}");
info!("Sockets in room: {:?}", socket.local().sockets());
if let Some(dest) = socket.to("default").sockets().iter().find(|s| {
info!("Sockets in room: {:?}", socket.local().sockets().unwrap());
if let Some(dest) = socket.to("default").sockets().unwrap().iter().find(|s| {
s.extensions
.get::<Nickname>()
.map(|n| n.0 == room)
Expand All @@ -51,12 +51,12 @@ pub async fn handler(socket: Arc<Socket<LocalAdapter>>) {

socket.on("join", |socket, room: String, _, _| async move {
info!("Joining room {}", room);
socket.join(room);
socket.join(room).unwrap();
});

socket.on("leave", |socket, room: String, _, _| async move {
info!("Leaving room {}", room);
socket.leave(room);
socket.leave(room).unwrap();
});

socket.on("list", |socket, room: Option<String>, _, _| async move {
Expand All @@ -65,14 +65,15 @@ pub async fn handler(socket: Arc<Socket<LocalAdapter>>) {
let sockets = socket
.within(room)
.sockets()
.unwrap()
.iter()
.filter_map(|s| s.extensions.get::<Nickname>())
.fold("".to_string(), |a, b| a + &b.0 + ", ")
.trim_end_matches(", ")
.to_string();
socket.emit("message", sockets).ok();
} else {
let rooms = socket.rooms();
let rooms = socket.rooms().unwrap();
info!("Listing rooms: {:?}", &rooms);
socket.emit("message", rooms).ok();
}
Expand Down
Loading