iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: session remove duplicate ID in endpoints.

Browse Source
This commit is contained in:
Miroslav Šedivý
2020-10-31 23:53:19 +01:00
parent e150203b54
commit 5c92b75cf7
7 changed files with 53 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
internal/session/manager.go
View File

@ -1,8 +1,6 @@
package session
import (
"fmt"
"github.com/kataras/go-events"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
@ -14,7 +12,7 @@ import (
func New(remote types.RemoteManager) *SessionManager {
return &SessionManager{
logger: log.With().Str("module", "session").Logger(),
host: "",
host: nil,
remote: remote,
members: make(map[string]*Session),
emmiter: events.New(),
@ -23,7 +21,7 @@ func New(remote types.RemoteManager) *SessionManager {
type SessionManager struct {
logger zerolog.Logger
host string
host types.Session
remote types.RemoteManager
members map[string]*Session
emmiter events.EventEmmiter
@ -50,30 +48,22 @@ func (manager *SessionManager) New(id string, admin bool, socket types.WebSocket
}
func (manager *SessionManager) HasHost() bool {
return manager.host != ""
return manager.host != nil
}
func (manager *SessionManager) SetHost(id string) error {
host, ok := manager.GetHost()
if ok {
manager.host = id
manager.emmiter.Emit("host", host)
return nil
}
return fmt.Errorf("invalid session id %s", id)
func (manager *SessionManager) SetHost(host types.Session) {
manager.host = host
manager.emmiter.Emit("host", host)
}
func (manager *SessionManager) GetHost() (types.Session, bool) {
host, ok := manager.members[manager.host]
return host, ok
func (manager *SessionManager) GetHost() types.Session {
return manager.host
}
func (manager *SessionManager) ClearHost() {
host, ok := manager.GetHost()
manager.host = ""
if ok {
manager.emmiter.Emit("host_cleared", host)
}
host := manager.host
manager.host = nil
manager.emmiter.Emit("host_cleared", host)
}
func (manager *SessionManager) Has(id string) bool {
@ -119,14 +109,14 @@ func (manager *SessionManager) Members() []*types.Member {
func (manager *SessionManager) Destroy(id string) error {
session, ok := manager.members[id]
if ok {
delete(manager.members, id)
err := session.destroy()
if !manager.remote.Streaming() && len(manager.members) <= 0 {
manager.remote.StopStream()
}
manager.emmiter.Emit("before_destroy", session)
delete(manager.members, id)
manager.emmiter.Emit("destroy", id)
return err
}
@ -164,9 +154,9 @@ func (manager *SessionManager) OnHostCleared(listener func(session types.Session
})
}
func (manager *SessionManager) OnBeforeDestroy(listener func(session types.Session)) {
manager.emmiter.On("before_destroy", func(payload ...interface{}) {
listener(payload[0].(*Session))
func (manager *SessionManager) OnDestroy(listener func(id string)) {
manager.emmiter.On("destroy", func(payload ...interface{}) {
listener(payload[0].(string))
})
}

2
internal/session/session.go
View File

@ -37,7 +37,7 @@ func (session *Session) Muted() bool {
}
func (session *Session) IsHost() bool {
return session.manager.host == session.id
return session.manager.host != nil && session.manager.host.ID() == session.ID()
}
func (session *Session) Connected() bool {