fixes to WS server suporting player and GS. Player and GameServer merged to support eachother and future functions

internal/Messages/messages.go

@@ -1,13 +1,24 @@
 package messages
 
-/*
 const (
+	Auth         string = "Auth"
 	Message      string = "Message"
 	PlayerAction string = "PlayerAction"
 	System       string = "System"
 )
 
-type PlayerMessage struct {
+/*
+
 
-}
  */
+
+type PlayerMsg struct {
+	Type    string      "json:`Type`"
+	Status  int         "json:`Status`"
+	Message interface{} "json:`Message`"
+}
+
+type AuthMsg struct {
+	Login    string "json:`Login`"
+	Password string "json:`Password`"
+}

internal/gameServer/gameServer.go

@@ -6,7 +6,6 @@ import (
 	"sync"
 
 	"daydev.org/shipsgs/internal/config"
-	"daydev.org/shipsgs/internal/player"
 	"daydev.org/shipsgs/internal/utils"
 )
 
@@ -21,14 +20,17 @@ type GameServer struct {
 	currentPlayers int
 
 	// Storing connected Players
-	playerConns map[*player.Player]bool
+	playerConns map[*Player]bool
 
 	// Notify Game Server a New Player
-	connection chan *player.Player
+	Connection chan *Player
 
 	//Quit the loops correctly and shut down the Game Server
 	Shutdown chan bool
 
+	//1 Second Update planning
+	OneSecond chan bool
+
 	//sync threads
 	WG sync.WaitGroup
 }
@@ -41,20 +43,37 @@ func (m *GameServer) Init(logger *utils.Logger, config *config.S_Config) {
 	m.maxPlayers = m.Config.MaxPlayers
 
 	m.Shutdown = make(chan bool)
+	m.OneSecond = make(chan bool)
 
 	m.currentLobbies = 0
 	m.currentPlayers = 0
 
-	m.WG.Add(1)
+	m.Connection = make(chan *Player)
+
+	m.playerConns = make(map[*Player]bool)
+
+	m.WG.Add(2)
 
 }
 
 func (m *GameServer) Update() {
 	for {
 		select {
+		case pl := <-m.Connection:
+			m.playerConns[pl] = true
+
+			go pl.Receiver()
+
 		case <-m.Shutdown:
 			m.ShutdownServer()
 			m.WG.Done()
+
+		case <-m.OneSecond:
+			fmt.Println("OneSecond yikes")
+			fmt.Println(m.playerConns)
+		default:
+			// default actions
+
 		}
 	}
 }

internal/gameServer/player.go

@@ -0,0 +1,59 @@
+package gameServer
+
+import (
+	"encoding/json"
+	"fmt"
+
+	messages "daydev.org/shipsgs/internal/Messages"
+	"github.com/gorilla/websocket"
+)
+
+type Player struct {
+	Name     string `json:"Name"`
+	Password string `json:"Password"`
+
+	//Connection
+	Conn *websocket.Conn
+
+	AuthString string `json:"AuthString"`
+
+	Level string `json:"Level"` // hidden from user, for balancing purposes
+
+	Kills  int `json:"Kills"`
+	Killed int `json:"Killed"`
+
+	Won     int `json:"Won"`
+	Lost    int `json:"Lost"`
+	WinRate int `json:"WinRate"`
+
+	Health int `json:"Health"`
+
+	Authed bool `json:"Authed"`
+
+	GS *GameServer `json:"GS"`
+}
+
+func (pc *Player) Receiver() {
+	for {
+		_, command, err := pc.Conn.ReadMessage()
+		if err != nil {
+			fmt.Println("pc err: " + err.Error())
+		}
+
+		if pc.Authed == false {
+			reply := messages.PlayerMsg{
+				Type:    messages.System,
+				Status:  401,
+				Message: nil,
+			}
+
+			authRequired, err := json.Marshal(reply)
+			if err != nil {
+				fmt.Println("pc err: " + err.Error())
+			}
+			pc.Conn.WriteMessage(websocket.TextMessage, authRequired)
+		}
+
+		fmt.Println(command)
+	}
+}

internal/player/player.go

@@ -1,12 +1,16 @@
 package player
 
-import "github.com/gorilla/websocket"
+import (
+	"fmt"
+
+	"github.com/gorilla/websocket"
+)
 
 type Player struct {
 	Name     string `json:"Name"`
 	Password string `json:"Password"`
 
-	//Connection WS variable TODO
+	//Connection
 	Conn *websocket.Conn
 
 	AuthString string `json:"AuthString"`
@@ -21,4 +25,23 @@ type Player struct {
 	WinRate int `json:"WinRate"`
 
 	Health int `json:"Health"`
+
+	Authed bool `json:"Authed"`
+}
+
+func (pc *Player) Receiver() {
+	for {
+
+		fmt.Println("ticker")
+
+		_, command, err := pc.Conn.ReadMessage()
+
+		if err != nil {
+			fmt.Println("pc err: " + err.Error())
+		}
+
+		pc.Conn.WriteMessage(websocket.TextMessage, []byte("otvet"))
+		fmt.Println(command)
+
+	}
 }

internal/room/room.go

@@ -52,6 +52,7 @@ func (r *Room) TextAnnounce() {
 
 func (r *Room) Update() {
 	for {
+		/*
 			select {
 			case pj := <-r.join:
 				// player joins
@@ -60,7 +61,7 @@ func (r *Room) Update() {
 			case <-r.updateAll:
 				// update the room
 			}
-
+		*/
 	}
 }
 

internal/server/server.go

@@ -6,10 +6,12 @@ import (
 	"log"
 	"net/http"
 
-	"daydev.org/shipsgs/internal/player"
+	"daydev.org/shipsgs/internal/gameServer"
 	"github.com/gorilla/websocket"
 )
 
+var GS *gameServer.GameServer
+
 type Health struct {
 	Health  string `json:"Health"`
 	Lobbies int    `json:"Lobbies"`
@@ -40,11 +42,16 @@ func wsEndpoint(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	player := player.Player{
+	player := &gameServer.Player{
 		Conn: conn,
 	}
 	player.Name = "Yale"
+	player.Authed = false
+	player.GS = GS
+
+	GS.Connection <- player
 
+	/*
 		log.Println(r.RemoteAddr)
 
 		for {
@@ -58,6 +65,7 @@ func wsEndpoint(w http.ResponseWriter, r *http.Request) {
 				return
 			}
 		}
+	*/
 
 }
 
@@ -67,9 +75,11 @@ func setupRoutes() {
 
 }
 
-func SetupAndRun(port string, sighup *chan bool) {
+func SetupAndRun(port string, sighup *chan bool, gs *gameServer.GameServer) {
 	setupRoutes()
 
+	GS = gs
+
 	srv := &http.Server{Addr: port}
 
 	go func() {

main.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"time"
 
 	"daydev.org/shipsgs/internal/config"
 	"daydev.org/shipsgs/internal/gameServer"
@@ -15,6 +16,9 @@ import (
 var Logger *utils.Logger
 var ch_sighup *chan bool
 
+//channel to shutdown oneSecUpdater
+var ch_oneSecUpdaterShutdown chan bool
+
 //GameServer Public Global Instance
 var GS *gameServer.GameServer
 
@@ -33,6 +37,8 @@ func main() {
 	sighup := make(chan bool)
 	ch_sighup = &sighup
 
+	ch_oneSecUpdaterShutdown = make(chan bool)
+
 	//If debug - fill Stdout too - LOG to use?
 	//Logger = utils.New(os.Stdout, utils.LevelInfo)
 
@@ -42,10 +48,15 @@ func main() {
 	GS.Init(Logger, &config.Config)
 	go GS.Update()
 
+	//Starting oneSecUpdater after GameServer is ready, because oneSecUpdater
+	// is depending on GameServer.Shutdown channel which
+	// is IF uninitialized we will get "invalid memory address or nil pointer dereference"
+	go oneSecUpdater()
+
 	log.Println("Starting Healthy")
 
 	//closer.Hold()
-	server.SetupAndRun(":8080", ch_sighup)
+	server.SetupAndRun(":8080", ch_sighup, GS)
 
 	GS.WG.Wait()
 
@@ -54,6 +65,9 @@ func main() {
 func cleanup() {
 	fmt.Println("Shutting down ")
 
+	//Shutting down oneSecUpdater
+	ch_oneSecUpdaterShutdown <- true
+
 	//Investigate why no messages on correct closing
 	GS.Shutdown <- true
 
@@ -65,3 +79,25 @@ func cleanup() {
 	})
 
 }
+
+func oneSecUpdater() {
+	//The intention here is to awake after 1 second and send an update to GameServer to update everything
+	for {
+		select {
+		case <-ch_oneSecUpdaterShutdown:
+			fmt.Println("Shutdown One Sec Updater")
+			GS.WG.Done()
+			// Goroutine will wait untill the DEFAULT: will happen before shutdown will take
+			// any effect
+		case <-time.After(time.Second * 1):
+			fmt.Println("1 Sec Timer")
+		default:
+			//*** maybe try this 10 secs in a CASE segment ?
+			// This blocks whole goroutine
+			<-time.After(time.Second * 2)
+
+			GS.OneSecond <- true
+		}
+	}
+
+}