From d18248cfe926e5ad13843e52aafbc49048e62a5a Mon Sep 17 00:00:00 2001
From: mohammadreza <mohammadrezaashrafian2@gmail.com>
Date: Fri, 19 Jun 2026 16:52:29 +0330
Subject: [PATCH] implement all TODO taks

---
 src/main/java/chat/ChatClient.java      | 24 +++++++++++++++++-------
 src/main/java/chat/ChatServer.java      | 25 +++++++++++++++++--------
 src/main/java/chat/MessageListener.java | 12 ++++++++++++
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/main/java/chat/ChatClient.java b/src/main/java/chat/ChatClient.java
index eb20460..5eef048 100644
--- a/src/main/java/chat/ChatClient.java
+++ b/src/main/java/chat/ChatClient.java
@@ -37,19 +37,29 @@ public class ChatClient {
     }
 
     private void connectToServer() throws IOException {
-        // TODO: create socket connection to host:port
-        // TODO: initialize output stream (PrintWriter)
-        // TODO: initialize input stream (BufferedReader)
+
+        socket = new Socket(host, port);
+        out = new PrintWriter(socket.getOutputStream(), true);
+        in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
     }
 
     private void readUserInputAndSend() throws IOException {
-        // TODO: read continuously from console
-        // TODO: send each input line to server
+
+        String line;
+        while((line = consoleReader.readLine()) != null) {
+            out.println(line);
+        }
     }
 
     private void cleanup() {
-        // TODO: close socket safely
-        // TODO: release resources
+
+        try {
+            if (socket != null && !socket.isClosed()) {
+                socket.close();
+            }
+        } catch (IOException e) {
+            System.err.println("Error closing socket: " + e.getMessage());
+        }
     }
 
     public static void main(String[] args) {
diff --git a/src/main/java/chat/ChatServer.java b/src/main/java/chat/ChatServer.java
index 218dbcd..a545c2e 100644
--- a/src/main/java/chat/ChatServer.java
+++ b/src/main/java/chat/ChatServer.java
@@ -39,20 +39,29 @@ public class ChatServer {
     }
 
     public void broadcast(String message, ClientHandler sender) {
-        // step 1: iterate through connectedClients safely
-        // step 2: skip the sender client
-        // step 3: send message to remaining clients using sendMessage
+
+        synchronized (connectedClients) {
+            for (ClientHandler client : connectedClients) {
+                if (client != sender) {
+                    client.sendMessage(message);
+                }
+            }
+        }
     }
 
     public void broadcastSystemMessage(String message) {
-        // step 1: iterate through all connected clients
-        // step 2: send system message to each client
+
+        synchronized (connectedClients) {
+            for (ClientHandler client : connectedClients) {
+                client.sendMessage(message);
+            }
+        }
     }
 
     public void removeClient(ClientHandler clientHandler) {
-        // step 1: remove client from connectedClients set
-        // step 2: retrieve username from clientHandler
-        // step 3: broadcast system message about user leaving
+
+        connectedClients.remove(clientHandler);
+        broadcastSystemMessage("[System] " + clientHandler.getUsername() + " left the chat.");
     }
 
     public static void main(String[] args) {
diff --git a/src/main/java/chat/MessageListener.java b/src/main/java/chat/MessageListener.java
index 246256b..89f824f 100644
--- a/src/main/java/chat/MessageListener.java
+++ b/src/main/java/chat/MessageListener.java
@@ -15,5 +15,17 @@ public class MessageListener implements Runnable {
     public void run() {
         // TODO: continuously read messages from server
         // TODO: print received messages immediately
+
+        try {
+            String line;
+            while ((line = inputReader.readLine()) != null) {
+
+                System.out.println(line);
+            }
+        }
+        catch (IOException e) {
+
+            System.out.println("Error while reading from input stream" + e.getMessage());
+        }
     }
 }
-- 
2.54.0