server side preparation

src/bin/client/net.rs

@@ -1,8 +1,8 @@
 use crate::ClientEvent;
 use dashmap::DashMap;
 use openworm::net::{
-    ClientMsg, ClientRequestMsg, RecvHandler, RequestId, RequestMsg, SERVER_NAME, ServerMsg,
-    ServerRespMsg, SkipServerVerification, recv_uni, send_uni,
+    ClientMsg, ClientMsgInst, RecvHandler, RequestId, RequestMsg, SERVER_NAME, ServerMsg,
+    ServerMsgInst, SkipServerVerification, recv_uni, send_uni,
 };
 use quinn::{
     ClientConfig, Connection, Endpoint, IdleTimeout, TransportConfig,
@@ -10,12 +10,10 @@ use quinn::{
 };
 use std::{
     net::{Ipv6Addr, SocketAddr, SocketAddrV6, ToSocketAddrs},
-    str::FromStr,
     sync::Arc,
     time::Duration,
 };
 use tokio::sync::{mpsc::UnboundedSender, oneshot};
-use winit::event_loop::EventLoopProxy;
 
 pub const CLIENT_SOCKET: SocketAddr =
     SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::UNSPECIFIED, 0, 0, 0));
@@ -30,21 +28,8 @@ pub struct NetHandle {
     send: UnboundedSender<NetCtrlMsg>,
 }
 
-#[derive(Clone)]
-pub struct AppHandle {
-    pub proxy: EventLoopProxy<ClientEvent>,
-}
-
-impl AppHandle {
-    pub fn send(&self, event: ClientEvent) {
-        self.proxy.send_event(event).unwrap_or_else(|_| panic!());
-    }
-}
-
 type NetResult<T> = Result<T, String>;
 
-pub trait ClientRequest {}
-
 pub enum NetCtrlMsg {
     Send(ClientMsg),
     Request(ClientMsg, oneshot::Sender<ServerMsg>),
@@ -156,9 +141,9 @@ impl NetHandle {
                 let request_id = req_id.next();
                 match msg {
                     NetCtrlMsg::Send(msg) => {
-                        let msg = ClientRequestMsg {
+                        let msg = ClientMsgInst {
                             id: request_id,
-                            msg: msg.into(),
+                            msg,
                         };
                         if send_uni(&conn, msg).await.is_err() {
                             println!("disconnected from server");
@@ -166,9 +151,9 @@ impl NetHandle {
                         }
                     }
                     NetCtrlMsg::Request(msg, send) => {
-                        let msg = ClientRequestMsg {
+                        let msg = ClientMsgInst {
                             id: request_id,
-                            msg: msg.into(),
+                            msg,
                         };
                         recv.requests.insert(request_id, send);
                         if send_uni(&conn, msg).await.is_err() {
@@ -206,15 +191,14 @@ struct ServerRecv<F: MsgHandler> {
     msg: F,
 }
 
-impl<F: MsgHandler> RecvHandler<ServerRespMsg> for ServerRecv<F> {
-    async fn msg(&self, resp: ServerRespMsg) {
-        let msg = resp.msg.into();
+impl<F: MsgHandler> RecvHandler<ServerMsgInst> for ServerRecv<F> {
+    async fn msg(&self, resp: ServerMsgInst) {
         if let Some(id) = resp.id
             && let Some((_, send)) = self.requests.remove(&id)
         {
-            send.send(msg);
+            let _ = send.send(resp.msg);
         } else {
-            self.msg.run(msg).await;
+            self.msg.run(resp.msg).await;
         }
     }
 }