Merge pull request #8 from DrOctavius/main

websocket fixes

Author: DrOctavius

Diff for: core/clients/db/constructor/client.go

@@ -55,7 +55,7 @@ func (dbc *DBClient) New(
 // GetDefaultClient -> it returns the default client based on the existing app configuration
 func (dbc *DBClient) GetDefaultClient() (*gorm.DB, error) {
 	conf := mainConfig.GetConfig()
-	//defaultConnName := conf.Clients.MySQL.DefaultConn.Name
+	//defaultConnName := conf.ClientsStatus.MySQL.DefaultConn.Name
 
 	// TODO: get driverType and get from config
 

Diff for: core/config/autoloader/generate.go

@@ -32,7 +32,7 @@ func SaveConfigFromMemory(cfg Config) error {
 	c := viper.New()
 
 	// Create the map!
-	//MainConfig.Clients.MySQL.Connections = make(map[string]mysql.Config)
+	//MainConfig.ClientsStatus.MySQL.Connections = make(map[string]mysql.Config)
 	//MainConfig.Listeners.Http.Instances = make(map[string]http.Config)
 
 	// This is the default config!
@@ -232,7 +232,7 @@ func SaveConfigFromMemory(cfg Config) error {
 	//---------------------------------------------------------------------------------\\
 
 	// Cassandra Default Config Instance
-	/*if _, ok := cfgData.MainConfig.Clients.Cassandra.Instances["default"]; !ok {
+	/*if _, ok := cfgData.MainConfig.ClientsStatus.Cassandra.Instances["default"]; !ok {
 		_cassandra := &cassandraConfig.Config{
 			Hosts: []cassandraConfig.Host{
 				cassandraConfig.Host{
@@ -245,11 +245,11 @@ func SaveConfigFromMemory(cfg Config) error {
 			panic(_err)
 		}
 		// If the map is empty... we need to create it
-		if cfgData.MainConfig.Clients.Cassandra.Instances == nil {
+		if cfgData.MainConfig.ClientsStatus.Cassandra.Instances == nil {
 			// Creating  the map, where we will set afterwards the default object
-			cfgData.MainConfig.Clients.Cassandra.Instances = make(map[string]cassandraConfig.Config)
+			cfgData.MainConfig.ClientsStatus.Cassandra.Instances = make(map[string]cassandraConfig.Config)
 		}
-		cfgData.MainConfig.Clients.Cassandra.Instances["default"] = *_cassandra
+		cfgData.MainConfig.ClientsStatus.Cassandra.Instances["default"] = *_cassandra
 	}*/
 
 	//---------------------------------------------------------------------------------\\

Diff for: core/console/menu/menu.go

@@ -268,7 +268,7 @@ func (m *Menu) AddCommand(c *command.AddCmd) *Menu {
 				// -------Run Services--------\\
 
 				if c.EnableStartupServices {
-					// Run Broker Clients
+					// Run Broker ClientsStatus
 					if c.StartupCoreServices.BrokerClients {
 						// Register the broker client service
 						brokerClientService.RegisterBrokerService()

Diff for: core/listeners/http/server/server_client_indexing.go

@@ -479,7 +479,7 @@ func (c *clientsData) getClientsByFilter(filter FindClientsFilter) map[uint64]*C
 	// Prepare the filter..
 	prepareFilter(&filter)
 
-	// TODO: we can also save where we have found the Clients
+	// TODO: we can also save where we have found the ClientsStatus
 	// We are searching through 6 indexes!
 
 	// There are no overheads on local slices when using len function!
@@ -785,7 +785,7 @@ func NewClientsInstance() *clientsData {
 	return &clientsData{
 		// Here we store the c
 		clients: make(map[*Client]bool),
-		// Creating map of Clients indexes
+		// Creating map of ClientsStatus indexes
 		clientsIndex: ClientsIndex{
 			Users:       make(map[string]map[uint64]*Client),
 			Devices:     make(map[string]map[uint64]*Client),

Diff for: core/listeners/http/server/server_structure.go

@@ -93,7 +93,7 @@ type Server struct {
 	onBeforeStart *_map_string_interface.MapStringInterface
 	onStarted     *_map_string_interface.MapStringInterface
 
-	// Here we store the active/registered Clients (Connections)
+	// Here we store the active/registered ClientsStatus (Connections)
 	c *clientsData
 }
 

Diff for: core/listeners/websocket/server/hub_broadcast.go

@@ -22,8 +22,8 @@ const SplitForPercentageLoad = 25 // 25 percentage*/
 // 1750 / 437.5 = 4 GoRoutines
 //
 // ---------------ALGO nr. 2------------------\\
-// Total nr of Clients
-// If Nr of Clients
+// Total nr of ClientsStatus
+// If Nr of ClientsStatus
 // x < 10 -> 2 routine
 // 10 < x < 50 ->  5 routines
 // 50 < x < 100 -> 10 routines
@@ -97,7 +97,7 @@ func (h *Hub) run() {
 				nrOfRoutines := getNrOfRoutines(uint64(nrOfClients))
 				clients := h.c.GetClientsInChunks(nrOfRoutines)
 
-				// Split in multiple routines if there are many Clients
+				// Split in multiple routines if there are many ClientsStatus
 
 				for _, clientsChunk := range clients {
 					go func(c map[*Client]bool) {
@@ -119,7 +119,7 @@ func (h *Hub) run() {
 			}()
 		case broadcastTo := <-h.broadcastTo:
 
-			// For faster broadcasting maybe we should goroutine here... because looping through Clients takes some time...!
+			// For faster broadcasting maybe we should goroutine here... because looping through ClientsStatus takes some time...!
 			// And if starting more goroutines that will also start looping and transmit messages will not be a problem!
 			// This will improve speed, but can consume resources!
 

Diff for: core/listeners/websocket/server/hub_structure.go

@@ -63,7 +63,7 @@ type Hub struct {
 	// ControlMessages
 	ControlChannel chan int
 
-	// Unregistered Clients
+	// Unregistered ClientsStatus
 	UnregisterClientChannel chan *Client
 }
 

Diff for: core/listeners/websocket/server/server_client_indexing.go

@@ -487,7 +487,7 @@ func (c *clientsData) getClientsByFilter(filter FindClientsFilter) map[uint64]*C
 	// Prepare the filter..
 	prepareFilter(&filter)
 
-	// TODO: we can also save where we have found the Clients
+	// TODO: we can also save where we have found the ClientsStatus
 	// We are searching through 6 indexes!
 
 	// There are no overheads on local slices when using len function!
@@ -793,7 +793,7 @@ func NewClientsInstance() *clientsData {
 	return &clientsData{
 		// Here we store the c
 		clients: make(map[*Client]bool),
-		// Creating map of Clients indexes
+		// Creating map of ClientsStatus indexes
 		clientsIndex: ClientsIndex{
 			Users:       make(map[string]map[uint64]*Client),
 			Devices:     make(map[string]map[uint64]*Client),

Diff for: core/listeners/websocket/server/server_model.go

@@ -137,7 +137,7 @@ type Server struct {
 
 	// ------Settings ---------\\
 
-	// Here we store the active/registered Clients (Connections)
+	// Here we store the active/registered ClientsStatus (Connections)
 	// c      map[*Client]bool
 	// clientsIndex ClientsIndex
 	c *clientsData

Diff for: core/listeners/websocket/server/server_registration_hub.go

@@ -32,7 +32,7 @@ func (h *RegistrationHub) unregisterClient(client *Client) {
 		}
 	}()
 
-	// Hub -> Server -> Clients
+	// Hub -> Server -> ClientsStatus
 	h.s.c.unregisterClient(client)
 
 	// Close the channel for output buffering

Diff for: core/listeners/websocket/server/server_status.go

@@ -5,8 +5,17 @@ import (
 	"github.com/kyaxcorp/go-core/core/helpers/info"
 	"runtime"
 	"strings"
+	"time"
 )
 
+type ClientDetails struct {
+	IPAddress        string
+	ConnectedAt      time.Time
+	ConnectedSeconds int64
+	UserID           string
+	DeviceID         string
+}
+
 type FullStatus struct {
 	Name                  string
 	ListeningAddresses    []string
@@ -112,6 +121,34 @@ func (s *Server) Stack(onCollected func(stack string)) {
 	}()
 }
 
+func (s *Server) ClientsStatus(onCollected func(clients []ClientDetails)) {
+	go func() {
+
+		/*
+			IP
+			Device ID
+			Connected Time
+		*/
+
+		now := time.Now()
+		currentClients := s.GetClients()
+		var cls []ClientDetails
+		for c, _ := range currentClients {
+			cls = append(cls, ClientDetails{
+				IPAddress:        c.GetIPAddress(),
+				ConnectedAt:      c.connectTime,
+				ConnectedSeconds: now.Unix() - c.connectTime.Unix(),
+				UserID:           c.GetUserID(),
+				DeviceID:         c.GetDeviceID(),
+			})
+		}
+
+		if onCollected != nil {
+			onCollected(cls)
+		}
+	}()
+}
+
 func (s *Server) StatusHubs(onCollected func(status HubsStatus)) {
 	go func() {
 		status := HubsStatus{
@@ -168,6 +205,11 @@ func (s *Server) startServerStatus() *Server {
 				// We have received the status, and we return through channel the response!
 				awaitStatus <- stack
 			})
+		case "clients":
+			s.ClientsStatus(func(clients []ClientDetails) {
+				// We have received the status, and we return through channel the response!
+				awaitStatus <- clients
+			})
 		default:
 			s.Status(func(status FullStatus) {
 				// We have received the status, and we return through channel the response!
@@ -194,6 +236,7 @@ func (s *Server) startServerStatus() *Server {
 		serverStatus.GET("/stack", getStatus)
 		serverStatus.GET("/hubs", getStatus)
 		serverStatus.GET("/nr_of_clients", getStatus)
+		serverStatus.GET("/clients", getStatus)
 		serverStatus.GET("/system_status", getStatus)
 	}
 	return s