~starkingdoms/starkingdoms: fix the client

5 files changed, 6 insertions(+), 15 deletions(-)

M client/src/lib.rs
M client/src/macros.rs
M server/src/client_handler.rs
M server/src/handler.rs
M server/src/main.rs

M client/src/lib.rs => client/src/lib.rs +1 -6

@@ 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;

M client/src/macros.rs => client/src/macros.rs +0 -4

@@ 1,7 1,3 @@
-
-
-use futures::{FutureExt, StreamExt};
-
 use serde::{Serialize};
 use ws_stream_wasm::WsMessage;

M server/src/client_handler.rs => server/src/client_handler.rs +1 -1

@@ 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};

M server/src/handler.rs => server/src/handler.rs +2 -2

@@ 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 {

M server/src/main.rs => server/src/main.rs +2 -2

@@ 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<Body>, remote_addr: SocketAddr, mgr
                 }).unwrap()
             )).unwrap())
         },
-        (url@_, false) => {
+        (_url@_, false) => {
             // typical HTTP file request
             // TODO
             Ok(Response::new(Body::empty()))