Merge pull request #8 from ascenmmo/stage

Stage

Author: ascenmmo

.gitignore

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

cmd/udp/main.go

@@ -21,7 +21,7 @@ func main() {
 		env.UDPPort,
 		env.TokenKey,
 		env.MaxRequestPerSecond,
-		5,
+		10,
 		logger,
 		true)
 	if err != nil {

internal/service/service.go

@@ -108,14 +108,19 @@ func (s *service) setNewUser(ds connection.DataSender, req []byte) (clientInfo *
 	s.storage.SetData(ds.GetID(), info)
 	roomKey := utils.GenerateRoomKey(info)
 
+	var room *types.Room
 	roomData, ok := s.storage.GetData(roomKey)
 	if !ok {
-		return clientInfo, errors.ErrRoomNotFound
-	}
-
-	room, ok := roomData.(*types.Room)
-	if !ok {
-		return clientInfo, errors.ErrRoomBadValue
+		room = &types.Room{
+			GameID: clientInfo.GameID,
+			RoomID: clientInfo.RoomID,
+		}
+		s.setRoom(*clientInfo, room)
+	} else {
+		room, ok = roomData.(*types.Room)
+		if !ok {
+			return clientInfo, errors.ErrRoomBadValue
+		}
 	}
 
 	room.SetUser(&types.User{

internal/tests/udp_test.go

@@ -21,7 +21,7 @@ import (
 )
 
 var (
-	clients = 20
+	clients = 2000
 	msgs    = 100
 
 	baseURl = "http://" + env.ServerAddress + ":" + env.TCPPort

pkg/api/types/room.go

@@ -3,7 +3,6 @@ package types
 import (
 	"github.com/ascenmmo/udp-server/internal/connection"
 	"github.com/google/uuid"
-	"sync"
 	"time"
 )
 
@@ -16,7 +15,6 @@ type Room struct {
 	Users []*User
 
 	UpdatedAt time.Time
-	mtx       sync.RWMutex
 }
 
 type User struct {
@@ -26,22 +24,16 @@ type User struct {
 }
 
 func (r *Room) SetUser(user *User) {
-	r.mtx.Lock()
 	r.Users = r.setUser(r.Users, user)
-	r.mtx.Unlock()
 }
 
 func (r *Room) GetUser() (users []*User) {
-	r.mtx.RLock()
 	users = r.Users
-	r.mtx.RUnlock()
 	return
 }
 
 func (r *Room) RemoveUser(user uuid.UUID) {
-	r.mtx.Lock()
 	r.removeFromArray(user)
-	r.mtx.Unlock()
 }
 
 func (r *Room) SetUpdatedAt() {
@@ -63,13 +55,11 @@ func (r *Room) setUser(users []*User, user *User) (allUsers []*User) {
 }
 
 func (r *Room) removeFromArray(userID uuid.UUID) {
-	r.mtx.Lock()
 	for i, user := range r.Users {
 		if user.ID == userID {
 			r.Users = append(r.Users[:i], r.Users[i+1:]...)
 		}
 	}
-	r.mtx.Unlock()
 }
 
 func (r *Room) SetServerID(id uuid.UUID) {
@@ -82,11 +72,9 @@ func (r *Room) SetServerID(id uuid.UUID) {
 }
 
 func (r *Room) RemoveServerID(id uuid.UUID) {
-	r.mtx.Lock()
 	for i, server := range r.ServerID {
 		if server == id {
 			r.ServerID = append(r.ServerID[:i], r.ServerID[i+1:]...)
 		}
 	}
-	r.mtx.Unlock()
 }