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

handle use webrtc logger.

Browse Source
This commit is contained in:
Miroslav Šedivý 2023-04-17 00:47:34 +02:00
parent e8aab98012
commit c2b29ccf21
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/webrtc/handler.go
View File

@ -9,11 +9,15 @@ import (
"github.com/demodesk/neko/internal/webrtc/payload" "github.com/demodesk/neko/internal/webrtc/payload"
"github.com/demodesk/neko/pkg/types" "github.com/demodesk/neko/pkg/types"
"github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3"
"github.com/rs/zerolog"
) )
func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataChannel, session types.Session) error { func (manager *WebRTCManagerCtx) handle(
// add session id to logger context logger zerolog.Logger, data []byte,
logger := manager.logger.With().Str("session_id", session.ID()).Logger() dataChannel *webrtc.DataChannel,
session types.Session,
) error {
isHost := session.IsHost()
// //
// parse header // parse header
@ -38,7 +42,7 @@ func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataCha
} }
x, y := int(payload.X), int(payload.Y) x, y := int(payload.X), int(payload.Y)
if session.IsHost() { if isHost {
// handle active cursor movement // handle active cursor movement
manager.desktop.Move(x, y) manager.desktop.Move(x, y)
manager.curPosition.Set(x, y) manager.curPosition.Set(x, y)
@ -87,7 +91,7 @@ func (manager *WebRTCManagerCtx) handle(data []byte, dataChannel *webrtc.DataCha
} }
// continue only if session is host // continue only if session is host
if !session.IsHost() { if !isHost {
return nil return nil
} }

2
internal/webrtc/manager.go
View File

@ -562,7 +562,7 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int,
}) })
dataChannel.OnMessage(func(message webrtc.DataChannelMessage) { dataChannel.OnMessage(func(message webrtc.DataChannelMessage) {
if err := manager.handle(message.Data, dataChannel, session); err != nil { if err := manager.handle(logger, message.Data, dataChannel, session); err != nil {
logger.Err(err).Msg("data handle failed") logger.Err(err).Msg("data handle failed")
} }
}) })