Merge branch 'develop' into issue38_irregular_key_event_packets

# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/ServerPacketParser.java
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/GameClient.java

src/main/java/seng302/visualiser/ClientToServerThread.java

@@ -7,6 +7,7 @@ import java.io.OutputStream;
 import java.net.Socket;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Queue;
 import java.util.Timer;
@@ -17,10 +18,9 @@ import java.util.zip.Checksum;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
-import seng302.gameServer.server.messages.BoatActionMessage;
-import seng302.gameServer.server.messages.BoatAction;
-import seng302.gameServer.server.messages.Message;
 import seng302.model.stream.packets.StreamPacket;
+import seng302.gameServer.server.messages.BoatActionMessage;
+import seng302.gameServer.server.messages.Message;
 
 /**
  * A class describing a single connection to a Server for the purposes of sending and receiving on
@@ -51,6 +51,8 @@ public class ClientToServerThread implements Runnable {
     private Socket socket;
     private InputStream is;
 
+    private Logger logger = LoggerFactory.getLogger(ClientToServerThread.class);
+
     //Output stream
     private OutputStream os;
     private Timer upWindPacketTimer = new Timer();
@@ -58,7 +60,9 @@ public class ClientToServerThread implements Runnable {
     private boolean upwindTimerFlag = false, downwindTimerFlag = false;
     static public final int PACKET_SENDING_INTERVAL_MS = 100;
 
-    private int clientId;
+    private int clientId = -1;
+
+//    private Boolean updateClient = true;
     private ByteArrayOutputStream crcBuffer;
     private boolean socketOpen = true;
 
@@ -78,15 +82,8 @@ public class ClientToServerThread implements Runnable {
         socket = new Socket(ipAddress, portNumber);
         is = socket.getInputStream();
         os = socket.getOutputStream();
-        Integer allocatedID = threeWayHandshake();
-        if (allocatedID != null) {
-            clientId = allocatedID;
-            clientLog("Successful handshake. Allocated ID: " + clientId, 1);
-        } else {
-            clientLog("Unsuccessful handshake", 1);
-            closeSocket();
-            return;
-        }
+
+        sendRegistrationRequest();
 
         thread = new Thread(this);
         thread.start();
@@ -135,9 +132,15 @@ public class ClientToServerThread implements Runnable {
                         if (streamPackets.size() > 0) {
                             streamPackets.add(new StreamPacket(type, payloadLength, timeStamp, payload));
                         } else {
-                            streamPackets.add(new StreamPacket(type, payloadLength, timeStamp, payload));
-                            for (ClientSocketListener csl : listeners)
-                                csl.newPacket();
+                            if (PacketType.RACE_REGISTRATION_RESPONSE == PacketType.assignPacketType(type, payload)){
+                                processRegistrationResponse(new StreamPacket(type, payloadLength, timeStamp, payload));
+                            }
+                            else {
+                                if (clientId == -1) continue; // Do not continue if not registered
+                                streamPackets.add(new StreamPacket(type, payloadLength, timeStamp, payload));
+                                for (ClientSocketListener csl : listeners)
+                                    csl.newPacket();
+                            }
                         }
                     } else {
                         clientLog("Packet has been dropped", 1);
@@ -161,30 +164,52 @@ public class ClientToServerThread implements Runnable {
 
 
     /**
-     * Listens for an allocated sourceID and returns it to the server
-     *
-     * @return the sourceID allocated to us by the server
+     * Sends a request to the server asking for a source ID
      */
-    private Integer threeWayHandshake() {
-        Integer ourSourceID = null;
-        while (true) {
-            try {
-                ourSourceID = is.read();
-            } catch (IOException e) {
-                clientLog("Three way handshake failed", 1);
-            }
-            if (ourSourceID != null) {
-                try {
-                    os.write(ourSourceID);
-                    return ourSourceID;
-                } catch (IOException e) {
-                    clientLog("Three way handshake failed", 1);
-                    return null;
-                }
-            }
+    private void sendRegistrationRequest() {
+        RegistrationRequestMessage requestMessage = new RegistrationRequestMessage(ClientType.PLAYER);
+
+        try {
+            os.write(requestMessage.getBuffer());
+        } catch (IOException e) {
+            logger.error("Could not send registration request. Exiting");
+            System.exit(1);
         }
     }
 
+    /**
+     * Accepts a response to the registration request message, and updates the client OR quits
+     * @param packet The registration requests packet
+     */
+    private void processRegistrationResponse(StreamPacket packet){
+        int sourceId = (int) Message.bytesToLong(Arrays.copyOfRange(packet.getPayload(), 0, 3));
+        int statusCode = (int) Message.bytesToLong(Arrays.copyOfRange(packet.getPayload(), 4,5));
+
+        RegistrationResponseStatus status = RegistrationResponseStatus.getResponseStatus(statusCode);
+
+        if (status.equals(RegistrationResponseStatus.SUCCESS_PLAYING)){
+            clientId = sourceId;
+
+            return;
+        }
+
+        logger.error("Server Denied Connection, Exiting");
+
+        final String alertErrorText;
+
+        if (status.equals(RegistrationResponseStatus.FAILURE_FULL)){
+            alertErrorText = "Server is full";
+        }
+        else{
+            alertErrorText = "Could not connect to server";
+        }
+
+        Platform.runLater(() -> {
+            new Alert(AlertType.ERROR, alertErrorText, ButtonType.OK).showAndWait();
+            System.exit(1);
+        });
+    }
+
     /**
      * Sends packets for the given boat action. Special cases are: \n
      * - DOWNWIND = Packets are sent every ClientToServerThread.PACKET_SENDING_INTERVAL_MS
@@ -252,10 +277,12 @@ public class ClientToServerThread implements Runnable {
      * @param message The given message type.
      */
     private void sendBoatAction(BoatActionMessage message) {
-        try {
-            os.write(message.getBuffer());
-        } catch (IOException e) {
-            clientLog("Could not write to server", 1);
+        if (clientId != -1) {
+            try {
+                os.write(message.getBuffer());
+            } catch (IOException e) {
+                clientLog("Could not write to server", 1);
+            }
         }
     }
 

src/main/java/seng302/visualiser/GameClient.java

@@ -14,6 +14,8 @@ import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Pane;
 import seng302.gameServer.MainServerThread;
 import seng302.gameServer.server.messages.BoatAction;
+import seng302.gameServer.server.messages.BoatActionMessage;
+import seng302.gameServer.server.messages.BoatActionType;
 import seng302.model.RaceState;
 import seng302.model.Yacht;
 import seng302.model.stream.packets.StreamPacket;
@@ -58,6 +60,7 @@ public class GameClient {
             ioe.printStackTrace();
             System.out.println("Unable to connect to host...");
         }
+
         socketThread.addStreamObserver(this::parsePackets);
         LobbyController lobbyController = loadLobby();
         lobbyController.setPlayerListSource(clientLobbyList);

src/main/java/seng302/visualiser/controllers/RaceViewController.java

@@ -312,7 +312,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 updateRaceTime();
                 updateWindDirection();
                 updateOrder();
-                updateSparkLine();
+//                updateSparkLine();
             }
         }, 0, 1000);
     }