From 089ed7f549eaf82fb7bc3c46616b19615c55d72a Mon Sep 17 00:00:00 2001 From: omagdy Date: Wed, 23 Jul 2025 03:06:26 +0300 Subject: feat: Added second step in the handshake process --- src/lib.rs | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index bb91b2e..4aef994 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,6 +5,8 @@ use std::{ net::{TcpListener, TcpStream}, }; +use crate::resp_parser::parse; + #[macro_use] pub mod macros; pub mod rdb; @@ -50,17 +52,38 @@ fn handshake_process(slave: &RedisServer) -> Result<(), String> { // PING match TcpStream::connect(master_address) { Ok(mut stream) => { + let mut buffer = [0; 512]; + + // PING if let Err(e) = stream.write_all(&resp_bytes!(array => [resp!(bulk "PING")])) { return Err(format!("Failed to send: {}", e)); - } else { - Ok(()) } + + let _ = match stream.read(&mut buffer) { + Ok(0) => return Ok(()), // connection closed + Ok(n) => n, + Err(_) => return Ok(()), // error occurred + }; + + // REPLCONF + if let Err(e) = stream.write_all(&resp_bytes!(array => [resp!(bulk "REPLCONF"), resp!(bulk "listening-port"), resp!(bulk slave.port.clone())])) { + return Err(format!("Failed to send: {}", e)); + } + + let _ = match stream.read(&mut buffer) { + Ok(0) => return Ok(()), // connection closed + Ok(n) => n, + Err(_) => return Ok(()), // error occurred + }; + + if let Err(e) = stream.write_all(&resp_bytes!(array => [resp!(bulk "REPLCONF"), resp!(bulk "capa"), resp!(bulk "psync2")])) { + return Err(format!("Failed to send: {}", e)); + } + Ok(()) } Err(e) => Err(format!("Master node doesn't exists: {}", e)), } - // REPLCONF - // PSYNC } -- cgit v1.2.3