progress on server refactor

server/internal/session/manager.go

@@ -26,9 +26,10 @@ type SessionManager struct {
 
 func (m *SessionManager) New(id string, admin bool, socket *websocket.Conn) *Session {
 	session := &Session{
-		ID:     id,
-		Admin:  admin,
-		socket: socket,
+		ID:        id,
+		Admin:     admin,
+		socket:    socket,
+		connected: false,
 	}
 
 	m.members[id] = session
@@ -76,6 +77,17 @@ func (m *SessionManager) Get(id string) (*Session, bool) {
 	return session, ok
 }
 
+func (m *SessionManager) GetConnected() []*Session {
+	var sessions []*Session
+	for _, sess := range m.members {
+		if sess.connected {
+			sessions = append(sessions, sess)
+		}
+	}
+
+	return sessions
+}
+
 func (m *SessionManager) Set(id string, session *Session) {
 	m.members[id] = session
 }
@@ -115,6 +127,8 @@ func (m *SessionManager) SetName(id string, name string) (bool, error) {
 	session, ok := m.members[id]
 	if ok {
 		session.Name = name
+		session.connected = true
+		m.emmiter.Emit("connected", id, session)
 		return true, nil
 	}
 
@@ -126,24 +140,21 @@ func (m *SessionManager) Clear() error {
 }
 
 func (m *SessionManager) Brodcast(v interface{}, exclude interface{}) error {
-	if exclude != nil {
-		for id, sess := range m.members {
+	for id, sess := range m.members {
+		if !sess.connected {
+			continue
+		}
+
+		if exclude != nil {
 			if in, _ := utils.ArrayIn(id, exclude); in {
 				continue
 			}
-
-			if err := sess.Send(v); err != nil {
-				return err
-			}
 		}
-	} else {
-		for _, sess := range m.members {
-			if err := sess.Send(v); err != nil {
-				return err
-			}
+
+		if err := sess.Send(v); err != nil {
+			return err
 		}
 	}
-
 	return nil
 }
 
@@ -165,6 +176,12 @@ func (m *SessionManager) OnCreated(listener func(id string, session *Session)) {
 	})
 }
 
+func (m *SessionManager) OnConnected(listener func(id string, session *Session)) {
+	m.emmiter.On("connected", func(payload ...interface{}) {
+		listener(payload[0].(string), payload[1].(*Session))
+	})
+}
+
 func (m *SessionManager) OnDestroy(listener func(id string)) {
 	m.emmiter.On("destroyed", func(payload ...interface{}) {
 		listener(payload[0].(string))

server/internal/session/session.go

@@ -8,12 +8,13 @@ import (
 )
 
 type Session struct {
-	ID     string
-	Name   string
-	Admin  bool
-	socket *websocket.Conn
-	peer   *webrtc.PeerConnection
-	mu     sync.Mutex
+	ID        string `json:"id"`
+	Name      string `json:"username"`
+	Admin     bool   `json:"admin"`
+	connected bool
+	socket    *websocket.Conn
+	peer      *webrtc.PeerConnection
+	mu        sync.Mutex
 }
 
 // TODO: write to peer data channel