fix

Reviewed-on: #5

go.mod

@@ -3,6 +3,6 @@ module server
 go 1.25.0
 
 require (
-	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
+	github.com/telegram-mini-apps/init-data-golang v1.5.0
 )

go.sum

@@ -1,4 +1,4 @@
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/telegram-mini-apps/init-data-golang v1.5.0 h1:rtpsmQ/nihkicPvnrdRXmHHtTnPvG1FmxMRZJwMKPz0=
+github.com/telegram-mini-apps/init-data-golang v1.5.0/go.mod h1:GG4HnRx9ocjD4MjjzOw7gf9Ptm0NvFbDr5xqnfFOYuY=

main.go

@@ -1,10 +1,12 @@
 package main
 
 import (
+	"fmt"
 	"log"
 	"net/http"
+	"server/src/controllers"
+	"server/src/models"
 
-	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
 )
 
@@ -12,45 +14,82 @@ var upgrader = websocket.Upgrader{
 	CheckOrigin: func(r *http.Request) bool { return true },
 }
 
-func ServeWS(room *Room, w http.ResponseWriter, r *http.Request) {
+func ServeWS(room *controllers.Room, w http.ResponseWriter, r *http.Request) {
-	conn, _ := upgrader.Upgrade(w, r, nil)
+	conn, err := upgrader.Upgrade(w, r, nil)
-
+	if err != nil {
-	id := uuid.New().String()
+		log.Println("Failed to upgrade connection:", err)
-	player := &Player{
+		return
-		ID:   id,
-		Conn: conn,
-		X:    180,
-		Y:    320,
 	}
 
-	room.Players[id] = player
+	var auth models.AuthMessage
+	if err := conn.ReadJSON(&auth); err != nil || auth.Type != "auth" {
+		log.Println("Invalid auth message. Connection closed!")
+		conn.Close()
+		return
+	}
+
+	data, err := controllers.VerifyTelegramInitData(auth.InitData, "7697757472:AAESD9HfkWwbIZe-HXR7IazUShr69hZTLmE")
+	if err != nil {
+		log.Println("initData is empty. Connection closed!")
+		conn.Close()
+		return
+	}
+
+	userID := data.User.ID
+	username := data.User.Username
+
+	if username == "" {
+		username = data.User.FirstName
+	}
+
+	log.Printf("Player %d connected!", userID)
+
+	player := &models.Player{
+		ID:       userID,
+		Username: username,
+		Conn:     conn,
+		X:        180,
+		Y:        320,
+	}
+
+	room.Players[player.ID] = player
 
 	player.Conn.WriteJSON(map[string]any{
 		"type": "init",
 		"payload": map[string]string{
-			"id": id,
+			"id": fmt.Sprintf("%d", player.ID),
 		},
 	})
 
 	go readLoop(room, player)
 }
 
-func readLoop(room *Room, player *Player) {
+func readLoop(room *controllers.Room, player *models.Player) {
+	defer func() {
+		log.Printf("Player %d disconnected!", player.ID)
+		delete(room.Players, player.ID)
+		player.Conn.Close()
+	}()
+
 	for {
-		var msg InputMessage
+		var msg models.StateMessage
 		err := player.Conn.ReadJSON(&msg)
 		if err != nil {
-			delete(room.Players, player.ID)
 			return
 		}
 
-		msg.PlayerID = player.ID
+		switch msg.Type {
-		room.Input <- msg
+		case models.InputMsgType:
+			var input models.InputMessage = msg.Payload.(models.InputMessage)
+			player.X = input.DX
+			player.Y = input.DY
+			room.Input <- input
+		}
 	}
 }
 
 func main() {
-	room := NewRoom()
+	room := controllers.NewRoom()
 
 	go room.Run()
 

protocol.go

@@ -1,12 +0,0 @@
-package main
-
-type InputMessage struct {
-	PlayerID string
-	DX       float64 `json:"dx"`
-	DY       float64 `json:"dy"`
-}
-
-type StateMessage struct {
-	Type    string `json:"type"`
-	Payload any    `json:"payload"`
-}

src/controllers/room.go

@@ -1,18 +1,21 @@
-package main
+package controllers
 
 import (
+	"server/src/models"
+	"sync"
 	"time"
 )
 
 type Room struct {
-	Players map[string]*Player
+	Players map[int64]*models.Player
-	Input   chan InputMessage
+	Input   chan models.InputMessage
+	mu      sync.Mutex
 }
 
 func NewRoom() *Room {
 	return &Room{
-		Players: make(map[string]*Player),
+		Players: make(map[int64]*models.Player),
-		Input:   make(chan InputMessage, 128),
+		Input:   make(chan models.InputMessage, 128),
 	}
 }
 
@@ -20,47 +23,58 @@ func (r *Room) update() {
 	for {
 		select {
 		case input := <-r.Input:
+			r.mu.Lock()
 			p := r.Players[input.PlayerID]
 			if p != nil {
 				p.DX = input.DX
 				p.DY = input.DY
 			}
+			r.mu.Unlock()
 		default:
 			goto DONE
 		}
 	}
 DONE:
 
+	// 2️⃣ двигаем игроков
+	r.mu.Lock()
 	for _, p := range r.Players {
 		p.X += p.DX * 4
 		p.Y += p.DY * 4
 	}
+	r.mu.Unlock()
 }
 
 func (r *Room) broadcast() {
-	state := map[string]map[string]float64{}
+	r.mu.Lock()
 
+	state := make(map[int64]map[string]any, len(r.Players))
 	for id, p := range r.Players {
-		state[id] = map[string]float64{
+		state[id] = map[string]any{
-			"x": p.X,
+			"x":    p.X,
-			"y": p.Y,
+			"y":    p.Y,
+			"name": p.Username,
 		}
 	}
 
-	msg := StateMessage{
+	r.mu.Unlock()
-		Type: "state",
+
+	msg := models.StateMessage{
+		Type: "input",
 		Payload: map[string]any{
 			"players": state,
 		},
 	}
 
+	// отправляем БЕЗ mutex — важно
 	for _, p := range r.Players {
-		p.Conn.WriteJSON(msg)
+		_ = p.Conn.WriteJSON(msg)
 	}
 }
 
 func (r *Room) Run() {
 	ticker := time.NewTicker(time.Second / 30)
+	defer ticker.Stop()
 
 	for range ticker.C {
 		r.update()

src/controllers/telegram.go

@@ -0,0 +1,16 @@
+package controllers
+
+import (
+	"time"
+
+	initdata "github.com/telegram-mini-apps/init-data-golang"
+)
+
+func VerifyTelegramInitData(initData, botToken string) (initdata.InitData, error) {
+	expIn := 24 * time.Hour
+	err := initdata.Validate(initData, botToken, expIn)
+	if err != nil {
+		return initdata.InitData{}, err
+	}
+	return initdata.Parse(initData)
+}

src/models/auth.go

@@ -0,0 +1,6 @@
+package models
+
+type AuthMessage struct {
+	Type     string `json:"type"`
+	InitData string `json:"initData"`
+}

src/models/player.go

@@ -1,12 +1,13 @@
-package main
+package models
 
 import (
 	"github.com/gorilla/websocket"
 )
 
 type Player struct {
-	ID   string
+	ID       int64
-	Conn *websocket.Conn
+	Username string
+	Conn     *websocket.Conn
 
 	X, Y   float64
 	DX, DY float64

src/models/protocol.go

@@ -0,0 +1,19 @@
+package models
+
+type MsgType string
+
+const (
+	InputMsgType MsgType = "input"
+	ChatMsgType  MsgType = "chat"
+)
+
+type InputMessage struct {
+	PlayerID int64
+	DX       float64 `json:"dx"`
+	DY       float64 `json:"dy"`
+}
+
+type StateMessage struct {
+	Type    MsgType `json:"type"`
+	Payload any     `json:"payload"`
+}