diff --git a/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java b/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java index da5c1a9..0dd7368 100644 --- a/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java +++ b/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java @@ -13,20 +13,19 @@ import java.net.SocketException; import java.util.Scanner; import java.util.regex.Matcher; import java.util.regex.Pattern; - import static ch.zhaw.pm2.multichat.protocol.ConnectionHandler.State.*; public class ClientConnectionHandler extends ConnectionHandler implements Runnable { - private final Pattern messagePattern = Pattern.compile("^(?:@(\\S*))?\\s*(.*)$"); + private final Pattern messagePattern = Pattern.compile( "^(?:@(\\S*))?\\s*(.*)$" ); private SimpleStringProperty userName; - private final SimpleObjectProperty state; - private final ClientMessageList messages; - private final SimpleStringProperty serverAddress; - private final SimpleIntegerProperty serverPort; + private SimpleObjectProperty state; + private ClientMessageList messages; + private SimpleStringProperty serverAddress; + private SimpleIntegerProperty serverPort; - public ClientConnectionHandler(ClientMessageList messages) { + public ClientConnectionHandler(ClientMessageList messages) { super(); this.messages = messages; state = new SimpleObjectProperty<>(State.NEW); @@ -40,30 +39,24 @@ public class ClientConnectionHandler extends ConnectionHandler implements Runnab this.serverAddress.set(serverAddress); this.serverPort.set(serverPort); setConnection(NetworkHandler.openConnection(serverAddress, serverPort)); - this.userName = new SimpleStringProperty((userName == null || userName.isBlank()) ? USER_NONE : userName); + this.userName = new SimpleStringProperty((userName == null || userName.isBlank())? USER_NONE : userName); } - public SimpleStringProperty getServerAddressProperty() { - return serverAddress; - } + public SimpleStringProperty getServerAddressProperty() { return serverAddress; } - public SimpleIntegerProperty getServerPortProperty() { - return serverPort; - } + public SimpleIntegerProperty getServerPortProperty() { return serverPort; } public SimpleObjectProperty getStateProperty() { return this.state; } - public SimpleStringProperty getUserNameProperty() { - return userName; - } + public SimpleStringProperty getUserNameProperty() { return userName; } - public void setState(State newState) { + public void setState (State newState) { state.set(newState); } - public void run() { + public void run () { startReceiving(); } @@ -84,9 +77,9 @@ public class ClientConnectionHandler extends ConnectionHandler implements Runnab System.out.println("Connection terminated by remote"); this.setState(DISCONNECTED); System.err.println("Unregistered because connection terminated" + e.getMessage()); - } catch (IOException e) { + } catch(IOException e) { System.err.println("Communication error" + e); - } catch (ClassNotFoundException e) { + } catch(ClassNotFoundException e) { System.err.println("Received object of unknown type" + e.getMessage()); } System.out.println("Stopped Connection Handler"); @@ -106,65 +99,48 @@ public class ClientConnectionHandler extends ConnectionHandler implements Runnab private void processData(String data) { try { - // parse data content Scanner scanner = new Scanner(data); - String sender = null; - String reciever = null; - String type = null; - String payload = null; - if (scanner.hasNextLine()) { - sender = scanner.nextLine(); - } else { - throw new ChatProtocolException("No Sender found"); - } - if (scanner.hasNextLine()) { - reciever = scanner.nextLine(); - } else { - throw new ChatProtocolException("No Reciever found"); - } - if (scanner.hasNextLine()) { - type = scanner.nextLine(); - } else { - throw new ChatProtocolException("No Type found"); - } - if (scanner.hasNextLine()) { - payload = scanner.nextLine(); - } + StringBuilder sender = new StringBuilder(); + StringBuilder reciever = new StringBuilder(); + StringBuilder type = new StringBuilder(); + StringBuilder payload = new StringBuilder(); + super.processData(scanner,sender,reciever,type,payload); + // dispatch operation based on type parameter - if (type.equals(getDataTypeConnect())) { + if (type.toString().equals(getDataTypeConnect())) { System.err.println("Illegal connect request from server"); - } else if (type.equals(getDataTypeConfirm())) { + } else if (type.toString().equals(getDataTypeConfirm())) { if (state.get() == CONFIRM_CONNECT) { - this.userName.set(reciever); + this.userName.set(reciever.toString()); this.serverPort.set(getConnection().getRemotePort()); this.serverAddress.set(getConnection().getRemoteHost()); - messages.addMessage(new Message(Message.MessageType.INFO, sender, reciever, payload)); + messages.addMessage(new Message(Message.MessageType.INFO,sender.toString(),reciever.toString(),payload.toString())); System.out.println("CONFIRM: " + payload); this.setState(CONNECTED); } else if (state.get() == CONFIRM_DISCONNECT) { - messages.addMessage(new Message(Message.MessageType.INFO, sender, reciever, payload)); + messages.addMessage(new Message(Message.MessageType.INFO,sender.toString(),reciever.toString(),payload.toString())); System.out.println("CONFIRM: " + payload); this.setState(DISCONNECTED); } else { System.err.println("Got unexpected confirm message: " + payload); } - } else if (type.equals(getDataTypeDisconnect())) { + } else if (type.toString().equals(getDataTypeDisconnect())) { if (state.get() == DISCONNECTED) { System.out.println("DISCONNECT: Already in disconnected: " + payload); return; } - messages.addMessage(new Message(Message.MessageType.INFO, sender, reciever, payload)); + messages.addMessage(new Message(Message.MessageType.INFO,sender.toString(),reciever.toString(),payload.toString())); System.out.println("DISCONNECT: " + payload); this.setState(DISCONNECTED); - } else if (type.equals(getDataTypeMessage())) { + } else if (type.toString().equals(getDataTypeMessage())) { if (state.get() != CONNECTED) { System.out.println("MESSAGE: Illegal state " + state + " for message: " + payload); return; } - messages.addMessage(new Message(Message.MessageType.MESSAGE, sender, reciever, payload)); - System.out.println("MESSAGE: From " + sender + " to " + reciever + ": " + payload); - } else if (type.equals(getDataTypeError())) { - messages.addMessage(new Message(Message.MessageType.ERROR, sender, reciever, payload)); + messages.addMessage(new Message(Message.MessageType.MESSAGE,sender.toString(),reciever.toString(),payload.toString())); + System.out.println("MESSAGE: From " + sender + " to " + reciever + ": "+ payload); + } else if (type.toString().equals(getDataTypeError())) { + messages.addMessage(new Message(Message.MessageType.ERROR,sender.toString(),reciever.toString(),payload.toString())); System.out.println("ERROR: " + payload); } else { System.out.println("Unknown data type received: " + type); @@ -175,37 +151,16 @@ public class ClientConnectionHandler extends ConnectionHandler implements Runnab } } - private void sendData(String sender, String receiver, String type, String payload) { - if (getConnection().isAvailable()) { - new StringBuilder(); - String data = new StringBuilder() - .append(sender + "\n") - .append(receiver + "\n") - .append(type + "\n") - .append(payload + "\n") - .toString(); - try { - getConnection().send(data); - } catch (SocketException e) { - System.err.println("Connection closed: " + e.getMessage()); - } catch (EOFException e) { - System.out.println("Connection terminated by remote"); - } catch (IOException e) { - System.err.println("Communication error: " + e.getMessage()); - } - } - } public void connect() throws ChatProtocolException { if (state.get() != NEW) throw new ChatProtocolException("Illegal state for connect: " + state); - this.sendData(userName.get(), USER_NONE, getDataTypeConnect(), null); + this.sendData(userName.get(), USER_NONE, getDataTypeConnect(),null); this.setState(CONFIRM_CONNECT); } public void disconnect() throws ChatProtocolException { - if (state.get() != NEW && state.get() != CONNECTED) - throw new ChatProtocolException("Illegal state for disconnect: " + state); - this.sendData(userName.get(), USER_NONE, getDataTypeDisconnect(), null); + if (state.get() != NEW && state.get() != CONNECTED) throw new ChatProtocolException("Illegal state for disconnect: " + state); + this.sendData(userName.get(), USER_NONE, getDataTypeDisconnect(),null); this.setState(CONFIRM_DISCONNECT); } @@ -216,15 +171,14 @@ public class ClientConnectionHandler extends ConnectionHandler implements Runnab if (matcher.find()) { String receiver = matcher.group(1); String message = matcher.group(2); - if (message.length() < 1) { + if(message.length() < 1){ return false; } if (receiver == null || receiver.isBlank()) receiver = ClientConnectionHandler.USER_ALL; - this.sendData(userName.get(), receiver, getDataTypeMessage(), message); + this.sendData(userName.get(), receiver, getDataTypeMessage(),message); return true; } else { return false; } } - } diff --git a/protocol/src/main/java/ch/zhaw/pm2/multichat/protocol/ConnectionHandler.java b/protocol/src/main/java/ch/zhaw/pm2/multichat/protocol/ConnectionHandler.java index f0e31bb..b0ed994 100644 --- a/protocol/src/main/java/ch/zhaw/pm2/multichat/protocol/ConnectionHandler.java +++ b/protocol/src/main/java/ch/zhaw/pm2/multichat/protocol/ConnectionHandler.java @@ -1,5 +1,10 @@ package ch.zhaw.pm2.multichat.protocol; +import java.io.EOFException; +import java.io.IOException; +import java.net.SocketException; +import java.util.Scanner; + public abstract class ConnectionHandler { private NetworkHandler.NetworkConnection connection; @@ -44,4 +49,47 @@ public abstract class ConnectionHandler { protected void setConnection(NetworkHandler.NetworkConnection connection) { this.connection = connection; } + + protected void processData(Scanner scanner, StringBuilder sender, StringBuilder reciever, StringBuilder type, StringBuilder payload) throws ChatProtocolException { + // parse data content + if (scanner.hasNextLine()) { + sender.append(scanner.nextLine()); + } else { + throw new ChatProtocolException("No Sender found"); + } + if (scanner.hasNextLine()) { + reciever.append(scanner.nextLine()); + } else { + throw new ChatProtocolException("No Reciever found"); + } + if (scanner.hasNextLine()) { + type.append(scanner.nextLine()); + } else { + throw new ChatProtocolException("No Type found"); + } + if (scanner.hasNextLine()) { + payload.append(scanner.nextLine()); + } + } + + protected void sendData(String sender, String receiver, String type, String payload) { + if (connection.isAvailable()) { + new StringBuilder(); + String data = new StringBuilder() + .append(sender+"\n") + .append(receiver+"\n") + .append(type+"\n") + .append(payload+"\n") + .toString(); + try { + getConnection().send(data); + } catch (SocketException e) { + System.err.println("Connection closed: " + e.getMessage()); + } catch (EOFException e) { + System.out.println("Connection terminated by remote"); + } catch(IOException e) { + System.err.println("Communication error: " + e.getMessage()); + } + } + } } diff --git a/server/src/main/java/ch/zhaw/pm2/multichat/server/ServerConnectionHandler.java b/server/src/main/java/ch/zhaw/pm2/multichat/server/ServerConnectionHandler.java index c45dfca..eac70e8 100644 --- a/server/src/main/java/ch/zhaw/pm2/multichat/server/ServerConnectionHandler.java +++ b/server/src/main/java/ch/zhaw/pm2/multichat/server/ServerConnectionHandler.java @@ -8,7 +8,6 @@ import ch.zhaw.pm2.multichat.protocol.NetworkHandler; import java.io.EOFException; import java.io.IOException; import java.net.SocketException; -import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.Scanner; @@ -91,43 +90,25 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab getConnection().close(); System.out.println("Stopped receiving data."); } catch (IOException e) { - System.err.println("Failed to close connection." + e); + System.err.println("Failed to close connection." + e.getMessage()); } System.out.println("Closed Connection Handler for " + userName); } private void processData(String data) { try { - // parse data content Scanner scanner = new Scanner(data); - String sender = null; - String reciever = null; - String type = null; - String payload = null; - if (scanner.hasNextLine()) { - sender = scanner.nextLine(); - } else { - throw new ChatProtocolException("No Sender found"); - } - if (scanner.hasNextLine()) { - reciever = scanner.nextLine(); - } else { - throw new ChatProtocolException("No Reciever found"); - } - if (scanner.hasNextLine()) { - type = scanner.nextLine(); - } else { - throw new ChatProtocolException("No Type found"); - } - if (scanner.hasNextLine()) { - payload = scanner.nextLine(); - } + StringBuilder sender = new StringBuilder(); + StringBuilder reciever = new StringBuilder(); + StringBuilder type = new StringBuilder(); + StringBuilder payload = new StringBuilder(); + super.processData(scanner,sender,reciever,type,payload); // dispatch operation based on type parameter - if (type.equals(getDataTypeConnect())) { + if (type.toString().equals(getDataTypeConnect())) { if (this.state != NEW) throw new ChatProtocolException("Illegal state for connect request: " + state); - if (sender == null || sender.isBlank()) sender = this.userName; - if (connectionRegistry.containsKey(sender)) { + if (sender.toString().isBlank()) sender.append(this.userName); + if (connectionRegistry.containsKey(sender.toString())) { mutex.lock(); try { state = ERROR; @@ -140,7 +121,7 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab } mutex.lock(); try { - this.userName = sender; + this.userName = sender.toString(); nameComplete.signal(); } finally { @@ -149,9 +130,9 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab connectionRegistry.put(userName, this); sendData(USER_NONE, userName, getDataTypeConfirm(), "Registration successfull for " + userName); this.state = CONNECTED; - } else if (type.equals(getDataTypeConfirm())) { + } else if (type.toString().equals(getDataTypeConfirm())) { System.out.println("Not expecting to receive a CONFIRM request from client"); - } else if (type.equals(getDataTypeDisconnect())) { + } else if (type.toString().equals(getDataTypeDisconnect())) { if (state == DISCONNECTED) throw new ChatProtocolException("Illegal state for disconnect request: " + state); if (state == CONNECTED) { @@ -160,24 +141,24 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab sendData(USER_NONE, userName, getDataTypeConfirm(), "Confirm disconnect of " + userName); this.state = DISCONNECTED; this.stopReceiving(); - } else if (type.equals(getDataTypeMessage())) { + } else if (type.toString().equals(getDataTypeMessage())) { if (state != CONNECTED) throw new ChatProtocolException("Illegal state for message request: " + state); - if (USER_ALL.equals(reciever)) { + if (USER_ALL.equals(reciever.toString())) { for (ServerConnectionHandler handler : connectionRegistry.values()) { - handler.sendData(sender, reciever, type, payload); + handler.sendData(sender.toString(), reciever.toString(), type.toString(), payload.toString()); } } else { - ServerConnectionHandler handler = connectionRegistry.get(reciever); + ServerConnectionHandler handler = connectionRegistry.get(reciever.toString()); if (handler != null) { - handler.sendData(sender, reciever, type, payload); - if(!reciever.equals(sender)){ - sendData(sender, reciever, type, payload); //send message to sender if it's a direct message and sender is not receiver. + handler.sendData(sender.toString(), reciever.toString(), type.toString(), payload.toString()); + if(!reciever.toString().equals(sender.toString())){ + sendData(sender.toString(), reciever.toString(), type.toString(), payload.toString()); //send message to sender if it's a direct message and sender is not receiver. } } else { this.sendData(USER_NONE, userName, getDataTypeError(), "Unknown User: " + reciever); } } - } else if (type.equals(getDataTypeError())) { + } else if (type.toString().equals(getDataTypeError())) { System.err.println("Received error from client (" + sender + "): " + payload); } else { System.err.println("Unknown data type received: " + type); @@ -188,27 +169,4 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab sendData(USER_NONE, userName, getDataTypeError(), e.getMessage()); } } - - - - private void sendData(String sender, String receiver, String type, String payload) { - if (getConnection().isAvailable()) { - new StringBuilder(); - String data = new StringBuilder() - .append(sender+"\n") - .append(receiver+"\n") - .append(type+"\n") - .append(payload+"\n") - .toString(); - try { - getConnection().send(data); - } catch (SocketException e) { - System.out.println("Connection closed: " + e.getMessage()); - } catch (EOFException e) { - System.out.println("Connection terminated by remote"); - } catch(IOException e) { - System.out.println("Communication error: " + e.getMessage()); - } - } - } }