Morph01/ClientServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: reformat for better understanding and added a client handler list to main server

Browse Source
This commit is contained in:
Morph01
2025-04-01 10:37:39 +02:00
parent d0c9f59ad2
commit 4894c2555d
3 changed files with 135 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/clientserver/client/Client.java
View File

@@ -35,29 +35,26 @@ public class Client {
int serverPort = 6666; int serverPort = 6666;
// 2 - Envoyer un message au serveur // 2 - Envoyer un message au serveur
String message = "Connection request"; String pseudo = "PseudoTest";
byte[] sendData = message.getBytes(); byte[] sendData = pseudo.getBytes();
DatagramPacket sendPacket = new DatagramPacket( DatagramPacket sendPacket = new DatagramPacket(
sendData, sendData,
sendData.length, sendData.length,
serverAddress, serverAddress,
serverPort serverPort);
);
socketClient.send(sendPacket); socketClient.send(sendPacket);
System.out.println("New connection request sent"); System.out.println("New connection request sent");
// 3 - Recevoir // 3 - Recevoir
byte[] receivedData = new byte[1024]; // tampon de réception byte[] receivedData = new byte[1024]; // tampon de réception
DatagramPacket receivedPacket = new DatagramPacket( DatagramPacket receivedPacket = new DatagramPacket(
receivedData, receivedData,
receivedData.length receivedData.length);
);
socketClient.receive(receivedPacket); socketClient.receive(receivedPacket);
String reponse = new String( String reponse = new String(
receivedPacket.getData(), receivedPacket.getData(),
0, 0,
receivedPacket.getLength() receivedPacket.getLength());
);
if (reponse.startsWith("PORT:")) { if (reponse.startsWith("PORT:")) {
int newPort = Integer.parseInt(reponse.substring(5)); int newPort = Integer.parseInt(reponse.substring(5));
@@ -69,13 +66,34 @@ public class Client {
String messagePort = "Test"; String messagePort = "Test";
byte[] envoyeesPort = messagePort.getBytes(); byte[] envoyeesPort = messagePort.getBytes();
DatagramPacket paquetPort = new DatagramPacket( DatagramPacket paquetPort = new DatagramPacket(
envoyeesPort, envoyeesPort,
envoyeesPort.length, envoyeesPort.length,
serverAddress, serverAddress,
newPort newPort);
);
socketClient.send(paquetPort); socketClient.send(paquetPort);
System.out.println("Test sent"); System.out.println("Test sent");
try {
// Définir un timeout court pour que la boucle continue
socketClient.setSoTimeout(1000);
byte[] reponseData = new byte[1024];
DatagramPacket reponsePacket = new DatagramPacket(
reponseData,
reponseData.length);
socketClient.receive(reponsePacket);
String messageServeur = new String(
reponsePacket.getData(),
0,
reponsePacket.getLength());
System.out.println("Serveur répond: \n" + messageServeur);
} catch (java.net.SocketTimeoutException e) {
// Ignorer le timeout et continuer
System.out.println("Pas de réponse du serveur cette fois-ci");
}
TimeUnit.SECONDS.sleep(1); TimeUnit.SECONDS.sleep(1);
} }
} }

71
app/src/main/java/clientserver/server/ClientHandler.java
View File

@@ -6,69 +6,72 @@ import java.net.DatagramSocket;
public class ClientHandler implements Runnable { public class ClientHandler implements Runnable {
private final DatagramSocket socket; private final DatagramSocket clientHandlerSocket;
private final Client client; private final Client client;
private boolean running = true; private boolean running = true;
public ClientHandler(DatagramSocket socket, Client client) { public ClientHandler(DatagramSocket socket, Client client) {
this.socket = socket; this.clientHandlerSocket = socket;
this.client = client; this.client = client;
} }
public void sendConnectedClients() {
Server.sendMessage(clientHandlerSocket, Server.getPseudos(), client.getAddress(), client.getPort());
}
public void stop() { public void stop() {
running = false; running = false;
if (socket != null && !socket.isClosed()) { if (clientHandlerSocket != null && !clientHandlerSocket.isClosed()) {
socket.close(); clientHandlerSocket.close();
} }
} }
@Override @Override
public void run() { public void run() {
System.out.println( System.out.println(
"Started handler for client " + "Started handler for client " +
client.getAddress() + client.getAddress() +
":" + ":" +
client.getPort() client.getPort());
);
// try { // try {
// socket.setSoTimeout(30000); // socket.setSoTimeout(30000);
// } catch (Exception e) { // } catch (Exception e) {
// System.err.println("Could not set socket timeout"); // System.err.println("Could not set socket timeout");
// } // }
while (running && !socket.isClosed()) { while (running && !clientHandlerSocket.isClosed()) {
DatagramPacket packet = Server.receivedPacket(socket); DatagramPacket packet = Server.receivedPacket(clientHandlerSocket);
if (packet == null) continue; if (packet == null)
continue;
String message = new String( String message = new String(
packet.getData(), packet.getData(),
0, 0,
packet.getLength() packet.getLength());
);
System.out.println( System.out.println(
"Received from " + "Received from " +
client.getAddress() + client.getAddress() +
":" + ":" +
client.getPort() + client.getPort() +
": " + ": " +
message message);
);
sendConnectedClients();
// Reply with echo // Reply with echo
// String response = "ECHO: " + message; // String response = "ECHO: " + message;
// Server.sendMessage( // Server.sendMessage(
// socket, // socket,
// response, // response,
// client.getAddress(), // client.getAddress(),
// client.getPort() // client.getPort()
// ); // );
} }
System.out.println( System.out.println(
"Client handler terminated for " + "Client handler terminated for " +
client.getAddress() + client.getAddress() +
":" + ":" +
client.getPort() client.getPort());
);
} }
} }

104
app/src/main/java/clientserver/server/Server.java
View File

@@ -4,12 +4,16 @@ import clientserver.client.Client;
import java.io.IOException; 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.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class Server { 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<>();
public Server(int port) { public Server(int port) {
this.mainServerPort = port; this.mainServerPort = port;
@@ -40,9 +44,8 @@ public class Server {
public static DatagramPacket receivedPacket(DatagramSocket socket) { public static DatagramPacket receivedPacket(DatagramSocket socket) {
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
@@ -54,73 +57,75 @@ public class Server {
} }
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) return; if (packet == null)
return;
Client client = new Client(packet.getAddress(), packet.getPort()); int originalClientPort = packet.getPort();
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 " +
client.getAddress() + clientAddress +
":" + ":" +
client.getPort() originalClientPort);
);
// Process the received message // Process the received message
String message = 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 " +
client.getAddress() + clientAddress +
":" + ":" +
client.getPort() + originalClientPort +
": " + ": " +
message pseudoMessage);
);
// Create a new socket for this client // Create a new socket for this client
DatagramSocket clientSocket = createNewSocket(); DatagramSocket clientHandlerSocket = createNewSocket();
if (clientSocket == null) return; if (clientHandlerSocket == null)
return;
int newPort = clientSocket.getLocalPort(); int clientHandlerLocalPort = clientHandlerSocket.getLocalPort();
client.setPort(newPort);
Client client = new Client(clientAddress, originalClientPort);
// Send new port information to client // Send new port information to client
String response = "PORT:" + newPort; String response = "PORT:" + clientHandlerLocalPort;
sendMessage( sendMessage(
mainServerSocket, mainServerSocket,
response, response,
client.getAddress(), 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(clientSocket, 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
mapPseudosConnectedClientsHandlers.putIfAbsent(pseudoMessage, handler);
} }
public void run() { public void run() {
@@ -130,11 +135,24 @@ 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();
} }
} }
System.out.println("Server shutdown"); System.out.println("Server shutdown");
} }
public static String getPseudos() {
StringBuilder pseudos = new StringBuilder("All connected clients:\n");
mapPseudosConnectedClientsHandlers.forEach((k, v) -> pseudos.append("Pseudo: ").append(k).append("\n"));
return pseudos.toString();
}
public void addConnectedClientHandler(String pseudo, ClientHandler clientHandler) {
mapPseudosConnectedClientsHandlers.putIfAbsent(pseudo, clientHandler);
}
public void removeClientHandler(String pseudo) {
mapPseudosConnectedClientsHandlers.remove(pseudo);
}
} }