diff --git a/cmd/webtorrent/init.go b/cmd/webtorrent/init.go index 4dc223aa..7a484fa9 100644 --- a/cmd/webtorrent/init.go +++ b/cmd/webtorrent/init.go @@ -54,7 +54,7 @@ func Init() { if log.Debug().Enabled() { srv.Listen(func(msg interface{}) { switch msg.(type) { - case string: + case string, error: log.Debug().Msgf("[webtorrent] %s", msg) case *webtorrent.Message: log.Trace().Any("msg", msg).Msgf("[webtorrent]") diff --git a/pkg/webtorrent/server.go b/pkg/webtorrent/server.go index a2850b80..144911e0 100644 --- a/pkg/webtorrent/server.go +++ b/pkg/webtorrent/server.go @@ -130,23 +130,29 @@ func (s *Server) reader(ws *websocket.Conn, peerID string) error { return nil } + s.Fire("new offer: " + v.OfferId) + cipher, err := NewCipher(share.name, share.pwd, v.OfferId) if err != nil { + s.Fire(err) return nil } enc, err := base64.StdEncoding.DecodeString(v.Offer.SDP) if err != nil { + s.Fire(err) return nil } offer, err := cipher.Decrypt(enc) if err != nil { + s.Fire(err) return nil } answer, err := s.Exchange(share.src, string(offer)) if err != nil { + s.Fire(err) return nil }