HMC/handmade-revolt-backend
6
0
Fork 0
forked from jmug/stoatchat
Code Pull Requests Actions Packages Releases 2 Activity

fix msgpack encoding

Browse Source
This commit is contained in:
Zomatree
2021-09-05 22:01:58 +01:00
parent 5328c66cbb
commit 175d257e34
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@@ -2758,8 +2758,7 @@ dependencies = [
[[package]] [[package]]
name = "rmp" name = "rmp"
version = "0.8.10" version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/3Hren/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814#5bf2c24203ad422233cf35b7b7bfad9f7e811814"
checksum = "4f55e5fa1446c4d5dd1f5daeed2a4fe193071771a2636274d0d7a3b082aa7ad6"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"num-traits", "num-traits",
@@ -2768,8 +2767,7 @@ dependencies = [
[[package]] [[package]]
name = "rmp-serde" name = "rmp-serde"
version = "0.15.5" version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/3Hren/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814#5bf2c24203ad422233cf35b7b7bfad9f7e811814"
checksum = "723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"rmp", "rmp",

2
Cargo.toml
View File

@@ -36,7 +36,7 @@ base64 = "0.13.0"
serde_json = "1.0.57" serde_json = "1.0.57"
serde = { version = "1.0.115", features = ["derive"] } serde = { version = "1.0.115", features = ["derive"] }
validator = { version = "0.11", features = ["derive"] } validator = { version = "0.11", features = ["derive"] }
rmp-serde = "0.15.5" rmp-serde = { git = "https://github.com/3Hren/msgpack-rust", rev = "5bf2c24203ad422233cf35b7b7bfad9f7e811814" }
# async # async
futures = "0.3.8" futures = "0.3.8"

20
src/notifications/websocket.rs
View File

@@ -30,7 +30,7 @@ use super::{
}; };
type Tx = UnboundedSender<Message>; type Tx = UnboundedSender<Message>;
type PeerMap = Arc<Mutex<HashMap<SocketAddr, Tx>>>; type PeerMap = Arc<Mutex<HashMap<SocketAddr, (Tx, MSGFormat)>>>;
lazy_static! { lazy_static! {
static ref CONNECTIONS: PeerMap = Arc::new(Mutex::new(HashMap::new())); static ref CONNECTIONS: PeerMap = Arc::new(Mutex::new(HashMap::new()));
@@ -48,7 +48,7 @@ pub async fn launch_server() {
} }
} }
#[derive(Debug)] #[derive(Debug, Clone)]
enum MSGFormat { enum MSGFormat {
JSON, JSON,
MSGPACK MSGPACK
@@ -92,7 +92,7 @@ async fn accept(stream: TcpStream) {
let (write, read) = ws_stream.split(); let (write, read) = ws_stream.split();
let (tx, rx) = unbounded(); let (tx, rx) = unbounded();
CONNECTIONS.lock().unwrap().insert(addr, tx.clone()); CONNECTIONS.lock().unwrap().insert(addr, (tx.clone(), msg_format.clone()));
let send = |notification: ClientboundNotification| { let send = |notification: ClientboundNotification| {
let res = match msg_format { let res = match msg_format {
@@ -100,7 +100,7 @@ async fn accept(stream: TcpStream) {
Ok(s) => Message::Text(s), Ok(s) => Message::Text(s),
Err(_) => return Err(_) => return
} }
MSGFormat::MSGPACK => match rmp_serde::to_vec(&notification) { MSGFormat::MSGPACK => match rmp_serde::to_vec_named(&notification) {
Ok(v) => Message::Binary(v), Ok(v) => Message::Binary(v),
Err(_) => return Err(_) => return
} }
@@ -358,12 +358,18 @@ pub fn publish(ids: Vec<String>, notification: ClientboundNotification) {
} }
} }
let msg = Message::Text(serde_json::to_string(&notification).unwrap()); let json_msg = Message::Text(serde_json::to_string(&notification.clone()).unwrap());
let msgpack_msg = Message::Binary(rmp_serde::to_vec_named(&notification).unwrap());
let connections = CONNECTIONS.lock().unwrap(); let connections = CONNECTIONS.lock().unwrap();
for target in targets { for target in targets {
if let Some(conn) = connections.get(&target) { if let Some((conn, msg_format)) = connections.get(&target) {
if let Err(_) = conn.unbounded_send(msg.clone()) { let msg = match msg_format {
MSGFormat::JSON => json_msg.clone(),
MSGFormat::MSGPACK => msgpack_msg.clone()
};
if let Err(_) = conn.unbounded_send(msg) {
debug!("Failed unbounded_send."); debug!("Failed unbounded_send.");
} }
} }