Correct URL path port in sockets (#416)

* Correct URL path port in sockets

* add flask-cors to requirements (spelt correctly)

aimmo-game/requirements.txt

@@ -4,3 +4,4 @@ flask-socketio
 pykube
 requests
 six
+flask-cors

aimmo-game/service.py

@@ -12,6 +12,7 @@
 
 import flask
 from flask_socketio import SocketIO, emit
+from flask_cors import CORS
 
 from simulation.turn_manager import state_provider
 from simulation import map_generator
@@ -21,6 +22,7 @@
 from simulation.pickups import pickups_update
 
 app = flask.Flask(__name__)
+CORS(app, supports_credentials=True)
 socketio = SocketIO()
 
 worker_manager = None

example_project/example_project/settings.py

@@ -113,9 +113,9 @@ def get_url(game):
     if os.environ.get('AIMMO_MODE', '') == 'minikube':
         output = subprocess.check_output([os.environ['MINIKUBE_PATH'], 'service',
                                           'game-%s' % game, '--url'])
-        return output.strip(), '/game/%s/socket.io' % game
+        return output.strip(), '/game/%s' % game
     else:
-        return 'http://localhost:%d' % (6001 + int(game) * 1000), '/socket.io'
+        return 'http://localhost:%d' % (6001 + int(game) * 1000), ''
 
 
 AIMMO_GAME_SERVER_LOCATION_FUNCTION = get_url

players/templates/players/watch.html

@@ -25,7 +25,7 @@
 
 function SendAllConnect() {
   console.log("Sending Messages...");
-  gameInstance.SendMessage("World Controller", "SetGameURL", host);
+  gameInstance.SendMessage("World Controller", "SetGameURL", `${host}:${port}${path}`);
   gameInstance.SendMessage("World Controller", "SetGamePort", parseInt(port));
   gameInstance.SendMessage("World Controller", "EstablishConnection");
 }

setup.py

@@ -20,6 +20,7 @@
         'six',
         'pykube',
         'hypothesis',
+        'flask-cors'
     ],
     tests_require=[
         'django-setuptest',