room isfull and code refactor

main.go

@@ -39,8 +39,8 @@ func setupRouter() {
 	router.HandleFunc("/api/playerstats/{steamid}", controller.GetPlayerStats).Methods("GET")
 
 	// create rooms and run them (TODO: database rooms integration)
-	for _, uid := range []uint{1, 2, 3, 4, 5} {
-		newRoom := websocket.NewRoom(uid)
+	for _, uid := range []int{1, 2, 3, 4, 5} {
+		newRoom := websocket.NewRoom(uid, 2)
 		roomRoute := fmt.Sprintf("/chat/%d", uid)
 		router.HandleFunc(roomRoute, newRoom.HandleWebsocket)
 		go newRoom.Run()

utils/utils.go

@@ -14,11 +14,9 @@ type ErrorResponse struct {
 	ErrorMsg string
 }
 
+// ErrorResponse "constructor"
 func NewAPIError(c int, m string) ErrorResponse {
-	return ErrorResponse{
-		Code:     c,
-		ErrorMsg: m,
-	}
+	return ErrorResponse{Code: c, ErrorMsg: m}
 }
 
 // Error response in JSON format

websocket/client.go

@@ -2,6 +2,7 @@ package websocket
 
 import "github.com/gorilla/websocket"
 
+// Client represents a... client
 type Client struct {
 	socket *websocket.Conn
 	room   *Room

websocket/message.go

@@ -1,8 +1,6 @@
 package websocket
 
-import (
-	"encoding/json"
-)
+import "encoding/json"
 
 // Message represents a chat message
 type Message struct {
@@ -11,8 +9,8 @@ type Message struct {
 	Created string `json:"created"`
 }
 
-// FromJSON created a new Message struct from given JSON
-func FromJSON(jsonInput []byte) (message *Message) {
-	json.Unmarshal(jsonInput, &message)
-	return
+// FromJSON creates a new Message struct from given JSON
+func FromJSON(jsonData []byte) (message *Message) {
+	json.Unmarshal(jsonData, &message)
+	return message
 }

websocket/room.go

@@ -9,11 +9,12 @@ import (
 
 // Room represents a single chat room
 type Room struct {
-	id      uint
-	clients map[*Client]bool
-	forward chan []byte
-	join    chan *Client
-	leave   chan *Client
+	id         int
+	maxplayers int
+	clients    map[*Client]bool
+	forward    chan []byte
+	join       chan *Client
+	leave      chan *Client
 }
 
 const (
@@ -25,19 +26,20 @@ var upgrader = &websocket.Upgrader{
 	ReadBufferSize:  socketBufferSize,
 	WriteBufferSize: socketBufferSize,
 	CheckOrigin: func(r *http.Request) bool {
-		// TODO: change origin to frontend
+		// TODO: change origin to frontend url
 		return true
 	},
 }
 
 // Create a new chat room
-func NewRoom(id uint) *Room {
+func NewRoom(id int, maxplayers int) *Room {
 	return &Room{
-		id:      id,
-		clients: make(map[*Client]bool),
-		forward: make(chan []byte),
-		join:    make(chan *Client),
-		leave:   make(chan *Client),
+		id:         id,
+		maxplayers: maxplayers,
+		clients:    make(map[*Client]bool),
+		forward:    make(chan []byte),
+		join:       make(chan *Client),
+		leave:      make(chan *Client),
 	}
 }
 
@@ -72,16 +74,21 @@ func (r *Room) leaveRoom(c *Client) {
 // Print message to all in the current room
 func (r *Room) printToChatAll(msg []byte) {
 	data := FromJSON(msg)
-	log.Printf("[room %v] %v: %v", r.id, data.Sender, data.Message)
+	log.Printf("[room %v] %v: %v", r.id, data.Sender, data)
 
 	for client := range r.clients {
 		select {
 		case client.send <- msg:
-			log.Println("client.send <- msg")
+			// success
 		default:
-			// not sure if this is possible
+			// not sure if this is possible/reachable but yeah
 			delete(r.clients, client)
 			close(client.send)
 		}
 	}
 }
+
+// Returns true if room is full
+func (room *Room) IsFull() bool {
+	return len(room.clients) == room.maxplayers
+}

websocket/server.go

@@ -1,12 +1,21 @@
 package websocket
 
-import "net/http"
+import (
+	"net/http"
+)
 
 // /api/rooms/{room_id} - create a client websocket, associating it with a room
 func (room *Room) HandleWebsocket(w http.ResponseWriter, r *http.Request) {
+	// check if room is full
+	if room.IsFull() {
+		// TODO: return error
+		return
+	}
+
 	// create client socket
 	socket, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
+		// TODO: return error
 		return
 	}
 
@@ -16,7 +25,7 @@ func (room *Room) HandleWebsocket(w http.ResponseWriter, r *http.Request) {
 	// join the room
 	room.join <- client
 
-	// executed at end of this function (after goroutines stop)
+	// executed at end of this fn
 	defer func() {
 		room.leave <- client
 	}()