Merge pull request #10 from ascenmmo/stage

Stage

Author: ascenmmo

internal/handler/tcp/server_settings.go

@@ -6,7 +6,6 @@ import (
 	"github.com/ascenmmo/udp-server/internal/utils"
 	"github.com/ascenmmo/udp-server/pkg/api/types"
 	"github.com/ascenmmo/udp-server/pkg/errors"
-	"github.com/google/uuid"
 )
 
 type ServerSettings struct {
@@ -45,12 +44,12 @@ func (r *ServerSettings) CreateRoom(ctx context.Context, token string, createRoo
 	if limited {
 		return errors.ErrTooManyRequests
 	}
-	err = r.server.CreateRoom(token)
+	err = r.server.CreateRoom(token, createRoom)
 	return
 }
 
-func (r *ServerSettings) SetNotifyServer(ctx context.Context, token string, id uuid.UUID, url string) (err error) {
-	return
+func (r *ServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
+	return r.server.GetDeletedRooms(token, ids)
 }
 
 func NewServerSettings(rateLimit utils.RateLimit, server service.Service) *ServerSettings {

internal/service/service.go

@@ -10,13 +10,15 @@ import (
 	"github.com/ascenmmo/udp-server/pkg/errors"
 	"github.com/google/uuid"
 	"github.com/rs/zerolog"
+	"time"
 )
 
 type Service interface {
 	GetConnectionsNum() (countConn int, exists bool)
-	CreateRoom(token string) error
+	CreateRoom(token string, room types.CreateRoomRequest) error
 	GetUsersAndMessage(ds connection.DataSender, req []byte) (users []types.User, msg []byte, err error)
 	RemoveUser(ds connection.DataSender, userID uuid.UUID) (err error)
+	GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error)
 }
 
 type service struct {
@@ -37,7 +39,7 @@ func (s *service) GetConnectionsNum() (countConn int, exists bool) {
 
 	return count, true
 }
-func (s *service) CreateRoom(token string) error {
+func (s *service) CreateRoom(token string, room types.CreateRoomRequest) error {
 	clientInfo, err := s.token.ParseToken(token)
 	if err != nil {
 		return err
@@ -53,7 +55,7 @@ func (s *service) CreateRoom(token string) error {
 	s.setRoom(clientInfo, &types.Room{
 		GameID: clientInfo.GameID,
 		RoomID: clientInfo.RoomID,
-	})
+	}, room.RoomTTl)
 
 	return nil
 }
@@ -97,6 +99,33 @@ func (s *service) RemoveUser(ds connection.DataSender, userID uuid.UUID) (err er
 	return nil
 }
 
+func (s *service) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
+	info, err := s.token.ParseToken(token)
+	if err != nil {
+		return nil, err
+	}
+
+	roomsWithKey := make(map[string]types.GetDeletedRooms)
+	for _, id := range ids {
+		info.GameID = id.GameID
+		info.RoomID = id.RoomID
+		roomsWithKey[utils.GenerateRoomKey(info)] = id
+	}
+
+	for k, _ := range roomsWithKey {
+		_, ok := s.storage.GetData(k)
+		if !ok {
+			delete(roomsWithKey, k)
+		}
+	}
+
+	for _, v := range roomsWithKey {
+		deletedIds = append(deletedIds, v)
+	}
+
+	return deletedIds, nil
+}
+
 func (s *service) setNewUser(ds connection.DataSender, req []byte) (clientInfo *tokentype.Info, err error) {
 	token := string(req)
 
@@ -115,7 +144,7 @@ func (s *service) setNewUser(ds connection.DataSender, req []byte) (clientInfo *
 			GameID: clientInfo.GameID,
 			RoomID: clientInfo.RoomID,
 		}
-		s.setRoom(*clientInfo, room)
+		s.setRoom(*clientInfo, room, 0)
 	} else {
 		room, ok = roomData.(*types.Room)
 		if !ok {
@@ -175,8 +204,12 @@ func (s *service) getRoomByClientInfo(clientInfo tokentype.Info) (room *types.Ro
 	return room, nil
 }
 
-func (s *service) setRoom(clientInfo tokentype.Info, room *types.Room) {
+func (s *service) setRoom(clientInfo tokentype.Info, room *types.Room, ttl time.Duration) {
 	roomKey := utils.GenerateRoomKey(clientInfo)
+	if ttl != 0 {
+		s.storage.SetDataWithTTL(roomKey, room, ttl)
+		return
+	}
 	s.storage.SetData(roomKey, room)
 }
 

internal/storage/memory_db.go

@@ -9,6 +9,7 @@ import (
 type IMemoryDB interface {
 	GetData(key string) (any, bool)
 	SetData(key string, value any)
+	SetDataWithTTL(key string, value any, ttl time.Duration)
 	Remove(key string)
 
 	AddConnection(id string)
@@ -54,6 +55,11 @@ func (db *MemoryDb) SetData(key string, value any) {
 	db.userData.count++
 }
 
+func (db *MemoryDb) SetDataWithTTL(key string, value any, ttl time.Duration) {
+	db.userData.storage.Store(key, &rowType{value: value, usedAt: time.Now().Add(ttl)})
+	db.userData.count++
+}
+
 func (db *MemoryDb) AddConnection(id string) {
 	db.connections.storage.Store(id, &rowType{value: id, usedAt: time.Now()})
 	db.connections.count++

pkg/api/server_settings.go

@@ -11,7 +11,6 @@ package api
 import (
 	"context"
 	"github.com/ascenmmo/udp-server/pkg/api/types"
-	"github.com/google/uuid"
 )
 
 // ServerSettings
@@ -32,6 +31,6 @@ type ServerSettings interface {
 	// @tg summary=`CreateRoom`
 	CreateRoom(ctx context.Context, token string, createRoom types.CreateRoomRequest) (err error)
 	// @tg http-headers=token|Token
-	// @tg summary=`SetNotifyServer`
-	SetNotifyServer(ctx context.Context, token string, id uuid.UUID, url string) (err error)
+	// @tg summary=`GetDeletedRooms`
+	GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error)
 }

pkg/api/types/network.go

@@ -0,0 +1,15 @@
+package types
+
+import (
+	"github.com/google/uuid"
+	"time"
+)
+
+type CreateRoomRequest struct {
+	RoomTTl time.Duration `json:"roomTTl"`
+}
+
+type GetDeletedRooms struct {
+	GameID uuid.UUID `json:"gameID"`
+	RoomID uuid.UUID `json:"roomID"`
+}

pkg/api/types/server_settings.go

@@ -1,10 +1,7 @@
 // GENERATED BY 'T'ransport 'G'enerator. DO NOT EDIT.
 package udpGameServer
 
-import (
-	"github.com/ascenmmo/udp-server/pkg/api/types"
-	"github.com/google/uuid"
-)
+import "github.com/ascenmmo/udp-server/pkg/api/types"
 
 type requestServerSettingsGetConnectionsNum struct {
 	Token string `json:"token"`
@@ -39,11 +36,11 @@ type requestServerSettingsCreateRoom struct {
 // Formal exchange type, please do not delete.
 type responseServerSettingsCreateRoom struct{}
 
-type requestServerSettingsSetNotifyServer struct {
-	Token string    `json:"token"`
-	Id    uuid.UUID `json:"id"`
-	Url   string    `json:"url"`
+type requestServerSettingsGetDeletedRooms struct {
+	Token string                  `json:"token"`
+	Ids   []types.GetDeletedRooms `json:"ids"`
 }
 
-// Formal exchange type, please do not delete.
-type responseServerSettingsSetNotifyServer struct{}
+type responseServerSettingsGetDeletedRooms struct {
+	DeletedIds []types.GetDeletedRooms `json:"deletedIds"`
+}

pkg/clients/udpGameServer/serversettings-exchange.go

@@ -6,5 +6,5 @@ type fallbackServerSettings interface {
 	HealthCheck(err error) bool
 	GetServerSettings(err error) bool
 	CreateRoom(err error) bool
-	SetNotifyServer(err error) bool
+	GetDeletedRooms(err error) bool
 }

pkg/clients/udpGameServer/serversettings-fallback.go

@@ -7,7 +7,6 @@ import (
 	"github.com/ascenmmo/udp-server/pkg/api/types"
 	"github.com/ascenmmo/udp-server/pkg/clients/udpGameServer/hasher"
 	"github.com/ascenmmo/udp-server/pkg/clients/udpGameServer/jsonrpc"
-	"github.com/google/uuid"
 )
 
 type ClientServerSettings struct {
@@ -18,7 +17,7 @@ type retServerSettingsGetConnectionsNum = func(countConn int, exists bool, err e
 type retServerSettingsHealthCheck = func(exists bool, err error)
 type retServerSettingsGetServerSettings = func(settings types.Settings, err error)
 type retServerSettingsCreateRoom = func(err error)
-type retServerSettingsSetNotifyServer = func(err error)
+type retServerSettingsGetDeletedRooms = func(deletedIds []types.GetDeletedRooms, err error)
 
 func (cli *ClientServerSettings) GetConnectionsNum(ctx context.Context, token string) (countConn int, exists bool, err error) {
 
@@ -238,20 +237,19 @@ func (cli *ClientServerSettings) ReqCreateRoom(ctx context.Context, callback ret
 	return
 }
 
-func (cli *ClientServerSettings) SetNotifyServer(ctx context.Context, token string, id uuid.UUID, url string) (err error) {
+func (cli *ClientServerSettings) GetDeletedRooms(ctx context.Context, token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
 
-	request := requestServerSettingsSetNotifyServer{
-		Id:    id,
+	request := requestServerSettingsGetDeletedRooms{
+		Ids:   ids,
 		Token: token,
-		Url:   url,
 	}
-	var response responseServerSettingsSetNotifyServer
+	var response responseServerSettingsGetDeletedRooms
 	var rpcResponse *jsonrpc.ResponseRPC
 	cacheKey, _ := hasher.Hash(request)
-	rpcResponse, err = cli.rpc.Call(ctx, "serversettings.setnotifyserver", request)
+	rpcResponse, err = cli.rpc.Call(ctx, "serversettings.getdeletedrooms", request)
 	var fallbackCheck func(error) bool
 	if cli.fallbackServerSettings != nil {
-		fallbackCheck = cli.fallbackServerSettings.SetNotifyServer
+		fallbackCheck = cli.fallbackServerSettings.GetDeletedRooms
 	}
 	if rpcResponse != nil && rpcResponse.Error != nil {
 		if cli.errorDecoder != nil {
@@ -263,28 +261,27 @@ func (cli *ClientServerSettings) SetNotifyServer(ctx context.Context, token stri
 	if err = cli.proceedResponse(ctx, err, cacheKey, fallbackCheck, rpcResponse, &response); err != nil {
 		return
 	}
-	return err
+	return response.DeletedIds, err
 }
 
-func (cli *ClientServerSettings) ReqSetNotifyServer(ctx context.Context, callback retServerSettingsSetNotifyServer, token string, id uuid.UUID, url string) (request RequestRPC) {
+func (cli *ClientServerSettings) ReqGetDeletedRooms(ctx context.Context, callback retServerSettingsGetDeletedRooms, token string, ids []types.GetDeletedRooms) (request RequestRPC) {
 
 	request = RequestRPC{rpcRequest: &jsonrpc.RequestRPC{
 		ID:      jsonrpc.NewID(),
 		JSONRPC: jsonrpc.Version,
-		Method:  "serversettings.setnotifyserver",
-		Params: requestServerSettingsSetNotifyServer{
-			Id:    id,
+		Method:  "serversettings.getdeletedrooms",
+		Params: requestServerSettingsGetDeletedRooms{
+			Ids:   ids,
 			Token: token,
-			Url:   url,
 		},
 	}}
 	if callback != nil {
-		var response responseServerSettingsSetNotifyServer
+		var response responseServerSettingsGetDeletedRooms
 		request.retHandler = func(err error, rpcResponse *jsonrpc.ResponseRPC) {
 			cacheKey, _ := hasher.Hash(request.rpcRequest.Params)
 			var fallbackCheck func(error) bool
 			if cli.fallbackServerSettings != nil {
-				fallbackCheck = cli.fallbackServerSettings.SetNotifyServer
+				fallbackCheck = cli.fallbackServerSettings.GetDeletedRooms
 			}
 			if rpcResponse != nil && rpcResponse.Error != nil {
 				if cli.errorDecoder != nil {
@@ -293,7 +290,7 @@ func (cli *ClientServerSettings) ReqSetNotifyServer(ctx context.Context, callbac
 					err = fmt.Errorf(rpcResponse.Error.Message)
 				}
 			}
-			callback(cli.proceedResponse(ctx, err, cacheKey, fallbackCheck, rpcResponse, &response))
+			callback(response.DeletedIds, cli.proceedResponse(ctx, err, cacheKey, fallbackCheck, rpcResponse, &response))
 		}
 	}
 	return