optmize optimize WSAcceptor parameters

acceptor/ws_acceptor.go

@@ -67,6 +67,7 @@ func NewWSAcceptor(addr string, opts ...WSAcceptorOption) *WSAcceptor {
 		addr:     addr,
 		connChan: make(chan PlayerConn),
 		running:  false,
+		path:     "/",
 	}
 
 	for _, opt := range opts {

acceptor/ws_acceptor_test.go

@@ -23,9 +23,6 @@ var wsAcceptorTables = []struct {
 	// TODO change to allocatable ports
 	{"test_1", "0.0.0.0:0", []byte{0x01, 0x02}, []string{"./fixtures/server.crt", "./fixtures/server.key"}, nil},
 	{"test_2", "127.0.0.1:0", []byte{0x00}, []string{"./fixtures/server.crt", "./fixtures/server.key"}, nil},
-	{"test_3", "0.0.0.0:0", []byte{0x00}, []string{"wqodij"}, constants.ErrInvalidCertificates},
-	{"test_4", "0.0.0.0:0", []byte{0x00}, []string{"wqodij", "qwdo", "wod"}, constants.ErrInvalidCertificates},
-	{"test_4", "0.0.0.0:0", []byte{0x00}, []string{}, nil},
 }
 
 func TestNewWSAcceptor(t *testing.T) {
@@ -34,12 +31,12 @@ func TestNewWSAcceptor(t *testing.T) {
 		t.Run(table.name, func(t *testing.T) {
 			if table.panicErr != nil {
 				assert.PanicsWithValue(t, table.panicErr, func() {
-					NewWSAcceptor(table.addr, "", table.certs...)
+					NewWSAcceptor(table.addr, WithWSAcceptorCerts(table.certs[0], table.certs[1]))
 				})
 			} else {
 				var w *WSAcceptor
 				assert.NotPanics(t, func() {
-					w = NewWSAcceptor(table.addr, "", table.certs...)
+					w = NewWSAcceptor(table.addr, WithWSAcceptorCerts(table.certs[0], table.certs[1]))
 				})
 
 				if len(table.certs) == 2 {
@@ -59,7 +56,7 @@ func TestWSAcceptorGetAddr(t *testing.T) {
 	t.Parallel()
 	for _, table := range wsAcceptorTables {
 		t.Run(table.name, func(t *testing.T) {
-			w := NewWSAcceptor(table.addr, "/")
+			w := NewWSAcceptor(table.addr)
 			// will return empty string because acceptor is not listening
 			assert.Equal(t, "", w.GetAddr())
 		})
@@ -70,7 +67,7 @@ func TestWSAcceptorGetConn(t *testing.T) {
 	t.Parallel()
 	for _, table := range wsAcceptorTables {
 		t.Run(table.name, func(t *testing.T) {
-			w := NewWSAcceptor(table.addr, "/")
+			w := NewWSAcceptor(table.addr)
 			assert.NotNil(t, w.GetConnChan())
 		})
 	}
@@ -91,7 +88,7 @@ func mustConnectToWS(t *testing.T, write []byte, w *WSAcceptor, protocol string)
 func TestWSAcceptorListenAndServe(t *testing.T) {
 	for _, table := range wsAcceptorTables {
 		t.Run(table.name, func(t *testing.T) {
-			w := NewWSAcceptor(table.addr, "/")
+			w := NewWSAcceptor(table.addr)
 			c := w.GetConnChan()
 			defer w.Stop()
 			go w.ListenAndServe()
@@ -105,7 +102,7 @@ func TestWSAcceptorListenAndServe(t *testing.T) {
 func TestWSAcceptorListenAndServeTLS(t *testing.T) {
 	for _, table := range wsAcceptorTables {
 		t.Run(table.name, func(t *testing.T) {
-			w := NewWSAcceptor(table.addr, "/")
+			w := NewWSAcceptor(table.addr)
 			c := w.GetConnChan()
 			defer w.Stop()
 			go w.ListenAndServeTLS("./fixtures/server.crt", "./fixtures/server.key")
@@ -119,7 +116,7 @@ func TestWSAcceptorListenAndServeTLS(t *testing.T) {
 func TestWSAcceptorStop(t *testing.T) {
 	for _, table := range wsAcceptorTables {
 		t.Run(table.name, func(t *testing.T) {
-			w := NewWSAcceptor(table.addr, "/")
+			w := NewWSAcceptor(table.addr)
 			go w.ListenAndServe()
 			mustConnectToWS(t, table.write, w, "ws")
 			addr := fmt.Sprintf("ws://%s", w.GetAddr())
@@ -133,7 +130,7 @@ func TestWSAcceptorStop(t *testing.T) {
 func TestWSConnRead(t *testing.T) {
 	for _, table := range wsAcceptorTables {
 		t.Run(table.name, func(t *testing.T) {
-			w := NewWSAcceptor(table.addr, "/")
+			w := NewWSAcceptor(table.addr)
 			c := w.GetConnChan()
 			defer w.Stop()
 			go w.ListenAndServe()
@@ -151,7 +148,7 @@ func TestWSConnRead(t *testing.T) {
 func TestWSConnWrite(t *testing.T) {
 	for _, table := range wsAcceptorTables {
 		t.Run(table.name, func(t *testing.T) {
-			w := NewWSAcceptor(table.addr, "/")
+			w := NewWSAcceptor(table.addr)
 			c := w.GetConnChan()
 			defer w.Stop()
 			go w.ListenAndServe()
@@ -168,7 +165,7 @@ func TestWSConnWrite(t *testing.T) {
 func TestWSConnLocalAddr(t *testing.T) {
 	for _, table := range wsAcceptorTables {
 		t.Run(table.name, func(t *testing.T) {
-			w := NewWSAcceptor(table.addr, "/")
+			w := NewWSAcceptor(table.addr)
 			c := w.GetConnChan()
 			defer w.Stop()
 			go w.ListenAndServe()
@@ -183,7 +180,7 @@ func TestWSConnLocalAddr(t *testing.T) {
 func TestWSConnRemoteAddr(t *testing.T) {
 	for _, table := range wsAcceptorTables {
 		t.Run(table.name, func(t *testing.T) {
-			w := NewWSAcceptor(table.addr, "/")
+			w := NewWSAcceptor(table.addr)
 			c := w.GetConnChan()
 			defer w.Stop()
 			go w.ListenAndServe()
@@ -198,7 +195,7 @@ func TestWSConnRemoteAddr(t *testing.T) {
 func TestWSConnSetDeadline(t *testing.T) {
 	for _, table := range wsAcceptorTables {
 		t.Run(table.name, func(t *testing.T) {
-			w := NewWSAcceptor(table.addr, "/")
+			w := NewWSAcceptor(table.addr)
 			c := w.GetConnChan()
 			defer w.Stop()
 			go w.ListenAndServe()
@@ -226,7 +223,7 @@ func TestWSGetNextMessage(t *testing.T) {
 
 	for _, table := range tables {
 		t.Run(table.name, func(t *testing.T) {
-			w := NewWSAcceptor("0.0.0.0:0", "/")
+			w := NewWSAcceptor("0.0.0.0:0")
 			c := w.GetConnChan()
 			defer w.Stop()
 			go w.ListenAndServe()
@@ -256,7 +253,7 @@ func TestWSGetNextMessage(t *testing.T) {
 }
 
 func TestWSGetNextMessageSequentially(t *testing.T) {
-	w := NewWSAcceptor("0.0.0.0:0", "/")
+	w := NewWSAcceptor("0.0.0.0:0")
 	c := w.GetConnChan()
 	defer w.Stop()
 	go w.ListenAndServe()

cluster/etcd_service_discovery.go

@@ -27,13 +27,12 @@ import (
 	"strings"
 	"sync"
 	"time"
-
 	"github.com/topfreegames/pitaya/v2/config"
 	"github.com/topfreegames/pitaya/v2/constants"
 	"github.com/topfreegames/pitaya/v2/logger"
 	"github.com/topfreegames/pitaya/v2/util"
-	logutil "go.etcd.io/etcd/client/pkg/v3/logutil"
 	clientv3 "go.etcd.io/etcd/client/v3"
+	logutil "go.etcd.io/etcd/client/pkg/v3/logutil"
 	"go.etcd.io/etcd/client/v3/namespace"
 	"google.golang.org/grpc"
 )

cluster/nats_rpc_client_test.go

@@ -470,7 +470,7 @@ func TestNatsRPCClientCall(t *testing.T) {
 			ss.EXPECT().SetRequestInFlight(gomock.Any(), gomock.Any(), gomock.Any()).Times(2)
 
 			res, err := rpcClient.Call(context.Background(), protos.RPCType_Sys, rt, ss, msg, sv2)
-			assert.Equal(t, table.expected.GetData(), res.GetData())
+			assert.Equal(t, table.expected, res)
 			if table.err != nil {
 				assert.Error(t, err)
 				assert.Contains(t, err.Error(), table.err.Error())

groups/etcd_group_service.go

@@ -6,12 +6,12 @@ import (
 	"sync"
 	"time"
 
+	clientv3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/namespace"
+	"go.etcd.io/etcd/api/v3/mvccpb"
 	"github.com/topfreegames/pitaya/v2/config"
 	"github.com/topfreegames/pitaya/v2/constants"
 	"github.com/topfreegames/pitaya/v2/logger"
-	"go.etcd.io/etcd/api/v3/mvccpb"
-	clientv3 "go.etcd.io/etcd/client/v3"
-	"go.etcd.io/etcd/client/v3/namespace"
 )
 
 var (

helpers/helpers.go

@@ -64,7 +64,6 @@ func GetTestNatsServer(t *testing.T) *server.Server {
 // GetTestEtcd gets a test in memory etcd server
 func GetTestEtcd(t *testing.T) (*integration.ClusterV3, *clientv3.Client) {
 	t.Helper()
-	// skip etcd go leak detection
 	integration.BeforeTest(t)
 	c := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
 	cli := c.RandClient()

modules/binding_storage.go

@@ -25,13 +25,13 @@ import (
 	"fmt"
 	"time"
 
+	clientv3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/namespace"
 	"github.com/topfreegames/pitaya/v2/cluster"
 	"github.com/topfreegames/pitaya/v2/config"
 	"github.com/topfreegames/pitaya/v2/constants"
 	"github.com/topfreegames/pitaya/v2/logger"
 	"github.com/topfreegames/pitaya/v2/session"
-	clientv3 "go.etcd.io/etcd/client/v3"
-	"go.etcd.io/etcd/client/v3/namespace"
 )
 
 // ETCDBindingStorage module that uses etcd to keep in which frontend server each user is bound