Merge pull request #7 from ascenmmo/stage

Stage

.gitignore

@@ -22,5 +22,4 @@ go.work
 go.work.sum
 
 data
-.idea
-env
+.idea

Dockerfile

@@ -5,6 +5,8 @@ WORKDIR $GOPATH/src
 ADD . .
 ENV GO111MODULE=on
 
+RUN go mod vendor
+
 RUN go build -o /bin/app ./cmd/multiplayer
 
 FROM ubuntu:24.04

README.md

@@ -39,7 +39,7 @@ var (
 	RunMultiplayer                 = true // Enable multiplayer mode
 	RunAdminPanel                  = true // Enable admin panel
 	MultiplayerPort                = "8080" // Port for multiplayer mode
-	MongoURL                       = "mongodb://username:[email protected]:27017/?maxPoolSize=20&w=majority" // MongoDB connection URL
+	MongoURL                       = "mongodb://username:[email protected]:27017" // MongoDB connection URL
 	MultiplayerMaxRequestPerSecond = 5 // Maximum requests per second for multiplayer mode
 )
 

RU_README.md

@@ -39,7 +39,7 @@ var (
 	RunMultiplayer                 = true // Запуск многопользовательского режима
 	RunAdminPanel                  = true // Запуск админки
 	MultiplayerPort                = "8080" // Порт для многопользовательского режима
-	MongoURL                       = "mongodb://username:[email protected]:27017/?maxPoolSize=20&w=majority" // URL подключения к MongoDB
+	MongoURL                       = "mongodb://username:[email protected]:27017" // URL подключения к MongoDB
 	MultiplayerMaxRequestPerSecond = 5 // Максимальное количество запросов в секунду для многопользовательского режима
 )
 

cmd/multiplayer/main.go

@@ -5,17 +5,26 @@ import (
 	"github.com/ascenmmo/multiplayer-game-servers/env"
 	"github.com/ascenmmo/multiplayer-game-servers/internal/start"
 	"github.com/rs/zerolog"
+	"log"
+	"net/http"
+	_ "net/http/pprof"
 	"os"
 	"os/signal"
 	"syscall"
 )
 
 func main() {
-	logger := zerolog.New(os.Stdout).With().Timestamp().Logger()
+	logger := zerolog.Logger{}
+
 	ctx := context.Background()
 
 	shutdown := make(chan os.Signal, 1)
 	signal.Notify(shutdown, syscall.SIGINT)
+	//go exiter()
+
+	if env.DebugLogs {
+		logger = zerolog.New(os.Stdout).With().Timestamp().Logger()
+	}
 
 	if env.RunMultiplayer {
 		go start.Multiplayer(logger)
@@ -33,5 +42,19 @@ func main() {
 		go start.TcpServer(ctx, logger)
 	}
 
+	prof()
+
 	<-shutdown
 }
+
+func prof() {
+	go func() {
+		log.Println(http.ListenAndServe(":6060", nil))
+	}()
+}
+
+//func exiter() {
+//	for range time.NewTicker(time.Minute * 5).C {
+//		os.Exit(0)
+//	}
+//}

docker-compose.yml

@@ -14,6 +14,7 @@ services:
       - "8083:8083"  # TCP Server
       - "4500:4500/udp"  # UDP Connection Port
       - "4240:4240"  # WebSocket Connection Port
+      - "6060:6060"  # WebSocket Connection Port
 
   mongodb:
     image: mongo:8.0

env/env.go

@@ -3,14 +3,15 @@ package env
 var (
 	ServerAddress = "ascenmmo.com"
 	TokenKey      = "_remember_token_mast_be_32_bytes"
+	DebugLogs     = true
 )
 
 var (
 	RunMultiplayer                 = true
 	RunAdminPanel                  = true
 	MultiplayerPort                = "8080"
-	MongoURL                       = "mongodb://username:[email protected]:27017/?maxPoolSize=20&w=majority"
-	MultiplayerMaxRequestPerSecond = 5
+	MongoURL                       = "mongodb://username:[email protected]:27017"
+	MultiplayerMaxRequestPerSecond = 100
 )
 
 var (

go.mod

@@ -3,10 +3,10 @@ module github.com/ascenmmo/multiplayer-game-servers
 go 1.23.2
 
 require (
-	github.com/ascenmmo/tcp-server v0.0.0-20241024213218-104f0955af07
-	github.com/ascenmmo/token-generator v1.0.0
-	github.com/ascenmmo/udp-server v0.0.0-20241024213152-f807e90ce36c
-	github.com/ascenmmo/websocket-server v0.0.0-20241024213056-3c1271cc0529
+	github.com/ascenmmo/tcp-server v1.0.2
+	github.com/ascenmmo/token-generator v1.0.2
+	github.com/ascenmmo/udp-server v1.0.2
+	github.com/ascenmmo/websocket-server v1.0.3
 	github.com/go-kit/kit v0.13.0
 	github.com/gofiber/adaptor/v2 v2.2.1
 	github.com/gofiber/fiber/v2 v2.52.5
@@ -37,10 +37,12 @@ require (
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
+	github.com/philhofer/fwd v1.1.2 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.55.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/tinylib/msgp v1.1.8 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.51.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect

go.sum

@@ -4,14 +4,14 @@ github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrd
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
 github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/ascenmmo/tcp-server v0.0.0-20241024213218-104f0955af07 h1:sAVYrtUU+Q0OECrtxmp+AouR9n7tAchjBmH7gG6md2E=
-github.com/ascenmmo/tcp-server v0.0.0-20241024213218-104f0955af07/go.mod h1:14K6fwh/Sj958MMSPA+35xHzng0ZzVc2oq5kpXYLQbo=
-github.com/ascenmmo/token-generator v1.0.0 h1:+yUCIXfeO68tuWvYyStT4dnnYWfujfP4vPXqOrEf7No=
-github.com/ascenmmo/token-generator v1.0.0/go.mod h1:M3RdQKl1JfQeqM2hWNs0645G48GupB7idwdzQMkxlxM=
-github.com/ascenmmo/udp-server v0.0.0-20241024213152-f807e90ce36c h1:6XLXv+VJ1pI5SbQhLlB2ynVcJ6y2UN1lQKh5tBb99V4=
-github.com/ascenmmo/udp-server v0.0.0-20241024213152-f807e90ce36c/go.mod h1:uJBaE4CgtsgKsu7DFiW9+RYy+BXjjG3+N1V52saYEqY=
-github.com/ascenmmo/websocket-server v0.0.0-20241024213056-3c1271cc0529 h1:Rwgx3hEykeJMIy9R/abLIz652Y1ZYnQR1cgSUOCV714=
-github.com/ascenmmo/websocket-server v0.0.0-20241024213056-3c1271cc0529/go.mod h1:P6ISIRo2rzqMDx5YzP7ixsFKXbYMw0DeYkAPsJS5ScE=
+github.com/ascenmmo/tcp-server v1.0.2 h1:ykvz3at8Efm7dPJXlIPrDlcEMSq9GS9TpqD9WUh+EjI=
+github.com/ascenmmo/tcp-server v1.0.2/go.mod h1:14K6fwh/Sj958MMSPA+35xHzng0ZzVc2oq5kpXYLQbo=
+github.com/ascenmmo/token-generator v1.0.2 h1:NpqtMWsx/XhhZlvodPjWvwx9jVKxe6xrUnLTHBCBR8k=
+github.com/ascenmmo/token-generator v1.0.2/go.mod h1:M3RdQKl1JfQeqM2hWNs0645G48GupB7idwdzQMkxlxM=
+github.com/ascenmmo/udp-server v1.0.2 h1:4ckeABZEE4s3qJ5C2M9v/Gku5rReNKC/l+xUIW6beyc=
+github.com/ascenmmo/udp-server v1.0.2/go.mod h1:uJBaE4CgtsgKsu7DFiW9+RYy+BXjjG3+N1V52saYEqY=
+github.com/ascenmmo/websocket-server v1.0.3 h1:fBpYxAadz+VXXIJjZTptedoWASdhJNw+u/VG/gTzSjc=
+github.com/ascenmmo/websocket-server v1.0.3/go.mod h1:P6ISIRo2rzqMDx5YzP7ixsFKXbYMw0DeYkAPsJS5ScE=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -63,6 +63,8 @@ github.com/openzipkin-contrib/zipkin-go-opentracing v0.5.0 h1:uhcF5Jd7rP9DVEL10S
 github.com/openzipkin-contrib/zipkin-go-opentracing v0.5.0/go.mod h1:+oCZ5GXXr7KPI/DNOQORPTq5AWHfALJj9c72b0+YsEY=
 github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg=
 github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LDHcMZmk3RmK7c=
+github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
+github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -85,6 +87,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
+github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
 github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
 github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
@@ -113,11 +117,14 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
 golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -126,21 +133,25 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
 golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
 golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
 google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=

internal/errors/access.go

@@ -5,4 +5,5 @@ import "errors"
 var (
 	ErrAccessDenied                = errors.New("access denied")
 	ErrAccessDeniedDeleteCreatorID = errors.New("access denied cannot delete creatorID")
+	ErrRecordAlredyExists          = errors.New("record already exists")
 )

internal/errors/client.go

@@ -4,5 +4,8 @@ import "errors"
 
 var (
 	ErrClientCreationError = errors.New("error creating client")
-	ErrClientNotFound      = errors.New("error client not found")
+	ErrNotFound            = errors.New("error not found")
+	ErrWrongUserOrPassword = errors.New("error wrong user or password")
+	ErrBadNewPassword      = errors.New("error bad new password")
+	ErrGameSaves           = errors.New("error game saves found")
 )

internal/errors/errors.go

@@ -0,0 +1,7 @@
+package errors
+
+import "errors"
+
+var (
+	ErrTooManyRequests = errors.New("too many requests")
+)

internal/service/access/access.go

@@ -31,7 +31,7 @@ func (c *accessGame) CreateNew(gameID, userID uuid.UUID) (err error) {
 
 	err = c.storage.CreateAccessGame(gameAccess)
 	if err != nil {
-		return err
+		return errors.ErrRecordAlredyExists
 	}
 
 	return nil
@@ -54,7 +54,7 @@ func (c *accessGame) AddOwner(ownerID uuid.UUID, gameID, newOwnerID uuid.UUID) (
 	}
 
 	gameAccess.Owners = append(gameAccess.Owners, newOwnerID)
-	err = c.storage.CreateAccessGame(gameAccess)
+	err = c.storage.Update(gameAccess)
 	if err != nil {
 		return err
 	}

internal/service/dev_tools/connections.go

@@ -14,12 +14,11 @@ import (
 )
 
 type connections struct {
-	gameStorage        storage.GameStorage
-	serverStorage      storage.ServersStorage
-	roomsStorage       storage.RoomsStorage
-	gameConfigsStorage storage.GameConfigsStorage
-	token              tokengenerator.TokenGenerator
-	logger             *zerolog.Logger
+	gameStorage   storage.GameStorage
+	serverStorage storage.ServersStorage
+	roomsStorage  storage.RoomsStorage
+	token         tokengenerator.TokenGenerator
+	logger        *zerolog.Logger
 }
 
 func (c *connections) CreateRoom(ctx context.Context, token string, gameID uuid.UUID) (newToken string, err error) {
@@ -52,7 +51,7 @@ func (c *connections) CreateRoom(ctx context.Context, token string, gameID uuid.
 	for i := range servers {
 		exists, err := servers[i].IsExists(ctx, token)
 		if err != nil {
-			c.logger.Error().Err(err)
+			c.logger.Error().Err(err).Msg("IsExists error")
 			continue
 		}
 		if exists {
@@ -144,14 +143,12 @@ func (c *connections) GetRoomsConnectionUrls(ctx context.Context, token string)
 		return []types.ConnectionServer{}, errors.ErrServerCreatingRoomAllServesOffError
 	}
 
-	config, err := c.gameConfigsStorage.GetConfig(info.GameID)
 	if err != nil {
 		c.logger.Error().Err(err).Msg("game configs not found")
 	}
 
 	for _, server := range servers {
-		configForServer := config.ConfigForServer(server.ServerType)
-		err = server.CreateRoom(ctx, token, configForServer)
+		err = server.CreateRoom(ctx, token)
 		if err != nil {
 			if err.Error() != errors.ErrRoomIsExists.Error() {
 				c.logger.Error().Err(err).Msg("server error create room")
@@ -187,6 +184,6 @@ func (c *connections) RemoveRoomByID(ctx context.Context, token string, gameID u
 	return nil
 }
 
-func NewConnections(gameStorage storage.GameStorage, serverStorage storage.ServersStorage, roomsStorage storage.RoomsStorage, gameConfigsStorage storage.GameConfigsStorage, token tokengenerator.TokenGenerator, logger *zerolog.Logger) multiplayer.DevToolsConnections {
-	return &connections{gameStorage: gameStorage, serverStorage: serverStorage, roomsStorage: roomsStorage, gameConfigsStorage: gameConfigsStorage, token: token, logger: logger}
+func NewConnections(gameStorage storage.GameStorage, serverStorage storage.ServersStorage, roomsStorage storage.RoomsStorage, token tokengenerator.TokenGenerator, logger *zerolog.Logger) multiplayer.DevToolsConnections {
+	return &connections{gameStorage: gameStorage, serverStorage: serverStorage, roomsStorage: roomsStorage, token: token, logger: logger}
 }