From 340aa47c4652fe2f0ec5b0e4f293cfff407a0e6c Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 15 Jul 2024 15:00:27 +0200 Subject: add texture import/export system for light client --- light-client/src/network.rs | 51 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) (limited to 'light-client/src/network.rs') diff --git a/light-client/src/network.rs b/light-client/src/network.rs index 2a185b73..dc6e894f 100644 --- a/light-client/src/network.rs +++ b/light-client/src/network.rs @@ -1,7 +1,52 @@ -pub struct Network {} +use hurrycurry_protocol::{PacketC, PacketS, BINCODE_CONFIG}; +use log::warn; +use std::{collections::VecDeque, net::TcpStream}; +use tungstenite::{stream::MaybeTlsStream, Message, WebSocket}; + +pub struct Network { + sock: WebSocket>, + queue_in: VecDeque, + queue_out: VecDeque, +} impl Network { - pub fn connect(addr: &str) { - let (sock, resp) = tungstenite::connect(addr).unwrap(); + pub fn connect(addr: &str) -> Self { + let (sock, _resp) = tungstenite::connect(addr).unwrap(); + Self { + sock, + queue_in: VecDeque::new(), + queue_out: VecDeque::new(), + } + } + pub fn poll(&mut self) { + self.queue_in.extend(match self.sock.read() { + Ok(Message::Text(packet)) => match serde_json::from_str(&packet) { + Ok(p) => Some(p), + Err(e) => { + warn!("invalid json packet: {e:?}"); + None + } + }, + Ok(Message::Binary(packet)) => { + match bincode::decode_from_slice(&packet, BINCODE_CONFIG) { + Ok((p, _)) => Some(p), + Err(e) => { + warn!("invalid bincode packet: {e:?}"); + None + } + } + } + Ok(_) => None, + Err(e) => { + warn!("{e:?}"); + None + } + }); + + for packet in self.queue_out.drain(..) { + self.sock + .write(Message::Text(serde_json::to_string(&packet).unwrap())) + .unwrap(); + } } } -- cgit v1.2.3-70-g09d2