Logisim-Evolution/Projet-UDP
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handshake to test if the server exists

Browse Source 
simplification of some commands
This commit is contained in:
Clément
2025-03-01 13:18:14 +01:00
parent a041193ce2
commit 6d3bca136a
7 changed files with 77 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ChatApp/src/client/Client.java
View File

@@ -7,6 +7,7 @@ import java.net.SocketException;
import java.util.Objects;
import java.util.Scanner;
import network.protocol.ANSIColor;
import network.protocol.packets.*;
public class Client {
@@ -30,6 +31,23 @@ public class Client {
public Client(InetSocketAddress serverAddress) throws SocketException {
this.connexion = new ClientConnexion(new DatagramSocket(), serverAddress);
int tries = 0;
try {
connexion.sendPacket(new HandshakePacket());
} catch (IOException e) {
e.printStackTrace();
}
while(!connexion.connected) {
try {
Thread.sleep(100);
if(tries++ > 5) {
System.out.println("Server is not responding");
System.exit(1);
}
} catch (InterruptedException e) {
e.printStackTrace();
}
}
Scanner scanner = new Scanner(System.in);
System.out.println("Enter your pseudo:");
String pseudo = scanner.nextLine();
@@ -39,17 +57,23 @@ public class Client {
public void visitMessage(String message){
try {
if(message.startsWith("/")){
if(message.startsWith("/createRoom")) {
if(message.startsWith("/createRoom ")) {
String roomName = message.substring(12).trim();
SendCreateRoom(roomName);
} else if(message.startsWith("/listRooms")) {
} else if(message.startsWith("/create ")){
String roomName = message.substring(8).trim();
SendCreateRoom(roomName);
} else if(message.equals("/listRooms") || message.equals("/list")) {
RequestRoomList();
} else if(message.startsWith("/joinRoom")) {
} else if(message.startsWith("/joinRoom ")) {
String roomName = message.substring(10).trim();
SendJoinRoom(roomName);
} else if(message.startsWith("/leaveRoom")) {
} else if(message.startsWith("/join ")){
String roomName = message.substring(6).trim();
SendJoinRoom(roomName);
} else if(message.equals("/leaveRoom") || message.equals("/leave")) {
SendLeaveRoom();
} else if(message.startsWith("/help")) {
} else if(message.equals("/help")) {
System.out.println("Available commands:");
System.out.println("\t/createRoom <roomName>");
System.out.println("\t/listRooms");
@@ -58,7 +82,7 @@ public class Client {
System.out.println("\t/help");
}
else {
System.out.println("Unknown command");
System.out.println(ANSIColor.formatString("&rUnknown command&n"));
}
} else {
SendChatMessage(message);

29
ChatApp/src/client/ClientConnexion.java
View File

@@ -10,21 +10,14 @@ import network.SocketWriter;
import network.protocol.ANSIColor;
import network.protocol.Packet;
import network.protocol.PacketVisitor;
import network.protocol.packets.ChatMessagePacket;
import network.protocol.packets.CreateRoomPacket;
import network.protocol.packets.JoinRoomPacket;
import network.protocol.packets.LeaveRoomPacket;
import network.protocol.packets.LoginPacket;
import network.protocol.packets.RequestRoomListPacket;
import network.protocol.packets.RoomListPacket;
import network.protocol.packets.SendChatMessagePacket;
import network.protocol.packets.ServerResponsePacket;
import network.protocol.packets.*;
public class ClientConnexion implements PacketVisitor, PacketHandler{
private final InetSocketAddress serverAddress;
private final SocketWriter writer;
private final SocketReader reader;
protected boolean connected = false;
public ClientConnexion(DatagramSocket socket, InetSocketAddress serverAddress) {
this.serverAddress = serverAddress;
@@ -50,13 +43,13 @@ public class ClientConnexion implements PacketVisitor, PacketHandler{
public void visitPacket(ChatMessagePacket packet) {
StringBuilder sb = new StringBuilder();
String time = packet.getTime().toString();
sb.append("&y[");
sb.append(time, 11, 19); // We only take the HH:MM:SS part
sb.append("]&n");
sb.append(" ");
sb.append(packet.getChatter());
sb.append(" : ");
sb.append(packet.getContent()).append("&n"); // make the color back to normal at the end of every message
sb.append("&y[")
.append(time, 11, 19) // We only take the HH:MM:SS part
.append("]&n")
.append(" ")
.append(packet.getChatter())
.append(" : ")
.append(packet.getContent()).append("&n"); // make the color back to normal at the end of every message
System.out.println(ANSIColor.formatString(sb.toString()));
}
@@ -106,4 +99,8 @@ public class ClientConnexion implements PacketVisitor, PacketHandler{
System.out.println(packet.getResponse());
}
@Override
public void visitPacket(HandshakePacket packet) {
connected = true;
}
}