Skip to content

Commit

Permalink
Add error payload
Browse files Browse the repository at this point in the history
  • Loading branch information
de-luca committed Nov 30, 2021
1 parent 0b7e748 commit e8bf895
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use crate::room::Room;

use futures_channel::mpsc::UnboundedSender;
use log::info;
use response::{Error, Payload, Signal};
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
use tokio_tungstenite::tungstenite::Message;
Expand Down Expand Up @@ -85,7 +86,7 @@ impl Handler {
.get(&peer_id)
.unwrap()
.unbounded_send(Message::Text(
serde_json::to_string(&response::Payload::Created(room.id.to_owned())).unwrap(),
serde_json::to_string(&Payload::Created(room.id.to_owned())).unwrap(),
))
.unwrap();
}
Expand All @@ -99,12 +100,13 @@ impl Handler {

match room {
None => tx
.unbounded_send(Message::Text("NOT A ROOM".into()))
.unbounded_send(Message::Text(
serde_json::to_string(&Payload::Error(Error::RoomDoesNotExists)).unwrap(),
))
.unwrap(),
Some(room) => {
tx.unbounded_send(Message::Text(
serde_json::to_string(&response::Payload::Joined(room.to_owned().peers))
.unwrap(),
serde_json::to_string(&Payload::Joined(room.to_owned().peers)).unwrap(),
))
.unwrap();
room.add_peer(peer_id);
Expand All @@ -119,7 +121,7 @@ impl Handler {
.get(&params.peer_id)
.unwrap()
.unbounded_send(Message::Text(
serde_json::to_string(&response::Payload::Signal(response::Signal {
serde_json::to_string(&Payload::Signal(Signal {
peer_id,
data: params.data.to_owned(),
}))
Expand Down
7 changes: 7 additions & 0 deletions src/response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ pub enum Payload {
Created(Uuid),
Joined(HashSet<Uuid>),
Signal(Signal),
Error(Error),
}

#[derive(Serialize, Debug)]
Expand All @@ -17,3 +18,9 @@ pub struct Signal {
pub peer_id: Uuid,
pub data: serde_json::Value,
}

#[derive(Serialize, Debug)]
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
pub enum Error {
RoomDoesNotExists,
}

0 comments on commit e8bf895

Please sign in to comment.