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 update mutex logic.

Browse Source
This commit is contained in:
Miroslav Šedivý 2021-09-30 19:42:25 +02:00
parent 325af8fc5a
commit e9502b0d9b
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/session/session.go
View File

@ -54,7 +54,7 @@ func (session *SessionCtx) IsHost() bool {
} }
// --- // ---
// webscoket // websocket
// --- // ---
func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) { func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) {
@ -69,17 +69,20 @@ func (session *SessionCtx) SetWebSocketPeer(websocketPeer types.WebSocketPeer) {
func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPeer, connected bool) { func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPeer, connected bool) {
session.websocketMu.Lock() session.websocketMu.Lock()
if websocketPeer != session.websocketPeer { isCurrentPeer := websocketPeer == session.websocketPeer
session.websocketMu.Unlock() session.websocketMu.Unlock()
if !isCurrentPeer {
return return
} }
session.websocketMu.Unlock()
session.state.IsConnected = connected session.state.IsConnected = connected
if connected { if connected {
session.manager.emmiter.Emit("connected", session) session.manager.emmiter.Emit("connected", session)
} else { return
}
session.manager.emmiter.Emit("disconnected", session) session.manager.emmiter.Emit("disconnected", session)
session.websocketMu.Lock() session.websocketMu.Lock()
@ -87,7 +90,6 @@ func (session *SessionCtx) SetWebSocketConnected(websocketPeer types.WebSocketPe
session.websocketPeer = nil session.websocketPeer = nil
} }
session.websocketMu.Unlock() session.websocketMu.Unlock()
}
} }
func (session *SessionCtx) GetWebSocketPeer() types.WebSocketPeer { func (session *SessionCtx) GetWebSocketPeer() types.WebSocketPeer {
@ -120,22 +122,25 @@ func (session *SessionCtx) SetWebRTCPeer(webrtcPeer types.WebRTCPeer) {
func (session *SessionCtx) SetWebRTCConnected(webrtcPeer types.WebRTCPeer, connected bool) { func (session *SessionCtx) SetWebRTCConnected(webrtcPeer types.WebRTCPeer, connected bool) {
session.webrtcMu.Lock() session.webrtcMu.Lock()
if webrtcPeer != session.webrtcPeer { isCurrentPeer := webrtcPeer == session.webrtcPeer
session.webrtcMu.Unlock() session.webrtcMu.Unlock()
if !isCurrentPeer {
return return
} }
session.webrtcMu.Unlock()
session.state.IsWatching = connected session.state.IsWatching = connected
session.manager.emmiter.Emit("state_changed", session) session.manager.emmiter.Emit("state_changed", session)
if !connected { if connected {
return
}
session.webrtcMu.Lock() session.webrtcMu.Lock()
if webrtcPeer == session.webrtcPeer { if webrtcPeer == session.webrtcPeer {
session.webrtcPeer = nil session.webrtcPeer = nil
} }
session.webrtcMu.Unlock() session.webrtcMu.Unlock()
}
} }
func (session *SessionCtx) GetWebRTCPeer() types.WebRTCPeer { func (session *SessionCtx) GetWebRTCPeer() types.WebRTCPeer {