Merge pull request 'new server' (#2) from feauture into main

Reviewed-on: #2

auth.go

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

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,10 @@
 package main
 
 import (
-	"fmt"
 	"log"
 	"net/http"
 
+	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
 )
 
@@ -13,46 +13,22 @@ var upgrader = websocket.Upgrader{
 }
 
 func ServeWS(room *Room, w http.ResponseWriter, r *http.Request) {
-	conn, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		return
-	}
-
-	var auth AuthMessage
-	if err := conn.ReadJSON(&auth); err != nil || auth.Type != "auth" {
-		conn.Close()
-		return
-	}
-
-	data, err := VerifyTelegramInitData(auth.InitData, "7697757472:AAESD9HfkWwbIZe-HXR7IazUShr69hZTLmE")
-	if err != nil {
-		conn.Close()
-		return
-	}
-
-	userID := data.User.ID
-	username := data.User.Username
-
-	if username == "" {
-		username = data.User.FirstName
-	}
-
-	log.Printf("Player %d connected!", userID)
+	conn, _ := upgrader.Upgrade(w, r, nil)
 
+	id := uuid.New().String()
 	player := &Player{
-		ID:       userID,
-		Username: username,
-		Conn:     conn,
-		X:        180,
-		Y:        320,
+		ID:   id,
+		Conn: conn,
+		X:    180,
+		Y:    320,
 	}
 
-	room.Players[player.ID] = player
+	room.Players[id] = player
 
 	player.Conn.WriteJSON(map[string]any{
 		"type": "init",
 		"payload": map[string]string{
-			"id": fmt.Sprintf("%d", player.ID),
+			"id": id,
 		},
 	})
 
@@ -60,15 +36,11 @@ func ServeWS(room *Room, w http.ResponseWriter, r *http.Request) {
 }
 
 func readLoop(room *Room, player *Player) {
-	defer func() {
-		delete(room.Players, player.ID)
-		player.Conn.Close()
-	}()
-
 	for {
 		var msg InputMessage
 		err := player.Conn.ReadJSON(&msg)
 		if err != nil {
+			delete(room.Players, player.ID)
 			return
 		}
 

player.go

@@ -5,9 +5,8 @@ import (
 )
 
 type Player struct {
-	ID       int64
-	Username string
-	Conn     *websocket.Conn
+	ID   string
+	Conn *websocket.Conn
 
 	X, Y   float64
 	DX, DY float64

protocol.go

@@ -1,7 +1,7 @@
 package main
 
 type InputMessage struct {
-	PlayerID int64
+	PlayerID string
 	DX       float64 `json:"dx"`
 	DY       float64 `json:"dy"`
 }

room.go

@@ -1,64 +1,52 @@
 package main
 
 import (
-	"sync"
 	"time"
 )
 
 type Room struct {
-	Players map[int64]*Player
+	Players map[string]*Player
 	Input   chan InputMessage
-	mu      sync.Mutex
 }
 
 func NewRoom() *Room {
 	return &Room{
-		Players: make(map[int64]*Player),
+		Players: make(map[string]*Player),
 		Input:   make(chan InputMessage, 128),
 	}
 }
 
 func (r *Room) update() {
-	// 1️⃣ обрабатываем input
 	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() {
-	r.mu.Lock()
+	state := map[string]map[string]float64{}
 
-	state := make(map[int64]map[string]any, len(r.Players))
 	for id, p := range r.Players {
-		state[id] = map[string]any{
-			"x":    p.X,
-			"y":    p.Y,
-			"name": p.Username,
+		state[id] = map[string]float64{
+			"x": p.X,
+			"y": p.Y,
 		}
 	}
 
-	r.mu.Unlock()
-
 	msg := StateMessage{
 		Type: "state",
 		Payload: map[string]any{
@@ -66,15 +54,13 @@ func (r *Room) broadcast() {
 		},
 	}
 
-	// отправляем БЕЗ 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()

telegram.go

@@ -1,16 +0,0 @@
-package main
-
-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)
-}