Merge pull request 'Complete assignmnet' (#1) from develop into main

Reviewed-on: #1

src/main/java/com/university/chat/Client/ServerListener.java

@@ -1,18 +1,28 @@
 package com.university.chat.Client;
 
+import com.university.chat.Common.ChatMessage;
+import com.university.chat.Common.FileMessage;
+
+import java.io.ObjectInputStream;
+
 public class ServerListener implements Runnable{
-    // TODO: store the ObjectInputStream from the user socket
+    private final ObjectInputStream in;
-    //          (this should be the same input stream the
+
-    //           chatClient created when connecting)
+    public ServerListener(ObjectInputStream inputStream) {
+        this.in = inputStream;
+    }
 
     @Override
     public void run() {
         try {
-            // TODO: In an infinite loop read objects from the server
+            while(true){
-            //   - if it's a ChatMessage  -> print "<sender>: <content>"
+                Object obj = in.readObject();
-            //   - if it's a FileMessage  -> print that a file was received
+                if(obj instanceof ChatMessage msg)
-            //                               (filename + sender), it's already
+                    System.out.printf("%s: %s\n", msg.getSender(), msg.getContent());
-            //                               saved to disk by the server.
+                else if(obj instanceof FileMessage msg){
+                    System.out.printf("File %s received from %s\n", msg.getFilename(), msg.getSender());
+                }
+            }
         } catch (Exception e){
             System.out.println("Disconnected from server");
         }

src/main/java/com/university/chat/Client/chatClient.java

@@ -1,26 +1,137 @@
 package com.university.chat.Client;
 
+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;
+
 public class chatClient {
     public static void main() {
-        // TODO: Connecting to the server
+        Socket socket;
-        //  1. Create a socket and connect to the server
+        try {
-        //  2. Create an ObjectOutputStream (out) and ObjectInputStream (in)
+            socket = new Socket("127.0.0.1", 555);
-        //      from the socket's streams — output FIRST, then input.
+        } catch (IOException e) {
-        //  2. Get the username, and send a LOGIN ChatMessage with that username
+            throw new RuntimeException(e);
-        //  3. Start a new Thread running a ServerListener(in) so incoming
+        }
-        //      messages are handled concurrently.
+
+        ObjectOutputStream out = null;
+        ObjectInputStream in = null;
+        try{
+            out = new ObjectOutputStream(socket.getOutputStream());
+        } catch (IOException e) {
+            System.err.println(e.getMessage());
+        }
+        try{
+            in = new ObjectInputStream(socket.getInputStream());
+        } catch (IOException e) {
+            System.err.println(e.getMessage());
+        }
+
+
+        Scanner scanner = new Scanner(System.in);
+        System.out.println("Enter your username: ");
+        String username = scanner.nextLine();
+
+        try {
+            assert out != null;
+            out.writeObject(new ChatMessage(
+                    MessageType.LOGIN,
+                    username,
+                    null,
+                    username
+            ));
+            out.flush();
+
+            assert in != null;
+            Object loginResponse = in.readObject();
+            if(loginResponse != MessageType.LOGIN_SUCCESS){
+                System.out.println("Login failed");
+                socket.close();
+                return;
+            }
+
+            Thread listenerThread = new Thread(new ServerListener(in));
+            listenerThread.start();
+
+        } catch (IOException | ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+
 
         while (true){
             try {
                 // TODO: Program loop — read a line from the console and act on it:
-                //   - "/msg <user> <text>"        -> build & send a PRIVATE_MESSAGE
+                String input = scanner.nextLine();
-                //   - "/users"                    -> build & send a USER_LIST request
+                String[] parts = input.split("\\s+", 3);
-                //   - "/sendfile <user> <path>"   -> read the file into a byte[]
+
-                //                                     (you can use TransferProgress
+                switch (parts[0]){
-                //                                     to show progress)
+                    case "/msg" -> {
-                //                                     and send it as a FileMessage
+                        if(parts.length < 3){
-                //   - anything else               -> send a PUBLIC_MESSAGE
+                            System.out.println("Not valid");
-                //   Remember to flush() the output stream after writeObject().
+                            continue;
+                        }
+
+                        out.writeObject(new ChatMessage(
+                                MessageType.PRIVATE_MESSAGE,
+                                username,
+                                parts[1],
+                                parts[2]
+                        ));
+                        out.flush();
+                    }
+
+                    case "/users" -> {
+                        if(parts.length != 1){
+                            System.out.println("Not valid");
+                            continue;
+                        }
+
+                        out.writeObject(new ChatMessage(
+                                MessageType.USER_LIST,
+                                username,
+                                null,
+                                ""
+                        ));
+                    }
+
+                    case "/sendfile" -> {
+                        if(parts.length < 3){
+                            System.out.println("Not valid");
+                            continue;
+                        }
+
+                        Path path = Path.of(parts[2]);
+                        byte[] data = Files.readAllBytes(path);
+                        TransferProgress transferProgress = new TransferProgress(data.length);
+                        transferProgress.update(data.length);
+
+                        out.writeObject(new FileMessage(
+                                username,
+                                parts[1],
+                                path.getFileName().toString(),
+                                data
+                        ));
+                        out.flush();
+                    }
+
+                    default -> {
+                        out.writeObject(new ChatMessage(
+                                MessageType.PUBLIC_MESSAGE,
+                                username,
+                                null,
+                                input
+                        ));
+                        out.flush();
+                    }
+                }
+
             } catch (Exception e){
                 System.out.println("command failed: " + e.getMessage());
             }

src/main/java/com/university/chat/Server/ChatServer.java

@@ -1,15 +1,31 @@
 package com.university.chat.Server;
 
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
 public class ChatServer {
-    // TODO: declare a single shared UserManager instance (static final)
+    public static final UserManager userManager = new UserManager();
-    //         This MUST be shared by all ClientSession threads so that
+    public static ServerSocket serverSocket;
-    //         broadcasting and private messaging work correctly.
 
     public static void main(String[] args) {
-        // TODO: Create a ServerSocket
+        try {
+            serverSocket = new ServerSocket(555);
+        } catch (IOException e){
+            throw new RuntimeException(e);
+        }
+
+        while(true){
+            try {
+                Socket socket = serverSocket.accept();
+                System.out.println("New client accepted.");
+
+                ClientSession session = new ClientSession(socket, userManager);
+                new Thread(session).start();
+            } catch(IOException e){
+                System.err.println("Cannot establish connection");
+            }
+        }
 
-        // TODO: In an infinite loop:
-        //  accept an incoming client connection
-        //  make a new thread running ClientSession for each user.
     }
 }

src/main/java/com/university/chat/Server/ClientSession.java

@@ -2,44 +2,84 @@ 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 final UserManager userManager;
+    private final Socket socket;
+    private ObjectOutputStream out;
+    private ObjectInputStream in;
 
     public ClientSession(Socket socket, UserManager userManager) {
-        // TODO : Create an ObjectOutputStream from socket.getOutputStream()
+        this.userManager = userManager;
-        //         and an ObjectInputStream from socket.getInputStream().
+        this.socket = socket;
+
+        try {
+            out = new ObjectOutputStream(socket.getOutputStream());
+        } catch (IOException e) {
+            System.err.println(e.getMessage());
+        }
+
+        try {
+            in = new ObjectInputStream(socket.getInputStream());
+        } catch (IOException e) {
+            System.err.println(e.getMessage());
+        }
     }
 
     @Override
     public void run() {
         try {
+            System.out.println("Welcome!");
+
+            boolean isLogin = false;
+            Object firstObject = in.readObject();
+            if(firstObject instanceof ChatMessage){
+                isLogin = ((ChatMessage)firstObject).getType() == MessageType.LOGIN;
+            }
+
+            if(!isLogin){
+                socket.close();
+                return;
+            }
+
+            username = ((ChatMessage) firstObject).getSender();
+            if(userManager.addUser(username, this)){
+                System.out.println(username + " added successfully.");
+                FileManager.createUserFolders(username);
+                out.writeObject(MessageType.LOGIN_SUCCESS);
+                out.flush();
+            }
+            else{
+                System.out.println("failed to add " + username);
+                out.writeObject(MessageType.LOGIN_FAILED);
+                out.flush();
+                socket.close();
+                return;
+            }
+
+            while(true){
+                Object obj = in.readObject();
+                if(obj instanceof ChatMessage)
+                    handleChatMessage((ChatMessage) obj);
+                else if(obj instanceof FileMessage)
+                    handleFileMessage((FileMessage) obj);
+            }
 
-            // 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).
 
         } catch (Exception e) {
             System.out.println("Disconnected: " + username);
         } finally {
-            // TODO: Remove the user from UserManager so they no longer
+            userManager.removeUser(username);
-            //        receive broadcasts or appear in users list
         }
     }
 
@@ -47,13 +87,32 @@ 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.
+                Iterable<ClientSession> users = userManager.getAllSessions();
+                for(ClientSession user : users){
+                    user.send(msg);
+                }
             }
             case PRIVATE_MESSAGE -> {
-                // TODO: Forward this message to the receiver user.
+                ClientSession receiver = userManager.getUser(msg.getReceiver());
+                if(receiver != null){
+                    receiver.send(msg);
+                }
+                else{
+                    send(new ChatMessage(
+                            MessageType.PRIVATE_MESSAGE,
+                            "server",
+                            username,
+                            "User not found: " + msg.getReceiver()
+                    ));
+                }
             }
             case USER_LIST -> {
-                // TODO: Reply to the requester with the list of online users.
+                send(new ChatMessage(
+                        MessageType.USER_LIST,
+                        "server",
+                        username,
+                        userManager.listUsers()
+                ));
             }
         }
     }
@@ -66,6 +125,12 @@ 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 receiver = userManager.getUser(fileMsg.getReceiver());
+        receiver.send(fileMsg);
+    }
+
+    private synchronized void send(Object obj) throws IOException{
+        out.writeObject(obj);
+        out.flush();
     }
 }