From d6b7215667dae41dd0a56344450579c57ae229ea Mon Sep 17 00:00:00 2001 From: Reza Date: Fri, 19 Jun 2026 13:44:24 +0330 Subject: [PATCH] complete --- .../chat/Client/ServerListener.java | 32 ++++-- .../university/chat/Client/chatClient.java | 98 ++++++++++++---- .../university/chat/Server/ChatServer.java | 21 ++-- .../university/chat/Server/ClientSession.java | 107 +++++++++++++----- 4 files changed, 192 insertions(+), 66 deletions(-) diff --git a/src/main/java/com/university/chat/Client/ServerListener.java b/src/main/java/com/university/chat/Client/ServerListener.java index b609d74..f429b9a 100644 --- a/src/main/java/com/university/chat/Client/ServerListener.java +++ b/src/main/java/com/university/chat/Client/ServerListener.java @@ -1,18 +1,32 @@ package com.university.chat.Client; -public class ServerListener implements Runnable{ - // TODO: store the ObjectInputStream from the user socket - // (this should be the same input stream the - // chatClient created when connecting) +import com.university.chat.Common.ChatMessage; +import com.university.chat.Common.FileMessage; +import java.io.ObjectInputStream; +public class ServerListener implements Runnable{ + + private final ObjectInputStream in; + + public ServerListener(ObjectInputStream in) { + this.in = in; + } @Override public void run() { try { - // TODO: In an infinite loop read objects from the server - // - if it's a ChatMessage -> print ": " - // - if it's a FileMessage -> print that a file was received - // (filename + sender), it's already - // saved to disk by the server. + while (true) { + Object obj = in.readObject(); + if (obj instanceof ChatMessage msg) { + if (msg.getType() == com.university.chat.Common.MessageType.USER_LIST) { + System.out.println("Online users: " + msg.getContent()); + } else { + System.out.println(msg.getSender() + ": " + msg.getContent()); + } + } else if (obj instanceof FileMessage fileMsg) { + System.out.println("File received: " + fileMsg.getFilename() + + " from " + fileMsg.getSender()); + } + } } catch (Exception e){ System.out.println("Disconnected from server"); } diff --git a/src/main/java/com/university/chat/Client/chatClient.java b/src/main/java/com/university/chat/Client/chatClient.java index dae0bad..bf2a132 100644 --- a/src/main/java/com/university/chat/Client/chatClient.java +++ b/src/main/java/com/university/chat/Client/chatClient.java @@ -1,29 +1,81 @@ package com.university.chat.Client; -public class chatClient { - public static void main() { - // TODO: Connecting to the server - // 1. Create a socket and connect to the server - // 2. Create an ObjectOutputStream (out) and ObjectInputStream (in) - // from the socket's streams — output FIRST, then input. - // 2. Get the username, and send a LOGIN ChatMessage with that username - // 3. Start a new Thread running a ServerListener(in) so incoming - // messages are handled concurrently. +import com.university.chat.Common.ChatMessage; +import com.university.chat.Common.FileMessage; +import com.university.chat.Common.MessageType; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.net.Socket; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Scanner; - while (true){ - try { - // TODO: Program loop — read a line from the console and act on it: - // - "/msg " -> build & send a PRIVATE_MESSAGE - // - "/users" -> build & send a USER_LIST request - // - "/sendfile " -> read the file into a byte[] - // (you can use TransferProgress - // to show progress) - // and send it as a FileMessage - // - anything else -> send a PUBLIC_MESSAGE - // Remember to flush() the output stream after writeObject(). - } catch (Exception e){ - System.out.println("command failed: " + e.getMessage()); +public class chatClient { + public static void main(String[] args) { + String serverAddress = "localhost"; + int serverPort = 12345; + + try (Socket socket = new Socket(serverAddress, serverPort); + ObjectOutputStream out = new ObjectOutputStream(socket.getOutputStream()); + ObjectInputStream in = new ObjectInputStream(socket.getInputStream()); + Scanner console = new Scanner(System.in)) { + + System.out.print("Enter username: "); + String username = console.nextLine(); + out.writeObject(new ChatMessage(MessageType.LOGIN, username, null, null)); + out.flush(); + + ChatMessage response = (ChatMessage) in.readObject(); + if (response.getType() == MessageType.LOGIN_FAILED) { + System.out.println("Login failed: " + response.getContent()); + return; } + System.out.println("Connected as " + username); + + Thread listener = new Thread(new ServerListener(in)); + listener.start(); + + while (true) { + try { + String line = console.nextLine(); + if (line.startsWith("/msg ")) { + String[] parts = line.split(" ", 3); + if (parts.length < 3) { + System.out.println("Usage: /msg "); + continue; + } + out.writeObject(new ChatMessage(MessageType.PRIVATE_MESSAGE, username, parts[1], parts[2])); + } + else if (line.equals("/users")) { + out.writeObject(new ChatMessage(MessageType.USER_LIST, username, null, null)); + } + else if (line.startsWith("/sendfile ")) { + String[] parts = line.split(" ", 3); + if (parts.length < 3) { + System.out.println("Usage: /sendfile "); + continue; + } + try { + byte[] data = Files.readAllBytes(Path.of(parts[2])); + out.writeObject(new FileMessage(username, parts[1], + Path.of(parts[2]).getFileName().toString(), data)); + } + catch (IOException e) { + System.out.println("File error: " + e.getMessage()); + } + } + else { + out.writeObject(new ChatMessage(MessageType.PUBLIC_MESSAGE, username, null, line)); + } + out.flush(); + } + catch (Exception e) { + System.out.println("command failed: " + e.getMessage()); + } + } + } catch (Exception e) { + System.out.println("Connection closed: " + e.getMessage()); } } -} +} \ No newline at end of file diff --git a/src/main/java/com/university/chat/Server/ChatServer.java b/src/main/java/com/university/chat/Server/ChatServer.java index b2a35ae..777e9f7 100644 --- a/src/main/java/com/university/chat/Server/ChatServer.java +++ b/src/main/java/com/university/chat/Server/ChatServer.java @@ -1,15 +1,20 @@ package com.university.chat.Server; +import java.net.ServerSocket; +import java.net.Socket; + public class ChatServer { - // TODO: declare a single shared UserManager instance (static final) - // This MUST be shared by all ClientSession threads so that - // broadcasting and private messaging work correctly. + private static final UserManager userManager = new UserManager(); - public static void main(String[] args) { - // TODO: Create a ServerSocket + public static void main(String[] args) throws Exception { + int port = 12345; + ServerSocket serverSocket = new ServerSocket(port); + System.out.println("Server started on port " + port); - // TODO: In an infinite loop: - // accept an incoming client connection - // make a new thread running ClientSession for each user. + while (true) { + Socket clientSocket = serverSocket.accept(); + ClientSession session = new ClientSession(clientSocket, userManager); + new Thread(session).start(); + } } } diff --git a/src/main/java/com/university/chat/Server/ClientSession.java b/src/main/java/com/university/chat/Server/ClientSession.java index f09d64a..ebb41d5 100644 --- a/src/main/java/com/university/chat/Server/ClientSession.java +++ b/src/main/java/com/university/chat/Server/ClientSession.java @@ -2,70 +2,125 @@ package com.university.chat.Server; import com.university.chat.Common.ChatMessage; import com.university.chat.Common.FileMessage; +import com.university.chat.Common.MessageType; +import java.io.EOFException; import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.net.Socket; import java.nio.file.Files; public class ClientSession implements Runnable { + private final Socket socket; + private final UserManager userManager; + private ObjectOutputStream out; + private ObjectInputStream in; private String username; public ClientSession(Socket socket, UserManager userManager) { - // TODO : Create an ObjectOutputStream from socket.getOutputStream() - // and an ObjectInputStream from socket.getInputStream(). + this.socket = socket; + this.userManager = userManager; + + try { + out = new ObjectOutputStream(socket.getOutputStream()); + in = new ObjectInputStream(socket.getInputStream()); + } catch (IOException e) { + closeEverything(); + } } @Override public void run() { - try { + try {ChatMessage loginMsg = (ChatMessage) in.readObject(); + if (loginMsg.getType() != MessageType.LOGIN) { + closeEverything(); + return; + } - // TODO: Welcome the user (login step) - // 1. Read the first object sent by the client. - // 2. Check it's a ChatMessage with type LOGIN. - // 3. Extract the username. - // 4. Try to register the user via userManager.addUser(...). - // 5. If the username is taken, send back LOGIN_FAILED and close the socket. - // 6. Otherwise, create the user's folders with FileManager.createUserFolders(...) - // and send back LOGIN_SUCCESS. - // TODO: Main message loop - // In a loop, call in.readObject(), you can separate messages by their type: - // - if it's a ChatMessage -> call handleChatMessage(msg) - // - if it's a FileMessage -> call handleFileMessage(fileMsg) - // Keep looping until the connection is closed (an exception will be thrown). + username = loginMsg.getSender(); + if (!userManager.addUser(username, this)) { - } catch (Exception e) { + out.writeObject(new ChatMessage(MessageType.LOGIN_FAILED, "Server", username, "Username already taken")); + out.flush(); + closeEverything(); + return; + } + + + FileManager.createUserFolders(username); + out.writeObject(new ChatMessage(MessageType.LOGIN_SUCCESS, "Server", username, "Welcome!")); + out.flush(); + + Object obj; + while ((obj = in.readObject()) != null) { + if (obj instanceof ChatMessage msg) { + handleChatMessage(msg); + } else if (obj instanceof FileMessage fileMsg) { + handleFileMessage(fileMsg); + } + } + } + catch (EOFException e) { + } + catch (Exception e) { System.out.println("Disconnected: " + username); } finally { - // TODO: Remove the user from UserManager so they no longer - // receive broadcasts or appear in users list + if (username != null) userManager.removeUser(username); + closeEverything(); } } - private void handleChatMessage(ChatMessage msg) throws IOException { switch (msg.getType()) { case PUBLIC_MESSAGE -> { - // TODO: Broadcast this message to every connected client. + for (ClientSession session : userManager.getAllSessions()) { + if (!session.equals(this)) { + session.sendMessage(msg); + } + } } case PRIVATE_MESSAGE -> { - // TODO: Forward this message to the receiver user. + ClientSession receiver = userManager.getUser(msg.getReceiver()); + if (receiver != null) { + receiver.sendMessage(msg); + } } case USER_LIST -> { - // TODO: Reply to the requester with the list of online users. + String list = userManager.listUsers(); + ChatMessage reply = new ChatMessage(MessageType.USER_LIST, "Server", username, list); + sendMessage(reply); } } } private void handleFileMessage(FileMessage fileMsg) throws IOException { - // Storing the file + var sentPath = FileManager.getSentPath(fileMsg.getSender(), fileMsg.getFilename()); var recvPath = FileManager.getReceivedPath(fileMsg.getReceiver(), fileMsg.getFilename()); - Files.write(sentPath, fileMsg.getData()); Files.write(recvPath, fileMsg.getData()); - // TODO: Forward the received file-message to the destination user. + ClientSession receiver = userManager.getUser(fileMsg.getReceiver()); + if (receiver != null) { + receiver.sendFile(fileMsg); + } + } + public void sendMessage(ChatMessage msg) throws IOException { + out.writeObject(msg); + out.flush(); + } + + public void sendFile(FileMessage fileMsg) throws IOException { + out.writeObject(fileMsg); + out.flush(); + } + + private void closeEverything() { + try { if (out != null) out.close(); } catch (IOException ignored) {} + try { if (in != null) in.close(); } catch (IOException ignored) {} + try { if (socket != null) socket.close(); } catch (IOException ignored) {} } } \ No newline at end of file -- 2.54.0