Merge pull request #257 from ubclaunchpad/brian/session-finding

Brian/session finding

client/.eslintrc.json

@@ -3,7 +3,8 @@
     "globals": {
         "window": false,
         "WebSocket": false,
-        "document": false
+        "document": false,
+        "fetch": false
     },
     "rules": {
         "react/jsx-filename-extension": 0,

client/App.js

@@ -11,9 +11,7 @@ import {
   registerTesterUpdateEvent,
 } from './database/database';
 
-const address = process.env.NODE_ENV === 'production'
-  ? 'bumper.ubclaunchpad.com'
-  : 'localhost:9090';
+const address = 'localhost:9090';
 
 export default class App extends React.Component {
   constructor(props) {
@@ -49,7 +47,7 @@ export default class App extends React.Component {
 
   async componentDidMount() {
     this.canvas = document.getElementById('ctx');
-    this.connectPlayer();
+    await this.connectPlayer();
     registerNewTesterEvent();
     registerTesterUpdateEvent();
   }
@@ -68,7 +66,13 @@ export default class App extends React.Component {
   }
 
   // connect player on load
-  connectPlayer() {
+  async connectPlayer() {
+    const response = await fetch(`http://${address}/start`);
+    const res = await response.json();
+
+    // Address of lobby to connect to
+    console.log(res.location);
+
     if (window.WebSocket) {
       this.socket = new WebSocket(`ws://${address}/connect`);
       this.socket.onopen = () => {

client/components/Minimap.js

@@ -52,6 +52,14 @@ export default class Minimap extends React.Component {
 
     // Deep copy and then translate all game objects
     const holes = this.holes.map((h) => {
+      if (!h.position) {
+        return {
+          position: { x: 0, y: 0 },
+          radius: 0,
+          isAlive: false,
+        };
+      }
+
       const newPosition = {
         x: (h.position.x / MAP_SCALE) + this.mapX,
         y: (h.position.y / MAP_SCALE) + this.mapY,
@@ -64,6 +72,14 @@ export default class Minimap extends React.Component {
     });
 
     const players = this.players.map((p) => {
+      if (!p.position) {
+        return {
+          position: { x: 0, y: 0 },
+          color: 'black',
+          angle: 0,
+        };
+      }
+
       const newPosition = {
         x: (p.position.x / MAP_SCALE) + this.mapX,
         y: (p.position.y / MAP_SCALE) + this.mapY,
@@ -77,6 +93,13 @@ export default class Minimap extends React.Component {
     });
 
     const junk = this.junk.map((j) => {
+      if (!j.position) {
+        return {
+          position: { x: 0, y: 0 },
+          color: 'black',
+        };
+      }
+
       const newPosition = {
         x: (j.position.x / MAP_SCALE) + this.mapX,
         y: (j.position.y / MAP_SCALE) + this.mapY,

client/webpack.config.js

@@ -13,7 +13,7 @@ const config = {
   devServer: {
     port: 8080,
     inline: true,
-    contentBase: './public'
+    contentBase: './public',
   },
   module: {
     loaders: [

server/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/json"
 	"log"
 	"math/rand"
 	"net/http"
@@ -13,6 +14,19 @@ import (
 	"github.com/ubclaunchpad/bumper/server/models"
 )
 
+func getLobby(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	w.Header().Set("Content-Type", "application/json")
+
+	response := struct {
+		Location string `json:"location"`
+	}{
+		"localhost:9090",
+	}
+
+	json.NewEncoder(w).Encode(response)
+}
+
 func main() {
 	rand.Seed(time.Now().UTC().UnixNano())
 
@@ -24,6 +38,7 @@ func main() {
 		log.Println("DBClient not initialized correctly")
 	}
 
+	http.HandleFunc("/start", getLobby)
 	http.Handle("/connect", game)
 	game.StartGame()