From e533262c3812b4d43d3e236d9e9cb066823a8112 Mon Sep 17 00:00:00 2001
From: ginkelmath <mathis.ginkel@gmail.com>
Date: Wed, 11 Mar 2026 21:37:35 +0100
Subject: [PATCH 1/5] Add: First version of a Client-side Networking Service

---
 .../cs108/casono/client/chat/Message.java     |  57 +++++++++
 .../casono/client/network/ClientService.java  | 110 ++++++++++++++++++
 .../casono/client/network/sendRequest.java    |  49 ++++++++
 .../dmi/dbis/cs108/casono/server/Server.java  |  59 ++++++++++
 .../client/network/ClientServiceTest.java     |  35 ++++++
 5 files changed, 310 insertions(+)
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/Server.java
 create mode 100644 src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
new file mode 100644
index 0000000..44e2c45
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
@@ -0,0 +1,57 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.chat;
+
+import java.time.LocalTime;
+
+public class Message {
+    private String message;
+    public String name;
+    public int hourTime;
+    public int minuteTime;
+    public int game_id = 0;
+    public String target = null;
+
+    // For Global Chat
+
+    public  Message(String message, String name) {
+        this.message = message;
+        this.name = name;
+        LocalTime now = LocalTime.now();
+        this.hourTime = now.getHour();
+        this.minuteTime = now.getMinute();
+    }
+
+    // For Lobby Chat
+
+    public  Message(String message, String name, int game_id) {
+        this.message = message;
+        this.name = name;
+        LocalTime now = LocalTime.now();
+        this.hourTime = now.getHour();
+        this.minuteTime = now.getMinute();
+        this.game_id = game_id;
+    }
+
+    // For Whisper Chat
+
+    public  Message(String message, String name, int game_id, String target) {
+        this.message = message;
+        this.name = name;
+        LocalTime now = LocalTime.now();
+        this.hourTime = now.getHour();
+        this.minuteTime = now.getMinute();
+        this.game_id = game_id;
+        this.target = target;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public String toString() {
+        return String.format("%s: %s", this.name, this.message);
+    }
+
+    public void print() {
+        System.out.println(this.toString());
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
new file mode 100644
index 0000000..e8f9f28
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -0,0 +1,110 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.network;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+
+/**
+ * Responsible for the transferring of the data from the Client to the Server and the other way around
+ */
+
+public class ClientService {
+
+    private Socket socket;
+    private BufferedReader input;
+    private BufferedWriter output;
+
+    private String ip;
+    private int port;
+
+    private ExecutorService executor;
+
+    /**
+     * Creates a new ClientSession with a Socket, a Reader and Writer of the Input- and the Outputstream and a pool of threads to send requests and receive responses.
+     * @param ip : ip-adress of the server
+     * @param port : port of the server
+     */
+
+    public ClientService(String ip, int port) {
+
+        this.ip = ip;
+        this.port = port;
+
+        try {
+            socket = new Socket(this.ip, this.port);
+            System.out.println("Connected");
+            input = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            output = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));
+        }
+        catch (UnknownHostException u) {
+            System.out.println(u);
+            return;
+        }
+        catch (IOException i) {
+            System.out.println(i);
+            return;
+        }
+
+        executor = Executors.newSingleThreadExecutor();
+
+
+    }
+
+    /**
+     * Sends a Chat Message to the Server and awaits a response, which will be passed along
+     * @param message : Protocol Message of type "Message" to be sent to the server
+     * @return ArrayList<String> : The Response of the Server to be interpreted later
+     */
+
+    public Future<ArrayList<String>> sendMessage(Message message) {
+
+        String time = message.hourTime + ":" + message.minuteTime;
+
+        String request = "";
+
+        if (message.target == null && message.game_id == 0) {
+            request = String.format("SEND_MESSAGE TYPE=GLOBAL GAME=null USER=%s TARGET=null TEXT=%s TIME=%s", message.name, message.getMessage(), time);
+        }
+        else if (message.target == null) {
+            request = String.format("SEND_MESSAGE TYPE=LOBBY GAME=%d USER=%s TARGET=null TEXT=%s TIME=%s", message.game_id, message.name, message.getMessage(), time);
+        } else {
+            request = String.format("SEND_MESSAGE TYPE=WHISPER GAME=%d USER=%s TARGET=%s TEXT=%s TIME=%s", message.game_id, message.name, message.target, message.getMessage(), time);
+        }
+
+        System.out.println("Writing following request: " + request);
+
+        sendRequest task = new sendRequest(request, input, output);
+
+        Future<ArrayList<String>> response = executor.submit(task);
+
+        return response;
+    }
+
+    /**
+     * Closes the Socket and shuts down the Threadpool associated with that Socket-Connection.
+     */
+
+    public void closeSocket() {
+
+        try {
+            executor.shutdown();
+            input.close();
+            output.close();
+            socket.close();
+        } catch (IOException j) {
+            System.out.println(j);
+        }
+
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java
new file mode 100644
index 0000000..cb0a4fb
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java
@@ -0,0 +1,49 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.network;
+
+import java.io.BufferedReader;
+import java.util.concurrent.Callable;
+
+import java.util.ArrayList;
+
+import java.io.*;
+
+public class sendRequest implements Callable<ArrayList<String>> {
+
+    final private String request;
+    final private BufferedReader input;
+    final private BufferedWriter output;
+
+    public sendRequest(String request, BufferedReader input, BufferedWriter output) {
+        this.request = request;
+        this.input = input;
+        this.output = output;
+    }
+
+    @Override
+    public ArrayList<String> call() throws Exception {
+        try {
+            output.write(request+"\n");
+            output.flush();
+            System.out.println("Writing following request: " + request);
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+
+        ArrayList<String> response = new ArrayList<>();
+
+        try {
+            String line;
+            while ((line = input.readLine()) != null) {
+                if (line.toLowerCase().startsWith("ok")) {
+                    break;
+                }
+                response.add(line);
+            }
+
+            System.out.println("Response from server: " + response.get(0));
+        }
+        catch (Exception e) {System.out.println(e);}
+
+        return response;
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/Server.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/Server.java
new file mode 100644
index 0000000..98bbbcc
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/Server.java
@@ -0,0 +1,59 @@
+package ch.unibas.dmi.dbis.cs108.casono.server;
+
+import java.io.*;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+public class Server {
+    private ServerSocket ss = null;
+    private BufferedReader input = null;
+    private BufferedWriter output = null;
+
+    public Server(int port) {
+        try {
+            ss = new ServerSocket(port);
+            System.out.println("Server started");
+        }
+        catch (IOException e) {
+            System.out.println(e.getMessage());
+        }
+    }
+
+    public void simpleListenLoop() {
+        System.out.println("Waiting for connection...");
+        Socket s = null;
+        try {
+        while (true) {
+                s = ss.accept();
+            System.out.println("Accepted connection");
+
+            input = new BufferedReader(new InputStreamReader(s.getInputStream()));
+
+            output = new BufferedWriter(new OutputStreamWriter(s.getOutputStream()));
+            String line = null;
+            while((line = input.readLine())!=null) {
+                System.out.println("Server got "+ line);
+                // do something with this line
+                output.write("OK"+"\n");
+                output.flush();
+                if(Thread.currentThread().isInterrupted()) {
+                    return;
+                }
+            }
+            if(Thread.currentThread().isInterrupted()) {
+                return;
+            }
+        }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            try {
+                s.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
new file mode 100644
index 0000000..56cc2d5
--- /dev/null
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
@@ -0,0 +1,35 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.network;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.Server;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+public class ClientServiceTest {
+
+    Server server = null;
+    private Thread serverThread;
+
+    @BeforeEach
+    public void setUp() {
+        server = new Server(5000);
+        serverThread = new Thread(()-> server.simpleListenLoop());
+        serverThread.start();
+    }
+    @AfterEach
+    public void tearDown() {
+        serverThread.interrupt();
+    }
+    @Test
+    public void testClientService() throws ExecutionException, InterruptedException {
+        ClientService client = new ClientService("localhost", 5000);
+        Future<ArrayList<String>> future = client.sendMessage(new Message("bla", "name"));
+        future.get();
+        client.closeSocket();
+    }
+}

From 892f0553f6daaa4ce675309237fd83df2ca36694 Mon Sep 17 00:00:00 2001
From: ginkelmath <mathis.ginkel@gmail.com>
Date: Sat, 14 Mar 2026 11:46:05 +0100
Subject: [PATCH 2/5] Change protocol implementation

---
 .../casono/client/network/ClientParser.java   | 26 +++++
 .../casono/client/network/ClientService.java  | 98 ++++++++++++++++---
 .../client/network/ResponseException.java     |  9 ++
 .../casono/client/network/sendRequest.java    | 30 +++---
 .../client/network/ClientServiceTest.java     |  1 +
 5 files changed, 137 insertions(+), 27 deletions(-)
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientParser.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ResponseException.java

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientParser.java
new file mode 100644
index 0000000..3334a6b
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientParser.java
@@ -0,0 +1,26 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.network;
+
+public class ClientParser {
+    public static final String Seperator = " ";
+
+    enum Protocol {}
+
+    public void parseMessage(String msg) {
+        var parts = msg.split(Seperator);
+
+        switch (parts[0]) {
+            case :
+
+            case :
+
+            case :
+
+            case :
+
+            default :
+                System.out.println("Response " + msg + " is not recognized");
+        }
+
+
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
index e8f9f28..5b9d2b4 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -6,6 +6,8 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.net.Socket;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -30,6 +32,8 @@ public class ClientService {
 
     private ExecutorService executor;
 
+    public static ArrayList<String> response;
+
     /**
      * Creates a new ClientSession with a Socket, a Reader and Writer of the Input- and the Outputstream and a pool of threads to send requests and receive responses.
      * @param ip : ip-adress of the server
@@ -57,8 +61,57 @@ public class ClientService {
         }
 
         executor = Executors.newSingleThreadExecutor();
+    }
 
+    /**
+     * Sends a Request to get all the messages, the other clients sent, and that the client is not currently aware of.
+     */
 
+    public List<String> getMessage() {
+        return processMessage("GET_MESSAGE");
+    }
+
+    private List<String> processMessage(String message) {
+        List<String> response = new ArrayList<>();
+        sendRequest(() -> {
+            try {
+                output.write(message+"\n");
+                output.flush();
+                String line;
+                while ((line = input.readLine()) != null) {
+                    if (line.toLowerCase().startsWith(".")) {
+                        break;
+                    }
+                    response.add(line);
+                }
+            } catch (Exception e) {
+                throw getRuntimeException(e);
+            }
+        });
+        return response;
+    }
+
+    private void sendRequest(Runnable request) {
+        Future<?> future = executor.submit(request);
+        try {
+            future.get();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        } catch (ExecutionException e) {
+            throw getRuntimeException(e);
+        }
+    }
+
+    private static RuntimeException getRuntimeException(Exception e) {
+        Throwable reason = e.getCause();
+        RuntimeException re;
+        if (reason == null) {
+            reason = e;
+        } else if (reason instanceof RuntimeException rte) {
+            re = rte;
+        }
+        re = new RuntimeException(reason);
+        return re;
     }
 
     /**
@@ -67,27 +120,51 @@ public class ClientService {
      * @return ArrayList<String> : The Response of the Server to be interpreted later
      */
 
-    public Future<ArrayList<String>> sendMessage(Message message) {
-
+    public ArrayList<String> sendMessage(Message message) {
         String time = message.hourTime + ":" + message.minuteTime;
-
         String request = "";
-
         if (message.target == null && message.game_id == 0) {
-            request = String.format("SEND_MESSAGE TYPE=GLOBAL GAME=null USER=%s TARGET=null TEXT=%s TIME=%s", message.name, message.getMessage(), time);
+            request = String.format("SEND_MESSAGE TYPE=GLOBAL GAME=null USER=%s TARGET=null TIME=%s TEXT=%s", message.name, time, message.getMessage());
         }
         else if (message.target == null) {
-            request = String.format("SEND_MESSAGE TYPE=LOBBY GAME=%d USER=%s TARGET=null TEXT=%s TIME=%s", message.game_id, message.name, message.getMessage(), time);
+            request = String.format("SEND_MESSAGE TYPE=LOBBY GAME=%d USER=%s TARGET=null TIME=%s TEXT=%s", message.game_id, message.name,  time, message.getMessage());
         } else {
-            request = String.format("SEND_MESSAGE TYPE=WHISPER GAME=%d USER=%s TARGET=%s TEXT=%s TIME=%s", message.game_id, message.name, message.target, message.getMessage(), time);
+            request = String.format("SEND_MESSAGE TYPE=WHISPER GAME=%d USER=%s TARGET=%s TIME=%s TEXT=%s", message.game_id, message.name, message.target, time, message.getMessage());
         }
-
         System.out.println("Writing following request: " + request);
-
         sendRequest task = new sendRequest(request, input, output);
+        executor.submit(task);
+        return this.response;
+    }
 
-        Future<ArrayList<String>> response = executor.submit(task);
+    public ArrayList<String> getState(int game_id) {
+        String request = String.format("GET_STATE GAME=%d", game_id);
+        sendRequest task = new sendRequest(request, input, output);
+        executor.submit(task);
+        return this.response;
 
+    }
+
+    public ArrayList<String> joinGame(int game_id, String name) {
+        String request = String.format("JOIN GAME=%d NAME=%s", game_id, name);
+        sendRequest task = new sendRequest(request, input, output);
+        executor.submit(task);
+        return response;
+    }
+
+    /**
+     *
+     * @param type : Keyword, as one-word description of the action the player did.
+     * @param game_id : ID of the Lobby that the client is currently in
+     * @param value : Dependent on the action of the User (money)
+     * @param name : Username of the player of that Client
+     * @return The Response of the Server -> Action successfull only if response is valid
+     */
+
+    public ArrayList<String>sendAction(String type, int game_id, String action, int value, String name) {
+        String request = String.format("SEND_ACTION TYPE=%s GAME=%s ACTION=%s VALUE=%d NAME=%s", type, game_id, action, value, name);
+        sendRequest task = new sendRequest(request, input, output);
+        executor.submit(task);
         return response;
     }
 
@@ -96,7 +173,6 @@ public class ClientService {
      */
 
     public void closeSocket() {
-
         try {
             executor.shutdown();
             input.close();
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ResponseException.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ResponseException.java
new file mode 100644
index 0000000..5ab8a3a
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ResponseException.java
@@ -0,0 +1,9 @@
+package ch.unibas.dmi.dbis.cs108.casono.client.network;
+
+public class ResponseException extends Exception {
+    public ResponseException() {
+        super();
+    }
+
+}
+
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java
index cb0a4fb..1c94f95 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java
@@ -3,11 +3,13 @@ package ch.unibas.dmi.dbis.cs108.casono.client.network;
 import java.io.BufferedReader;
 import java.util.concurrent.Callable;
 
+import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
+
 import java.util.ArrayList;
 
 import java.io.*;
 
-public class sendRequest implements Callable<ArrayList<String>> {
+public class sendRequest implements Runnable {
 
     final private String request;
     final private BufferedReader input;
@@ -20,30 +22,26 @@ public class sendRequest implements Callable<ArrayList<String>> {
     }
 
     @Override
-    public ArrayList<String> call() throws Exception {
+    public void run() {
         try {
-            output.write(request+"\n");
+            output.write(request + "\r\n");
             output.flush();
-            System.out.println("Writing following request: " + request);
+            //System.out.println("Writing following request: " + request);
         } catch (Exception e) {
             System.out.println(e);
         }
 
-        ArrayList<String> response = new ArrayList<>();
-
         try {
-            String line;
-            while ((line = input.readLine()) != null) {
-                if (line.toLowerCase().startsWith("ok")) {
+            while (true) {
+                String line;
+                line = input.readLine();
+                if (line.toLowerCase().startsWith("+ok")) {
                     break;
                 }
-                response.add(line);
+                ClientService.response.add(line);
             }
-
-            System.out.println("Response from server: " + response.get(0));
+        } catch (Exception e) {
+            System.out.println(e);
         }
-        catch (Exception e) {System.out.println(e);}
-
-        return response;
     }
-}
+}
\ No newline at end of file
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
index 56cc2d5..967636a 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
@@ -25,6 +25,7 @@ public class ClientServiceTest {
     public void tearDown() {
         serverThread.interrupt();
     }
+
     @Test
     public void testClientService() throws ExecutionException, InterruptedException {
         ClientService client = new ClientService("localhost", 5000);

From 3809b7e0e2bead01bf11a0a74c71d519710acd8f Mon Sep 17 00:00:00 2001
From: ginkelmath <mathis.ginkel@gmail.com>
Date: Sat, 14 Mar 2026 14:33:17 +0100
Subject: [PATCH 3/5] Fix: update clientservice

---
 .../cs108/casono/client/chat/Message.java     | 148 ++++++++++++++----
 .../casono/client/network/ClientParser.java   |  26 ---
 .../casono/client/network/ClientService.java  |  57 +------
 .../client/network/ResponseException.java     |   9 --
 .../client/network/ClientServiceTest.java     |   4 +-
 5 files changed, 118 insertions(+), 126 deletions(-)
 delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientParser.java
 delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ResponseException.java

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
index 44e2c45..d5b5a1c 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
@@ -1,57 +1,137 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.chat;
 
 import java.time.LocalTime;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Message Object for internal handling of Chat-Messages
+ * TODO: Should be used on both sides of the network
+ */
 
 public class Message {
+    private final MessageType type;
     private String message;
-    public String name;
-    public int hourTime;
-    public int minuteTime;
+    public String user;
+    public String timestamp;
     public int game_id = 0;
     public String target = null;
+    public enum MessageType {
+        GLOBAL, LOBBY, WHISPER
+    };
 
-    // For Global Chat
+    public static final String SEPERATOR = " ";
 
-    public  Message(String message, String name) {
-        this.message = message;
-        this.name = name;
-        LocalTime now = LocalTime.now();
-        this.hourTime = now.getHour();
-        this.minuteTime = now.getMinute();
-    }
+    /**
+     * Constructor for creating Messages with all information given
+     * @param type - Either global, local or whisper
+     * @param game_id - lobby id, or null, if the type is global
+     * @param user - username
+     * @param target - username of the target user, for whisper chat
+     * @param message
+     */
 
-    // For Lobby Chat
-
-    public  Message(String message, String name, int game_id) {
-        this.message = message;
-        this.name = name;
-        LocalTime now = LocalTime.now();
-        this.hourTime = now.getHour();
-        this.minuteTime = now.getMinute();
-        this.game_id = game_id;
-    }
-
-    // For Whisper Chat
-
-    public  Message(String message, String name, int game_id, String target) {
-        this.message = message;
-        this.name = name;
-        LocalTime now = LocalTime.now();
-        this.hourTime = now.getHour();
-        this.minuteTime = now.getMinute();
+    public Message(MessageType type, int game_id, String user, String target, String timestamp, String message) {
+        this.type = type;
         this.game_id = game_id;
+        this.user = user;
         this.target = target;
+        this.timestamp = timestamp;
+        this.message = message;
     }
 
+    /**
+     * Constructor for creating the Messages of the current user, using this client -> time of writing is being recorded
+     * @param type - Either global, local or whisper
+     * @param game_id - lobby id, or null, if the type is global
+     * @param user - username
+     * @param target - username of the target user, for whisper chat
+     * @param message
+     */
+
+    public Message(MessageType type, int game_id, String user, String target, String message) {
+        this.type = type;
+        this.game_id = game_id;
+        this.user = user;
+        this.target = target;
+        this.message = message;
+        LocalTime now = LocalTime.now();
+        this.timestamp = now.toString();
+    }
+
+
     public String getMessage() {
         return message;
     }
 
-    public String toString() {
-        return String.format("%s: %s", this.name, this.message);
+    public String getMessageType() {
+        return type.toString();
     }
 
-    public void print() {
-        System.out.println(this.toString());
+    /**
+     * Method to test the system
+     * @return - String representation of the Message instance, as for example "player1: Hello World"
+     */
+    public String toString() {
+        return String.format("%s: %s", this.user, this.message);
+    }
+
+    /**
+     * Method to create the request representation of the message object, to be sent to the server
+     * @return - request as specified in the network protocol, as String
+     */
+    public String toRequest() {
+        String request = String.format("SEND_MESSAGE TYPE=%s GAME=%d USER=%s TARGET=%s TIME=%s TEXT=%s",
+                this.type.toString(), this.game_id, this.user, this.target, this.timestamp, this.message);
+        return request;
+    }
+
+
+    /**
+     * Pattern, to analyze the response String with the given parameters
+     */
+    public static Pattern msgRex = Pattern.compile("TYPE=(?<type>\\w+) GAME=(?<game>\\w+) USER=(?<user>\\w+) TARGET=(?<target>\\w+) TIME=(?<time>[0-9:]+) TEXT=(?<text>.*)$");
+
+    /**
+     * Method to create a Message Object, from the information given by the String
+     * @param response - String that got sent as a response from the server
+     * @return - New Message Object
+     */
+    public static Message toMessage(String response) {
+        var parts = response.split(SEPERATOR);
+        Matcher m = msgRex.matcher(response);
+        if (! m.matches()) {
+            throw new RuntimeException("Can not parse message: " + response);
+        }
+        String typeString=m.group("type");
+
+        switch (typeString) {
+            case "GLOBAL":
+                return new Message(MessageType.GLOBAL,
+                        0,
+                        m.group("user"),
+                        null,
+                        m.group("time"),
+                        m.group("text"));
+
+            case "LOBBY":
+                return new Message(MessageType.LOBBY,
+                        Integer.parseInt(m.group("game")),
+                        m.group("user"),
+                        null,
+                        m.group("time"),
+                        m.group("text"));
+
+            case "WHISPER":
+                return new Message(MessageType.WHISPER,
+                        Integer.parseInt(m.group("game")),
+                        m.group("user"),
+                        m.group("target"),
+                        m.group("time"),
+                        m.group("text"));
+
+            default:
+                throw new RuntimeException("Unknown message type " + typeString);
+        }
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientParser.java
deleted file mode 100644
index 3334a6b..0000000
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientParser.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.client.network;
-
-public class ClientParser {
-    public static final String Seperator = " ";
-
-    enum Protocol {}
-
-    public void parseMessage(String msg) {
-        var parts = msg.split(Seperator);
-
-        switch (parts[0]) {
-            case :
-
-            case :
-
-            case :
-
-            case :
-
-            default :
-                System.out.println("Response " + msg + " is not recognized");
-        }
-
-
-    }
-}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
index 5b9d2b4..700fc2a 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -71,6 +71,8 @@ public class ClientService {
         return processMessage("GET_MESSAGE");
     }
 
+    public List<String> sendMessage(Message message) { return processMessage(message.toRequest()); }
+
     private List<String> processMessage(String message) {
         List<String> response = new ArrayList<>();
         sendRequest(() -> {
@@ -113,61 +115,6 @@ public class ClientService {
         re = new RuntimeException(reason);
         return re;
     }
-
-    /**
-     * Sends a Chat Message to the Server and awaits a response, which will be passed along
-     * @param message : Protocol Message of type "Message" to be sent to the server
-     * @return ArrayList<String> : The Response of the Server to be interpreted later
-     */
-
-    public ArrayList<String> sendMessage(Message message) {
-        String time = message.hourTime + ":" + message.minuteTime;
-        String request = "";
-        if (message.target == null && message.game_id == 0) {
-            request = String.format("SEND_MESSAGE TYPE=GLOBAL GAME=null USER=%s TARGET=null TIME=%s TEXT=%s", message.name, time, message.getMessage());
-        }
-        else if (message.target == null) {
-            request = String.format("SEND_MESSAGE TYPE=LOBBY GAME=%d USER=%s TARGET=null TIME=%s TEXT=%s", message.game_id, message.name,  time, message.getMessage());
-        } else {
-            request = String.format("SEND_MESSAGE TYPE=WHISPER GAME=%d USER=%s TARGET=%s TIME=%s TEXT=%s", message.game_id, message.name, message.target, time, message.getMessage());
-        }
-        System.out.println("Writing following request: " + request);
-        sendRequest task = new sendRequest(request, input, output);
-        executor.submit(task);
-        return this.response;
-    }
-
-    public ArrayList<String> getState(int game_id) {
-        String request = String.format("GET_STATE GAME=%d", game_id);
-        sendRequest task = new sendRequest(request, input, output);
-        executor.submit(task);
-        return this.response;
-
-    }
-
-    public ArrayList<String> joinGame(int game_id, String name) {
-        String request = String.format("JOIN GAME=%d NAME=%s", game_id, name);
-        sendRequest task = new sendRequest(request, input, output);
-        executor.submit(task);
-        return response;
-    }
-
-    /**
-     *
-     * @param type : Keyword, as one-word description of the action the player did.
-     * @param game_id : ID of the Lobby that the client is currently in
-     * @param value : Dependent on the action of the User (money)
-     * @param name : Username of the player of that Client
-     * @return The Response of the Server -> Action successfull only if response is valid
-     */
-
-    public ArrayList<String>sendAction(String type, int game_id, String action, int value, String name) {
-        String request = String.format("SEND_ACTION TYPE=%s GAME=%s ACTION=%s VALUE=%d NAME=%s", type, game_id, action, value, name);
-        sendRequest task = new sendRequest(request, input, output);
-        executor.submit(task);
-        return response;
-    }
-
     /**
      * Closes the Socket and shuts down the Threadpool associated with that Socket-Connection.
      */
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ResponseException.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ResponseException.java
deleted file mode 100644
index 5ab8a3a..0000000
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ResponseException.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.client.network;
-
-public class ResponseException extends Exception {
-    public ResponseException() {
-        super();
-    }
-
-}
-
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
index 967636a..b615453 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
@@ -7,6 +7,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
@@ -29,8 +30,7 @@ public class ClientServiceTest {
     @Test
     public void testClientService() throws ExecutionException, InterruptedException {
         ClientService client = new ClientService("localhost", 5000);
-        Future<ArrayList<String>> future = client.sendMessage(new Message("bla", "name"));
-        future.get();
+        List<String> response = client.sendMessage(new Message(Message.MessageType.GLOBAL, 0, "Mathis", null, "blahh"));
         client.closeSocket();
     }
 }

From d6468c9595ab1018e5b23df52de3a8d0b52376d9 Mon Sep 17 00:00:00 2001
From: Mathis Ginkel <m.ginkel@stud.unibas.ch>
Date: Sun, 15 Mar 2026 15:12:25 +0100
Subject: [PATCH 4/5] add: first version of client to client chat

---
 .../cs108/casono/client/chat/Message.java     | 33 ++++---
 .../casono/client/network/ClientService.java  | 87 +++++++++++--------
 .../dbis/cs108/casono/server/ServerApp.java   |  4 +
 .../network/events/ChatMessageEvent.java      | 15 ++++
 .../server/network/handlers/ChatHandler.java  | 35 ++++++++
 .../server/network/sessions/Session.java      | 70 ++++++++++++---
 .../network/transport/TcpTransport.java       |  7 +-
 .../client/network/ClientServiceTest.java     | 42 +++++++--
 8 files changed, 214 insertions(+), 79 deletions(-)
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/ChatMessageEvent.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/ChatHandler.java

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
index d5b5a1c..8fb2b0e 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
@@ -1,6 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.chat;
 
-import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -11,7 +12,7 @@ import java.util.regex.Pattern;
 
 public class Message {
     private final MessageType type;
-    private String message;
+    private final String message;
     public String user;
     public String timestamp;
     public int game_id = 0;
@@ -20,8 +21,6 @@ public class Message {
         GLOBAL, LOBBY, WHISPER
     };
 
-    public static final String SEPERATOR = " ";
-
     /**
      * Constructor for creating Messages with all information given
      * @param type - Either global, local or whisper
@@ -55,8 +54,9 @@ public class Message {
         this.user = user;
         this.target = target;
         this.message = message;
-        LocalTime now = LocalTime.now();
-        this.timestamp = now.toString();
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
+        this.timestamp = now.format(formatter);
     }
 
 
@@ -64,33 +64,33 @@ public class Message {
         return message;
     }
 
-    public String getMessageType() {
-        return type.toString();
+    public MessageType getMessageType() {
+        return type;
     }
 
-    /**
+    /*
      * Method to test the system
      * @return - String representation of the Message instance, as for example "player1: Hello World"
-     */
+
     public String toString() {
         return String.format("%s: %s", this.user, this.message);
     }
-
+    */
     /**
      * Method to create the request representation of the message object, to be sent to the server
      * @return - request as specified in the network protocol, as String
      */
-    public String toRequest() {
-        String request = String.format("SEND_MESSAGE TYPE=%s GAME=%d USER=%s TARGET=%s TIME=%s TEXT=%s",
+    public String toArgsString() {
+        return String.format("TYPE=%s GAME=%d USER=%s TARGET=%s TIME=%s TEXT=%s",
                 this.type.toString(), this.game_id, this.user, this.target, this.timestamp, this.message);
-        return request;
     }
 
 
     /**
      * Pattern, to analyze the response String with the given parameters
      */
-    public static Pattern msgRex = Pattern.compile("TYPE=(?<type>\\w+) GAME=(?<game>\\w+) USER=(?<user>\\w+) TARGET=(?<target>\\w+) TIME=(?<time>[0-9:]+) TEXT=(?<text>.*)$");
+    public static Pattern msgRex = Pattern.compile(
+            "TYPE=(?<type>\\w+) GAME=(?<game>\\w+) USER=(?<user>\\w+) TARGET=(?<target>\\w+) TIME=(?<time>[0-9:.]+) TEXT=(?<text>.*)$");
 
     /**
      * Method to create a Message Object, from the information given by the String
@@ -98,10 +98,9 @@ public class Message {
      * @return - New Message Object
      */
     public static Message toMessage(String response) {
-        var parts = response.split(SEPERATOR);
         Matcher m = msgRex.matcher(response);
         if (! m.matches()) {
-            throw new RuntimeException("Can not parse message: " + response);
+            throw new RuntimeException("Can not parse message: '" + response+"'");
         }
         String typeString=m.group("type");
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
index 700fc2a..3ad46ca 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -1,9 +1,5 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.network;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
@@ -13,9 +9,13 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 import java.io.IOException;
-import java.net.UnknownHostException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TcpTransport;
+
 
 /**
  * Responsible for the transferring of the data from the Client to the Server and the other way around
@@ -23,16 +23,16 @@ import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 
 public class ClientService {
 
-    private Socket socket;
-    private BufferedReader input;
-    private BufferedWriter output;
+    private final TcpTransport clienttcptransport;
+    private final Socket socket;
 
-    private String ip;
-    private int port;
+    private final String ip;
+    private final int port;
 
-    private ExecutorService executor;
+    private final ExecutorService executor;
 
     public static ArrayList<String> response;
+    private final AtomicInteger idGenerator;
 
     /**
      * Creates a new ClientSession with a Socket, a Reader and Writer of the Input- and the Outputstream and a pool of threads to send requests and receive responses.
@@ -44,20 +44,15 @@ public class ClientService {
 
         this.ip = ip;
         this.port = port;
+        this.idGenerator = new AtomicInteger(0);
 
         try {
             socket = new Socket(this.ip, this.port);
             System.out.println("Connected");
-            input = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-            output = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));
-        }
-        catch (UnknownHostException u) {
-            System.out.println(u);
-            return;
+            clienttcptransport = new TcpTransport(socket);
         }
         catch (IOException i) {
-            System.out.println(i);
-            return;
+            throw new RuntimeException(i);
         }
 
         executor = Executors.newSingleThreadExecutor();
@@ -67,30 +62,47 @@ public class ClientService {
      * Sends a Request to get all the messages, the other clients sent, and that the client is not currently aware of.
      */
 
-    public List<String> getMessage() {
-        return processMessage("GET_MESSAGE");
+    public List<Message> getMessages() {
+        String countStr = processMessage("GET_MESSAGE_COUNT");
+        int count = Integer.parseInt(countStr);
+        System.out.println("Got " + count + " messages");
+        List<Message> messages = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            String  message = processMessage("GET_NEXT_MESSAGE");
+            if (message != null) {
+                Message message1 = Message.toMessage(message);
+                messages.add(message1);
+            }
+        }
+        return messages;
     }
 
-    public List<String> sendMessage(Message message) { return processMessage(message.toRequest()); }
+    public String sendMessage(Message message) {
+        String request = "SEND_MESSAGE " + message.toArgsString();
+        return processMessage(request);
+    }
 
-    private List<String> processMessage(String message) {
-        List<String> response = new ArrayList<>();
+    private String processMessage(String message) {
+        AtomicReference<String> response = new AtomicReference<>();
         sendRequest(() -> {
             try {
-                output.write(message+"\n");
-                output.flush();
-                String line;
-                while ((line = input.readLine()) != null) {
-                    if (line.toLowerCase().startsWith(".")) {
-                        break;
+                writeToTransport(message);
+                String responseLine=null;
+                do {
+                    responseLine = clienttcptransport.read().payload();
+                    System.out.println("Raw message '" + responseLine + "'");
+                    if ("+OK".equals(responseLine)) {
+                        return;
+                    } else if ("-FAIL".equals(responseLine)) {
+                        throw new RuntimeException(responseLine);
                     }
-                    response.add(line);
-                }
+                    response.set(responseLine);
+                } while(true);
             } catch (Exception e) {
                 throw getRuntimeException(e);
             }
         });
-        return response;
+        return response.get();
     }
 
     private void sendRequest(Runnable request) {
@@ -122,12 +134,17 @@ public class ClientService {
     public void closeSocket() {
         try {
             executor.shutdown();
-            input.close();
-            output.close();
+            clienttcptransport.close();
             socket.close();
         } catch (IOException j) {
             System.out.println(j);
         }
 
     }
+
+    private void writeToTransport(String s) throws IOException {
+        int id = this.idGenerator.incrementAndGet();
+        this.clienttcptransport.write(new RawPacket(id, s));
+    }
+
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java
index d44df55..0e0b517 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java
@@ -25,6 +25,10 @@ public class ServerApp {
         Logger logger = LogManager.getLogger(ServerApp.class);
         logger.info("Starting server at port {}", port);
 
+        startServerCore(port);
+    }
+
+    public static void startServerCore(int port) {
         EventBus eventBus = new EventBus();
         SessionManager sessionManager = new SessionManager();
         eventBus.subscribe(
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/ChatMessageEvent.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/ChatMessageEvent.java
new file mode 100644
index 0000000..3f5f4db
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/ChatMessageEvent.java
@@ -0,0 +1,15 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.network.events;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+
+public class ChatMessageEvent implements Event {
+    private final Message message;
+
+    public ChatMessageEvent(Message message) {
+        this.message = message;
+    }
+
+    public Message getMessage() {
+        return message;
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/ChatHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/ChatHandler.java
new file mode 100644
index 0000000..d409401
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/ChatHandler.java
@@ -0,0 +1,35 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.network.handlers;
+
+import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.events.ChatMessageEvent;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus;
+
+import java.util.ArrayDeque;
+
+public class ChatHandler {
+    private final EventBus eventBus;
+    private final ArrayDeque<Message> receivedMessages = new ArrayDeque<>();
+    public ChatHandler(EventBus eventBus) {
+        eventBus.subscribe(ChatMessageEvent.class, (event) -> {
+            processMessageEvent(event.getMessage());
+        });
+        this.eventBus = eventBus;
+    }
+
+    private synchronized void processMessageEvent(Message message) {
+        // TODO: filter
+        this.receivedMessages.offer(message);
+    }
+
+    public synchronized int getMessageCount() {
+        return this.receivedMessages.size();
+    }
+    public synchronized Message getNextMessage() {
+        return this.receivedMessages.poll();
+    }
+
+    public void sendMessage(String messageString) {
+        Message msg = Message.toMessage(messageString);
+        this.eventBus.publish(new ChatMessageEvent(msg));
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java
index 97e3943..ffe5d6e 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java
@@ -1,24 +1,30 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.PrimitiveRequest;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.ProtocolParser;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer;
 import java.io.EOFException;
 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.handlers.ChatHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-/** Represents a client session in the network server. */
+import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer;
+
+/**
+ * Represents a client session in the network server.
+ */
 public class Session implements Runnable {
+    private final ChatHandler chatHandler;
     private SessionId id;
     private Thread thread;
     private TransportLayer transport;
     private Logger logger;
     private Boolean running;
     private EventBus eventBus;
+    private AtomicInteger idGenerator;
 
     /**
      * Creates a new Session with the given transport and event bus.
@@ -36,6 +42,8 @@ public class Session implements Runnable {
 
         this.logger = LogManager.getLogger(Session.class.toString() + id.value());
         this.logger.info("Created new session");
+        this.idGenerator = new AtomicInteger();
+        this.chatHandler = new ChatHandler(eventBus);
     }
 
     /**
@@ -47,7 +55,9 @@ public class Session implements Runnable {
         return this.id;
     }
 
-    /** Starts the session thread. */
+    /**
+     * Starts the session thread.
+     */
     public void start() {
         thread.start();
     }
@@ -62,16 +72,43 @@ public class Session implements Runnable {
         this.running = false;
     }
 
-    /** Runs the session loop, reading from the transport. */
+    /**
+     * Runs the session loop, reading from the transport.
+     */
     @Override
     public void run() {
         while (running) {
             try {
-                RawPacket rawPacket = transport.read();
-                logger.debug("Recieved: {}", rawPacket);
-
-                PrimitiveRequest primitiveRequest = ProtocolParser.parse(rawPacket);
-                logger.debug("Parsed request to {}", primitiveRequest);
+                String clientCommand = transport.read().payload();
+                String[] commandAndArgs = clientCommand.split("\\s+", 2);
+                String commandWord = commandAndArgs[0];
+                System.out.println("Session "+id.value()+" Received: " + commandAndArgs[0]);
+            switch (commandWord) {
+                    case "SEND_MESSAGE":
+                        this.chatHandler.sendMessage(commandAndArgs[1]);
+                        writeToTransport("+OK");
+                        writeToTransport("+OK");
+                        break;
+                    case "GET_MESSAGE_COUNT":
+                        int count = chatHandler.getMessageCount();
+                        writeToTransport(""+count);
+                        writeToTransport("+OK");
+                        break;
+                    case "GET_NEXT_MESSAGE":
+                         if (chatHandler.getMessageCount() == 0) {
+                             logger.warn("FAIL No more messages!");
+                             writeToTransport("-FAIL");
+                         } else {
+                             String msgString = chatHandler.getNextMessage().toArgsString();
+                             logger.debug("Session "+id.value()+" Write next message "+msgString);
+                             writeToTransport(msgString);
+                             writeToTransport("+OK");
+                         }
+                         break;
+                    default:
+                        this.logger.warn("Unknown command: " + commandWord);
+                        writeToTransport("-FAIL");
+                }
             } catch (EOFException e) {
                 logger.info("Client disconnected");
                 eventBus.publish(new DisconnectEvent(id));
@@ -82,4 +119,9 @@ public class Session implements Runnable {
             }
         }
     }
+
+    private void writeToTransport(String s) throws IOException {
+        int id = this.idGenerator.incrementAndGet();
+        this.transport.write(new RawPacket(id, s));
+    }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TcpTransport.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TcpTransport.java
index 9a15f01..9dbcb35 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TcpTransport.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TcpTransport.java
@@ -8,8 +8,8 @@ import java.nio.charset.StandardCharsets;
 
 /** Implements TCP-based transport layer for network communication. */
 public class TcpTransport implements TransportLayer {
-    private Socket socket;
-    private DataInputStream in;
+    private final Socket socket;
+    private final DataInputStream in;
     private DataOutputStream out;
 
     /**
@@ -49,9 +49,8 @@ public class TcpTransport implements TransportLayer {
     public void write(RawPacket data) throws IOException {
         int requestId = data.requestId();
         byte[] rawPayload = data.payload().getBytes(StandardCharsets.UTF_8);
-
-        out.writeInt(requestId);
         out.writeInt(rawPayload.length);
+        out.writeInt(requestId);
         out.write(rawPayload);
         out.flush();
     }
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
index b615453..55ea07e 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
@@ -2,14 +2,15 @@ package ch.unibas.dmi.dbis.cs108.casono.client.network;
 
 import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 import ch.unibas.dmi.dbis.cs108.casono.server.Server;
+import ch.unibas.dmi.dbis.cs108.casono.server.ServerApp;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ClientServiceTest {
 
@@ -18,19 +19,42 @@ public class ClientServiceTest {
 
     @BeforeEach
     public void setUp() {
-        server = new Server(5000);
-        serverThread = new Thread(()-> server.simpleListenLoop());
-        serverThread.start();
+        //server = new Server(5000);
+        //serverThread = new Thread(()-> server.simpleListenLoop());
+        //serverThread.start();
+        ServerApp.startServerCore(5000);
     }
     @AfterEach
     public void tearDown() {
-        serverThread.interrupt();
+
+        //serverThread.interrupt();
     }
 
     @Test
     public void testClientService() throws ExecutionException, InterruptedException {
-        ClientService client = new ClientService("localhost", 5000);
-        List<String> response = client.sendMessage(new Message(Message.MessageType.GLOBAL, 0, "Mathis", null, "blahh"));
-        client.closeSocket();
+        ClientService client1 = new ClientService("localhost", 5000);
+        ClientService client2 = new ClientService("localhost", 5000);
+        Thread.sleep(2000);
+        String response = client1.sendMessage(new Message(Message.MessageType.GLOBAL, 0, "Mathis", null, "blahh"));
+        Thread.sleep(5000);
+        List<Message> received = client2.getMessages();
+
+        assertEquals(1, received.size());
+        Message s = received.get(0);
+        assertEquals(Message.MessageType.GLOBAL, s.getMessageType());
+    }
+
+    @Test
+    public void testMessage() {
+        Message msg = new Message(Message.MessageType.GLOBAL, 0, "Mathis", null, "blah");
+        Message msg2 = new Message(Message.MessageType.WHISPER, 1, "Mathis", "Julian", "blah");
+        String serial = msg.toArgsString();
+        Message roundTripped = Message.toMessage(serial);
+        String serial2 = msg2.toArgsString();
+        Message roundTripped2 = Message.toMessage(serial2);
+
+        assert(roundTripped.game_id == msg.game_id);
+        assertEquals(0, roundTripped.game_id);
+        assert(roundTripped2.game_id == msg2.game_id);
     }
 }

From 98df1dc227ff21a1a44cac1d8d6be9a60ef30979 Mon Sep 17 00:00:00 2001
From: Mathis Ginkel <m.ginkel@stud.unibas.ch>
Date: Sun, 15 Mar 2026 22:13:50 +0100
Subject: [PATCH 5/5] add: first implementation of login

---
 .../casono/client/network/ClientService.java  | 62 +++++++++++++++++--
 .../casono/client/network/sendRequest.java    | 47 --------------
 .../server/network/handlers/ChatHandler.java  | 23 ++++++-
 .../server/network/handlers/UserHandler.java  | 57 +++++++++++++++++
 .../server/network/sessions/Session.java      | 27 +++++---
 .../client/network/ClientServiceTest.java     |  7 ++-
 6 files changed, 163 insertions(+), 60 deletions(-)
 delete mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java
 create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/UserHandler.java

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
index 3ad46ca..386c146 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
@@ -59,7 +59,28 @@ public class ClientService {
     }
 
     /**
-     * Sends a Request to get all the messages, the other clients sent, and that the client is not currently aware of.
+     * Sends a ping to the server
+     * Returns nothing, the method processMessage() already handles the cases "+OK" or "-ERROR"
+     */
+
+    public void ping() {
+        processMessage("PING");
+    }
+
+    /**
+     * Sends a login request to the server to create a new user on the server
+     * @param username
+     * @return - a new username, if the same username is already used by someone else
+     */
+
+    public String login(String username) {
+        String msg = "LOGIN USERNAME=" + username;
+        return processMessage(msg);
+    }
+
+    /**
+     * Send a Request to get the number of Messages currently in the Queue for the client.
+     * Then proceeds, if needed, to get the messages by sending
      */
 
     public List<Message> getMessages() {
@@ -77,11 +98,26 @@ public class ClientService {
         return messages;
     }
 
-    public String sendMessage(Message message) {
+    /**
+     * Sends a Request to the Server containing all relevant information of the message the client wrote.
+     * @param message
+     * @return
+     */
+
+    public void sendMessage(Message message) {
         String request = "SEND_MESSAGE " + message.toArgsString();
-        return processMessage(request);
+        processMessage(request);
     }
 
+    /**
+     * Sends the Requests to the server and waits for the response
+     * If the response is "+OK" it proceeds normal
+     * If the response "-ERROR" it throws a runtime exception
+     * @param message
+     * @return - The response as a string, if it has to be returned
+     * (+OK will not be returned)
+     */
+
     private String processMessage(String message) {
         AtomicReference<String> response = new AtomicReference<>();
         sendRequest(() -> {
@@ -93,7 +129,7 @@ public class ClientService {
                     System.out.println("Raw message '" + responseLine + "'");
                     if ("+OK".equals(responseLine)) {
                         return;
-                    } else if ("-FAIL".equals(responseLine)) {
+                    } else if (("-ERROR").equals(responseLine)) {
                         throw new RuntimeException(responseLine);
                     }
                     response.set(responseLine);
@@ -105,6 +141,11 @@ public class ClientService {
         return response.get();
     }
 
+    /**
+     *
+     * @param request
+     */
+
     private void sendRequest(Runnable request) {
         Future<?> future = executor.submit(request);
         try {
@@ -116,6 +157,12 @@ public class ClientService {
         }
     }
 
+    /**
+     * Returns a Runtime Exceptions thrown by the sendRequest method
+     * @param e - an Exception
+     * @return - a Runtime Exception
+     */
+
     private static RuntimeException getRuntimeException(Exception e) {
         Throwable reason = e.getCause();
         RuntimeException re;
@@ -127,6 +174,7 @@ public class ClientService {
         re = new RuntimeException(reason);
         return re;
     }
+
     /**
      * Closes the Socket and shuts down the Threadpool associated with that Socket-Connection.
      */
@@ -142,6 +190,12 @@ public class ClientService {
 
     }
 
+    /**
+     * Method to write with the tcp transport to the server
+     * @param s - Message to be sent
+     * @throws IOException
+     */
+
     private void writeToTransport(String s) throws IOException {
         int id = this.idGenerator.incrementAndGet();
         this.clienttcptransport.write(new RawPacket(id, s));
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java
deleted file mode 100644
index 1c94f95..0000000
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/sendRequest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.client.network;
-
-import java.io.BufferedReader;
-import java.util.concurrent.Callable;
-
-import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
-
-import java.util.ArrayList;
-
-import java.io.*;
-
-public class sendRequest implements Runnable {
-
-    final private String request;
-    final private BufferedReader input;
-    final private BufferedWriter output;
-
-    public sendRequest(String request, BufferedReader input, BufferedWriter output) {
-        this.request = request;
-        this.input = input;
-        this.output = output;
-    }
-
-    @Override
-    public void run() {
-        try {
-            output.write(request + "\r\n");
-            output.flush();
-            //System.out.println("Writing following request: " + request);
-        } catch (Exception e) {
-            System.out.println(e);
-        }
-
-        try {
-            while (true) {
-                String line;
-                line = input.readLine();
-                if (line.toLowerCase().startsWith("+ok")) {
-                    break;
-                }
-                ClientService.response.add(line);
-            }
-        } catch (Exception e) {
-            System.out.println(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/ChatHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/ChatHandler.java
index d409401..2d23852 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/ChatHandler.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/ChatHandler.java
@@ -9,6 +9,11 @@ import java.util.ArrayDeque;
 public class ChatHandler {
     private final EventBus eventBus;
     private final ArrayDeque<Message> receivedMessages = new ArrayDeque<>();
+
+    /**
+     * Creates a ChatHandler for a Session
+     * @param eventBus
+     */
     public ChatHandler(EventBus eventBus) {
         eventBus.subscribe(ChatMessageEvent.class, (event) -> {
             processMessageEvent(event.getMessage());
@@ -16,18 +21,34 @@ public class ChatHandler {
         this.eventBus = eventBus;
     }
 
+    /**
+     * Sends the Chat Message that the server received to the queue
+     * @param message
+     */
+
     private synchronized void processMessageEvent(Message message) {
-        // TODO: filter
+        // TODO: filter for Messages that were sent by the Client
         this.receivedMessages.offer(message);
     }
 
+
+    /**
+     * Returns the current size of the queue (Used for Command GET_MESSAGE_COUNT)
+     */
     public synchronized int getMessageCount() {
         return this.receivedMessages.size();
     }
+
+    /**
+     * Takes the next message out of the queue, to be sent to the Client
+     */
     public synchronized Message getNextMessage() {
         return this.receivedMessages.poll();
     }
 
+    /**
+     * Message is converted into a String and sent to the Client
+     */
     public void sendMessage(String messageString) {
         Message msg = Message.toMessage(messageString);
         this.eventBus.publish(new ChatMessageEvent(msg));
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/UserHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/UserHandler.java
new file mode 100644
index 0000000..6c171e0
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/handlers/UserHandler.java
@@ -0,0 +1,57 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.network.handlers;
+
+import jdk.jshell.spi.ExecutionControl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class UserHandler {
+
+    private final List<String> usernames;
+
+    public UserHandler() {
+        this.usernames = new ArrayList<String>();
+    }
+
+    public Boolean checkUsername(String username) {
+        for (int i = 0; i < this.usernames.size(); i++) {
+            if (this.usernames.get(i).equals(username)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public Pattern usrRex = Pattern.compile("USERNAME=(?<user>\\w+)");
+
+    public String addUsername(String username) {
+        Matcher matcher = usrRex.matcher(username);
+        if (! matcher.find()) {
+            throw new RuntimeException("Cannot parse " +  username);
+        }
+        String usr = matcher.group("user");
+        if (!this.checkUsername(usr)) {
+            this.usernames.add(usr);
+        } else {
+            this.usernames.add(getAltUsername(usr));
+        }
+        return String.format("USERNAME=%s", usr);
+    }
+
+    public void removeUsername(String username) {
+        this.usernames.remove(username);
+    }
+
+    public String getAltUsername(String username) {
+        int count = 0;
+        while (true) {
+            username = String.format("%s%d", username, ++count);
+            if (this.checkUsername(username)) {
+                return username;
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java
index ffe5d6e..8e33248 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import ch.unibas.dmi.dbis.cs108.casono.server.network.handlers.ChatHandler;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.handlers.UserHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -18,6 +19,7 @@ import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer;
  */
 public class Session implements Runnable {
     private final ChatHandler chatHandler;
+    private final UserHandler userHandler;
     private SessionId id;
     private Thread thread;
     private TransportLayer transport;
@@ -44,6 +46,7 @@ public class Session implements Runnable {
         this.logger.info("Created new session");
         this.idGenerator = new AtomicInteger();
         this.chatHandler = new ChatHandler(eventBus);
+        this.userHandler = new UserHandler();
     }
 
     /**
@@ -84,11 +87,11 @@ public class Session implements Runnable {
                 String commandWord = commandAndArgs[0];
                 System.out.println("Session "+id.value()+" Received: " + commandAndArgs[0]);
             switch (commandWord) {
-                    case "SEND_MESSAGE":
-                        this.chatHandler.sendMessage(commandAndArgs[1]);
-                        writeToTransport("+OK");
-                        writeToTransport("+OK");
-                        break;
+                case "SEND_MESSAGE":
+                    this.chatHandler.sendMessage(commandAndArgs[1]);
+                    writeToTransport("+OK");
+                    writeToTransport("+OK");
+                    break;
                     case "GET_MESSAGE_COUNT":
                         int count = chatHandler.getMessageCount();
                         writeToTransport(""+count);
@@ -97,7 +100,7 @@ public class Session implements Runnable {
                     case "GET_NEXT_MESSAGE":
                          if (chatHandler.getMessageCount() == 0) {
                              logger.warn("FAIL No more messages!");
-                             writeToTransport("-FAIL");
+                             writeToTransport("-ERROR");
                          } else {
                              String msgString = chatHandler.getNextMessage().toArgsString();
                              logger.debug("Session "+id.value()+" Write next message "+msgString);
@@ -105,9 +108,19 @@ public class Session implements Runnable {
                              writeToTransport("+OK");
                          }
                          break;
+                    case "LOGIN":
+                        String usr = userHandler.addUsername(commandAndArgs[1]);
+                        writeToTransport(usr);
+                        writeToTransport("+OK");
+
+                    case "LOGOUT":
+                        userHandler.removeUsername(commandAndArgs[1]);
+                        writeToTransport("+OK");
+                    case "PING":
+                        
                     default:
                         this.logger.warn("Unknown command: " + commandWord);
-                        writeToTransport("-FAIL");
+                        writeToTransport("-ERROR");
                 }
             } catch (EOFException e) {
                 logger.info("Client disconnected");
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
index 55ea07e..36c2bb9 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
@@ -33,15 +33,20 @@ public class ClientServiceTest {
     @Test
     public void testClientService() throws ExecutionException, InterruptedException {
         ClientService client1 = new ClientService("localhost", 5000);
+        /*
         ClientService client2 = new ClientService("localhost", 5000);
         Thread.sleep(2000);
-        String response = client1.sendMessage(new Message(Message.MessageType.GLOBAL, 0, "Mathis", null, "blahh"));
+        client1.sendMessage(new Message(Message.MessageType.GLOBAL, 0, "Mathis", null, "blahh"));
         Thread.sleep(5000);
         List<Message> received = client2.getMessages();
 
         assertEquals(1, received.size());
         Message s = received.get(0);
         assertEquals(Message.MessageType.GLOBAL, s.getMessageType());
+         */
+
+        String username = client1.login("Mathis");
+        assertEquals("USERNAME=Mathis", username);
     }
 
     @Test