me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use bincode instead of serde_json in iced_sentinel

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-02-27 16:16:52 +01:00
parent 4f8ed7d6ee
commit 0870b158d7
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
4 changed files with 33 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

53
sentinel/src/lib.rs
View file

@ -11,7 +11,7 @@ use futures::future;
use futures::stream::{self, Stream, StreamExt};
use semver::Version;
use serde::{Deserialize, Serialize};
use tokio::io::{self, AsyncBufReadExt, BufStream};
use tokio::io::{self, AsyncReadExt, BufStream};
use tokio::net;
pub const SOCKET_ADDRESS: &str = "127.0.0.1:9167";
@ -74,33 +74,34 @@ async fn connect() -> Result<net::TcpStream, io::Error> {
async fn receive(
mut stream: BufStream<net::TcpStream>,
) -> Result<(BufStream<net::TcpStream>, Event), io::Error> {
let mut input = String::new();
let mut bytes = Vec::new();
loop {
match stream.read_line(&mut input).await? {
0 => return Ok((stream, Event::Disconnected)),
n => {
match serde_json::from_str(&input[..n]) {
Ok(input) => {
return Ok((
stream,
match dbg!(input) {
Input::Connected(version) => {
Event::Connected(version)
}
Input::TimingMeasured(timing) => {
Event::TimingMeasured(timing)
}
Input::ThemeChanged(palette) => {
Event::ThemeChanged(palette)
}
},
))
}
Err(_) => {
// TODO: Log decoding error
}
}
let size = stream.read_u64().await? as usize;
if bytes.len() < size {
bytes.resize(size, 0);
}
let _n = stream.read_exact(&mut bytes[..size]).await?;
match bincode::deserialize(&bytes) {
Ok(input) => {
return Ok((
stream,
match dbg!(input) {
Input::Connected(version) => Event::Connected(version),
Input::TimingMeasured(timing) => {
Event::TimingMeasured(timing)
}
Input::ThemeChanged(palette) => {
Event::ThemeChanged(palette)
}
},
));
}
Err(_) => {
// TODO: Log decoding error
}
}
}