working lobby!

internal/client/client_utils.go

@@ -3,16 +3,18 @@ package client
 import (
 	"fmt"
 	"io"
-	"log"
 	"sshpong/internal/netwrk"
 	"strings"
 )
 
+type InterrupterMessage struct {
+	InterruptType string
+	Content       string
+}
+
 var help = fmt.Errorf("use invite <player name> to invite a player\nchat or / to send a message to the lobby\nq or quit to leave the game")
 
-func HandleUserInput(buf []byte) (*netwrk.LobbyMessage, error) {
-	input := string(buf)
-	args := strings.Fields(input)
+func HandleUserInput(args []string) (*netwrk.LobbyMessage, error) {
 	if len(args) == 0 {
 		return nil, help
 	}
@@ -49,28 +51,76 @@ func HandleUserInput(buf []byte) (*netwrk.LobbyMessage, error) {
 	case "h":
 		return nil, help
 	default:
+		if strings.Index(args[0], "/") == 0 {
+			return &netwrk.LobbyMessage{
+				Type:    "chat",
+				Content: strings.Join(args, " ")[1:],
+			}, nil
+		}
 		return nil, help
 	}
 	return nil, nil
 }
 
-func HandleServerMessage(message *netwrk.LobbyMessage) {
-	switch message.Type {
+func HandleInterruptInput(incoming InterrupterMessage, args []string) (*netwrk.LobbyMessage, error) {
+
+	switch incoming.InterruptType {
 	case "invite":
-		log.Println(message.PlayerId, "is inviting you to a game.", message.Content)
+		if len(args) < 1 {
+			return &netwrk.LobbyMessage{
+				Type:    "decline",
+				Content: incoming.Content,
+			}, nil
+		} else {
+			if strings.ToLower(args[0]) == "y" || strings.ToLower(args[0]) == "yes" {
+				return &netwrk.LobbyMessage{Type: "accept", Content: incoming.Content}, nil
+			}
+		}
+
+	// Cancel waiting for invite?
+	case "decline":
+
+	// Disconnect and connect to game
 	case "accepted":
-		log.Println(message.PlayerId, "accepted your invite.", message.Content)
-	case "text":
-		log.Println(message.PlayerId, ":", message.Content)
-	case "decline_game":
-		log.Println("Invite was declined:", message.Content)
-	case "disconnect":
-		log.Println("Got disconnect for player:", message.Content)
-	case "connect":
-		log.Println("Got connect for player:", message.Content)
-	case "pong":
-		log.Println("Received", message.Content)
+		return &netwrk.LobbyMessage{
+			Type:    "disconnect",
+			Content: "",
+		}, nil
 	default:
-		log.Println("Received", message.Content)
+		return nil, fmt.Errorf("received a interrupt message that could not be handled %v", incoming)
 	}
+
+	return nil, nil
+}
+
+func HandleServerMessage(message *netwrk.LobbyMessage) (InterrupterMessage, error) {
+	switch message.Type {
+	case "name":
+		fmt.Printf("Current Players\n%s\n", message.Content)
+	case "invite":
+		fmt.Println(message.PlayerId, "is inviting you to a game\nType y to accept...")
+		return InterrupterMessage{
+			InterruptType: "invite",
+			Content:       message.PlayerId,
+		}, nil
+	case "pending_invite":
+		fmt.Println("Invite sent to", message.Content, "\nWaiting for response...")
+	case "accepted":
+		fmt.Println(message.PlayerId, "accepted your invite.\n", "Starting game...")
+	case "game_start":
+		fmt.Println("Invited accepted\n", "Starting game...")
+	case "text":
+		fmt.Println(message.PlayerId, ":", message.Content)
+	case "decline_game":
+		fmt.Println(message.Content, "declined your game invite")
+	case "disconnect":
+		fmt.Println(message.Content, "has disconnected")
+	case "connect":
+		fmt.Println(message.Content, "has connected")
+	case "pong":
+		fmt.Println("Received", message.Content)
+	default:
+		fmt.Println("Received", message.Content)
+	}
+	return InterrupterMessage{}, nil
 }