Merge pull request 'feauture' (#3) from feauture into main

Reviewed-on: #3

auth.go

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

controllers/connection.go

@@ -1,55 +0,0 @@
-package controllers
-
-import (
-	"log"
-	"server/models"
-
-	"github.com/gorilla/websocket"
-)
-
-func (h *Hub) readLoop(conn *websocket.Conn) {
-	handMessage := models.Message{Type: MSG_WELCOME}
-	_ = conn.WriteMessage(websocket.BinaryMessage, handMessage.Encode())
-
-	var player *models.Player
-
-	defer func() {
-		if player != nil {
-			h.removePlayer(player.ID)
-			log.Println("Player left:", player.ID)
-		}
-		conn.Close()
-	}()
-
-	for {
-		_, bytes, err := conn.ReadMessage()
-		if err != nil {
-			return
-		}
-
-		msg, err := models.Decode(bytes)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-
-		switch msg.Type {
-
-		case MSG_WELCOME:
-			if player != nil {
-				continue
-			}
-			player = h.handShake(msg.Payload, conn)
-			log.Println("Player joined:", player.ID)
-
-		case MSG_INPUT:
-			if player == nil {
-				continue
-			}
-			reader := models.NewReader(msg.Payload)
-			x := reader.ReadF32()
-			y := reader.ReadF32()
-			h.updatePosition(x, y, player)
-		}
-	}
-}

controllers/hub.go

@@ -1,26 +0,0 @@
-package controllers
-
-import (
-	"log"
-	"net/http"
-	"server/models"
-	"sync"
-)
-
-type Hub struct {
-	Players map[uint32]*models.Player
-	Mu      sync.RWMutex
-}
-
-func NewHub() *Hub {
-	return &Hub{
-		Players: make(map[uint32]*models.Player),
-	}
-}
-
-func (h *Hub) Start() {
-	go h.updateWorld()
-	http.HandleFunc("/ws", h.ws)
-	log.Println("Server listen port 8080")
-	log.Fatal(http.ListenAndServe(":8080", nil))
-}

controllers/players.go

@@ -1,43 +0,0 @@
-package controllers
-
-import (
-	"server/models"
-
-	"github.com/gorilla/websocket"
-)
-
-func (h *Hub) handShake(msg []byte, conn *websocket.Conn) *models.Player {
-	reader := models.NewReader(msg)
-	newID := reader.ReadU32()
-	name := reader.ReadString()
-
-	player := &models.Player{
-		Entity: models.Entity{
-			Type: models.EntityPlayer,
-			ID:   newID,
-		},
-		Name: name,
-		Conn: conn,
-	}
-
-	h.Mu.Lock()
-	h.Players[player.ID] = player
-	h.Mu.Unlock()
-
-	return player
-}
-
-func (h *Hub) updatePosition(x, y float32, player *models.Player) {
-	h.Mu.Lock()
-	defer h.Mu.Unlock()
-
-	player.X = x
-	player.Y = y
-}
-
-func (h *Hub) removePlayer(id uint32) {
-	h.Mu.Lock()
-	defer h.Mu.Unlock()
-
-	delete(h.Players, id)
-}

controllers/protocol.go

@@ -1,7 +0,0 @@
-package controllers
-
-const (
-	MSG_WELCOME  = 0
-	MSG_INPUT    = 1
-	MSG_SNAPSHOT = 2
-)

controllers/world.go

@@ -1,46 +0,0 @@
-package controllers
-
-import (
-	"server/models"
-	"time"
-
-	"github.com/gorilla/websocket"
-)
-
-func (h *Hub) broadcastSnapshot() {
-	h.Mu.RLock()
-	defer h.Mu.RUnlock()
-
-	w := models.Writer{}
-	w.WriteU16(uint16(len(h.Players)))
-
-	for _, p := range h.Players {
-		w.WriteU32(p.ID)
-		w.WriteU8(uint8(models.EntityPlayer))
-		w.WriteF32(p.X)
-		w.WriteF32(p.Y)
-		w.WriteF32(p.Z)
-		w.WriteF32(p.Yaw)
-	}
-
-	msg := models.Message{
-		Type:    MSG_SNAPSHOT,
-		Version: 1,
-		Payload: w.Bytes(),
-	}
-
-	for _, p := range h.Players {
-		if p.Conn != nil {
-			_ = p.Conn.WriteMessage(websocket.BinaryMessage, msg.Encode())
-		}
-	}
-}
-
-func (h *Hub) updateWorld() {
-	ticker := time.NewTicker(50 * time.Millisecond)
-	defer ticker.Stop()
-
-	for range ticker.C {
-		h.broadcastSnapshot()
-	}
-}

controllers/ws.go

@@ -1,22 +0,0 @@
-package controllers
-
-import (
-	"log"
-	"net/http"
-
-	"github.com/gorilla/websocket"
-)
-
-func (h *Hub) ws(w http.ResponseWriter, r *http.Request) {
-	upgrader := websocket.Upgrader{
-		CheckOrigin: func(r *http.Request) bool { return true },
-	}
-
-	conn, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	go h.readLoop(conn)
-}

main.go

@@ -1,10 +1,88 @@
 package main
 
 import (
-	"server/controllers"
+	"log"
+	"net/http"
+
+	"github.com/gorilla/websocket"
 )
 
-func main() {
+var upgrader = websocket.Upgrader{
-	hub := controllers.NewHub()
+	CheckOrigin: func(r *http.Request) bool { return true },
-	hub.Start()
+}
+
+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, ok := VerifyTelegramInitData(auth.InitData, "7697757472:AAESD9HfkWwbIZe-HXR7IazUShr69hZTLmE")
+	if !ok {
+		conn.Close()
+		return
+	}
+
+	userID := data["user.id"]
+	username := data["user.username"]
+
+	if username == "" {
+		username = data["user.first_name"]
+	}
+	if username == "" {
+		username = "user_" + userID
+	}
+
+	player := &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": player.ID,
+		},
+	})
+
+	go readLoop(room, player)
+}
+
+func readLoop(room *Room, player *Player) {
+	for {
+		var msg InputMessage
+		err := player.Conn.ReadJSON(&msg)
+		if err != nil {
+			delete(room.Players, player.ID)
+			player.Conn.Close()
+			return
+		}
+
+		msg.PlayerID = player.ID
+		room.Input <- msg
+	}
+}
+
+func main() {
+	room := NewRoom()
+
+	go room.Run()
+
+	http.HandleFunc("/ws", func(w http.ResponseWriter, r *http.Request) {
+		ServeWS(room, w, r)
+	})
+
+	log.Println("Server started on :8080")
+	log.Fatal(http.ListenAndServe(":8080", nil))
 }

models/entity.go

@@ -1,19 +0,0 @@
-package models
-
-type EntityType uint8
-
-const (
-	EntityPlayer EntityType = 1
-	EntityNPC    EntityType = 2
-	EntityBullet EntityType = 3
-)
-
-type Entity struct {
-	ID   uint32
-	Type EntityType
-
-	X   float32
-	Y   float32
-	Z   float32
-	Yaw float32
-}

models/message.go

@@ -1,48 +0,0 @@
-package models
-
-import (
-	"encoding/binary"
-	"errors"
-)
-
-type Message struct {
-	Type    uint16
-	Version uint16
-	Payload []byte
-}
-
-func (m *Message) Encode() []byte {
-	payloadLen := len(m.Payload)
-	if payloadLen > 0xFFFF {
-		return nil
-	}
-
-	buf := make([]byte, 8+payloadLen)
-
-	binary.LittleEndian.PutUint16(buf[0:2], m.Type)
-	binary.LittleEndian.PutUint16(buf[2:4], m.Version)
-	binary.LittleEndian.PutUint16(buf[4:6], uint16(payloadLen))
-
-	copy(buf[8:], m.Payload)
-	return buf
-}
-
-func Decode(data []byte) (*Message, error) {
-	if len(data) < 8 {
-		return nil, errors.New("message too short")
-	}
-
-	payloadLen := binary.LittleEndian.Uint16(data[4:6])
-	if len(data) != int(8+payloadLen) {
-		return nil, errors.New("invalid payload length")
-	}
-
-	msg := &Message{
-		Type:    binary.LittleEndian.Uint16(data[0:2]),
-		Version: binary.LittleEndian.Uint16(data[2:4]),
-		Payload: make([]byte, payloadLen),
-	}
-
-	copy(msg.Payload, data[8:])
-	return msg, nil
-}

models/player.go

@@ -1,9 +0,0 @@
-package models
-
-import "github.com/gorilla/websocket"
-
-type Player struct {
-	Entity
-	Name string
-	Conn *websocket.Conn
-}

models/reader.go

@@ -1,50 +0,0 @@
-package models
-
-import (
-	"encoding/binary"
-	"math"
-)
-
-type Reader struct {
-	buf []byte
-	off int
-}
-
-func NewReader(b []byte) *Reader {
-	return &Reader{buf: b}
-}
-
-func (r *Reader) ReadU8() uint8 {
-	v := r.buf[r.off]
-	r.off++
-	return v
-}
-
-func (r *Reader) ReadU16() uint16 {
-	v := binary.LittleEndian.Uint16(r.buf[r.off:])
-	r.off += 2
-	return v
-}
-
-func (r *Reader) ReadU32() uint32 {
-	v := binary.LittleEndian.Uint32(r.buf[r.off:])
-	r.off += 4
-	return v
-}
-
-func (r *Reader) ReadF32() float32 {
-	v := math.Float32frombits(binary.LittleEndian.Uint32(r.buf[r.off:]))
-	r.off += 4
-	return v
-}
-
-func (r *Reader) ReadBool() bool {
-	return r.ReadU8() == 1
-}
-
-func (r *Reader) ReadString() string {
-	l := r.ReadU16()
-	s := string(r.buf[r.off : r.off+int(l)])
-	r.off += int(l)
-	return s
-}

models/writer.go

@@ -1,49 +0,0 @@
-package models
-
-import (
-	"encoding/binary"
-	"math"
-)
-
-type Writer struct {
-	buf []byte
-}
-
-func (w *Writer) Bytes() []byte {
-	return w.buf
-}
-
-func (w *Writer) WriteU8(v uint8) {
-	w.buf = append(w.buf, v)
-}
-
-func (w *Writer) WriteU16(v uint16) {
-	tmp := make([]byte, 2)
-	binary.LittleEndian.PutUint16(tmp, v)
-	w.buf = append(w.buf, tmp...)
-}
-
-func (w *Writer) WriteU32(v uint32) {
-	tmp := make([]byte, 4)
-	binary.LittleEndian.PutUint32(tmp, v)
-	w.buf = append(w.buf, tmp...)
-}
-
-func (w *Writer) WriteF32(v float32) {
-	tmp := make([]byte, 4)
-	binary.LittleEndian.PutUint32(tmp, math.Float32bits(v))
-	w.buf = append(w.buf, tmp...)
-}
-
-func (w *Writer) WriteBool(v bool) {
-	if v {
-		w.WriteU8(1)
-	} else {
-		w.WriteU8(0)
-	}
-}
-
-func (w *Writer) WriteString(s string) {
-	w.WriteU16(uint16(len(s)))
-	w.buf = append(w.buf, []byte(s)...)
-}

player.go

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

protocol.go

@@ -0,0 +1,12 @@
+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"`
+}

room.go

@@ -0,0 +1,83 @@
+package main
+
+import (
+	"sync"
+	"time"
+)
+
+type Room struct {
+	Players map[string]*Player
+	Input   chan InputMessage
+	mu      sync.Mutex
+}
+
+func NewRoom() *Room {
+	return &Room{
+		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 := make(map[string]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,
+		}
+	}
+
+	r.mu.Unlock()
+
+	msg := StateMessage{
+		Type: "state",
+		Payload: map[string]any{
+			"players": state,
+		},
+	}
+
+	// отправляем БЕЗ mutex — важно
+	for _, p := range r.Players {
+		_ = p.Conn.WriteJSON(msg)
+	}
+}
+
+func (r *Room) Run() {
+	ticker := time.NewTicker(time.Second / 30)
+	defer ticker.Stop()
+
+	for range ticker.C {
+		r.update()
+		r.broadcast()
+	}
+}

telegram.go

@@ -0,0 +1,41 @@
+package main
+
+import (
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/hex"
+	"net/url"
+	"sort"
+	"strings"
+)
+
+func VerifyTelegramInitData(initData, botToken string) (map[string]string, bool) {
+	values, _ := url.ParseQuery(initData)
+
+	hash := values.Get("hash")
+	values.Del("hash")
+
+	var data []string
+	for k, v := range values {
+		data = append(data, k+"="+v[0])
+	}
+	sort.Strings(data)
+
+	checkString := strings.Join(data, "\n")
+
+	secret := sha256.Sum256([]byte(botToken))
+	h := hmac.New(sha256.New, secret[:])
+	h.Write([]byte(checkString))
+
+	expected := hex.EncodeToString(h.Sum(nil))
+
+	return valuesToMap(values), expected == hash
+}
+
+func valuesToMap(v url.Values) map[string]string {
+	m := make(map[string]string)
+	for k, val := range v {
+		m[k] = val[0]
+	}
+	return m
+}