package torrent
import (
+ "context"
"fmt"
+ "net"
+ netHttp "net/http"
"net/url"
"sync"
"github.com/anacrolix/log"
+ "github.com/gorilla/websocket"
+ "github.com/pion/datachannel"
"github.com/anacrolix/torrent/tracker"
+ httpTracker "github.com/anacrolix/torrent/tracker/http"
"github.com/anacrolix/torrent/webtorrent"
- "github.com/pion/datachannel"
)
-type websocketTracker struct {
+type websocketTrackerStatus struct {
url url.URL
- *webtorrent.TrackerClient
+ tc *webtorrent.TrackerClient
}
-func (me websocketTracker) statusLine() string {
- return fmt.Sprintf("%q", me.url.String())
+func (me websocketTrackerStatus) statusLine() string {
+ return fmt.Sprintf("%+v", me.tc.Stats())
}
-func (me websocketTracker) URL() url.URL {
- return me.url
+func (me websocketTrackerStatus) URL() *url.URL {
+ return &me.url
}
type refCountedWebtorrentTrackerClient struct {
}
type websocketTrackers struct {
- PeerId [20]byte
- Logger log.Logger
- GetAnnounceRequest func(event tracker.AnnounceEvent, infoHash [20]byte) tracker.AnnounceRequest
- OnConn func(datachannel.ReadWriteCloser, webtorrent.DataChannelContext)
- mu sync.Mutex
- clients map[string]*refCountedWebtorrentTrackerClient
+ PeerId [20]byte
+ Logger log.Logger
+ GetAnnounceRequest func(event tracker.AnnounceEvent, infoHash [20]byte) (tracker.AnnounceRequest, error)
+ OnConn func(datachannel.ReadWriteCloser, webtorrent.DataChannelContext)
+ mu sync.Mutex
+ clients map[string]*refCountedWebtorrentTrackerClient
+ Proxy httpTracker.ProxyFunc
+ DialContext func(ctx context.Context, network, addr string) (net.Conn, error)
+ WebsocketTrackerHttpHeader func() netHttp.Header
+ ICEServers []string
}
-func (me *websocketTrackers) Get(url string) (*webtorrent.TrackerClient, func()) {
+func (me *websocketTrackers) Get(url string, infoHash [20]byte) (*webtorrent.TrackerClient, func()) {
me.mu.Lock()
defer me.mu.Unlock()
value, ok := me.clients[url]
if !ok {
+ dialer := &websocket.Dialer{Proxy: me.Proxy, NetDialContext: me.DialContext, HandshakeTimeout: websocket.DefaultDialer.HandshakeTimeout}
value = &refCountedWebtorrentTrackerClient{
TrackerClient: webtorrent.TrackerClient{
+ Dialer: dialer,
Url: url,
GetAnnounceRequest: me.GetAnnounceRequest,
PeerId: me.PeerId,
Logger: me.Logger.WithText(func(m log.Msg) string {
return fmt.Sprintf("tracker client for %q: %v", url, m)
}),
+ WebsocketTrackerHttpHeader: me.WebsocketTrackerHttpHeader,
+ ICEServers: me.ICEServers,
},
}
- go func() {
- err := value.TrackerClient.Run()
+ value.TrackerClient.Start(func(err error) {
if err != nil {
me.Logger.Printf("error running tracker client for %q: %v", url, err)
}
- }()
+ })
if me.clients == nil {
me.clients = make(map[string]*refCountedWebtorrentTrackerClient)
}
return &value.TrackerClient, func() {
me.mu.Lock()
defer me.mu.Unlock()
+ value.TrackerClient.CloseOffersForInfohash(infoHash)
value.refCount--
if value.refCount == 0 {
value.TrackerClient.Close()