Finish lobby mechanics implementation

internal/infra/ws/servewebsockets.go

@@ -8,6 +8,7 @@ import (
 	"github.com/feelbeatapp/feelbeatserver/internal/infra/auth"
 	"github.com/feelbeatapp/feelbeatserver/internal/lib/feelbeaterror"
 	"github.com/feelbeatapp/feelbeatserver/internal/lib/messages"
+	roomLib "github.com/feelbeatapp/feelbeatserver/internal/lib/room"
 	"github.com/gorilla/websocket"
 )
 
@@ -32,6 +33,12 @@ func (w WSHandler) websocketHandler(user auth.User, res http.ResponseWriter, req
 		return
 	}
 
+	if room.Stage() != roomLib.LobbyStage {
+		http.Error(res, feelbeaterror.RoomGameStage, feelbeaterror.StatusCode(feelbeaterror.RoomGameStage))
+		api.LogApiError("user rejected, room in game stage", nil, user.Profile.Id, req)
+		return
+	}
+
 	conn, err := upgrader.Upgrade(res, req, nil)
 	if err != nil {
 		http.Error(res, feelbeaterror.Default, feelbeaterror.StatusCode(feelbeaterror.Default))

internal/infra/ws/wshub.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/buger/jsonparser"
 	"github.com/feelbeatapp/feelbeatserver/internal/infra/fblog"
 	"github.com/feelbeatapp/feelbeatserver/internal/lib/component"
 	"github.com/feelbeatapp/feelbeatserver/internal/lib/feelbeaterror"
@@ -122,20 +123,52 @@ func (h *WSHub) passMessages(ctx context.Context, wg *sync.WaitGroup, from strin
 				h.unregister <- from
 				return
 			}
-			var message messages.ClientMessage
-			err := json.Unmarshal(bytes, &message)
+
+			msgType, err := jsonparser.GetString(bytes, "type")
+			if err != nil {
+				fblog.Error(component.Hub, "Failed to parse client message", "err", err)
+				continue
+			}
+			payload, _, _, err := jsonparser.Get(bytes, "payload")
 			if err != nil {
 				fblog.Error(component.Hub, "Failed to parse client message", "err", err)
+				continue
 			}
-			message.From = from
 
-			h.rcv <- message
+			h.rcv <- decodeMessage(from, msgType, payload)
 		case <-ctx.Done():
 			return
 		}
 	}
 }
 
+func decodeMessage(from string, msgType string, payload []byte) messages.ClientMessage {
+	var settingsUpdate messages.SettingsUpdatePayload
+
+	var err error
+	var result interface{}
+	switch msgType {
+	case messages.SettingsUpdate:
+		err = json.Unmarshal(payload, &settingsUpdate)
+		result = settingsUpdate
+	case messages.ReadyStatus:
+		result, err = jsonparser.GetBoolean(payload)
+	}
+
+	if err != nil {
+		return messages.ClientMessage{
+			From: from,
+			Type: messages.ClientMessageType(msgType),
+		}
+	} else {
+		return messages.ClientMessage{
+			From:    from,
+			Type:    messages.ClientMessageType(msgType),
+			Payload: result,
+		}
+	}
+}
+
 func (h *WSHub) sendMessage(message messages.ServerMessage) {
 	bytes, err := json.Marshal(message.ToUnit())
 	if err != nil {

internal/lib/feelbeaterror/errorcode.go

@@ -11,6 +11,7 @@ const (
 	RoomNotFound          = "Room not found"
 	RoomFull              = "Room is full"
 	EncodingMessageFailed = "Encoding message failed"
+	RoomGameStage         = "Room is already in game mode"
 )
 
 func StatusCode(code ErrorCode) int {
@@ -21,6 +22,8 @@ func StatusCode(code ErrorCode) int {
 		return http.StatusForbidden
 	case AuthFailed:
 		return http.StatusForbidden
+	case RoomGameStage:
+		return http.StatusBadRequest
 	default:
 		return http.StatusInternalServerError
 	}

internal/lib/interfaces.go

@@ -0,0 +1,5 @@
+package lib
+
+type SpotifyApi interface {
+	FetchPlaylistData(playlistId string, token string) (PlaylistData, error)
+}

internal/lib/messages/client.go

@@ -5,16 +5,23 @@ import "github.com/feelbeatapp/feelbeatserver/internal/lib"
 type ClientMessageType string
 
 const (
-	JoiningPlayer = "JOIN"
-	LeavingPlayer = "LEAVE"
+	JoiningPlayer  = "JOIN"
+	LeavingPlayer  = "LEAVE"
+	SettingsUpdate = "SETTINGS_UPDATE"
+	ReadyStatus    = "READY_STATUS"
 )
 
 type ClientMessage struct {
 	Type    ClientMessageType `json:"type"`
-	From    string
-	Payload interface{} `json:"payload"`
+	From    string            `json:"-"`
+	Payload interface{}       `json:"payload"`
 }
 
 type JoiningPlayerPayload struct {
 	User lib.UserProfile
 }
+
+type SettingsUpdatePayload struct {
+	Token    string           `json:"token"`
+	Settings lib.RoomSettings `json:"settings"`
+}

internal/lib/messages/server.go

@@ -28,6 +28,9 @@ const (
 	InitialMessage = "INITIAL"
 	NewPlayer      = "NEW_PLAYER"
 	PlayerLeft     = "PLAYER_LEFT"
+	ServerError    = "SERVER_ERROR"
+	RoomStage      = "ROOM_STAGE"
+	PlayerReady    = "PLAYER_READY"
 )
 
 type InitialGameState struct {
@@ -37,6 +40,7 @@ type InitialGameState struct {
 	Playlist PlaylistState     `json:"playlist"`
 	Players  []lib.UserProfile `json:"players"`
 	Settings lib.RoomSettings  `json:"settings"`
+	ReadyMap map[string]bool   `json:"readyMap"`
 }
 
 type PlaylistState struct {
@@ -57,3 +61,8 @@ type PlayerLeftPayload struct {
 	Left  string `json:"left"`
 	Admin string `json:"admin"`
 }
+
+type PlayerReadyPayload struct {
+	Player string `json:"player"`
+	Ready  bool   `json:"ready"`
+}

internal/lib/room/processMessages.go

@@ -18,6 +18,19 @@ func (r *Room) processMessages() {
 			}
 		case messages.LeavingPlayer:
 			r.removePlayer(message.From)
+		case messages.SettingsUpdate:
+			payload, ok := message.Payload.(messages.SettingsUpdatePayload)
+			if !ok {
+				logIncorrectPayload("Incorrect payload in settings update", message.Payload, message.From)
+			} else {
+				r.updateSettings(message.From, payload)
+			}
+		case messages.ReadyStatus:
+			if ready, ok := message.Payload.(bool); ok {
+				r.updateReady(message.From, ready)
+			} else {
+				logIncorrectPayload("Incorrect paylod in ready status", message.Payload, message.From)
+			}
 		default:
 			fblog.Warn(component.Room, "Received unexpected message", "room", r.id, "from", message.From, "type", message.Type, "payload", message.Payload)
 		}