Port connection info changes to v2 (#433)

* feat: add a method to get the number of connected clients (#430)
* Fix static call to session GetNumberOfConnectedClients (#431)
---------

Co-authored-by: Reinaldo Oliveira <reinaldo.oliveira@wildlifestudios.com>
Co-authored-by: Rodrigo Ueda <rodrigo.ueda@wildlifestudios.com>
Co-authored-by: rodrigoueda <rodrigoyueda@gmail.com>

app.go

@@ -125,6 +125,8 @@ type Pitaya interface {
 	RegisterModuleAfter(module interfaces.Module, name string) error
 	RegisterModuleBefore(module interfaces.Module, name string) error
 	GetModule(name string) (interfaces.Module, error)
+
+	GetNumberOfConnectedClients() int64
 }
 
 // App is the base app struct
@@ -553,3 +555,8 @@ func (app *App) RegisterRPCJob(rpcJob worker.RPCJob) error {
 	err := app.worker.RegisterRPCJob(rpcJob)
 	return err
 }
+
+// GetNumberOfConnectedClients returns the number of connected clients
+func (app *App) GetNumberOfConnectedClients() int64 {
+	return app.sessionPool.GetSessionCount()
+}

session/session.go

@@ -64,6 +64,7 @@ type SessionPool interface {
 	OnSessionClose(f func(s Session))
 	CloseAll()
 	AddHandshakeValidator(name string, f func(data *HandshakeData) error)
+	GetNumberOfConnectedClients() int64
 }
 
 // HandshakeClientData represents information about the client sent on the handshake.
@@ -310,6 +311,11 @@ func (pool *sessionPoolImpl) AddHandshakeValidator(name string, f func(data *Han
 	pool.handshakeValidators[name] = f
 }
 
+// GetNumberOfConnectedClients returns the number of connected clients
+func (pool *sessionPoolImpl) GetNumberOfConnectedClients() int64 {
+	return pool.GetSessionCount()
+}
+
 func (s *sessionImpl) updateEncodedData() error {
 	var b []byte
 	b, err := json.Marshal(s.data)

session/session_test.go

@@ -1507,3 +1507,18 @@ func TestSessionValidateHandshake(t *testing.T) {
 		})
 	}
 }
+
+func TestGetNumberOfConnectedClients(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	entity := mocks.NewMockNetworkEntity(ctrl)
+	sessionPool := NewSessionPool()
+	connections := sessionPool.GetNumberOfConnectedClients()
+	assert.Equal(t, int64(0), connections)
+
+	ss := sessionPool.NewSession(entity, true)
+	assert.NotNil(t, ss)
+	connections = sessionPool.GetNumberOfConnectedClients()
+	assert.Equal(t, int64(1), connections)
+}

session/static.go

@@ -36,3 +36,8 @@ func OnSessionClose(f func(s Session)) {
 func CloseAll() {
 	DefaultSessionPool.CloseAll()
 }
+
+// GetNumberOfConnectedClients returns the number of connected clients
+func GetNumberOfConnectedClients() int64 {
+	return DefaultSessionPool.GetNumberOfConnectedClients()
+}

session/test/static_test.go

@@ -1,6 +1,7 @@
 package test
 
 import (
+	"math"
 	"testing"
 
 	"github.com/golang/mock/gomock"
@@ -115,3 +116,15 @@ func TestStaticCloseAll(t *testing.T) {
 	session.DefaultSessionPool = sessionPool
 	session.CloseAll()
 }
+
+func TestGetNumberOfConnectedClients(t *testing.T) {
+	ctrl := gomock.NewController(t)
+
+	expected := int64(math.MaxInt64)
+	sessionPool := mocks.NewMockSessionPool(ctrl)
+	sessionPool.EXPECT().GetNumberOfConnectedClients().Return(expected)
+
+	session.DefaultSessionPool = sessionPool
+	numberOfConnections := session.GetNumberOfConnectedClients()
+	require.Equal(t, expected, numberOfConnections)
+}

static.go

@@ -225,3 +225,7 @@ func RegisterModuleBefore(module interfaces.Module, name string) error {
 func GetModule(name string) (interfaces.Module, error) {
 	return DefaultApp.GetModule(name)
 }
+
+func GetNumberOfConnectedClients() int64 {
+	return DefaultApp.GetNumberOfConnectedClients()
+}

static_test.go

@@ -24,6 +24,7 @@ import (
 	"context"
 	"errors"
 	"github.com/topfreegames/pitaya/v2/constants"
+	"math"
 	"testing"
 	"time"
 
@@ -922,3 +923,15 @@ func TestStaticGetModule(t *testing.T) {
 		})
 	}
 }
+
+func TestGetNumberOfConnectedClients(t *testing.T) {
+	ctrl := gomock.NewController(t)
+
+	expected := int64(math.MaxInt64)
+
+	app := mocks.NewMockPitaya(ctrl)
+	app.EXPECT().GetNumberOfConnectedClients().Return(expected)
+
+	DefaultApp = app
+	require.Equal(t, expected, GetNumberOfConnectedClients())
+}