feat: use bitcode in production mode

TomBANCHEREAU · Nov 5, 2023 · d274894 · d274894
1 parent cb93c18
commit d274894
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -31,6 +31,7 @@ serde_json = "1.0.96"
 serde = "1.0.171"
 yew-websocket = "1.0.1"
 futures-util = { version = "0.3.28", features = ["sink"] }
+bitcode = { version = "0.5.0", features = ["serde"] }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.13"

diff --git a/client/src/utils/socket.rs b/client/src/utils/socket.rs
@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use gloo::{events::EventListener, utils::window};
 use serde::{de::DeserializeOwned, Serialize};
 use wasm_bindgen::JsCast;
-use web_sys::{Event, MessageEvent, WebSocket};
+use web_sys::{BinaryType, Event, MessageEvent, WebSocket};
 use yew::Callback;
 
 pub struct Socket<In: Serialize, Out: DeserializeOwned> {
@@ -19,11 +19,18 @@ impl<In: Serialize + 'static, Out: DeserializeOwned + 'static> Socket<In, Out> {
         url.set_protocol(url.protocol().replace("http", "ws").as_str());
         url.set_pathname(pathname);
         let socket = WebSocket::new(url.href().as_str()).unwrap();
+        socket.set_binary_type(BinaryType::Arraybuffer);
         let listener = EventListener::new(&socket, "message", move |event: &Event| {
             let event = event.dyn_ref::<MessageEvent>().unwrap();
+            #[cfg(debug_assertions)]
             callback.emit(
                 serde_json::from_str::<Out>(event.data().as_string().unwrap().as_str()).unwrap(),
-            )
+            );
+            #[cfg(not(debug_assertions))]
+            callback.emit(
+                bitcode::deserialize::<Out>(Uint8Array::new(&event.data()).to_vec().as_ref())
+                    .unwrap(),
+            );
         });
 
         Self {
@@ -34,8 +41,13 @@ impl<In: Serialize + 'static, Out: DeserializeOwned + 'static> Socket<In, Out> {
         }
     }
     pub fn send(&mut self, payload: In) {
+        #[cfg(debug_assertions)]
         self.socket
             .send_with_str(serde_json::to_string(&payload).unwrap().as_str())
             .unwrap();
+        #[cfg(not(debug_assertions))]
+        self.socket
+            .send_with_u8_array(bitcode::serialize(&payload).unwrap().as_ref())
+            .unwrap();
     }
 }
diff --git a/server/Cargo.toml b/server/Cargo.toml
@@ -22,3 +22,4 @@ actix = "0.13.0"
 core = { path = "../core", features=["server"] }
 model = { path = "../model" }
 nanoid = "0.4.0"
+bitcode = { version = "0.5.0", features = ["serde"] }
diff --git a/server/src/lobby.rs b/server/src/lobby.rs
@@ -28,20 +28,32 @@ impl Actor for WsActor {
 impl Handler<GenericServerMessageWrapper> for WsActor {
     type Result = ();
     fn handle(&mut self, item: GenericServerMessageWrapper, ctx: &mut Self::Context) {
+        #[cfg(debug_assertions)]
         ctx.text(serde_json::to_string(&item.0).unwrap());
+
+        #[cfg(not(debug_assertions))]
+        ctx.binary(bitcode::serialize(&item.0).unwrap());
     }
 }
 
 impl StreamHandler<Result<ws::Message, ws::ProtocolError>> for WsActor {
     fn handle(&mut self, msg: Result<ws::Message, ws::ProtocolError>, _: &mut Self::Context) {
         // let Ok(msg) = msg else { return };
         match msg.unwrap() {
-            ws::Message::Text(text) => self
-                .lobby
-                .lock()
-                .unwrap()
-                .handle_message(serde_json::from_str(text.to_string().as_str()).unwrap()),
-            ws::Message::Binary(_) => todo!(),
+            ws::Message::Text(text) => {
+                #[cfg(debug_assertions)]
+                self.lobby
+                    .lock()
+                    .unwrap()
+                    .handle_message(serde_json::from_str(text.to_string().as_str()).unwrap());
+            }
+            ws::Message::Binary(binary) => {
+                #[cfg(not(debug_assertions))]
+                self.lobby
+                    .lock()
+                    .unwrap()
+                    .handle_message(bitcode::deserialize(binary.as_ref()).unwrap());
+            }
             ws::Message::Continuation(_) => todo!(),
             ws::Message::Ping(_) => todo!(),
             ws::Message::Pong(_) => todo!(),