...

src/server.rs

@@ -14,6 +14,7 @@ use crate::storage::Storage;
 pub struct Server {
     pub storage: Arc<Storage>,
     pub option: options::DBOption,
+    pub client_name: Option<String>,
 }
 
 impl Server {
@@ -28,6 +29,7 @@ impl Server {
         Server {
             storage: Arc::new(storage),
             option,
+            client_name: None,
         }
     }
 
@@ -46,20 +48,37 @@ impl Server {
                 }
                 
                 let s = str::from_utf8(&buf[..len])?;
-                let (cmd, protocol) =
-                    Cmd::from(s).unwrap_or((Cmd::Unknow, Protocol::err("unknow cmd")));
-                println!("got command: {:?}, protocol: {:?}", cmd, protocol);
+                let (cmd, protocol) = match Cmd::from(s) {
+                    Ok((cmd, protocol)) => (cmd, protocol),
+                    Err(e) => {
+                        println!("\x1b[31;1mprotocol error: {:?}\x1b[0m", e);
+                        (Cmd::Unknow("protocol_error".to_string()), Protocol::err(&format!("protocol error: {}", e.0)))
+                    }
+                };
+                if self.option.debug {
+                    println!("\x1b[34;1mgot command: {:?}, protocol: {:?}\x1b[0m", cmd, protocol);
+                } else {
+                    println!("got command: {:?}, protocol: {:?}", cmd, protocol);
+                }
 
                 // Check if this is a QUIT command before processing
                 let is_quit = matches!(cmd, Cmd::Quit);
 
                 let res = cmd
-                    .run(self, protocol, &mut queued_cmd)
+                    .run(&mut self.clone(), protocol.clone(), &mut queued_cmd)
                     .await
-                    .unwrap_or(Protocol::err("unknow cmd"));
-                print!("queued cmd {:?}", queued_cmd);
+                    .unwrap_or(Protocol::err("unknown cmd from server"));
+                if self.option.debug {
+                    println!("\x1b[34;1mqueued cmd {:?}\x1b[0m", queued_cmd);
+                } else {
+                    print!("queued cmd {:?}", queued_cmd);
+                }
 
-                println!("going to send response {}", res.encode());
+                if self.option.debug {
+                    println!("\x1b[32;1mgoing to send response {}\x1b[0m", res.encode());
+                } else {
+                    println!("going to send response {}", res.encode());
+                }
                 _ = stream.write(res.encode().as_bytes()).await?;
                 
                 // If this was a QUIT command, close the connection