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

WebRTC refactor -> session dependency removal.

Browse Source
This commit is contained in:
Miroslav Šedivý
2020-10-31 21:20:42 +01:00
parent dadac4f145
commit b1b5a70c64
6 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/webrtc/handle.go
View File

@ -6,6 +6,8 @@ import (
"strconv"
"github.com/pion/webrtc/v2"
"demodesk/neko/internal/types"
)
const OP_MOVE = 0x01
@ -36,8 +38,8 @@ type PayloadKey struct {
Key uint64
}
func (manager *WebRTCManager) handle(id string, msg webrtc.DataChannelMessage) error {
if !manager.sessions.IsHost(id) {
func (manager *WebRTCManager) handle(session types.Session, msg webrtc.DataChannelMessage) error {
if !session.IsHost() {
return nil
}

17
internal/webrtc/webrtc.go
View File

@ -15,11 +15,10 @@ import (
"demodesk/neko/internal/types/config"
)
func New(sessions types.SessionManager, remote types.RemoteManager, config *config.WebRTC) *WebRTCManager {
func New(remote types.RemoteManager, config *config.WebRTC) *WebRTCManager {
return &WebRTCManager{
logger: log.With().Str("module", "webrtc").Logger(),
remote: remote,
sessions: sessions,
config: config,
}
}
@ -30,7 +29,6 @@ type WebRTCManager struct {
audioTrack *webrtc.Track
videoCodec *webrtc.RTPCodec
audioCodec *webrtc.RTPCodec
sessions types.SessionManager
remote types.RemoteManager
config *config.WebRTC
}
@ -136,7 +134,7 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri
connection.OnDataChannel(func(d *webrtc.DataChannel) {
d.OnMessage(func(msg webrtc.DataChannelMessage) {
if err = manager.handle(id, msg); err != nil {
if err = manager.handle(session, msg); err != nil {
manager.logger.Warn().Err(err).Msg("data handle failed")
}
})
@ -151,17 +149,10 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (stri
case webrtc.PeerConnectionStateDisconnected:
case webrtc.PeerConnectionStateFailed:
manager.logger.Info().Str("id", id).Msg("peer disconnected")
if err = manager.sessions.Destroy(id); err != nil {
manager.logger.Warn().Err(err).Msg("error while destroying session")
}
session.Disconnect("peer connection state failed")
case webrtc.PeerConnectionStateConnected:
manager.logger.Info().Str("id", id).Msg("peer connected")
if err = session.SetConnected(true); err != nil {
manager.logger.Warn().Err(err).Msg("unable to set connected on peer")
if err = manager.sessions.Destroy(id); err != nil {
manager.logger.Warn().Err(err).Msg("error while destroying session")
}
}
session.SetConnected(true)
}
})