Server discovery bug fixes & error handling improvements

- Fixed concurrency bug that prevented players from connecting to servers
- Discovery server can restart itself if it crashes
- Added nicer error handling for server discovery.
- Using AWS to get servers external IP address.

Tags: #story[1281]

src/main/java/seng302/gameServer/MainServerThread.java

@@ -1,11 +1,5 @@
 package seng302.gameServer;
 
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.util.ArrayList;
-import java.util.Random;
-import java.util.Timer;
-import java.util.TimerTask;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import seng302.gameServer.messages.Message;
@@ -18,6 +12,13 @@ import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.stream.xml.parser.RegattaXMLData;
 import seng302.utilities.GeoUtility;
 
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.ArrayList;
+import java.util.Random;
+import java.util.Timer;
+import java.util.TimerTask;
+
 /**
  * A class describing the overall server, which creates and collects server threads for each client
  * Created by wmu16 on 13/07/17.
@@ -158,6 +159,8 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
     }
 
     private void sendSetupMessages() {
+        MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
+
         broadcastMessage(MessageFactory.getRaceXML());
         broadcastMessage(MessageFactory.getRegattaXML());
         broadcastMessage(MessageFactory.getBoatXML());
@@ -253,16 +256,26 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
                 }
             });
         } else {
-            serverToClientThread.addConnectionListener(this::sendSetupMessages);
-            MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
+            //serverToClientThread.addConnectionListener(this::sendSetupMessages);
         }
         serverToClientThreads.add(serverToClientThread);
-        serverToClientThread.addDisconnectListener(this::clientDisconnected);
+
         try {
             ServerAdvertiser.getInstance().setNumberOfPlayers(GameState.getNumberOfPlayers());
         } catch (IOException e) {
             logger.warn("Couldn't update advertisement");
         }
+
+        while (regattaXMLData == null && raceXMLData == null){
+            try {
+                Thread.sleep(50);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+        }
+        serverToClientThread.addConnectionListener(this::sendSetupMessages);
+        serverToClientThread.addDisconnectListener(this::clientDisconnected);
     }
 
     /**
@@ -283,6 +296,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
                 serverToClientThread.sendSetupMessages();
             }
         }
+
         serverToClientThreads.remove(closedConnection);
 
         try {

src/main/java/seng302/gameServer/MessageFactory.java

@@ -1,18 +1,6 @@
 package seng302.gameServer;
 
-import java.util.ArrayList;
-import java.util.List;
-import seng302.gameServer.messages.BoatLocationMessage;
-import seng302.gameServer.messages.BoatSubMessage;
-import seng302.gameServer.messages.RaceStartNotificationType;
-import seng302.gameServer.messages.RaceStartStatusMessage;
-import seng302.gameServer.messages.RaceStatus;
-import seng302.gameServer.messages.RaceStatusMessage;
-import seng302.gameServer.messages.RaceType;
-import seng302.gameServer.messages.XMLMessage;
-import seng302.gameServer.messages.XMLMessageSubType;
-import seng302.gameServer.messages.YachtEventCodeMessage;
-import seng302.gameServer.messages.YachtEventType;
+import seng302.gameServer.messages.*;
 import seng302.model.Player;
 import seng302.model.ServerYacht;
 import seng302.model.stream.xml.generator.RaceXMLTemplate;
@@ -20,9 +8,11 @@ import seng302.model.stream.xml.generator.RegattaXMLTemplate;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.stream.xml.parser.RegattaXMLData;
 import seng302.model.token.Token;
-import seng302.model.token.TokenType;
 import seng302.utilities.XMLGenerator;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * A Class for interfacing between the data we have in the GameState to the messages we need to send
  * through the MainServerThread.

src/main/java/seng302/gameServer/ServerAdvertiser.java

@@ -1,7 +1,7 @@
 package seng302.gameServer;
 
-import seng302.discoveryServer.util.ServerListing;
 import seng302.discoveryServer.DiscoveryServerClient;
+import seng302.discoveryServer.util.ServerListing;
 
 import javax.jmdns.JmDNS;
 import javax.jmdns.ServiceInfo;
@@ -133,7 +133,7 @@ public class ServerAdvertiser {
                 }
             }, 0);
 
-        ServerListing serverListing = new ServerListing(serverName, props.get("map"), getLocalHostIp(), portNo, Integer.parseInt(props.get("capacity")));
+        ServerListing serverListing = new ServerListing(serverName, props.get("map"), new DiscoveryServerClient().getInetIp(), portNo, Integer.parseInt(props.get("capacity")));
         repositoryClient.register(serverListing);
     }
 

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -1,6 +1,21 @@
 package seng302.gameServer;
 
 
+import javafx.beans.property.SimpleObjectProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.gameServer.messages.*;
+import seng302.model.Player;
+import seng302.model.ServerYacht;
+import seng302.model.stream.packets.PacketType;
+import seng302.model.stream.packets.StreamPacket;
+import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.model.stream.xml.parser.RegattaXMLData;
+import seng302.utilities.StreamParser;
+import seng302.utilities.XMLGenerator;
+import seng302.utilities.XMLParser;
+import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -12,26 +27,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
-import javafx.beans.property.SimpleObjectProperty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import seng302.gameServer.messages.BoatAction;
-import seng302.gameServer.messages.ChatterMessage;
-import seng302.gameServer.messages.ClientType;
-import seng302.gameServer.messages.CustomizeRequestType;
-import seng302.gameServer.messages.Message;
-import seng302.gameServer.messages.RegistrationResponseMessage;
-import seng302.gameServer.messages.RegistrationResponseStatus;
-import seng302.model.Player;
-import seng302.model.ServerYacht;
-import seng302.model.stream.packets.PacketType;
-import seng302.model.stream.packets.StreamPacket;
-import seng302.model.stream.xml.parser.RaceXMLData;
-import seng302.model.stream.xml.parser.RegattaXMLData;
-import seng302.utilities.StreamParser;
-import seng302.utilities.XMLGenerator;
-import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
-import seng302.utilities.XMLParser;
 
 /**
  * A class describing a single connection to a Client for the purposes of sending and receiving on
@@ -196,6 +191,7 @@ public class ServerToClientThread implements Runnable {
                                 // TODO: 17/08/2017 ajm412: Send a response packet here, not really necessary until we do shapes.
                                 break;
                             case RACE_XML:
+                                System.out.println("Got raceXML from client");
                                 raceXMLProperty.set(
                                     XMLParser.parseRace(
                                         StreamParser.extractXmlMessage(packet)