Merge pull request #5 from Pixel-Tactics/feat/online-players

Feat/online players

src/main.go

@@ -30,6 +30,12 @@ func main() {
 		})
 	})
 
+	router.GET("/players", func(context *gin.Context) {
+		context.JSON(http.StatusOK, map[string]interface{}{
+			"players": clientHub.GetAllPlayerId(),
+		})
+	})
+
 	router.GET("/ws", func(context *gin.Context) {
 		ws.ServeWebSocket(clientHub, context.Writer, context.Request)
 	})

src/utils/gcp.go

@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	unknownRegion = "Unknown Server Region"
+	unknownRegion = "Unknown Region"
 )
 
 var regionCodeToName = map[string]string{

src/utils/sync_map.go

@@ -35,6 +35,20 @@ func (s *SyncMap[T, P]) Print() {
 	log.Println(s.inner_map)
 }
 
+func (s *SyncMap[T, P]) Keys() []T {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+	keys := make([]T, len(s.inner_map))
+
+	i := 0
+	for k := range s.inner_map {
+		keys[i] = k
+		i++
+	}
+
+	return keys
+}
+
 func NewSyncMap[T comparable, P any]() *SyncMap[T, P] {
 	return &SyncMap[T, P]{
 		inner_map: make(map[T]P),

src/websocket/core/hub.go

@@ -21,6 +21,10 @@ type PlayerHub struct {
 	clientToPlayerId *utils.SyncMap[*Client, string]
 }
 
+func (hub *PlayerHub) GetAllPlayerId() []string {
+	return hub.playerIdToClient.Keys()
+}
+
 func (hub *PlayerHub) RegisterPlayer(playerId string, client *Client) {
 	hub.playerIdToClient.Store(playerId, client)
 	hub.clientToPlayerId.Store(client, playerId)
@@ -46,6 +50,10 @@ type ClientHub struct {
 	message        chan *MessageWithClient
 }
 
+func (hub *ClientHub) GetAllPlayerId() []string {
+	return hub.playerHub.GetAllPlayerId()
+}
+
 func (hub *ClientHub) GetClientFromPlayerId(playerId string) (*Client, bool) {
 	client, ok := hub.playerHub.playerIdToClient.Load(playerId)
 	if !ok {
@@ -120,6 +128,9 @@ func (hub *ClientHub) Run() {
 					RegisterPlayer: func(playerId string) {
 						hub.RegisterPlayer(playerId, client)
 					},
+					GetPlayerList: func() []string {
+						return hub.GetAllPlayerId()
+					},
 				},
 			}
 

src/websocket/types/interaction.go

@@ -9,6 +9,7 @@ type Response struct {
 	NotifyClient      func(message *Message)
 	NotifyOtherClient func(playerId string, message *Message)
 	RegisterPlayer    func(playerId string)
+	GetPlayerList     func() []string
 }
 
 type Interaction struct {