diff --git a/a.txt b/a.txt new file mode 100644 index 0000000..4384c96 --- /dev/null +++ b/a.txt @@ -0,0 +1,4 @@ +hiiiiiiiiiiiiii +how are youuuuuuuuuu +long time no seeeeeeeeeee +:( \ No newline at end of file diff --git a/src/main/java/com/university/chat/Client/ServerListener.java b/src/main/java/com/university/chat/Client/ServerListener.java index b609d74..ae27855 100644 --- a/src/main/java/com/university/chat/Client/ServerListener.java +++ b/src/main/java/com/university/chat/Client/ServerListener.java @@ -1,19 +1,50 @@ 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 com.university.chat.Common.MessageType; + +import java.io.ObjectInputStream; + +public class ServerListener implements Runnable +{ + private ObjectInputStream in; + public ServerListener(ObjectInputStream in) + { + this.in = in; + } @Override - public void run() { + 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. - } catch (Exception e){ + while (true) { + Object object = in.readObject(); + + if (object instanceof ChatMessage) + { + ChatMessage msg = (ChatMessage) object; + + if (msg.getType() == MessageType.LOGIN_SUCCESS || msg.getType() == MessageType.LOGIN_FAILED) + { + System.out.println("\n" + msg.getContent()); + } + else + { + System.out.println("\n" + msg.getSender() + ": " + msg.getContent()); + } + + } + else if (object instanceof FileMessage) + { + FileMessage fileMsg = (FileMessage) object; + System.out.println("\n[FILE RECEIVED] From: " + fileMsg.getSender() + " | Name: " + fileMsg.getFilename()); + System.out.print("> "); + } + } + } + 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..39e1dd3 100644 --- a/src/main/java/com/university/chat/Client/chatClient.java +++ b/src/main/java/com/university/chat/Client/chatClient.java @@ -1,29 +1,138 @@ 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; - 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()); +import java.io.*; +import java.net.Socket; +import java.net.UnknownHostException; +import java.util.Scanner; + +public class chatClient +{ + private static Socket socket; + private static ObjectOutputStream out; + private static ObjectInputStream in; + private static String username; + + public static void main() + { + Scanner scanner = new Scanner(System.in); + + try + { + socket = new Socket("localhost", 5000); + out = new ObjectOutputStream(socket.getOutputStream()); + in = new ObjectInputStream(socket.getInputStream()); + + System.out.print("Enter your username: "); + username = scanner.nextLine(); + + ChatMessage loginMsg = new ChatMessage(MessageType.LOGIN, username, null, ""); + out.writeObject(loginMsg); + out.flush(); + + ServerListener listener = new ServerListener(in); + Thread thread = new Thread(listener); + thread.start(); + + System.out.println("Connected!"); + + while (true) + { + try + { + String input = scanner.nextLine(); + + if (input.startsWith("/msg ")) + { + String[] parts = input.split(" ", 3); + if (parts.length >= 3) + { + String receiver = parts[1]; + String content = parts[2]; + ChatMessage msg = new ChatMessage(MessageType.PRIVATE_MESSAGE, username, receiver, content); + out.writeObject(msg); + out.flush(); + } + else + { + System.out.println("Usage: /msg "); + } + + } + else if (input.trim().equals("/users")) + { + ChatMessage req = new ChatMessage(MessageType.USER_LIST, username, null, ""); + out.writeObject(req); + out.flush(); + + } + else if (input.startsWith("/sendfile ")) + { + String[] parts = input.split(" ", 3); + if (parts.length >= 3) + { + String receiver = parts[1]; + String filePath = parts[2]; + sendFile(receiver, filePath); + } + else + { + System.out.println("Usage: /sendfile "); + } + + } + else + { + if (!input.isEmpty()) + { + ChatMessage msg = new ChatMessage(MessageType.PUBLIC_MESSAGE, username, null, input); + out.writeObject(msg); + out.flush(); + } + } + } + catch (Exception e) + { + System.out.println("command failed: " + e.getMessage()); + } } } + catch (UnknownHostException e) + { + throw new RuntimeException(e); + } + catch (IOException e) + { + throw new RuntimeException(e); + } + } + + private static void sendFile(String receiver, String filePath) throws IOException + { + File file = new File(filePath); + if (!file.exists()) + { + System.out.println("file not found : " + filePath); + return; + } + + long fileSize = file.length(); + byte[] data = new byte[(int) fileSize]; + + try (FileInputStream fis = new FileInputStream(file)) + { + fis.read(data); + } + + TransferProgress progress = new TransferProgress(fileSize); + progress.update(fileSize); + + FileMessage fileMsg = new FileMessage(username, receiver, file.getName(), data); + out.writeObject(fileMsg); + out.flush(); + System.out.println("Send file : " + file.getName()); } } diff --git a/src/main/java/com/university/chat/Server/ChatServer.java b/src/main/java/com/university/chat/Server/ChatServer.java index b2a35ae..fb58429 100644 --- a/src/main/java/com/university/chat/Server/ChatServer.java +++ b/src/main/java/com/university/chat/Server/ChatServer.java @@ -1,15 +1,28 @@ package com.university.chat.Server; -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. +import java.net.ServerSocket; +import java.net.Socket; - public static void main(String[] args) { - // TODO: Create a ServerSocket +public class ChatServer +{ + private static final UserManager userManager = new UserManager(); - // TODO: In an infinite loop: - // accept an incoming client connection - // make a new thread running ClientSession for each user. + public static void main(String[] args) + { + try (ServerSocket serverSocket = new ServerSocket(5000)) + { + System.out.println("Server connected"); + while (true) + { + Socket clientSocket = serverSocket.accept(); + ClientSession clientSession = new ClientSession(clientSocket, userManager); + Thread thread = new Thread(clientSession); + thread.start(); + } + } + catch (Exception e) + { + throw new RuntimeException(e); + } } } diff --git a/src/main/java/com/university/chat/Server/ClientSession.java b/src/main/java/com/university/chat/Server/ClientSession.java index f09d64a..b6f242f 100644 --- a/src/main/java/com/university/chat/Server/ClientSession.java +++ b/src/main/java/com/university/chat/Server/ClientSession.java @@ -2,44 +2,110 @@ 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.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.net.Socket; import java.nio.file.Files; public class ClientSession implements Runnable { private String username; + private Socket socket; + private ObjectInputStream in; + private ObjectOutputStream out; + private UserManager userManager; - public ClientSession(Socket socket, UserManager userManager) { - // TODO : Create an ObjectOutputStream from socket.getOutputStream() - // and an ObjectInputStream from socket.getInputStream(). + public ClientSession(Socket socket, UserManager userManager) + { + this.socket = socket; + this.userManager = userManager; + + try + { + this.in = new ObjectInputStream(socket.getInputStream()); + this.out = new ObjectOutputStream(socket.getOutputStream()); + } + catch (IOException e) + { + System.err.println("Error creating streams: " + e.getMessage()); + try + { + socket.close(); + } + catch (IOException ex) + { + ex.printStackTrace(); + } + } } @Override - public void run() { - try { + public void run() + { + try + { + Object object = in.readObject(); - // 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. + if (object instanceof ChatMessage) + { + ChatMessage loginMsg = (ChatMessage) object; - // 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). + if (loginMsg.getType() == MessageType.LOGIN) + { + this.username = loginMsg.getSender(); - } catch (Exception e) { + if (userManager.addUser(username, this)) + { + ChatMessage successMsg = new ChatMessage(MessageType.LOGIN_SUCCESS, "System", username, "Welcome " + username); + out.writeObject(successMsg); + out.flush(); + + FileManager.createUserFolders(username); + System.out.println("User logged in: " + username); + } + else + { + ChatMessage failMsg = new ChatMessage(MessageType.LOGIN_FAILED, "System", username, "Username already taken"); + out.writeObject(failMsg); + out.flush(); + + socket.close(); + return; + } + } + } + + while (!socket.isClosed()) + { + Object message = in.readObject(); + + if (message instanceof ChatMessage) handleChatMessage((ChatMessage) message); + else if (message instanceof FileMessage) handleFileMessage ((FileMessage) message); + } + } + 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 + } + finally + { + if (username != null) + { + userManager.removeUser(username); + System.out.println("User removed: " + username); + } + + try + { + socket.close(); + } + catch (IOException e) + { + e.printStackTrace(); + } } } @@ -47,13 +113,31 @@ public class ClientSession implements Runnable { 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()) + { + session.out.writeObject(msg); + session.out.flush(); + } } case PRIVATE_MESSAGE -> { - // TODO: Forward this message to the receiver user. + ClientSession recieverSession = userManager.getUser(msg.getReceiver()); + if (recieverSession != null) + { + recieverSession.out.writeObject(msg); + recieverSession.out.flush(); + } + else + { + ChatMessage errorReply = new ChatMessage(MessageType.PRIVATE_MESSAGE, "System", msg.getSender(), "User " + msg.getReceiver() + " is not online."); + out.writeObject(errorReply); + out.flush(); + } } case USER_LIST -> { - // TODO: Reply to the requester with the list of online users. + String userList = userManager.listUsers(); + ChatMessage listMsg = new ChatMessage(MessageType.USER_LIST, "system", username, userList); + out.writeObject(listMsg); + out.flush(); } } } @@ -66,6 +150,11 @@ public class ClientSession implements Runnable { Files.write(sentPath, fileMsg.getData()); Files.write(recvPath, fileMsg.getData()); - // TODO: Forward the received file-message to the destination user. + ClientSession recieverSession = userManager.getUser(fileMsg.getReceiver()); + if (recieverSession != null) + { + recieverSession.out.writeObject(fileMsg); + recieverSession.out.flush(); + } } } \ No newline at end of file