fix race condition on 43 msg creation/closure. Speed up game object insert to db (from 10-12s to 1-2s)

internal/foundry/transport/transport.go

@@ -64,25 +64,26 @@ func NewFoundryTransport(data *FoundryTransportData) *FoundryTransport {
 	}
 }
 
-func (t *FoundryTransport) CloseMsgChannel(id int, timeout time.Duration) bool {
+func (t *FoundryTransport) CloseMsgChannel(msgChan chan []byte, id int, timeout time.Duration) bool {
 	time.Sleep(timeout)
 
 	t.ChanMutex.Lock()
 	defer t.ChanMutex.Unlock()
 
 	ok := true
-	if _, ok = t.ExchangeChan.Msgs[id]; !ok {
-		return false
-	}
 	select {
-	case _, ok = <-t.ExchangeChan.Msgs[id]:
+	case _, ok = <-msgChan:
 		if ok {
-			close(t.ExchangeChan.Msgs[id])
-			delete(t.ExchangeChan.Msgs, id)
+			if msgChan == t.ExchangeChan.Msgs[id] {
+				delete(t.ExchangeChan.Msgs, id)
+			}
+			close(msgChan)
 		}
 	default:
-		close(t.ExchangeChan.Msgs[id])
-		delete(t.ExchangeChan.Msgs, id)
+		if msgChan == t.ExchangeChan.Msgs[id] {
+			delete(t.ExchangeChan.Msgs, id)
+		}
+		close(msgChan)
 	}
 
 	return ok

internal/foundry/transport/websocket.go

@@ -1,6 +1,7 @@
 package transport
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -61,8 +62,8 @@ func (tr *FoundryTransport) HandleWebsocketRequest(msg *types.WsMessage) ([]byte
 }
 
 func (tr *FoundryTransport) ReceiveMessage(id int) ([]byte, error) {
-	// ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	// defer cancel()
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
 
 	for {
 		select {
@@ -71,14 +72,14 @@ func (tr *FoundryTransport) ReceiveMessage(id int) ([]byte, error) {
 				time.Sleep(5 * time.Microsecond)
 				continue
 			}
-			tr.CloseMsgChannel(id, 0)
+			tr.CloseMsgChannel(tr.ExchangeChan.Msgs[id], id, 0)
 			return msg, nil
-		// case <-ctx.Done():
-		// 	err := ctx.Err()
-		// 	if err != nil {
-		// 		return nil, err
-		// 	}
-		// 	return nil, ErrorTimeout
+		case <-ctx.Done():
+			err := ctx.Err()
+			if err != nil {
+				return nil, err
+			}
+			return nil, ErrorTimeout
 		default:
 			time.Sleep(5 * time.Microsecond)
 		}