Compare commits
5 Commits
55a7499339
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ee3291465 | |||
| b0e9f1bb4e | |||
| b8bc715868 | |||
| 13800486ba | |||
| bd0cf3c601 |
@@ -1,4 +1,4 @@
|
|||||||
arguments=--init-script /home/xeon0x/.var/app/dev.zed.Zed/data/zed/extensions/work/java/jdtls/jdt-language-server-1.46.0-202503271314/configuration/org.eclipse.osgi/58/0/.cp/gradle/init/init.gradle
|
arguments=--init-script /home/xeon0x/.var/app/dev.zed.Zed/data/zed/extensions/work/java/jdtls/jdt-language-server-1.46.1-202504011455/configuration/org.eclipse.osgi/58/0/.cp/gradle/init/init.gradle
|
||||||
auto.sync=false
|
auto.sync=false
|
||||||
build.scans.enabled=false
|
build.scans.enabled=false
|
||||||
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
|
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
|
||||||
|
|||||||
94
README.md
94
README.md
@@ -1,5 +1,24 @@
|
|||||||
# ClientServer
|
# ClientServer
|
||||||
|
|
||||||
|
A Java-based ☕️↔️ UDP client-server chat 💬 system with automatic 🔄 text-to-emoji 😊 conversion using Mistral API.
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
### Available Commands
|
||||||
|
|
||||||
|
- `/list` : Display connected clients list
|
||||||
|
- `/msg <nickname> <message>` : Send private message to specific client
|
||||||
|
- `/help` : Display help with all available commands
|
||||||
|
- `/disconnect` : Clean server disconnection
|
||||||
|
- `<message>` : Broadcast message translated to emojis to all connected clients
|
||||||
|
|
||||||
|
### Technical Features
|
||||||
|
|
||||||
|
- UDP Communication
|
||||||
|
- Multi-threading for client handling
|
||||||
|
- Mistral API for text-to-emoji conversion
|
||||||
|
- Disconnection handling
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -11,33 +30,76 @@
|
|||||||
### Client
|
### Client
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
./gradlew run --args='client'
|
./gradlew runClient
|
||||||
```
|
```
|
||||||
|
|
||||||
or
|
The client will ask for a pseudo, an IP (type `localhost` if server and clients are on the same machine), and a port (type `6666` by default).
|
||||||
|
|
||||||
```bash
|
|
||||||
./gradlew runServer
|
|
||||||
```
|
|
||||||
|
|
||||||
### Server
|
### Server
|
||||||
|
|
||||||
```bash
|
|
||||||
./gradlew run --args='server'
|
|
||||||
```
|
|
||||||
|
|
||||||
or
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
./gradlew runServer
|
./gradlew runServer
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
Create a `config.properties` file at project root (`ClientServer/app/config.properties`) with:
|
||||||
|
|
||||||
|
```properties
|
||||||
|
mistral.api.key=your_api_key
|
||||||
|
```
|
||||||
|
|
||||||
|
Replace `your_api_key` with your actual Mistral API key. Create one for free at https://console.mistral.ai/api-keys. If no API key is provided, the server will not be able to convert broadcasted messages to emojis and empty broadcasted messages will be sent.
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
|
### Sequence Diagram
|
||||||
|
|
||||||
```mermaid
|
```mermaid
|
||||||
sequenceDiagram
|
sequenceDiagram
|
||||||
Note over Client, Serveur: DatagramSocket("localhost", 66666)
|
participant MainServer
|
||||||
Client->>+Serveur: DatagramPacket("Salve !", 7, "localhost", 6666)
|
|
||||||
Note over Serveur, Client: DatagramSocket("localhost", 66666)
|
participant Alice
|
||||||
Serveur->>+Client: DatagramPacket("Accusé de réception", 19, "localhost", 6666)
|
Note over Alice: Creates DatagramSocket
|
||||||
|
Alice->>+MainServer: Sends username "Alice"
|
||||||
|
Note over MainServer: Creates new socket<br/>for AliceHandler
|
||||||
|
create participant AliceHandler
|
||||||
|
MainServer->>AliceHandler: Create new handler thread
|
||||||
|
MainServer->>-Alice: PORT:{AlicePort}
|
||||||
|
|
||||||
|
participant Bob
|
||||||
|
Bob->>+MainServer: Sends username "Bob"
|
||||||
|
Note over MainServer: Creates new socket<br/>for BobHandler
|
||||||
|
create participant BobHandler
|
||||||
|
MainServer->>BobHandler: Create new handler thread
|
||||||
|
MainServer->>-Bob: PORT:{BobPort}
|
||||||
|
|
||||||
|
rect rgb(200, 200, 255)
|
||||||
|
Note over Alice,Bob: Chat loop
|
||||||
|
Alice->>+AliceHandler: "Hi everyone!"
|
||||||
|
Note over AliceHandler: Converts to emojis
|
||||||
|
AliceHandler->>+BobHandler: Broadcast message
|
||||||
|
BobHandler->>-Bob: "Alice: 👋👩👩🌍🎉"
|
||||||
|
AliceHandler->>-Alice: Message sent
|
||||||
|
|
||||||
|
Bob->>+BobHandler: "Hello Alice, how are you?"
|
||||||
|
Note over BobHandler: Converts to emojis
|
||||||
|
BobHandler->>+AliceHandler: Broadcast message
|
||||||
|
AliceHandler->>-Alice: "Bob: 👋🏻👩🏼🦰🐰🤔👩🏼🦰🐇💬👩🏼🦰🐰👍🏻😊👩🏼🦰🐇👋🏻"
|
||||||
|
BobHandler->>-Bob: Message sent
|
||||||
|
end
|
||||||
|
|
||||||
|
Alice->>+AliceHandler: /disconnect
|
||||||
|
Note over AliceHandler: Removes Alice<br/>from map
|
||||||
|
AliceHandler->>-Alice: Disconnection confirmation
|
||||||
|
AliceHandler->>MainServer: Thread terminated
|
||||||
|
MainServer-->>AliceHandler: destroy
|
||||||
|
|
||||||
|
Bob->>+BobHandler: /disconnect
|
||||||
|
Note over BobHandler: Removes Bob<br/>from map
|
||||||
|
BobHandler->>-Bob: Disconnection confirmation
|
||||||
|
BobHandler->>MainServer: Thread terminated
|
||||||
|
MainServer-->>BobHandler: destroy
|
||||||
|
|
||||||
|
Note over Alice,Bob: Close sockets
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package clientserver.client;
|
package clientserver.client;
|
||||||
|
|
||||||
|
import clientserver.server.Server;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.DatagramPacket;
|
import java.net.DatagramPacket;
|
||||||
import java.net.DatagramSocket;
|
import java.net.DatagramSocket;
|
||||||
@@ -8,8 +9,6 @@ import java.net.SocketTimeoutException;
|
|||||||
import java.net.UnknownHostException;
|
import java.net.UnknownHostException;
|
||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
|
|
||||||
import clientserver.server.Server;
|
|
||||||
|
|
||||||
public class Client {
|
public class Client {
|
||||||
|
|
||||||
InetAddress clientAddress;
|
InetAddress clientAddress;
|
||||||
@@ -27,6 +26,7 @@ public class Client {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static class MessageReceiver implements Runnable {
|
private static class MessageReceiver implements Runnable {
|
||||||
|
|
||||||
private final DatagramSocket socket;
|
private final DatagramSocket socket;
|
||||||
private volatile boolean running = true;
|
private volatile boolean running = true;
|
||||||
|
|
||||||
@@ -43,21 +43,27 @@ public class Client {
|
|||||||
while (running && !socket.isClosed()) {
|
while (running && !socket.isClosed()) {
|
||||||
try {
|
try {
|
||||||
byte[] buffer = new byte[1024];
|
byte[] buffer = new byte[1024];
|
||||||
DatagramPacket packet = new DatagramPacket(buffer, buffer.length);
|
DatagramPacket packet = new DatagramPacket(
|
||||||
|
buffer,
|
||||||
|
buffer.length
|
||||||
|
);
|
||||||
|
|
||||||
socket.receive(packet);
|
socket.receive(packet);
|
||||||
String message = new String(packet.getData(), 0, packet.getLength());
|
String message = new String(
|
||||||
|
packet.getData(),
|
||||||
|
0,
|
||||||
|
packet.getLength()
|
||||||
|
);
|
||||||
|
|
||||||
// Afficher le message reçu avec une mise en forme claire
|
// Afficher le message reçu avec une mise en forme claire
|
||||||
System.out.println("\n>>> Message from server: \n" + message);
|
System.out.println(message);
|
||||||
System.out.print("Enter your message (or 'exit' to quit): ");
|
} catch (SocketTimeoutException e) {}
|
||||||
} catch (SocketTimeoutException e) {
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
if (!socket.isClosed()) {
|
if (!socket.isClosed()) {
|
||||||
System.err.println("Error in the reception of messages: " + e.getMessage());
|
System.err.println(
|
||||||
|
"Error in the reception of messages: " + e.getMessage()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
System.out.println("Message receiver stopped");
|
System.out.println("Message receiver stopped");
|
||||||
@@ -128,16 +134,23 @@ public class Client {
|
|||||||
System.out.println("Enter your Pseudo :");
|
System.out.println("Enter your Pseudo :");
|
||||||
|
|
||||||
// Créer le client avec l'adresse locale et le port du socket
|
// Créer le client avec l'adresse locale et le port du socket
|
||||||
Client client = new Client(socketClient.getLocalAddress(), socketClient.getLocalPort());
|
Client client = new Client(
|
||||||
|
socketClient.getLocalAddress(),
|
||||||
|
socketClient.getLocalPort()
|
||||||
|
);
|
||||||
client.setScanner(new Scanner(System.in));
|
client.setScanner(new Scanner(System.in));
|
||||||
String userPseudo = client.getScanner().next();
|
String userPseudo = client.getScanner().next();
|
||||||
client.setPseudo(userPseudo);
|
client.setPseudo(userPseudo);
|
||||||
|
|
||||||
System.out.println("Enter the IP address of the server :");
|
System.out.println("Enter the IP address of the server :");
|
||||||
try {
|
try {
|
||||||
client.serverAddress = InetAddress.getByName(client.getScanner().next());
|
client.serverAddress = InetAddress.getByName(
|
||||||
|
client.getScanner().next()
|
||||||
|
);
|
||||||
} catch (UnknownHostException e) {
|
} catch (UnknownHostException e) {
|
||||||
System.err.println("The address you choose create an UnknownHostException: " + e);
|
System.err.println(
|
||||||
|
"The address you choose create an UnknownHostException: " + e
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
System.out.println("Enter the port of the server:");
|
System.out.println("Enter the port of the server:");
|
||||||
@@ -146,26 +159,40 @@ public class Client {
|
|||||||
// (morph (/127.0.0.1:39056) : ...)
|
// (morph (/127.0.0.1:39056) : ...)
|
||||||
|
|
||||||
if (socketClient != null && client.serverAddress != null) {
|
if (socketClient != null && client.serverAddress != null) {
|
||||||
Server.sendMessage(socketClient, client.getPseudo(), client.serverAddress, client.getServerPort());
|
Server.sendMessage(
|
||||||
|
socketClient,
|
||||||
|
client.getPseudo(),
|
||||||
|
client.serverAddress,
|
||||||
|
client.getServerPort()
|
||||||
|
);
|
||||||
System.out.println("New connection request sent");
|
System.out.println("New connection request sent");
|
||||||
}
|
}
|
||||||
|
|
||||||
return client;
|
return client;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void deconnexionClient(DatagramSocket socketClient, Client client, int handlerPort) {
|
private static void deconnexionClient(
|
||||||
|
DatagramSocket socketClient,
|
||||||
|
Client client,
|
||||||
|
int handlerPort
|
||||||
|
) {
|
||||||
try {
|
try {
|
||||||
String disconnectMsg = "DISCONNECT";
|
String disconnectMsg = "/disconnect";
|
||||||
byte[] disconnectData = disconnectMsg.getBytes();
|
byte[] disconnectData = disconnectMsg.getBytes();
|
||||||
DatagramPacket disconnectPacket = new DatagramPacket(
|
DatagramPacket disconnectPacket = new DatagramPacket(
|
||||||
disconnectData,
|
disconnectData,
|
||||||
disconnectData.length,
|
disconnectData.length,
|
||||||
client.getServerAddress(),
|
client.getServerAddress(),
|
||||||
handlerPort);
|
handlerPort
|
||||||
|
);
|
||||||
socketClient.send(disconnectPacket);
|
socketClient.send(disconnectPacket);
|
||||||
System.out.println("Deconnection sended on the server port: " + handlerPort);
|
System.out.println(
|
||||||
|
"Deconnection sended on the server port: " + handlerPort
|
||||||
|
);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
System.err.println("Error during sending the deconnection message: " + e);
|
System.err.println(
|
||||||
|
"Error during sending the deconnection message: " + e
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -174,18 +201,28 @@ public class Client {
|
|||||||
boolean running = true;
|
boolean running = true;
|
||||||
|
|
||||||
System.out.println("\n=== Chat client ready ===");
|
System.out.println("\n=== Chat client ready ===");
|
||||||
System.out.println("Type your messages then press 'Enter' to send them to the server.");
|
// System.out.println(
|
||||||
|
// "Type your messages then press 'Enter' to send them to the server."
|
||||||
|
// );
|
||||||
System.out.println("Type /list to see all the clients connected.");
|
System.out.println("Type /list to see all the clients connected.");
|
||||||
System.out.println("Type 'exit' to quit.");
|
System.out.println(
|
||||||
|
"Type '/msg <target> <message>' to send a private message."
|
||||||
|
);
|
||||||
|
System.out.println("Type '/help' to see all the commands.");
|
||||||
|
System.out.println("Type '/disconnect' to quit.\n");
|
||||||
|
|
||||||
while (running) {
|
while (running) {
|
||||||
System.out.print("Enter your message: ");
|
|
||||||
String message = this.getScanner().nextLine();
|
String message = this.getScanner().nextLine();
|
||||||
|
|
||||||
if ("exit".equalsIgnoreCase(message)) {
|
if ("/disconnect".equalsIgnoreCase(message)) {
|
||||||
running = false;
|
running = false;
|
||||||
} else {
|
} else {
|
||||||
Server.sendMessage(this.clientSocket, message, this.getServerAddress(), this.getHandlerPort());
|
Server.sendMessage(
|
||||||
|
this.clientSocket,
|
||||||
|
message,
|
||||||
|
this.getServerAddress(),
|
||||||
|
this.getHandlerPort()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,7 +268,9 @@ public class Client {
|
|||||||
Thread.currentThread().interrupt();
|
Thread.currentThread().interrupt();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
System.err.println("Unexpected response from the server: " + reponse);
|
System.err.println(
|
||||||
|
"Unexpected response from the server: " + reponse
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 8 - Libérer le canal
|
// 8 - Libérer le canal
|
||||||
|
|||||||
@@ -10,10 +10,9 @@ import java.util.Properties;
|
|||||||
|
|
||||||
public class MistralDirectAPI {
|
public class MistralDirectAPI {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
private static String apiKey;
|
||||||
String apiKey;
|
|
||||||
|
|
||||||
// Load API key from properties file
|
static {
|
||||||
try {
|
try {
|
||||||
Properties props = new Properties();
|
Properties props = new Properties();
|
||||||
FileInputStream input = new FileInputStream("config.properties");
|
FileInputStream input = new FileInputStream("config.properties");
|
||||||
@@ -22,18 +21,22 @@ public class MistralDirectAPI {
|
|||||||
input.close();
|
input.close();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
System.err.println("Could not load API key: " + e.getMessage());
|
System.err.println("Could not load API key: " + e.getMessage());
|
||||||
return;
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String payload =
|
public static String translateToEmojis(String message) {
|
||||||
|
String payload = String.format(
|
||||||
"""
|
"""
|
||||||
{
|
{
|
||||||
"model": "mistral-medium",
|
"model": "mistral-medium",
|
||||||
"messages": [
|
"messages": [
|
||||||
{ "role": "user", "content": "Reverse turing test." }
|
{ "role": "system", "content": "Please translate the following message to emojis only. Do not include any comments. End the emoji message with ;" },
|
||||||
|
{ "role": "user", "content": "%s" }
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
""";
|
""",
|
||||||
|
message
|
||||||
|
);
|
||||||
|
|
||||||
HttpRequest request = HttpRequest.newBuilder()
|
HttpRequest request = HttpRequest.newBuilder()
|
||||||
.uri(URI.create("https://api.mistral.ai/v1/chat/completions"))
|
.uri(URI.create("https://api.mistral.ai/v1/chat/completions"))
|
||||||
@@ -49,10 +52,26 @@ public class MistralDirectAPI {
|
|||||||
request,
|
request,
|
||||||
HttpResponse.BodyHandlers.ofString()
|
HttpResponse.BodyHandlers.ofString()
|
||||||
);
|
);
|
||||||
System.out.println("Response Code: " + response.statusCode());
|
String responseBody = response.body();
|
||||||
System.out.println("Response Body: " + response.body());
|
return extractContent(responseBody);
|
||||||
} catch (IOException | InterruptedException e) {
|
} catch (IOException | InterruptedException e) {
|
||||||
System.err.println("Error occurred: " + e.getMessage());
|
System.err.println("Error occurred: " + e.getMessage());
|
||||||
|
return message;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static String extractContent(String jsonResponse) {
|
||||||
|
// Find the content field in the response
|
||||||
|
int contentIndex = jsonResponse.indexOf("\"content\":\"");
|
||||||
|
if (contentIndex != -1) {
|
||||||
|
int startIndex = contentIndex + "\"content\":\"".length();
|
||||||
|
|
||||||
|
int endIndex = jsonResponse.indexOf(";", startIndex);
|
||||||
|
|
||||||
|
if (endIndex != -1) {
|
||||||
|
return jsonResponse.substring(startIndex, endIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,24 +9,20 @@ public class ClientHandler implements Runnable {
|
|||||||
private final DatagramSocket clientHandlerSocket;
|
private final DatagramSocket clientHandlerSocket;
|
||||||
private final Client client;
|
private final Client client;
|
||||||
private boolean running = true;
|
private boolean running = true;
|
||||||
|
private final MessageProcessor messageProcessor;
|
||||||
|
|
||||||
public ClientHandler(DatagramSocket socket, Client client) {
|
public ClientHandler(DatagramSocket socket, Client client) {
|
||||||
this.clientHandlerSocket = socket;
|
this.clientHandlerSocket = socket;
|
||||||
this.client = client;
|
this.client = client;
|
||||||
|
this.messageProcessor = new MessageProcessor(
|
||||||
|
client,
|
||||||
|
clientHandlerSocket,
|
||||||
|
this
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sendConnectedClients(String message) {
|
public Client getClient() {
|
||||||
if (message.equals("/list")) {
|
return client;
|
||||||
Server.sendMessage(clientHandlerSocket, Server.getPseudos(), client.getAddress(), client.getPort());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleDeconnexion(String message) {
|
|
||||||
if (message.equals("DISCONNECT")) {
|
|
||||||
System.out.println("Client deconnection : " + prettyPrint(client));
|
|
||||||
Server.removeClientHandler(client.getPseudo());
|
|
||||||
stop();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void stop() {
|
public void stop() {
|
||||||
@@ -36,43 +32,39 @@ public class ClientHandler implements Runnable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public String prettyPrint(Client client) {
|
public static String prettyPrint(Client client) {
|
||||||
StringBuilder str = new StringBuilder();
|
StringBuilder str = new StringBuilder();
|
||||||
str.append(client.getPseudo() +
|
str.append(
|
||||||
|
client.getPseudo() +
|
||||||
" (" +
|
" (" +
|
||||||
client.getAddress() +
|
client.getAddress() +
|
||||||
":" +
|
":" +
|
||||||
client.getPort() +
|
client.getPort() +
|
||||||
")");
|
")"
|
||||||
|
);
|
||||||
return str.toString();
|
return str.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
System.out.println(
|
System.out.println("Started handler for client " + prettyPrint(client));
|
||||||
"Started handler for client " +
|
|
||||||
prettyPrint(client));
|
|
||||||
|
|
||||||
while (running && !clientHandlerSocket.isClosed()) {
|
while (running && !clientHandlerSocket.isClosed()) {
|
||||||
DatagramPacket packet = Server.receivedPacket(clientHandlerSocket);
|
DatagramPacket packet = Server.receivedPacket(clientHandlerSocket);
|
||||||
if (packet == null)
|
if (packet == null) continue;
|
||||||
continue;
|
|
||||||
|
|
||||||
String message = new String(
|
String message = new String(
|
||||||
packet.getData(),
|
packet.getData(),
|
||||||
0,
|
0,
|
||||||
packet.getLength());
|
packet.getLength()
|
||||||
System.out.println(
|
);
|
||||||
prettyPrint(client) + " : " +
|
System.out.println(prettyPrint(client) + " : " + message);
|
||||||
message);
|
|
||||||
|
|
||||||
// Possibilies
|
messageProcessor.processMessage(message);
|
||||||
sendConnectedClients(message); // /list command
|
|
||||||
handleDeconnexion(message); // exit command or DISCONNECT
|
|
||||||
}
|
}
|
||||||
|
|
||||||
System.out.println(
|
System.out.println(
|
||||||
"Client handler terminated for " +
|
"Client handler terminated for " + prettyPrint(client)
|
||||||
prettyPrint(client));
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
170
app/src/main/java/clientserver/server/MessageProcessor.java
Normal file
170
app/src/main/java/clientserver/server/MessageProcessor.java
Normal file
@@ -0,0 +1,170 @@
|
|||||||
|
package clientserver.server;
|
||||||
|
|
||||||
|
import clientserver.client.Client;
|
||||||
|
import clientserver.common.MistralDirectAPI;
|
||||||
|
import java.net.DatagramSocket;
|
||||||
|
|
||||||
|
public class MessageProcessor {
|
||||||
|
|
||||||
|
private final Client client;
|
||||||
|
private final DatagramSocket clientHandlerSocket;
|
||||||
|
private final ClientHandler clientHandler;
|
||||||
|
|
||||||
|
public MessageProcessor(
|
||||||
|
Client client,
|
||||||
|
DatagramSocket clientHandlerSocket,
|
||||||
|
ClientHandler clientHandler
|
||||||
|
) {
|
||||||
|
this.client = client;
|
||||||
|
this.clientHandlerSocket = clientHandlerSocket;
|
||||||
|
this.clientHandler = clientHandler;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void processMessage(String message) {
|
||||||
|
if (message == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (message.startsWith("/msg ")) {
|
||||||
|
handlePrivateMessage(message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (message) {
|
||||||
|
case "/list":
|
||||||
|
handleListCommand();
|
||||||
|
break;
|
||||||
|
case "/help":
|
||||||
|
handleHelpCommand();
|
||||||
|
break;
|
||||||
|
case "/msg":
|
||||||
|
handleMsgCommand();
|
||||||
|
break;
|
||||||
|
case "/disconnect":
|
||||||
|
handleDisconnect();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// Broadcast message to all clients
|
||||||
|
broadcastMessageEmoji(message);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handlePrivateMessage(String message) {
|
||||||
|
String[] parts = message.split(" ", 3);
|
||||||
|
if (parts.length < 3) {
|
||||||
|
handleMsgCommand();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String targetPseudo = parts[1];
|
||||||
|
String messageContent = parts[2];
|
||||||
|
|
||||||
|
ClientHandler targetHandler = Server.getClientHandler(targetPseudo);
|
||||||
|
|
||||||
|
if (targetHandler == null) {
|
||||||
|
Server.sendMessage(
|
||||||
|
clientHandlerSocket,
|
||||||
|
"> User " + targetPseudo + " not found",
|
||||||
|
client.getAddress(),
|
||||||
|
client.getPort()
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send private message to target
|
||||||
|
Client targetClient = targetHandler.getClient();
|
||||||
|
Server.sendMessage(
|
||||||
|
clientHandlerSocket,
|
||||||
|
"> " +
|
||||||
|
client.getPseudo() +
|
||||||
|
" -> " +
|
||||||
|
targetClient.getPseudo() +
|
||||||
|
": " +
|
||||||
|
messageContent,
|
||||||
|
targetClient.getAddress(),
|
||||||
|
targetClient.getPort()
|
||||||
|
);
|
||||||
|
|
||||||
|
// Send confirmation to sender
|
||||||
|
Server.sendMessage(
|
||||||
|
clientHandlerSocket,
|
||||||
|
"> " +
|
||||||
|
client.getPseudo() +
|
||||||
|
" -> " +
|
||||||
|
targetClient.getPseudo() +
|
||||||
|
": " +
|
||||||
|
messageContent,
|
||||||
|
client.getAddress(),
|
||||||
|
client.getPort()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void broadcastMessage(String message) {
|
||||||
|
String formattedMessage = "> " + client.getPseudo() + ": " + message;
|
||||||
|
|
||||||
|
for (ClientHandler handler : Server.getAllClientHandlers()) {
|
||||||
|
Client targetClient = handler.getClient();
|
||||||
|
Server.sendMessage(
|
||||||
|
clientHandlerSocket,
|
||||||
|
formattedMessage,
|
||||||
|
targetClient.getAddress(),
|
||||||
|
targetClient.getPort()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void broadcastMessageEmoji(String message) {
|
||||||
|
// Translate message to emojis
|
||||||
|
String emojiMessage = MistralDirectAPI.translateToEmojis(message);
|
||||||
|
String formattedMessage =
|
||||||
|
"> " + client.getPseudo() + ": " + emojiMessage;
|
||||||
|
|
||||||
|
for (ClientHandler handler : Server.getAllClientHandlers()) {
|
||||||
|
Client targetClient = handler.getClient();
|
||||||
|
Server.sendMessage(
|
||||||
|
clientHandlerSocket,
|
||||||
|
formattedMessage,
|
||||||
|
targetClient.getAddress(),
|
||||||
|
targetClient.getPort()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleMsgCommand() {
|
||||||
|
Server.sendMessage(
|
||||||
|
clientHandlerSocket,
|
||||||
|
"> /msg <target> <message> : send a message to a client",
|
||||||
|
client.getAddress(),
|
||||||
|
client.getPort()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleListCommand() {
|
||||||
|
Server.sendMessage(
|
||||||
|
clientHandlerSocket,
|
||||||
|
Server.getPseudos(),
|
||||||
|
client.getAddress(),
|
||||||
|
client.getPort()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleHelpCommand() {
|
||||||
|
Server.sendMessage(
|
||||||
|
clientHandlerSocket,
|
||||||
|
"> /list : list all connected clients" +
|
||||||
|
"\n> /msg <target> <message> : send a message to a client" +
|
||||||
|
"\n> /disconnect : disconnect from the server",
|
||||||
|
client.getAddress(),
|
||||||
|
client.getPort()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleDisconnect() {
|
||||||
|
System.out.println(
|
||||||
|
"Client deconnection : " + ClientHandler.prettyPrint(client)
|
||||||
|
);
|
||||||
|
Server.removeClientHandler(client.getPseudo());
|
||||||
|
clientHandler.stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import java.io.IOException;
|
|||||||
import java.net.DatagramPacket;
|
import java.net.DatagramPacket;
|
||||||
import java.net.DatagramSocket;
|
import java.net.DatagramSocket;
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
@@ -13,7 +14,10 @@ public class Server {
|
|||||||
private int mainServerPort;
|
private int mainServerPort;
|
||||||
private DatagramSocket mainServerSocket;
|
private DatagramSocket mainServerSocket;
|
||||||
private boolean isRunning;
|
private boolean isRunning;
|
||||||
private static Map<String, ClientHandler> mapPseudosConnectedClientsHandlers = new ConcurrentHashMap<>();
|
private static Map<
|
||||||
|
String,
|
||||||
|
ClientHandler
|
||||||
|
> mapPseudosConnectedClientsHandlers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
public Server(int port) {
|
public Server(int port) {
|
||||||
this.mainServerPort = port;
|
this.mainServerPort = port;
|
||||||
@@ -45,7 +49,8 @@ public class Server {
|
|||||||
byte[] receivedData = new byte[1024];
|
byte[] receivedData = new byte[1024];
|
||||||
DatagramPacket receivedPacket = new DatagramPacket(
|
DatagramPacket receivedPacket = new DatagramPacket(
|
||||||
receivedData,
|
receivedData,
|
||||||
receivedData.length);
|
receivedData.length
|
||||||
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
socket.receive(receivedPacket); // Blocking call
|
socket.receive(receivedPacket); // Blocking call
|
||||||
@@ -57,81 +62,84 @@ public class Server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String packetToMessage(DatagramPacket packet) {
|
public static String packetToMessage(DatagramPacket packet) {
|
||||||
return new String(
|
return new String(packet.getData(), 0, packet.getLength());
|
||||||
packet.getData(),
|
|
||||||
0,
|
|
||||||
packet.getLength());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendMessage(
|
public static void sendMessage(
|
||||||
DatagramSocket socket,
|
DatagramSocket socket,
|
||||||
String message,
|
String message,
|
||||||
java.net.InetAddress address,
|
java.net.InetAddress address,
|
||||||
int port) {
|
int port
|
||||||
|
) {
|
||||||
try {
|
try {
|
||||||
byte[] sendData = message.getBytes();
|
byte[] sendData = message.getBytes();
|
||||||
DatagramPacket packetToSend = new DatagramPacket(
|
DatagramPacket packetToSend = new DatagramPacket(
|
||||||
sendData,
|
sendData,
|
||||||
sendData.length,
|
sendData.length,
|
||||||
address,
|
address,
|
||||||
port);
|
port
|
||||||
|
);
|
||||||
socket.send(packetToSend);
|
socket.send(packetToSend);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
System.err.println(
|
System.err.println(
|
||||||
"Failed to send message to " + address + ":" + port);
|
"Failed to send message to " + address + ":" + port
|
||||||
|
);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleNewConnection() {
|
private void handleNewConnection() {
|
||||||
DatagramPacket packet = receivedPacket(mainServerSocket);
|
DatagramPacket packet = receivedPacket(mainServerSocket);
|
||||||
if (packet == null)
|
if (packet == null) return;
|
||||||
return;
|
|
||||||
|
|
||||||
int originalClientPort = packet.getPort();
|
int originalClientPort = packet.getPort();
|
||||||
InetAddress clientAddress = packet.getAddress();
|
InetAddress clientAddress = packet.getAddress();
|
||||||
;
|
|
||||||
|
|
||||||
// Log the initial connection request
|
// Log the initial connection request
|
||||||
System.out.println(
|
System.out.println(
|
||||||
"New connection request from " +
|
"New connection request from " +
|
||||||
clientAddress +
|
clientAddress +
|
||||||
":" +
|
":" +
|
||||||
originalClientPort);
|
originalClientPort
|
||||||
|
);
|
||||||
|
|
||||||
// Process the received message
|
// Process the received message
|
||||||
String pseudoMessage = new String(packet.getData(), 0, packet.getLength());
|
String pseudoMessage = new String(
|
||||||
|
packet.getData(),
|
||||||
|
0,
|
||||||
|
packet.getLength()
|
||||||
|
);
|
||||||
|
|
||||||
System.out.println(
|
System.out.println(
|
||||||
"Received message from " +
|
"Received message from " +
|
||||||
clientAddress +
|
clientAddress +
|
||||||
":" +
|
":" +
|
||||||
originalClientPort +
|
originalClientPort +
|
||||||
": " +
|
": " +
|
||||||
pseudoMessage);
|
pseudoMessage
|
||||||
|
);
|
||||||
// Create a new socket for this client
|
// Create a new socket for this client
|
||||||
DatagramSocket clientHandlerSocket = createNewSocket();
|
DatagramSocket clientHandlerSocket = createNewSocket();
|
||||||
if (clientHandlerSocket == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
|
if (clientHandlerSocket == null) return;
|
||||||
int clientHandlerLocalPort = clientHandlerSocket.getLocalPort();
|
int clientHandlerLocalPort = clientHandlerSocket.getLocalPort();
|
||||||
|
|
||||||
Client client = new Client(clientAddress, originalClientPort);
|
Client client = new Client(clientAddress, originalClientPort);
|
||||||
client.setPseudo(pseudoMessage);
|
|
||||||
|
|
||||||
|
client.setPseudo(pseudoMessage);
|
||||||
// Send new port information to client
|
// Send new port information to client
|
||||||
String response = "PORT:" + clientHandlerLocalPort;
|
String response = "PORT:" + clientHandlerLocalPort;
|
||||||
|
|
||||||
sendMessage(
|
sendMessage(
|
||||||
mainServerSocket,
|
mainServerSocket,
|
||||||
response,
|
response,
|
||||||
clientAddress,
|
clientAddress,
|
||||||
packet.getPort());
|
packet.getPort()
|
||||||
|
);
|
||||||
// Create and start a ClientHandler for this connection
|
// Create and start a ClientHandler for this connection
|
||||||
ClientHandler handler = new ClientHandler(clientHandlerSocket, client);
|
ClientHandler handler = new ClientHandler(clientHandlerSocket, client);
|
||||||
|
|
||||||
Thread thread = new Thread(handler);
|
Thread thread = new Thread(handler);
|
||||||
thread.start();
|
thread.start();
|
||||||
|
|
||||||
// Add client handler to mapPseudosConnectedClients
|
// Add client handler to mapPseudosConnectedClients
|
||||||
addConnectedClientHandler(pseudoMessage, handler);
|
addConnectedClientHandler(pseudoMessage, handler);
|
||||||
}
|
}
|
||||||
@@ -143,7 +151,8 @@ public class Server {
|
|||||||
handleNewConnection();
|
handleNewConnection();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
System.err.println(
|
System.err.println(
|
||||||
"Error handling connection: " + e.getMessage());
|
"Error handling connection: " + e.getMessage()
|
||||||
|
);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -151,12 +160,34 @@ public class Server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String getPseudos() {
|
public static String getPseudos() {
|
||||||
StringBuilder pseudos = new StringBuilder("All connected clients:\n");
|
StringBuilder pseudos = new StringBuilder();
|
||||||
mapPseudosConnectedClientsHandlers.forEach((k, v) -> pseudos.append("Pseudo: ").append(k).append("\n"));
|
int size = mapPseudosConnectedClientsHandlers.size();
|
||||||
|
int count = 0;
|
||||||
|
for (Map.Entry<
|
||||||
|
String,
|
||||||
|
ClientHandler
|
||||||
|
> entry : mapPseudosConnectedClientsHandlers.entrySet()) {
|
||||||
|
count++;
|
||||||
|
pseudos.append("> ").append(entry.getKey());
|
||||||
|
if (count < size) {
|
||||||
|
pseudos.append("\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
return pseudos.toString();
|
return pseudos.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addConnectedClientHandler(String pseudo, ClientHandler clientHandler) {
|
public static ClientHandler getClientHandler(String pseudo) {
|
||||||
|
return mapPseudosConnectedClientsHandlers.get(pseudo);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Collection<ClientHandler> getAllClientHandlers() {
|
||||||
|
return mapPseudosConnectedClientsHandlers.values();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addConnectedClientHandler(
|
||||||
|
String pseudo,
|
||||||
|
ClientHandler clientHandler
|
||||||
|
) {
|
||||||
mapPseudosConnectedClientsHandlers.putIfAbsent(pseudo, clientHandler);
|
mapPseudosConnectedClientsHandlers.putIfAbsent(pseudo, clientHandler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
1
gradle.properties
Normal file
1
gradle.properties
Normal file
@@ -0,0 +1 @@
|
|||||||
|
org.gradle.console=plain
|
||||||
Reference in New Issue
Block a user