From eb15b7455174e2f9b46b72e16ffd3a156a930d24 Mon Sep 17 00:00:00 2001 From: core Date: Mon, 10 Apr 2023 15:19:31 -0400 Subject: [PATCH] fix the client --- client/src/lib.rs | 7 +------ client/src/macros.rs | 4 ---- server/src/client_handler.rs | 2 +- server/src/handler.rs | 4 ++-- server/src/main.rs | 4 ++-- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index 887ec62a0168abca07370c713506fca4d0b95c16..77a443a54f599e2bae5921d124cf7f38d091654a 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -3,16 +3,11 @@ use futures::stream::{SplitSink, SplitStream}; use futures::StreamExt; use log::{error, info, Level, trace, warn}; use wasm_bindgen::prelude::*; -use ws_stream_wasm::{WsMessage, WsMeta, WsStream}; +use ws_stream_wasm::{WsErr, WsMessage, WsMeta, WsStream}; use starkingdoms_protocol::State; use starkingdoms_protocol::PROTOCOL_VERSION; use starkingdoms_protocol::MessageS2C; use starkingdoms_protocol::MessageC2S; -use ws_stream_wasm::{WsErr, WsMessage, WsMeta, WsStream}; -use protocol::State; -use protocol::PROTOCOL_VERSION; -use protocol::MessageS2C; -use protocol::MessageC2S; use futures::SinkExt; use lazy_static::lazy_static; use std::sync::Arc; diff --git a/client/src/macros.rs b/client/src/macros.rs index a4496e2d7b1cbeb278b12af616d0146b9f884db4..fe1f822bf1f6cc779604f458a3946beb57690664 100644 --- a/client/src/macros.rs +++ b/client/src/macros.rs @@ -1,7 +1,3 @@ - - -use futures::{FutureExt, StreamExt}; - use serde::{Serialize}; use ws_stream_wasm::WsMessage; diff --git a/server/src/client_handler.rs b/server/src/client_handler.rs index 771dee40eba37bfeced890e4726cba4a8999994d..05768990473157343876036104004e2e43bfb692 100644 --- a/server/src/client_handler.rs +++ b/server/src/client_handler.rs @@ -7,7 +7,7 @@ use log::{error, info}; use tokio::sync::mpsc::Receiver; use tokio_tungstenite::WebSocketStream; use tungstenite::Message; -use starkingdoms_protocol::{GoodbyeReason, MessageC2S, MessageS2C, PROTOCOL_VERSION, ps2c, State}; +use starkingdoms_protocol::{GoodbyeReason, MessageC2S, MessageS2C, PROTOCOL_VERSION, State}; use crate::handler::{ClientHandlerMessage, ClientManager}; use crate::{send, recv}; diff --git a/server/src/handler.rs b/server/src/handler.rs index f1d9c6f80ca5bc30f4f0a6fa0ef0ea5450ae2944..c16eace098da679b422aca619c71486b6eed5c3c 100644 --- a/server/src/handler.rs +++ b/server/src/handler.rs @@ -5,8 +5,8 @@ use std::sync::Arc; use tokio::sync::mpsc::Sender; use tokio::sync::RwLock; -use tungstenite::Message; -use starkingdoms_protocol::State; + + #[derive(Clone)] pub struct ClientManager { diff --git a/server/src/main.rs b/server/src/main.rs index 2c9e56926e7bc6df8f962a6f964ffdf4607cc9a6..e732e7dfb0992ebe4779901094d39947ab0d9e64 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -10,7 +10,7 @@ use lazy_static::lazy_static; use log::{error, info, Level}; use serde::{Deserialize, Serialize}; use tokio::sync::RwLock; -use starkingdoms_protocol::{PROTOCOL_VERSION, State}; +use starkingdoms_protocol::{PROTOCOL_VERSION}; use crate::handler::{ClientHandler, ClientManager}; use crate::client_handler::handle_client; use crate::timer::timer_main; @@ -110,7 +110,7 @@ async fn handle_request(mut request: Request, remote_addr: SocketAddr, mgr }).unwrap() )).unwrap()) }, - (url@_, false) => { + (_url@_, false) => { // typical HTTP file request // TODO Ok(Response::new(Body::empty()))