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

session state decoupled.

Browse Source
This commit is contained in:
Miroslav Šedivý 2021-03-14 00:50:08 +01:00
parent 4a28307c1e
commit ecad2124fd
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/session/manager.go
View File

@ -103,7 +103,7 @@ func (manager *SessionManagerCtx) Delete(id string) error {
manager.sessionsMu.Unlock() manager.sessionsMu.Unlock()
var err error var err error
if session.IsConnected() { if session.State().IsConnected {
err = session.Disconnect("session deleted") err = session.Disconnect("session deleted")
} }
@ -175,7 +175,7 @@ func (manager *SessionManagerCtx) Broadcast(v interface{}, exclude interface{})
defer manager.sessionsMu.Unlock() defer manager.sessionsMu.Unlock()
for id, session := range manager.sessions { for id, session := range manager.sessions {
if !session.IsConnected() { if !session.State().IsConnected {
continue continue
} }
@ -196,7 +196,7 @@ func (manager *SessionManagerCtx) AdminBroadcast(v interface{}, exclude interfac
defer manager.sessionsMu.Unlock() defer manager.sessionsMu.Unlock()
for id, session := range manager.sessions { for id, session := range manager.sessions {
if !session.IsConnected() || !session.Profile().IsAdmin { if !session.State().IsConnected || !session.Profile().IsAdmin {
continue continue
} }

14
internal/session/session.go
View File

@ -45,22 +45,14 @@ func (session *SessionCtx) profileChanged() {
} }
} }
// --- func (session *SessionCtx) State() types.SessionState {
// state return session.state
// --- }
func (session *SessionCtx) IsHost() bool { func (session *SessionCtx) IsHost() bool {
return session.manager.host != nil && session.manager.host == session return session.manager.host != nil && session.manager.host == session
} }
func (session *SessionCtx) IsConnected() bool {
return session.state.IsConnected
}
func (session *SessionCtx) State() types.SessionState {
return session.state
}
// --- // ---
// webscoket // webscoket
// --- // ---

5
internal/types/session.go
View File

@ -20,11 +20,8 @@ type SessionState struct {
type Session interface { type Session interface {
ID() string ID() string
Profile() MemberProfile Profile() MemberProfile
// state
IsHost() bool
IsConnected() bool
State() SessionState State() SessionState
IsHost() bool
// websocket // websocket
SetWebSocketPeer(websocketPeer WebSocketPeer) SetWebSocketPeer(websocketPeer WebSocketPeer)

2
internal/websocket/manager.go
View File

@ -180,7 +180,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque
return connection.Close() return connection.Close()
} }
if session.IsConnected() { if session.State().IsConnected {
// TODO: Refactor, return error code. // TODO: Refactor, return error code.
if err = connection.WriteJSON( if err = connection.WriteJSON(
message.SystemDisconnect{ message.SystemDisconnect{