Merge pull request 'Make games rejoinable again!' (#14) from make-games-rejoinable-again into master

Reviewed-on: #14

api/handler/handler.go

@@ -58,6 +58,7 @@ func GetLobbyForPassphraseHandler(c *gin.Context) {
 		ID: &lobby.Uuid,
 	}
 
+	c.Header("Access-Control-Allow-Origin", "*")
 	c.IndentedJSON(http.StatusOK, lobbyInfo)
 }
 
@@ -69,6 +70,7 @@ func JoinPrivateGame(c *gin.Context) {
 	err := c.ShouldBindJSON(&req)
 	if err != nil || req.Passphrase == nil || *req.Passphrase == "" {
 		c.IndentedJSON(http.StatusNotFound, req)
+		return
 	}
 
 	u := lobbies.GetUsher()
@@ -78,8 +80,12 @@ func JoinPrivateGame(c *gin.Context) {
 		req.PlayerID != nil &&
 		req.LobbyID != nil { //is reconnect
 		lobby := u.FindExistingPrivateLobby(utils.Passphrase(*req.Passphrase))
-		_, found := lobby.GetPlayerByUUID(*req.PlayerID)
+		var found bool
+		if lobby != nil {
+			_, found = lobby.GetPlayerByUUID(*req.PlayerID)
+		}
 		if found {
+			c.Header("Access-Control-Allow-Origin", "*")
 			c.IndentedJSON(
 				http.StatusOK,
 				api.PlayerInfo{
@@ -90,6 +96,7 @@ func JoinPrivateGame(c *gin.Context) {
 			return
 		} else {
 			c.IndentedJSON(http.StatusNotFound, req)
+			return
 		}
 	}
 

chess/game.go

@@ -157,6 +157,14 @@ func (game *Game) AddPlayersToGame(player *Player) {
 	game.players = append(game.players, player)
 }
 
+func (game *Game) AreBothPlayersConnected() bool {
+	if len(game.GetPlayers()) < 2 {
+		return false
+	}
+
+	return game.players[0].hasWebsocketConnection() && game.players[1].hasWebsocketConnection()
+}
+
 func (game *Game) killGame() {
 	log.Println("Game should be killed")
 }
@@ -212,5 +220,5 @@ func (game *Game) playerDisconnected(p *Player) {
 }
 
 func (game *Game) SetWebsocketConnectionFor(ctx context.Context, p *Player, ws *gorillaws.Conn) {
-	p.SetWebsocketConnectionAndSendBoardState(ctx, ws, game.board.PGN(), game.board.colorToMove)
+	p.SetWebsocketConnectionAndSendBoardState(ctx, ws, &game.board)
 }

chess/player.go

@@ -41,11 +41,10 @@ func (p *Player) SetWebsocketConnection(ctx context.Context, ws *gorillaws.Conn)
 func (p *Player) SetWebsocketConnectionAndSendBoardState(
 	ctx context.Context,
 	ws *gorillaws.Conn,
-	boardPosition string,
-	turnColor types.ChessColor,
+	board *Board,
 ) {
 	p.SetWebsocketConnection(ctx, ws)
-	p.SendBoardState(types.Move{}, boardPosition, turnColor)
+	p.SendBoardState(board.getLastMove(), board.PGN(), board.colorToMove)
 }
 
 func (p *Player) SetColor(color types.ChessColor) {

connection/type.go

@@ -75,6 +75,8 @@ func (conn *Connection) SetWebsocketConnection(ws *gorillaws.Conn) {
 			_, msg, err := conn.ws.ReadMessage()
 			if err != nil {
 				log.Println("while reading from websocket: %w", err)
+
+				conn.unsetWebsocketConnection()
 				if conn.disconnectCallback != nil {
 					conn.disconnectCallback()
 				}
@@ -85,6 +87,10 @@ func (conn *Connection) SetWebsocketConnection(ws *gorillaws.Conn) {
 	}()
 }
 
+func (conn *Connection) unsetWebsocketConnection() {
+	conn.ws = nil
+}
+
 func (conn *Connection) Write(msg []byte) error {
 	conn.wsWriteLock.Lock()
 	defer conn.wsWriteLock.Unlock()

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/stretchr/testify v1.9.0
 )
 
-require github.com/benbjohnson/clock v1.3.0 // indirect
+require github.com/benbjohnson/clock v1.3.5 // indirect
 
 require (
 	github.com/bytedance/sonic v1.11.6 // indirect

go.sum

@@ -1,5 +1,5 @@
-github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
-github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=
+github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
 github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
 github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
@@ -71,6 +71,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/ratelimit v0.3.1 h1:K4qVE+byfv/B3tC+4nYWP7v/6SimcO7HzHekoMNBma0=
 go.uber.org/ratelimit v0.3.1/go.mod h1:6euWsTB6U/Nb3X++xEUXA8ciPJvr19Q/0h1+oDcJhRk=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=

lobbies/lobby.go

@@ -31,12 +31,16 @@ func newEmptyLobbyWithPassphrase() *Lobby {
 
 func (l *Lobby) AddPlayerAndStartGameIfFull(player *chess.Player) {
 	l.Game.AddPlayersToGame(player)
-	if l.IsFull() {
+	if l.ContainsTwoPlayers() {
 		l.Game.StartHandling()
 	}
 }
 
-func (w *Lobby) IsFull() bool {
+func (w *Lobby) AreBothPlayersConnected() bool {
+	return w.Game.AreBothPlayersConnected()
+}
+
+func (w *Lobby) ContainsTwoPlayers() bool {
 	return len(w.Game.GetPlayers()) == 2
 }
 

lobbies/registry.go

@@ -32,7 +32,7 @@ func (r *LobbyRegistry) CreateNewPrivateLobby() *Lobby {
 
 func (r *LobbyRegistry) GetLobbyForPlayer() *Lobby {
 	for _, lobby := range r.lobbies {
-		if !lobby.IsFull() {
+		if !lobby.ContainsTwoPlayers() {
 			return lobby
 		}
 	}

lobbies/usher.go

@@ -35,7 +35,7 @@ func (u *Usher) CreateNewPrivateLobby(player *chess.Player) *Lobby {
 
 func (u *Usher) FindExistingPrivateLobby(p utils.Passphrase) *Lobby {
 	lobby := GetLobbyRegistry().GetLobbyByPassphrase(p)
-	if lobby == nil || lobby.IsFull() {
+	if lobby == nil || lobby.AreBothPlayersConnected() {
 		return nil
 	}
 	return lobby