Add: Network compression (Attempts to fix stutter when sharing the radar)

Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "abi_stable"
@@ -1886,12 +1886,14 @@ dependencies = [
  "clap",
  "dataview 1.0.1",
  "enum-primitive-derive",
+ "flate2",
  "itertools 0.13.0",
  "local-ip-address",
  "log",
  "memflow",
  "memflow-native",
  "num-traits",
+ "rand",
  "reqwest",
  "serde",
  "serde_json",

Cargo.toml

@@ -38,6 +38,8 @@ local-ip-address = "0.6.3"
 # other
 itertools = "0.13.0"
 
+flate2 = "1.0"
+rand = "0.8"
 
 [build-dependencies]
 reqwest = { version = "0.12.9", features = ["blocking"] }

src/comms.rs

@@ -58,6 +58,14 @@ impl PlayerData {
             money
         }
     }
+
+    pub fn get_pos(&self) -> &Vec3 {
+        &self.pos
+    }
+
+    pub fn get_player_name(&self) -> &str {
+        &self.player_name
+    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -174,6 +182,14 @@ impl RadarData {
             money_reveal_enabled: false
         }
     }
+
+    pub fn get_entities(&self) -> &Vec<EntityData> {
+        &self.player_data
+    }
+
+    pub fn set_entities(&mut self, entities: Vec<EntityData>) {
+        self.player_data = entities;
+    }
 }
 
 unsafe impl Send for RadarData {}

src/websocket.rs

@@ -1,12 +1,12 @@
 use std::{sync::Arc, path::PathBuf};
-
 use axum::{
     extract::{ws::{WebSocketUpgrade, WebSocket, Message}, State},
     response::Response,
     routing::get,
     Router,
 };
-
+use flate2::{write::GzEncoder, Compression};
+use std::io::Write;
 use tokio::sync::RwLock;
 use tower_http::services::ServeDir;
 
@@ -23,25 +23,37 @@ async fn ws_handler(ws: WebSocketUpgrade, State(state): State<AppState>) -> Resp
 }
 
 async fn handle_socket(mut socket: WebSocket, state: AppState) {
+    let mut compression_buffer: Vec<u8> = Vec::with_capacity(65536);
+
     while let Some(msg) = socket.recv().await {
         if let Ok(msg) = msg {
             if let Ok(text) = msg.to_text() {
                 if text == "requestInfo" {
-                    let str = {
+                    let radar_data = state.data_lock.read().await;
-                        let data = state.data_lock.read().await;
 
-                        match serde_json::to_string(&*data) {
+                    if let Ok(json) = serde_json::to_string(&*radar_data) {
-                            Ok(json) => json,
+                        compression_buffer.clear();
-                            Err(e) => {
+
-                                log::error!("Could not serialize data into json: {}", e.to_string());
+                        let mut encoder = GzEncoder::new(Vec::new(), Compression::fast());
-                                log::error!("Sending \"error\" instead");
+                        if encoder.write_all(json.as_bytes()).is_ok() {
-                                "error".to_string()
+                            match encoder.finish() {
-                            },
+                                Ok(compressed) => {
+                                    let mut message = vec![0x01];
+                                    message.extend_from_slice(&compressed);
+
+                                    let _ = socket.send(Message::Binary(message)).await;
+                                },
+                                Err(_) => {
+                                    let mut uncompressed = vec![0x00];
+                                    uncompressed.extend_from_slice(json.as_bytes());
+                                    let _ = socket.send(Message::Binary(uncompressed)).await;
+                                }
+                            }
+                        } else {
+                            let mut uncompressed = vec![0x00];
+                            uncompressed.extend_from_slice(json.as_bytes());
+                            let _ = socket.send(Message::Binary(uncompressed)).await;
                         }
-                    };
-
-                    if socket.send(Message::Text(str)).await.is_err() {
-                        return;
                     }
                 } else if text == "toggleMoneyReveal" {
                     let new_value = {
@@ -56,13 +68,11 @@ async fn handle_socket(mut socket: WebSocket, state: AppState) {
                         "enabled": new_value
                     });
 
-                    if socket.send(Message::Text(response.to_string())).await.is_err() {
+                    let _ = socket.send(Message::Text(response.to_string())).await;
-                        return;
-                    }
                 }
             }
         } else {
-            return;
+            break;
         }
     }
 }
@@ -74,6 +84,7 @@ pub async fn run(path: PathBuf, port: u16, data_lock: Arc<RwLock<RadarData>>) ->
         .with_state(AppState { data_lock });
 
     let address = format!("0.0.0.0:{}", port);
+    log::info!("Starting WebSocket server on {}", address);
     let listener = tokio::net::TcpListener::bind(address).await?;
     axum::serve(listener, app.into_make_service())
         .await?;

webradar/index.html

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>radarflow</title>
     <link href="styles.css" rel="stylesheet" type="text/css" />
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pako/2.1.0/pako.min.js"></script>
 </head>
 
 <body>
@@ -13,6 +14,10 @@
         <button id="showMenuBtn" onclick="toggleMenu(true)" style="display: none;">Show Menu</button>
         <div id="settingsHolder">
             <div class="settings">
+                <div>
+                    <input type="checkbox" onclick="togglePerformanceMode()" id="performanceMode" />
+                    <label for="performanceMode">Performance Mode</label>
+                </div>
                 <div>
                     <input type="checkbox" onclick="toggleZoom()" id="zoomCheck" name="zoom" />
                     <label for="zoomCheck">Zoom</label>
@@ -65,5 +70,4 @@
     <script src="webstuff.js"></script>
 
 </body>
-
 </html>