Revert "Reject duplicate client IDs"

This reverts commit bee5fe4af3.
This commit is contained in:
zikaeroh 2020-06-14 12:33:07 -07:00
parent bee5fe4af3
commit 3a57f683ac
1 changed files with 15 additions and 28 deletions

View File

@ -245,39 +245,26 @@ func (r *Room) HandleConn(ctx context.Context, playerID uuid.UUID, nickname stri
g, ctx := errgroup.WithContext(ctx) g, ctx := errgroup.WithContext(ctx)
setup := func() (success bool) { r.mu.Lock()
r.mu.Lock() r.players[playerID] = func(s protocol.ServerNote) {
defer r.mu.Unlock() if ctx.Err() != nil {
return
if _, ok := r.players[playerID]; ok {
ctxlog.Warn(ctx, "client with this ID already exists")
return false
} }
r.players[playerID] = func(s protocol.ServerNote) { // It's not safe to start more group goroutines concurrently; just use a regular
if ctx.Err() != nil { // goroutine and hope that errors here will be reflected later via ping/receive failures.
go func() {
ctx, cancel := context.WithTimeout(ctx, time.Second)
defer cancel()
if err := wsjson.Write(ctx, c, &s); err != nil {
return return
} }
metricSent.Inc()
// It's not safe to start more group goroutines concurrently; just use a regular }()
// goroutine and hope that errors here will be reflected later via ping/receive failures.
go func() {
ctx, cancel := context.WithTimeout(ctx, time.Second)
defer cancel()
if err := wsjson.Write(ctx, c, &s); err != nil {
return
}
metricSent.Inc()
}()
}
r.room.AddPlayer(playerID, nickname)
r.sendAll()
return true
}
if !setup() {
return
} }
r.room.AddPlayer(playerID, nickname)
r.sendAll()
r.mu.Unlock()
defer func() { defer func() {
r.mu.Lock() r.mu.Lock()